Merge pull request #1761 from slntopp/dev

Dev
slntopp · Jun 5, 2024 · 5c35774 · 5c35774
2 parents 2621962 + 7f47469
commit 5c35774
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 3 deletions.
diff --git a/admin-ui/src/components/instances_table.vue b/admin-ui/src/components/instances_table.vue
@@ -82,6 +82,10 @@
       {{ formatSecondsToDate(getValue("date", item)) || "Unknown" }}
     </template>
 
+    <template v-slot:[`item.deleted`]="{ item }">
+      {{ formatSecondsToDate(item.deleted) || "-" }}
+    </template>
+
     <template v-slot:[`item.dueDate`]="{ item }">
       {{
         typeof getExpirationDate(item) === "number"
@@ -610,6 +614,7 @@ export default {
         { text: "Period", value: "period" },
         { text: "Email", value: "email" },
         { text: "Created date", value: "date", editable: { type: "date" } },
+        { text: "Deleted date", value: "deleted" },
         { text: "UUID", value: "uuid" },
         { text: "Price model", value: "billingPlan.title" },
         { text: "IP", value: "state.meta.networking" },

diff --git a/admin-ui/src/components/modules/cpanel/billingInfo.vue b/admin-ui/src/components/modules/cpanel/billingInfo.vue
@@ -47,6 +47,14 @@
         />
       </v-col>
 
+      <v-col>
+        <v-text-field
+          label="Deleted date"
+          readonly
+          :value="formatSecondsToDate(template.deleted, true, '-')"
+        />
+      </v-col>
+
       <v-col
         v-if="
           template.billingPlan.title.toLowerCase() !== 'payg' ||

diff --git a/admin-ui/src/components/modules/empty/billingInfo.vue b/admin-ui/src/components/modules/empty/billingInfo.vue
@@ -46,6 +46,14 @@
         />
       </v-col>
 
+      <v-col>
+        <v-text-field
+          label="Deleted date"
+          readonly
+          :value="formatSecondsToDate(template.deleted, true, '-')"
+        />
+      </v-col>
+
       <v-col>
         <v-text-field
           readonly

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -51,6 +51,14 @@
         />
       </v-col>
 
+      <v-col>
+        <v-text-field
+          label="Deleted date"
+          readonly
+          :value="formatSecondsToDate(template.deleted, true, '-')"
+        />
+      </v-col>
+
       <v-col v-if="!isMonitoringEmpty">
         <v-text-field
           readonly

diff --git a/admin-ui/src/components/modules/keyweb/billingInfo.vue b/admin-ui/src/components/modules/keyweb/billingInfo.vue
@@ -46,6 +46,14 @@
         />
       </v-col>
 
+      <v-col>
+        <v-text-field
+          label="Deleted date"
+          readonly
+          :value="formatSecondsToDate(template.deleted, true, '-')"
+        />
+      </v-col>
+
       <v-col v-if="template.billingPlan.title.toLowerCase() !== 'payg'">
         <v-text-field
           readonly

diff --git a/admin-ui/src/components/modules/openai/billingInfo.vue b/admin-ui/src/components/modules/openai/billingInfo.vue
@@ -36,6 +36,14 @@
           "
         />
       </v-col>
+
+      <v-col>
+        <v-text-field
+          label="Deleted date"
+          readonly
+          :value="formatSecondsToDate(template.deleted, true, '-')"
+        />
+      </v-col>
     </v-row>
     <instances-panels title="Prices">
       <nocloud-table

diff --git a/admin-ui/src/components/modules/opensrs/billingInfo.vue b/admin-ui/src/components/modules/opensrs/billingInfo.vue
@@ -43,6 +43,14 @@
         />
       </v-col>
 
+      <v-col>
+        <v-text-field
+          label="Deleted date"
+          readonly
+          :value="formatSecondsToDate(template.deleted, true, '-')"
+        />
+      </v-col>
+
       <v-col>
         <v-text-field
           readonly

diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -51,6 +51,15 @@
           "
         />
       </v-col>
+
+      <v-col>
+        <v-text-field
+          label="Deleted date"
+          readonly
+          :value="formatSecondsToDate(template.deleted, true, '-')"
+        />
+      </v-col>
+
       <v-col>
         <v-text-field
           readonly

diff --git a/pkg/graph/instances.go b/pkg/graph/instances.go
@@ -147,7 +147,7 @@ func (ctrl *InstancesController) Create(ctx context.Context, group driver.Docume
 	c := pb.Context{
 		Instance: i.GetUuid(),
 		Sp:       sp,
-		Event:    "create",
+		Event:    spb.NoCloudStatus_INIT.String(),
 	}
 	body, err := proto.Marshal(&c)
 	if err == nil {
@@ -301,7 +301,7 @@ func (ctrl *InstancesController) Update(ctx context.Context, sp string, inst, ol
 	c := pb.Context{
 		Instance: inst.GetUuid(),
 		Sp:       sp,
-		Event:    "update",
+		Event:    "UPDATE",
 	}
 	body, err := proto.Marshal(&c)
 	if err == nil {
@@ -358,7 +358,7 @@ func (ctrl *InstancesController) Delete(ctx context.Context, group string, i *pb
 		c := pb.Context{
 			Instance: i.GetUuid(),
 			Sp:       sp,
-			Event:    "create",
+			Event:    spb.NoCloudStatus_DEL.String(),
 		}
 		body, err := proto.Marshal(&c)
 		if err == nil {

diff --git a/pkg/services/services.go b/pkg/services/services.go
@@ -531,6 +531,13 @@ func (s *ServicesServer) Up(ctx context.Context, request *pb.UpRequest) (*pb.UpR
 			continue
 		}
 
+		for _, inst := range group.GetInstances() {
+			if inst.GetStatus() == statuspb.NoCloudStatus_DEL {
+				continue
+			}
+			s.ctrl.IGController().Instances().SetStatus(ctx, inst, statuspb.NoCloudStatus_UP)
+		}
+
 		log.Debug("Updated Group", zap.Any("group", group))
 	}