fix(pci.project.instances): add state reload

* add goToInstances & goToInstance resolve and use it in goBack sub resolve
* fix translations loading

ref: MSB-18

Author: Cyrille Bourgois

packages/manager/modules/pci/src/projects/project/instances/active-monthly-billing/active-monthly-billing.routing.js

@@ -16,9 +16,7 @@ export default /* @ngInject */($stateProvider) => {
           instanceId,
         ) => PciProjectsProjectInstanceService
           .get(projectId, instanceId),
-        goBack: /* @ngInject */ ($state, projectId) => () => $state.go('pci.projects.project.instances', {
-          projectId,
-        }),
+        goBack: /* @ngInject */ goToInstances => goToInstances,
       },
     });
 };

packages/manager/modules/pci/src/projects/project/instances/add/add.controller.js

@@ -63,7 +63,6 @@ export default class PciInstancesAddController {
   }
 
   loadMessages() {
-    this.CucCloudMessage.unSubscribe('pci.projects.project.instances.add');
     this.messageHandler = this.CucCloudMessage.subscribe('pci.projects.project.instances.add', { onMessage: () => this.refreshMessages() });
   }
 

packages/manager/modules/pci/src/projects/project/instances/add/add.routing.js

@@ -21,7 +21,7 @@ export default /* @ngInject */($stateProvider) => {
         projectId,
       }),
 
-      goBack: ($state, projectId) => () => $state.go('pci.projects.project.instances', { projectId }),
+      goBack: /* @ngInject */ goToInstances => goToInstances,
     },
   });
 };

packages/manager/modules/pci/src/projects/project/instances/backup/backup.routing.js

@@ -22,9 +22,7 @@ export default /* @ngInject */($stateProvider) => {
           instance,
         ) => PciProjectsProjectInstanceService
           .getBackupPriceEstimation(projectId, instance),
-        goBack: /* @ngInject */ ($state, projectId) => () => $state.go('pci.projects.project.instances', {
-          projectId,
-        }),
+        goBack: /* @ngInject */ goToInstances => goToInstances,
       },
     });
 };

packages/manager/modules/pci/src/projects/project/instances/delete/delete.routing.js

@@ -16,9 +16,7 @@ export default /* @ngInject */($stateProvider) => {
           instanceId,
         ) => PciProjectsProjectInstanceService
           .get(projectId, instanceId),
-        goBack: /* @ngInject */ ($state, projectId) => () => $state.go('pci.projects.project.instances', {
-          projectId,
-        }),
+        goBack: /* @ngInject */ goToInstances => goToInstances,
       },
     });
 };

packages/manager/modules/pci/src/projects/project/instances/hard-reboot/hard-reboot.routing.js

@@ -17,10 +17,7 @@ export default /* @ngInject */($stateProvider) => {
           instanceId,
         ) => PciProjectsProjectInstanceService
           .get(projectId, instanceId),
-        goBack: /* @ngInject */ ($state, projectId, instanceId) => () => $state.go('pci.projects.project.instances', {
-          projectId,
-          instanceId,
-        }),
+        goBack: /* @ngInject */ goToInstances => goToInstances,
       },
     });
 };

packages/manager/modules/pci/src/projects/project/instances/instance.class.js

@@ -135,7 +135,7 @@ export default class Instance {
   }
 
   isRescuableWithDefaultImage() {
-    return !includes(['freebsd', 'windows'], this.image.distribution);
+    return !includes(['freebsd', 'windows'], get(this.image, 'distribution'));
   }
 
   get connectionInfos() {

packages/manager/modules/pci/src/projects/project/instances/instance/active-monthly-billing/active-monthly-billing.controller.js

@@ -20,29 +20,26 @@ export default class PciInstanceActiveMonthlyBillingController {
     this.isLoading = true;
     return this.PciProjectsProjectInstanceService
       .activeMonthlyBilling(this.projectId, this.instance)
-      .then(() => {
-        this.CucCloudMessage.success(
-          this.$translate.instant(
-            'pci_projects_project_instances_instance_active-monthly-billing_success_message',
-            {
-              instance: this.instance.name,
-            },
-          ),
-        );
-      })
-      .catch((err) => {
-        this.CucCloudMessage.error(
-          this.$translate.instant(
-            'pci_projects_project_instances_instance_active-monthly-billing_error_enable',
-            {
-              message: get(err, 'data.message', null),
-            },
-          ),
-        );
-      })
+      .then(() => this.goBack(
+        this.$translate.instant(
+          'pci_projects_project_instances_instance_active-monthly-billing_success_message',
+          {
+            instance: this.instance.name,
+          },
+        ),
+      ))
+      .catch(err => this.goBack(
+        this.$translate.instant(
+          'pci_projects_project_instances_instance_active-monthly-billing_error_enable',
+          {
+            message: get(err, 'data.message', null),
+            instance: this.instance.name,
+          },
+        ),
+        'error',
+      ))
       .finally(() => {
         this.isLoading = false;
-        return this.goBack();
       });
   }
 }

packages/manager/modules/pci/src/projects/project/instances/instance/active-monthly-billing/active-monthly-billing.routing.js

@@ -8,11 +8,12 @@ export default /* @ngInject */($stateProvider) => {
         },
       },
       layout: 'modal',
+      translations: {
+        value: ['.'],
+        format: 'json',
+      },
       resolve: {
-        goBack: /* @ngInject */ ($state, projectId, instanceId) => () => $state.go('pci.projects.project.instances.instance', {
-          projectId,
-          instanceId,
-        }),
+        goBack: /* @ngInject */ goToInstance => goToInstance,
       },
     });
 };

packages/manager/modules/pci/src/projects/project/instances/instance/attach-private-network/attach-private-network.controller.js

@@ -40,26 +40,19 @@ export default class PciInstanceAttachPrivateNetworkController {
             },
           );
         }
-
-        this.CucCloudMessage.success(
-          message,
-          'pci.projects.project.instances.instance',
-        );
-      })
-      .catch((err) => {
-        this.CucCloudMessage.error(
-          this.$translate.instant(
-            'pci_projects_project_instances_instance_attach-private-network_error_attach',
-            {
-              message: get(err, 'data.message', null),
-            },
-            'pci.projects.project.instances.instance',
-          ),
-        );
+        return this.goBack(message);
       })
+      .catch(err => this.goBack(
+        this.$translate.instant(
+          'pci_projects_project_instances_instance_attach-private-network_error_attach',
+          {
+            message: get(err, 'data.message', null),
+          },
+        ),
+        'error',
+      ))
       .finally(() => {
         this.isLoading = false;
-        return this.goBack();
       });
   }
 }