fix(quay): fix dev mode by adding mock PermissionApi

janus-idp · Jun 28, 2024 · bce2c69 · bce2c69
1 parent d4a5075
commit bce2c69
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/plugins/quay/dev/index.tsx b/plugins/quay/dev/index.tsx
@@ -3,6 +3,8 @@ import React from 'react';
 import { Entity } from '@backstage/catalog-model';
 import { createDevApp } from '@backstage/dev-utils';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
+import { permissionApiRef } from '@backstage/plugin-permission-react';
+import { MockPermissionApi, TestApiProvider } from '@backstage/test-utils';
 
 import { createDevAppThemes } from '@redhat-developer/red-hat-developer-hub-theme';
 
@@ -25,14 +27,18 @@ const mockEntity: Entity = {
   },
 };
 
+const mockPermissionApi = new MockPermissionApi();
+
 createDevApp()
   .registerPlugin(quayPlugin)
   .addThemes(createDevAppThemes())
   .addPage({
     element: (
-      <EntityProvider entity={mockEntity}>
-        <QuayPage />
-      </EntityProvider>
+      <TestApiProvider apis={[[permissionApiRef, mockPermissionApi]]}>
+        <EntityProvider entity={mockEntity}>
+          <QuayPage />
+        </EntityProvider>
+      </TestApiProvider>
     ),
     title: 'Root Page',
     path: '/quay',

diff --git a/plugins/quay/package.json b/plugins/quay/package.json
@@ -29,7 +29,6 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^1.5.0",
-    "@backstage/plugin-catalog-common": "^1.0.23",
     "@backstage/plugin-permission-react": "^0.4.22",
     "@janus-idp/backstage-plugin-quay-common": "0.1.0",
     "@backstage/core-components": "^0.14.7",

diff --git a/plugins/quay/src/components/PermissionAlert/PermissionAlert.tsx b/plugins/quay/src/components/PermissionAlert/PermissionAlert.tsx
@@ -7,7 +7,7 @@ const PermissionAlert = () => {
     <Alert severity="warning" data-testid="no-permission-alert">
       <AlertTitle>Permission required</AlertTitle>
       To view quay image registry, contact your administrator to give you the
-      quay.view.read and catalog.entity.read permissions.
+      quay.view.read permission.
     </Alert>
   );
 };

diff --git a/plugins/quay/src/hooks/useQuayViewPermission.ts b/plugins/quay/src/hooks/useQuayViewPermission.ts
@@ -1,4 +1,3 @@
-import { catalogEntityReadPermission } from '@backstage/plugin-catalog-common/alpha';
 import { usePermission } from '@backstage/plugin-permission-react';
 
 import { quayViewPermission } from '@janus-idp/backstage-plugin-quay-common';
@@ -8,12 +7,5 @@ export const useQuayViewPermission = () => {
     permission: quayViewPermission,
   });
 
-  const catalogEntityPermissionResult = usePermission({
-    permission: catalogEntityReadPermission,
-    resourceRef: catalogEntityReadPermission.resourceType,
-  });
-
-  return (
-    quayViewPermissionResult.allowed && catalogEntityPermissionResult.allowed
-  );
+  return quayViewPermissionResult.allowed;
 };