-
Notifications
You must be signed in to change notification settings - Fork 593
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- independent mode dashboard - internal mode dashboard - object service dashboard Additional modifications: - dropdown options format to be {name: /*the string to be displayed and used for i18n*/,id: /*a unique name of the option-key*/} on all ocs dashboards - unit test adjustments - i18n of empty states in core components of details-card,inventory-card,graph-empty Namespaces added: ceph-storage-plugin, noobaa-storage-pugin Signed-off-by: Afreen Rahman <afrahman@redhat.com>
- Loading branch information
Afreen Rahman
committed
Dec 1, 2020
1 parent
b94adb6
commit 387cea6
Showing
59 changed files
with
816 additions
and
443 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
frontend/packages/ceph-storage-plugin/locales/en/ceph-storage-plugin.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
{ | ||
"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", | ||
"Projects": "Projects", | ||
"Storage Classes": "Storage Classes", | ||
"Pods": "Pods", | ||
"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", | ||
"Inventory": "Inventory", | ||
"Status": "Status", | ||
"OCS Cluster": "OCS Cluster", | ||
"Data Resiliency": "Data Resiliency", | ||
"Warning": "Warning", | ||
"Error": "Error", | ||
"Progressing": "Progressing", | ||
"{{capacityRatio, number}}:1": "{{capacityRatio, number}}:1", | ||
"Compression ratio": "Compression ratio", | ||
" The ratio of the data physical stored (after compression) compared to the size of the data received from the client.": " The ratio of the data physical stored (after compression) compared to the size of the data received from the client.", | ||
"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", | ||
"Requested capacity": "Requested capacity", | ||
"Persistent Storage": "Persistent Storage", | ||
"Storage": "Storage", | ||
"Troubleshoot": "Troubleshoot" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 28 additions & 5 deletions
33
.../packages/ceph-storage-plugin/src/__tests__/independent-dashboard-breakdown-card.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 6 additions & 3 deletions
9
...src/components/dashboard-page/storage-dashboard/activity-card/cluster-expand-activity.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,13 @@ | ||
import * as React from 'react'; | ||
import { useTranslation } from 'react-i18next'; | ||
import ActivityItem from '@console/shared/src/components/dashboard/activity-card/ActivityItem'; | ||
import { K8sResourceKind } from '@console/internal/module/k8s'; | ||
|
||
export const ClusterExpandActivity: React.FC = () => ( | ||
<ActivityItem>Expanding OCS Cluster</ActivityItem> | ||
); | ||
export const ClusterExpandActivity: React.FC = () => { | ||
const { t } = useTranslation(); | ||
|
||
return <ActivityItem>{t('ceph-storage-plugin~Expanding OCS Cluster')}</ActivityItem>; | ||
}; | ||
|
||
export const isClusterExpandActivity = (storageCluster: K8sResourceKind): boolean => | ||
storageCluster?.status?.phase === 'Expanding'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 6 additions & 3 deletions
9
...in/src/components/dashboard-page/storage-dashboard/activity-card/ocs-upgrade-activity.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,14 @@ | ||
import * as React from 'react'; | ||
import { useTranslation } from 'react-i18next'; | ||
import ActivityItem from '@console/shared/src/components/dashboard/activity-card/ActivityItem'; | ||
import { SubscriptionState, SubscriptionKind } from '@console/operator-lifecycle-manager'; | ||
import { getSubscriptionStatus } from '@console/operator-lifecycle-manager/src/status/csv-status'; | ||
|
||
export const isOCSUpgradeActivity = (subscription: SubscriptionKind): boolean => | ||
getSubscriptionStatus(subscription).status === SubscriptionState.SubscriptionStateUpgradePending; | ||
|
||
export const OCSUpgradeActivity: React.FC = () => ( | ||
<ActivityItem>Upgrading OCS Operator</ActivityItem> | ||
); | ||
export const OCSUpgradeActivity: React.FC = () => { | ||
const { t } = useTranslation(); | ||
|
||
return <ActivityItem>{t('ceph-storage-plugin~Upgrading OCS Operator')}</ActivityItem>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.