chore(release): 1.2.x rebase/backport argocd (#2527)

* chore(release): 1.1.7 [skip ci] ## [1.1.7](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-04) ### Features * **rbac:** add audit log for RBAC backend ([#1726](#1726)) ([e50464b](e50464b)) ### Bug Fixes * **audit-log:** deep copy objects passed into audit logger so redactor will not modify objects and remove `auditErrorLog` function ([#1730](#1730)) ([379c241](379c241)) * **deps:** update kiali dependencies (minor) ([#1779](#1779)) ([ff2b421](ff2b421)) * **rbac:** add support for scaling ([#1757](#1757)) ([caddc83](caddc83)) * **rbac:** fix handling condition action conflicts ([#1781](#1781)) ([966b2b2](966b2b2)) * **rbac:** fix role list view permission policies column value ([#1714](#1714)) ([07200e4](07200e4)) * chore(release): 1.1.8 [skip ci] * switch defaults of the `--embed-as-dependencies` and `in-place` options. ([#1787](#1787)) ([049e675](049e675)) Signed-off-by: Kim Tsao <[email protected]> * chore(release): 1.1.9 [skip ci] ## @janus-idp/backstage-plugin-argocd [1.1.9](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-10) * chore(release): 1.1.10 [skip ci] ## [1.1.10](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-13) ### Bug Fixes * **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91)) * **feedback:** fixed feedback backend plugin crashing ([#1809](#1809)) ([e4a571e](e4a571e)) * missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5)) * **orchestrator:** fix error handling in case data index failed to start ([#1804](#1804)) ([27affb7](27affb7)) * chore(deps): manual backstage 1.27 bump from PR 1683 Signed-off-by: Kim Tsao <[email protected]> * chore(release): 1.2.0 [skip ci] ## [1.2.0](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-13) ### Features * **deps:** update to backstage 1.27 ([#1683](#1683)) ([a14869c](a14869c)) * **feedback:** add support for jira component ([#1813](#1813)) ([4afbc17](4afbc17)) * fix(deps): update dependency react-use to v17.5.0 (#1780) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(release): 1.2.1 [skip ci] ## @janus-idp/backstage-plugin-argocd [1.2.1](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-14) ### Bug Fixes * **deps:** update dependency react-use to v17.5.0 ([#1780](#1780)) ([a25bf15](a25bf15)) * fix(argocd): hide commit section for helm based applications (#1834) * chore(release): 1.2.2 [skip ci] ## [1.2.2](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-19) ### Bug Fixes * **matomo:** add default export for new backend system ([#1822](#1822)) ([5e72920](5e72920)) * **orchestrator:** change log level of cache messages to be debug ([#1824](#1824)) ([4224612](4224612)) * chore(release): 1.2.3 [skip ci] ## @janus-idp/backstage-plugin-argocd [1.2.3](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-21) ### Bug Fixes * **argocd:** hide commit section for helm based applications ([#1834](#1834)) ([a86ce1e](a86ce1e)) * fix(argocd): fix argocd commit message visibility (#1874) * chore(release): 1.2.4 [skip ci] ## @janus-idp/backstage-plugin-argocd [1.2.4](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-07-17) ### Bug Fixes * **argocd:** fix argocd commit message visibility ([#1874](#1874)) ([e558d75](e558d75)) * chore(release): add empty changeset Signed-off-by: Kim Tsao <[email protected]> --------- Signed-off-by: Kim Tsao <[email protected]> Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Karthik Jeeyar <[email protected]> Co-authored-by: Eswaraiahsapram <[email protected]>
janus-idp · Nov 13, 2024 · 67cfca0 · 67cfca0
1 parent 80f88b8
commit 67cfca0
Show file tree

Hide file tree

Showing 11 changed files with 273 additions and 122 deletions.
diff --git a/.changeset/thirty-years-battle.md b/.changeset/thirty-years-battle.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/plugins/argocd/CHANGELOG.md b/plugins/argocd/CHANGELOG.md
@@ -1,3 +1,65 @@
+## @janus-idp/backstage-plugin-argocd [1.2.4](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-07-17)
+
+
+### Bug Fixes
+
+* **argocd:** fix argocd commit message visibility ([#1874](https://github.com/janus-idp/backstage-plugins/issues/1874)) ([e558d75](https://github.com/janus-idp/backstage-plugins/commit/e558d7549c49a1821eafc9424f174c6d457ce414))
+
+## @janus-idp/backstage-plugin-argocd [1.2.3](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-21)
+
+
+### Bug Fixes
+
+* **argocd:** hide commit section for helm based applications ([#1834](https://github.com/janus-idp/backstage-plugins/issues/1834)) ([a86ce1e](https://github.com/janus-idp/backstage-plugins/commit/a86ce1e5237ac419eb93a9766cb8e2736ba9b8d7))
+
+## @janus-idp/backstage-plugin-argocd [1.2.2](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-19)
+
+
+
+### Dependencies
+
+* **@janus-idp/cli:** upgraded to 1.11.1
+
+## @janus-idp/backstage-plugin-argocd [1.2.1](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-14)
+
+
+### Bug Fixes
+
+* **deps:** update dependency react-use to v17.5.0 ([#1780](https://github.com/janus-idp/backstage-plugins/issues/1780)) ([a25bf15](https://github.com/janus-idp/backstage-plugins/commit/a25bf15e14e9fa5a946551c5626c92f6b1f83d2f))
+
+## @janus-idp/backstage-plugin-argocd [1.2.0](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-13)
+
+
+### Features
+
+* **deps:** update to backstage 1.27 ([#1683](https://github.com/janus-idp/backstage-plugins/issues/1683)) ([a14869c](https://github.com/janus-idp/backstage-plugins/commit/a14869c3f4177049cb8d6552b36c3ffd17e7997d))
+
+
+
+### Dependencies
+
+* **@janus-idp/cli:** upgraded to 1.11.0
+
+## @janus-idp/backstage-plugin-argocd [1.1.10](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-13)
+
+
+
+### Dependencies
+
+* **@janus-idp/cli:** upgraded to 1.10.1
+
+## @janus-idp/backstage-plugin-argocd [1.1.9](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-10)
+
+## @janus-idp/backstage-plugin-argocd [1.1.8](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-05)
+
+
+
+### Dependencies
+
+* **@janus-idp/cli:** upgraded to 1.10.0
+
+## @janus-idp/backstage-plugin-argocd [1.1.7](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-04)
+
 ## @janus-idp/backstage-plugin-argocd [1.1.6](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-03)
 
 

diff --git a/plugins/argocd/package.json b/plugins/argocd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@janus-idp/backstage-plugin-argocd",
-  "version": "1.1.6",
+  "version": "1.2.4",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -32,11 +32,11 @@
     "prettier:fix": "prettier --ignore-unknown --write ."
   },
   "dependencies": {
-    "@backstage/catalog-model": "^1.4.5",
-    "@backstage/core-components": "^0.14.6",
+    "@backstage/catalog-model": "^1.5.0",
+    "@backstage/core-components": "^0.14.7",
     "@backstage/core-plugin-api": "^1.9.2",
-    "@backstage/plugin-catalog-react": "^1.11.3",
-    "@backstage/theme": "^0.5.3",
+    "@backstage/plugin-catalog-react": "^1.12.0",
+    "@backstage/theme": "^0.5.5",
     "@kubernetes/client-node": "^0.20.0",
     "@material-ui/core": "^4.9.13",
     "@material-ui/icons": "^4.9.1",
@@ -47,20 +47,20 @@
     "@patternfly/react-icons": "^5.1.1",
     "@patternfly/react-tokens": "^5.1.2",
     "moment": "^2.30.1",
-    "react-use": "17.4.0"
+    "react-use": "17.5.0"
   },
   "peerDependencies": {
     "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
     "react-router-dom": "^6.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "0.26.4",
+    "@backstage/cli": "0.26.6",
     "prettier": "3.3.3",
     "@backstage/config": "1.2.0",
-    "@backstage/core-app-api": "1.12.4",
-    "@backstage/dev-utils": "1.0.31",
-    "@backstage/test-utils": "1.5.4",
-    "@janus-idp/cli": "1.10.0",
+    "@backstage/core-app-api": "1.12.5",
+    "@backstage/dev-utils": "1.0.32",
+    "@backstage/test-utils": "1.5.5",
+    "@janus-idp/cli": "1.11.1",
     "@playwright/test": "1.44.1",
     "@redhat-developer/red-hat-developer-hub-theme": "0.0.54",
     "@testing-library/jest-dom": "6.4.5",

diff --git a/plugins/argocd/src/components/DeploymentLifeCycle/DeploymentLifecycle.tsx b/plugins/argocd/src/components/DeploymentLifeCycle/DeploymentLifecycle.tsx
@@ -87,14 +87,18 @@ const DeploymentLifecycle = () => {
 
   const activeApp = apps.find(a => a.metadata.name === activeItem);
 
+  if (error) {
+    return <ResponseErrorPanel data-testid="error-panel" error={error} />;
+  }
+
   if (loading) {
     return (
       <div data-testid="argocd-loader">
         <Progress />
       </div>
     );
-  } else if (error) {
-    return <ResponseErrorPanel data-testid="error-panel" error={error} />;
+  } else if (apps?.length === 0) {
+    return null;
   }
 
   return (

diff --git a/plugins/argocd/src/components/DeploymentLifeCycle/DeploymentLifecycleCard.tsx b/plugins/argocd/src/components/DeploymentLifeCycle/DeploymentLifecycleCard.tsx
@@ -33,6 +33,11 @@ const useCardStyles = makeStyles<Theme>(theme =>
       marginRight: theme.spacing(2.5),
       maxWidth: '300px',
     },
+    commitMessage: {
+      textOverflow: 'ellipsis',
+      whiteSpace: 'nowrap',
+      overflow: 'hidden',
+    },
   }),
 );
 
@@ -117,47 +122,65 @@ const DeploymentLifecycleCard: React.FC<DeploymentLifecycleCardProps> = ({
 
             <AppNamespace app={app} />
           </Grid>
-          <Grid item xs={12}>
-            <Typography color="textPrimary">Commit</Typography>
-            {revisionsMap && latestRevision ? (
-              <>
-                <Chip
-                  data-testid={`${latestRevision?.revision?.slice(
-                    0,
-                    5,
-                  )}-commit-link`}
-                  size="small"
-                  variant="outlined"
-                  onClick={e => {
-                    e.stopPropagation();
-                    const repoUrl = app?.spec?.source?.repoURL ?? '';
-                    if (repoUrl.length) {
-                      window.open(
-                        getCommitUrl(
-                          repoUrl,
-                          latestRevision?.revision,
-                          entity?.metadata?.annotations ?? {},
-                        ),
-                        '_blank',
-                      );
-                    }
-                  }}
-                  icon={<GitLabIcon />}
-                  color="primary"
-                  label={latestRevision?.revision.slice(0, 7)}
-                />
-                <Typography variant="body2" color="textSecondary">
-                  {revisionsMap?.[latestRevision?.revision] ? (
-                    <>{revisionsMap?.[latestRevision?.revision]?.message}</>
-                  ) : (
-                    <Skeleton />
-                  )}
-                </Typography>
-              </>
-            ) : (
-              <>-</>
-            )}
-          </Grid>
+          {!app?.spec?.source?.chart && (
+            <Grid item xs={12}>
+              <Typography color="textPrimary">Commit</Typography>
+              {revisionsMap && latestRevision ? (
+                <>
+                  <Chip
+                    data-testid={`${latestRevision?.revision?.slice(
+                      0,
+                      5,
+                    )}-commit-link`}
+                    size="small"
+                    variant="outlined"
+                    onClick={e => {
+                      e.stopPropagation();
+                      const repoUrl = app?.spec?.source?.repoURL ?? '';
+                      if (repoUrl.length) {
+                        window.open(
+                          getCommitUrl(
+                            repoUrl,
+                            latestRevision?.revision,
+                            entity?.metadata?.annotations ?? {},
+                          ),
+                          '_blank',
+                        );
+                      }
+                    }}
+                    icon={<GitLabIcon />}
+                    color="primary"
+                    label={latestRevision?.revision.slice(0, 7)}
+                  />
+                  <Typography
+                    variant="body2"
+                    color="textSecondary"
+                    className={classes.commitMessage}
+                  >
+                    {revisionsMap?.[latestRevision?.revision] ? (
+                      <Tooltip
+                        data-testid={`${latestRevision?.revision?.slice(
+                          0,
+                          5,
+                        )}-commit-message`}
+                        title={
+                          revisionsMap?.[latestRevision?.revision]?.message
+                        }
+                      >
+                        <span>
+                          {revisionsMap?.[latestRevision?.revision]?.message}
+                        </span>
+                      </Tooltip>
+                    ) : (
+                      <Skeleton />
+                    )}
+                  </Typography>
+                </>
+              ) : (
+                <>-</>
+              )}
+            </Grid>
+          )}
 
           <Grid item xs={12}>
             <Typography variant="body1" color="textPrimary">

diff --git a/plugins/argocd/src/components/DeploymentLifeCycle/DeploymentLifecycleDrawer.tsx b/plugins/argocd/src/components/DeploymentLifeCycle/DeploymentLifecycleDrawer.tsx
@@ -51,6 +51,9 @@ const useDrawerStyles = makeStyles<Theme>(theme =>
       justifyContent: 'space-between',
       alignItems: 'baseline',
     },
+    commitMessage: {
+      wordBreak: 'break-word',
+    },
   }),
 );
 const DeploymentLifecycleDrawer: React.FC<DeploymentLifecycleDrawerProps> = ({
@@ -136,51 +139,56 @@ const DeploymentLifecycleDrawer: React.FC<DeploymentLifecycleDrawerProps> = ({
 
             <AppNamespace app={app} />
           </Grid>
-          <Grid item xs={12}>
-            <Typography color="textPrimary">Commit</Typography>
-            {latestRevision ? (
-              <>
-                <Chip
-                  data-testid={`${latestRevision?.revision?.slice(
-                    0,
-                    5,
-                  )}-commit-link`}
-                  size="small"
-                  variant="outlined"
-                  icon={<GitLabIcon />}
-                  color="primary"
-                  onClick={e => {
-                    e.stopPropagation();
+          {!app?.spec?.source?.chart && (
+            <Grid item xs={12}>
+              <Typography color="textPrimary">Commit</Typography>
+              {latestRevision ? (
+                <>
+                  <Chip
+                    data-testid={`${latestRevision?.revision?.slice(
+                      0,
+                      5,
+                    )}-commit-link`}
+                    size="small"
+                    variant="outlined"
+                    icon={<GitLabIcon />}
+                    color="primary"
+                    onClick={e => {
+                      e.stopPropagation();
 
-                    const repoUrl = app?.spec?.source?.repoURL ?? '';
-                    if (repoUrl) {
-                      window.open(
-                        getCommitUrl(
-                          repoUrl,
-                          latestRevision?.revision,
-                          entity?.metadata?.annotations ?? {},
-                        ),
-                        '_blank',
-                      );
-                    }
-                  }}
-                  label={latestRevision?.revision.slice(0, 7)}
-                />
-                <Typography color="textSecondary">
-                  {revisionsMap?.[latestRevision?.revision] ? (
-                    <>
-                      {revisionsMap?.[latestRevision?.revision]?.message} by{' '}
-                      {revisionsMap?.[latestRevision?.revision]?.author}
-                    </>
-                  ) : (
-                    <Skeleton />
-                  )}
-                </Typography>
-              </>
-            ) : (
-              <>-</>
-            )}
-          </Grid>
+                      const repoUrl = app?.spec?.source?.repoURL ?? '';
+                      if (repoUrl) {
+                        window.open(
+                          getCommitUrl(
+                            repoUrl,
+                            latestRevision?.revision,
+                            entity?.metadata?.annotations ?? {},
+                          ),
+                          '_blank',
+                        );
+                      }
+                    }}
+                    label={latestRevision?.revision.slice(0, 7)}
+                  />
+                  <Typography
+                    color="textSecondary"
+                    className={classes.commitMessage}
+                  >
+                    {revisionsMap?.[latestRevision?.revision] ? (
+                      <>
+                        {revisionsMap?.[latestRevision?.revision]?.message} by{' '}
+                        {revisionsMap?.[latestRevision?.revision]?.author}
+                      </>
+                    ) : (
+                      <Skeleton />
+                    )}
+                  </Typography>
+                </>
+              ) : (
+                <>-</>
+              )}
+            </Grid>
+          )}
           {appHistory.length >= 1 && (
             <Grid item xs={12}>
               <Typography color="textPrimary">Latest deployment</Typography>
@@ -191,7 +199,11 @@ const DeploymentLifecycleDrawer: React.FC<DeploymentLifecycleDrawerProps> = ({
                     Deployment
                   </Typography>
 
-                  <Typography variant="body2" color="textSecondary">
+                  <Typography
+                    variant="body2"
+                    color="textSecondary"
+                    className={classes.commitMessage}
+                  >
                     Image{' '}
                     <Link
                       href={`https://${app?.status?.summary?.images?.[0]}`}
@@ -255,7 +267,11 @@ const DeploymentLifecycleDrawer: React.FC<DeploymentLifecycleDrawerProps> = ({
                             Deployment
                           </Typography>
 
-                          <Typography variant="body2" color="textSecondary">
+                          <Typography
+                            variant="body2"
+                            color="textSecondary"
+                            className={classes.commitMessage}
+                          >
                             {revisionsMap[dep.revision]?.message}{' '}
                             <Link
                               aria-disabled={!!commitUrl}