Chore/refactor some code (#686)

* refactor: ♻️ refactor some code * pr feedback
equinor · Nov 15, 2023 · 08b6975 · 08b6975
1 parent 7d92724
commit 08b6975
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/libs/scopechangerequestsidesheet/src/lib/ui-sidesheet/ScopechangerequestSidesheet.tsx b/libs/scopechangerequestsidesheet/src/lib/ui-sidesheet/ScopechangerequestSidesheet.tsx
@@ -2,7 +2,7 @@ import { ScopeChangeRequest } from '@cc-components/scopechangerequestshared';
 import { Tabs } from '@equinor/eds-core-react';
 import { createWidget } from '@cc-components/shared';
 import { useRef, useState } from 'react';
-import { RequestTab } from './tabs/RequestTab';
+import { RequestTab } from './tabs/requestTab/RequestTab';
 import { StyledTabListWrapper, StyledTabsList } from './sidesheet.styles';
 import { useQuery } from '@tanstack/react-query';
 import { LinkCell, useContextId, useHttpClient } from '@cc-components/shared';
@@ -66,51 +66,51 @@ export const ScopechangerequestSidesheet = createWidget<ScopeChangeRequest>(
     return (
       <StyledSideSheetContainer>
         <SidesheetHeader
-          title={scopechange.serialNumber + ' - ' + scopechange.title || ''}
+          title={scopechange.serialNumber + ' - ' + scopechange.title || 'N/A'}
           applicationTitle={'Scope Change Request'}
           onClose={props.closeSidesheet}
         />
         <StyledBanner>
           <BannerItem
             title="Phase"
             value={
-              !scopechange.phase ? (
-                ''
+              !!scopechange.phase ? (
+                <LinkCell url={scopechange.phase} urlText={'scopechange.phase'} />
               ) : (
-                <LinkCell url={scopechange.phase} urlText={scopechange.phase} />
+                'N/A'
               )
             }
           />
           <BannerItem
             title="Change Category"
             value={
-              !scopechange.changeCategory ? (
-                ''
-              ) : (
+              !!scopechange.changeCategory ? (
                 <LinkCell
                   url={scopechange.changeCategory.name}
                   urlText={scopechange.changeCategory.name}
                 />
+              ) : (
+                'N/A'
               )
             }
           />
           <BannerItem
             title="Scope"
             value={
-              !scopechange.scope ? (
-                ''
-              ) : (
+              !!scopechange.scope ? (
                 <LinkCell url={scopechange.scope.name} urlText={scopechange.scope.name} />
+              ) : (
+                'N/A'
               )
             }
           />
           <BannerItem
             title="State"
             value={
-              !scopechange.state ? (
-                ''
-              ) : (
+              !!scopechange.state ? (
                 <LinkCell url={scopechange.state} urlText={scopechange.state} />
+              ) : (
+                'N/A'
               )
             }
           />
@@ -120,7 +120,7 @@ export const ScopechangerequestSidesheet = createWidget<ScopeChangeRequest>(
             <StyledTabsList ref={ref}>
               <Tabs.Tab>Request </Tabs.Tab>
               <Tabs.Tab>Work orders</Tabs.Tab>
-              <Tabs.Tab>Logs</Tabs.Tab>
+              <Tabs.Tab>Log</Tabs.Tab>
             </StyledTabsList>
           </StyledTabListWrapper>
 

diff --git a/libs/scopechangerequestsidesheet/src/lib/ui-sidesheet/WorkflowChartItem.ts b/libs/scopechangerequestsidesheet/src/lib/ui-sidesheet/WorkflowChartItem.ts
diff --git a/libs/scopechangerequestsidesheet/src/lib/ui-sidesheet/tabs/LogTab.tsx b/libs/scopechangerequestsidesheet/src/lib/ui-sidesheet/tabs/LogTab.tsx
@@ -7,8 +7,8 @@ import {
 import { StyledContentWrapper } from '@cc-components/sharedcomponents';
 import { Checkbox } from '@equinor/eds-core-react';
 import { LogEntry, ScopeChangeRequest } from '@cc-components/scopechangerequestshared';
-import { WorkflowChart } from '../WorkflowChart';
-import { VerticalLine } from './requestTab.styles';
+import { WorkflowChart } from './requestTab/workflow/WorkflowChart';
+import { VerticalLine } from './requestTab/requestTab.styles';
 
 type LogTabProps = {
   logEntry?: LogEntry[] | undefined;

diff --git a/.../src/lib/ui-sidesheet/tabs/RequestTab.tsx → ...-sidesheet/tabs/requestTab/RequestTab.tsx b/.../src/lib/ui-sidesheet/tabs/RequestTab.tsx → ...-sidesheet/tabs/requestTab/RequestTab.tsx
@@ -2,7 +2,7 @@ import { StyledTabContent, TabTable } from '@cc-components/shared';
 import { StyledContentWrapper } from '@cc-components/sharedcomponents';
 import { Checkbox } from '@equinor/eds-core-react';
 import { ScopeChangeRequest } from '@cc-components/scopechangerequestshared';
-import { WorkflowChart } from '../WorkflowChart';
+import { WorkflowChart } from './workflow/WorkflowChart';
 
 import {
   StyledRequestColumn,

diff --git a/...ib/ui-sidesheet/tabs/requestTab.styles.ts → ...heet/tabs/requestTab/requestTab.styles.ts b/...ib/ui-sidesheet/tabs/requestTab.styles.ts → ...heet/tabs/requestTab/requestTab.styles.ts
diff --git a/...et/src/lib/ui-sidesheet/WorkflowChart.tsx → ...abs/requestTab/workflow/WorkflowChart.tsx b/...et/src/lib/ui-sidesheet/WorkflowChart.tsx → ...abs/requestTab/workflow/WorkflowChart.tsx
@@ -7,8 +7,8 @@ import {
   StyledRequestTabWrapper,
   VerticalLine,
   WorklowIconAndLine,
-} from './tabs/requestTab.styles';
-import { StyledWorkflowText } from './tabs/requestTab.styles';
+} from '../requestTab.styles';
+import { StyledWorkflowText } from '../requestTab.styles';
 
 type WorkflowChartProps = {
   scopechange?: ScopeChangeRequest | undefined;

diff --git a/...eet/src/lib/ui-sidesheet/WorkflowIcon.tsx → ...tabs/requestTab/workflow/WorkflowIcon.tsx b/...eet/src/lib/ui-sidesheet/WorkflowIcon.tsx → ...tabs/requestTab/workflow/WorkflowIcon.tsx