Fix duplicated repo name ids (#495)

* Fix filter by helm chart source
- To reproduce add bitnami helm repo endpoint named `bitnami`, add helm hub
  , try to filter by helm repo endpoint and nothing changes
- the helm repo bitnami charts were being overwritten by the helm hub
  bitnami charts as they were keyed the same in the store
- Fix is to ensure charts are keyed with their source

* Display helm hub label in chart summary view

Author: richard-cox

src/frontend/packages/suse-extensions/src/custom/helm/helm-entity-factory.ts

@@ -1,15 +1,13 @@
 import { Schema, schema } from 'normalizr';
 
 import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
+import { stratosMonocularEndpointGuid } from './monocular/stratos-monocular.helper';
 import { HelmVersion, MonocularChart } from './store/helm.types';
 
 export const helmVersionsEntityType = 'helmVersions';
 export const monocularChartsEntityType = 'monocularCharts';
 export const monocularChartVersionsEntityType = 'monocularChartVersions';
 
-export const getMonocularChartId = (entity: MonocularChart) => entity.id;
-export const getHelmVersionId = (entity: HelmVersion) => entity.endpointId;
-
 export const HELM_ENDPOINT_TYPE = 'helm';
 export const HELM_REPO_ENDPOINT_TYPE = 'repo';
 export const HELM_HUB_ENDPOINT_TYPE = 'hub';
@@ -39,19 +37,24 @@ export class HelmEntitySchema extends EntitySchema {
 entityCache[monocularChartsEntityType] = new HelmEntitySchema(
   monocularChartsEntityType,
   {},
-  { idAttribute: getMonocularChartId }
+  {
+    idAttribute: (entity: MonocularChart) => {
+      const monocularPrefix = entity.monocularEndpointId || stratosMonocularEndpointGuid;
+      return monocularPrefix + '/' + entity.id;
+    }
+  }
 );
 
 entityCache[helmVersionsEntityType] = new HelmEntitySchema(
   helmVersionsEntityType,
   {},
-  { idAttribute: getHelmVersionId }
+  { idAttribute: (entity: HelmVersion) => entity.endpointId }
 );
 
 entityCache[monocularChartVersionsEntityType] = new HelmEntitySchema(
   monocularChartVersionsEntityType,
   {},
-  { idAttribute: getMonocularChartId }
+  { idAttribute: (entity: MonocularChart) => entity.id }
 );
 
 export function helmEntityFactory(key: string): EntitySchema {

src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.html

@@ -5,8 +5,7 @@ <h2>Sorry, we couldn't find the chart</h2>
   <app-loader [loading]="loading">
     <div class="chart-details__wrapper">
       <app-entity-summary-title class="summary-title" *ngIf="chart" [title]="chart.attributes.name"
-        subTitle="{{ chart.attributes.repo.name }}"
-        [subText]="chart.attributes.description" [imagePath]="iconUrl">
+        [subTitle]="chartSubTitle" [subText]="chart.attributes.description" [imagePath]="iconUrl">
         <div class="chart-details__content">
           <article class="chart-details__content__docs">
             <app-chart-details-readme [currentVersion]=currentVersion></app-chart-details-readme>

src/frontend/packages/suse-extensions/src/custom/helm/monocular/chart-details/chart-details.component.ts

@@ -6,7 +6,7 @@ import { Chart } from '../shared/models/chart';
 import { ChartVersion } from '../shared/models/chart-version';
 import { ChartsService } from '../shared/services/charts.service';
 import { ConfigService } from '../shared/services/config.service';
-import { getMonocularEndpoint } from '../stratos-monocular.helper';
+import { getMonocularEndpoint, stratosMonocularEndpointGuid } from '../stratos-monocular.helper';
 
 @Component({
   selector: 'app-chart-details',
@@ -21,6 +21,7 @@ export class ChartDetailsComponent implements OnInit {
   currentVersion: ChartVersion;
   iconUrl: string;
   titleVersion: string;
+  chartSubTitle: string;
 
   loadingDelay: any;
 
@@ -43,6 +44,10 @@ export class ChartDetailsComponent implements OnInit {
           this.loading = false;
           this.initing = false;
           this.chart = chart;
+          this.chartSubTitle = chart.attributes.repo.name;
+          if (getMonocularEndpoint(this.route, chart) !== stratosMonocularEndpointGuid) {
+            this.chartSubTitle = 'Helm Hub - ' + this.chartSubTitle;
+          }
           const version = params.version || this.chart.relationships.latestChartVersion.data.version;
           this.chartsService.getVersion(repo, chartName, version).pipe(first())
             .subscribe(chartVersion => {

src/frontend/packages/suse-extensions/src/custom/helm/store/helm.effects.ts

@@ -18,6 +18,7 @@ import {
 import { ClearPaginationOfType, ResetPaginationOfType } from '../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import { EntitySchema } from '../../../../../store/src/helpers/entity-schema';
 import { isJetstreamError } from '../../../../../store/src/jetstream';
 import { ApiRequestTypes } from '../../../../../store/src/reducers/api-request-reducer/request-helpers';
 import { endpointOfTypeSelector } from '../../../../../store/src/selectors/endpoint.selectors';
@@ -31,13 +32,7 @@ import {
   WrapperRequestActionSuccess,
 } from '../../../../../store/src/types/request.types';
 import { helmEntityCatalog } from '../helm-entity-catalog';
-import {
-  getHelmVersionId,
-  getMonocularChartId,
-  HELM_ENDPOINT_TYPE,
-  HELM_HUB_ENDPOINT_TYPE,
-  HELM_REPO_ENDPOINT_TYPE,
-} from '../helm-entity-factory';
+import { HELM_ENDPOINT_TYPE, HELM_HUB_ENDPOINT_TYPE, HELM_REPO_ENDPOINT_TYPE } from '../helm-entity-factory';
 import { Chart } from '../monocular/shared/models/chart';
 import { stratosMonocularEndpointGuid } from '../monocular/stratos-monocular.helper';
 import {
@@ -58,15 +53,19 @@ type MonocularChartsResponse = {
   data: Chart[];
 };
 
-const mapMonocularChartResponse = (entityKey: string, response: MonocularChartsResponse): NormalizedResponse => {
+const mapMonocularChartResponse = (
+  entityKey: string,
+  response: MonocularChartsResponse,
+  schema: EntitySchema
+): NormalizedResponse => {
   const base: NormalizedResponse = {
     entities: { [entityKey]: {} },
     result: []
   };
 
   const items = response.data as Array<any>;
   const processedData: NormalizedResponse = items.reduce((res, data) => {
-    const id = getMonocularChartId(data);
+    const id = schema.getId(data);
     res.entities[entityKey][id] = data;
     // Promote the name to the top-level object for simplicity
     data.name = data.attributes.name;
@@ -76,12 +75,16 @@ const mapMonocularChartResponse = (entityKey: string, response: MonocularChartsR
   return processedData;
 };
 
-const mergeMonocularChartResponses = (entityKey: string, responses: MonocularChartsResponse[]): NormalizedResponse => {
+const mergeMonocularChartResponses = (
+  entityKey: string,
+  responses: MonocularChartsResponse[],
+  schema: EntitySchema
+): NormalizedResponse => {
   const combined = responses.reduce((res, response) => {
     res.data = res.data.concat(response.data);
     return res;
   }, { data: [] });
-  return mapMonocularChartResponse(entityKey, combined);
+  return mapMonocularChartResponse(entityKey, combined, schema);
 };
 
 const addMonocularId = (endpointId: string, response: MonocularChartsResponse): MonocularChartsResponse => {
@@ -155,7 +158,7 @@ export class HelmEffects {
         this.createHelmRepoRequest(helmEndpoints),
         this.createHelmHubRequest(helmHubEndpoint)
       ]).pipe(
-        map(res => mergeMonocularChartResponses(entityKey, res)),
+        map(res => mergeMonocularChartResponses(entityKey, res, action.entity[0])),
         mergeMap((response: NormalizedResponse) => [new WrapperRequestActionSuccess(response, action)]),
         catchError(error => {
           const { status, message } = HelmEffects.createHelmError(error);
@@ -199,7 +202,7 @@ export class HelmEffects {
             endpointId: endpoint,
             ...endpointData
           };
-          processedData.entities[entityKey][getHelmVersionId(version)] = version;
+          processedData.entities[entityKey][action.entity[0].getId(version)] = version;
           processedData.result.push(endpoint);
         });
         return processedData;
@@ -221,7 +224,7 @@ export class HelmEffects {
 
           const items = response.data as Array<any>;
           const processedData = items.reduce((res, data) => {
-            const id = getMonocularChartId(data);
+            const id = action.entity[0].getId(data);
             res.entities[entityKey][id] = data;
             // Promote the name to the top-level object for simplicity
             data.name = data.attributes.name;