added backend test and updated api reports

Signed-off-by: Lykke Axlin <lykkeaxlin@hotmail.com>

Co-authored-by: klaraab <klarabroman@live.se>

plugins/bazaar/api-report.md

@@ -26,7 +26,7 @@ export const bazaarPlugin: BackstagePlugin<
 // Warning: (ae-missing-release-tag) "EntityBazaarInfoCard" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const EntityBazaarInfoCard: () => JSX.Element;
+export const EntityBazaarInfoCard: () => JSX.Element | null;
 
 // (No @packageDocumentation comment for this package)
 ```

plugins/bazaar/package.json

@@ -26,7 +26,7 @@
     "@backstage/core-components": "^0.5.0",
     "@backstage/core-plugin-api": "^0.1.3",
     "@backstage/plugin-catalog": "^0.6.6",
-    "@backstage/plugin-catalog-react": "^0.4.0",
+    "@backstage/plugin-catalog-react": "^0.5.0",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",

plugins/bazaar/src/api.ts

@@ -91,12 +91,14 @@ export class BazaarClient implements BazaarApi {
   async getMetadata(entity: Entity): Promise<any> {
     const baseUrl = await this.discoveryApi.getBaseUrl('bazaar');
 
-    return await fetch(`${baseUrl}/metadata`, {
+    const response = await fetch(`${baseUrl}/metadata`, {
       method: 'GET',
       headers: {
         entity_ref: stringifyEntityRef(entity),
       },
     });
+
+    return response.ok ? response : null;
   }
 
   async getMembers(entity: Entity): Promise<any> {

plugins/bazaar/src/components/EditProjectDialog/EditProjectDialog.tsx

@@ -24,7 +24,7 @@ import { bazaarApiRef } from '../../api';
 type Props = {
   entity: Entity;
   bazaarProject: BazaarProject;
-  fetchBazaarProject: () => Promise<BazaarProject>;
+  fetchBazaarProject: () => Promise<BazaarProject | null>;
   open: boolean;
   handleClose: () => void;
   isAddForm: boolean;

plugins/bazaar/src/components/EntityBazaarInfoCard/EntityBazaarInfoCard.tsx

@@ -47,14 +47,9 @@ import DeleteIcon from '@material-ui/icons/Delete';
 import { EditProjectDialog } from '../EditProjectDialog';
 import { DeleteProjectDialog } from '../DeleteProjectDialog';
 import ExitToAppIcon from '@material-ui/icons/ExitToApp';
-import {
-  useApi,
-  identityApiRef,
-  useRouteRef,
-} from '@backstage/core-plugin-api';
+import { useApi, identityApiRef } from '@backstage/core-plugin-api';
 import { Member, BazaarProject } from '../../types';
 import { bazaarApiRef } from '../../api';
-import { rootRouteRef } from '../../routes';
 import { Alert } from '@material-ui/lab';
 import { useAsyncFn } from 'react-use';
 
@@ -92,7 +87,6 @@ export const EntityBazaarInfoCard = () => {
   const [openDelete, setOpenDelete] = useState(false);
   const [isMember, setIsMember] = useState(false);
   const [isBazaar, setIsBazaar] = useState(false);
-  const routeRef = useRouteRef(rootRouteRef);
   const [members, fetchMembers] = useAsyncFn(async () => {
     const response = await bazaarApi.getMembers(entity);
     const dbMembers = response.data.map((obj: any) => {
@@ -112,17 +106,21 @@ export const EntityBazaarInfoCard = () => {
 
   const [bazaarProject, fetchBazaarProject] = useAsyncFn(async () => {
     const response = await bazaarApi.getMetadata(entity);
-    const metadata = await response.json().then((resp: any) => resp.data[0]);
 
-    return {
-      entityRef: metadata.entity_ref,
-      name: metadata.name,
-      community: metadata.community,
-      announcement: metadata.announcement,
-      status: metadata.status,
-      updatedAt: metadata.updated_at,
-      membersCount: metadata.members_count,
-    } as BazaarProject;
+    if (response) {
+      const metadata = await response.json().then((resp: any) => resp.data[0]);
+
+      return {
+        entityRef: metadata.entity_ref,
+        name: metadata.name,
+        community: metadata.community,
+        announcement: metadata.announcement,
+        status: metadata.status,
+        updatedAt: metadata.updated_at,
+        membersCount: metadata.members_count,
+      } as BazaarProject;
+    }
+    return null;
   });
 
   useEffect(() => {
@@ -135,7 +133,7 @@ export const EntityBazaarInfoCard = () => {
       members?.value
         ?.map((member: Member) => member.userId)
         .indexOf(identity.getUserId()) >= 0;
-    const isBazaarProject = bazaarProject !== undefined;
+    const isBazaarProject = bazaarProject !== null;
 
     setIsMember(isBazaarMember);
     setIsBazaar(isBazaarProject);
@@ -185,32 +183,14 @@ export const EntityBazaarInfoCard = () => {
     },
   ];
 
-  if (bazaarProject.loading || members.loading) {
+  if (!isBazaar) {
+    return null;
+  } else if (bazaarProject.loading || members.loading) {
     return <Progress />;
   } else if (bazaarProject.error) {
     return <Alert severity="error">{bazaarProject?.error?.message}</Alert>;
   } else if (members.error) {
     return <Alert severity="error">{members?.error?.message}</Alert>;
-  } else if (!isBazaar) {
-    return (
-      <Card>
-        <CardHeader title="Bazaar" style={{ paddingBottom: '1rem' }} />
-        <Divider />
-        <CardContent>
-          <Typography variant="body1">
-            This project is not in the Bazaar. Go to the{' '}
-            <Link className={classes.link} to={`/${routeRef()}`}>
-              Bazaar
-            </Link>{' '}
-            to add the project or to{' '}
-            <Link className={classes.link} to={`/${routeRef()}/about`}>
-              read more
-            </Link>
-            .
-          </Typography>
-        </CardContent>
-      </Card>
-    );
   }
   return (
     <Card>