From 684c1448e9c8649c243c210d99725600ed1cb3a7 Mon Sep 17 00:00:00 2001 From: Shaiah Emigh-Doyle Date: Mon, 8 May 2023 19:41:55 -0400 Subject: [PATCH 1/7] change message connect to hub > server url message Issue: AAH-2335 --- src/containers/token/token-insights.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/containers/token/token-insights.tsx b/src/containers/token/token-insights.tsx index ad8ef9de88..2ae8f1fcf1 100644 --- a/src/containers/token/token-insights.tsx +++ b/src/containers/token/token-insights.tsx @@ -182,8 +182,7 @@ class TokenInsights extends React.Component {

{t`Server URL`}

- Use this URL to configure the API endpoints that clients need to - download content from Automation Hub. + Use this URL to configure the API endpoints that clients need to download certified content from Automation Hub. Synclists are deprecated in AAP 2.4 and will be removed in a future release, instead use client-side requirements.yml. [link to AAP synclist documentation]

{getRepoURL('published')} From 145a94decf38894b8b25d2c34ac78516db454ea5 Mon Sep 17 00:00:00 2001 From: Shaiah Emigh-Doyle Date: Mon, 8 May 2023 19:43:54 -0400 Subject: [PATCH 2/7] add to changelog Issue: AAH-2335 --- CHANGES/2335.task | 1 + src/containers/token/token-insights.tsx | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 CHANGES/2335.task diff --git a/CHANGES/2335.task b/CHANGES/2335.task new file mode 100644 index 0000000000..edc717f379 --- /dev/null +++ b/CHANGES/2335.task @@ -0,0 +1 @@ +Ajdust UI messages to reflect synclist deprecation. \ No newline at end of file diff --git a/src/containers/token/token-insights.tsx b/src/containers/token/token-insights.tsx index 2ae8f1fcf1..f2ac82ab5a 100644 --- a/src/containers/token/token-insights.tsx +++ b/src/containers/token/token-insights.tsx @@ -182,7 +182,11 @@ class TokenInsights extends React.Component {

{t`Server URL`}

- Use this URL to configure the API endpoints that clients need to download certified content from Automation Hub. Synclists are deprecated in AAP 2.4 and will be removed in a future release, instead use client-side requirements.yml. [link to AAP synclist documentation] + Use this URL to configure the API endpoints that clients need to + download certified content from Automation Hub. Synclists are + deprecated in AAP 2.4 and will be removed in a future release, + instead use client-side requirements.yml. [link to AAP synclist + documentation]

{getRepoURL('published')} From 09547b0c13d90588b17d8ad2a614f1bad0e2313f Mon Sep 17 00:00:00 2001 From: Shaiah Emigh-Doyle Date: Mon, 8 May 2023 20:33:56 -0400 Subject: [PATCH 3/7] reword header message Issue: AAH-2335 --- src/loaders/insights/loader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/loaders/insights/loader.tsx b/src/loaders/insights/loader.tsx index 7c0dc9ed34..e463c81098 100644 --- a/src/loaders/insights/loader.tsx +++ b/src/loaders/insights/loader.tsx @@ -62,7 +62,7 @@ const App = (_props) => { From f8c2e1a37b31a1f5e9d27116df26e010c4c163df Mon Sep 17 00:00:00 2001 From: Shaiah Emigh-Doyle Date: Tue, 9 May 2023 16:14:13 -0400 Subject: [PATCH 4/7] add published/ suffix to server url Issue: AAH-2335 --- src/containers/token/token-insights.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/containers/token/token-insights.tsx b/src/containers/token/token-insights.tsx index f2ac82ab5a..89005d22c9 100644 --- a/src/containers/token/token-insights.tsx +++ b/src/containers/token/token-insights.tsx @@ -189,7 +189,9 @@ class TokenInsights extends React.Component { documentation]

- {getRepoURL('published')} + {`${getRepoUrl( + 'published', + )}published/`}

{t`SSO URL`}

From 4a786236981ea4fcdda072379a129fdc4f1f3008 Mon Sep 17 00:00:00 2001 From: Shaiah Emigh-Doyle Date: Mon, 15 May 2023 16:28:53 -0400 Subject: [PATCH 5/7] remove alert Issue: AAH-2335 --- src/loaders/insights/loader.tsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/loaders/insights/loader.tsx b/src/loaders/insights/loader.tsx index e463c81098..c791835e8a 100644 --- a/src/loaders/insights/loader.tsx +++ b/src/loaders/insights/loader.tsx @@ -1,6 +1,4 @@ import '../app.scss'; -import { t } from '@lingui/macro'; -import { Alert } from '@patternfly/react-core'; import useChrome from '@redhat-cloud-services/frontend-components/useChrome'; import React, { useEffect, useState } from 'react'; import { FeatureFlagsType, SettingsType, UserType } from 'src/api'; @@ -59,11 +57,6 @@ const App = (_props) => { ), }} > - From bd7112067789f20a233d4cf67b2a3a8559937b9c Mon Sep 17 00:00:00 2001 From: Shaiah Emigh-Doyle Date: Mon, 15 May 2023 16:48:01 -0400 Subject: [PATCH 6/7] add note about synclist documentation Issue: AAH-2335 --- src/containers/token/token-insights.tsx | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/containers/token/token-insights.tsx b/src/containers/token/token-insights.tsx index 89005d22c9..cf9478718d 100644 --- a/src/containers/token/token-insights.tsx +++ b/src/containers/token/token-insights.tsx @@ -1,7 +1,6 @@ import { Trans, t } from '@lingui/macro'; import { Button, ClipboardCopyVariant } from '@patternfly/react-core'; import * as React from 'react'; -import { Link } from 'react-router-dom'; import { MyDistributionAPI } from 'src/api'; import { AlertList, @@ -12,7 +11,6 @@ import { closeAlertMixin, } from 'src/components'; import { AppContext } from 'src/loaders/app-context'; -import { Paths, formatPath } from 'src/paths'; import { RouteProps, withRouter } from 'src/utilities'; import { errorMessage, getRepoURL } from 'src/utilities'; @@ -96,16 +94,10 @@ class TokenInsights extends React.Component {

{t`Connect Private Automation Hub`}

- Use the{' '} - - Repositories - {' '} - page to sync collections curated by your organization to the Red - Hat Certified repository in your private Automation Hub. Users - with the correct permissions can use the sync toggles on the{' '} - Collections page - to control which collections are added to their - organization's sync repository. + Use the Server URL below to sync certified collections to the + Red Hat Certified repository in your private Automation Hub. If + you wish to sync validated content, you can add a remote with a + server url pointed to the validated repo.

@@ -185,13 +177,11 @@ class TokenInsights extends React.Component { Use this URL to configure the API endpoints that clients need to download certified content from Automation Hub. Synclists are deprecated in AAP 2.4 and will be removed in a future release, - instead use client-side requirements.yml. [link to AAP synclist - documentation] + instead use client-side requirements.yml, see AAP 2.4 + documentation.

- {`${getRepoUrl( - 'published', - )}published/`} + {getRepoURL('published')}

{t`SSO URL`}

From 3bd81adad0558ad165c1709682bab3a0577de706 Mon Sep 17 00:00:00 2001 From: Shaiah Emigh-Doyle Date: Wed, 24 May 2023 13:35:02 -0400 Subject: [PATCH 7/7] use param to expose /content/published Issue: AAH-2335 --- src/containers/token/token-insights.tsx | 4 +++- src/utilities/get-repo-url.ts | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/containers/token/token-insights.tsx b/src/containers/token/token-insights.tsx index cf9478718d..16930462ce 100644 --- a/src/containers/token/token-insights.tsx +++ b/src/containers/token/token-insights.tsx @@ -181,7 +181,9 @@ class TokenInsights extends React.Component { documentation.

- {getRepoURL('published')} + + {getRepoURL('published', true)} +

{t`SSO URL`}

diff --git a/src/utilities/get-repo-url.ts b/src/utilities/get-repo-url.ts index de8f24b402..6c43be0bea 100644 --- a/src/utilities/get-repo-url.ts +++ b/src/utilities/get-repo-url.ts @@ -1,11 +1,11 @@ // Returns the API path for a specific repository -export function getRepoURL(distribution_base_path) { +export function getRepoURL(distribution_base_path, view_published = false) { // If the api is hosted on another URL, use API_HOST as the host part of the URL. // Otherwise use the host that the UI is served from const host = API_HOST ? API_HOST : window.location.origin; // repo/distro "published" is special; not related to repo pipeline type - if (distribution_base_path === 'published') { + if (distribution_base_path === 'published' && view_published === false) { return `${host}${API_BASE_PATH}`; }