Merge branch 'main' into mta-2007

konveyor · Jan 15, 2024 · 692b3db · 692b3db
2 parents 0a3dbd0 + 2ea144d
commit 692b3db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 24 deletions.
diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -54,16 +54,12 @@ import keycloak from "@app/keycloak";
 import {
   RBAC,
   RBAC_TYPE,
-  analysisReadScopes,
-  analysisWriteScopes,
+  analysesReadScopes,
   applicationsWriteScopes,
-  assessmentReadScopes,
   assessmentWriteScopes,
   credentialsReadScopes,
-  credentialsWriteScopes,
   dependenciesWriteScopes,
   importsWriteScopes,
-  reviewsReadScopes,
   reviewsWriteScopes,
   tasksReadScopes,
   tasksWriteScopes,
@@ -542,16 +538,12 @@ export const ApplicationsTable: React.FC = () => {
     importWriteAccess = checkAccess(userScopes, importsWriteScopes),
     applicationWriteAccess = checkAccess(userScopes, applicationsWriteScopes),
     assessmentWriteAccess = checkAccess(userScopes, assessmentWriteScopes),
-    analysisWriteAccess = checkAccess(userScopes, analysisWriteScopes),
-    assessmentReadAccess = checkAccess(userScopes, assessmentReadScopes),
     credentialsReadAccess = checkAccess(userScopes, credentialsReadScopes),
-    credentialsWriteAccess = checkAccess(userScopes, credentialsWriteScopes),
     dependenciesWriteAccess = checkAccess(userScopes, dependenciesWriteScopes),
-    analysisReadAccess = checkAccess(userScopes, analysisReadScopes),
+    analysesReadAccess = checkAccess(userScopes, analysesReadScopes),
     tasksReadAccess = checkAccess(userScopes, tasksReadScopes),
     tasksWriteAccess = checkAccess(userScopes, tasksWriteScopes),
-    reviewsWriteAccess = checkAccess(userScopes, reviewsWriteScopes),
-    reviewsReadAccess = checkAccess(userScopes, reviewsReadScopes);
+    reviewsWriteAccess = checkAccess(userScopes, reviewsWriteScopes);
 
   const areAppsInWaves = selectedRows.some(
     (application) => application.migrationWave !== null
@@ -1031,7 +1023,7 @@ export const ApplicationsTable: React.FC = () => {
                                   },
                                 ]
                               : []),
-                            ...(analysisReadAccess && hasExistingAnalysis
+                            ...(analysesReadAccess && hasExistingAnalysis
                               ? [
                                   {
                                     title: t("actions.analysisDetails"),

diff --git a/client/src/app/rbac.ts b/client/src/app/rbac.ts
@@ -110,18 +110,7 @@ export const archetypesWriteScopes = [
   "archetypes:delete",
 ];
 
-export const analysisWriteScopes = [
-  "applications.analysis:put",
-  "applications.analysis:post",
-  "applications.analysis:delete",
-  "archetypes.analysis:put",
-  "archetypes.analysis:post",
-  "archetypes.analysis:delete",
-];
-export const analysisReadScopes = [
-  "applications.analysis:get",
-  "archetypes.analysis:get",
-];
+export const analysesReadScopes = ["applications.analyses:get"];
 
 export const assessmentWriteScopes = [
   "applications.assessments:put",