Skip to content

Upgrade @meshery/schemas to v1.0.4 for Workspace enhancements #1392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miacycle merged 2 commits into from
Apr 7, 2026
Merged

Upgrade @meshery/schemas to v1.0.4 for Workspace enhancements #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfde137
Upgrade @meshery/schemas to v1.0.4 for Workspace enhancements
leecalcote Apr 7, 2026
5c23ad3
fix: update lockfile to @meshery/schemas 1.0.4 and correct comment
leecalcote Apr 7, 2026
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
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
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

@fitzergerald fitzergerald Apr 7, 2026

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
View file
Open in desktop
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
View file
Open in desktop
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 (derived from WorkspacePayload with relaxed requirements)
*/
const editWorkspace = {
...createAndEditWorkspace,
required: ['organization']
};

export default createAndEditWorkspace;
export { editWorkspace };
5 changes: 4 additions & 1 deletion src/schemas/index.tsx
View file
Open in desktop
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