#769: Do not allow user create job/template with Shell type via UI (#770)

#769: Do not allow user create job/template with Shell type via UI (#770)

Author: jozefbakus

ui/src/app/components/admin/job-templates/job-templates-form/job-templates-form.component.html

@@ -85,7 +85,7 @@
           [name]="'Job type'"
           [value]="jobTemplate?.jobParameters?.jobType"
           (valueChange)="jobTypeChange($event)"
-          [options]="jobTypesMap"
+          [options]="getJobTypes(jobTemplate?.jobParameters?.jobType)"
           [isRequired]="true">
         </app-select-part>
       </div>

ui/src/app/components/admin/job-templates/job-templates-form/job-templates-form.component.spec.ts

@@ -34,7 +34,7 @@ import {
   UpdateJobTemplate,
 } from '../../../../stores/job-templates/job-templates.actions';
 import { absoluteRoutes } from '../../../../constants/routes.constants';
-import { jobTypes } from '../../../../constants/jobTypes.constants';
+import { jobTypes, jobTypesMap } from '../../../../constants/jobTypes.constants';
 import { ShellTemplateParametersModel } from '../../../../models/jobTemplateParameters.model';
 
 describe('JobTemplatesFormComponent', () => {
@@ -327,4 +327,26 @@ describe('JobTemplatesFormComponent', () => {
     underTest.toggleJobTemplateParametersAccordion();
     expect(underTest.isJobTemplateParametersHidden).toBeTrue();
   });
+
+  it(
+    'getJobTypes() should return all job types if input type is shell',
+    waitForAsync(() => {
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        const result = underTest.getJobTypes(jobTypes.SHELL);
+        expect(result).toEqual(jobTypesMap);
+      });
+    }),
+  );
+
+  it(
+    'getJobTypes() should return job types without shell if input type is not shell',
+    waitForAsync(() => {
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        const result = underTest.getJobTypes(jobTypes.SPARK);
+        expect(result.size).toEqual(jobTypesMap.size - 1);
+      });
+    }),
+  );
 });

ui/src/app/components/admin/job-templates/job-templates-form/job-templates-form.component.ts

@@ -164,6 +164,13 @@ export class JobTemplatesFormComponent implements OnDestroy {
     return this.mode == jobTemplateModes.SHOW || this.mode == jobTemplateModes.COMPARISON;
   }
 
+  getJobTypes(value: string): Map<string, string> {
+    if (value == this.jobTypes.SHELL) {
+      return this.jobTypesMap;
+    }
+    return new Map([...this.jobTypesMap.entries()].filter(([k, v]) => v !== this.jobTypes.SHELL));
+  }
+
   ngOnDestroy(): void {
     !!this.confirmationDialogServiceSubscription && this.confirmationDialogServiceSubscription.unsubscribe();
   }

ui/src/app/components/workflows/workflow-form/jobs/job/job.component.html

@@ -26,7 +26,7 @@
   [isShow]="isShow"
   [name]="'Job type'"
   [value]="job?.jobParameters?.jobType"
-  [options]="jobTypesMap"
+  [options]="getJobTypes(job?.jobParameters?.jobType)"
   (valueChange)="jobTypeChange($event)"
   [isRequired]="true">
 </app-select-part>

ui/src/app/components/workflows/workflow-form/jobs/job/job.component.spec.ts

@@ -22,7 +22,7 @@ import {
   ShellTemplateParametersModel,
   SparkTemplateParametersModel,
 } from '../../../../../models/jobTemplateParameters.model';
-import { jobTypes } from '../../../../../constants/jobTypes.constants';
+import { jobTypes, jobTypesMap } from '../../../../../constants/jobTypes.constants';
 import { JobDefinitionModelFactory } from '../../../../../models/jobDefinition.model';
 import { ShellDefinitionParametersModel } from '../../../../../models/jobDefinitionParameters.model';
 import { JobTemplateChangeEventModel } from '../../../../../models/jobTemplateChangeEvent';
@@ -123,6 +123,28 @@ describe('JobComponent', () => {
     }),
   );
 
+  it(
+    'getJobTypes() should return all job types if input type is shell',
+    waitForAsync(() => {
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        const result = underTest.getJobTypes(jobTypes.SHELL);
+        expect(result).toEqual(jobTypesMap);
+      });
+    }),
+  );
+
+  it(
+    'getJobTypes() should return job types without shell if input type is not shell',
+    waitForAsync(() => {
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        const result = underTest.getJobTypes(jobTypes.SPARK);
+        expect(result.size).toEqual(jobTypesMap.size - 1);
+      });
+    }),
+  );
+
   it('should return selected template parameters when getSelectedJobTemplateParameters() is called and template is selected', () => {
     underTest.job = { ...underTest.job, jobTemplateId: sparkTemplate.id.toString() };
     const result = underTest.getSelectedJobTemplateParameters();

ui/src/app/components/workflows/workflow-form/jobs/job/job.component.ts

@@ -91,6 +91,13 @@ export class JobComponent {
     );
   }
 
+  getJobTypes(value: string): Map<string, string> {
+    if (value == this.jobTypes.SHELL) {
+      return this.jobTypesMap;
+    }
+    return new Map([...this.jobTypesMap.entries()].filter(([k, v]) => v !== this.jobTypes.SHELL));
+  }
+
   getSelectedJobTemplateParameters(): JobTemplateParameters {
     return this.jobTemplates.find((jobTemplate) => jobTemplate.id.toString() == this.job.jobTemplateId)?.jobParameters;
   }