feat(nomad): remove nomad from UI EE-6060 (#10509)

app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/EditEdgeStackForm.tsx

@@ -24,10 +24,8 @@ import { PrivateRegistryFieldsetWrapper } from './PrivateRegistryFieldsetWrapper
 import { FormValues } from './types';
 import { ComposeForm } from './ComposeForm';
 import { KubernetesForm } from './KubernetesForm';
-import { NomadForm } from './NomadForm';
 import { GitForm } from './GitForm';
 import { useValidateEnvironmentTypes } from './useEdgeGroupHasType';
-import { atLeastTwo } from './atLeastTwo';
 
 interface Props {
   edgeStack: EdgeStack;
@@ -41,7 +39,6 @@ interface Props {
 const forms = {
   [DeploymentType.Compose]: ComposeForm,
   [DeploymentType.Kubernetes]: KubernetesForm,
-  [DeploymentType.Nomad]: NomadForm,
 };
 
 export function EditEdgeStackForm({
@@ -108,7 +105,6 @@ function InnerForm({
 
   const hasKubeEndpoint = hasType(EnvironmentType.EdgeAgentOnKubernetes);
   const hasDockerEndpoint = hasType(EnvironmentType.EdgeAgentOnDocker);
-  const hasNomadEndpoint = hasType(EnvironmentType.EdgeAgentOnNomad);
 
   const DeploymentForm = forms[values.deploymentType];
 
@@ -120,7 +116,7 @@ function InnerForm({
         error={errors.edgeGroups}
       />
 
-      {atLeastTwo(hasKubeEndpoint, hasDockerEndpoint, hasNomadEndpoint) && (
+      {hasKubeEndpoint && hasDockerEndpoint && (
         <TextTip>
           There are no available deployment types when there is more than one
           type of environment in your edge group selection (e.g. Kubernetes and
@@ -142,7 +138,6 @@ function InnerForm({
         value={values.deploymentType}
         hasDockerEndpoint={hasType(EnvironmentType.EdgeAgentOnDocker)}
         hasKubeEndpoint={hasType(EnvironmentType.EdgeAgentOnKubernetes)}
-        hasNomadEndpoint={hasType(EnvironmentType.EdgeAgentOnNomad)}
         onChange={(value) => {
           setFieldValue('content', getCachedContent(value));
           setFieldValue('deploymentType', value);
@@ -255,7 +250,6 @@ function useCachedContent() {
   const [cachedContent, setCachedContent] = useState({
     [DeploymentType.Compose]: '',
     [DeploymentType.Kubernetes]: '',
-    [DeploymentType.Nomad]: '',
   });
 
   function handleChangeContent(type: DeploymentType, content: string) {

app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/GitForm/GitForm.tsx

@@ -44,7 +44,6 @@ import { EnvironmentVariablesPanel } from '@@/form-components/EnvironmentVariabl
 import { EnvVar } from '@@/form-components/EnvironmentVariablesFieldset/types';
 
 import { useValidateEnvironmentTypes } from '../useEdgeGroupHasType';
-import { atLeastTwo } from '../atLeastTwo';
 import { PrivateRegistryFieldset } from '../../../components/PrivateRegistryFieldset';
 
 import {
@@ -201,7 +200,6 @@ function InnerForm({
 
   const hasKubeEndpoint = hasType(EnvironmentType.EdgeAgentOnKubernetes);
   const hasDockerEndpoint = hasType(EnvironmentType.EdgeAgentOnDocker);
-  const hasNomadEndpoint = hasType(EnvironmentType.EdgeAgentOnNomad);
 
   return (
     <Form className="form-horizontal" onSubmit={handleSubmit}>
@@ -211,7 +209,7 @@ function InnerForm({
         error={errors.groupIds}
       />
 
-      {atLeastTwo(hasKubeEndpoint, hasDockerEndpoint, hasNomadEndpoint) && (
+      {hasKubeEndpoint && hasDockerEndpoint && (
         <TextTip>
           There are no available deployment types when there is more than one
           type of environment in your edge group selection (e.g. Kubernetes and
@@ -231,7 +229,6 @@ function InnerForm({
         value={values.deploymentType}
         hasDockerEndpoint={hasType(EnvironmentType.EdgeAgentOnDocker)}
         hasKubeEndpoint={hasType(EnvironmentType.EdgeAgentOnKubernetes)}
-        hasNomadEndpoint={hasType(EnvironmentType.EdgeAgentOnNomad)}
         onChange={(value) => {
           setFieldValue('deploymentType', value);
         }}

app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/NomadForm.tsx

@@ -1,38 +0,0 @@
-import { useFormikContext } from 'formik';
-
-import { WebEditorForm } from '@@/WebEditorForm';
-
-import { DeploymentType } from '../../types';
-
-import { FormValues } from './types';
-
-export function NomadForm({
-  handleContentChange,
-}: {
-  handleContentChange: (type: DeploymentType, content: string) => void;
-}) {
-  const { errors, values } = useFormikContext<FormValues>();
-
-  return (
-    <WebEditorForm
-      value={values.content}
-      yaml
-      id="kube-manifest-editor"
-      placeholder="Define or paste the content of your manifest here"
-      onChange={(value) => handleContentChange(DeploymentType.Nomad, value)}
-      error={errors.content}
-    >
-      <p>
-        You can get more information about Nomad file format in the{' '}
-        <a
-          href="https://www.nomadproject.io/docs/job-specification"
-          target="_blank"
-          rel="noreferrer"
-        >
-          official documentation
-        </a>
-        .
-      </p>
-    </WebEditorForm>
-  );
-}

app/react/edge/edge-stacks/components/EdgeStackDeploymentTypeSelector.tsx

@@ -1,8 +1,6 @@
 import _ from 'lodash';
 
 import { EditorType } from '@/react/edge/edge-stacks/types';
-import NomadIcon from '@/assets/ico/vendor/nomad.svg?c';
-import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
 
 import { BoxSelector } from '@@/BoxSelector';
 import { BoxSelectorOption } from '@@/BoxSelector/types';
@@ -16,7 +14,6 @@ interface Props {
   onChange(value: number): void;
   hasDockerEndpoint: boolean;
   hasKubeEndpoint: boolean;
-  hasNomadEndpoint: boolean;
   allowKubeToSelectCompose?: boolean;
 }
 
@@ -25,44 +22,28 @@ export function EdgeStackDeploymentTypeSelector({
   onChange,
   hasDockerEndpoint,
   hasKubeEndpoint,
-  hasNomadEndpoint,
   allowKubeToSelectCompose,
 }: Props) {
   const deploymentOptions: BoxSelectorOption<number>[] = _.compact([
     {
       ...compose,
       value: EditorType.Compose,
-      disabled: () =>
-        allowKubeToSelectCompose
-          ? hasNomadEndpoint
-          : hasNomadEndpoint || hasKubeEndpoint,
+      disabled: () => !allowKubeToSelectCompose && hasKubeEndpoint,
       tooltip: () =>
-        hasNomadEndpoint || hasKubeEndpoint
-          ? 'Cannot use this option with Edge Kubernetes or Edge Nomad environments'
+        hasKubeEndpoint
+          ? 'Cannot use this option with Edge Kubernetes environments'
           : '',
     },
     {
       ...kubernetes,
       value: EditorType.Kubernetes,
-      disabled: () => hasDockerEndpoint || hasNomadEndpoint,
+      disabled: () => hasDockerEndpoint,
       tooltip: () =>
-        hasDockerEndpoint || hasNomadEndpoint
-          ? 'Cannot use this option with Edge Docker or Edge Nomad environments'
+        hasDockerEndpoint
+          ? 'Cannot use this option with Edge Docker environments'
           : '',
       iconType: 'logo',
     },
-    isBE && {
-      id: 'deployment_nomad',
-      icon: NomadIcon,
-      label: 'Nomad',
-      description: 'Nomad HCL format',
-      value: EditorType.Nomad,
-      disabled: () => hasDockerEndpoint || hasKubeEndpoint,
-      tooltip: () =>
-        hasDockerEndpoint || hasKubeEndpoint
-          ? 'Cannot use this option with Edge Docker or Edge Kubernetes environments'
-          : '',
-    },
   ]);
 
   return (

app/react/edge/edge-stacks/types.ts

@@ -60,8 +60,6 @@ export enum DeploymentType {
   Compose,
   /** represent an edge stack deployed using a kubernetes manifest file */
   Kubernetes,
-  /** represent an edge stack deployed using a nomad hcl job file */
-  Nomad,
 }
 
 export type EdgeStack = {
@@ -100,5 +98,4 @@ export type EdgeStack = {
 export enum EditorType {
   Compose,
   Kubernetes,
-  Nomad,
 }