Merge branch 'main' into task/WP-211-targetPath

TACC · Sep 29, 2023 · 090a0bf · 090a0bf
2 parents 55b7d52 + 9b53589
commit 090a0bf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesMoveModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesMoveModal.jsx
@@ -50,10 +50,7 @@ const DataFilesMoveModal = React.memo(() => {
 
   const onOpened = () => {
     fetchListing({
-      api: 'tapis',
-      scheme: 'private',
-      system: selectedSystem.system,
-      path: `${selectedSystem.homeDir || ''}`,
+      ...params,
     });
   };
 
@@ -68,7 +65,7 @@ const DataFilesMoveModal = React.memo(() => {
       setDisabled(true);
       move({
         destSystem: system,
-        destPath: path,
+        destPath: path || '/',
         callback: reloadPage,
       });
     },

diff --git a/client/src/redux/sagas/datafiles.sagas.js b/client/src/redux/sagas/datafiles.sagas.js
@@ -254,7 +254,7 @@ export function* renameFile(action) {
       action.payload.api,
       action.payload.scheme,
       file.system,
-      file.path,
+      '/' + file.path,
       action.payload.newName
     );
     yield put({

diff --git a/server/portal/apps/signals/signals.py b/server/portal/apps/signals/signals.py
@@ -1,4 +1,3 @@
 from django.dispatch import Signal
 
-# Generic event signal. Not in use as of 6.29.20
-portal_event = Signal(providing_args=['event_type', 'event_data', 'event_users'])
+portal_event = Signal()
diff --git a/server/pytest.ini b/server/pytest.ini
@@ -1,3 +1,17 @@
 [pytest]
 DJANGO_SETTINGS_MODULE = portal.settings.unit_test_settings
 python_files = tests.py *unit_test.py
+
+filterwarnings =
+    ignore::DeprecationWarning:django.*:
+    ignore::DeprecationWarning:openapi_schema_validator.*:
+    ignore::DeprecationWarning:openapi_spec_validator.*:
+    ignore::DeprecationWarning:openapi_core.*:
+    ignore::DeprecationWarning:kombu.*:
+    ignore::DeprecationWarning:pkg_resources.*:
+    ignore:.*Django now detects this configuration.*:django.utils.deprecation.RemovedInDjango41Warning
+
+markers =
+    asyncio: mark a test as asyncio.
+
+# refer to WP-271 for follow up on Deprecation Warnings