fix(tf): use alias instead of id

Author: fiftin

db/TerraformInventoryAlias.go

@@ -3,7 +3,6 @@ package db
 import "reflect"
 
 type TerraformInventoryAlias struct {
-	ID          int    `db:"id" json:"id"`
 	ProjectID   int    `db:"project_id" json:"project_id"`
 	InventoryID int    `db:"inventory_id" json:"inventory_id"`
 	AuthKeyID   int    `db:"auth_key_id" json:"auth_key_id"`
@@ -14,12 +13,12 @@ type TerraformInventoryAlias struct {
 var TerraformInventoryAliasProps = ObjectProps{
 	TableName:         "project__terraform_inventory_alias",
 	Type:              reflect.TypeOf(TerraformInventoryAlias{}),
-	PrimaryColumnName: "id",
+	PrimaryColumnName: "alias",
 }
 
 func (alias TerraformInventoryAlias) ToAlias() Alias {
 	return Alias{
-		ID:        alias.ID,
+		//ID:        alias.ID,
 		Alias:     alias.Alias,
 		ProjectID: alias.ProjectID,
 	}

db/TerraformInventoryStore_pro.go

@@ -3,10 +3,10 @@ package db
 type TerraformStore interface {
 	CreateTerraformInventoryAlias(alias TerraformInventoryAlias) (TerraformInventoryAlias, error)
 	GetTerraformInventoryAliasByAlias(alias string) (TerraformInventoryAlias, error)
-	GetTerraformInventoryAlias(projectID int, inventoryID int, aliasID int) (TerraformInventoryAlias, error)
+	GetTerraformInventoryAlias(projectID int, inventoryID int, aliasID string) (TerraformInventoryAlias, error)
 	GetTerraformInventoryAliases(projectID, inventoryID int) ([]TerraformInventoryAlias, error)
 	UpdateTerraformInventoryAlias(alias TerraformInventoryAlias) error
-	DeleteTerraformInventoryAlias(projectID int, inventoryID int, aliasID int) error
+	DeleteTerraformInventoryAlias(projectID int, inventoryID int, aliasID string) error
 
 	CreateTerraformInventoryState(State TerraformInventoryState) (TerraformInventoryState, error)
 	GetTerraformInventoryState(projectID int, inventoryId int, stateID int) (TerraformInventoryState, error)

db/sql/SqlDb.go

@@ -235,6 +235,12 @@ func (d *SqlDbConnection) SelectAll(i any, query string, args ...any) ([]any, er
 }
 
 func (d *SqlDbConnection) DeleteObject(projectID int, props db.ObjectProps, objectID any) error {
+	primaryColumnName := "id"
+
+	if props.PrimaryColumnName != "" {
+		primaryColumnName = props.PrimaryColumnName
+	}
+
 	if props.IsGlobal {
 		return validateMutationResult(
 			d.Exec(
@@ -243,7 +249,7 @@ func (d *SqlDbConnection) DeleteObject(projectID int, props db.ObjectProps, obje
 	} else {
 		return validateMutationResult(
 			d.Exec(
-				"delete from "+props.TableName+" where project_id=? and id=?",
+				"delete from "+props.TableName+" where project_id=? and "+primaryColumnName+"=?",
 				projectID,
 				objectID))
 	}

pro/db/sql/terraform_inventory.go

@@ -19,15 +19,15 @@ func (d *TerraformStoreImpl) GetTerraformInventoryAliasByAlias(alias string) (re
 	return
 }
 
-func (d *TerraformStoreImpl) GetTerraformInventoryAlias(projectID, inventoryID int, aliasID int) (res db.TerraformInventoryAlias, err error) {
+func (d *TerraformStoreImpl) GetTerraformInventoryAlias(projectID, inventoryID int, aliasID string) (res db.TerraformInventoryAlias, err error) {
 	return
 }
 
 func (d *TerraformStoreImpl) GetTerraformInventoryAliases(projectID, inventoryID int) (res []db.TerraformInventoryAlias, err error) {
 	return
 }
 
-func (d *TerraformStoreImpl) DeleteTerraformInventoryAlias(projectID int, inventoryID int, aliasID int) (err error) {
+func (d *TerraformStoreImpl) DeleteTerraformInventoryAlias(projectID int, inventoryID int, aliasID string) (err error) {
 	return
 }
 

web/src/views/project/template/TemplateTerraformState.vue

@@ -210,6 +210,9 @@
             </v-btn>
           </v-alert>
 
+          <h3>Aliases</h3>
+          <div class="mb-6">Alieases allows you to use state externally</div>
+
           <div class="mb-3 pl-1" v-if="(aliases || []).length === 0">There is no aliases.</div>
 
           <div v-else v-for="alias of (aliases || [])" :key="alias.id">
@@ -230,19 +233,27 @@
             color="primary"
             @click="addAlias()"
             :disabled="!premiumFeatures.terraform_backend"
+            class="mb-8"
           >
             {{ aliases == null ? $t('LoadAlias') : $t('AddAlias') }}
           </v-btn>
 
+          <v-divider class="mb-4" />
+
+          <h3>State history</h3>
+          <div class="mb-6">Alieases allows you to use state externally</div>
+
           <v-data-table
-            style="max-width: 1000px; margin: auto; background: transparent;"
+            style="
+              background: transparent;
+            "
             v-if="premiumFeatures.terraform_backend"
             :headers="headers"
             :items="states"
             :footer-props="{ itemsPerPageOptions: [20] }"
             single-expand
             show-expand
-            class="mt-4 TaskListTable"
+            class="mt-4 TaskListTable TaskListTable TerraformStateTable"
           >
             <template v-slot:item.id="{ item }">
               #{{ item.id }}
@@ -291,6 +302,20 @@
 
   </div>
 </template>
+<style lang="scss">
+.TerraformStateTable {
+
+  .v-data-table__wrapper {
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+  }
+
+  .v-data-footer {
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+  }
+}
+</style>
 <script>
 
 import axios from 'axios';