Skip to content

Commit 7b7cae7

Browse files
CahllagerfeldCahllagerfeld
authored
Merge pull request #537 from zenml-io/dev
2 parents 9b0f0c8 + 732ac4a commit 7b7cae7

File tree

8 files changed

+191
-133
lines changed

8 files changed

+191
-133
lines changed

‎appserverSchema.d.ts‎

Lines changed: 126 additions & 84 deletions
Large diffs are not rendered by default.

‎src/api/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export type ServiceConnector = components['schemas']['ServiceConnectorResponse']
1818
export type ServiceConnectorTypes = components['schemas']['ServiceConnectorTypeModel'];
1919

2020
//secrets
21-
export type Secret = components['schemas']['SecretResponseModel'];
21+
export type Secret = components['schemas']['SecretResponse'];
2222

2323
//runs
2424
export type Run = components['schemas']['PipelineRunResponse'];

‎src/ui/layouts/secrets/SecretDetail/Configuration/index.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@ import { useService } from './useService';
1515
import { routePaths } from '../../../../../routes/routePaths';
1616
import { useHistory, useSelector } from '../../../../hooks';
1717
import { workspaceSelectors } from '../../../../../redux/selectors';
18+
import { Secret } from '../../../../../api/types';
1819

1920
export const Configuration: React.FC<{
2021
secretId: TId;
2122
tiles?: any;
2223
fetching?: boolean;
2324
}> = ({ secretId, fetching }) => {
24-
const { secret } = useService({ secretId });
25+
const { secret }: { secret: Secret } = useService({ secretId });
2526
const history = useHistory();
2627

2728
const selectedWorkspace = useSelector(workspaceSelectors.selectedWorkspace);
@@ -52,7 +53,7 @@ export const Configuration: React.FC<{
5253
label={'Scope'}
5354
labelColor="rgba(66, 66, 64, 0.5)"
5455
placeholder={'Choose a scope'}
55-
value={secret?.scope}
56+
value={secret?.body?.scope || ''}
5657
onChange={() => {}}
5758
disabled
5859
options={[] as any}
@@ -67,7 +68,7 @@ export const Configuration: React.FC<{
6768
</Box>
6869

6970
<Box marginTop="md">
70-
<SelectorDisabled inputFields={secret.values} width="30vw" />
71+
<SelectorDisabled inputFields={secret.body?.values} width="30vw" />
7172
</Box>
7273

7374
<FlexBox

‎src/ui/layouts/secrets/SecretDetail/getHeaderCols.tsx‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,14 @@ export const GetHeaderCols = ({
8989
width: '15%',
9090
renderRow: (secret: Secret) => (
9191
<>
92-
{secret.scope && (
92+
{secret.body?.scope && (
9393
<FlexBox alignItems="center">
94-
<div data-tip data-for={secret.scope}>
94+
<div data-tip data-for={secret.body?.scope}>
9595
<Paragraph size="small" color="black">
96-
{secret.scope}
96+
{secret.body?.scope}
9797
</Paragraph>
9898
</div>
99-
<Tooltip id={secret.scope} text={secret.scope} />
99+
<Tooltip id={secret.body?.scope} text={secret.body?.scope} />
100100
</FlexBox>
101101
)}
102102
</>
@@ -110,24 +110,29 @@ export const GetHeaderCols = ({
110110
</Paragraph>
111111
),
112112
width: '15%',
113-
renderRow: (secret: any) => {
114-
const initials = getInitialsFromEmail(secret?.user?.name as string);
113+
renderRow: (secret: Secret) => {
114+
const initials = getInitialsFromEmail(
115+
secret?.body?.user?.name as string,
116+
);
115117
return (
116118
<FlexBox alignItems="center">
117-
<div data-tip data-for={secret?.user?.name}>
119+
<div data-tip data-for={secret?.body?.user?.name}>
118120
<FlexBox alignItems="center">
119-
{secret?.user?.name && (
121+
{secret?.body?.user?.name && (
120122
<Box paddingRight="sm">
121123
<ColoredCircle color="secondary" size="sm">
122124
{initials}
123125
</ColoredCircle>
124126
</Box>
125127
)}
126128

127-
<Paragraph size="small">{secret?.user?.name}</Paragraph>
129+
<Paragraph size="small">{secret?.body?.user?.name}</Paragraph>
128130
</FlexBox>
129131
</div>
130-
<Tooltip id={secret?.user?.name} text={secret?.user?.name} />
132+
<Tooltip
133+
id={secret?.body?.user?.name}
134+
text={secret?.body?.user?.name}
135+
/>
131136
</FlexBox>
132137
);
133138
},
@@ -141,18 +146,18 @@ export const GetHeaderCols = ({
141146
width: '20%',
142147
renderRow: (secret: Secret) => (
143148
<>
144-
{secret.created && (
149+
{secret.body?.created && (
145150
<FlexBox alignItems="center">
146-
<div data-tip data-for={formatDateToSort(secret.created)}>
151+
<div data-tip data-for={formatDateToSort(secret.body?.created)}>
147152
<FlexBox alignItems="center">
148153
<Paragraph color="grey" size="tiny">
149-
{formatDateToDisplayOnTable(secret.created)}
154+
{formatDateToDisplayOnTable(secret.body?.created)}
150155
</Paragraph>
151156
</FlexBox>
152157
</div>
153158
<Tooltip
154-
id={formatDateToSort(secret.created)}
155-
text={formatDateToDisplayOnTable(secret.created)}
159+
id={formatDateToSort(secret.body?.created)}
160+
text={formatDateToDisplayOnTable(secret.body?.created)}
156161
/>
157162
</FlexBox>
158163
)}

‎src/ui/layouts/secrets/Secrets/List/UserName/useService.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ export const useService = ({
1919
const dispatch = useDispatch();
2020
const [fetching, setFetching] = useState<boolean>(false);
2121

22-
const user = useSelector(userSelectors.userForId(secret.user?.id as string));
22+
const user = useSelector(
23+
userSelectors.userForId(secret.body?.user?.id as string),
24+
);
2325

2426
useEffect(() => {
2527
setFetching(true);
2628
dispatch(
2729
userActions.userForId({
28-
userId: secret.user?.id as string,
30+
userId: secret.body?.user?.id as string,
2931
onSuccess: () => setFetching(false),
3032
onFailure: () => setFetching(false),
3133
}),

‎src/ui/layouts/secrets/Secrets/List/getHeaderCols.tsx‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { HeaderCol } from '../../../common/Table';
1919
import { SortingHeader } from './ForSorting/SortingHeader';
2020
import { Sorting, SortingDirection } from './ForSorting/types';
2121
import { useService } from './ForSorting/useServiceForSorting';
22+
import { Secret } from '../../../../../api/types';
2223

2324
export const GetHeaderCols = ({
2425
expendedRow,
@@ -76,7 +77,7 @@ export const GetHeaderCols = ({
7677
),
7778
testId: 'Id',
7879
width: '20%',
79-
renderRow: (secret: any) => (
80+
renderRow: (secret: Secret) => (
8081
<FlexBox alignItems="center">
8182
<div data-tip data-for={secret.id}>
8283
<FlexBox.Row style={{ alignItems: 'center' }}>
@@ -118,7 +119,7 @@ export const GetHeaderCols = ({
118119
),
119120
testId: 'Name',
120121
width: '30%',
121-
renderRow: (secret: any) => (
122+
renderRow: (secret: Secret) => (
122123
<FlexBox alignItems="center">
123124
<div data-tip data-for={secret.name}>
124125
<Paragraph size="small" color="black">
@@ -152,14 +153,14 @@ export const GetHeaderCols = ({
152153
),
153154
testId: 'Scope',
154155
width: '15%',
155-
renderRow: (secret: any) => (
156+
renderRow: (secret: Secret) => (
156157
<FlexBox alignItems="center">
157-
<div data-tip data-for={secret.scope}>
158+
<div data-tip data-for={secret.body?.scope}>
158159
<Paragraph size="small" color="black">
159-
{secret.scope}
160+
{secret.body?.scope}
160161
</Paragraph>
161162
</div>
162-
<Tooltip id={secret.scope} text={secret.scope} />
163+
<Tooltip id={secret.body?.scope} text={secret.body?.scope} />
163164
</FlexBox>
164165
),
165166
},
@@ -185,24 +186,29 @@ export const GetHeaderCols = ({
185186
),
186187
testId: 'Author',
187188
width: '15%',
188-
renderRow: (secret: any) => {
189-
const initials = getInitialsFromEmail(secret?.user?.name as string);
189+
renderRow: (secret: Secret) => {
190+
const initials = getInitialsFromEmail(
191+
secret?.body?.user?.name as string,
192+
);
190193
return (
191194
<FlexBox alignItems="center">
192-
<div data-tip data-for={secret?.user?.name}>
195+
<div data-tip data-for={secret?.body?.user?.name}>
193196
<FlexBox alignItems="center">
194-
{secret?.user?.name && (
197+
{secret?.body?.user?.name && (
195198
<Box paddingRight="sm">
196199
<ColoredCircle color="secondary" size="sm">
197200
{initials}
198201
</ColoredCircle>
199202
</Box>
200203
)}
201204

202-
<Paragraph size="small">{secret?.user?.name}</Paragraph>
205+
<Paragraph size="small">{secret?.body?.user?.name}</Paragraph>
203206
</FlexBox>
204207
</div>
205-
<Tooltip id={secret?.user?.name} text={secret?.user?.name} />
208+
<Tooltip
209+
id={secret?.body?.user?.name}
210+
text={secret?.body?.user?.name}
211+
/>
206212
</FlexBox>
207213
);
208214
},
@@ -216,13 +222,15 @@ export const GetHeaderCols = ({
216222
asc: (filteredSecrets: any[]) =>
217223
_.orderBy(
218224
filteredSecrets,
219-
(secret: any) => new Date(secret.created).getTime(),
225+
(secret: Secret) =>
226+
new Date(secret.body?.created || '').getTime(),
220227
['asc'],
221228
),
222229
desc: (filteredSecrets: any[]) =>
223230
_.orderBy(
224231
filteredSecrets,
225-
(secret: any) => new Date(secret.created).getTime(),
232+
(secret: Secret) =>
233+
new Date(secret.body?.created || '').getTime(),
226234
['desc'],
227235
),
228236
})}
@@ -236,18 +244,18 @@ export const GetHeaderCols = ({
236244
),
237245
testId: 'created_at',
238246
width: '20%',
239-
renderRow: (secret: any) => (
247+
renderRow: (secret: Secret) => (
240248
<FlexBox alignItems="center">
241-
<div data-tip data-for={formatDateToSort(secret.created)}>
249+
<div data-tip data-for={formatDateToSort(secret.body?.created || '')}>
242250
<FlexBox alignItems="center">
243251
<Paragraph color="grey" size="tiny">
244-
{formatDateToDisplayOnTable(secret.created)}
252+
{formatDateToDisplayOnTable(secret.body?.created || '')}
245253
</Paragraph>
246254
</FlexBox>
247255
</div>
248256
<Tooltip
249-
id={formatDateToSort(secret.created)}
250-
text={formatDateToDisplayOnTable(secret.created)}
257+
id={formatDateToSort(secret.body?.created || '')}
258+
text={formatDateToDisplayOnTable(secret.body?.created)}
251259
/>
252260
</FlexBox>
253261
),

‎src/ui/layouts/secrets/UpdateSecret/UpdateConfig/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const UpdateConfig: React.FC<{
3636
const workspaces = useSelector(workspaceSelectors.myWorkspaces);
3737
const { secret } = useService({ secretId });
3838
const [secretName, setSecretName] = useState(secret?.name);
39-
const [scope, setScope] = useState(secret?.scope);
39+
const [scope, setScope] = useState(secret?.body?.scope);
4040
const [inputFields, setInputFields] = useState([]) as any;
4141
const [loading, setLoading] = useState(false);
4242
const childStateRef = useRef(null);
@@ -45,7 +45,7 @@ export const UpdateConfig: React.FC<{
4545
setInputFields(childStateRef.current as any);
4646
// eslint-disable-next-line react-hooks/exhaustive-deps
4747
}, [childStateRef]);
48-
const valuesIntoArray = Object.entries(secret?.values || {}).map(
48+
const valuesIntoArray = Object.entries(secret?.body?.values || {}).map(
4949
([key, value]) => ({
5050
key,
5151
value,

‎src/ui/layouts/secrets/UpdateSecret/getHeaderCols.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ export const GetHeaderCols = ({
7878
width: '15%',
7979
renderRow: (secret: Secret) => (
8080
<FlexBox alignItems="center">
81-
<div data-tip data-for={secret.scope}>
81+
<div data-tip data-for={secret.body?.scope}>
8282
<Paragraph size="small" color="black">
83-
{secret.scope}
83+
{secret.body?.scope}
8484
</Paragraph>
8585
</div>
86-
<Tooltip id={secret.scope} text={secret.scope} />
86+
<Tooltip id={secret.body?.scope} text={secret.body?.scope} />
8787
</FlexBox>
8888
),
8989
},
@@ -129,16 +129,16 @@ export const GetHeaderCols = ({
129129
width: '20%',
130130
renderRow: (secret: Secret) => (
131131
<FlexBox alignItems="center">
132-
<div data-tip data-for={formatDateToSort(secret.created)}>
132+
<div data-tip data-for={formatDateToSort(secret.body?.created || '')}>
133133
<FlexBox alignItems="center">
134134
<Paragraph color="grey" size="tiny">
135-
{formatDateToDisplayOnTable(secret.created)}
135+
{formatDateToDisplayOnTable(secret.body?.created)}
136136
</Paragraph>
137137
</FlexBox>
138138
</div>
139139
<Tooltip
140-
id={formatDateToSort(secret.created)}
141-
text={formatDateToDisplayOnTable(secret.created)}
140+
id={formatDateToSort(secret.body?.created || '')}
141+
text={formatDateToDisplayOnTable(secret.body?.created)}
142142
/>
143143
</FlexBox>
144144
),

0 commit comments

Comments
 (0)