feat: Add ansible framework option (#311)

epam · Jul 26, 2024 · e579091 · e579091
1 parent 4004b31
commit e579091
Show file tree

Hide file tree

Showing 18 changed files with 216 additions and 8 deletions.
diff --git a/src/configs/codebase-mappings/index.ts b/src/configs/codebase-mappings/index.ts
@@ -39,6 +39,7 @@ export const CODEBASE_COMMON_FRAMEWORKS = {
   GIN: 'gin',
   AWS: 'aws',
   GIT_OPS: 'gitops',
+  ANSIBLE: 'ansible'
 } as const;
 
 export const CODEBASE_COMMON_BUILD_TOOLS = {

diff --git a/src/configs/codebase-mappings/library/index.ts b/src/configs/codebase-mappings/library/index.ts
@@ -113,6 +113,11 @@ export const LIBRARY_MAPPING: LibraryMapping = {
         value: CODEBASE_COMMON_FRAMEWORKS.PYTHON_3_8,
         icon: FRAMEWORK_ICON_MAPPING[CODEBASE_COMMON_FRAMEWORKS.PYTHON_3_8],
       },
+      [CODEBASE_COMMON_FRAMEWORKS.ANSIBLE]: {
+        name: 'Ansible',
+        value: CODEBASE_COMMON_FRAMEWORKS.ANSIBLE,
+        icon: FRAMEWORK_ICON_MAPPING[CODEBASE_COMMON_FRAMEWORKS.ANSIBLE],
+      },
     },
     buildTools: {
       [CODEBASE_COMMON_BUILD_TOOLS.PYTHON]: {

diff --git a/src/configs/icon-mappings/index.ts b/src/configs/icon-mappings/index.ts
@@ -49,6 +49,7 @@ export const FRAMEWORK_ICON_MAPPING = {
   [CODEBASE_COMMON_FRAMEWORKS.GIN]: RESOURCE_ICON_NAMES.GIN,
   [CODEBASE_COMMON_FRAMEWORKS.ANTORA]: RESOURCE_ICON_NAMES.ANTORA,
   [CODEBASE_COMMON_FRAMEWORKS.GIT_OPS]: RESOURCE_ICON_NAMES.GIT_OPS,
+  [CODEBASE_COMMON_FRAMEWORKS.ANSIBLE]: RESOURCE_ICON_NAMES.ANSIBLE,
 } as const;
 
 export const BUILD_TOOL_ICON_MAPPING = {

diff --git a/src/icons/iconify-icons-mapping.ts b/src/icons/iconify-icons-mapping.ts
@@ -73,4 +73,5 @@ export enum ICONS {
   KEY = 'solar:key-bold',
   REDO = 'uil:redo',
   CANCEL = 'mdi:cancel-bold',
+  QUEUE = 'hugeicons:queue-02',
 }
diff --git a/src/icons/sprites/Resources/index.tsx b/src/icons/sprites/Resources/index.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import {
   Angular,
+  Ansible,
   Antora,
   AWS,
   Beego,
@@ -49,6 +50,7 @@ export const Resources = () => {
       xmlnsXlink="http://www.w3.org/1999/xlink"
       display={'none'}
     >
+      <Ansible />
       <Beego />
       <Codenarc />
       <Container />

diff --git a/src/icons/sprites/Resources/names.ts b/src/icons/sprites/Resources/names.ts
@@ -39,5 +39,6 @@ export const RESOURCE_ICON_NAMES = {
   HARBOR: 'harbor',
   OPENSHIFT: 'openshift',
   NEXUS: 'nexus',
+  ANSIBLE: 'ansible',
   OTHER: 'other',
 } as const;
diff --git a/src/icons/sprites/Resources/symbols/Ansible.tsx b/src/icons/sprites/Resources/symbols/Ansible.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { RESOURCE_ICON_NAMES } from '../names';
+
+export const Ansible = () => {
+  return (
+    <symbol id={RESOURCE_ICON_NAMES.ANSIBLE} viewBox="0 0 24 24" xmlSpace="preserve">
+      <path
+        d="M10.617 11.473l4.686 3.695-3.102-7.662zM12 0C5.371 0 0 5.371 0 12s5.371 12 12 12 12-5.371 12-12S18.629 0 12 0zm5.797 17.305c-.011.471-.403.842-.875.83-.236 0-.416-.09-.664-.293l-6.19-5-2.079 5.203H6.191L11.438 5.44c.124-.314.427-.52.764-.506.326-.014.63.189.742.506l4.774 11.494c.045.111.08.234.08.348-.001.009-.001.009-.001.023z"
+        fill="#000"
+      />
+    </symbol>
+  );
+};
diff --git a/src/icons/sprites/Resources/symbols/index.ts b/src/icons/sprites/Resources/symbols/index.ts
@@ -38,3 +38,4 @@ export * from './ECR';
 export * from './Harbor';
 export * from './Openshift';
 export * from './Nexus';
+export * from './Ansible';
diff --git a/src/k8s/TaskRun/index.ts b/src/k8s/TaskRun/index.ts
@@ -99,7 +99,7 @@ export class TaskRunKubeObject extends K8s.cluster.makeKubeObject<TaskRunKubeObj
       case TASK_RUN_STEP_STATUS.RUNNING:
         return [ICONS.LOADER_CIRCLE, STATUS_COLOR.IN_PROGRESS, true];
       case TASK_RUN_STEP_STATUS.WAITING:
-        return [ICONS.LOADER_CIRCLE, STATUS_COLOR.IN_PROGRESS, true];
+        return [ICONS.QUEUE, STATUS_COLOR.UNKNOWN];
       case TASK_RUN_STEP_STATUS.TERMINATED:
         if (_reason === TASK_RUN_STEP_REASON.COMPLETED) {
           return [ICONS.CHECK_CIRCLE, STATUS_COLOR.SUCCESS];

diff --git a/...ges/edp-pipeline-details/components/PipelineRunDetails/components/MenuAccordion/index.tsx b/...ges/edp-pipeline-details/components/PipelineRunDetails/components/MenuAccordion/index.tsx
@@ -15,6 +15,24 @@ import {
   StyledAccordionSummary,
 } from '../../../../styles';
 
+export function updateUnexecutedSteps(steps) {
+  if (!steps) {
+    return steps;
+  }
+  let errorIndex = steps.length - 1;
+  return steps.map((step, index) => {
+    if (!step.terminated || step.terminated.reason !== 'Completed') {
+      errorIndex = Math.min(index, errorIndex);
+    }
+    if (index > errorIndex) {
+      // eslint-disable-next-line no-unused-vars
+      const { running, terminated, ...rest } = step;
+      return { ...rest };
+    }
+    return step;
+  });
+}
+
 export const MenuAccordion = ({ taskRunName, taskRunListByNameMap, setQueryParams }) => {
   const location = useLocation();
   const queryParams = new URLSearchParams(location.search);
@@ -28,7 +46,7 @@ export const MenuAccordion = ({ taskRunName, taskRunListByNameMap, setQueryParam
 
   const [icon, color, isRotating] = TaskRunKubeObject.getStatusIcon(taskRunStatus, taskRunReason);
 
-  const taskRunSteps = taskRun?.status?.steps;
+  const taskRunSteps = updateUnexecutedSteps(taskRun?.status?.steps);
   const isExpanded = queryParamTaskRun === taskRunName;
   const isActive = queryParamTaskRun === taskRunName && !queryParamStep;
 

diff --git a/...s/edp-pipeline-details/components/PipelineRunDetails/components/TaskRun/hooks/useTabs.tsx b/...s/edp-pipeline-details/components/PipelineRunDetails/components/TaskRun/hooks/useTabs.tsx
@@ -47,7 +47,7 @@ export const useTabs = ({ taskRun }) => {
         : []),
       {
         label: 'Status',
-        component: <ViewYAML item={taskRun.status} />,
+        component: <ViewYAML item={taskRun?.status} />,
       },
     ];
   }, [results, taskRun]);

diff --git a/src/pages/edp-pipeline-details/components/PipelineRunDetails/components/TaskRun/index.tsx b/src/pages/edp-pipeline-details/components/PipelineRunDetails/components/TaskRun/index.tsx
@@ -25,7 +25,7 @@ export const TaskRun = ({ taskRun }: { taskRun: TaskRunKubeObjectInterface }) =>
 
   const tabs = useTabs({ taskRun });
 
-  return (
+  return taskRun ? (
     <Paper>
       <StyledDetailsHeader>
         <Stack spacing={1}>
@@ -71,5 +71,5 @@ export const TaskRun = ({ taskRun }: { taskRun: TaskRunKubeObjectInterface }) =>
         <Tabs tabs={tabs} initialTabIdx={0} />
       </StyledDetailsBody>
     </Paper>
-  );
+  ) : null;
 };
diff --git a/...pages/edp-pipeline-details/components/PipelineRunDetails/components/TaskRunStep/index.tsx b/...pages/edp-pipeline-details/components/PipelineRunDetails/components/TaskRunStep/index.tsx
@@ -3,12 +3,17 @@ import React from 'react';
 import { LoadingWrapper } from '../../../../../../components/LoadingWrapper';
 import { Tabs } from '../../../../../../components/Tabs';
 import { PodKubeObject } from '../../../../../../k8s/Pod';
-import { getTaskRunStepReason } from '../../../../../../k8s/TaskRun/utils/getStatus';
+import {
+  getTaskRunStepReason,
+  getTaskRunStepStatus,
+} from '../../../../../../k8s/TaskRun/utils/getStatus';
 import { humanize } from '../../../../../../utils/date/humanize';
+import { capitalizeFirstLetter } from '../../../../../../utils/format/capitalizeFirstLetter';
 import { StyledDetailsBody, StyledDetailsHeader } from '../../styles';
 import { useTabs } from './hooks/useTabs';
 
 export const TaskRunStep = ({ taskRun, step }) => {
+  const status = getTaskRunStepStatus(step);
   const reason = getTaskRunStepReason(step);
 
   const completionTime = step?.terminated?.finishedAt || new Date().toISOString();
@@ -56,7 +61,7 @@ export const TaskRunStep = ({ taskRun, step }) => {
                 component="span"
                 color="secondary.dark"
               >
-                {reason}
+                {capitalizeFirstLetter(reason || status || 'unknown')}
               </Typography>
             </Typography>
             <Typography

diff --git a/src/widgets/ManageGitServer/__snapshots__/index.create.test.tsx.snap b/src/widgets/ManageGitServer/__snapshots__/index.create.test.tsx.snap
@@ -71,6 +71,16 @@ exports[`testing ManageGitServer Create renders ManageGitServer component withou
             xmlns="http://www.w3.org/2000/svg"
             xmlns:xlink="http://www.w3.org/1999/xlink"
           >
+            <symbol
+              id="ansible"
+              viewBox="0 0 24 24"
+              xml:space="preserve"
+            >
+              <path
+                d="M10.617 11.473l4.686 3.695-3.102-7.662zM12 0C5.371 0 0 5.371 0 12s5.371 12 12 12 12-5.371 12-12S18.629 0 12 0zm5.797 17.305c-.011.471-.403.842-.875.83-.236 0-.416-.09-.664-.293l-6.19-5-2.079 5.203H6.191L11.438 5.44c.124-.314.427-.52.764-.506.326-.014.63.189.742.506l4.774 11.494c.045.111.08.234.08.348-.001.009-.001.009-.001.023z"
+                fill="#000"
+              />
+            </symbol>
             <symbol
               id="beego"
               viewBox="6.56 1 71.44 77"
@@ -2323,6 +2333,16 @@ exports[`testing ManageGitServer Create renders ManageGitServer component withou
             xmlns="http://www.w3.org/2000/svg"
             xmlns:xlink="http://www.w3.org/1999/xlink"
           >
+            <symbol
+              id="ansible"
+              viewBox="0 0 24 24"
+              xml:space="preserve"
+            >
+              <path
+                d="M10.617 11.473l4.686 3.695-3.102-7.662zM12 0C5.371 0 0 5.371 0 12s5.371 12 12 12 12-5.371 12-12S18.629 0 12 0zm5.797 17.305c-.011.471-.403.842-.875.83-.236 0-.416-.09-.664-.293l-6.19-5-2.079 5.203H6.191L11.438 5.44c.124-.314.427-.52.764-.506.326-.014.63.189.742.506l4.774 11.494c.045.111.08.234.08.348-.001.009-.001.009-.001.023z"
+                fill="#000"
+              />
+            </symbol>
             <symbol
               id="beego"
               viewBox="6.56 1 71.44 77"
@@ -4575,6 +4595,16 @@ exports[`testing ManageGitServer Create renders ManageGitServer component withou
             xmlns="http://www.w3.org/2000/svg"
             xmlns:xlink="http://www.w3.org/1999/xlink"
           >
+            <symbol
+              id="ansible"
+              viewBox="0 0 24 24"
+              xml:space="preserve"
+            >
+              <path
+                d="M10.617 11.473l4.686 3.695-3.102-7.662zM12 0C5.371 0 0 5.371 0 12s5.371 12 12 12 12-5.371 12-12S18.629 0 12 0zm5.797 17.305c-.011.471-.403.842-.875.83-.236 0-.416-.09-.664-.293l-6.19-5-2.079 5.203H6.191L11.438 5.44c.124-.314.427-.52.764-.506.326-.014.63.189.742.506l4.774 11.494c.045.111.08.234.08.348-.001.009-.001.009-.001.023z"
+                fill="#000"
+              />
+            </symbol>
             <symbol
               id="beego"
               viewBox="6.56 1 71.44 77"
@@ -6827,6 +6857,16 @@ exports[`testing ManageGitServer Create renders ManageGitServer component withou
             xmlns="http://www.w3.org/2000/svg"
             xmlns:xlink="http://www.w3.org/1999/xlink"
           >
+            <symbol
+              id="ansible"
+              viewBox="0 0 24 24"
+              xml:space="preserve"
+            >
+              <path
+                d="M10.617 11.473l4.686 3.695-3.102-7.662zM12 0C5.371 0 0 5.371 0 12s5.371 12 12 12 12-5.371 12-12S18.629 0 12 0zm5.797 17.305c-.011.471-.403.842-.875.83-.236 0-.416-.09-.664-.293l-6.19-5-2.079 5.203H6.191L11.438 5.44c.124-.314.427-.52.764-.506.326-.014.63.189.742.506l4.774 11.494c.045.111.08.234.08.348-.001.009-.001.009-.001.023z"
+                fill="#000"
+              />
+            </symbol>
             <symbol
               id="beego"
               viewBox="6.56 1 71.44 77"

diff --git a/src/widgets/ManageGitServer/__snapshots__/index.edit.test.tsx.snap b/src/widgets/ManageGitServer/__snapshots__/index.edit.test.tsx.snap
@@ -72,6 +72,16 @@ exports[`testing ManageGitServer Edit renders ManageGitServer component with Ger
             xmlns="http://www.w3.org/2000/svg"
             xmlns:xlink="http://www.w3.org/1999/xlink"
           >
+            <symbol
+              id="ansible"
+              viewBox="0 0 24 24"
+              xml:space="preserve"
+            >
+              <path
+                d="M10.617 11.473l4.686 3.695-3.102-7.662zM12 0C5.371 0 0 5.371 0 12s5.371 12 12 12 12-5.371 12-12S18.629 0 12 0zm5.797 17.305c-.011.471-.403.842-.875.83-.236 0-.416-.09-.664-.293l-6.19-5-2.079 5.203H6.191L11.438 5.44c.124-.314.427-.52.764-.506.326-.014.63.189.742.506l4.774 11.494c.045.111.08.234.08.348-.001.009-.001.009-.001.023z"
+                fill="#000"
+              />
+            </symbol>
             <symbol
               id="beego"
               viewBox="6.56 1 71.44 77"
@@ -2319,6 +2329,16 @@ exports[`testing ManageGitServer Edit renders ManageGitServer component with Ger
             xmlns="http://www.w3.org/2000/svg"
             xmlns:xlink="http://www.w3.org/1999/xlink"
           >
+            <symbol
+              id="ansible"
+              viewBox="0 0 24 24"
+              xml:space="preserve"
+            >
+              <path
+                d="M10.617 11.473l4.686 3.695-3.102-7.662zM12 0C5.371 0 0 5.371 0 12s5.371 12 12 12 12-5.371 12-12S18.629 0 12 0zm5.797 17.305c-.011.471-.403.842-.875.83-.236 0-.416-.09-.664-.293l-6.19-5-2.079 5.203H6.191L11.438 5.44c.124-.314.427-.52.764-.506.326-.014.63.189.742.506l4.774 11.494c.045.111.08.234.08.348-.001.009-.001.009-.001.023z"
+                fill="#000"
+              />
+            </symbol>
             <symbol
               id="beego"
               viewBox="6.56 1 71.44 77"
@@ -4566,6 +4586,16 @@ exports[`testing ManageGitServer Edit renders ManageGitServer component with Git
             xmlns="http://www.w3.org/2000/svg"
             xmlns:xlink="http://www.w3.org/1999/xlink"
           >
+            <symbol
+              id="ansible"
+              viewBox="0 0 24 24"
+              xml:space="preserve"
+            >
+              <path
+                d="M10.617 11.473l4.686 3.695-3.102-7.662zM12 0C5.371 0 0 5.371 0 12s5.371 12 12 12 12-5.371 12-12S18.629 0 12 0zm5.797 17.305c-.011.471-.403.842-.875.83-.236 0-.416-.09-.664-.293l-6.19-5-2.079 5.203H6.191L11.438 5.44c.124-.314.427-.52.764-.506.326-.014.63.189.742.506l4.774 11.494c.045.111.08.234.08.348-.001.009-.001.009-.001.023z"
+                fill="#000"
+              />
+            </symbol>
             <symbol
               id="beego"
               viewBox="6.56 1 71.44 77"
@@ -6807,6 +6837,16 @@ exports[`testing ManageGitServer Edit renders ManageGitServer component with Git
             xmlns="http://www.w3.org/2000/svg"
             xmlns:xlink="http://www.w3.org/1999/xlink"
           >
+            <symbol
+              id="ansible"
+              viewBox="0 0 24 24"
+              xml:space="preserve"
+            >
+              <path
+                d="M10.617 11.473l4.686 3.695-3.102-7.662zM12 0C5.371 0 0 5.371 0 12s5.371 12 12 12 12-5.371 12-12S18.629 0 12 0zm5.797 17.305c-.011.471-.403.842-.875.83-.236 0-.416-.09-.664-.293l-6.19-5-2.079 5.203H6.191L11.438 5.44c.124-.314.427-.52.764-.506.326-.014.63.189.742.506l4.774 11.494c.045.111.08.234.08.348-.001.009-.001.009-.001.023z"
+                fill="#000"
+              />
+            </symbol>
             <symbol
               id="beego"
               viewBox="6.56 1 71.44 77"

diff --git a/src/widgets/ManageJiraServer/components/JiraServer/fields/URL/index.tsx b/src/widgets/ManageJiraServer/components/JiraServer/fields/URL/index.tsx
@@ -12,7 +12,7 @@ export const URL = () => {
         form: {
           register,
           control,
-          formState: { errors, defaultValues },
+          formState: { errors },
         },
       },
     },

diff --git a/src/widgets/ManageRegistry/__snapshots__/index.create.test.tsx.snap b/src/widgets/ManageRegistry/__snapshots__/index.create.test.tsx.snap
@@ -21,6 +21,16 @@ exports[`testing ManageRegistry Create renders ManageRegistry component without
             xmlns="http://www.w3.org/2000/svg"
             xmlns:xlink="http://www.w3.org/1999/xlink"
           >
+            <symbol
+              id="ansible"
+              viewBox="0 0 24 24"
+              xml:space="preserve"
+            >
+              <path
+                d="M10.617 11.473l4.686 3.695-3.102-7.662zM12 0C5.371 0 0 5.371 0 12s5.371 12 12 12 12-5.371 12-12S18.629 0 12 0zm5.797 17.305c-.011.471-.403.842-.875.83-.236 0-.416-.09-.664-.293l-6.19-5-2.079 5.203H6.191L11.438 5.44c.124-.314.427-.52.764-.506.326-.014.63.189.742.506l4.774 11.494c.045.111.08.234.08.348-.001.009-.001.009-.001.023z"
+                fill="#000"
+              />
+            </symbol>
             <symbol
               id="beego"
               viewBox="6.56 1 71.44 77"