fix(vcd): fix veeam backup status (#13856)

ref: MANAGER-15767 Signed-off-by: Paul Dickerson <[email protected]>
ovh · Nov 14, 2024 · 0f77ae4 · 0f77ae4
1 parent 17cf3e5
commit 0f77ae4
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 25 deletions.
diff --git a/.../src/components/tiles/organization-data-tile/OrganizationDataProtectionTile.component.tsx b/.../src/components/tiles/organization-data-tile/OrganizationDataProtectionTile.component.tsx
@@ -9,8 +9,15 @@ import {
   DATA_PROTECTION_RECOVERY_TITLE,
 } from '@/pages/dashboard/organization/OrganizationDashboard.constants';
 import BackupTileItem from './backup-tile-item/BackupTileItem.component';
+import IVcdOrganization from '@/types/vcd-organization.interface';
 
-export default function DataProtectionTile() {
+type TTileProps = {
+  vcdOrganization: IVcdOrganization;
+};
+
+export default function DataProtectionTile({
+  vcdOrganization,
+}: Readonly<TTileProps>) {
   const { t } = useTranslation('dashboard');
 
   return (
@@ -21,7 +28,7 @@ export default function DataProtectionTile() {
           {
             id: 'backup',
             label: DATA_PROTECTION_BACKUP_TITLE,
-            value: <BackupTileItem />,
+            value: <BackupTileItem vcdOrganization={vcdOrganization} />,
           },
           {
             id: 'recovery',

diff --git a/...d-vcd/src/components/tiles/organization-data-tile/OrganizationDataProtectionTile.spec.tsx b/...d-vcd/src/components/tiles/organization-data-tile/OrganizationDataProtectionTile.spec.tsx
@@ -20,6 +20,7 @@ import { useManagedVcdOrganizationBackup } from '../../../data/hooks/useManagedV
 import IVcdOrganizationBackup, {
   BackupResourceStatus,
 } from '../../../types/vcd-organization-backup.interface';
+import { organizationList } from '../../../../mocks/vcd-organization/vcd-organization.mock';
 
 vi.mock('../../../data/hooks/useManagedVcdOrganization', () => ({
   useManagedVcdOrganizationBackup: vi.fn(),
@@ -44,7 +45,7 @@ const renderComponent = () => {
       <ShellContext.Provider
         value={(shellContext as unknown) as ShellContextType}
       >
-        <OrganizationDataProtectionTile />
+        <OrganizationDataProtectionTile vcdOrganization={organizationList[0]} />
       </ShellContext.Provider>
     </QueryClientProvider>,
   );

diff --git a/...src/components/tiles/organization-data-tile/backup-tile-item/BackupTileItem.component.tsx b/...src/components/tiles/organization-data-tile/backup-tile-item/BackupTileItem.component.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import { useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { ShellContext } from '@ovh-ux/manager-react-shell-client';
 import { Links, LinkType } from '@ovh-ux/manager-react-components';
@@ -11,14 +10,20 @@ import {
   BackupBadgeParams,
   getBackupBadgeParams,
   getBackupBadgeStatus,
-} from '@/utils/getBackupBadge';
+} from '@/utils/veeamBackupBadge';
+import IVcdOrganization from '@/types/vcd-organization.interface';
 
-export default function BackupTileItem() {
-  const { id } = useParams();
+type TTileProps = {
+  vcdOrganization: IVcdOrganization;
+};
+
+export default function BackupTileItem({
+  vcdOrganization,
+}: Readonly<TTileProps>) {
   const { t } = useTranslation('dashboard');
   const { shell } = React.useContext(ShellContext);
   const { data: vcdBackup, isLoading, error } = useManagedVcdOrganizationBackup(
-    id,
+    vcdOrganization,
   );
   const [veeamHref, setVeeamHref] = React.useState('');
   const badgeParams: BackupBadgeParams = getBackupBadgeParams(
@@ -34,9 +39,10 @@ export default function BackupTileItem() {
       .then((url: string) => setVeeamHref(url));
   }, []);
 
+  if (isLoading) return <OsdsSkeleton data-testid="backupLoading" />;
+
   return (
     <div className="flex flex-col items-start">
-      {isLoading && <OsdsSkeleton data-testid="backupLoading" />}
       <OsdsChip
         inline
         data-testid={badgeParams.testIdLabel}

diff --git a/...es/organization-general-information-tile/OrganizationGeneralInformationTile.component.tsx b/...es/organization-general-information-tile/OrganizationGeneralInformationTile.component.tsx
@@ -41,8 +41,8 @@ export default function OrganizationGenerationInformationTile({
           label: t('managed_vcd_dashboard_name'),
           value: (
             <EditableTileItem
-              label={vcdOrganization?.currentState?.fullName}
-              urn={vcdOrganization?.iam?.urn}
+              label={vcdOrganization.currentState?.fullName}
+              urn={vcdOrganization.iam?.urn}
               iamActions={[
                 iamActions.vmwareCloudDirectorApiovhOrganizationEdit,
               ]}
@@ -55,8 +55,8 @@ export default function OrganizationGenerationInformationTile({
           label: t('managed_vcd_dashboard_description'),
           value: (
             <EditableTileItem
-              label={vcdOrganization?.currentState?.description}
-              urn={vcdOrganization?.iam.urn}
+              label={vcdOrganization.currentState?.description}
+              urn={vcdOrganization.iam.urn}
               iamActions={[
                 iamActions.vmwareCloudDirectorApiovhOrganizationEdit,
               ]}
@@ -76,7 +76,7 @@ export default function OrganizationGenerationInformationTile({
               hue={ODS_THEME_COLOR_HUE._500}
             >
               <Region
-                name={vcdOrganization?.currentState?.region?.toLowerCase()}
+                name={vcdOrganization.currentState?.region?.toLowerCase()}
                 mode="region"
               />
             </OsdsText>
@@ -93,7 +93,7 @@ export default function OrganizationGenerationInformationTile({
           value: (
             <Links
               type={LinkType.external}
-              href={vcdOrganization?.currentState?.webInterfaceUrl}
+              href={vcdOrganization.currentState?.webInterfaceUrl}
               label={t('managed_vcd_dashboard_management_interface_access')}
               target={OdsHTMLAnchorElementTarget._blank}
             />

diff --git a/packages/manager/apps/hpc-vmware-managed-vcd/src/data/api/hpc-vmware-managed-vcd.ts b/packages/manager/apps/hpc-vmware-managed-vcd/src/data/api/hpc-vmware-managed-vcd.ts
@@ -27,11 +27,9 @@ export const getVcdOrganization = async (
  * Get VCD Backup
  */
 export const getVcdOrganizationBackup = async (
-  organizationId: string,
+  backupId: string,
 ): Promise<ApiResponse<IVcdOrganizationBackup>> =>
-  apiClient.v2.get(
-    `/vmwareCloudDirector/backup/${organizationId}-veeam-backup`,
-  );
+  apiClient.v2.get(`/vmwareCloudDirector/backup/${backupId}`);
 
 /**
  * Edit VCD Organization

diff --git a/packages/manager/apps/hpc-vmware-managed-vcd/src/data/hooks/useManagedVcdOrganization.ts b/packages/manager/apps/hpc-vmware-managed-vcd/src/data/hooks/useManagedVcdOrganization.ts
@@ -14,6 +14,7 @@ import {
   getVcdOrganizationQueryKey,
   getVcdOrganizationBackupQueryKey,
 } from '@/utils/queryKeys';
+import { getBackupIdFromOrganization } from '@/utils/veeamBackupId';
 
 interface IUseManagedVcdOrganization
   extends Pick<UseQueryOptions, 'refetchOnWindowFocus' | 'refetchInterval'> {
@@ -35,10 +36,13 @@ const useManagedVcdOrganization = ({
   });
 };
 
-export const useManagedVcdOrganizationBackup = (id: string) => {
+export const useManagedVcdOrganizationBackup = (
+  vcdOrganization: IVcdOrganization,
+) => {
   return useQuery<ApiResponse<IVcdOrganizationBackup>, ApiError>({
-    queryKey: getVcdOrganizationBackupQueryKey(id),
-    queryFn: () => getVcdOrganizationBackup(id),
+    queryKey: getVcdOrganizationBackupQueryKey(vcdOrganization.id),
+    queryFn: () =>
+      getVcdOrganizationBackup(getBackupIdFromOrganization(vcdOrganization)),
     retry: false,
     placeholderData: keepPreviousData,
   });

diff --git a/.../pages/dashboard/organization/general-information/OrganizationGeneralInformation.page.tsx b/.../pages/dashboard/organization/general-information/OrganizationGeneralInformation.page.tsx
@@ -37,13 +37,13 @@ function GeneralInformation() {
   return (
     <div className="grid xs:grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-8 px-10">
       <OrganizationGenerationInformationTile
-        vcdOrganization={vcdOrganization?.data}
+        vcdOrganization={vcdOrganization.data}
       />
       <div className="flex flex-col gap-8">
         <OrganizationOptionsTile
-          isLicenseActive={!!vcdOrganization?.data?.currentState?.spla}
+          isLicenseActive={!!vcdOrganization.data?.currentState?.spla}
         />
-        <DataProtectionTile />
+        <DataProtectionTile vcdOrganization={vcdOrganization.data} />
       </div>
       <div>
         <BillingTile id={id} />

diff --git a/...e-managed-vcd/src/utils/getBackupBadge.ts → ...managed-vcd/src/utils/veeamBackupBadge.ts b/...e-managed-vcd/src/utils/getBackupBadge.ts → ...managed-vcd/src/utils/veeamBackupBadge.ts
diff --git a/packages/manager/apps/hpc-vmware-managed-vcd/src/utils/veeamBackupId.ts b/packages/manager/apps/hpc-vmware-managed-vcd/src/utils/veeamBackupId.ts
@@ -0,0 +1,9 @@
+import IVcdOrganization from '@/types/vcd-organization.interface';
+
+const getOrganizationUuid = (organization: IVcdOrganization) =>
+  organization.id.split(
+    `${organization.currentState.region.toLowerCase()}-`,
+  )[1];
+
+export const getBackupIdFromOrganization = (organization: IVcdOrganization) =>
+  `${getOrganizationUuid(organization)}-veeam-backup`;