@backstage-community/plugin-jfrog-artifactory 1.15.2 → 1.16.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 ### Dependencies
 
+## 1.16.0
+
+### Minor Changes
+
+- 3dab416: Adds the possibility to use multiple artifactory instances
+
+### Patch Changes
+
+- 7f18c19: remove devDependency on '@redhat-developer/red-hat-developer-hub-theme'
+
+## 1.15.3
+
+### Patch Changes
+
+- 66718a0: remove unused devDependencies
+
 ## 1.15.2
 
 ### Patch Changes

package/README.md

@@ -27,6 +27,18 @@ The Jfrog Artifactory plugin displays information about your container images wi
          secure: true
    ```
 
+If you have multiple instances of artifactory supported, you can set up multiple proxy target paths as follows:
+
+```yaml title="app-config.yaml"
+proxy:
+  endpoints:
+    '/jfrog-instance1': # This is a local alias for the proxy endpoint, not the actual Artifactory hostname
+      target: 'https://<hostname1>'
+      # Rest of the config for hostname1
+    '/jfrog-instance2':
+      target: 'https://<hostname2>'
+```
+
 1. Enable the **JFROG ARTIFACTORY** tab on the entity view page in `packages/app/src/components/catalog/EntityPage.tsx`:
 
    ```ts title="packages/app/src/components/catalog/EntityPage.tsx"
@@ -60,6 +72,9 @@ The Jfrog Artifactory plugin displays information about your container images wi
    metadata:
      annotations:
        'jfrog-artifactory/image-name': '<IMAGE-NAME>'
+       # if your app supports multiple artifactory instances,
+       # you'll need to specify the instance proxy target path your image belongs to
+       'jfrog-artifactory/target-proxy': '/<PROXY-TARGET>' # e.g. `/jfrog-instance1` from the example above
    ```
 
 ## For users

package/dist/api/index.esm.js

@@ -14,9 +14,9 @@ class JfrogArtifactoryApiClient {
     this.configApi = options.configApi;
     this.identityApi = options.identityApi;
   }
-  async getBaseUrl() {
+  async getBaseUrl(target) {
     const proxyPath = this.configApi.getOptionalString("jfrogArtifactory.proxyPath") || DEFAULT_PROXY_PATH;
-    return `${await this.discoveryApi.getBaseUrl("proxy")}${proxyPath}`;
+    return `${await this.discoveryApi.getBaseUrl("proxy")}${target ?? proxyPath}`;
   }
   async fetcher(url, query) {
     const { token: idToken } = await this.identityApi.getCredentials();
@@ -35,8 +35,8 @@ class JfrogArtifactoryApiClient {
     }
     return await response.json();
   }
-  async getTags(repo) {
-    const proxyUrl = await this.getBaseUrl();
+  async getTags(repo, target) {
+    const proxyUrl = await this.getBaseUrl(target);
     const tagQuery = {
       query: "query ($filter: VersionFilter!, $first: Int, $orderBy: VersionOrder) { versions (filter: $filter, first: $first, orderBy: $orderBy) { edges { node { name, created, modified, package { id }, repos { name, type, leadFilePath }, licenses { name, source }, size, stats { downloadCount }, vulnerabilities { critical, high, medium, low, info, unknown, skipped }, files { name, lead, size, md5, sha1, sha256, mimeType } } } } }",
       variables: {

package/dist/api/index.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.esm.js","sources":["../../src/api/index.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n  ConfigApi,\n  createApiRef,\n  DiscoveryApi,\n  IdentityApi,\n} from '@backstage/core-plugin-api';\n\nimport { TagsResponse } from '../types';\n\nconst DEFAULT_PROXY_PATH = '/jfrog-artifactory/api';\n\nexport interface JfrogArtifactoryApiV1 {\n  getTags(repo: string): Promise<TagsResponse>;\n}\n\nexport const jfrogArtifactoryApiRef = createApiRef<JfrogArtifactoryApiV1>({\n  id: 'plugin.jfrog-artifactory.service',\n});\n\nexport type Options = {\n  discoveryApi: DiscoveryApi;\n  configApi: ConfigApi;\n  identityApi: IdentityApi;\n};\n\nexport class JfrogArtifactoryApiClient implements JfrogArtifactoryApiV1 {\n  // @ts-ignore\n  private readonly discoveryApi: DiscoveryApi;\n\n  private readonly configApi: ConfigApi;\n\n  private readonly identityApi: IdentityApi;\n\n  constructor(options: Options) {\n    this.discoveryApi = options.discoveryApi;\n    this.configApi = options.configApi;\n    this.identityApi = options.identityApi;\n  }\n\n  private async getBaseUrl() {\n    const proxyPath =\n      this.configApi.getOptionalString('jfrogArtifactory.proxyPath') ||\n      DEFAULT_PROXY_PATH;\n    return `${await this.discoveryApi.getBaseUrl('proxy')}${proxyPath}`;\n  }\n\n  private async fetcher(url: string, query: string) {\n    const { token: idToken } = await this.identityApi.getCredentials();\n    const response = await fetch(url, {\n      headers: {\n        'Content-Type': 'application/json',\n        ...(idToken && { Authorization: `Bearer ${idToken}` }),\n      },\n      method: 'POST',\n      body: query,\n    });\n    if (!response.ok) {\n      throw new Error(\n        `failed to fetch data, status ${response.status}: ${response.statusText}`,\n      );\n    }\n    return await response.json();\n  }\n\n  async getTags(repo: string) {\n    const proxyUrl = await this.getBaseUrl();\n    const tagQuery = {\n      query:\n        'query ($filter: VersionFilter!, $first: Int, $orderBy: VersionOrder) { versions (filter: $filter, first: $first, orderBy: $orderBy) { edges { node { name, created, modified, package { id }, repos { name, type, leadFilePath }, licenses { name, source }, size, stats { downloadCount }, vulnerabilities { critical, high, medium, low, info, unknown, skipped }, files { name, lead, size, md5, sha1, sha256, mimeType } } } } }',\n      variables: {\n        filter: {\n          packageId: `docker://${repo}`,\n          name: '*',\n          ignorePreRelease: false,\n        },\n        first: 100,\n        orderBy: {\n          field: 'NAME_SEMVER',\n          direction: 'DESC',\n        },\n      },\n    };\n\n    return (await this.fetcher(\n      `${proxyUrl}/metadata/api/v1/query`,\n      JSON.stringify(tagQuery),\n    )) as TagsResponse;\n  }\n}\n"],"names":[],"mappings":";;AAwBA,MAAM,kBAAqB,GAAA,wBAAA;AAMpB,MAAM,yBAAyB,YAAoC,CAAA;AAAA,EACxE,EAAI,EAAA;AACN,CAAC;AAQM,MAAM,yBAA2D,CAAA;AAAA;AAAA,EAErD,YAAA;AAAA,EAEA,SAAA;AAAA,EAEA,WAAA;AAAA,EAEjB,YAAY,OAAkB,EAAA;AAC5B,IAAA,IAAA,CAAK,eAAe,OAAQ,CAAA,YAAA;AAC5B,IAAA,IAAA,CAAK,YAAY,OAAQ,CAAA,SAAA;AACzB,IAAA,IAAA,CAAK,cAAc,OAAQ,CAAA,WAAA;AAAA;AAC7B,EAEA,MAAc,UAAa,GAAA;AACzB,IAAA,MAAM,SACJ,GAAA,IAAA,CAAK,SAAU,CAAA,iBAAA,CAAkB,4BAA4B,CAC7D,IAAA,kBAAA;AACF,IAAO,OAAA,CAAA,EAAG,MAAM,IAAK,CAAA,YAAA,CAAa,WAAW,OAAO,CAAC,GAAG,SAAS,CAAA,CAAA;AAAA;AACnE,EAEA,MAAc,OAAQ,CAAA,GAAA,EAAa,KAAe,EAAA;AAChD,IAAA,MAAM,EAAE,KAAO,EAAA,OAAA,KAAY,MAAM,IAAA,CAAK,YAAY,cAAe,EAAA;AACjE,IAAM,MAAA,QAAA,GAAW,MAAM,KAAA,CAAM,GAAK,EAAA;AAAA,MAChC,OAAS,EAAA;AAAA,QACP,cAAgB,EAAA,kBAAA;AAAA,QAChB,GAAI,OAAW,IAAA,EAAE,aAAe,EAAA,CAAA,OAAA,EAAU,OAAO,CAAG,CAAA;AAAA,OACtD;AAAA,MACA,MAAQ,EAAA,MAAA;AAAA,MACR,IAAM,EAAA;AAAA,KACP,CAAA;AACD,IAAI,IAAA,CAAC,SAAS,EAAI,EAAA;AAChB,MAAA,MAAM,IAAI,KAAA;AAAA,QACR,CAAgC,6BAAA,EAAA,QAAA,CAAS,MAAM,CAAA,EAAA,EAAK,SAAS,UAAU,CAAA;AAAA,OACzE;AAAA;AAEF,IAAO,OAAA,MAAM,SAAS,IAAK,EAAA;AAAA;AAC7B,EAEA,MAAM,QAAQ,IAAc,EAAA;AAC1B,IAAM,MAAA,QAAA,GAAW,MAAM,IAAA,CAAK,UAAW,EAAA;AACvC,IAAA,MAAM,QAAW,GAAA;AAAA,MACf,KACE,EAAA,saAAA;AAAA,MACF,SAAW,EAAA;AAAA,QACT,MAAQ,EAAA;AAAA,UACN,SAAA,EAAW,YAAY,IAAI,CAAA,CAAA;AAAA,UAC3B,IAAM,EAAA,GAAA;AAAA,UACN,gBAAkB,EAAA;AAAA,SACpB;AAAA,QACA,KAAO,EAAA,GAAA;AAAA,QACP,OAAS,EAAA;AAAA,UACP,KAAO,EAAA,aAAA;AAAA,UACP,SAAW,EAAA;AAAA;AACb;AACF,KACF;AAEA,IAAA,OAAQ,MAAM,IAAK,CAAA,OAAA;AAAA,MACjB,GAAG,QAAQ,CAAA,sBAAA,CAAA;AAAA,MACX,IAAA,CAAK,UAAU,QAAQ;AAAA,KACzB;AAAA;AAEJ;;;;"}
+{"version":3,"file":"index.esm.js","sources":["../../src/api/index.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n  ConfigApi,\n  createApiRef,\n  DiscoveryApi,\n  IdentityApi,\n} from '@backstage/core-plugin-api';\n\nimport { TagsResponse } from '../types';\n\nconst DEFAULT_PROXY_PATH = '/jfrog-artifactory/api';\n\nexport interface JfrogArtifactoryApiV1 {\n  getTags(repo: string, target?: string): Promise<TagsResponse>;\n}\n\nexport const jfrogArtifactoryApiRef = createApiRef<JfrogArtifactoryApiV1>({\n  id: 'plugin.jfrog-artifactory.service',\n});\n\nexport type Options = {\n  discoveryApi: DiscoveryApi;\n  configApi: ConfigApi;\n  identityApi: IdentityApi;\n};\n\nexport class JfrogArtifactoryApiClient implements JfrogArtifactoryApiV1 {\n  // @ts-ignore\n  private readonly discoveryApi: DiscoveryApi;\n\n  private readonly configApi: ConfigApi;\n\n  private readonly identityApi: IdentityApi;\n\n  constructor(options: Options) {\n    this.discoveryApi = options.discoveryApi;\n    this.configApi = options.configApi;\n    this.identityApi = options.identityApi;\n  }\n\n  private async getBaseUrl(target?: string) {\n    const proxyPath =\n      this.configApi.getOptionalString('jfrogArtifactory.proxyPath') ||\n      DEFAULT_PROXY_PATH;\n    return `${await this.discoveryApi.getBaseUrl('proxy')}${\n      target ?? proxyPath\n    }`;\n  }\n\n  private async fetcher(url: string, query: string) {\n    const { token: idToken } = await this.identityApi.getCredentials();\n    const response = await fetch(url, {\n      headers: {\n        'Content-Type': 'application/json',\n        ...(idToken && { Authorization: `Bearer ${idToken}` }),\n      },\n      method: 'POST',\n      body: query,\n    });\n    if (!response.ok) {\n      throw new Error(\n        `failed to fetch data, status ${response.status}: ${response.statusText}`,\n      );\n    }\n    return await response.json();\n  }\n\n  async getTags(repo: string, target?: string) {\n    const proxyUrl = await this.getBaseUrl(target);\n    const tagQuery = {\n      query:\n        'query ($filter: VersionFilter!, $first: Int, $orderBy: VersionOrder) { versions (filter: $filter, first: $first, orderBy: $orderBy) { edges { node { name, created, modified, package { id }, repos { name, type, leadFilePath }, licenses { name, source }, size, stats { downloadCount }, vulnerabilities { critical, high, medium, low, info, unknown, skipped }, files { name, lead, size, md5, sha1, sha256, mimeType } } } } }',\n      variables: {\n        filter: {\n          packageId: `docker://${repo}`,\n          name: '*',\n          ignorePreRelease: false,\n        },\n        first: 100,\n        orderBy: {\n          field: 'NAME_SEMVER',\n          direction: 'DESC',\n        },\n      },\n    };\n\n    return (await this.fetcher(\n      `${proxyUrl}/metadata/api/v1/query`,\n      JSON.stringify(tagQuery),\n    )) as TagsResponse;\n  }\n}\n"],"names":[],"mappings":";;AAwBA,MAAM,kBAAqB,GAAA,wBAAA;AAMpB,MAAM,yBAAyB,YAAoC,CAAA;AAAA,EACxE,EAAI,EAAA;AACN,CAAC;AAQM,MAAM,yBAA2D,CAAA;AAAA;AAAA,EAErD,YAAA;AAAA,EAEA,SAAA;AAAA,EAEA,WAAA;AAAA,EAEjB,YAAY,OAAkB,EAAA;AAC5B,IAAA,IAAA,CAAK,eAAe,OAAQ,CAAA,YAAA;AAC5B,IAAA,IAAA,CAAK,YAAY,OAAQ,CAAA,SAAA;AACzB,IAAA,IAAA,CAAK,cAAc,OAAQ,CAAA,WAAA;AAAA;AAC7B,EAEA,MAAc,WAAW,MAAiB,EAAA;AACxC,IAAA,MAAM,SACJ,GAAA,IAAA,CAAK,SAAU,CAAA,iBAAA,CAAkB,4BAA4B,CAC7D,IAAA,kBAAA;AACF,IAAO,OAAA,CAAA,EAAG,MAAM,IAAK,CAAA,YAAA,CAAa,WAAW,OAAO,CAAC,CACnD,EAAA,MAAA,IAAU,SACZ,CAAA,CAAA;AAAA;AACF,EAEA,MAAc,OAAQ,CAAA,GAAA,EAAa,KAAe,EAAA;AAChD,IAAA,MAAM,EAAE,KAAO,EAAA,OAAA,KAAY,MAAM,IAAA,CAAK,YAAY,cAAe,EAAA;AACjE,IAAM,MAAA,QAAA,GAAW,MAAM,KAAA,CAAM,GAAK,EAAA;AAAA,MAChC,OAAS,EAAA;AAAA,QACP,cAAgB,EAAA,kBAAA;AAAA,QAChB,GAAI,OAAW,IAAA,EAAE,aAAe,EAAA,CAAA,OAAA,EAAU,OAAO,CAAG,CAAA;AAAA,OACtD;AAAA,MACA,MAAQ,EAAA,MAAA;AAAA,MACR,IAAM,EAAA;AAAA,KACP,CAAA;AACD,IAAI,IAAA,CAAC,SAAS,EAAI,EAAA;AAChB,MAAA,MAAM,IAAI,KAAA;AAAA,QACR,CAAgC,6BAAA,EAAA,QAAA,CAAS,MAAM,CAAA,EAAA,EAAK,SAAS,UAAU,CAAA;AAAA,OACzE;AAAA;AAEF,IAAO,OAAA,MAAM,SAAS,IAAK,EAAA;AAAA;AAC7B,EAEA,MAAM,OAAQ,CAAA,IAAA,EAAc,MAAiB,EAAA;AAC3C,IAAA,MAAM,QAAW,GAAA,MAAM,IAAK,CAAA,UAAA,CAAW,MAAM,CAAA;AAC7C,IAAA,MAAM,QAAW,GAAA;AAAA,MACf,KACE,EAAA,saAAA;AAAA,MACF,SAAW,EAAA;AAAA,QACT,MAAQ,EAAA;AAAA,UACN,SAAA,EAAW,YAAY,IAAI,CAAA,CAAA;AAAA,UAC3B,IAAM,EAAA,GAAA;AAAA,UACN,gBAAkB,EAAA;AAAA,SACpB;AAAA,QACA,KAAO,EAAA,GAAA;AAAA,QACP,OAAS,EAAA;AAAA,UACP,KAAO,EAAA,aAAA;AAAA,UACP,SAAW,EAAA;AAAA;AACb;AACF,KACF;AAEA,IAAA,OAAQ,MAAM,IAAK,CAAA,OAAA;AAAA,MACjB,GAAG,QAAQ,CAAA,sBAAA,CAAA;AAAA,MACX,IAAA,CAAK,UAAU,QAAQ;AAAA,KACzB;AAAA;AAEJ;;;;"}

package/dist/components/JfrogArtifactoryDashboardPage/JfrogArtifactoryDashboardPage.esm.js

@@ -5,8 +5,8 @@ import { useJfrogArtifactoryAppData } from '../useJfrogArtifactoryAppData.esm.js
 
 const JfrogArtifactoryDashboardPage = () => {
   const { entity } = useEntity();
-  const { imageName } = useJfrogArtifactoryAppData({ entity });
-  return /* @__PURE__ */ jsx(JfrogArtifactoryRepository, { image: imageName });
+  const { imageName, targetProxy } = useJfrogArtifactoryAppData({ entity });
+  return /* @__PURE__ */ jsx(JfrogArtifactoryRepository, { image: imageName, target: targetProxy });
 };
 
 export { JfrogArtifactoryDashboardPage };

package/dist/components/JfrogArtifactoryDashboardPage/JfrogArtifactoryDashboardPage.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"JfrogArtifactoryDashboardPage.esm.js","sources":["../../../src/components/JfrogArtifactoryDashboardPage/JfrogArtifactoryDashboardPage.tsx"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { useEntity } from '@backstage/plugin-catalog-react';\n\nimport { JfrogArtifactoryRepository } from '../JfrogArtifactoryRepository';\nimport { useJfrogArtifactoryAppData } from '../useJfrogArtifactoryAppData';\n\nexport const JfrogArtifactoryDashboardPage = () => {\n  const { entity } = useEntity();\n  const { imageName } = useJfrogArtifactoryAppData({ entity });\n\n  return <JfrogArtifactoryRepository image={imageName} />;\n};\n"],"names":[],"mappings":";;;;;AAoBO,MAAM,gCAAgC,MAAM;AACjD,EAAM,MAAA,EAAE,MAAO,EAAA,GAAI,SAAU,EAAA;AAC7B,EAAA,MAAM,EAAE,SAAU,EAAA,GAAI,0BAA2B,CAAA,EAAE,QAAQ,CAAA;AAE3D,EAAO,uBAAA,GAAA,CAAC,0BAA2B,EAAA,EAAA,KAAA,EAAO,SAAW,EAAA,CAAA;AACvD;;;;"}
+{"version":3,"file":"JfrogArtifactoryDashboardPage.esm.js","sources":["../../../src/components/JfrogArtifactoryDashboardPage/JfrogArtifactoryDashboardPage.tsx"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { useEntity } from '@backstage/plugin-catalog-react';\n\nimport { JfrogArtifactoryRepository } from '../JfrogArtifactoryRepository';\nimport { useJfrogArtifactoryAppData } from '../useJfrogArtifactoryAppData';\n\nexport const JfrogArtifactoryDashboardPage = () => {\n  const { entity } = useEntity();\n  const { imageName, targetProxy } = useJfrogArtifactoryAppData({ entity });\n\n  return <JfrogArtifactoryRepository image={imageName} target={targetProxy} />;\n};\n"],"names":[],"mappings":";;;;;AAoBO,MAAM,gCAAgC,MAAM;AACjD,EAAM,MAAA,EAAE,MAAO,EAAA,GAAI,SAAU,EAAA;AAC7B,EAAA,MAAM,EAAE,SAAW,EAAA,WAAA,KAAgB,0BAA2B,CAAA,EAAE,QAAQ,CAAA;AAExE,EAAA,uBAAQ,GAAA,CAAA,0BAAA,EAAA,EAA2B,KAAO,EAAA,SAAA,EAAW,QAAQ,WAAa,EAAA,CAAA;AAC5E;;;;"}

package/dist/components/JfrogArtifactoryRepository/JfrogArtifactoryRepository.esm.js

@@ -19,14 +19,14 @@ const useLocalStyles = makeStyles({
     }
   }
 });
-function JfrogArtifactoryRepository({ image }) {
+function JfrogArtifactoryRepository({ image, target }) {
   const jfrogArtifactoryClient = useApi(jfrogArtifactoryApiRef);
   const classes = useStyles();
   const localClasses = useLocalStyles();
   const [edges, setEdges] = useState([]);
   const titleprop = `Jfrog Artifactory repository: ${image}`;
   const { loading } = useAsync(async () => {
-    const tagsResponse = await jfrogArtifactoryClient.getTags(image);
+    const tagsResponse = await jfrogArtifactoryClient.getTags(image, target);
     setEdges(tagsResponse.data.versions.edges);
     return tagsResponse;
   });

package/dist/components/JfrogArtifactoryRepository/JfrogArtifactoryRepository.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"JfrogArtifactoryRepository.esm.js","sources":["../../../src/components/JfrogArtifactoryRepository/JfrogArtifactoryRepository.tsx"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { useState } from 'react';\nimport { useAsync } from 'react-use';\n\nimport { Link, Progress, Table } from '@backstage/core-components';\nimport { useApi } from '@backstage/core-plugin-api';\n\nimport { Box, Chip, makeStyles } from '@material-ui/core';\n\nimport { formatDate } from '@janus-idp/shared-react';\n\nimport { jfrogArtifactoryApiRef } from '../../api';\nimport { Edge } from '../../types';\nimport { columns, useStyles } from './tableHeading';\nimport { formatByteSize } from '../../utils';\n\nconst useLocalStyles = makeStyles({\n  chip: {\n    margin: 0,\n    marginRight: '.2em',\n    height: '1.5em',\n    '& > span': {\n      padding: '.3em',\n    },\n  },\n});\n\nexport function JfrogArtifactoryRepository({ image }: RepositoryProps) {\n  const jfrogArtifactoryClient = useApi(jfrogArtifactoryApiRef);\n  const classes = useStyles();\n  const localClasses = useLocalStyles();\n  const [edges, setEdges] = useState<Edge[]>([]);\n  const titleprop = `Jfrog Artifactory repository: ${image}`;\n\n  const { loading } = useAsync(async () => {\n    const tagsResponse = await jfrogArtifactoryClient.getTags(image);\n\n    setEdges(tagsResponse.data.versions.edges);\n\n    return tagsResponse;\n  });\n\n  if (loading) {\n    return <Progress />;\n  }\n\n  const data = edges?.map((edge: Edge) => {\n    const shortHash = edge.node.files\n      .find(manifest => manifest.name === 'manifest.json')\n      ?.sha256.substring(0, 12);\n    return {\n      name: edge.node.name,\n      last_modified: formatDate(edge.node.modified),\n      size: formatByteSize(Number(edge.node.size)),\n      manifest_digest: (\n        <Box sx={{ display: 'flex', alignItems: 'center' }}>\n          <Chip label=\"sha256\" className={localClasses.chip} />\n          {shortHash}\n        </Box>\n      ),\n      repositories:\n        `${edge.node.repos.length}` +\n        ' | ' +\n        `${edge.node.repos.map(repo => repo.name).join('| ')}`,\n    };\n  });\n\n  return (\n    <div style={{ border: '1px solid #ddd' }}>\n      <Table\n        title={titleprop}\n        options={{ paging: true, padding: 'dense' }}\n        data={data}\n        columns={columns}\n        emptyContent={\n          <div className={classes.empty}>\n            No data was added yet,&nbsp;\n            <Link to=\"https://backstage.io/\">learn how to add data</Link>.\n          </div>\n        }\n      />\n    </div>\n  );\n}\n\ninterface RepositoryProps {\n  image: string;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"JfrogArtifactoryRepository.esm.js","sources":["../../../src/components/JfrogArtifactoryRepository/JfrogArtifactoryRepository.tsx"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { useState } from 'react';\nimport { useAsync } from 'react-use';\n\nimport { Link, Progress, Table } from '@backstage/core-components';\nimport { useApi } from '@backstage/core-plugin-api';\n\nimport { Box, Chip, makeStyles } from '@material-ui/core';\n\nimport { formatDate } from '@janus-idp/shared-react';\n\nimport { jfrogArtifactoryApiRef } from '../../api';\nimport { Edge } from '../../types';\nimport { columns, useStyles } from './tableHeading';\nimport { formatByteSize } from '../../utils';\n\nconst useLocalStyles = makeStyles({\n  chip: {\n    margin: 0,\n    marginRight: '.2em',\n    height: '1.5em',\n    '& > span': {\n      padding: '.3em',\n    },\n  },\n});\n\nexport function JfrogArtifactoryRepository({ image, target }: RepositoryProps) {\n  const jfrogArtifactoryClient = useApi(jfrogArtifactoryApiRef);\n  const classes = useStyles();\n  const localClasses = useLocalStyles();\n  const [edges, setEdges] = useState<Edge[]>([]);\n  const titleprop = `Jfrog Artifactory repository: ${image}`;\n\n  const { loading } = useAsync(async () => {\n    const tagsResponse = await jfrogArtifactoryClient.getTags(image, target);\n\n    setEdges(tagsResponse.data.versions.edges);\n\n    return tagsResponse;\n  });\n\n  if (loading) {\n    return <Progress />;\n  }\n\n  const data = edges?.map((edge: Edge) => {\n    const shortHash = edge.node.files\n      .find(manifest => manifest.name === 'manifest.json')\n      ?.sha256.substring(0, 12);\n    return {\n      name: edge.node.name,\n      last_modified: formatDate(edge.node.modified),\n      size: formatByteSize(Number(edge.node.size)),\n      manifest_digest: (\n        <Box sx={{ display: 'flex', alignItems: 'center' }}>\n          <Chip label=\"sha256\" className={localClasses.chip} />\n          {shortHash}\n        </Box>\n      ),\n      repositories:\n        `${edge.node.repos.length}` +\n        ' | ' +\n        `${edge.node.repos.map(repo => repo.name).join('| ')}`,\n    };\n  });\n\n  return (\n    <div style={{ border: '1px solid #ddd' }}>\n      <Table\n        title={titleprop}\n        options={{ paging: true, padding: 'dense' }}\n        data={data}\n        columns={columns}\n        emptyContent={\n          <div className={classes.empty}>\n            No data was added yet,&nbsp;\n            <Link to=\"https://backstage.io/\">learn how to add data</Link>.\n          </div>\n        }\n      />\n    </div>\n  );\n}\n\ninterface RepositoryProps {\n  image: string;\n  target?: string;\n}\n"],"names":[],"mappings":"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"}

package/dist/components/useJfrogArtifactoryAppData.esm.js

@@ -1,11 +1,13 @@
 const JFROG_ARTIFACTORY_ANNOTATION_IMAGE_NAME = "jfrog-artifactory/image-name";
+const JFROG_ARTIFACTORY_ANNOTATION_TARGET_PROXY = "jfrog-artifactory/target-proxy";
 const useJfrogArtifactoryAppData = ({ entity }) => {
   const imageName = entity?.metadata.annotations?.[JFROG_ARTIFACTORY_ANNOTATION_IMAGE_NAME] ?? "";
+  const targetProxy = entity?.metadata.annotations?.[JFROG_ARTIFACTORY_ANNOTATION_TARGET_PROXY];
   if (!imageName) {
     throw new Error("'Jfrog Artifactory' annotations are missing");
   }
-  return { imageName };
+  return { imageName, targetProxy };
 };
 
-export { JFROG_ARTIFACTORY_ANNOTATION_IMAGE_NAME, useJfrogArtifactoryAppData };
+export { JFROG_ARTIFACTORY_ANNOTATION_IMAGE_NAME, JFROG_ARTIFACTORY_ANNOTATION_TARGET_PROXY, useJfrogArtifactoryAppData };
 //# sourceMappingURL=useJfrogArtifactoryAppData.esm.js.map

package/dist/components/useJfrogArtifactoryAppData.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"useJfrogArtifactoryAppData.esm.js","sources":["../../src/components/useJfrogArtifactoryAppData.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { Entity } from '@backstage/catalog-model';\n\nexport const JFROG_ARTIFACTORY_ANNOTATION_IMAGE_NAME =\n  'jfrog-artifactory/image-name';\n\nexport const useJfrogArtifactoryAppData = ({ entity }: { entity: Entity }) => {\n  const imageName =\n    entity?.metadata.annotations?.[JFROG_ARTIFACTORY_ANNOTATION_IMAGE_NAME] ??\n    '';\n\n  if (!imageName) {\n    throw new Error(\"'Jfrog Artifactory' annotations are missing\");\n  }\n  return { imageName };\n};\n"],"names":[],"mappings":"AAiBO,MAAM,uCACX,GAAA;AAEK,MAAM,0BAA6B,GAAA,CAAC,EAAE,MAAA,EAAiC,KAAA;AAC5E,EAAA,MAAM,SACJ,GAAA,MAAA,EAAQ,QAAS,CAAA,WAAA,GAAc,uCAAuC,CACtE,IAAA,EAAA;AAEF,EAAA,IAAI,CAAC,SAAW,EAAA;AACd,IAAM,MAAA,IAAI,MAAM,6CAA6C,CAAA;AAAA;AAE/D,EAAA,OAAO,EAAE,SAAU,EAAA;AACrB;;;;"}
+{"version":3,"file":"useJfrogArtifactoryAppData.esm.js","sources":["../../src/components/useJfrogArtifactoryAppData.ts"],"sourcesContent":["/*\n * Copyright 2024 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { Entity } from '@backstage/catalog-model';\n\nexport const JFROG_ARTIFACTORY_ANNOTATION_IMAGE_NAME =\n  'jfrog-artifactory/image-name';\n\nexport const JFROG_ARTIFACTORY_ANNOTATION_TARGET_PROXY =\n  'jfrog-artifactory/target-proxy';\n\nexport const useJfrogArtifactoryAppData = ({ entity }: { entity: Entity }) => {\n  const imageName =\n    entity?.metadata.annotations?.[JFROG_ARTIFACTORY_ANNOTATION_IMAGE_NAME] ??\n    '';\n\n  const targetProxy =\n    entity?.metadata.annotations?.[JFROG_ARTIFACTORY_ANNOTATION_TARGET_PROXY];\n\n  if (!imageName) {\n    throw new Error(\"'Jfrog Artifactory' annotations are missing\");\n  }\n  return { imageName, targetProxy };\n};\n"],"names":[],"mappings":"AAiBO,MAAM,uCACX,GAAA;AAEK,MAAM,yCACX,GAAA;AAEK,MAAM,0BAA6B,GAAA,CAAC,EAAE,MAAA,EAAiC,KAAA;AAC5E,EAAA,MAAM,SACJ,GAAA,MAAA,EAAQ,QAAS,CAAA,WAAA,GAAc,uCAAuC,CACtE,IAAA,EAAA;AAEF,EAAA,MAAM,WACJ,GAAA,MAAA,EAAQ,QAAS,CAAA,WAAA,GAAc,yCAAyC,CAAA;AAE1E,EAAA,IAAI,CAAC,SAAW,EAAA;AACd,IAAM,MAAA,IAAI,MAAM,6CAA6C,CAAA;AAAA;AAE/D,EAAO,OAAA,EAAE,WAAW,WAAY,EAAA;AAClC;;;;"}

package/dist/plugin.esm.js

@@ -1,5 +1,5 @@
-import { createPlugin, createApiFactory, discoveryApiRef, configApiRef, identityApiRef, createComponentExtension } from '@backstage/core-plugin-api';
-import { jfrogArtifactoryApiRef, JfrogArtifactoryApiClient } from './api/index.esm.js';
+import { createPlugin, createApiFactory, identityApiRef, configApiRef, discoveryApiRef, createComponentExtension } from '@backstage/core-plugin-api';
+import { JfrogArtifactoryApiClient, jfrogArtifactoryApiRef } from './api/index.esm.js';
 import { JFROG_ARTIFACTORY_ANNOTATION_IMAGE_NAME } from './components/useJfrogArtifactoryAppData.esm.js';
 import { rootRouteRef } from './routes.esm.js';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage-community/plugin-jfrog-artifactory",
-  "version": "1.15.2",
+  "version": "1.16.0",
   "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",
@@ -46,15 +46,11 @@
   },
   "devDependencies": {
     "@backstage/cli": "^0.32.1",
-    "@backstage/core-app-api": "^1.17.0",
     "@backstage/dev-utils": "^1.1.10",
     "@backstage/test-utils": "^1.7.8",
-    "@redhat-developer/red-hat-developer-hub-theme": "0.4.0",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "14.3.1",
-    "@testing-library/user-event": "14.6.1",
     "cross-fetch": "4.0.0",
-    "msw": "1.3.5",
     "react-router-dom": "^6.26.2"
   },
   "files": [