Use in Controller - update to external links

ansible · Apr 14, 2024 · 3d7c993 · 3d7c993
1 parent 8cb2cc7
commit 3d7c993
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 21 deletions.
diff --git a/src/containers/execution-environment-detail/base.tsx b/src/containers/execution-environment-detail/base.tsx
@@ -13,6 +13,7 @@ import {
   type AlertType,
   DeleteExecutionEnvironmentModal,
   ExecutionEnvironmentHeader,
+  ExternalLink,
   LoadingPage,
   Main,
   RepositoryForm,
@@ -26,6 +27,7 @@ import {
   RepoSigningUtils,
   type RouteProps,
   canSignEE,
+  controllerURL,
   taskAlert,
   waitForTask,
 } from 'src/utilities';
@@ -122,12 +124,15 @@ export function withContainerRepo(WrappedComponent) {
         ),
         <DropdownItem
           key='use-in-controller'
-          onClick={() => {
-            // TODO image: this.state.repo.name,
-          }}
-        >
-          {t`Use in Controller`}
-        </DropdownItem>,
+          component={
+            <ExternalLink
+              href={controllerURL({ image: this.state.repo.name })}
+              variant='menu'
+            >
+              {t`Use in Controller`}
+            </ExternalLink>
+          }
+        />,
         hasPermission('container.delete_containerrepository') && (
           <DropdownItem
             key='delete'

diff --git a/src/containers/execution-environment-detail/execution_environment_detail_images.tsx b/src/containers/execution-environment-detail/execution_environment_detail_images.tsx
@@ -24,6 +24,7 @@ import {
   DeleteModal,
   EmptyStateFilter,
   EmptyStateNoData,
+  ExternalLink,
   HubPagination,
   LabelGroup,
   ListItemActions,
@@ -37,6 +38,7 @@ import { AppContext, type IAppContextType } from 'src/loaders/app-context';
 import { Paths, formatEEPath } from 'src/paths';
 import {
   ParamHelper,
+  controllerURL,
   errorMessage,
   filterIsSet,
   getContainersURL,
@@ -379,14 +381,19 @@ class ExecutionEnvironmentDetailImages extends Component<
       ),
       <DropdownItem
         key='use-in-controller'
-        onClick={() => {
-          // TODO digest: image.digest,
-          //    image: this.props.containerRepository.name,
-          //    tag: image.tags[0],
-        }}
-      >
-        {t`Use in Controller`}
-      </DropdownItem>,
+        component={
+          <ExternalLink
+            href={controllerURL({
+              digest: image.digest,
+              image: this.props.containerRepository.name,
+              tag: image.tags[0],
+            })}
+            variant='menu'
+          >
+            {t`Use in Controller`}
+          </ExternalLink>
+        }
+      />,
       hasPermission('container.delete_containerrepository') && (
         <DropdownItem
           key='delete-image'

diff --git a/src/containers/execution-environment-list/execution_environment_list.tsx b/src/containers/execution-environment-list/execution_environment_list.tsx
@@ -42,6 +42,7 @@ import { Paths, formatEEPath } from 'src/paths';
 import {
   ParamHelper,
   type RouteProps,
+  controllerURL,
   filterIsSet,
   taskAlert,
   withRouter,
@@ -366,12 +367,15 @@ class ExecutionEnvironmentList extends Component<RouteProps, IState> {
       ),
       <DropdownItem
         key='use-in-controller'
-        onClick={() => {
-          // TODO image: item.name,
-        }}
-      >
-        {t`Use in Controller`}
-      </DropdownItem>,
+        component={
+          <ExternalLink
+            href={controllerURL({ image: item.name })}
+            variant='menu'
+          >
+            {t`Use in Controller`}
+          </ExternalLink>
+        }
+      />,
       hasPermission('container.delete_containerrepository') && (
         <DropdownItem
           key='delete'

diff --git a/src/utilities/get-repo-url.ts b/src/utilities/get-repo-url.ts
@@ -29,3 +29,29 @@ export function getContainersURL({
     digest && !tag ? `@${digest}` : ''
   }`;
 }
+
+// returns controller UI URL for the EE add form, prefilling a chosen image from hub
+export function controllerURL({
+  image,
+  tag,
+  digest,
+}: {
+  image: string;
+  tag?: string;
+  digest?: string;
+}) {
+  if (!digest && !tag) {
+    tag = 'latest';
+  }
+
+  const imageUrl = encodeURIComponent(
+    getContainersURL({
+      name: image,
+      tag,
+      digest,
+    }),
+  );
+
+  // TODO update to 2.5 link
+  return `${window.location.origin}/#/execution_environments/add?image=${imageUrl}`;
+}
diff --git a/src/utilities/index.ts b/src/utilities/index.ts
@@ -5,7 +5,7 @@ export { DeleteCollectionUtils } from './delete-collection';
 export { downloadString } from './download-data';
 export { errorMessage, handleHttpError } from './fail-alerts';
 export { filterIsSet } from './filter-is-set';
-export { getContainersURL, getRepoURL } from './get-repo-url';
+export { controllerURL, getContainersURL, getRepoURL } from './get-repo-url';
 export { getHumanSize } from './get_human_size';
 export { hasPermission } from './has-permission';
 export { lastSyncStatus, lastSynced } from './last-sync-task';