Token insights - remove MyDistribution query, drop synclist url

reverts ansible#4198 / reapplies ansible#3708, ansible#3346, ansible#3893 (AAP 2.3 is EOL, no need to support it on cloud) keep 2.4 synclist deprecation notice
himdel · May 31, 2024 · 88e9856 · 88e9856
1 parent 9ef597b
commit 88e9856
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 59 deletions.
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -24,7 +24,6 @@ export { LegacyImportAPI } from './legacy-import';
 export { LegacyNamespaceAPI } from './legacy-namespace';
 export { LegacyRoleAPI } from './legacy-role';
 export { LegacySyncAPI } from './legacy-sync';
-export { MyDistributionAPI } from './my-distribution';
 export { MyNamespaceAPI } from './my-namespace';
 export { MySyncListAPI } from './my-synclist';
 export { NamespaceAPI } from './namespace';

diff --git a/src/api/my-distribution.ts b/src/api/my-distribution.ts
diff --git a/src/containers/token/token-insights.tsx b/src/containers/token/token-insights.tsx
@@ -1,9 +1,7 @@
 import { Trans, t } from '@lingui/macro';
 import { Button } from '@patternfly/react-core';
 import React, { Component } from 'react';
-import { MyDistributionAPI } from 'src/api';
 import {
-  Alert,
   AlertList,
   type AlertType,
   BaseHeader,
@@ -14,16 +12,10 @@ import {
   closeAlert,
 } from 'src/components';
 import { AppContext } from 'src/loaders/app-context';
-import {
-  type RouteProps,
-  getRepoURL,
-  jsxErrorMessage,
-  withRouter,
-} from 'src/utilities';
+import { type RouteProps, getRepoURL, withRouter } from 'src/utilities';
 
 interface IState {
   alerts: AlertType[];
-  synclistBasePath?: string;
   tokenData?: {
     access_token: string;
     expires_in: number;
@@ -44,14 +36,12 @@ class TokenInsights extends Component<RouteProps, IState> {
 
     this.state = {
       alerts: [],
-      synclistBasePath: null,
       tokenData: null,
     };
   }
 
   componentDidMount() {
     this.getTokenData();
-    this.getSynclistBasePath();
   }
 
   getTokenData() {
@@ -67,34 +57,8 @@ class TokenInsights extends Component<RouteProps, IState> {
       .then(({ data: tokenData }) => this.setState({ tokenData }));
   }
 
-  getSynclistBasePath() {
-    MyDistributionAPI.list()
-      .then(({ data }) => {
-        const syncDistro = data.data.find(({ base_path }) =>
-          base_path.includes('synclist'),
-        );
-        this.setState({
-          synclistBasePath: syncDistro?.base_path,
-        });
-      })
-      .catch((e) => {
-        const { status, statusText } = e.response;
-        this.setState({
-          synclistBasePath: null,
-          alerts: [
-            ...this.state.alerts,
-            {
-              variant: 'danger',
-              title: t`Server URL could not be displayed.`,
-              description: jsxErrorMessage(status, statusText),
-            },
-          ],
-        });
-      });
-  }
-
   render() {
-    const { alerts, synclistBasePath, tokenData } = this.state;
+    const { alerts, tokenData } = this.state;
     const renewTokenCmd = `curl https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token -d grant_type=refresh_token -d client_id="cloud-services" -d refresh_token="${
       tokenData?.refresh_token ?? '{{ user_token }}'
     }" --fail --silent --show-error --output /dev/null`;
@@ -200,21 +164,8 @@ class TokenInsights extends Component<RouteProps, IState> {
                   Synclists are deprecated in AAP 2.4 and will be removed in a
                   future release, use client-side <code>requirements.yml</code>{' '}
                   instead.
-                  <br />
-                  If you&apos;re using sync toggles with AAP 2.3 or older, you
-                  will need to use a different URL:
                 </Trans>
               </p>
-              {synclistBasePath ? (
-                <CopyURL url={getRepoURL(synclistBasePath)} />
-              ) : (
-                <Alert
-                  variant='danger'
-                  isInline
-                  title={t`Synclist distribution was not found.`}
-                  className='hub-content-alert-fix'
-                />
-              )}
             </section>
             <section className='body'>
               <h2>{t`SSO URL`}</h2>