From d54ed38175285f8835fa2d8c2abb47b37409d9c4 Mon Sep 17 00:00:00 2001 From: "Liav Weiss (EXT-Nokia)" Date: Thu, 23 Jan 2025 17:15:31 +0200 Subject: [PATCH] feat(ws): Notebooks 2.0 // Frontend // Workspaces table // Workspace Kind column #148 Signed-off-by: Liav Weiss (EXT-Nokia) --- node_modules/.package-lock.json | 6 ------ package-lock.json | 6 ------ ...{WorkspacekindsActions.tsx => WorkspaceKindsActions.tsx} | 0 workspaces/frontend/src/app/context/useNotebookAPIState.tsx | 4 ++-- .../hooks/{useWorkspacekinds.ts => useWorkspaceKinds.ts} | 6 +++--- workspaces/frontend/src/app/pages/Workspaces/Workspaces.tsx | 6 +++--- workspaces/frontend/src/app/types.ts | 4 ++-- workspaces/frontend/src/shared/api/notebookService.ts | 2 +- 8 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 node_modules/.package-lock.json delete mode 100644 package-lock.json rename workspaces/frontend/src/app/actions/{WorkspacekindsActions.tsx => WorkspaceKindsActions.tsx} (100%) rename workspaces/frontend/src/app/hooks/{useWorkspacekinds.ts => useWorkspaceKinds.ts} (80%) diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json deleted file mode 100644 index d370bf52..00000000 --- a/node_modules/.package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "notebooks", - "lockfileVersion": 3, - "requires": true, - "packages": {} -} diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index d370bf52..00000000 --- a/package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "notebooks", - "lockfileVersion": 3, - "requires": true, - "packages": {} -} diff --git a/workspaces/frontend/src/app/actions/WorkspacekindsActions.tsx b/workspaces/frontend/src/app/actions/WorkspaceKindsActions.tsx similarity index 100% rename from workspaces/frontend/src/app/actions/WorkspacekindsActions.tsx rename to workspaces/frontend/src/app/actions/WorkspaceKindsActions.tsx diff --git a/workspaces/frontend/src/app/context/useNotebookAPIState.tsx b/workspaces/frontend/src/app/context/useNotebookAPIState.tsx index d79f910c..080b61aa 100644 --- a/workspaces/frontend/src/app/context/useNotebookAPIState.tsx +++ b/workspaces/frontend/src/app/context/useNotebookAPIState.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { APIState } from '~/shared/api/types'; import { NotebookAPIs } from '~/app/types'; -import { getNamespaces, getWorkspacekinds} from '~/shared/api/notebookService'; +import { getNamespaces, getWorkspaceKinds} from '~/shared/api/notebookService'; import useAPIState from '~/shared/api/useAPIState'; @@ -13,7 +13,7 @@ const useNotebookAPIState = ( const createAPI = React.useCallback( (path: string) => ({ getNamespaces: getNamespaces(path), - getWorkspacekinds: getWorkspacekinds(path), + getWorkspaceKinds: getWorkspaceKinds(path), }), [], ); diff --git a/workspaces/frontend/src/app/hooks/useWorkspacekinds.ts b/workspaces/frontend/src/app/hooks/useWorkspaceKinds.ts similarity index 80% rename from workspaces/frontend/src/app/hooks/useWorkspacekinds.ts rename to workspaces/frontend/src/app/hooks/useWorkspaceKinds.ts index 730aaf6e..f0ad1846 100644 --- a/workspaces/frontend/src/app/hooks/useWorkspacekinds.ts +++ b/workspaces/frontend/src/app/hooks/useWorkspaceKinds.ts @@ -6,14 +6,14 @@ import useFetchState, { import { WorkspaceKind } from '~/shared/types'; import { useNotebookAPI } from '~/app/hooks/useNotebookAPI'; -const useWorkspacekinds = (): FetchState => { +const useWorkspaceKinds = (): FetchState => { const { api, apiAvailable } = useNotebookAPI(); const call = React.useCallback>( (opts) => { if (!apiAvailable) { return Promise.reject(new Error('API not yet available')); } - return api.getWorkspacekinds(opts); + return api.getWorkspaceKinds(opts); }, [api, apiAvailable], ); @@ -21,4 +21,4 @@ const useWorkspacekinds = (): FetchState => { return useFetchState(call, []); }; -export default useWorkspacekinds; +export default useWorkspaceKinds; diff --git a/workspaces/frontend/src/app/pages/Workspaces/Workspaces.tsx b/workspaces/frontend/src/app/pages/Workspaces/Workspaces.tsx index 16c7b5ea..885b39d0 100644 --- a/workspaces/frontend/src/app/pages/Workspaces/Workspaces.tsx +++ b/workspaces/frontend/src/app/pages/Workspaces/Workspaces.tsx @@ -32,8 +32,8 @@ import { WorkspaceDetails } from '~/app/pages/Workspaces/Details/WorkspaceDetail import { ExpandedWorkspaceRow } from '~/app/pages/Workspaces/ExpandedWorkspaceRow'; import Filter, { FilteredColumn } from 'shared/components/Filter'; import { formatRam } from 'shared/utilities/WorkspaceResources'; -import { buildKindLogoDictionary } from '~/app/actions/WorkspacekindsActions'; -import useWorkspacekinds from '~/app/hooks/useWorkspacekinds'; +import { buildKindLogoDictionary } from '~/app/actions/WorkspaceKindsActions'; +import useWorkspaceKinds from '~/app/hooks/useWorkspaceKinds'; export const Workspaces: React.FunctionComponent = () => { /* Mocked workspaces, to be removed after fetching info from backend */ @@ -135,7 +135,7 @@ export const Workspaces: React.FunctionComponent = () => { }, ]; - const [workspaceKinds, loaded, loadError] = useWorkspacekinds(); + const [workspaceKinds, loaded, loadError] = useWorkspaceKinds(); let kindLogoDict: Record = {}; if (loaded && workspaceKinds) { diff --git a/workspaces/frontend/src/app/types.ts b/workspaces/frontend/src/app/types.ts index 2a7b5b50..26ba3e1f 100644 --- a/workspaces/frontend/src/app/types.ts +++ b/workspaces/frontend/src/app/types.ts @@ -65,9 +65,9 @@ export type NamespacesList = Namespace[]; export type GetNamespaces = (opts: APIOptions) => Promise; -export type GetWorkspacekinds = (opts: APIOptions) => Promise; +export type GetWorkspaceKinds = (opts: APIOptions) => Promise; export type NotebookAPIs = { getNamespaces: GetNamespaces; - getWorkspacekinds: GetWorkspacekinds; + getWorkspaceKinds: GetWorkspaceKinds; }; diff --git a/workspaces/frontend/src/shared/api/notebookService.ts b/workspaces/frontend/src/shared/api/notebookService.ts index c7cf9979..27cbd9e4 100644 --- a/workspaces/frontend/src/shared/api/notebookService.ts +++ b/workspaces/frontend/src/shared/api/notebookService.ts @@ -14,7 +14,7 @@ export const getNamespaces = throw new Error('Invalid response format'); }); - export const getWorkspacekinds = + export const getWorkspaceKinds = (hostPath: string) => (opts: APIOptions): Promise => handleRestFailures(restGET(hostPath, `/workspacekinds`, {}, opts)).then((response) => {