From 084aa7e968f3c962b4ff82bbaeeed2eb57b563d3 Mon Sep 17 00:00:00 2001 From: gabriel-farache Date: Fri, 21 Jun 2024 10:06:09 +0200 Subject: [PATCH] Fix errors Signed-off-by: gabriel-farache --- plugins/orchestrator-backend/dist-dynamic/package.json | 9 +++++---- .../WorkflowDefinitionViewerPage.tsx | 2 +- .../orchestrator/src/components/WorkflowInstancePage.tsx | 2 +- plugins/orchestrator/src/components/WorkflowsTable.tsx | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/plugins/orchestrator-backend/dist-dynamic/package.json b/plugins/orchestrator-backend/dist-dynamic/package.json index 1912e2bee33..ee309685757 100644 --- a/plugins/orchestrator-backend/dist-dynamic/package.json +++ b/plugins/orchestrator-backend/dist-dynamic/package.json @@ -47,6 +47,7 @@ ], "scripts": {}, "dependencies": { + "@janus-idp/backstage-plugin-rbac-common": "^1.6.0", "@urql/core": "^4.1.4", "ajv-formats": "^2.1.1", "cloudevents": "^8.0.0", @@ -71,21 +72,21 @@ "@backstage/backend-app-api": "^0.7.5", "@backstage/backend-common": "^0.22.0", "@backstage/backend-dynamic-feature-service": "^0.2.10", - "@backstage/errors": "^1.2.4", "@backstage/backend-plugin-api": "^0.6.18", "@backstage/backend-tasks": "^0.5.23", "@backstage/catalog-client": "^1.6.5", "@backstage/config": "^1.2.0", "@backstage/core-plugin-api": "^1.9.2", + "@backstage/errors": "^1.2.4", "@backstage/integration": "^1.11.0", + "@backstage/plugin-auth-node": "^0.4.13", "@backstage/plugin-catalog-node": "^1.12.0", "@backstage/plugin-events-backend": "^0.3.5", "@backstage/plugin-events-node": "^0.3.4", - "@backstage/plugin-scaffolder-backend": "^1.22.8", - "@backstage/plugin-scaffolder-node": "^0.4.4", "@backstage/plugin-permission-common": "^0.7.13", "@backstage/plugin-permission-node": "^0.7.29", - "@backstage/plugin-auth-node": "^0.4.13", + "@backstage/plugin-scaffolder-backend": "^1.22.8", + "@backstage/plugin-scaffolder-node": "^0.4.4", "@backstage/types": "^1.1.1" }, "overrides": { diff --git a/plugins/orchestrator/src/components/WorkflowDefinitionViewerPage/WorkflowDefinitionViewerPage.tsx b/plugins/orchestrator/src/components/WorkflowDefinitionViewerPage/WorkflowDefinitionViewerPage.tsx index fcd5d1f9a28..177b36e728e 100644 --- a/plugins/orchestrator/src/components/WorkflowDefinitionViewerPage/WorkflowDefinitionViewerPage.tsx +++ b/plugins/orchestrator/src/components/WorkflowDefinitionViewerPage/WorkflowDefinitionViewerPage.tsx @@ -10,10 +10,10 @@ import { } from '@backstage/core-plugin-api'; import { usePermission } from '@backstage/plugin-permission-react'; -import { Tooltip } from '@mui/material'; import Button from '@mui/material/Button'; import Grid from '@mui/material/Grid'; import Skeleton from '@mui/material/Skeleton'; +import Tooltip from '@mui/material/Tooltip'; import { orchestratorWorkflowExecutePermission } from '@janus-idp/backstage-plugin-orchestrator-common'; diff --git a/plugins/orchestrator/src/components/WorkflowInstancePage.tsx b/plugins/orchestrator/src/components/WorkflowInstancePage.tsx index 046c828c90b..1b6cdbfc1ab 100644 --- a/plugins/orchestrator/src/components/WorkflowInstancePage.tsx +++ b/plugins/orchestrator/src/components/WorkflowInstancePage.tsx @@ -13,9 +13,9 @@ import { } from '@backstage/core-plugin-api'; import { usePermission } from '@backstage/plugin-permission-react'; -import { Tooltip } from '@mui/material'; import Button from '@mui/material/Button'; import Grid from '@mui/material/Grid'; +import Tooltip from '@mui/material/Tooltip'; import { AssessedProcessInstance, diff --git a/plugins/orchestrator/src/components/WorkflowsTable.tsx b/plugins/orchestrator/src/components/WorkflowsTable.tsx index 330c8f1444b..1363d477c1d 100644 --- a/plugins/orchestrator/src/components/WorkflowsTable.tsx +++ b/plugins/orchestrator/src/components/WorkflowsTable.tsx @@ -85,7 +85,7 @@ export const WorkflowsTable = ({ items }: WorkflowsTableProps) => { ]; return actionItems; - }, [handleExecute, handleView]); + }, [handleExecute, handleView, permittedToExecute]); const columns = useMemo[]>( () => [