Remove calls to cloud providers to get IP addresses.

ILLGrenoble · Nov 28, 2024 · fcae6a9 · fcae6a9
1 parent eab29c1
commit fcae6a9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/src/app/admin/common/components/box/latest-instances/latest-instances-box.component.html b/src/app/admin/common/components/box/latest-instances/latest-instances-box.component.html
@@ -25,7 +25,7 @@ <h3 class="admin-box-title">
                 <td>{{ instance.owner?.fullName }}</td>
                 <td>{{ instance.owner.affiliation ? instance.owner.affiliation.name : 'No affiliation'}}</td>
                 <td *ngIf="multiCloudEnabled">{{ instance.cloudClient.name}}</td>
-                <td>{{ instance.cloudInstance?.address || 'No IP address'}}</td>
+                <td>{{ instance.ipAddress || 'No IP address'}}</td>
                 <td [ngClass]="{'text-danger': instance.state ==='ERROR'}">{{ instance.state.replace('_', ' ') | titlecase  }}</td>
                 <td>
                     <clr-tooltip>

diff --git a/src/app/admin/common/components/box/latest-instances/latest-instances-box.component.ts b/src/app/admin/common/components/box/latest-instances/latest-instances-box.component.ts
@@ -95,6 +95,7 @@ export class LatestInstancesBoxComponent implements OnInit, OnDestroy {
                       uid
                       name
                       createdAt
+                      ipAddress
                       plan {
                         image {
                           name
@@ -105,9 +106,6 @@ export class LatestInstancesBoxComponent implements OnInit, OnDestroy {
                         }
                       }
                       state
-                      cloudInstance {
-                        address
-                      }
                       owner {
                         id
                         fullName

diff --git a/src/app/admin/components/dashboard/dashboard.component.html b/src/app/admin/components/dashboard/dashboard.component.html
@@ -34,17 +34,14 @@
                         <visa-admin-cloud-client-distribution-box [refresh]="refreshEvent$"></visa-admin-cloud-client-distribution-box>
                     </div>
                 </div>
-
             </div>
+
             <div class="clr-col-lg-3">
                 <div><visa-admin-image-count-stat [refresh]="refreshEvent$"></visa-admin-image-count-stat></div>
                 <div><visa-admin-flavour-count-stat [refresh]="refreshEvent$"></visa-admin-flavour-count-stat></div>
-                <visa-admin-activated-users-count-stat [refresh]="refreshEvent$">
-                </visa-admin-activated-users-count-stat>
-                <visa-admin-cloud-limit-box [refresh]="refreshEvent$">
-                </visa-admin-cloud-limit-box>
-                <visa-admin-instance-states-box [refresh]="refreshEvent$">
-                </visa-admin-instance-states-box>
+                <visa-admin-activated-users-count-stat [refresh]="refreshEvent$"></visa-admin-activated-users-count-stat>
+                <visa-admin-cloud-limit-box [refresh]="refreshEvent$"></visa-admin-cloud-limit-box>
+                <visa-admin-instance-states-box [refresh]="refreshEvent$"></visa-admin-instance-states-box>
             </div>
         </div>
     </div>
-Original file line number
+Diff line change
@@ Expand Up @@
                           uid
                           name
                           createdAt
+                          ipAddress
                           plan {
                             image {
                               name
@@ Expand All @@
                             }
                           }
                           state
-                          cloudInstance {
-                            address
-                          }
                           owner {
                             id
                             fullName
@@ Expand Down @@