Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Domain env bugs #396

Merged
merged 4 commits into from
Dec 1, 2023
Merged

Domain env bugs #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2debd59
update storybook@latest
D-B-Hawk Dec 1, 2023
904cbad
fix: loading state perpetually hanging during maagament provision
D-B-Hawk Dec 1, 2023
c0d3073
fix: use subDomainName if present
D-B-Hawk Dec 1, 2023
4ed2e53
remove default selected and add back hover styles to meu item contain…
D-B-Hawk Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions components/clusterDetails/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import React, { ComponentPropsWithoutRef, FunctionComponent, useEffect, useState } from 'react';
import React, {
ComponentPropsWithoutRef,
FunctionComponent,
useEffect,
useMemo,
useState,
} from 'react';
import moment from 'moment';

import {
Expand Down Expand Up @@ -43,6 +49,7 @@ const ClusterDetails: FunctionComponent<ClusterDetailsProps> = ({
cloudRegion,
creationDate,
domainName,
subDomainName,
gitProvider,
nodeCount,
instanceSize,
Expand All @@ -58,6 +65,11 @@ const ClusterDetails: FunctionComponent<ClusterDetailsProps> = ({
setTimeout(() => setAvailable(true), 10000);
});

const fullDomainName = useMemo(
() => (subDomainName ? `${subDomainName}.${domainName}` : domainName),
[subDomainName, domainName],
);

return (
<Container {...rest}>
<Column style={{ gap: '8px' }}>
Expand All @@ -72,7 +84,7 @@ const ClusterDetails: FunctionComponent<ClusterDetailsProps> = ({
)}
<Column style={{ gap: '4px' }}>
<StatusIndicator available>
<ExternalLink href={`https://argocd.${domainName}/applications/clusters`} available>
<ExternalLink href={`https://argocd.${fullDomainName}/applications/clusters`} available>
View your Argo CD clusters
</ExternalLink>
</StatusIndicator>
Expand Down
20 changes: 18 additions & 2 deletions components/select/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import MenuItem from '@mui/material/MenuItem';
import Typography from '../typography';
import { Required } from '../textField/textField.styled';
import Tag, { TagColor } from '../tag';
import { DOLPHIN, LIGHT_GREY, LINK_WATER, ROYAL_PURPLE } from '../../constants/colors';
import { DOLPHIN, LIGHT_GREY, LINK_WATER, ROYAL_PURPLE, WHITE_SMOKE } from '../../constants/colors';
import { StyledFormHelperText } from '../textArea/textArea.styled';
import Row from '../row';
import { ClusterEnvironment } from '../../types/provision';
Expand Down Expand Up @@ -99,14 +99,30 @@ const EnvironmentSelect: FunctionComponent<EnvironmentSelectProps> = ({
}
}}
>
<MenuItem disableRipple onClick={onAddNewEnvironment}>
<MenuItem
disableRipple
onClick={onAddNewEnvironment}
sx={{
'&.MuiMenuItem-root.Mui-selected': {
'backgroundColor': 'white',
'&:hover': { backgroundColor: `${WHITE_SMOKE}` },
},
}}
>
<Row style={{ gap: '4px', alignItems: 'center' }}>
<AddIcon sx={{ height: 20, width: 20, color: ROYAL_PURPLE }} />
<Typography variant="body3" sx={{ color: ROYAL_PURPLE }}>
New environment
</Typography>
</Row>
</MenuItem>
{!!options.length && (
<MenuItem value="" disableRipple>
<Typography variant="body3" sx={{ color: ROYAL_PURPLE, marginLeft: '3px' }}>
None
</Typography>
</MenuItem>
)}
{options.map((option) => (
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
//@ts-ignore
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
"@faker-js/faker": "^7.5.0",
"@mdx-js/react": "^2.2.1",
"@next/eslint-plugin-next": "^13.0.4",
"@storybook/addon-actions": "^7.5.3",
"@storybook/addon-essentials": "^7.5.3",
"@storybook/addon-interactions": "^7.5.3",
"@storybook/addon-links": "^7.5.3",
"@storybook/addon-mdx-gfm": "^7.5.3",
"@storybook/addon-actions": "^7.6.2",
"@storybook/addon-essentials": "^7.6.2",
"@storybook/addon-interactions": "^7.6.2",
"@storybook/addon-links": "^7.6.2",
"@storybook/addon-mdx-gfm": "^7.6.2",
"@storybook/mdx2-csf": "^1.1.0",
"@storybook/nextjs": "^7.5.3",
"@storybook/react": "^7.5.3",
"@storybook/nextjs": "^7.6.2",
"@storybook/react": "^7.6.2",
"@storybook/testing-library": "^0.2.2",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.3.0",
Expand Down Expand Up @@ -108,7 +108,7 @@
"jest-environment-jsdom": "^29.2.2",
"prettier": "^2.7.1",
"process": "^0.11.10",
"storybook": "^7.5.3",
"storybook": "^7.6.2",
"ts-jest": "^28.0.8",
"ts-node": "^10.9.1",
"typescript": "^4.8.4"
Expand Down
1 change: 1 addition & 0 deletions redux/slices/api.slice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ const apiSlice = createSlice({
state.responseError = action.error.message;
})
.addCase(getCloudDomains.fulfilled, (state, { payload }: PayloadAction<Array<string>>) => {
state.loading = false;
state.cloudDomains = sortBy(payload);
})
.addCase(getCloudRegions.pending, (state) => {
Expand Down
Loading
Loading