moved error display to own component w/ burnettk

spiffworkflow-frontend/src/App.tsx

@@ -15,6 +15,7 @@ import { ErrorForDisplay } from './interfaces';
 import { AbilityContext } from './contexts/Can';
 import UserService from './services/UserService';
 import { Notification } from './components/Notification';
+import ErrorDisplay from './components/ErrorDisplay';
 
 export default function App() {
   const [errorObject, setErrorObject] = useState<ErrorForDisplay | null>(null);
@@ -31,51 +32,51 @@ export default function App() {
 
   const ability = defineAbility(() => {});
 
-  let errorTag = null;
+  // let errorTag = null;
-  if (errorObject) {
+  // if (errorObject) {
-    let sentryLinkTag = null;
+  //   let sentryLinkTag = null;
-    if (errorObject.sentry_link) {
+  //   if (errorObject.sentry_link) {
-      sentryLinkTag = (
+  //     sentryLinkTag = (
-        <span>
+  //       <span>
-          {
+  //         {
-            ': Find details about this error here (it may take a moment to become available): '
+  //           ': Find details about this error here (it may take a moment to become available): '
-          }
+  //         }
-          <a href={errorObject.sentry_link} target="_blank" rel="noreferrer">
+  //         <a href={errorObject.sentry_link} target="_blank" rel="noreferrer">
-            {errorObject.sentry_link}
+  //           {errorObject.sentry_link}
-          </a>
+  //         </a>
-        </span>
+  //       </span>
-      );
+  //     );
-    }
+  //   }
-
+  //
-    let message = <div>{errorObject.message}</div>;
+  //   let message = <div>{errorObject.message}</div>;
-    let title = 'Error:';
+  //   let title = 'Error:';
-    if ('task_name' in errorObject && errorObject.task_name) {
+  //   if ('task_name' in errorObject && errorObject.task_name) {
-      title = `Error in python script:`;
+  //     title = 'Error in python script:';
-      message = (
+  //     message = (
-        <>
+  //       <>
-          <br />
+  //         <br />
-          <div>
+  //         <div>
-            Task: {errorObject.task_name} ({errorObject.task_id})
+  //           Task: {errorObject.task_name} ({errorObject.task_id})
-          </div>
+  //         </div>
-          <div>File name: {errorObject.file_name}</div>
+  //         <div>File name: {errorObject.file_name}</div>
-          <div>Line number in script task: {errorObject.line_number}</div>
+  //         <div>Line number in script task: {errorObject.line_number}</div>
-          <br />
+  //         <br />
-          <div>{errorObject.message}</div>
+  //         <div>{errorObject.message}</div>
-        </>
+  //       </>
-      );
+  //     );
-    }
+  //   }
-
+  //
-    errorTag = (
+  //   errorTag = (
-      <Notification
+  //     <Notification
-        title={title}
+  //       title={title}
-        onClose={() => setErrorObject(null)}
+  //       onClose={() => setErrorObject(null)}
-        type="error"
+  //       type="error"
-      >
+  //     >
-        {message}
+  //       {message}
-        {sentryLinkTag}
+  //       {sentryLinkTag}
-      </Notification>
+  //     </Notification>
-    );
+  //   );
-  }
+  // }
 
   return (
     <div className="cds--white">
@@ -85,7 +86,7 @@ export default function App() {
           <BrowserRouter>
             <NavigationBar />
             <Content>
-              {errorTag}
+              <ErrorDisplay />
               <ErrorBoundary>
                 <Routes>
                   <Route path="/*" element={<HomePageRoutes />} />

spiffworkflow-frontend/src/components/ErrorDisplay.tsx

@@ -0,0 +1,55 @@
+import { useContext } from 'react';
+import ErrorContext from 'src/contexts/ErrorContext';
+import { Notification } from './Notification';
+
+export default function ErrorDisplay() {
+  const [errorObject, setErrorObject] = (useContext as any)(ErrorContext);
+
+  let errorTag = null;
+  if (errorObject) {
+    let sentryLinkTag = null;
+    if (errorObject.sentry_link) {
+      sentryLinkTag = (
+        <span>
+          {
+            ': Find details about this error here (it may take a moment to become available): '
+          }
+          <a href={errorObject.sentry_link} target="_blank" rel="noreferrer">
+            {errorObject.sentry_link}
+          </a>
+        </span>
+      );
+    }
+
+    let message = <div>{errorObject.message}</div>;
+    let title = 'Error:';
+    if ('task_name' in errorObject && errorObject.task_name) {
+      title = 'Error in python script:';
+      message = (
+        <>
+          <br />
+          <div>
+            Task: {errorObject.task_name} ({errorObject.task_id})
+          </div>
+          <div>File name: {errorObject.file_name}</div>
+          <div>Line number in script task: {errorObject.line_number}</div>
+          <br />
+          <div>{errorObject.message}</div>
+        </>
+      );
+    }
+
+    errorTag = (
+      <Notification
+        title={title}
+        onClose={() => setErrorObject(null)}
+        type="error"
+      >
+        {message}
+        {sentryLinkTag}
+      </Notification>
+    );
+  }
+
+  return errorTag;
+}

spiffworkflow-frontend/src/hooks/PermissionService.tsx

@@ -35,6 +35,14 @@ export const usePermissionFetcher = (
         }
       });
       ability.update(rules);
+      console.log('SETTING PERMISSIONS');
+      const thePERMMap = (ability as any).j;
+      console.log(
+        'thePERMMAP',
+        thePERMMap.get(
+          '/v1.0/process-models/misc:category_number_one:workflow_one/files'
+        )
+      );
       setPermissionsLoaded(true);
     };
     if (Object.keys(permissionsToCheck).length !== 0) {
@@ -47,5 +55,5 @@ export const usePermissionFetcher = (
     }
   });
 
-  return { ability, permissionsLoaded };
+  return { ability, permissionsLoaded, setPermissionsLoaded };
 };

spiffworkflow-frontend/src/routes/ProcessModelShow.tsx

@@ -73,9 +73,8 @@ export default function ProcessModelShow() {
     [targetUris.processInstanceCreatePath]: ['POST'],
     [targetUris.processModelFileCreatePath]: ['POST', 'PUT', 'GET', 'DELETE'],
   };
-  const { ability, permissionsLoaded } = usePermissionFetcher(
+  const { ability, permissionsLoaded, setPermissionsLoaded } =
-    permissionRequestData
+    usePermissionFetcher(permissionRequestData);
-  );
 
   const modifiedProcessModelId = modifyProcessIdentifierForPathParam(
     `${params.process_model_id}`
@@ -234,6 +233,10 @@ export default function ProcessModelShow() {
     const elements = [];
     let icon = View;
     let actionWord = 'View';
+    console.log(
+      'targetUris.processModelFileCreatePath',
+      targetUris.processModelFileCreatePath
+    );
     if (ability.can('PUT', targetUris.processModelFileCreatePath)) {
       icon = Edit;
       actionWord = 'Edit';
@@ -306,6 +309,17 @@ export default function ProcessModelShow() {
     if (!processModel || !permissionsLoaded) {
       return null;
     }
+    const permLoad = JSON.stringify(permissionsLoaded);
+    console.log('permLoad', permLoad);
+    const theMap = (ability as any).j;
+    // console.log('theMap', theMap[targetUris.processModelFileCreatePath]);
+    // console.log('theMap', theMap);
+    console.log(
+      'theMap',
+      theMap.get(
+        '/v1.0/process-models/misc:category_number_one:workflow_one/files'
+      )
+    );
     let constructedTag;
     const tags = processModel.files.map((processModelFile: ProcessFile) => {
       const isPrimaryBpmnFile =
@@ -327,11 +341,7 @@ export default function ProcessModelShow() {
       let fileLink = null;
       const fileUrl = profileModelFileEditUrl(processModelFile);
       if (fileUrl) {
-        if (ability.can('GET', targetUris.processModelFileCreatePath)) {
+        fileLink = <Link to={fileUrl}>{processModelFile.name}</Link>;
-          fileLink = <Link to={fileUrl}>{processModelFile.name}</Link>;
-        } else {
-          fileLink = <span>{processModelFile.name}</span>;
-        }
       }
       constructedTag = (
         <TableRow key={processModelFile.name}>