From c3221fb0ff54ab34b3fd239b3063b23be31353c6 Mon Sep 17 00:00:00 2001 From: Shivanand Sonnad Date: Fri, 18 Oct 2024 10:08:47 +0000 Subject: [PATCH] fix: [AH-518]: fix issue with registry and package type select on UI (#2830) * fix: [AH-518]: show detailed error message coming from api response * fix: [AH-518]: fix incorrect placeholder and handle loading senario for digest selector * fix: [AH-518]: fix issue with registry and package type select on UI --- .../ar/components/PackageTypeSelector/PackageTypeSelector.tsx | 3 ++- .../components/RepositorySelector/RepositorySelector.tsx | 4 ++-- .../components/SetupClientContent/GenerateTokenStep.tsx | 4 ++-- .../components/ArchitectureSelector/ArchitectureSelector.tsx | 2 +- web/src/ar/pages/version-details/strings/strings.en.yaml | 1 + web/src/ar/strings/strings.en.yaml | 1 + web/src/ar/strings/types.ts | 2 ++ 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/web/src/ar/components/PackageTypeSelector/PackageTypeSelector.tsx b/web/src/ar/components/PackageTypeSelector/PackageTypeSelector.tsx index d31669daa..4213a27d0 100644 --- a/web/src/ar/components/PackageTypeSelector/PackageTypeSelector.tsx +++ b/web/src/ar/components/PackageTypeSelector/PackageTypeSelector.tsx @@ -30,7 +30,8 @@ export default function PackageTypeSelector(props: PackageTypeSelectorProps): JS const { getString } = useStrings() return ( !each.disabled).map(each => ({ ...each, label: getString(each.label) }))} value={value} onSelect={onChange} diff --git a/web/src/ar/pages/artifact-list/components/RepositorySelector/RepositorySelector.tsx b/web/src/ar/pages/artifact-list/components/RepositorySelector/RepositorySelector.tsx index 5a7d4463a..fbb8eccd3 100644 --- a/web/src/ar/pages/artifact-list/components/RepositorySelector/RepositorySelector.tsx +++ b/web/src/ar/pages/artifact-list/components/RepositorySelector/RepositorySelector.tsx @@ -54,8 +54,8 @@ export default function RepositorySelector(props: RepositorySelectorProps): JSX. return ( { props.onChange(option.value as string) }} diff --git a/web/src/ar/pages/repository-details/components/SetupClientContent/GenerateTokenStep.tsx b/web/src/ar/pages/repository-details/components/SetupClientContent/GenerateTokenStep.tsx index 23c704439..485f91d9f 100644 --- a/web/src/ar/pages/repository-details/components/SetupClientContent/GenerateTokenStep.tsx +++ b/web/src/ar/pages/repository-details/components/SetupClientContent/GenerateTokenStep.tsx @@ -16,7 +16,7 @@ import React, { useState } from 'react' import { defaultTo } from 'lodash-es' -import { Button, ButtonVariation, Container, Text, useToaster } from '@harnessio/uicore' +import { Button, ButtonVariation, Container, getErrorInfoFromErrorObject, Text, useToaster } from '@harnessio/uicore' import { FontVariation } from '@harnessio/design-system' import type { ClientSetupStep } from '@harnessio/react-har-service-client' @@ -43,7 +43,7 @@ export default function GenerateTokenStep({ stepIndex, step }: GenerateTokenStep }) .catch(err => { clear() - showError(err?.message || getString('repositoryDetails.clientSetup.failedToGenerateToken')) + showError(getErrorInfoFromErrorObject(err) || getString('repositoryDetails.clientSetup.failedToGenerateToken')) }) } return ( diff --git a/web/src/ar/pages/version-details/DockerVersion/components/ArchitectureSelector/ArchitectureSelector.tsx b/web/src/ar/pages/version-details/DockerVersion/components/ArchitectureSelector/ArchitectureSelector.tsx index 67bb4ec0b..8ad7df59b 100644 --- a/web/src/ar/pages/version-details/DockerVersion/components/ArchitectureSelector/ArchitectureSelector.tsx +++ b/web/src/ar/pages/version-details/DockerVersion/components/ArchitectureSelector/ArchitectureSelector.tsx @@ -89,7 +89,7 @@ export default function ArchitectureSelector(props: ArchitectureSelectorProps): usePortal={true} addClearBtn={false} itemDisabled={item => !item.value} - placeholder={getString('artifactList.table.allRepositories')} + placeholder={loading ? getString('loading') : getString('versionDetails.selectDigestPlaceholder')} isLabel getCustomLabel={option => ( diff --git a/web/src/ar/pages/version-details/strings/strings.en.yaml b/web/src/ar/pages/version-details/strings/strings.en.yaml index a9c044843..21caf5da1 100644 --- a/web/src/ar/pages/version-details/strings/strings.en.yaml +++ b/web/src/ar/pages/version-details/strings/strings.en.yaml @@ -1,4 +1,5 @@ page: Version Details Page +selectDigestPlaceholder: All Digest tabs: overview: Overview artifactDetails: Artifact Details diff --git a/web/src/ar/strings/strings.en.yaml b/web/src/ar/strings/strings.en.yaml index dc55dfe51..2d3bbf926 100644 --- a/web/src/ar/strings/strings.en.yaml +++ b/web/src/ar/strings/strings.en.yaml @@ -16,6 +16,7 @@ tabNotFound: Tab not found search: Search copied: Copied download: download +loading: Loading... dateLabel: Date timeLabel: Time harnessAI: Harness AI diff --git a/web/src/ar/strings/types.ts b/web/src/ar/strings/types.ts index 2a1f59975..8a4a19ca3 100644 --- a/web/src/ar/strings/types.ts +++ b/web/src/ar/strings/types.ts @@ -189,6 +189,7 @@ export interface StringsMap { 'versionDetails.overview.generalInformation.url': string 'versionDetails.overview.generalInformation.version': string 'versionDetails.page': string + 'versionDetails.selectDigestPlaceholder': string 'versionDetails.tabs.artifactDetails': string 'versionDetails.tabs.code': string 'versionDetails.tabs.deployments': string @@ -247,6 +248,7 @@ export interface StringsMap { harnessAI: string id: string lastUpdated: string + loading: string modifiedAt: string moduleName: string na: string