From 0e8960bb32ed265e69fa04100eaf997694f84ab8 Mon Sep 17 00:00:00 2001 From: Becky Reamy Date: Fri, 13 Oct 2023 14:58:12 -0400 Subject: [PATCH 1/7] KPMP-4674: Change endpoint to exclude pacakge types --- src/actions/Packages/packageActions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/actions/Packages/packageActions.js b/src/actions/Packages/packageActions.js index 3f369ec2..24e305f6 100755 --- a/src/actions/Packages/packageActions.js +++ b/src/actions/Packages/packageActions.js @@ -7,7 +7,7 @@ import { getDTDByVersion } from '../dtdActions'; const api = Api.getInstance(); export const getPackagesStateless = () => { - return api.get('/api/v1/packages') + return api.get('/api/v1/packages/exclude/true') .then(res => { return res.data }) From 80d6780f2f92962c965b2a598116646e69f18a6a Mon Sep 17 00:00:00 2001 From: Becky Reamy Date: Mon, 23 Oct 2023 12:39:57 -0400 Subject: [PATCH 2/7] KPMP-4674: Update endpoint --- src/actions/Packages/packageActions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/actions/Packages/packageActions.js b/src/actions/Packages/packageActions.js index 24e305f6..d1251d44 100755 --- a/src/actions/Packages/packageActions.js +++ b/src/actions/Packages/packageActions.js @@ -7,7 +7,7 @@ import { getDTDByVersion } from '../dtdActions'; const api = Api.getInstance(); export const getPackagesStateless = () => { - return api.get('/api/v1/packages/exclude/true') + return api.get('/api/v1/packages?shouldExclude=true') .then(res => { return res.data }) From 04937465efaba938727d7d045ceea86126413f8d Mon Sep 17 00:00:00 2001 From: dert1129 Date: Fri, 10 Nov 2023 12:33:33 -0500 Subject: [PATCH 3/7] edit instruciton text --- src/components/Upload/Forms/DynamicForm.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/Upload/Forms/DynamicForm.js b/src/components/Upload/Forms/DynamicForm.js index de6d5e22..f33829fa 100755 --- a/src/components/Upload/Forms/DynamicForm.js +++ b/src/components/Upload/Forms/DynamicForm.js @@ -174,7 +174,10 @@ class DynamicForm extends Component { />
-

STEP 1: Determine the size of all files in this package

+

STEP 1: Verify you have completed the following required to upload your data:

+
1. Globus is installed and your local endpoint is set up
+
2. You have downloaded and filled out the current version of the metadata spreadsheet for your technology
+
3. Your data is organized in your Globus endpoint and ready for upload

It is important that you submit the metadata for your experiment using the most recent metadata template

From 0043d0ec66436ac448104897955aa73a02d0b415 Mon Sep 17 00:00:00 2001 From: dert1129 Date: Fri, 17 Nov 2023 10:25:02 -0500 Subject: [PATCH 4/7] fix language --- src/components/Upload/Forms/DynamicForm.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/Upload/Forms/DynamicForm.js b/src/components/Upload/Forms/DynamicForm.js index f33829fa..86bf23dc 100755 --- a/src/components/Upload/Forms/DynamicForm.js +++ b/src/components/Upload/Forms/DynamicForm.js @@ -176,9 +176,8 @@ class DynamicForm extends Component {

STEP 1: Verify you have completed the following required to upload your data:

1. Globus is installed and your local endpoint is set up
-
2. You have downloaded and filled out the current version of the metadata spreadsheet for your technology
+
2. You have downloaded and filled out the current version of the metadata template for your technology
3. Your data is organized in your Globus endpoint and ready for upload
-

It is important that you submit the metadata for your experiment using the most recent metadata template

From 43a71637283219c80c81e2023340b3a2af36cfdc Mon Sep 17 00:00:00 2001 From: rlreamy <34109594+rlreamy@users.noreply.github.com> Date: Thu, 4 Jan 2024 15:35:56 -0500 Subject: [PATCH 5/7] Update DynamicForm.js --- src/components/Upload/Forms/DynamicForm.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Upload/Forms/DynamicForm.js b/src/components/Upload/Forms/DynamicForm.js index 051d48dd..ca270cb0 100755 --- a/src/components/Upload/Forms/DynamicForm.js +++ b/src/components/Upload/Forms/DynamicForm.js @@ -8,7 +8,6 @@ import qq from 'fine-uploader/lib/core'; import { uploader } from '../fineUploader'; import { Link, Prompt } from 'react-router-dom'; import PropTypes from 'prop-types'; -import Switch from "react-switch"; class DynamicForm extends Component { From 962615a03dbacce519e91e9aca445b61bd357b35 Mon Sep 17 00:00:00 2001 From: rlreamy <34109594+rlreamy@users.noreply.github.com> Date: Thu, 4 Jan 2024 15:39:44 -0500 Subject: [PATCH 6/7] Update NavUser.js --- src/components/Nav/NavUser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Nav/NavUser.js b/src/components/Nav/NavUser.js index 235cc3ce..1b479da6 100755 --- a/src/components/Nav/NavUser.js +++ b/src/components/Nav/NavUser.js @@ -29,7 +29,7 @@ class NavUser extends Component { {this.props.displayName} - + Help @@ -47,4 +47,4 @@ NavUser.propTypes = { displayName: PropTypes.string.isRequired }; -export default NavUser; \ No newline at end of file +export default NavUser; From 9dc1330cdce1e1b2314a579ce9d6c284f1ea32f1 Mon Sep 17 00:00:00 2001 From: rlreamy <34109594+rlreamy@users.noreply.github.com> Date: Thu, 4 Jan 2024 15:43:27 -0500 Subject: [PATCH 7/7] Update DynamicForm.js fixing build errors --- src/components/Upload/Forms/DynamicForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Upload/Forms/DynamicForm.js b/src/components/Upload/Forms/DynamicForm.js index ca270cb0..0dea615c 100755 --- a/src/components/Upload/Forms/DynamicForm.js +++ b/src/components/Upload/Forms/DynamicForm.js @@ -220,7 +220,7 @@ class DynamicForm extends Component {

STEP 1: Verify you have completed the following required to upload your data:

1. Globus is installed and your local endpoint is set up
-
2. You have downloaded and filled out the current version of the metadata template for your technology
+
2. You have downloaded and filled out the current version of the metadata template for your technology
3. Your data is organized in your Globus endpoint and ready for upload