Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@eslint/compat": "^2.0.3",
"@eslint/eslintrc": "^3.3.5",
"@eslint/js": "^9.0.0",
"@meshery/schemas": "^1.0.1",
"@meshery/schemas": "^1.0.4",
"@mui/icons-material": "^7.3.9",
Comment on lines 49 to 51
Copy link

Copilot AI Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

package-lock.json still pins @meshery/schemas to 1.0.1 (including the resolved tarball), while package.json is bumped to ^1.0.4. This will cause installs/CI to keep using 1.0.1. Please update/commit the lockfile to match the new version.

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed — updated package-lock.json to resolve @meshery/schemas@1.0.4, matching the package.json version.

"@reduxjs/toolkit": "^2.11.2",
"@testing-library/dom": "^10.4.1",
Expand Down
3 changes: 3 additions & 0 deletions src/custom/Workspaces/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ export interface Workspace {
id: string;
name: string;
description?: string;
organization_id?: string;
owner?: string;
metadata?: Record<string, string>;
created_at: string;
updated_at: string;
deleted_at: {
Expand Down
13 changes: 13 additions & 0 deletions src/schemas/createAndEditWorkspace/schema.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ import { WorkspaceDefinitionV1Beta1OpenApiSchema } from '@meshery/schemas';

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const workspaceSchema = (WorkspaceDefinitionV1Beta1OpenApiSchema as any).components.schemas;

/**
* Create workspace schema - name is required
*/
const createAndEditWorkspace = {
properties: {
description: {
Expand Down Expand Up @@ -33,4 +37,13 @@ const createAndEditWorkspace = {
required: ['name', 'organization']
};

/**
* Edit workspace schema - name is optional per WorkspaceUpdatePayload
*/
const editWorkspace = {
...createAndEditWorkspace,
required: ['organization']
Comment thread
miacycle marked this conversation as resolved.
};

export default createAndEditWorkspace;
export { editWorkspace };
5 changes: 4 additions & 1 deletion src/schemas/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import helpAndSupportModalUiSchema from './helpAndSupportModal/uiSchema';
import createAndEditEnvironmentSchema from './createAndEditEnvironment/schema';
import createAndEditEnvironmentUiSchema from './createAndEditEnvironment/uiSchema';

import createAndEditWorkspaceSchema from './createAndEditWorkspace/schema';
import createAndEditWorkspaceSchema, {
editWorkspace as editWorkspaceSchema
} from './createAndEditWorkspace/schema';
import createAndEditWorkspaceUiSchema from './createAndEditWorkspace/uiSchema';

import helmConnectionSchema from './helmConnection/schema';
Expand Down Expand Up @@ -80,6 +82,7 @@ export {
createAndEditEnvironmentUiSchema,
createAndEditWorkspaceSchema,
createAndEditWorkspaceUiSchema,
editWorkspaceSchema,
grafanaCredentialSUiSchema,
grafanaCredentialSchema,
helmConnectionSchema,
Expand Down
Loading