From c6fcf488c823b03fe1c09eff18996b30b64eb6d4 Mon Sep 17 00:00:00 2001 From: Arthur Bullet Date: Tue, 18 Jun 2024 18:07:15 +0200 Subject: [PATCH] feat(pci.db): update pci menu to support bff for db react app ref : DATATR-1090 Signed-off-by: Arthur Bullet --- .../universe/public-cloud/pci-menu.ts | 49 ++++++++++++++--- .../navigation-tree/services/publicCloud.ts | 53 ++++++++++++++++--- 2 files changed, 89 insertions(+), 13 deletions(-) diff --git a/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/public-cloud/pci-menu.ts b/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/public-cloud/pci-menu.ts index 95785755bc58..c6f7c1653550 100644 --- a/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/public-cloud/pci-menu.ts +++ b/packages/manager/apps/container/src/container/legacy/server-sidebar/universe/public-cloud/pci-menu.ts @@ -14,7 +14,12 @@ export const features = [ 'pci-baremetal', 'block-storage', 'object-storage', - 'databases', + 'databases-operational', + 'databases-streaming', + 'databases-analysis', + 'pci-databases-analytics-operational', + 'pci-databases-analytics-streaming', + 'pci-databases-analytics-analysis', 'archive', 'cold-archive', 'snapshot', @@ -230,25 +235,46 @@ export function getPciProjectMenu( title: 'Databases & Analytics', regions: ['EU', 'CA', 'US'], subItems: [ - + //Entry menu for PCI Databases for Angular { - id: 'databases', + id: 'databases-operational', title: 'Databases', - feature: 'databases', + feature: 'databases-operational', href: getURL( 'public-cloud', `#/pci/projects/${projectId}/storages/databases-analytics/databases`, ), }, + //Entry menu for PCI Databases for React + { + id: 'pci-databases-analytics-operational', + title: 'Databases', + feature: 'pci-databases-analytics-operational', + href: getURL( + 'public-cloud', + `#/pci/projects/${projectId}/databases-analytics/operational/services`, + ), + }, + //Entry menu for PCI Data Streaming for Angular { id: 'databases-streaming', title: 'Data Streaming', - feature: 'databases', + feature: 'databases-streaming', href: getURL( 'public-cloud', `#/pci/projects/${projectId}/storages/databases-analytics/data-streaming`, ), }, + //Entry menu for PCI Data Streaming for React + { + id: 'pci-databases-analytics-streaming', + title: 'Data Streaming', + feature: 'pci-databases-analytics-streaming', + href: getURL( + 'public-cloud', + `#/pci/projects/${projectId}/databases-analytics/streaming/services`, + ), + }, { id: 'data-processing', title: 'Data Processing', @@ -258,15 +284,26 @@ export function getPciProjectMenu( `#/pci/projects/${projectId}/data-processing`, ), }, + //Entry menu for PCI Data Analysis for Angular { id: 'databases-analysis', title: 'Data Analysis', - feature: 'databases', + feature: 'databases-analysis', href: getURL( 'public-cloud', `#/pci/projects/${projectId}/storages/databases-analytics/data-analysis`, ), }, + //Entry menu for PCI Data Analysis for React + { + id: 'pci-databases-analytics-analysis', + title: 'Data Analysis', + feature: 'pci-databases-analytics-analysis', + href: getURL( + 'public-cloud', + `#/pci/projects/${projectId}/databases-analytics/analysis/services`, + ), + }, { id: 'data-platform', title: 'Data Platform', diff --git a/packages/manager/apps/container/src/container/nav-reshuffle/sidebar/navigation-tree/services/publicCloud.ts b/packages/manager/apps/container/src/container/nav-reshuffle/sidebar/navigation-tree/services/publicCloud.ts index cabba357800b..5ba402bcee92 100644 --- a/packages/manager/apps/container/src/container/nav-reshuffle/sidebar/navigation-tree/services/publicCloud.ts +++ b/packages/manager/apps/container/src/container/nav-reshuffle/sidebar/navigation-tree/services/publicCloud.ts @@ -268,29 +268,55 @@ const pciNode: Node = { { id: 'pci-analytics', translation: 'sidebar_pci_analytics', - features: ['data-processing', 'logs-data-platform', 'databases'], + features: ['data-processing', 'logs-data-platform', 'databases-analysis', 'databases-operational', 'databases-streaming', 'pci-databases-analytics-analysis', 'pci-databases-analytics-operational', 'pci-databases-analytics-streaming'], forceVisibility: true, children: [ + //Entry menu for PCI Databases for Angular { - id: 'pci-analytics-databases', + id: 'pci-databases-operational', translation: 'sidebar_pci_analytics_databases', serviceType: 'CLOUD_PROJECT_DATABASE', routing: { application: 'public-cloud', hash: '#/pci/projects/{projectId}/storages/databases-analytics/databases', }, - features: ['databases'], + features: ['databases-operational'], forceVisibility: true, }, + //Entry menu for PCI Databases for React { - id: 'pci-analytics-data-streaming', + id: 'pci-databases-analytics-operational', + translation: 'sidebar_pci_analytics_databases', + serviceType: 'CLOUD_PROJECT_DATABASE', + routing: { + application: 'public-cloud', + hash: '#/pci/projects/{projectId}/databases-analytics/operational/services', + }, + features: ['pci-databases-analytics-operational'], + forceVisibility: true, + }, + //Entry menu for PCI Data Streaming for Angular + { + id: 'pci-databases-streaming', translation: 'sidebar_pci_analytics_data_streaming', serviceType: 'CLOUD_PROJECT_DATABASE', routing: { application: 'public-cloud', hash: '#/pci/projects/{projectId}/storages/databases-analytics/data-streaming', }, - features: ['databases'], + features: ['databases-streaming'], + forceVisibility: true, + }, + //Entry menu for PCI Data Streaming for React + { + id: 'pci-databases-analytics-streaming', + translation: 'sidebar_pci_analytics_data_streaming', + serviceType: 'CLOUD_PROJECT_DATABASE', + routing: { + application: 'public-cloud', + hash: '#/pci/projects/{projectId}/databases-analytics/streaming/services', + }, + features: ['pci-databases-analytics-streaming'], forceVisibility: true, }, { @@ -304,15 +330,28 @@ const pciNode: Node = { features: ['data-processing'], forceVisibility: true, }, + //Entry menu for PCI Data Analysis for Angular { - id: 'pci-analytics-data-analysis', + id: 'pci-databases-analysis', translation: 'sidebar_pci_analytics_data_analysis', serviceType: 'CLOUD_PROJECT_DATABASE', routing: { application: 'public-cloud', hash: '#/pci/projects/{projectId}/storages/databases-analytics/data-analysis', }, - features: ['databases'], + features: ['databases-analysis'], + forceVisibility: true, + }, + //Entry menu for PCI Data Analysis for React + { + id: 'pci-databases-analytics-analysis', + translation: 'sidebar_pci_analytics_data_analysis', + serviceType: 'CLOUD_PROJECT_DATABASE', + routing: { + application: 'public-cloud', + hash: '#/pci/projects/{projectId}/databases-analytics/analysis/services', + }, + features: ['pci-databases-analytics-analysis'], forceVisibility: true, }, {