Skip to content

Commit bfde137

Browse files
committed
Upgrade @meshery/schemas to v1.0.4 for Workspace enhancements
- Bump @meshery/schemas devDependency from ^1.0.1 to ^1.0.4 - Add editWorkspaceSchema with optional name for WorkspaceUpdatePayload support - Align Workspace type with schema v1.0.4 (add organization_id, owner, metadata) - Export editWorkspaceSchema from schemas index Signed-off-by: Lee Calcote <lee.calcote@layer5.io>
1 parent 2d3944d commit bfde137

File tree

4 files changed

+21
-2
lines changed

4 files changed

+21
-2
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"@eslint/compat": "^2.0.3",
4848
"@eslint/eslintrc": "^3.3.5",
4949
"@eslint/js": "^9.0.0",
50-
"@meshery/schemas": "^1.0.1",
50+
"@meshery/schemas": "^1.0.4",
5151
"@mui/icons-material": "^7.3.9",
5252
"@reduxjs/toolkit": "^2.11.2",
5353
"@testing-library/dom": "^10.4.1",

src/custom/Workspaces/types.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ export interface Workspace {
1717
id: string;
1818
name: string;
1919
description?: string;
20+
organization_id?: string;
21+
owner?: string;
22+
metadata?: Record<string, string>;
2023
created_at: string;
2124
updated_at: string;
2225
deleted_at: {

src/schemas/createAndEditWorkspace/schema.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ import { WorkspaceDefinitionV1Beta1OpenApiSchema } from '@meshery/schemas';
55

66
// eslint-disable-next-line @typescript-eslint/no-explicit-any
77
const workspaceSchema = (WorkspaceDefinitionV1Beta1OpenApiSchema as any).components.schemas;
8+
9+
/**
10+
* Create workspace schema - name is required
11+
*/
812
const createAndEditWorkspace = {
913
properties: {
1014
description: {
@@ -33,4 +37,13 @@ const createAndEditWorkspace = {
3337
required: ['name', 'organization']
3438
};
3539

40+
/**
41+
* Edit workspace schema - name is optional per WorkspaceUpdatePayload
42+
*/
43+
const editWorkspace = {
44+
...createAndEditWorkspace,
45+
required: ['organization']
46+
};
47+
3648
export default createAndEditWorkspace;
49+
export { editWorkspace };

src/schemas/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import helpAndSupportModalUiSchema from './helpAndSupportModal/uiSchema';
44
import createAndEditEnvironmentSchema from './createAndEditEnvironment/schema';
55
import createAndEditEnvironmentUiSchema from './createAndEditEnvironment/uiSchema';
66

7-
import createAndEditWorkspaceSchema from './createAndEditWorkspace/schema';
7+
import createAndEditWorkspaceSchema, {
8+
editWorkspace as editWorkspaceSchema
9+
} from './createAndEditWorkspace/schema';
810
import createAndEditWorkspaceUiSchema from './createAndEditWorkspace/uiSchema';
911

1012
import helmConnectionSchema from './helmConnection/schema';
@@ -80,6 +82,7 @@ export {
8082
createAndEditEnvironmentUiSchema,
8183
createAndEditWorkspaceSchema,
8284
createAndEditWorkspaceUiSchema,
85+
editWorkspaceSchema,
8386
grafanaCredentialSUiSchema,
8487
grafanaCredentialSchema,
8588
helmConnectionSchema,

0 commit comments

Comments
 (0)