Merge branch 'main' into bug/WP-782

client/src/components/DataFiles/tests/DataFiles.test.jsx

@@ -1,24 +1,40 @@
-import React from 'react';
+import React, { version } from 'react';
 import { createMemoryHistory } from 'history';
 import configureStore from 'redux-mock-store';
 import DataFiles from '../DataFiles';
 import systemsFixture from '../fixtures/DataFiles.systems.fixture';
 import filesFixture from '../fixtures/DataFiles.files.fixture';
 import renderComponent from 'utils/testing';
 import { projectsFixture } from '../../../redux/sagas/fixtures/projects.fixture';
+import { vi } from 'vitest';
+import { useExtract } from 'hooks/datafiles/mutations';
 
 const mockStore = configureStore();
+global.fetch = vi.fn();
 
 describe('DataFiles', () => {
-  it('should render Data Files with multiple private systems', () => {
+  afterEach(() => {
+    fetch.mockClear();
+  });
+  it.skip('should render Data Files with multiple private systems', () => {
     const history = createMemoryHistory();
     const store = mockStore({
       workbench: {
         config: {
-          extract: '',
-          compress: '',
+          extract: {
+            id: 'extract',
+            version: '0.0.1',
+          },
+          compress: {
+            id: 'compress',
+            version: '0.0.3',
+          },
         },
       },
+      allocations: {
+        portal_alloc: 'TACC-ACI',
+        active: [{ projectId: 'active-project' }],
+      },
       systems: systemsFixture,
       files: filesFixture,
       pushKeys: {
@@ -39,6 +55,7 @@ describe('DataFiles', () => {
         },
       },
     });
+    fetch.mockResolvedValue(useExtract());
     const { getByText, getAllByText, queryByText } = renderComponent(
       <DataFiles />,
       store,

client/src/components/Tickets/TicketCreateForm.jsx

@@ -197,7 +197,7 @@ function TicketCreateForm({
                       <FormField
                         name="cc"
                         label="Cc"
-                        description="Separate emails with commas"
+                        description="Separate emails with commas. NOTE: Emails listed here will only receive emails on replies to tickets."
                       />
                     </Col>
                   </Row>

client/src/hooks/datafiles/mutations/useCompress.ts

@@ -0,0 +1,156 @@
+import { useMutation } from '@tanstack/react-query';
+import { useSelector, useDispatch, shallowEqual } from 'react-redux';
+import { getCompressParams } from 'utils/getCompressParams';
+import { apiClient } from 'utils/apiClient';
+import { TTapisFile, TPortalSystem } from 'utils/types';
+import { TJobBody, TJobPostResponse } from './useSubmitJob';
+
+async function submitJobUtil(body: TJobBody) {
+  const res = await apiClient.post<TJobPostResponse>(
+    `/api/workspace/jobs`,
+    body
+  );
+  return res.data.response;
+}
+
+function useCompress() {
+  const dispatch = useDispatch();
+  const status = useSelector(
+    (state: any) => state.files.operationStatus.compress,
+    shallowEqual
+  );
+
+  const setStatus = (newStatus: any) => {
+    dispatch({
+      type: 'DATA_FILES_SET_OPERATION_STATUS',
+      payload: { status: newStatus, operation: 'compress' },
+    });
+  };
+
+  const compressErrorAction = (errorMessage: any) => {
+    return {
+      type: 'DATA_FILES_SET_OPERATION_STATUS',
+      payload: {
+        status: { type: 'ERROR', message: errorMessage },
+        operation: 'compress',
+      },
+    };
+  };
+
+  const compressApp = useSelector(
+    (state: any) => state.workbench.config.compressApp
+  );
+
+  const defaultAllocation = useSelector(
+    (state: any) =>
+      state.allocations.portal_alloc || state.allocations.active[0].projectName
+  );
+
+  const systems = useSelector(
+    (state: any) => state.systems.storage.configuration
+  );
+
+  const { mutateAsync } = useMutation({ mutationFn: submitJobUtil });
+
+  const compress = ({
+    scheme,
+    files,
+    filename,
+    compressionType,
+  }: {
+    scheme: string;
+    files: TTapisFile[];
+    filename: string;
+    compressionType: string;
+  }) => {
+    dispatch({
+      type: 'DATA_FILES_SET_OPERATION_STATUS',
+      payload: { status: 'RUNNING', operation: 'compress' },
+    });
+
+    let defaultPrivateSystem: TPortalSystem | undefined;
+
+    if (files[0].scheme === 'private' && files[0].api === 'tapis') {
+      defaultPrivateSystem = undefined;
+    }
+
+    if (scheme !== 'private' && scheme !== 'projects') {
+      defaultPrivateSystem = systems.find((s: any) => s.default);
+
+      if (!defaultPrivateSystem) {
+        throw new Error('Folder downloads are unavailable in this portal', {
+          cause: 'compressError',
+        });
+      }
+    }
+
+    const params = getCompressParams(
+      files,
+      filename,
+      compressionType,
+      compressApp,
+      defaultAllocation,
+      defaultPrivateSystem
+    );
+
+    return mutateAsync(
+      {
+        job: params,
+      },
+      {
+        onSuccess: (response: any) => {
+          // If the execution system requires pushing keys, then
+          // bring up the modal and retry the compress action
+          if (response.execSys) {
+            dispatch({
+              type: 'SYSTEMS_TOGGLE_MODAL',
+              payload: {
+                operation: 'pushKeys',
+                props: {
+                  system: response.execSys,
+                  onCancel: compressErrorAction('An error has occurred'),
+                },
+              },
+            });
+          } else if (response.status === 'PENDING') {
+            dispatch({
+              type: 'DATA_FILES_SET_OPERATION_STATUS',
+              payload: { status: { type: 'SUCCESS' }, operation: 'compress' },
+            });
+            dispatch({
+              type: 'ADD_TOAST',
+              payload: {
+                message: 'Compress job submitted.',
+              },
+            });
+            dispatch({
+              type: 'DATA_FILES_SET_OPERATION_STATUS',
+              payload: { operation: 'compress', status: {} },
+            });
+            dispatch({
+              type: 'DATA_FILES_TOGGLE_MODAL',
+              payload: { operation: 'compress', props: {} },
+            });
+          }
+        },
+        onError: (response) => {
+          const errorMessage =
+            response.cause === 'compressError'
+              ? response.message
+              : 'An error has occurred.';
+          dispatch({
+            type: 'DATA_FILES_SET_OPERATION_STATUS',
+            payload: {
+              status: { type: 'ERROR', message: errorMessage },
+              operation: 'compress',
+            },
+          });
+        },
+      }
+    );
+  };
+
+  return { compress, status, setStatus };
+}
+
+export default useCompress;