Новый виды условных шагов (#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/app/AdminApp.tsx

@@ -4,7 +4,8 @@ import { TopNav } from './TopNav';
 import { ScreenKey } from './types';
 import { ApprovalRouteApi } from '../../services/api';
 import { PortalDictionaryClient } from '../../services/portalDictionary';
-import { TemplateRoute } from '../../models';
+import { SharePointListsClient } from '../../services/sharePointLists';
+import { RequestType, TemplateRoute } from '../../models';
 import { DashboardScreen } from '../screens/DashboardScreen';
 import { RequestTypesScreen } from '../screens/RequestTypesScreen';
 import { RoutesScreen } from '../screens/RoutesScreen';
@@ -15,13 +16,14 @@ export interface IAdminAppProps {
   api: ApprovalRouteApi;
   /** Undefined, пока SPFx выдаёт AAD-клиент для api.tnsu.kz. */
   dictionary?: PortalDictionaryClient;
+  sharePoint: SharePointListsClient;
   currentUserEmail?: string;
 }
 
-export const AdminApp: React.FC<IAdminAppProps> = ({ api, dictionary, currentUserEmail }) => {
+export const AdminApp: React.FC<IAdminAppProps> = ({ api, dictionary, sharePoint, currentUserEmail }) => {
   const [screen, setScreen] = React.useState<ScreenKey>('dashboard');
   const [selectedRoute, setSelectedRoute] = React.useState<TemplateRoute | undefined>();
-  const [selectedRequestTypeName, setSelectedRequestTypeName] = React.useState('');
+  const [selectedRequestType, setSelectedRequestType] = React.useState<RequestType | undefined>();
 
   const navigate = (key: ScreenKey): void => {
     setScreen(key);
@@ -29,9 +31,10 @@ export const AdminApp: React.FC<IAdminAppProps> = ({ api, dictionary, currentUse
 
   const openSteps = (route: TemplateRoute): void => {
     setSelectedRoute(route);
+    setSelectedRequestType(undefined);
     api.requestTypes.get(route.requestTypeId)
-      .then(rt => setSelectedRequestTypeName(rt.name))
-      .catch(() => setSelectedRequestTypeName(`#${route.requestTypeId}`));
+      .then(setSelectedRequestType)
+      .catch(() => setSelectedRequestType(undefined));
     setScreen('routeSteps');
   };
 
@@ -40,19 +43,20 @@ export const AdminApp: React.FC<IAdminAppProps> = ({ api, dictionary, currentUse
       <TopNav active={screen} onSelect={navigate} />
       <div className={styles.content}>
         {screen === 'dashboard' && <DashboardScreen api={api} onNavigate={navigate} />}
-        {screen === 'requestTypes' && <RequestTypesScreen api={api} />}
+        {screen === 'requestTypes' && <RequestTypesScreen api={api} sharePoint={sharePoint} />}
         {screen === 'routes' && <RoutesScreen api={api} dictionary={dictionary} onOpenSteps={openSteps} />}
         {screen === 'routeSteps' && selectedRoute && (
           <RouteStepsScreen
             api={api}
             route={selectedRoute}
-            requestTypeName={selectedRequestTypeName}
+            requestType={selectedRequestType}
             dictionary={dictionary}
+            sharePoint={sharePoint}
             onBack={() => setScreen('routes')}
           />
         )}
         {screen === 'resolve' && (
-          <ResolveScreen api={api} dictionary={dictionary} currentUserEmail={currentUserEmail} />
+          <ResolveScreen api={api} dictionary={dictionary} sharePoint={sharePoint} currentUserEmail={currentUserEmail} />
         )}
       </div>
     </div>