From 874933e5e3393d69f37803543b4aef4cb54d36ab Mon Sep 17 00:00:00 2001 From: Donald Labaj Date: Thu, 9 Dec 2021 13:38:18 -0500 Subject: [PATCH] Updated cards according to microcopy recommendations. Updated cards according to microcopy recommendations. Updated cards according to microcopy recommendations. Updated cards according to microcopy recommendations. Updated cards according to microcopy recommendations. Updated cards according to microcopy recommendations. Updated cards according to microcopy recommendations. Updated cards according to microcopy recommendations. Updated cards according to microcopy recommendations. --- data/applications/aikit.yaml | 2 +- data/applications/openvino.yaml | 2 +- .../EnabledApplications.spec.tsx.snap | 2 +- frontend/src/components/OdhAppCard.tsx | 30 +++++++------------ frontend/src/utilities/quickStartUtils.ts | 10 +++---- 5 files changed, 19 insertions(+), 27 deletions(-) diff --git a/data/applications/aikit.yaml b/data/applications/aikit.yaml index 497096acce..11662b4dea 100644 --- a/data/applications/aikit.yaml +++ b/data/applications/aikit.yaml @@ -9,7 +9,7 @@ spec: The AI Kit is a set of AI software tools to accelerate end-to-end data science and analytics pipelines on Intel® architectures. route: '' img: images/oneapi.png - category: Self managed + category: Self-managed support: third party support csvName: aikit-operator docsLink: https://software.intel.com/content/www/us/en/develop/tools/oneapi/ai-analytics-toolkit.html diff --git a/data/applications/openvino.yaml b/data/applications/openvino.yaml index 23a3278c60..4e329e93c2 100644 --- a/data/applications/openvino.yaml +++ b/data/applications/openvino.yaml @@ -9,7 +9,7 @@ spec: OpenVINO is an open source toolkit to help optimize deep learning performance and deploy using an inference engine onto Intel hardware. kfdefApplications: [] img: images/openvino.svg - category: Self managed + category: Self-managed support: third party support csvName: openvino-operator docsLink: https://docs.openvinotoolkit.org/latest/index.html diff --git a/frontend/src/__tests__/__snapshots__/EnabledApplications.spec.tsx.snap b/frontend/src/__tests__/__snapshots__/EnabledApplications.spec.tsx.snap index 1992d7a5f9..46e41812e2 100644 --- a/frontend/src/__tests__/__snapshots__/EnabledApplications.spec.tsx.snap +++ b/frontend/src/__tests__/__snapshots__/EnabledApplications.spec.tsx.snap @@ -4,4 +4,4 @@ exports[`EnabledApplications should display a message when loading applications exports[`EnabledApplications should display a message when there are no enabled applications 1`] = `"

Enabled

Launch your enabled applications, view documentation, or get started with quick start instructions and tasks.

No Components Found
"`; -exports[`EnabledApplications should display enabled applications 1`] = `"

Enabled

Launch your enabled applications, view documentation, or get started with quick start instructions and tasks.

\\"JupyterHub\\"
JupyterHub\\"Red
Red Hat managed
A multi-user version of the notebook designed for companies, classrooms and research labs.
LaunchQuick start
"`; +exports[`EnabledApplications should display enabled applications 1`] = `"

Enabled

Launch your enabled applications, view documentation, or get started with quick start instructions and tasks.

\\"JupyterHub\\"
JupyterHub\\"Red
Red Hat managed
A multi-user version of the notebook designed for companies, classrooms and research labs.
Launch application
"`; diff --git a/frontend/src/components/OdhAppCard.tsx b/frontend/src/components/OdhAppCard.tsx index 99ff2ce009..ec649a8a5e 100644 --- a/frontend/src/components/OdhAppCard.tsx +++ b/frontend/src/components/OdhAppCard.tsx @@ -50,22 +50,22 @@ const OdhAppCard: React.FC = ({ odhApp }) => { target="_blank" rel="noopener noreferrer" > - Documentation + View documentation , ]; + const quickStartClasses = classNames('odh-dashboard__external-link', { + 'm-hidden': !odhApp.spec.quickStart, + 'm-disabled': + getLaunchStatus(odhApp.spec.quickStart || '', qsContext) === LaunchStatusEnum.Close, + }); + + ('odh-dashboard__external-link'); if (odhApp.spec.link) { dropdownItems.push( - - Launch - + + {`${getLaunchStatus(odhApp.spec.quickStart || '', qsContext)} quick start`} , ); } @@ -73,11 +73,6 @@ const OdhAppCard: React.FC = ({ odhApp }) => { const launchClasses = classNames('odh-card__footer__link', { 'm-hidden': !odhApp.spec.link, }); - const quickStartClasses = classNames('odh-card__footer__link', { - 'm-hidden': !odhApp.spec.quickStart, - 'm-disabled': - getLaunchStatus(odhApp.spec.quickStart || '', qsContext) === LaunchStatusEnum.Close, - }); const cardFooter = ( @@ -87,12 +82,9 @@ const OdhAppCard: React.FC = ({ odhApp }) => { target="_blank" rel="noopener noreferrer" > - Launch + Launch application - - Quick start - ); diff --git a/frontend/src/utilities/quickStartUtils.ts b/frontend/src/utilities/quickStartUtils.ts index 9a50a1dc34..f5da181471 100644 --- a/frontend/src/utilities/quickStartUtils.ts +++ b/frontend/src/utilities/quickStartUtils.ts @@ -5,7 +5,7 @@ import { } from '@cloudmosaic/quickstarts'; export enum LaunchStatusEnum { - Start = 'Start', + Open = 'Open', Continue = 'Continue', Restart = 'Restart', Close = 'Close', @@ -16,20 +16,20 @@ export const getLaunchStatus = ( qsContext?: QuickStartContextValues, ): LaunchStatusEnum => { if (!quickStartId || !qsContext || !qsContext.allQuickStartStates) { - return LaunchStatusEnum.Start; + return LaunchStatusEnum.Open; } const quickStartState = qsContext.allQuickStartStates[quickStartId]; if (!quickStartState) { - return LaunchStatusEnum.Start; + return LaunchStatusEnum.Open; } if (quickStartState.taskNumber === -1) { if (qsContext.activeQuickStartID === quickStartId) { return LaunchStatusEnum.Close; } - return LaunchStatusEnum.Start; + return LaunchStatusEnum.Open; } if ( @@ -43,7 +43,7 @@ export const getLaunchStatus = ( return LaunchStatusEnum.Continue; } - return LaunchStatusEnum.Start; + return LaunchStatusEnum.Open; }; export const getQuickStartLabel = (