Merge branch 'main' of github.com:sartography/spiff-arena

spiffworkflow-frontend/src/components/ProcessInstanceListDeleteReport.tsx

@@ -0,0 +1,29 @@
+import { ProcessInstanceReport } from '../interfaces';
+import HttpService from '../services/HttpService';
+import ButtonWithConfirmation from './ButtonWithConfirmation';
+
+type OwnProps = {
+  onSuccess: (..._args: any[]) => any;
+  processInstanceReportSelection: ProcessInstanceReport;
+};
+
+export default function ProcessInstanceListDeleteReport({
+  onSuccess,
+  processInstanceReportSelection,
+}: OwnProps) {
+  const deleteProcessInstanceReport = () => {
+    HttpService.makeCallToBackend({
+      path: `/process-instances/reports/${processInstanceReportSelection.id}`,
+      successCallback: onSuccess,
+      httpMethod: 'DELETE',
+    });
+  };
+
+  return (
+    <ButtonWithConfirmation
+      description={`Delete Perspective ${processInstanceReportSelection.identifier}?`}
+      onConfirmation={deleteProcessInstanceReport}
+      buttonLabel="Delete"
+    />
+  );
+}

spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx

@@ -63,6 +63,7 @@ import {
 } from '../interfaces';
 import ProcessModelSearch from './ProcessModelSearch';
 import ProcessInstanceReportSearch from './ProcessInstanceReportSearch';
+import ProcessInstanceListDeleteReport from './ProcessInstanceListDeleteReport';
 import ProcessInstanceListSaveAsReport from './ProcessInstanceListSaveAsReport';
 import { FormatProcessModelDisplayName } from './MiniComponents';
 import { Notification } from './Notification';
@@ -681,6 +682,19 @@ export default function ProcessInstanceListTable({
     );
   };
 
+  const onDeleteReportSuccess = () => {
+    processInstanceReportDidChange({ selectedItem: null });
+  };
+
+  const deleteReportComponent = () => {
+    return processInstanceReportSelection ? (
+      <ProcessInstanceListDeleteReport
+        onSuccess={onDeleteReportSuccess}
+        processInstanceReportSelection={processInstanceReportSelection}
+      />
+    ) : null;
+  };
+
   const removeColumn = (reportColumn: ReportColumn) => {
     if (reportMetadata) {
       const reportMetadataCopy = { ...reportMetadata };
@@ -1062,6 +1076,7 @@ export default function ProcessInstanceListTable({
           </Column>
           <Column sm={4} md={4} lg={8}>
             {saveAsReportComponent()}
+            {deleteReportComponent()}
           </Column>
         </Grid>
       </>

spiffworkflow-frontend/src/routes/ProcessInstanceReportList.tsx

@@ -31,9 +31,7 @@ export default function ProcessInstanceReportList() {
       return (
         <tr key={(row as any).id}>
           <td>
-            <Link
+            <Link to={`/admin/process-instances?report_id=${rowToUse.id}`}>
-              to={`/admin/process-instances/reports/${rowToUse.identifier}`}
-            >
               {rowToUse.identifier}
             </Link>
           </td>