Merge pull request #1 from TIBCO-Hub-Backstage/1.5.0

Version 1.5.0 related changes and released 1.5.0.

Author: sgantaya

Dockerfile

@@ -9,7 +9,7 @@ RUN --mount=type=cache,target=/home/nonroot/.cache/pip,uid=65532,gid=65532 \
     /home/nonroot/venv/bin/pip install setuptools
 
 # Stage 1 - Create yarn install skeleton layer
-FROM cgr.dev/chainguard/wolfi-base@sha256:2148be123cd047f10c93e2bc88010d4abba1fc56a367d6287a251099ed5f006a AS packages
+FROM cgr.dev/chainguard/wolfi-base@sha256:7afaeb1ffbc9c33c21b9ddbd96a80140df1a5fa95aed6411b210bcb404e75c11 AS packages
 
 WORKDIR /app
 COPY package.json yarn.lock ./
@@ -24,7 +24,7 @@ COPY plugins plugins
 
 RUN find packages \! -name "package.json" -mindepth 2 -maxdepth 2 -exec rm -rf {} \+
 
-FROM cgr.dev/chainguard/wolfi-base@sha256:2148be123cd047f10c93e2bc88010d4abba1fc56a367d6287a251099ed5f006a as build
+FROM cgr.dev/chainguard/wolfi-base@sha256:7afaeb1ffbc9c33c21b9ddbd96a80140df1a5fa95aed6411b210bcb404e75c11 as build
 
 ENV NODE_VERSION="18=~18.20"
 
@@ -59,7 +59,7 @@ RUN mkdir packages/backend/dist/skeleton packages/backend/dist/bundle \
     && tar xzf packages/backend/dist/skeleton.tar.gz -C packages/backend/dist/skeleton \
     && tar xzf packages/backend/dist/bundle.tar.gz -C packages/backend/dist/bundle
 
-FROM cgr.dev/chainguard/wolfi-base@sha256:2148be123cd047f10c93e2bc88010d4abba1fc56a367d6287a251099ed5f006a as node-builder
+FROM cgr.dev/chainguard/wolfi-base@sha256:7afaeb1ffbc9c33c21b9ddbd96a80140df1a5fa95aed6411b210bcb404e75c11 as node-builder
 
 ENV NODE_VERSION="18=~18.20"
 
@@ -85,7 +85,7 @@ COPY --from=build --chown=65532:65532 /app/yarn.lock /app/package.json /app/pack
 RUN --mount=type=cache,target=/home/nonroot/.yarn/berry/cache,sharing=locked,uid=65532,gid=65532 \
     yarn workspaces focus --all --production && yarn cache clean --all
 
-FROM --platform=linux/amd64 cgr.dev/chainguard/wolfi-base@sha256:2148be123cd047f10c93e2bc88010d4abba1fc56a367d6287a251099ed5f006a
+FROM --platform=linux/amd64 cgr.dev/chainguard/wolfi-base@sha256:7afaeb1ffbc9c33c21b9ddbd96a80140df1a5fa95aed6411b210bcb404e75c11
 
 ENV PYTHON_VERSION="3.12=~3.12"
 ENV NODE_VERSION="18=~18.20"

README.md

@@ -105,6 +105,7 @@ docker build -t <customImageName:customImageTag> .
 
 | TIBCO Developer Hub Version | TIBCO Platform Version |
 | --------------------------- | ---------------------- |
+| 1.5.0                       | 1.4.0                  |
 | 1.4.0                       | 1.4.0                  |
 | 1.3.2                       | 1.3.0                  |
 | 1.3.1                       | 1.3.0                  |

app-config.production.yaml

@@ -1,3 +1,4 @@
+define: &docUrl 'https://docs.tibco.com/go/platform-cp/1.5.0/doc/html#cshid=developer_hub_overview'
 app:
   title: TIBCO® Developer Hub
   # Should be the same as backend.baseUrl when using the `app-backend` plugin.
@@ -13,9 +14,9 @@ app:
       - title: 'TIBCO Documentation Page'
         icon: 'docs'
         links:
-          - url: 'https://docs.tibco.com/go/platform-cp/1.4.0/doc/html#cshid=developer_hub_overview'
+          - url: *docUrl
             title: 'TIBCO® Developer Hub Documentation'
-  developerHubVersion: 1.4.0
+  docUrl: *docUrl
 organization:
   name: TIBCO Software's
 

app-config.yaml

@@ -1,3 +1,4 @@
+define: &docUrl 'https://docs.tibco.com/go/platform-cp/1.5.0/doc/html#cshid=developer_hub_overview'
 app:
   title: TIBCO® Developer Hub
   baseUrl: http://localhost:3000/tibco/hub
@@ -12,9 +13,9 @@ app:
       - title: 'TIBCO Documentation Page'
         icon: 'docs'
         links:
-          - url: 'https://docs.tibco.com/go/platform-cp/1.4.0/doc/html#cshid=developer_hub_overview'
+          - url: *docUrl
             title: 'TIBCO® Developer Hub Documentation'
-  developerHubVersion: 1.4.0
+  docUrl: *docUrl
 
 organization:
   name: TIBCO Software's
@@ -125,8 +126,3 @@ scaffolder:
   defaultCommitMessage: 'Initial commit' # Defaults to 'Initial commit'
 catalog:
   locations: []
-# GitHub rate limits API requests to 5,000 per hour (or more for Enterprise accounts).
-# For more information, visit https://backstage.io/docs/integrations/github/discovery/#github-api-rate-limits-1
-# You can set the refresh rate of catalog (in milliseconds) for catalog API to fetch changes from GitHub, by using the below config.
-# The allowed range is [100,900]
-# catalogRefreshDelayInSec: 300

docs/app-config-extensions.md

@@ -17,6 +17,26 @@ app:
   showBuildVersion: true
 ```
 
+## Developer Hub Version
+
+Show developer hub version. Displays currently deployed version the left bottom of the Home Page UI
+
+Example config:
+
+```yaml
+app:
+  developerHubVersion: '1.5.0'
+```
+
+## Doc Url
+
+Documentation url
+
+```yaml
+app:
+  docUrl: 'https://docs.tibco.com/go/platform-cp/1.5.0/doc/html#cshid=developer_hub_overview'
+```
+
 The CI/CD pipeline automatically adds the build number to all docker images.
 
 ## Walk Through

package.json

@@ -1,6 +1,6 @@
 {
   "name": "root",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "private": true,
   "engines": {
     "node": "20 || 22"
@@ -47,7 +47,7 @@
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "@kubernetes/client-node": "^1.0.0-rc7",
-    "jsonpath-plus": "^10.0.7"
+    "jsonpath-plus": "^10.3.0"
   },
   "prettier": "@spotify/prettier-config",
   "lint-staged": {

packages/app/config.d.ts

@@ -19,6 +19,11 @@ export interface Config {
      * @visibility frontend
      */
     developerHubVersion?: string;
+    /**
+     * Documentation url. String value.
+     * @visibility frontend
+     */
+    docUrl: string;
   };
   auth?: {
     /**

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "private": true,
   "bundled": true,
   "backstage": {
@@ -39,8 +39,8 @@
     "@backstage/plugin-user-settings": "^0.8.16",
     "@backstage/theme": "^0.6.2",
     "@fontsource/source-sans-pro": "^4.5.11",
-    "@internal/backstage-plugin-import-flow": "^1.4.0",
-    "@internal/plugin-tibco-platform-plugin": "^1.4.0",
+    "@internal/backstage-plugin-import-flow": "^1.5.0",
+    "@internal/plugin-tibco-platform-plugin": "^1.5.0",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.61",

packages/app/src/components/catalog-import/components/DefaultImportPage/DefaultImportPage.tsx

@@ -52,7 +52,7 @@ export const DefaultImportPage = () => {
       <ImportStepper />
     </Grid>,
   ];
-
+  const reverseContentItems = [...contentItems].reverse();
   return (
     <Page themeId="home">
       <Header title="Register an existing component" />
@@ -65,7 +65,7 @@ export const DefaultImportPage = () => {
         </ContentHeader>
 
         <Grid container spacing={2}>
-          {isMobile ? contentItems : contentItems.reverse()}
+          {isMobile ? contentItems : reverseContentItems}
         </Grid>
       </Content>
     </Page>

packages/app/src/components/home/HomePage.tsx

@@ -48,12 +48,8 @@ export const HomePage = () => {
   const identityApi = useApi(identityApiRef);
   const starredApi = useApi(starredEntitiesApiRef);
   const { value, loading, error } = useAsync(async () => {
-    try {
-      const data = await identityApi.getProfileInfo();
-      return data.displayName;
-    } catch (err) {
-      throw error;
-    }
+    const data = await identityApi.getProfileInfo();
+    return data.displayName;
   });
   const title = config.getOptionalString('app.title');
   useEffect(
@@ -100,72 +96,66 @@ export const HomePage = () => {
                 );
               }
             }
-            try {
-              const result: any[] = await Promise.all(apiCalls);
-              const newCards = [];
-              for (const [index, card] of cards.entries()) {
-                card.loading = false;
-                if (card.type === HomeCardType.WalkThrough) {
-                  card.viewAllLink = walkthrough.viewAllLink;
-                  card.itemsInfo = walkthrough.items || [];
-                } else {
-                  let items = result[index]?.items;
-                  if (card.type === HomeCardType.Template) {
-                    items = items.filter(
-                      (item: any) =>
-                        !item.metadata.tags
-                          ?.map((v: any) => v.toLowerCase())
-                          .includes('import-flow'),
-                    );
-                  }
-                  if (items) {
-                    let itemsInfo = [];
-                    if (stars && stars.length > 0) {
-                      for (const item of items) {
-                        const inx = getIndex(item, stars);
-                        if (inx > -1) {
-                          item.star = true;
-                          itemsInfo.push(item);
-                        }
-                        if (itemsInfo.length >= 3) {
-                          break;
-                        }
-                      }
-                      for (const item of items) {
-                        if (itemsInfo.length >= 3) {
-                          break;
-                        }
-                        const ind = getIndex(item, stars);
-                        if (ind > -1) {
-                          continue;
-                        }
+
+            const result: any[] = await Promise.all(apiCalls);
+            const newCards = [];
+            for (const [index, card] of cards.entries()) {
+              card.loading = false;
+              if (card.type === HomeCardType.WalkThrough) {
+                card.viewAllLink = walkthrough.viewAllLink;
+                card.itemsInfo = walkthrough.items || [];
+              } else {
+                let items = result[index]?.items;
+                if (card.type === HomeCardType.Template) {
+                  items = items.filter(
+                    (item: any) =>
+                      !item.metadata.tags
+                        ?.map((v: any) => v.toLowerCase())
+                        .includes('import-flow'),
+                  );
+                }
+                if (items) {
+                  let itemsInfo = [];
+                  if (stars && stars.length > 0) {
+                    for (const item of items) {
+                      const inx = getIndex(item, stars);
+                      if (inx > -1) {
+                        item.star = true;
                         itemsInfo.push(item);
                       }
-                    } else {
-                      itemsInfo = result[index]?.items?.slice(
-                        0,
-                        ITEMS_PER_CARD,
-                      );
+                      if (itemsInfo.length >= 3) {
+                        break;
+                      }
+                    }
+                    for (const item of items) {
+                      if (itemsInfo.length >= 3) {
+                        break;
+                      }
+                      const ind = getIndex(item, stars);
+                      if (ind > -1) {
+                        continue;
+                      }
+                      itemsInfo.push(item);
                     }
-                    card.itemsInfo = itemsInfo.map((item: any) => {
-                      return {
-                        title: item.metadata?.title,
-                        name: item.metadata?.name,
-                        kind: item.kind,
-                        star: item.star,
-                        namespace: item.metadata?.namespace,
-                        tags: item.metadata?.tags?.slice(0, 3),
-                        text: `${item.metadata?.description}`,
-                      };
-                    });
+                  } else {
+                    itemsInfo = result[index]?.items?.slice(0, ITEMS_PER_CARD);
                   }
+                  card.itemsInfo = itemsInfo.map((item: any) => {
+                    return {
+                      title: item.metadata?.title,
+                      name: item.metadata?.name,
+                      kind: item.kind,
+                      star: item.star,
+                      namespace: item.metadata?.namespace,
+                      tags: item.metadata?.tags?.slice(0, 3),
+                      text: `${item.metadata?.description}`,
+                    };
+                  });
                 }
-                newCards.push(card);
               }
-              setCards(newCards);
-            } catch (err) {
-              throw err;
+              newCards.push(card);
             }
+            setCards(newCards);
           })();
         },
         err => {

packages/app/src/components/home/components/HomeCard/HomeCard.tsx

@@ -151,7 +151,7 @@ export const HomeCard = (props: { cardData: HomeCardProps }) => {
                 <Grid container spacing={0}>
                   {element.tags &&
                     element.tags.length > 0 &&
-                    element.tags!.map((tag, i) => (
+                    element.tags.map((tag, i) => (
                       <div className="tpdh-card-item-tag" key={i}>
                         {tag}
                       </div>

packages/app/src/components/home/components/Introduction/Introduction.tsx

@@ -2,8 +2,11 @@ import React from 'react';
 import './Introduction.css';
 import { Grid } from '@material-ui/core';
 import { Link } from 'react-router-dom';
+import { configApiRef, useApi } from '@backstage/core-plugin-api';
 
 export const Introduction = () => {
+  const configApi = useApi(configApiRef);
+  const docUrl: string = configApi.get('app.docUrl');
   return (
     <div className="tpdh-intro-container">
       <div className="tpdh-intro-title">What is the TIBCO® Developer Hub ?</div>
@@ -27,10 +30,7 @@ export const Introduction = () => {
           </Link>
         </Grid>
         <Grid item>
-          <Link
-            to="https://docs.tibco.com/go/platform-cp/1.4.0/doc/html#cshid=developer_hub_overview"
-            target="_blank"
-          >
+          <Link to={docUrl} target="_blank">
             <button
               type="button"
               className="pl-button pl-button--secondary"

packages/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "main": "dist/index.cjs.js",
   "types": "src/index.ts",
   "private": true,
@@ -49,7 +49,7 @@
     "@backstage/plugin-search-backend-module-techdocs": "^0.3.3",
     "@backstage/plugin-search-backend-node": "^1.3.5",
     "@backstage/plugin-techdocs-backend": "^1.11.3",
-    "@internal/backstage-plugin-scaffolder-backend-module-import-flow": "^1.4.0",
+    "@internal/backstage-plugin-scaffolder-backend-module-import-flow": "^1.5.0",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "dockerode": "^3.3.1",