Updates to the joyride tutorials and some minor bugfixes.

esgf2-us · Oct 31, 2024 · ec2f5da · ec2f5da
1 parent 4382ee7
commit ec2f5da
Show file tree

Hide file tree

Showing 6 changed files with 513 additions and 356 deletions.
diff --git a/backend/metagrid/api_proxy/views.py b/backend/metagrid/api_proxy/views.py
@@ -202,7 +202,7 @@ def do_request(request, urlbase):
         resp = requests.get(urlbase)
 
     #    print(resp.text)
-    httpresp = HttpResponse(resp.text)
+    httpresp = HttpResponse(resp.text, content_type="text/json")
     httpresp.status_code = resp.status_code
 
     return httpresp

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": true,
   "scripts": {
     "build:local": "env-cmd -f .envs/.react react-scripts build",
@@ -83,7 +83,7 @@
     "react-dom": "18.2.0",
     "react-hotjar": "2.2.1",
     "react-joyride": "2.5.3",
-    "react-markdown": "8.0.7",
+    "react-markdown": "9.0.1",
     "react-router-dom": "^6.9.0",
     "react-scripts": "5.0.1",
     "recoil": "0.7.7",

diff --git a/frontend/public/changelog/v1.2.1.md b/frontend/public/changelog/v1.2.1.md
@@ -0,0 +1,4 @@
+## Summary
+
+1. Updates to the tutorials: added new tutorial for the Globus transfer feature.
+2. Minor bugfixes.
diff --git a/frontend/src/common/reactJoyrideSteps.ts b/frontend/src/common/reactJoyrideSteps.ts
@@ -806,13 +806,19 @@ export const createCollectionsFormTour = (): JoyrideTour => {
     .addNextStep(
       manageCollectionsTourTargets.mySavedCollections.selector(),
       "Your currently saved collections are displayed in this table, where you can also 'Set' or 'Update' the file path to use for a specific collection. If the path is set for a specific collection, you won't have to set the path again when doing transfers to that collection.",
-      'auto',
+      'auto'
+    )
+    .addNextStep('body', 'This concludes the cart page tour.', 'center')
+    .setOnFinish(
       /* istanbul ignore next */
-      async () => {
-        clickFirstElement(
-          manageCollectionsTourTargets.mySavedCollectionsPanel.selector()
-        );
-        await delay(300);
+      () => {
+        // Clean-up step for when the tour is complete (or skipped)
+        return async () => {
+          clickFirstElement(
+            manageCollectionsTourTargets.mySavedCollectionsPanel.selector()
+          );
+          await delay(300);
+        };
       }
     );
 

diff --git a/frontend/src/components/Messaging/messageDisplayData.ts b/frontend/src/components/Messaging/messageDisplayData.ts
@@ -5,6 +5,7 @@ export const rightDrawerMessages: MarkdownMessage[] = [
 ];
 
 export const rightDrawerChanges: MarkdownMessage[] = [
+  { title: 'V1.2.1', fileName: 'changelog/v1.2.1.md' },
   { title: 'V1.2.0', fileName: 'changelog/v1.2.0.md' },
   { title: 'V1.1.3-pre', fileName: 'changelog/v1.1.3-pre.md' },
   { title: 'V1.1.2-pre', fileName: 'changelog/v1.1.2-pre.md' },
@@ -16,9 +17,18 @@ export const rightDrawerChanges: MarkdownMessage[] = [
 ];
 
 const startupMessages: StartPopupData = {
-  messageToShow: 'v1.2.0', // This is the version number that appears in the footer
+  messageToShow: 'v1.2.1', // This is the version number that appears in the footer
   defaultMessageId: 'welcome',
   messageData: [
+    {
+      messageId: 'v1.2.1',
+      template: MessageTemplates.ChangeLog,
+      style: { minWidth: '700px' },
+      data: {
+        changesFile: 'changelog/v1.2.1.md',
+        version: '1.2.1',
+      },
+    },
     {
       messageId: 'v1.2.0',
       template: MessageTemplates.ChangeLog,