Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1998240: Update helm side panel info and use support url #9899

Merged
merged 1 commit into from Aug 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion frontend/packages/helm-plugin/locales/en/helm-plugin.json
Expand Up @@ -20,7 +20,6 @@
"Certified": "Certified",
"Latest Chart version": "Latest Chart version",
"Product version": "Product version",
"Provider type": "Provider type",
"Provider": "Provider",
"Home page": "Home page",
"Repository": "Repository",
Expand Down
Expand Up @@ -17,6 +17,7 @@ import {
PROVIDER_TYPE_ANNOTATION,
PROVIDER_TYPE_KEYS,
PROVIDER_NAME_ANNOTATION,
SUPPORT_URL_ANNOTATION,
} from './const';

export const normalizeHelmCharts = (
Expand All @@ -37,6 +38,7 @@ export const normalizeHelmCharts = (
const annotatedName = annotations?.[CHART_NAME_ANNOTATION] ?? '';
const providerType = annotations?.[PROVIDER_TYPE_ANNOTATION] ?? '';
const providerName = annotations?.[PROVIDER_NAME_ANNOTATION] ?? '';
const supportUrl = annotations?.[SUPPORT_URL_ANNOTATION] ?? '';
const displayName = annotatedName || `${toTitleCase(name)}`;
const imgUrl = chart.icon || getImageForIconClass('icon-helm');
const chartURL = chart.urls[0];
Expand Down Expand Up @@ -88,7 +90,7 @@ export const normalizeHelmCharts = (
value: appVersion,
},
{
label: t('helm-plugin~Provider type'),
label: t('helm-plugin~Source'),
value: translatedProviderType,
},
{
Expand Down Expand Up @@ -145,6 +147,7 @@ export const normalizeHelmCharts = (
properties: detailsProperties,
descriptions: detailsDescriptions,
},
supportUrl,
};

// group Helm chart with same name and different version together
Expand Down
2 changes: 2 additions & 0 deletions frontend/packages/helm-plugin/src/catalog/utils/const.ts
Expand Up @@ -4,6 +4,8 @@ export const CHART_NAME_ANNOTATION = 'charts.openshift.io/name';
export const PROVIDER_TYPE_ANNOTATION = 'charts.openshift.io/providerType';
// Annotation for provider name, e.g. Fortanix, HashiCorp, etc
export const PROVIDER_NAME_ANNOTATION = 'charts.openshift.io/provider';
// Annotation for support URL by the provider
export const SUPPORT_URL_ANNOTATION = 'charts.openshift.io/supportURL';

export enum PROVIDER_TYPE {
redhat = 'redhat',
Expand Down