paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 24 Packages Projects Releases Wiki Activity

catalog-react: stop using CatalogEntityPermission convenience type

Browse Source 
There's currently an issue with importing alpha exports from other
packages in the monorepo. This works around the issue for now by
skipping the use of the `CatalogEntityPermission` convenience type,
using `ResourcePermission<'catalog-entity'>` directly instead.

cf. https://github.com/backstage/backstage/pull/10128

Signed-off-by: Mike Lewis <mtlewis@users.noreply.github.com>
This commit is contained in:
Mike Lewis
2022-03-11 09:21:58 +00:00
committed by Joe Porpeglia
parent 0ffd88a90e
commit 8cb7acd781
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changeset/clever-donuts-teach.md
+1 -1
View File
@@ -2,4 +2,4 @@
'@backstage/plugin-catalog-react': patch
---
Prevent permissions with types other than `CatalogEntityPermission` from being used with the `useEntityPermission` hook.
Prevent permissions with types other than `ResourcePermission<'catalog-entity'>` from being used with the `useEntityPermission` hook.
plugins/catalog-react/api-report.md
+4 -2
View File
@@ -8,7 +8,6 @@
import { ApiRef } from '@backstage/core-plugin-api';
import { CATALOG_FILTER_EXISTS } from '@backstage/catalog-client';
import { CatalogApi } from '@backstage/catalog-client';
import { CatalogEntityPermission } from '@backstage/plugin-catalog-common';
import { ComponentEntity } from '@backstage/catalog-model';
import { ComponentProps } from 'react';
import { CompoundEntityRef } from '@backstage/catalog-model';
@@ -20,6 +19,7 @@ import { Overrides } from '@material-ui/core/styles/overrides';
import { PropsWithChildren } from 'react';
import { default as React_2 } from 'react';
import { ReactNode } from 'react';
import { ResourcePermission } from '@backstage/plugin-permission-common';
import { RouteRef } from '@backstage/core-plugin-api';
import { ScmIntegrationRegistry } from '@backstage/integration';
import { StyleRules } from '@material-ui/core/styles/withStyles';
@@ -489,7 +489,9 @@ export function useEntityOwnership(): {
};
// @alpha
export function useEntityPermission(permission: CatalogEntityPermission): {
export function useEntityPermission(
permission: ResourcePermission<'catalog-entity'>,
): {
loading: boolean;
allowed: boolean;
error?: Error;
plugins/catalog-react/src/hooks/useEntityPermission.ts
+4 -2
View File
@@ -15,7 +15,7 @@
*/
import { stringifyEntityRef } from '@backstage/catalog-model';
import { CatalogEntityPermission } from '@backstage/plugin-catalog-common';
import { ResourcePermission } from '@backstage/plugin-permission-common';
import { usePermission } from '@backstage/plugin-permission-react';
import { useAsyncEntity } from './useEntity';
@@ -30,7 +30,9 @@ import { useAsyncEntity } from './useEntity';
* `usePermission` hook directly.
* @alpha
*/
export function useEntityPermission(permission: CatalogEntityPermission): {
export function useEntityPermission(
permission: ResourcePermission<'catalog-entity'>,
): {
loading: boolean;
allowed: boolean;
error?: Error;