Skip to content

Commit 697ffd7

Browse files
thaorellthaorell
authored
feat: Add PVC and StorageClasses API client to frontend (#934)
* feat: Add PVC and StorageClasses API client to frontend Signed-off-by: Charles Thao <cthao@redhat.com> * Updated Swagger.version to latest Signed-off-by: Charles Thao <cthao@redhat.com> --------- Signed-off-by: Charles Thao <cthao@redhat.com>
1 parent 455b333 commit 697ffd7

26 files changed

+686
-135
lines changed

‎workspaces/frontend/config/cspell-ignore-words.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ pficon
1010
svgs
1111
labelledby
1212
xlarge
13+
storageclasses
14+
pvcs
15+
rwop

‎workspaces/frontend/scripts/swagger.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fc3504085df1b118b485bfe966e19a1bf2d530f4
1+
455b3339e9e5f5ff610d6d3e04a7d68fa9ad5c29

‎workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaceKinds/workspaceKindSummary.cy.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
buildMockWorkspaceWithPodConfig,
2020
} from '~/__tests__/cypress/cypress/utils/testBuilders';
2121
import { NOTEBOOKS_API_VERSION } from '~/__tests__/cypress/cypress/support/commands/api';
22-
import { WorkspacesWorkspaceState } from '~/generated/data-contracts';
22+
import { V1Beta1WorkspaceState } from '~/generated/data-contracts';
2323

2424
const DEFAULT_NAMESPACE = 'default';
2525
const NAMESPACE_A = 'namespace-a';
@@ -48,7 +48,7 @@ const setupWorkspaceKindSummary = (args: {
4848
count: workspaceCount,
4949
namespace: mockNamespace.name,
5050
kind: mockWorkspaceKind,
51-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
51+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
5252
});
5353

5454
cy.interceptApi(
@@ -86,14 +86,14 @@ const setupMultiNamespaceWorkspaces = (args: {
8686
count: namespaceACount,
8787
namespace: mockNamespaceA.name,
8888
kind: mockWorkspaceKind,
89-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
89+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
9090
});
9191

9292
const namespaceBWorkspaces = buildMockWorkspaceList({
9393
count: namespaceBCount,
9494
namespace: mockNamespaceB.name,
9595
kind: mockWorkspaceKind,
96-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
96+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
9797
});
9898

9999
const allWorkspaces = [...namespaceAWorkspaces, ...namespaceBWorkspaces];
@@ -257,21 +257,21 @@ describe('Workspace Kind Summary', () => {
257257
namespace: DEFAULT_NAMESPACE,
258258
workspaceKindName: TEST_WORKSPACE_KIND,
259259
gpuCount: 2,
260-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
260+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
261261
}),
262262
buildMockWorkspaceWithGPU({
263263
name: 'Workspace 2',
264264
namespace: DEFAULT_NAMESPACE,
265265
workspaceKindName: TEST_WORKSPACE_KIND,
266266
gpuCount: 3,
267-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
267+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
268268
}),
269269
buildMockWorkspaceWithGPU({
270270
name: 'Workspace 3',
271271
namespace: DEFAULT_NAMESPACE,
272272
workspaceKindName: TEST_WORKSPACE_KIND,
273273
gpuCount: 4,
274-
state: WorkspacesWorkspaceState.WorkspaceStatePaused,
274+
state: V1Beta1WorkspaceState.WorkspaceStatePaused,
275275
}),
276276
];
277277

@@ -296,7 +296,7 @@ describe('Workspace Kind Summary', () => {
296296
name: 'Workspace 1',
297297
namespace: DEFAULT_NAMESPACE,
298298
workspaceKind: buildMockWorkspaceKindInfo({ name: TEST_WORKSPACE_KIND }),
299-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
299+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
300300
podTemplate: buildMockPodTemplate({
301301
options: buildPodTemplateOptions({
302302
podConfig: buildMockPodConfig({
@@ -335,7 +335,7 @@ describe('Workspace Kind Summary', () => {
335335
namespace: DEFAULT_NAMESPACE,
336336
workspaceKindName: TEST_WORKSPACE_KIND,
337337
gpuCount: 1,
338-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
338+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
339339
activity: {
340340
lastActivity: now,
341341
lastUpdate: now,
@@ -346,7 +346,7 @@ describe('Workspace Kind Summary', () => {
346346
namespace: DEFAULT_NAMESPACE,
347347
workspaceKindName: TEST_WORKSPACE_KIND,
348348
gpuCount: 2,
349-
state: WorkspacesWorkspaceState.WorkspaceStatePaused,
349+
state: V1Beta1WorkspaceState.WorkspaceStatePaused,
350350
activity: {
351351
lastActivity: twoHoursAgo,
352352
lastUpdate: twoHoursAgo,
@@ -376,7 +376,7 @@ describe('Workspace Kind Summary', () => {
376376
namespace: DEFAULT_NAMESPACE,
377377
workspaceKindName: TEST_WORKSPACE_KIND,
378378
gpuCount: 1,
379-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
379+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
380380
activity: {
381381
lastActivity: now,
382382
lastUpdate: now,
@@ -387,7 +387,7 @@ describe('Workspace Kind Summary', () => {
387387
namespace: DEFAULT_NAMESPACE,
388388
workspaceKindName: TEST_WORKSPACE_KIND,
389389
gpuCount: 2,
390-
state: WorkspacesWorkspaceState.WorkspaceStatePaused,
390+
state: V1Beta1WorkspaceState.WorkspaceStatePaused,
391391
activity: {
392392
lastActivity: twoHoursAgo,
393393
lastUpdate: twoHoursAgo,
@@ -421,7 +421,7 @@ describe('Workspace Kind Summary', () => {
421421
name: 'Workspace A1',
422422
namespace: mockNamespaceA.name,
423423
workspaceKind: mockWorkspaceKind,
424-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
424+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
425425
podTemplate: buildMockPodTemplate({
426426
options: buildPodTemplateOptions({
427427
podConfig: buildMockPodConfig({
@@ -439,7 +439,7 @@ describe('Workspace Kind Summary', () => {
439439
name: 'Workspace B1',
440440
namespace: mockNamespaceB.name,
441441
workspaceKind: mockWorkspaceKind,
442-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
442+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
443443
podTemplate: buildMockPodTemplate({
444444
options: buildPodTemplateOptions({
445445
podConfig: buildMockPodConfig({
@@ -496,7 +496,7 @@ describe('Workspace Kind Summary', () => {
496496
name: 'Workspace 1',
497497
namespace: DEFAULT_NAMESPACE,
498498
workspaceKind: buildMockWorkspaceKindInfo({ name: TEST_WORKSPACE_KIND }),
499-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
499+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
500500
podTemplate: buildMockPodTemplate({
501501
options: buildPodTemplateOptions({
502502
podConfig: buildMockPodConfig({
@@ -706,19 +706,19 @@ describe('Workspace Kind Summary', () => {
706706
name: 'Running Workspace',
707707
namespace: DEFAULT_NAMESPACE,
708708
workspaceKind: buildMockWorkspaceKindInfo({ name: TEST_WORKSPACE_KIND }),
709-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
709+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
710710
}),
711711
buildMockWorkspace({
712712
name: 'Paused Workspace',
713713
namespace: DEFAULT_NAMESPACE,
714714
workspaceKind: buildMockWorkspaceKindInfo({ name: TEST_WORKSPACE_KIND }),
715-
state: WorkspacesWorkspaceState.WorkspaceStatePaused,
715+
state: V1Beta1WorkspaceState.WorkspaceStatePaused,
716716
}),
717717
buildMockWorkspace({
718718
name: 'Error Workspace',
719719
namespace: DEFAULT_NAMESPACE,
720720
workspaceKind: buildMockWorkspaceKindInfo({ name: TEST_WORKSPACE_KIND }),
721-
state: WorkspacesWorkspaceState.WorkspaceStateError,
721+
state: V1Beta1WorkspaceState.WorkspaceStateError,
722722
}),
723723
];
724724

‎workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaces/editWorkspace.cy.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
buildMockWorkspaceUpdate,
1010
} from '~/shared/mock/mockBuilder';
1111
import { NOTEBOOKS_API_VERSION } from '~/__tests__/cypress/cypress/support/commands/api';
12-
import { WorkspacesWorkspaceState } from '~/generated/data-contracts';
12+
import { V1Beta1WorkspaceState } from '~/generated/data-contracts';
1313
import { toastNotification } from '~/__tests__/cypress/cypress/pages/components/toastNotification';
1414

1515
const DEFAULT_NAMESPACE = 'default';
@@ -31,7 +31,7 @@ const setupEditWorkspace = (): EditWorkspaceSetup => {
3131
name: TEST_WORKSPACE_NAME,
3232
namespace: mockNamespace.name,
3333
workspaceKind: buildMockWorkspaceKindInfo({ name: WORKSPACE_KIND_NAME }),
34-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
34+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
3535
podTemplate: {
3636
podMetadata: {
3737
labels: { testLabel: 'testValue' },
@@ -328,7 +328,7 @@ describe('Edit workspace', () => {
328328
name: TEST_WORKSPACE_NAME,
329329
namespace: mockNamespace.name,
330330
workspaceKind: buildMockWorkspaceKindInfo({ name: WORKSPACE_KIND_NAME }),
331-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
331+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
332332
});
333333
const mockWorkspaceUpdateResponse = buildMockWorkspaceUpdate({
334334
podTemplate: {

‎workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaces/secretsAttach.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
buildMockWorkspaceUpdateFromWorkspace,
1212
} from '~/shared/mock/mockBuilder';
1313
import { navBar } from '~/__tests__/cypress/cypress/pages/components/navBar';
14-
import { WorkspacesWorkspaceState } from '~/generated/data-contracts';
14+
import { V1Beta1WorkspaceState } from '~/generated/data-contracts';
1515

1616
describe('SecretsAttachModal', () => {
1717
const mockNamespace = buildMockNamespace({ name: 'default' });
@@ -22,7 +22,7 @@ describe('SecretsAttachModal', () => {
2222
name: 'test-workspace',
2323
namespace: mockNamespace.name,
2424
workspaceKind: mockWorkspaceKindInfo,
25-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
25+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
2626
});
2727
mockWorkspaceListItem.podTemplate.volumes.secrets = [];
2828

‎workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaces/secretsEdit.cy.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
buildMockWorkspaceUpdateFromWorkspace,
1616
} from '~/shared/mock/mockBuilder';
1717
import { navBar } from '~/__tests__/cypress/cypress/pages/components/navBar';
18-
import { WorkspacesWorkspaceState } from '~/generated/data-contracts';
18+
import { V1Beta1WorkspaceState } from '~/generated/data-contracts';
1919

2020
describe('Edit Secret Modal', () => {
2121
const mockNamespace = buildMockNamespace({ name: 'default' });
@@ -26,7 +26,7 @@ describe('Edit Secret Modal', () => {
2626
name: 'test-workspace',
2727
namespace: mockNamespace.name,
2828
workspaceKind: mockWorkspaceKindInfo,
29-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
29+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
3030
});
3131

3232
// Add a secret to the workspace
@@ -194,7 +194,7 @@ describe('Edit Secret Modal', () => {
194194
name: 'test-workspace',
195195
namespace: mockNamespace.name,
196196
workspaceKind: mockWorkspaceKindInfo,
197-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
197+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
198198
});
199199
workspaceWithImmutableSecret.podTemplate.volumes.secrets = [
200200
{ secretName: 'immutable-secret', mountPath: '/mnt/immutable', defaultMode: 420 },

‎workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaces/secretsManagement.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
buildMockWorkspaceUpdateFromWorkspace,
1212
} from '~/shared/mock/mockBuilder';
1313
import { navBar } from '~/__tests__/cypress/cypress/pages/components/navBar';
14-
import { WorkspacesWorkspaceState } from '~/generated/data-contracts';
14+
import { V1Beta1WorkspaceState } from '~/generated/data-contracts';
1515

1616
describe('Secrets Expandable Key/Value Pairs', () => {
1717
const mockNamespace = buildMockNamespace({ name: 'default' });
@@ -23,7 +23,7 @@ describe('Secrets Expandable Key/Value Pairs', () => {
2323
name: 'test-workspace',
2424
namespace: mockNamespace.name,
2525
workspaceKind: mockWorkspaceKindInfo,
26-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
26+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
2727
});
2828

2929
// Override the secrets in the workspace

‎workspaces/frontend/src/__tests__/cypress/cypress/tests/mocked/workspaces/workspaceRedirects.cy.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
} from '~/shared/mock/mockBuilder';
1515
import { NOTEBOOKS_API_VERSION } from '~/__tests__/cypress/cypress/support/commands/api';
1616
import { navBar } from '~/__tests__/cypress/cypress/pages/components/navBar';
17-
import { WorkspacesWorkspaceState } from '~/generated/data-contracts';
17+
import { V1Beta1WorkspaceState } from '~/generated/data-contracts';
1818

1919
const DEFAULT_NAMESPACE = 'default';
2020

@@ -28,7 +28,7 @@ describe('Workspace Redirects', () => {
2828
name: 'Workspace with Image Redirect',
2929
namespace: mockNamespace.name,
3030
workspaceKind: mockWorkspaceKind,
31-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
31+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
3232
podTemplate: buildMockPodTemplate({
3333
options: buildPodTemplateOptions({
3434
imageConfig: {
@@ -78,7 +78,7 @@ describe('Workspace Redirects', () => {
7878
name: 'Workspace with Pod Config Redirect',
7979
namespace: mockNamespace.name,
8080
workspaceKind: mockWorkspaceKind,
81-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
81+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
8282
podTemplate: buildMockPodTemplate({
8383
options: buildPodTemplateOptions({
8484
podConfig: {
@@ -128,7 +128,7 @@ describe('Workspace Redirects', () => {
128128
name: 'Workspace without Redirects',
129129
namespace: mockNamespace.name,
130130
workspaceKind: mockWorkspaceKind,
131-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
131+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
132132
podTemplate: buildMockPodTemplate({
133133
options: buildPodTemplateOptions({
134134
imageConfig: buildMockImageConfig({
@@ -176,7 +176,7 @@ describe('Workspace Redirects', () => {
176176
name: 'Workspace with Both Redirects',
177177
namespace: mockNamespace.name,
178178
workspaceKind: mockWorkspaceKind,
179-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
179+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
180180
podTemplate: buildMockPodTemplate({
181181
options: buildPodTemplateOptions({
182182
imageConfig: {
@@ -242,7 +242,7 @@ describe('Workspace Redirects', () => {
242242
name: 'Test Workspace',
243243
namespace: mockNamespace.name,
244244
workspaceKind: mockWorkspaceKind,
245-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
245+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
246246
podTemplate: buildMockPodTemplate({
247247
options: buildPodTemplateOptions({
248248
imageConfig: {
@@ -289,7 +289,7 @@ describe('Workspace Redirects', () => {
289289
name: 'Test Workspace',
290290
namespace: mockNamespace.name,
291291
workspaceKind: mockWorkspaceKind,
292-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
292+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
293293
podTemplate: buildMockPodTemplate({
294294
options: buildPodTemplateOptions({
295295
imageConfig: {
@@ -340,7 +340,7 @@ describe('Workspace Redirects', () => {
340340
name: 'Multi-step Redirect Workspace',
341341
namespace: mockNamespace.name,
342342
workspaceKind: mockWorkspaceKind,
343-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
343+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
344344
podTemplate: buildMockPodTemplate({
345345
options: buildPodTemplateOptions({
346346
imageConfig: {
@@ -392,7 +392,7 @@ describe('Workspace Redirects', () => {
392392
name: 'Severity Labels Workspace',
393393
namespace: mockNamespace.name,
394394
workspaceKind: mockWorkspaceKind,
395-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
395+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
396396
podTemplate: buildMockPodTemplate({
397397
options: buildPodTemplateOptions({
398398
imageConfig: {
@@ -447,7 +447,7 @@ describe('Workspace Redirects', () => {
447447
name: 'Messages Workspace',
448448
namespace: mockNamespace.name,
449449
workspaceKind: mockWorkspaceKind,
450-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
450+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
451451
podTemplate: buildMockPodTemplate({
452452
options: buildPodTemplateOptions({
453453
imageConfig: {
@@ -503,7 +503,7 @@ describe('Workspace Redirects', () => {
503503
name: 'Pod Config Redirect Workspace',
504504
namespace: mockNamespace.name,
505505
workspaceKind: mockWorkspaceKind,
506-
state: WorkspacesWorkspaceState.WorkspaceStateRunning,
506+
state: V1Beta1WorkspaceState.WorkspaceStateRunning,
507507
podTemplate: buildMockPodTemplate({
508508
options: buildPodTemplateOptions({
509509
podConfig: {

0 commit comments

Comments
 (0)