status-im
/
spiff-arena
mirror of https://github.com/status-im/spiff-arena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

moved error display to own component w/ burnettk

This commit is contained in:
jasquat 2022-12-30 15:05:22 -05:00
parent 4b16e0df59
commit f93a64f126
4 changed files with 129 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
spiffworkflow-frontend/src/App.tsx
View File

@ -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;
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>
);
}
// 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 (
<div className="cds--white">
@ -85,7 +86,7 @@ export default function App() {
<BrowserRouter>
<NavigationBar />
<Content>
{errorTag}
<ErrorDisplay />
<ErrorBoundary>
<Routes>
<Route path="/*" element={<HomePageRoutes />} />

55
spiffworkflow-frontend/src/components/ErrorDisplay.tsx Normal file
View File

@ -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;
}

10
spiffworkflow-frontend/src/hooks/PermissionService.tsx
View File

@ -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 };
};

26
spiffworkflow-frontend/src/routes/ProcessModelShow.tsx
View File

@ -73,9 +73,8 @@ export default function ProcessModelShow() {
[targetUris.processInstanceCreatePath]: ['POST'],
[targetUris.processModelFileCreatePath]: ['POST', 'PUT', 'GET', 'DELETE'],
};
const { ability, permissionsLoaded } = usePermissionFetcher(
permissionRequestData
);
const { ability, permissionsLoaded, setPermissionsLoaded } =
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>;
} else {
fileLink = <span>{processModelFile.name}</span>;
}
fileLink = <Link to={fileUrl}>{processModelFile.name}</Link>;
}
constructedTag = (
<TableRow key={processModelFile.name}>