From 7d3624cd491b213eb7de41fb1700f156df8aa295 Mon Sep 17 00:00:00 2001 From: bipuladh Date: Tue, 9 Feb 2021 20:28:09 +0530 Subject: [PATCH] Refactor Ceph Plugin Directory Structure --- .../locales/en/ceph-storage-plugin.json | 110 +++++++++--------- .../src/__tests__/breakdown-body.spec.tsx | 10 +- .../src/__tests__/breakdown-chart.spec.tsx | 4 +- ...ependent-dashboard-breakdown-card.spec.tsx | 6 +- ...ndependent-dashboard-details-card.spec.tsx | 2 +- .../capacity-breakdown}/breakdown-body.tsx | 0 .../breakdown-capacity.tsx | 0 .../capacity-breakdown}/breakdown-card.scss | 0 .../capacity-breakdown}/breakdown-chart.tsx | 0 .../breakdown-dropdown.tsx | 0 .../capacity-breakdown}/breakdown-loading.tsx | 0 .../common/capacity-breakdown}/consts.ts | 0 .../common/capacity-breakdown}/utils.tsx | 0 .../data-resiliency-activity.tsx | 0 .../storage-efficiency-card-item.tsx | 1 + .../storage-efficiency-card.scss | 0 .../persistent-external}/breakdown-card.tsx | 15 +-- .../persistent-external}/details-card.tsx | 4 +- .../persistent-external}/status-card.tsx | 4 +- .../persistent-external}/utilization-card.tsx | 2 +- .../activity-card/activity-card.scss | 0 .../activity-card/activity-card.tsx | 5 +- .../activity-card/cluster-expand-activity.tsx | 0 .../activity-card/ocs-upgrade-activity.tsx | 0 .../capacity-breakdown-card.scss | 0 .../capacity-breakdown-card.tsx | 6 +- .../persistent-internal}/details-card.tsx | 0 .../persistent-internal}/inventory-card.tsx | 0 .../raw-capacity-card/raw-capacity-card.scss | 0 .../raw-capacity-card/raw-capacity-card.tsx | 0 .../status-card/status-card.tsx | 0 .../persistent-internal}/status-card/utils.ts | 0 .../storage-efficiency-card.tsx | 4 +- .../top-consumers-card-body.tsx | 0 .../top-consumers-card/utils.ts | 0 .../utilization-card/utilization-card.tsx | 0 .../utilization-card/utils.tsx | 0 .../ocs-disks-list.tsx | 6 +- .../ocs-kebab-options.tsx | 2 +- .../ocs-status-column.scss | 0 .../ocs-status-column.tsx | 0 .../state-reducer.ts | 0 .../src/components/kms-config/kms-config.tsx | 2 +- .../src/components/kms-config/utils.tsx | 2 +- ...ity-modal.scss => add-capacity-modal.scss} | 0 .../add-capacity-modal/add-capacity-modal.tsx | 2 +- .../advanced-kms-modal/advanced-kms-modal.tsx | 2 +- .../disk-replacement-modal.tsx | 9 +- .../attached-devices.scss | 0 .../create-sc/create-sc.tsx | 0 .../create-sc/state.ts | 0 .../wizard-pages/auto-detect-volume.tsx | 0 .../create-sc/wizard-pages/configure-step.tsx | 0 .../wizard-pages/create-local-volume-set.tsx | 0 .../create-sc/wizard-pages/disk-list.tsx | 0 .../create-sc/wizard-pages/donut-chart.tsx | 0 .../wizard-pages/review-and-create-step.tsx | 0 .../wizard-pages/storage-and-nodes-step.tsx | 0 .../install.tsx | 0 .../sc-node-list.tsx | 0 .../external-mode}/fileUpload.scss | 0 .../external-mode}/fileUpload.tsx | 0 .../external-mode}/install.scss | 0 .../external-mode}/install.tsx | 8 +- .../external-mode}/utils.spec.ts | 0 .../external-mode}/utils.ts | 2 +- .../components/ocs-install/install-page.tsx | 6 +- .../install-wizard/capacity-and-nodes.tsx | 2 +- .../ocs-install/install-wizard/configure.tsx | 2 +- .../ocs-install/pvs-available-capacity.tsx | 2 +- .../ceph-storage-plugin/src/plugin.ts | 36 +++--- .../ceph-storage-plugin/src/utils/install.ts | 2 +- .../data-resiliency-activity.tsx | 2 +- .../capacity-breakdown-card.tsx | 8 +- .../data-consumption-card-dropdown.tsx | 2 +- .../performance-graph.tsx | 2 +- .../components/status-card/status-card.tsx | 2 +- .../storage-efficiency-card.tsx | 4 +- 78 files changed, 138 insertions(+), 140 deletions(-) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/breakdown-card => dashboards/common/capacity-breakdown}/breakdown-body.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/breakdown-card => dashboards/common/capacity-breakdown}/breakdown-capacity.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/breakdown-card => dashboards/common/capacity-breakdown}/breakdown-card.scss (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/breakdown-card => dashboards/common/capacity-breakdown}/breakdown-chart.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/breakdown-card => dashboards/common/capacity-breakdown}/breakdown-dropdown.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/breakdown-card => dashboards/common/capacity-breakdown}/breakdown-loading.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/breakdown-card => dashboards/common/capacity-breakdown}/consts.ts (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/breakdown-card => dashboards/common/capacity-breakdown}/utils.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/activity-card => dashboards/common/data-resiliency}/data-resiliency-activity.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/storage-efficiency-card => dashboards/common/storage-efficiency}/storage-efficiency-card-item.tsx (96%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/storage-efficiency-card => dashboards/common/storage-efficiency}/storage-efficiency-card.scss (100%) rename frontend/packages/ceph-storage-plugin/src/components/{independent-dashboard-page => dashboards/persistent-external}/breakdown-card.tsx (87%) rename frontend/packages/ceph-storage-plugin/src/components/{independent-dashboard-page => dashboards/persistent-external}/details-card.tsx (97%) rename frontend/packages/ceph-storage-plugin/src/components/{independent-dashboard-page => dashboards/persistent-external}/status-card.tsx (92%) rename frontend/packages/ceph-storage-plugin/src/components/{independent-dashboard-page => dashboards/persistent-external}/utilization-card.tsx (98%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/activity-card/activity-card.scss (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/activity-card/activity-card.tsx (97%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/activity-card/cluster-expand-activity.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/activity-card/ocs-upgrade-activity.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/capacity-breakdown => dashboards/persistent-internal/capacity-breakdown-card}/capacity-breakdown-card.scss (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard/capacity-breakdown => dashboards/persistent-internal/capacity-breakdown-card}/capacity-breakdown-card.tsx (94%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/details-card.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/inventory-card.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/raw-capacity-card/raw-capacity-card.scss (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/raw-capacity-card/raw-capacity-card.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/status-card/status-card.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/status-card/utils.ts (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/storage-efficiency-card/storage-efficiency-card.tsx (97%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/top-consumers-card/top-consumers-card-body.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/top-consumers-card/utils.ts (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/utilization-card/utilization-card.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{dashboard-page/storage-dashboard => dashboards/persistent-internal}/utilization-card/utils.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{attached-devices-mode/lso-disk-inventory => disk-inventory}/ocs-disks-list.tsx (98%) rename frontend/packages/ceph-storage-plugin/src/components/{attached-devices-mode/lso-disk-inventory => disk-inventory}/ocs-kebab-options.tsx (94%) rename frontend/packages/ceph-storage-plugin/src/components/{attached-devices-mode/lso-disk-inventory => disk-inventory}/ocs-status-column.scss (100%) rename frontend/packages/ceph-storage-plugin/src/components/{attached-devices-mode/lso-disk-inventory => disk-inventory}/ocs-status-column.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{attached-devices-mode/lso-disk-inventory => disk-inventory}/state-reducer.ts (100%) rename frontend/packages/ceph-storage-plugin/src/components/modals/add-capacity-modal/{_add-capacity-modal.scss => add-capacity-modal.scss} (100%) rename frontend/packages/ceph-storage-plugin/src/components/{attached-devices-mode/lso-disk-inventory => modals}/disk-replacement-modal.tsx (96%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/attached-devices.scss (100%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/create-sc/create-sc.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/create-sc/state.ts (100%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/create-sc/wizard-pages/auto-detect-volume.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/create-sc/wizard-pages/configure-step.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/create-sc/wizard-pages/create-local-volume-set.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/create-sc/wizard-pages/disk-list.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/create-sc/wizard-pages/donut-chart.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/create-sc/wizard-pages/review-and-create-step.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/create-sc/wizard-pages/storage-and-nodes-step.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/install.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/ocs-install/{attached-devices => attached-devices-mode}/sc-node-list.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{independent-mode => ocs-install/external-mode}/fileUpload.scss (100%) rename frontend/packages/ceph-storage-plugin/src/components/{independent-mode => ocs-install/external-mode}/fileUpload.tsx (100%) rename frontend/packages/ceph-storage-plugin/src/components/{independent-mode => ocs-install/external-mode}/install.scss (100%) rename frontend/packages/ceph-storage-plugin/src/components/{independent-mode => ocs-install/external-mode}/install.tsx (97%) rename frontend/packages/ceph-storage-plugin/src/components/{independent-mode => ocs-install/external-mode}/utils.spec.ts (100%) rename frontend/packages/ceph-storage-plugin/src/components/{independent-mode => ocs-install/external-mode}/utils.ts (98%) diff --git a/frontend/packages/ceph-storage-plugin/locales/en/ceph-storage-plugin.json b/frontend/packages/ceph-storage-plugin/locales/en/ceph-storage-plugin.json index 796aff05308..007411de37d 100644 --- a/frontend/packages/ceph-storage-plugin/locales/en/ceph-storage-plugin.json +++ b/frontend/packages/ceph-storage-plugin/locales/en/ceph-storage-plugin.json @@ -1,62 +1,40 @@ { - "replacement disallowed: disk {{diskName}} is {{replacementStatus}}": "replacement disallowed: disk {{diskName}} is {{replacementStatus}}", - "Disk Replacement": "Disk Replacement", - "This action will start preparing the disk for replacement.": "This action will start preparing the disk for replacement.", - "Data rebalancing is in progress": "Data rebalancing is in progress", - "See data resiliency status": "See data resiliency status", - "Are you sure you want to replace <1>{{diskName}} ?": "Are you sure you want to replace <1>{{diskName}} ?", - "Replace": "Replace", - "Name": "Name", - "Disk State": "Disk State", - "OCS Status": "OCS Status", - "Type": "Type", - "Model": "Model", - "Capacity": "Capacity", - "Filesystem": "Filesystem", - "Disks List": "Disks List", - "Start Disk Replacement": "Start Disk Replacement", - "<0>{{diskName}} can be replaced with a disk of same type.": "<0>{{diskName}} can be replaced with a disk of same type.", - "Troubleshoot disk <1>{{diskName}}": "Troubleshoot disk <1>{{diskName}}", - "here": "here", - "Online": "Online", - "Offline": "Offline", - "NotResponding": "NotResponding", - "PreparingToReplace": "PreparingToReplace", - "ReplacementFailed": "ReplacementFailed", - "ReplacementReady": "ReplacementReady", - "Unknown": "Unknown", - "Activity": "Activity", - "Expanding OCS Cluster": "Expanding OCS Cluster", - "Rebuilding data resiliency": "Rebuilding data resiliency", - "{{formattedProgress, number}}%": "{{formattedProgress, number}}%", - "Upgrading OCS Operator": "Upgrading OCS Operator", "Not enough usage data": "Not enough usage data", "used": "used", "available": "available", "Other": "Other", "All other capacity usage that are not a part of the top 5 consumers.": "All other capacity usage that are not a part of the top 5 consumers.", "Available": "Available", + "Rebuilding data resiliency": "Rebuilding data resiliency", + "{{formattedProgress, number}}%": "{{formattedProgress, number}}%", "Projects": "Projects", "Storage Classes": "Storage Classes", "Pods": "Pods", - "Used Capacity Breakdown": "Used Capacity Breakdown", - "This card shows the used capacity for Usable storage, broken-down by different kubernetes resources. Usable storage is all the data that can be stored in the system after decreasing the replication policies.": "This card shows the used capacity for Usable storage, broken-down by different kubernetes resources. Usable storage is all the data that can be stored in the system after decreasing the replication policies.", + "Capacity breakdown": "Capacity breakdown", "{{metricType}}": "{{metricType}}", - "Break By Dropdown": "Break By Dropdown", "Details": "Details", "Service Name": "Service Name", "Cluster Name": "Cluster Name", "Provider": "Provider", "Mode": "Mode", "Version": "Version", + "Status": "Status", + "OCS Cluster": "OCS Cluster", + "Utilization": "Utilization", + "Used Capacity": "Used Capacity", + "Requested capacity": "Requested capacity", + "Activity": "Activity", + "Expanding OCS Cluster": "Expanding OCS Cluster", + "Upgrading OCS Operator": "Upgrading OCS Operator", + "Used Capacity Breakdown": "Used Capacity Breakdown", + "This card shows the used capacity for Usable storage, broken-down by different kubernetes resources. Usable storage is all the data that can be stored in the system after decreasing the replication policies.": "This card shows the used capacity for Usable storage, broken-down by different kubernetes resources. Usable storage is all the data that can be stored in the system after decreasing the replication policies.", + "Break By Dropdown": "Break By Dropdown", "Inventory": "Inventory", "Raw Capacity": "Raw Capacity", "Used": "Used", "Available versus Used Capacity": "Available versus Used Capacity", "Used of {{capacity}}": "Used of {{capacity}}", "Not Available": "Not Available", - "Status": "Status", - "OCS Cluster": "OCS Cluster", "Data Resiliency": "Data Resiliency", "Warning": "Warning", "Error": "Error", @@ -67,28 +45,29 @@ "Savings": "Savings", "The amount of physical storage saved after applying compression.": "The amount of physical storage saved after applying compression.", "Storage Efficiency": "Storage Efficiency", - "Used Capacity": "Used Capacity", - "Utilization": "Utilization", "IOPS": "IOPS", "Latency": "Latency", "Throughput": "Throughput", "Recovery": "Recovery", - "Capacity breakdown": "Capacity breakdown", - "Requested capacity": "Requested capacity", - "The uploaded file is not a valid JSON file": "The uploaded file is not a valid JSON file", - "Connect to external cluster": "Connect to external cluster", - "Download <1>{{SCRIPT_NAME}} script and run on the RHCS cluster, then upload the results(JSON) in the External cluster metadata field.": "Download <1>{{SCRIPT_NAME}} script and run on the RHCS cluster, then upload the results(JSON) in the External cluster metadata field.", - "Download Script": "Download Script", - "A bucket will be created to provide the OCS Service.": "A bucket will be created to provide the OCS Service.", - "Bucket created for OCS Service": "Bucket created for OCS Service", - "Create External Storage Cluster": "Create External Storage Cluster", - "External cluster metadata": "External cluster metadata", - "Upload JSON File": "Upload JSON File", - "Upload Credentials file": "Upload Credentials file", - "JSON data": "JSON data", - "Create Button": "Create Button", - "Create": "Create", - "Cancel": "Cancel", + "Name": "Name", + "Disk State": "Disk State", + "OCS Status": "OCS Status", + "Type": "Type", + "Model": "Model", + "Capacity": "Capacity", + "Filesystem": "Filesystem", + "Disks List": "Disks List", + "Start Disk Replacement": "Start Disk Replacement", + "<0>{{diskName}} can be replaced with a disk of same type.": "<0>{{diskName}} can be replaced with a disk of same type.", + "Troubleshoot disk <1>{{diskName}}": "Troubleshoot disk <1>{{diskName}}", + "here": "here", + "Online": "Online", + "Offline": "Offline", + "NotResponding": "NotResponding", + "PreparingToReplace": "PreparingToReplace", + "ReplacementFailed": "ReplacementFailed", + "ReplacementReady": "ReplacementReady", + "Unknown": "Unknown", "This is a required field": "This is a required field", "Please enter a URL": "Please enter a URL", "Please enter a valid port": "Please enter a valid port", @@ -123,6 +102,13 @@ "Client Certificate": "Client Certificate", "Client Private Key": "Client Private Key", "Save": "Save", + "replacement disallowed: disk {{diskName}} is {{replacementStatus}}": "replacement disallowed: disk {{diskName}} is {{replacementStatus}}", + "Disk Replacement": "Disk Replacement", + "This action will start preparing the disk for replacement.": "This action will start preparing the disk for replacement.", + "Data rebalancing is in progress": "Data rebalancing is in progress", + "See data resiliency status": "See data resiliency status", + "Are you sure you want to replace <1>{{diskName}} ?": "Are you sure you want to replace <1>{{diskName}} ?", + "Replace": "Replace", "{{replica}} Replication": "{{replica}} Replication", "A Storage pool is a logical entity providing elastic capacity to applications and workloads. Pools provide a means of supporting policies for access data resilience and storage efficiency.": "A Storage pool is a logical entity providing elastic capacity to applications and workloads. Pools provide a means of supporting policies for access data resilience and storage efficiency.", "Create New Storage Pool": "Create New Storage Pool", @@ -136,6 +122,7 @@ "Compression": "Compression", "Enable Compression": "Enable Compression", "Enabling compression may result in little or no space savings for encrypted or random data. Also, enabling compression may have an impact on I/O performance.": "Enabling compression may result in little or no space savings for encrypted or random data. Also, enabling compression may have an impact on I/O performance.", + "Create": "Create", "Discover Disks": "Discover Disks", "Create Storage Class": "Create Storage Class", "Storage and Nodes": "Storage and Nodes", @@ -143,6 +130,7 @@ "Review and Create": "Review and Create", "Next": "Next", "Back": "Back", + "Cancel": "Cancel", "Missing storage class": "Missing storage class", "The storage cluster needs to use a storage class to consume the local storage. In order to create one you need to discover the available disks and create a storage class using the filters to select the disks you wish to use": "The storage cluster needs to use a storage class to consume the local storage. In order to create one you need to discover the available disks and create a storage class using the filters to select the disks you wish to use", "Can be used on any platform. It means that OCS uses attached disks, via Local Storage Operator. In this case, the infrastructure storage class is actually provided by LSO, on top of attached drives.": "Can be used on any platform. It means that OCS uses attached disks, via Local Storage Operator. In this case, the infrastructure storage class is actually provided by LSO, on top of attached drives.", @@ -188,7 +176,19 @@ "Storage Cluster exists": "Storage Cluster exists", "Back to operator page": "Back to operator page", "Go to cluster page": "Go to cluster page", - "clusterExistText": "A storage cluster <1>{{clusterName}} already exists.<3>You cannot create another storage cluster.", + "clusterExistText": "A storage cluster <1>{{clusterName}} is already created.<3>You cannot create another storage cluster.", + "The uploaded file is not a valid JSON file": "The uploaded file is not a valid JSON file", + "Connect to external cluster": "Connect to external cluster", + "Download <1>{{SCRIPT_NAME}} script and run on the RHCS cluster, then upload the results(JSON) in the External cluster metadata field.": "Download <1>{{SCRIPT_NAME}} script and run on the RHCS cluster, then upload the results(JSON) in the External cluster metadata field.", + "Download Script": "Download Script", + "A bucket will be created to provide the OCS Service.": "A bucket will be created to provide the OCS Service.", + "Bucket created for OCS Service": "Bucket created for OCS Service", + "Create External Storage Cluster": "Create External Storage Cluster", + "External cluster metadata": "External cluster metadata", + "Upload JSON File": "Upload JSON File", + "Upload Credentials file": "Upload Credentials file", + "JSON data": "JSON data", + "Create Button": "Create Button", "Create Storage Cluster": "Create Storage Cluster", "OCS runs as a cloud-native service for optimal integration with applications in need of storage and handles the scenes such as provisioning and management.": "OCS runs as a cloud-native service for optimal integration with applications in need of storage and handles the scenes such as provisioning and management.", "The selected nodes will be labeled with <1>{{label}} (unless they are already labeled). {{replica}} of the selected nodes will be used for initial deployment. The remaining nodes will be used by OpenShift as scheduling targets for OCS scaling.": "The selected nodes will be labeled with <1>{{label}} (unless they are already labeled). {{replica}} of the selected nodes will be used for initial deployment. The remaining nodes will be used by OpenShift as scheduling targets for OCS scaling.", diff --git a/frontend/packages/ceph-storage-plugin/src/__tests__/breakdown-body.spec.tsx b/frontend/packages/ceph-storage-plugin/src/__tests__/breakdown-body.spec.tsx index a53c69c616c..e4cd9bd98e7 100644 --- a/frontend/packages/ceph-storage-plugin/src/__tests__/breakdown-body.spec.tsx +++ b/frontend/packages/ceph-storage-plugin/src/__tests__/breakdown-body.spec.tsx @@ -3,12 +3,12 @@ import { ShallowWrapper, shallow } from 'enzyme'; import { BreakdownBodyProps, BreakdownCardBody, -} from '../components/dashboard-page/storage-dashboard/breakdown-card/breakdown-body'; -import { getStackChartStats } from '../components/dashboard-page/storage-dashboard/breakdown-card/utils'; +} from '../components/dashboards/common/capacity-breakdown/breakdown-body'; +import { getStackChartStats } from '../components/dashboards/common/capacity-breakdown/utils'; import { breakdownData } from '../__mocks__/breakdown-data'; -import { BreakdownChart } from '../components/dashboard-page/storage-dashboard/breakdown-card/breakdown-chart'; -import { TotalCapacityBody } from '../components/dashboard-page/storage-dashboard/breakdown-card/breakdown-capacity'; -import { BreakdownChartLoading } from '../components/dashboard-page/storage-dashboard/breakdown-card/breakdown-loading'; +import { BreakdownChart } from '../components/dashboards/common/capacity-breakdown/breakdown-chart'; +import { TotalCapacityBody } from '../components/dashboards/common/capacity-breakdown/breakdown-capacity'; +import { BreakdownChartLoading } from '../components/dashboards/common/capacity-breakdown/breakdown-loading'; const top5MetricsStats = getStackChartStats(breakdownData.top5, breakdownData.humanize); diff --git a/frontend/packages/ceph-storage-plugin/src/__tests__/breakdown-chart.spec.tsx b/frontend/packages/ceph-storage-plugin/src/__tests__/breakdown-chart.spec.tsx index 34e9211c164..8083260675b 100644 --- a/frontend/packages/ceph-storage-plugin/src/__tests__/breakdown-chart.spec.tsx +++ b/frontend/packages/ceph-storage-plugin/src/__tests__/breakdown-chart.spec.tsx @@ -4,14 +4,14 @@ import { addAvailable, getStackChartStats, getLegends, -} from '../components/dashboard-page/storage-dashboard/breakdown-card/utils'; +} from '../components/dashboards/common/capacity-breakdown/utils'; import { breakdownData } from '../__mocks__/breakdown-data'; import { BreakdownChart, BreakdownChartProps, LinkableLegend, LinkableLegendProps, -} from '../components/dashboard-page/storage-dashboard/breakdown-card/breakdown-chart'; +} from '../components/dashboards/common/capacity-breakdown/breakdown-chart'; import { Link } from 'react-router-dom'; import { Chart, ChartBar } from '@patternfly/react-charts'; import { Tooltip } from '@patternfly/react-core'; diff --git a/frontend/packages/ceph-storage-plugin/src/__tests__/independent-dashboard-breakdown-card.spec.tsx b/frontend/packages/ceph-storage-plugin/src/__tests__/independent-dashboard-breakdown-card.spec.tsx index ab43c8cab4e..12244bf31e2 100644 --- a/frontend/packages/ceph-storage-plugin/src/__tests__/independent-dashboard-breakdown-card.spec.tsx +++ b/frontend/packages/ceph-storage-plugin/src/__tests__/independent-dashboard-breakdown-card.spec.tsx @@ -6,10 +6,10 @@ import DashboardCardHeader from '@console/shared/src/components/dashboard/dashbo import DashboardCardBody from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardBody'; import DashboardCardTitle from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardTitle'; import { PROJECTS, STORAGE_CLASSES, PODS } from '../constants'; -import { BreakdownCard } from '../components/independent-dashboard-page/breakdown-card'; +import { BreakdownCard } from '../components/dashboards/persistent-external/breakdown-card'; import { dashboardData } from '../__mocks__/independent-mode-dashboard-data'; -import { BreakdownCardBody } from '../components/dashboard-page/storage-dashboard/breakdown-card/breakdown-body'; -import { getSelectOptions } from '../components/dashboard-page/storage-dashboard/breakdown-card/breakdown-dropdown'; +import { BreakdownCardBody } from '../components/dashboards/common/capacity-breakdown/breakdown-body'; +import { getSelectOptions } from '../components/dashboards/common/capacity-breakdown/breakdown-dropdown'; jest.mock('react-i18next', () => { const reactI18next = require.requireActual('react-i18next'); diff --git a/frontend/packages/ceph-storage-plugin/src/__tests__/independent-dashboard-details-card.spec.tsx b/frontend/packages/ceph-storage-plugin/src/__tests__/independent-dashboard-details-card.spec.tsx index 3705d68cdf5..4e1eb367a36 100644 --- a/frontend/packages/ceph-storage-plugin/src/__tests__/independent-dashboard-details-card.spec.tsx +++ b/frontend/packages/ceph-storage-plugin/src/__tests__/independent-dashboard-details-card.spec.tsx @@ -4,7 +4,7 @@ import { ShallowWrapper, shallow } from 'enzyme'; import { DashboardItemProps } from '@console/internal/components/dashboard/with-dashboard-resources'; import DashboardCardHeader from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardHeader'; import DashboardCardTitle from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardTitle'; -import { DetailsCard } from '../components/independent-dashboard-page/details-card'; +import { DetailsCard } from '../components/dashboards/persistent-external/details-card'; import { dashboardData } from '../__mocks__/independent-mode-dashboard-data'; jest.mock('react-i18next', () => { diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-body.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-body.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-body.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-body.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-capacity.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-capacity.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-capacity.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-capacity.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-card.scss b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-card.scss similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-card.scss rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-card.scss diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-chart.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-chart.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-chart.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-chart.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-dropdown.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-dropdown.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-dropdown.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-dropdown.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-loading.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-loading.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-loading.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-loading.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/consts.ts b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/consts.ts similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/consts.ts rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/consts.ts diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/utils.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/utils.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/utils.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/utils.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/data-resiliency-activity.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/data-resiliency/data-resiliency-activity.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/data-resiliency-activity.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/common/data-resiliency/data-resiliency-activity.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/storage-efficiency-card/storage-efficiency-card-item.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/storage-efficiency/storage-efficiency-card-item.tsx similarity index 96% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/storage-efficiency-card/storage-efficiency-card-item.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/common/storage-efficiency/storage-efficiency-card-item.tsx index cfae5a558ce..9acc88b2b99 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/storage-efficiency-card/storage-efficiency-card-item.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/storage-efficiency/storage-efficiency-card-item.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; import { useTranslation } from 'react-i18next'; import { FieldLevelHelp } from '@console/internal/components/utils'; +import './storage-efficiency-card.scss'; export const EfficiencyItemBody: React.FC = React.memo( ({ stats, title, infoText, isLoading, error, getStats }) => { diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/storage-efficiency-card/storage-efficiency-card.scss b/frontend/packages/ceph-storage-plugin/src/components/dashboards/common/storage-efficiency/storage-efficiency-card.scss similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/storage-efficiency-card/storage-efficiency-card.scss rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/common/storage-efficiency/storage-efficiency-card.scss diff --git a/frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/breakdown-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/breakdown-card.tsx similarity index 87% rename from frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/breakdown-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/breakdown-card.tsx index 8d2262bdfe2..9e5e1b974c4 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/breakdown-card.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/breakdown-card.tsx @@ -11,15 +11,12 @@ import DashboardCard from '@console/shared/src/components/dashboard/dashboard-ca import DashboardCardTitle from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardTitle'; import DashboardCardBody from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardBody'; import { getInstantVectorStats } from '@console/internal/components/graphs/utils'; -import { breakdownIndependentQueryMap } from '../../constants/queries'; -import { PROJECTS, STORAGE_CLASSES, PODS } from '../../constants'; -import { - sortInstantVectorStats, - getStackChartStats, -} from '../dashboard-page/storage-dashboard/breakdown-card/utils'; -import { BreakdownCardBody } from '../dashboard-page/storage-dashboard/breakdown-card/breakdown-body'; -import { getSelectOptions } from '../dashboard-page/storage-dashboard/breakdown-card/breakdown-dropdown'; -import '../dashboard-page/storage-dashboard/capacity-breakdown/capacity-breakdown-card.scss'; +import { breakdownIndependentQueryMap } from '../../../constants/queries'; +import { PROJECTS, STORAGE_CLASSES, PODS } from '../../../constants'; +import { sortInstantVectorStats, getStackChartStats } from '../common/capacity-breakdown/utils'; +import { BreakdownCardBody } from '../common/capacity-breakdown/breakdown-body'; +import { getSelectOptions } from '../common/capacity-breakdown/breakdown-dropdown'; +import '../persistent-internal/capacity-breakdown-card/capacity-breakdown-card.scss'; export const BreakdownCard: React.FC = ({ watchPrometheus, diff --git a/frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/details-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/details-card.tsx similarity index 97% rename from frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/details-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/details-card.tsx index 3e7260f21fc..667cad65276 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/details-card.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/details-card.tsx @@ -15,8 +15,8 @@ import DashboardCardBody from '@console/shared/src/components/dashboard/dashboar import DashboardCardHeader from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardHeader'; import { useK8sGet } from '@console/internal/components/utils/k8s-get-hook'; import { InfrastructureModel } from '@console/internal/models'; -import { getOCSVersion } from '../../selectors'; -import { OCSServiceModel } from '../../models'; +import { getOCSVersion } from '../../../selectors'; +import { OCSServiceModel } from '../../../models'; const k8sResources: FirehoseResource[] = [ { diff --git a/frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/status-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/status-card.tsx similarity index 92% rename from frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/status-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/status-card.tsx index 7fa394f31b8..4281aa507f6 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/status-card.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/status-card.tsx @@ -10,8 +10,8 @@ import HealthItem from '@console/shared/src/components/dashboard/status-card/Hea import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook'; import { K8sResourceKind } from '@console/internal/module/k8s'; import { DashboardItemProps } from '@console/internal/components/dashboard/with-dashboard-resources'; -import { getCephHealthState } from '../dashboard-page/storage-dashboard/status-card/utils'; -import { cephClusterResource } from '../../constants/resources'; +import { getCephHealthState } from '../persistent-internal/status-card/utils'; +import { cephClusterResource } from '../../../constants/resources'; export const StatusCard: React.FC = () => { const { t } = useTranslation(); diff --git a/frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/utilization-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/utilization-card.tsx similarity index 98% rename from frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/utilization-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/utilization-card.tsx index b4be876cc78..f1ca9c4c8be 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/independent-dashboard-page/utilization-card.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-external/utilization-card.tsx @@ -12,7 +12,7 @@ import { Duration, } from '@console/shared/src/components/dashboard/duration-hook'; import { PrometheusUtilizationItem } from '@console/internal/components/dashboard/dashboards-page/cluster-dashboard/utilization-card'; -import { StorageDashboardQuery, INDEPENDENT_UTILIZATION_QUERIES } from '../../constants/queries'; +import { StorageDashboardQuery, INDEPENDENT_UTILIZATION_QUERIES } from '../../../constants/queries'; export const UtilizationCard: React.FC = () => { const { t } = useTranslation(); diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/activity-card.scss b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/activity-card/activity-card.scss similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/activity-card.scss rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/activity-card/activity-card.scss diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/activity-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/activity-card/activity-card.tsx similarity index 97% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/activity-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/activity-card/activity-card.tsx index 132145b4c70..47dba6fb35b 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/activity-card.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/activity-card/activity-card.tsx @@ -114,7 +114,10 @@ const OngoingActivity = withDashboardResources( if (getResiliencyProgress(progressResponse) < 1) { prometheusActivities.push({ results: progressResponse, - loader: () => import('./data-resiliency-activity').then((m) => m.DataResiliency), + loader: () => + import('../../common/data-resiliency/data-resiliency-activity').then( + (m) => m.DataResiliency, + ), }); } diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/cluster-expand-activity.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/activity-card/cluster-expand-activity.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/cluster-expand-activity.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/activity-card/cluster-expand-activity.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/ocs-upgrade-activity.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/activity-card/ocs-upgrade-activity.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/ocs-upgrade-activity.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/activity-card/ocs-upgrade-activity.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/capacity-breakdown/capacity-breakdown-card.scss b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/capacity-breakdown-card/capacity-breakdown-card.scss similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/capacity-breakdown/capacity-breakdown-card.scss rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/capacity-breakdown-card/capacity-breakdown-card.scss diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/capacity-breakdown/capacity-breakdown-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/capacity-breakdown-card/capacity-breakdown-card.tsx similarity index 94% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/capacity-breakdown/capacity-breakdown-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/capacity-breakdown-card/capacity-breakdown-card.tsx index d8d21fef28e..706b33ad628 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/capacity-breakdown/capacity-breakdown-card.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/capacity-breakdown-card/capacity-breakdown-card.tsx @@ -14,9 +14,9 @@ import DashboardCardBody from '@console/shared/src/components/dashboard/dashboar import { getInstantVectorStats } from '@console/internal/components/graphs/utils'; import { breakdownQueryMap } from '../../../../constants/queries'; import { PODS, PROJECTS, STORAGE_CLASSES } from '../../../../constants/index'; -import { BreakdownCardBody } from '../breakdown-card/breakdown-body'; -import { getStackChartStats, sortInstantVectorStats } from '../breakdown-card/utils'; -import { getSelectOptions } from '../breakdown-card/breakdown-dropdown'; +import { BreakdownCardBody } from '../../common/capacity-breakdown/breakdown-body'; +import { getStackChartStats, sortInstantVectorStats } from '../../common/capacity-breakdown/utils'; +import { getSelectOptions } from '../../common/capacity-breakdown/breakdown-dropdown'; import './capacity-breakdown-card.scss'; const BreakdownCard: React.FC = ({ diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/details-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/details-card.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/details-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/details-card.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/inventory-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/inventory-card.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/inventory-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/inventory-card.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/raw-capacity-card/raw-capacity-card.scss b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/raw-capacity-card/raw-capacity-card.scss similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/raw-capacity-card/raw-capacity-card.scss rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/raw-capacity-card/raw-capacity-card.scss diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/raw-capacity-card/raw-capacity-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/raw-capacity-card/raw-capacity-card.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/raw-capacity-card/raw-capacity-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/raw-capacity-card/raw-capacity-card.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/status-card/status-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/status-card/status-card.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/status-card/status-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/status-card/status-card.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/status-card/utils.ts b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/status-card/utils.ts similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/status-card/utils.ts rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/status-card/utils.ts diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/storage-efficiency-card/storage-efficiency-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/storage-efficiency-card/storage-efficiency-card.tsx similarity index 97% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/storage-efficiency-card/storage-efficiency-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/storage-efficiency-card/storage-efficiency-card.tsx index d99360b3bac..8974baf9f95 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/storage-efficiency-card/storage-efficiency-card.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/storage-efficiency-card/storage-efficiency-card.tsx @@ -14,12 +14,10 @@ import { POOL_STORAGE_EFFICIENCY_QUERIES, StorageDashboardQuery, } from '../../../../constants/queries'; -import { EfficiencyItemBody } from './storage-efficiency-card-item'; +import { EfficiencyItemBody } from '../../common/storage-efficiency/storage-efficiency-card-item'; import { getGaugeValue } from '../../../../utils'; import { humanizeBinaryBytes } from '@console/internal/components/utils'; -import './storage-efficiency-card.scss'; - const StorageEfficiencyCard: React.FC = ({ watchPrometheus, stopWatchPrometheusQuery, diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/top-consumers-card/top-consumers-card-body.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/top-consumers-card/top-consumers-card-body.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/top-consumers-card/top-consumers-card-body.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/top-consumers-card/top-consumers-card-body.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/top-consumers-card/utils.ts b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/top-consumers-card/utils.ts similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/top-consumers-card/utils.ts rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/top-consumers-card/utils.ts diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/utilization-card/utilization-card.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/utilization-card/utilization-card.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/utilization-card/utilization-card.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/utilization-card/utilization-card.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/utilization-card/utils.tsx b/frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/utilization-card/utils.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/utilization-card/utils.tsx rename to frontend/packages/ceph-storage-plugin/src/components/dashboards/persistent-internal/utilization-card/utils.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-disks-list.tsx b/frontend/packages/ceph-storage-plugin/src/components/disk-inventory/ocs-disks-list.tsx similarity index 98% rename from frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-disks-list.tsx rename to frontend/packages/ceph-storage-plugin/src/components/disk-inventory/ocs-disks-list.tsx index d758ebcebf0..5060016bf8e 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-disks-list.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/disk-inventory/ocs-disks-list.tsx @@ -36,11 +36,7 @@ import { NodesDisksListPage, NodesDisksListPageProps, } from '@console/local-storage-operator-plugin/src/components/disks-list/disks-list-page'; -import { - CEPH_STORAGE_NAMESPACE, - OSD_DOWN_ALERT, - OSD_DOWN_AND_OUT_ALERT, -} from '../../../constants/index'; +import { CEPH_STORAGE_NAMESPACE, OSD_DOWN_ALERT, OSD_DOWN_AND_OUT_ALERT } from '../../constants'; import { OCSKebabOptions } from './ocs-kebab-options'; import { OCSStatus } from './ocs-status-column'; import { diff --git a/frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-kebab-options.tsx b/frontend/packages/ceph-storage-plugin/src/components/disk-inventory/ocs-kebab-options.tsx similarity index 94% rename from frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-kebab-options.tsx rename to frontend/packages/ceph-storage-plugin/src/components/disk-inventory/ocs-kebab-options.tsx index c9c6500375e..53b1f8aed29 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-kebab-options.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/disk-inventory/ocs-kebab-options.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { useTranslation } from 'react-i18next'; import { TableData } from '@console/internal/components/factory'; import { KebabOption, Kebab } from '@console/internal/components/utils'; -import { diskReplacementModal } from './disk-replacement-modal'; +import { diskReplacementModal } from '../modals/disk-replacement-modal'; import { OCSDiskList, OCSColumnStateAction } from './state-reducer'; export const OCSKebabOptions: React.FC = React.memo( diff --git a/frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-status-column.scss b/frontend/packages/ceph-storage-plugin/src/components/disk-inventory/ocs-status-column.scss similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-status-column.scss rename to frontend/packages/ceph-storage-plugin/src/components/disk-inventory/ocs-status-column.scss diff --git a/frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-status-column.tsx b/frontend/packages/ceph-storage-plugin/src/components/disk-inventory/ocs-status-column.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/ocs-status-column.tsx rename to frontend/packages/ceph-storage-plugin/src/components/disk-inventory/ocs-status-column.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/state-reducer.ts b/frontend/packages/ceph-storage-plugin/src/components/disk-inventory/state-reducer.ts similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/state-reducer.ts rename to frontend/packages/ceph-storage-plugin/src/components/disk-inventory/state-reducer.ts diff --git a/frontend/packages/ceph-storage-plugin/src/components/kms-config/kms-config.tsx b/frontend/packages/ceph-storage-plugin/src/components/kms-config/kms-config.tsx index 0c4fdaf43e8..e8174a5fddc 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/kms-config/kms-config.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/kms-config/kms-config.tsx @@ -22,7 +22,7 @@ import { } from '../ocs-install/internal-mode/reducer'; import { KMSProviders } from '../../constants'; import { KMSConfig } from '../../types'; -import { State, Action } from '../ocs-install/attached-devices/create-sc/state'; +import { State, Action } from '../ocs-install/attached-devices-mode/create-sc/state'; import { setEncryptionDispatch, parseURL } from './utils'; import { StorageClassState, StorageClassClusterAction } from '../../utils/storage-pool'; diff --git a/frontend/packages/ceph-storage-plugin/src/components/kms-config/utils.tsx b/frontend/packages/ceph-storage-plugin/src/components/kms-config/utils.tsx index a56a8a6489e..00975741129 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/kms-config/utils.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/kms-config/utils.tsx @@ -10,7 +10,7 @@ import { KMSSecretName, KMSConfigMapCSIName, } from '../../constants'; -import { Action } from '../ocs-install/attached-devices/create-sc/state'; +import { Action } from '../ocs-install/attached-devices-mode/create-sc/state'; import { InternalClusterAction } from '../ocs-install/internal-mode/reducer'; import { KMSConfig, KMSConfigMap } from '../../types'; import { StorageClassClusterAction } from '../../utils/storage-pool'; diff --git a/frontend/packages/ceph-storage-plugin/src/components/modals/add-capacity-modal/_add-capacity-modal.scss b/frontend/packages/ceph-storage-plugin/src/components/modals/add-capacity-modal/add-capacity-modal.scss similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/modals/add-capacity-modal/_add-capacity-modal.scss rename to frontend/packages/ceph-storage-plugin/src/components/modals/add-capacity-modal/add-capacity-modal.scss diff --git a/frontend/packages/ceph-storage-plugin/src/components/modals/add-capacity-modal/add-capacity-modal.tsx b/frontend/packages/ceph-storage-plugin/src/components/modals/add-capacity-modal/add-capacity-modal.tsx index ec8c17e966e..88b84bc5192 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/modals/add-capacity-modal/add-capacity-modal.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/modals/add-capacity-modal/add-capacity-modal.tsx @@ -27,7 +27,7 @@ import { PVsAvailableCapacity } from '../../ocs-install/pvs-available-capacity'; import { createDeviceSet } from '../../ocs-install/ocs-request-data'; import { cephCapacityResource } from '../../../constants/resources'; import { DeviceSet } from '../../../types'; -import './_add-capacity-modal.scss'; +import './add-capacity-modal.scss'; import { checkArbiterCluster, checkFlexibleScaling } from '../../../utils/common'; const getProvisionedCapacity = (value: number) => (value % 1 ? (value * 3).toFixed(2) : value * 3); diff --git a/frontend/packages/ceph-storage-plugin/src/components/modals/advanced-kms-modal/advanced-kms-modal.tsx b/frontend/packages/ceph-storage-plugin/src/components/modals/advanced-kms-modal/advanced-kms-modal.tsx index 4a756ad2092..eca21839fee 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/modals/advanced-kms-modal/advanced-kms-modal.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/modals/advanced-kms-modal/advanced-kms-modal.tsx @@ -15,7 +15,7 @@ import { withHandlePromise, } from '@console/internal/components/utils/promise-component'; -import { State, Action } from '../../ocs-install/attached-devices/create-sc/state'; +import { State, Action } from '../../ocs-install/attached-devices-mode/create-sc/state'; import { InternalClusterState, InternalClusterAction, diff --git a/frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/disk-replacement-modal.tsx b/frontend/packages/ceph-storage-plugin/src/components/modals/disk-replacement-modal.tsx similarity index 96% rename from frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/disk-replacement-modal.tsx rename to frontend/packages/ceph-storage-plugin/src/components/modals/disk-replacement-modal.tsx index 421834908a6..5b1817cda46 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/attached-devices-mode/lso-disk-inventory/disk-replacement-modal.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/modals/disk-replacement-modal.tsx @@ -18,8 +18,13 @@ import { SecretKind, } from '@console/internal/module/k8s'; import { TemplateModel, TemplateInstanceModel, SecretModel } from '@console/internal/models'; -import { CEPH_STORAGE_NAMESPACE, OSD_REMOVAL_TEMPLATE, DASHBOARD_LINK } from '../../../constants'; -import { OCSDiskList, OCSColumnStateAction, ActionType, Status } from './state-reducer'; +import { CEPH_STORAGE_NAMESPACE, OSD_REMOVAL_TEMPLATE, DASHBOARD_LINK } from '../../constants'; +import { + OCSDiskList, + OCSColumnStateAction, + ActionType, + Status, +} from '../disk-inventory/state-reducer'; const createTemplateSecret = async (template: TemplateKind, osdId: string) => { const parametersSecret: SecretKind = { diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/attached-devices.scss b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/attached-devices.scss similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/attached-devices.scss rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/attached-devices.scss diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/create-sc.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/create-sc.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/create-sc.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/create-sc.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/state.ts b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/state.ts similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/state.ts rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/state.ts diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/auto-detect-volume.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/auto-detect-volume.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/auto-detect-volume.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/auto-detect-volume.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/configure-step.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/configure-step.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/configure-step.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/configure-step.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/create-local-volume-set.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/create-local-volume-set.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/create-local-volume-set.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/create-local-volume-set.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/disk-list.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/disk-list.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/disk-list.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/disk-list.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/donut-chart.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/donut-chart.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/donut-chart.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/donut-chart.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/review-and-create-step.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/review-and-create-step.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/review-and-create-step.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/review-and-create-step.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/storage-and-nodes-step.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/storage-and-nodes-step.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/create-sc/wizard-pages/storage-and-nodes-step.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/create-sc/wizard-pages/storage-and-nodes-step.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/install.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/install.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/install.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/install.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/sc-node-list.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/sc-node-list.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices/sc-node-list.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/attached-devices-mode/sc-node-list.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/independent-mode/fileUpload.scss b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/fileUpload.scss similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/independent-mode/fileUpload.scss rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/fileUpload.scss diff --git a/frontend/packages/ceph-storage-plugin/src/components/independent-mode/fileUpload.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/fileUpload.tsx similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/independent-mode/fileUpload.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/fileUpload.tsx diff --git a/frontend/packages/ceph-storage-plugin/src/components/independent-mode/install.scss b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/install.scss similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/independent-mode/install.scss rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/install.scss diff --git a/frontend/packages/ceph-storage-plugin/src/components/independent-mode/install.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/install.tsx similarity index 97% rename from frontend/packages/ceph-storage-plugin/src/components/independent-mode/install.tsx rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/install.tsx index de38ad31167..48fd38d2221 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/independent-mode/install.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/install.tsx @@ -34,12 +34,12 @@ import { history } from '@console/internal/components/utils/router'; import { SecretModel, PodModel } from '@console/internal/models'; import { setFlag } from '@console/internal/actions/features'; import { getName } from '@console/shared'; -import { OCSServiceModel } from '../../models'; +import { OCSServiceModel } from '../../../models'; import FileUpload from './fileUpload'; import { isValidJSON, checkError, prettifyJSON, getIPFamily } from './utils'; -import { OCS_INDEPENDENT_FLAG, OCS_FLAG, OCS_CONVERGED_FLAG } from '../../features'; -import { OCS_EXTERNAL_CR_NAME, IP_FAMILY } from '../../constants'; -import { labelOCSNamespace } from '../ocs-install/ocs-request-data'; +import { OCS_INDEPENDENT_FLAG, OCS_FLAG, OCS_CONVERGED_FLAG } from '../../../features'; +import { OCS_EXTERNAL_CR_NAME, IP_FAMILY } from '../../../constants'; +import { labelOCSNamespace } from '../ocs-request-data'; import './install.scss'; const CreateExternalCluster = withHandlePromise((props: CreateExternalClusterProps) => { diff --git a/frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.spec.ts b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/utils.spec.ts similarity index 100% rename from frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.spec.ts rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/utils.spec.ts diff --git a/frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.ts b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/utils.ts similarity index 98% rename from frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.ts rename to frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/utils.ts index afc6442e917..4f3bc408c5c 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/independent-mode/utils.ts +++ b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/external-mode/utils.ts @@ -4,7 +4,7 @@ import { HealthState } from '@console/shared/src/components/dashboard/status-car import { K8sResourceKind } from '@console/internal/module/k8s'; import { ClusterServiceVersionKind } from '@console/operator-lifecycle-manager'; import { getAnnotations } from '@console/shared'; -import { IP_FAMILY } from '../../constants'; +import { IP_FAMILY } from '../../../constants'; const pluralize = (count: number, singular: string, plural: string = `${singular}s`): string => count > 1 ? plural : singular; diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-page.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-page.tsx index 5246c120750..31417ee534c 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-page.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-page.tsx @@ -13,11 +13,11 @@ import { ClusterServiceVersionModel, ClusterServiceVersionKind, } from '@console/operator-lifecycle-manager'; -import { getRequiredKeys, createDownloadFile } from '../independent-mode/utils'; -import CreateExternalCluster from '../independent-mode/install'; +import { getRequiredKeys, createDownloadFile } from './external-mode/utils'; +import CreateExternalCluster from './external-mode/install'; import { CreateInternalCluster } from './internal-mode/install-wizard'; import { CEPH_STORAGE_NAMESPACE, MODES } from '../../constants'; -import { CreateAttachedDevicesCluster } from './attached-devices/install'; +import { CreateAttachedDevicesCluster } from './attached-devices-mode/install'; import { StorageClusterKind } from '../../types'; import { OCSServiceModel } from '../../models'; import ExistingClusterModal from './existing-cluster-modal'; diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-wizard/capacity-and-nodes.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-wizard/capacity-and-nodes.tsx index 5db7992230d..2efdf7b08e5 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-wizard/capacity-and-nodes.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-wizard/capacity-and-nodes.tsx @@ -17,7 +17,7 @@ import { humanizeBinaryBytes, Dropdown } from '@console/internal/components/util import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook'; import { StorageClassResourceKind, NodeKind, K8sResourceKind } from '@console/internal/module/k8s'; import { useDeepCompareMemoize } from '@console/shared'; -import { State, Action } from '../attached-devices/create-sc/state'; +import { State, Action } from '../attached-devices-mode/create-sc/state'; import { scResource } from '../../../constants/resources'; import { arbiterText } from '../../../constants'; import { getZone, isArbiterSC } from '../../../utils/install'; diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-wizard/configure.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-wizard/configure.tsx index 97dec619c9f..2bd95689465 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-wizard/configure.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/install-wizard/configure.tsx @@ -7,7 +7,7 @@ import { NetworkAttachmentDefinitionKind } from '@console/network-attachment-def import { NetworkAttachmentDefinitionModel } from '@console/network-attachment-definition-plugin'; import { referenceForModel } from '@console/internal/module/k8s'; import { InternalClusterState, InternalClusterAction, ActionType } from '../internal-mode/reducer'; -import { State, Action } from '../attached-devices/create-sc/state'; +import { State, Action } from '../attached-devices-mode/create-sc/state'; import { KMSConfigure } from '../../kms-config/kms-config'; import { NetworkType } from '../../../types'; import { ValidationMessage, ValidationType } from '../../../utils/common-ocs-install-el'; diff --git a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/pvs-available-capacity.tsx b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/pvs-available-capacity.tsx index df09dfeba8f..8e7015baffc 100644 --- a/frontend/packages/ceph-storage-plugin/src/components/ocs-install/pvs-available-capacity.tsx +++ b/frontend/packages/ceph-storage-plugin/src/components/ocs-install/pvs-available-capacity.tsx @@ -6,7 +6,7 @@ import { humanizeBinaryBytes } from '@console/internal/components/utils/'; import { getName } from '@console/shared'; import { pvResource } from '../../constants/resources'; import { calcPVsCapacity, getSCAvailablePVs } from '../../selectors'; -import '../modals/add-capacity-modal/_add-capacity-modal.scss'; +import '../modals/add-capacity-modal/add-capacity-modal.scss'; import './pvs-available-capacity.scss'; export const PVsAvailableCapacity: React.FC = ({ diff --git a/frontend/packages/ceph-storage-plugin/src/plugin.ts b/frontend/packages/ceph-storage-plugin/src/plugin.ts index 13c3230dcda..c6ccfd1f842 100644 --- a/frontend/packages/ceph-storage-plugin/src/plugin.ts +++ b/frontend/packages/ceph-storage-plugin/src/plugin.ts @@ -25,8 +25,8 @@ import { referenceForModel } from '@console/internal/module/k8s'; import { NodeModel } from '@console/internal/models'; import { LSO_DEVICE_DISCOVERY } from '@console/local-storage-operator-plugin/src/plugin'; import { OCS_ATTACHED_DEVICES_FLAG } from '@console/local-storage-operator-plugin/src/features'; -import { getCephHealthState } from './components/dashboard-page/storage-dashboard/status-card/utils'; -import { isClusterExpandActivity } from './components/dashboard-page/storage-dashboard/activity-card/cluster-expand-activity'; +import { getCephHealthState } from './components/dashboards/persistent-internal/status-card/utils'; +import { isClusterExpandActivity } from './components/dashboards/persistent-internal/activity-card/cluster-expand-activity'; import { StorageClassFormProvisoners } from './utils/ocs-storage-class-params'; import { WatchCephResource } from './types'; import { @@ -154,7 +154,7 @@ const plugin: Plugin = [ position: GridPosition.LEFT, loader: () => import( - './components/dashboard-page/storage-dashboard/details-card' /* webpackChunkName: "ceph-storage-details-card" */ + './components/dashboards/persistent-internal/details-card' /* webpackChunkName: "ceph-storage-details-card" */ ).then((m) => m.default), }, flags: { @@ -168,7 +168,7 @@ const plugin: Plugin = [ position: GridPosition.LEFT, loader: () => import( - './components/dashboard-page/storage-dashboard/inventory-card' /* webpackChunkName: "ceph-storage-inventory-card" */ + './components/dashboards/persistent-internal/inventory-card' /* webpackChunkName: "ceph-storage-inventory-card" */ ).then((m) => m.default), }, flags: { @@ -182,7 +182,7 @@ const plugin: Plugin = [ position: GridPosition.LEFT, loader: () => import( - './components/dashboard-page/storage-dashboard/storage-efficiency-card/storage-efficiency-card' /* webpackChunkName: "ceph-storage-efficiency-card" */ + './components/dashboards/persistent-internal/storage-efficiency-card/storage-efficiency-card' /* webpackChunkName: "ceph-storage-efficiency-card" */ ).then((m) => m.default), }, flags: { @@ -197,7 +197,7 @@ const plugin: Plugin = [ position: GridPosition.MAIN, loader: () => import( - './components/dashboard-page/storage-dashboard/status-card/status-card' /* webpackChunkName: "ceph-storage-status-card" */ + './components/dashboards/persistent-internal/status-card/status-card' /* webpackChunkName: "ceph-storage-status-card" */ ).then((m) => m.default), }, flags: { @@ -211,7 +211,7 @@ const plugin: Plugin = [ position: GridPosition.MAIN, loader: () => import( - './components/dashboard-page/storage-dashboard/raw-capacity-card/raw-capacity-card' /* webpackChunkName: "raw-capacity-card" */ + './components/dashboards/persistent-internal/raw-capacity-card/raw-capacity-card' /* webpackChunkName: "raw-capacity-card" */ ).then((m) => m.default), }, flags: { @@ -225,7 +225,7 @@ const plugin: Plugin = [ position: GridPosition.MAIN, loader: () => import( - './components/dashboard-page/storage-dashboard/capacity-breakdown/capacity-breakdown-card' /* webpackChunkName: "ceph-storage-usage-breakdown-card" */ + './components/dashboards/persistent-internal/capacity-breakdown-card/capacity-breakdown-card' /* webpackChunkName: "ceph-storage-usage-breakdown-card" */ ).then((m) => m.default), }, flags: { @@ -239,7 +239,7 @@ const plugin: Plugin = [ position: GridPosition.MAIN, loader: () => import( - './components/dashboard-page/storage-dashboard/utilization-card/utilization-card' /* webpackChunkName: "ceph-storage-utilization-card" */ + './components/dashboards/persistent-internal/utilization-card/utilization-card' /* webpackChunkName: "ceph-storage-utilization-card" */ ).then((m) => m.default), }, flags: { @@ -254,7 +254,7 @@ const plugin: Plugin = [ position: GridPosition.RIGHT, loader: () => import( - './components/dashboard-page/storage-dashboard/activity-card/activity-card' /* webpackChunkName: "ceph-storage-activity-card" */ + './components/dashboards/persistent-internal/activity-card/activity-card' /* webpackChunkName: "ceph-storage-activity-card" */ ).then((m) => m.ActivityCard), }, flags: { @@ -320,7 +320,7 @@ const plugin: Plugin = [ position: GridPosition.LEFT, loader: () => import( - './components/independent-dashboard-page/details-card' /* webpackChunkName: "indepedent-details-card" */ + './components/dashboards/persistent-external/details-card' /* webpackChunkName: "indepedent-details-card" */ ).then((m) => m.default), }, flags: { @@ -334,7 +334,7 @@ const plugin: Plugin = [ position: GridPosition.LEFT, loader: () => import( - './components/dashboard-page/storage-dashboard/inventory-card' /* webpackChunkName: "ceph-storage-inventory-card" */ + './components/dashboards/persistent-internal/inventory-card' /* webpackChunkName: "ceph-storage-inventory-card" */ ).then((m) => m.default), }, flags: { @@ -349,7 +349,7 @@ const plugin: Plugin = [ position: GridPosition.MAIN, loader: () => import( - './components/independent-dashboard-page/status-card' /* webpackChunkName: "indepedent-status-card" */ + './components/dashboards/persistent-external/status-card' /* webpackChunkName: "indepedent-status-card" */ ).then((m) => m.default), }, flags: { @@ -363,7 +363,7 @@ const plugin: Plugin = [ position: GridPosition.MAIN, loader: () => import( - './components/independent-dashboard-page/breakdown-card' /* webpackChunkName: "independent-breakdown-card" */ + './components/dashboards/persistent-external/breakdown-card' /* webpackChunkName: "independent-breakdown-card" */ ).then((m) => m.default), }, flags: { @@ -377,7 +377,7 @@ const plugin: Plugin = [ position: GridPosition.MAIN, loader: () => import( - './components/independent-dashboard-page/utilization-card' /* webpackChunkName: "utilization-card" */ + './components/dashboards/persistent-external/utilization-card' /* webpackChunkName: "utilization-card" */ ).then((m) => m.default), }, flags: { @@ -392,7 +392,7 @@ const plugin: Plugin = [ position: GridPosition.RIGHT, loader: () => import( - './components/dashboard-page/storage-dashboard/activity-card/activity-card' /* webpackChunkName: "ceph-storage-activity-card" */ + './components/dashboards/persistent-internal/activity-card/activity-card' /* webpackChunkName: "ceph-storage-activity-card" */ ).then((m) => m.ActivityCard), }, flags: { @@ -411,7 +411,7 @@ const plugin: Plugin = [ isActivity: isClusterExpandActivity, loader: () => import( - './components/dashboard-page/storage-dashboard/activity-card/cluster-expand-activity' /* webpackChunkName: "ceph-storage-plugin" */ + './components/dashboards/persistent-internal/activity-card/cluster-expand-activity' /* webpackChunkName: "ceph-storage-plugin" */ ).then((m) => m.ClusterExpandActivity), }, flags: { @@ -429,7 +429,7 @@ const plugin: Plugin = [ }, loader: () => import( - './components/attached-devices-mode/lso-disk-inventory/ocs-disks-list' /* webpackChunkName: "ocs-nodes-disks-list" */ + './components/disk-inventory/ocs-disks-list' /* webpackChunkName: "ocs-nodes-disks-list" */ ).then((m) => m.OCSNodesDiskListPage), }, flags: { diff --git a/frontend/packages/ceph-storage-plugin/src/utils/install.ts b/frontend/packages/ceph-storage-plugin/src/utils/install.ts index 51e54f922f4..bd3f873f4f0 100644 --- a/frontend/packages/ceph-storage-plugin/src/utils/install.ts +++ b/frontend/packages/ceph-storage-plugin/src/utils/install.ts @@ -17,7 +17,7 @@ import { } from '@console/local-storage-operator-plugin/src/constants'; import { getNodeCPUCapacity, getNodeAllocatableMemory, getName } from '@console/shared'; import { ocsTaint, NO_PROVISIONER, AVAILABLE, MINIMUM_NODES, ZONE_LABELS } from '../constants'; -import { Discoveries } from '../components/ocs-install/attached-devices/create-sc/state'; +import { Discoveries } from '../components/ocs-install/attached-devices-mode/create-sc/state'; import { getSCAvailablePVs } from '../selectors'; export const hasNoTaints = (node: NodeKind) => { diff --git a/frontend/packages/noobaa-storage-plugin/src/components/activity-card/data-resiliency-activity/data-resiliency-activity.tsx b/frontend/packages/noobaa-storage-plugin/src/components/activity-card/data-resiliency-activity/data-resiliency-activity.tsx index 121f3e4321b..694c0affe09 100644 --- a/frontend/packages/noobaa-storage-plugin/src/components/activity-card/data-resiliency-activity/data-resiliency-activity.tsx +++ b/frontend/packages/noobaa-storage-plugin/src/components/activity-card/data-resiliency-activity/data-resiliency-activity.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { useTranslation } from 'react-i18next'; import { PrometheusResponse } from '@console/internal/components/graphs'; import { formatDuration } from '@console/internal/components/utils/datetime'; -import { DataResiliency } from '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/data-resiliency-activity'; +import { DataResiliency } from '@console/ceph-storage-plugin/src/components/dashboards/common/data-resiliency/data-resiliency-activity'; import { getGaugeValue } from '../../../utils'; import './data-resiliency-activity.scss'; diff --git a/frontend/packages/noobaa-storage-plugin/src/components/capacity-breakdown/capacity-breakdown-card.tsx b/frontend/packages/noobaa-storage-plugin/src/components/capacity-breakdown/capacity-breakdown-card.tsx index 9629539e97e..578ef10687e 100644 --- a/frontend/packages/noobaa-storage-plugin/src/components/capacity-breakdown/capacity-breakdown-card.tsx +++ b/frontend/packages/noobaa-storage-plugin/src/components/capacity-breakdown/capacity-breakdown-card.tsx @@ -9,17 +9,17 @@ import DashboardCard from '@console/shared/src/components/dashboard/dashboard-ca import DashboardCardTitle from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardTitle'; import DashboardCardBody from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardBody'; import { SubscriptionModel, SubscriptionKind } from '@console/operator-lifecycle-manager/src'; -import { BreakdownCardBody } from '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-body'; -import { Colors } from '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/consts'; +import { BreakdownCardBody } from '@console/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-body'; +import { Colors } from '@console/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/consts'; import { useK8sWatchResource } from '@console/internal/components/utils/k8s-watch-hook'; import { usePrometheusQueries } from '@console/shared/src/components/dashboard/utilization-card/prometheus-hook'; import { OCS_OPERATOR } from '@console/ceph-storage-plugin/src/constants'; -import { getStackChartStats } from '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/utils'; +import { getStackChartStats } from '@console/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/utils'; import { PrometheusResponse, DataPoint } from '@console/internal/components/graphs'; import { getInstantVectorStats } from '@console/internal/components/graphs/utils'; import { useFlag } from '@console/shared/src/hooks/flag'; import { RGW_FLAG } from '@console/ceph-storage-plugin/src/features'; -import { getGroupedSelectOptions } from '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-dropdown'; +import { getGroupedSelectOptions } from '@console/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-dropdown'; import { ServiceType, CapacityBreakdown, Groups, secretResource } from '../../constants'; import { breakdownQueryMap } from '../../queries'; import { isFunctionThenApply, decodeRGWPrefix } from '../../utils'; diff --git a/frontend/packages/noobaa-storage-plugin/src/components/data-consumption-card/data-consumption-card-dropdown.tsx b/frontend/packages/noobaa-storage-plugin/src/components/data-consumption-card/data-consumption-card-dropdown.tsx index 53bbe9d472a..e2bf6cb0192 100644 --- a/frontend/packages/noobaa-storage-plugin/src/components/data-consumption-card/data-consumption-card-dropdown.tsx +++ b/frontend/packages/noobaa-storage-plugin/src/components/data-consumption-card/data-consumption-card-dropdown.tsx @@ -10,7 +10,7 @@ import { import { getOptionsMenuItems, getGroupedSelectOptions, -} from '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/breakdown-card/breakdown-dropdown'; +} from '@console/ceph-storage-plugin/src/components/dashboards/common/capacity-breakdown/breakdown-dropdown'; import { Breakdown, Metrics, diff --git a/frontend/packages/noobaa-storage-plugin/src/components/data-consumption-card/performance-graph.tsx b/frontend/packages/noobaa-storage-plugin/src/components/data-consumption-card/performance-graph.tsx index c5cb3eb3e49..b8ddcf823ed 100644 --- a/frontend/packages/noobaa-storage-plugin/src/components/data-consumption-card/performance-graph.tsx +++ b/frontend/packages/noobaa-storage-plugin/src/components/data-consumption-card/performance-graph.tsx @@ -20,7 +20,7 @@ import { import { twentyFourHourTime } from '@console/internal/components/utils/datetime'; import { GraphEmpty } from '@console/internal/components/graphs/graph-empty'; import { PrometheusGraph } from '@console/internal/components/graphs/prometheus-graph'; -import { getLatestValue } from '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/utilization-card/utils'; +import { getLatestValue } from '@console/ceph-storage-plugin/src/components/dashboards/persistent-internal/utilization-card/utils'; import { DataPoint } from '@console/internal/components/graphs'; import { Metrics, CHART_LABELS } from '../../constants'; import { convertNaNToNull } from '../../utils'; diff --git a/frontend/packages/noobaa-storage-plugin/src/components/status-card/status-card.tsx b/frontend/packages/noobaa-storage-plugin/src/components/status-card/status-card.tsx index f90cee104f1..a459e384a96 100644 --- a/frontend/packages/noobaa-storage-plugin/src/components/status-card/status-card.tsx +++ b/frontend/packages/noobaa-storage-plugin/src/components/status-card/status-card.tsx @@ -18,7 +18,7 @@ import { } from '@console/internal/components/dashboard/with-dashboard-resources'; import { FirehoseResource, FirehoseResult } from '@console/internal/components/utils'; import { referenceForModel, K8sResourceKind } from '@console/internal/module/k8s'; -import { getDataResiliencyState } from '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/status-card/utils'; +import { getDataResiliencyState } from '@console/ceph-storage-plugin/src/components/dashboards/persistent-internal/status-card/utils'; import { CephObjectStoreModel } from '@console/ceph-storage-plugin/src/models'; import { RGW_FLAG } from '@console/ceph-storage-plugin/src/features'; import { useFlag } from '@console/shared/src/hooks/flag'; diff --git a/frontend/packages/noobaa-storage-plugin/src/components/storage-efficiency-card/storage-efficiency-card.tsx b/frontend/packages/noobaa-storage-plugin/src/components/storage-efficiency-card/storage-efficiency-card.tsx index 4f5095be500..1843f6da870 100644 --- a/frontend/packages/noobaa-storage-plugin/src/components/storage-efficiency-card/storage-efficiency-card.tsx +++ b/frontend/packages/noobaa-storage-plugin/src/components/storage-efficiency-card/storage-efficiency-card.tsx @@ -9,13 +9,11 @@ import { withDashboardResources, } from '@console/internal/components/dashboard/with-dashboard-resources'; import { PrometheusResponse } from '@console/internal/components/graphs'; -import { EfficiencyItemBody } from '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/storage-efficiency-card/storage-efficiency-card-item'; +import { EfficiencyItemBody } from '@console/ceph-storage-plugin/src/components/dashboards/common/storage-efficiency/storage-efficiency-card-item'; import { humanizeBinaryBytes, humanizePercentage } from '@console/internal/components/utils'; import { getGaugeValue } from '../../utils'; import { ObjectStorageEfficiencyQueries } from '../../queries'; -import '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/storage-efficiency-card/storage-efficiency-card.scss'; - const StorageEfficiencyCard: React.FC = ({ watchPrometheus, stopWatchPrometheusQuery,