Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(hycu): add hycu dashboard #13642

Merged
merged 1 commit into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,21 @@ export type ResourceStatus =
| 'toDelete'
| 'toSuspend';

export type Renew = {
current: CurrentRenew;
capacities: RenewCapacities;
};

export type CurrentRenew = {
mode: RenewMode | null;
nextDate: string | null;
period: string;
};

export type RenewCapacities = {
mode: RenewMode[];
};

export type ServiceDetails = {
billing: {
engagement: {
Expand Down Expand Up @@ -115,15 +130,9 @@ export type ServiceDetails = {
pricingMode: string;
pricingType: PricingType;
};
renew?: Renew;
};
renew: {
capacities: { mode: RenewMode[] };
current: {
mode: RenewMode | null;
nextDate: string | null;
period: string;
};
};
renew?: Renew;
customer: {
contacts: CustomerContact[];
};
Expand Down
1 change: 1 addition & 0 deletions packages/manager/apps/hycu/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
e2e/reports
e2e/coverage
coverage
8 changes: 6 additions & 2 deletions packages/manager/apps/hycu/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"start": "lerna exec --stream --scope='@ovh-ux/manager-hycu-app' --include-dependencies -- npm run build --if-present",
"start:dev": "lerna exec --stream --scope='@ovh-ux/manager-hycu-app' --include-dependencies -- npm run dev --if-present",
"start:watch": "lerna exec --stream --parallel --scope='@ovh-ux/manager-hycu-app' --include-dependencies -- npm run dev:watch --if-present",
"test": "vitest run"
"test": "vitest run",
"test:coverage": "vitest run --coverage"
},
"dependencies": {
"@ovh-ux/manager-config": "*",
Expand Down Expand Up @@ -46,17 +47,20 @@
"devDependencies": {
"@cucumber/cucumber": "^10.3.1",
"@ovh-ux/manager-vite-config": "*",
"@ovh-ux/url-builder": "^1.2.0",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.1",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.13",
"@vitejs/plugin-react": "^4.3.2",
"@vitest/coverage-v8": "^2.1.3",
"element-internals-polyfill": "^1.3.12",
"eslint-plugin-prettier": "^5.2.1",
"msw": "2.1.7",
"typescript": "^5.1.6",
"vite": "^5.2.13",
"vitest": "^2.1.2"
"vitest": "^2.1.3"
},
"regions": [
"CA",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@
"hycu_crumb": "HYCU",
"tabs_2": "Tabs 2",
"hycu_description": "Simplifiez vos sauvegardes, plans de reprise après sinistre et migrations de votre infrastructure Nutanix. Ce service vous propose différents packs de licences HYCU Hybrid Cloud pour protéger vos charges de travail Nutanix.",
"hycu_cloud_vm_pack_unknown": "Pack inconnu"
"hycu_cloud_vm_pack_unknown": "Pack inconnu",
"hycu_status_activated": "Active",
"hycu_status_toActivate": "À activer",
"hycu_status_pending": "En cours d'activation",
"hycu_status_error": "Erreur d'activation"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"hycu_dashboard_generals_informations_title": "Informations générales",
"hycu_dashboard_label_name": "Nom",
"hycu_dashboard_label_status": "Statut",
"hycu_dashboard_label_pack_type": "Type de pack",
"hycu_dashboard_label_controller_id": "Controller ID",
"hycu_dashboard_label_license_key": "Clé de licence",
"hycu_dashboard_shortcuts_title": "Raccourcis",
"hycu_dashboard_link_activate": "Activer la licence",
"hycu_dashboard_link_reactivate": "Regénérer la licence",
"hycu_dashboard_link_terminated": "Résilier la licence",
"hycu_dashboard_link_change_pack_type": "Modifier le type de pack",
"hycu_dashboard_field_label_contacts": "Contacts",
"hycu_dashboard_contact_type_administrator": "Administrateur",
"hycu_dashboard_contact_type_technical": "Technique",
"hycu_dashboard_contact_type_billing": "Facturation",
"hycu_dashboard_action_billing_terminate": "Résilier",
"hycu_dashboard_field_label_manage_contacts": "Gérer les contacts",
"hycu_dashboard_label_renew": "Renouvellement automatique",
"hycu_dashboard_subscription_title": "Abonnement",
"hycu_dashboard_field_label_date_creation": "Date de création",
"hycu_dashboard_download_license_file": "Télécharger la license",
"hycu_dashboard_back_link": "Retour à la liste",
"hycu_dashboard_wait_for_activation": "En attente d'activation"
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
"hycu_status_activated": "Active",
"hycu_status_toActivate": "À activer",
"hycu_status_pending": "En cours d'activation",
"hycu_status_error": "Erreur d'activation",
"hycu_cloud_vm_pack_unknown": "Pack inconnu",
"hycu_name": "Nom",
"hycu_controller_id": "Controller ID",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import { OsdsSpinner } from '@ovhcloud/ods-components/react';

/* v8 ignore start */
export default function Loading() {
return (
<div className="flex justify-center">
Expand Down
15 changes: 7 additions & 8 deletions packages/manager/apps/hycu/src/data/api/hycu.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import { AxiosResponse } from 'axios';
import { fetchIcebergV6, apiClient } from '@ovh-ux/manager-core-api';
import { IHycuDetails } from '@/type/hycu.details.interface';

export type GetlicenseHycuListParams = {
/** Filter resources on IAM tags */
iamTags: any;
iamTags: string;
};

export const getlicenseHycuListQueryKey = ['get/license/hycu'];

/**
* Manage HYCU licenses : Get list of owned HYCU licenses
*/
export const getlicenseHycuList = async (
export const getlicenseHycuList = (
params: GetlicenseHycuListParams,
): Promise<unknown> => apiClient.v6.get('/license/hycu', { data: params });

Expand All @@ -19,16 +21,13 @@ export type GetlicenseHycuServiceParams = {
serviceName?: string;
};

export const getlicenseHycuServiceQueryKey = (
params: GetlicenseHycuServiceParams,
) => [`get/license/hycu/${params.serviceName}`];

/**
* Manage HYCU licenses : Get HYCU license info
*/
export const getlicenseHycuService = async (
export const getlicenseHycuService = (
params: GetlicenseHycuServiceParams,
): Promise<any> => apiClient.v6.get(`/license/hycu/${params.serviceName}`);
): Promise<AxiosResponse<IHycuDetails>> =>
apiClient.v6.get<IHycuDetails>(`/license/hycu/${params.serviceName}`);

/**
* Get listing with iceberg V6
Expand Down
15 changes: 15 additions & 0 deletions packages/manager/apps/hycu/src/hooks/api/license.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { AxiosResponse } from 'axios';
import { DefinedInitialDataOptions, useQuery } from '@tanstack/react-query';
import { getlicenseHycuService } from '@/data/api/hycu';
import { IHycuDetails } from '@/type/hycu.details.interface';

export const useDetailsLicenseHYCU = (
serviceName: string,
options?: DefinedInitialDataOptions<AxiosResponse<IHycuDetails>>,
) => {
return useQuery({
queryKey: ['license/hycu', 'get', serviceName],
queryFn: () => getlicenseHycuService({ serviceName }),
...(options ?? {}),
});
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { ShellContext } from '@ovh-ux/manager-react-shell-client';
import { vitest } from 'vitest';
import { ParamValueType } from '@ovh-ux/url-builder';
import React, { PropsWithChildren, useState } from 'react';
import { renderHook, waitFor } from '@testing-library/react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { useNavigationGetUrl } from './useNavigationGetUrl';

const mockGetURL = vitest.fn();

const Wrapper = ({ children }: PropsWithChildren) => {
const [queryClient] = useState(new QueryClient());
const [mockContextValue] = useState({
shell: { navigation: { getURL: mockGetURL } },
});
return (
<ShellContext.Provider value={mockContextValue as never}>
<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
</ShellContext.Provider>
);
};

describe('useNavigationGetUrl', () => {
it('should call navigation.getURL with correct linkParams', async () => {
const linkParams: [string, string, Record<string, ParamValueType>] = [
'param1',
'param2',
{ key: 'value' },
];
mockGetURL.mockResolvedValue('mockedUrl');

const { result } = renderHook(
() => useNavigationGetUrl(linkParams, { retry: false }),
{
wrapper: Wrapper,
},
);

await waitFor(() => result.current.isSuccess);

await waitFor(() => expect(mockGetURL).toHaveBeenCalledWith(...linkParams));
expect(result.current.data).toBe('mockedUrl');
});
});
21 changes: 21 additions & 0 deletions packages/manager/apps/hycu/src/hooks/shell/useNavigationGetUrl.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { ParamValueType } from '@ovh-ux/url-builder';
import { ShellContext } from '@ovh-ux/manager-react-shell-client';
import { DefinedInitialDataOptions, useQuery } from '@tanstack/react-query';
import { useContext } from 'react';

export const useNavigationGetUrl = (
linkParams: [string, string, Record<string, ParamValueType>],
options?: Partial<DefinedInitialDataOptions<unknown>>,
) => {
const {
shell: { navigation },
} = useContext(ShellContext);

return useQuery({
queryKey: ['shell', 'getUrl', linkParams],
queryFn: () => navigation.getURL(...linkParams),
refetchOnReconnect: false,
refetchOnWindowFocus: false,
...(options ?? {}),
});
};
1 change: 1 addition & 0 deletions packages/manager/apps/hycu/src/mocks/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './licenseHycu/licenseHycu';
export * from './serviceLicenseHycu/serviceLicenseHycu';
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const licensesHycu: IHycuDetails[] = [
},
comment: '',
serviceName: 'c1b7cb4f-6b63-45da-9a8a-f731f1a67b2c',
controllerId: '',
controllerId: 'test-id',
licenseStatus: LicenseStatus.ACTIVATED,
expirationDate: '0001-01-01T00:00:00Z',
},
Expand Down
22 changes: 21 additions & 1 deletion packages/manager/apps/hycu/src/mocks/licenseHycu/licenseHycu.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import { LicenseStatus } from '@/type/hycu.details.interface';
import { Handler } from '../../../../../../../playwright-helpers';
import { licensesHycu } from './licenseHycu.data';

export type GetLicenseHycuMocksParams = {
isGetLicenseHycuKo?: boolean;
nbLicenseHycu?: number;
licenseStatus?: LicenseStatus;
};

export const getLicenseHycuMocks = ({
isGetLicenseHycuKo,
nbLicenseHycu = Number.POSITIVE_INFINITY,
licenseStatus = LicenseStatus.TO_ACTIVATE,
}: GetLicenseHycuMocksParams): Handler[] => {
return [
{
Expand All @@ -17,7 +20,24 @@ export const getLicenseHycuMocks = ({
? {
message: 'Backup error',
}
: licensesHycu.slice(0, nbLicenseHycu),
: licensesHycu
.slice(0, nbLicenseHycu)
.map((license) => ({ ...license, licenseStatus })),
status: isGetLicenseHycuKo ? 500 : 200,
api: 'v6',
},
{
url: 'license/hycu/:serviceName',
response: isGetLicenseHycuKo
? {
message: 'Backup error',
}
: {
...licensesHycu[0],
licenseStatus,
controllerId:
licenseStatus !== LicenseStatus.TO_ACTIVATE ? 'test-id' : '',
},
status: isGetLicenseHycuKo ? 500 : 200,
api: 'v6',
},
Expand Down
Loading
Loading