Новый виды условных шагов (#6)

Co-authored-by: gorbenko.pavel <gorbenko.pavel@tansu.kz>
Reviewed-on: http://git.tnsu.kz/gorbenko.pavel/tnsu-approval-route/pulls/6

frontend/src/webparts/approvalAdmin/components/screens/RouteStepsScreen.tsx

@@ -2,9 +2,10 @@ import * as React from 'react';
 import { RouteStepFormModal } from './RouteStepFormModal';
 import { ApprovalRouteApi } from '../../services/api';
 import { PortalDictionaryClient } from '../../services/portalDictionary';
-import { RouteStepStatus, TemplateRoute, TemplateRouteStep } from '../../models';
-import { routeStepStatusLabels, routeTypeLabels, texts } from '../../texts';
-import { describeStepExecutor } from '../../utils/stepExecutor';
+import { SharePointListsClient } from '../../services/sharePointLists';
+import { RequestType, RouteStepStatus, TemplateRoute, TemplateRouteStep } from '../../models';
+import { routeStepStatusLabels, texts } from '../../texts';
+import { describeStepCondition, describeStepExecutor } from '../../utils/stepExecutor';
 import { useRouteSteps } from '../../hooks/useRouteSteps';
 import { useDeleteTarget } from '../../hooks/useDeleteTarget';
 import { usePortalEmployees } from '../../hooks/usePortalEmployees';
@@ -25,16 +26,19 @@ import {
 export interface IRouteStepsScreenProps {
   api: ApprovalRouteApi;
   route: TemplateRoute;
-  requestTypeName: string;
+  /** Undefined, пока грузится тип заявки (см. AdminApp.openSteps). */
+  requestType?: RequestType;
   /** Undefined, пока SPFx выдаёт AAD-клиент для api.tnsu.kz. */
   dictionary?: PortalDictionaryClient;
+  sharePoint: SharePointListsClient;
   onBack: () => void;
 }
 
-export const RouteStepsScreen: React.FC<IRouteStepsScreenProps> = ({ api, route, requestTypeName, dictionary, onBack }) => {
+export const RouteStepsScreen: React.FC<IRouteStepsScreenProps> = ({ api, route, requestType, dictionary, sharePoint, onBack }) => {
   const steps = useRouteSteps(api, route.id);
   const employees = usePortalEmployees(dictionary);
   const [savedWarning, setSavedWarning] = React.useState<string | undefined>();
+  const requestTypeName = requestType?.name ?? `#${route.requestTypeId}`;
 
   const [editing, setEditing] = React.useState<TemplateRouteStep | undefined>();
   const [showForm, setShowForm] = React.useState(false);
@@ -72,7 +76,7 @@ export const RouteStepsScreen: React.FC<IRouteStepsScreenProps> = ({ api, route,
       />
       <PageHeader
         icon="flag-check"
-        subtitle={texts.routeSteps.subtitle(requestTypeName, routeTypeLabels[route.routeType])}
+        subtitle={texts.routeSteps.subtitle(requestTypeName)}
         title={texts.routeSteps.title(route.id)}
         actions={
           <>
@@ -106,7 +110,7 @@ export const RouteStepsScreen: React.FC<IRouteStepsScreenProps> = ({ api, route,
             key: 'status',
             header: texts.routeSteps.columnStatus,
             render: r => (
-              <Badge variant={r.status === RouteStepStatus.Approval ? 'gold' : 'blue'}>
+              <Badge variant={r.status === RouteStepStatus.Approval ? 'neutral' : 'blue'}>
                 {routeStepStatusLabels[r.status]}
               </Badge>
             )
@@ -117,6 +121,11 @@ export const RouteStepsScreen: React.FC<IRouteStepsScreenProps> = ({ api, route,
             align: 'center',
             render: r => (r.allowReassignToOtherApprovers ? <Badge variant="ok">{texts.routeSteps.reassignAllowed}</Badge> : <Badge variant="neutral">{texts.common.no}</Badge>)
           },
+          {
+            key: 'condition',
+            header: texts.routeSteps.columnCondition,
+            render: r => describeStepCondition(r) ?? texts.common.empty
+          },
           {
             key: 'actions',
             header: '',
@@ -140,6 +149,8 @@ export const RouteStepsScreen: React.FC<IRouteStepsScreenProps> = ({ api, route,
         <RouteStepFormModal
           api={api}
           route={route}
+          requestType={requestType}
+          sharePoint={sharePoint}
           editing={editing}
           nextOrderNo={nextOrderNo}
           employees={employees.items}