Skip to content

Commit 162dd7c

Browse files
committed
fix: review comments
1 parent 01c519b commit 162dd7c

File tree

8 files changed

+88
-5
lines changed

8 files changed

+88
-5
lines changed
Lines changed: 62 additions & 0 deletions
Loading

src/Common/Tooltip/ShortcutKeyComboTooltipContent.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ const ShortcutKeyComboTooltipContent = ({ text, combo }: TooltipProps['shortcutK
2424
{!!combo?.length && (
2525
<div className="flexbox dc__gap-4 dc__align-items-center flex-wrap">
2626
{combo.map((key) => (
27-
// TODO: check styling for this since span was replaced by kbd
28-
<kbd key={key} className="shortcut-keys__chip dc__capitalize lh-16 fs-11 fw-5 flex">
27+
<kbd key={key} className="shortcut-keys__chip dc__capitalize lh-16 fs-11 fw-5 flex text__white">
2928
{KEYBOARD_KEYS_MAP[key]}
3029
</kbd>
3130
))}

src/Pages/ResourceBrowser/types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ export enum ClusterFiltersType {
2828

2929
export enum InstallationClusterStatus {
3030
Creating = 'Creating',
31-
Deleting = 'Deleting',
31+
Updated = 'Updated',
3232
Updating = 'Updating',
3333
Installed = 'Installed',
3434
Failed = 'Failed',
35-
Superseded = 'Superseded',
36-
Undefined = 'Undefined',
35+
Deleting = 'Deleting',
36+
Deleted = 'Deleted',
3737
}
3838

3939
export enum ClusterStatusType {

src/Shared/Components/Icon/Icon.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import { ReactComponent as ICCpu } from '@IconsV2/ic-cpu.svg'
3939
import { ReactComponent as ICCrown } from '@IconsV2/ic-crown.svg'
4040
import { ReactComponent as ICCube } from '@IconsV2/ic-cube.svg'
4141
import { ReactComponent as ICDelete } from '@IconsV2/ic-delete.svg'
42+
import { ReactComponent as ICDeleteDots } from '@IconsV2/ic-delete-dots.svg'
4243
import { ReactComponent as ICDeleteLightning } from '@IconsV2/ic-delete-lightning.svg'
4344
import { ReactComponent as ICDelhivery } from '@IconsV2/ic-delhivery.svg'
4445
import { ReactComponent as ICDevtron } from '@IconsV2/ic-devtron.svg'
@@ -157,6 +158,7 @@ export const iconMap = {
157158
'ic-cpu': ICCpu,
158159
'ic-crown': ICCrown,
159160
'ic-cube': ICCube,
161+
'ic-delete-dots': ICDeleteDots,
160162
'ic-delete-lightning': ICDeleteLightning,
161163
'ic-delete': ICDelete,
162164
'ic-delhivery': ICDelhivery,

src/Shared/Components/SelectPicker/common.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,3 +438,15 @@ export const SelectPickerGroupHeading = <OptionValue,>({
438438
export const renderLoadingMessage = () => (
439439
<p className="m-0 cn-7 fs-13 fw-4 lh-20 py-6 px-8 dc__loading-dots">Loading</p>
440440
)
441+
442+
export const ValueContainerWithLoadingShimmer = (props: ValueContainerProps) => {
443+
const {
444+
selectProps: { isLoading },
445+
} = props
446+
447+
if (!isLoading) {
448+
return <components.ValueContainer {...props} />
449+
}
450+
451+
return <div className="shimmer w-150 h-22" />
452+
}

src/Shared/Components/SelectPicker/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17+
export { ValueContainerWithLoadingShimmer } from './common'
1718
export { default as FilterSelectPicker } from './FilterSelectPicker'
1819
export { default as SelectPicker } from './SelectPicker.component'
1920
export * from './SelectPickerTextArea.component'

src/Shared/Components/StatusComponent/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export enum StatusType {
3434
INPROGRESS = 'INPROGRESS',
3535
HIBERNATING = 'HIBERNATING',
3636
TIMED_OUT = 'TIMED_OUT',
37+
DELETING = 'DELETING',
3738
}
3839

3940
export interface StatusComponentProps {

src/Shared/Components/StatusComponent/utils.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ export const getIconName = (status: string, showAnimatedIcon: boolean): IconName
7171
case 'timedout':
7272
case 'timed_out':
7373
return 'ic-timeout-two-dash'
74+
case 'deleting':
75+
return 'ic-delete-dots'
76+
case 'deleted':
77+
return 'ic-delete'
7478
default:
7579
return null
7680
}
@@ -93,6 +97,8 @@ export const getIconColor = (status: string): IconsProps['color'] => {
9397
return 'O500'
9498
case 'timedout':
9599
case 'timed_out':
100+
case 'deleting':
101+
case 'deleted':
96102
return 'R500'
97103
default:
98104
return null

0 commit comments

Comments
 (0)