Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v4.0 #384

Merged
merged 12 commits into from
Jan 4, 2024
Merged

Release v4.0 #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5bbe4a7
Merge pull request #375 from KPMP/KPMP-4663_add-descriptor-scoring
rlreamy Sep 7, 2023
0e8960b
KPMP-4674: Change endpoint to exclude pacakge types
rlreamy Oct 13, 2023
80d6780
KPMP-4674: Update endpoint
rlreamy Oct 23, 2023
3670a89
Merge pull request #379 from KPMP/KPMP-4674_SuppressEMImages
zwright Oct 25, 2023
0493746
edit instruciton text
Dert1129 Nov 10, 2023
268cd5f
Merge pull request #380 from KPMP/KPMP-4860_fix-step-1-header
rlreamy Nov 16, 2023
0043d0e
fix language
Dert1129 Nov 17, 2023
3220742
Merge pull request #383 from KPMP/KPMP-4860_tweak-language
zwright Nov 17, 2023
c98b6b3
Merge branch 'master' into develop
rlreamy Jan 4, 2024
43a7163
Update DynamicForm.js
rlreamy Jan 4, 2024
962615a
Update NavUser.js
rlreamy Jan 4, 2024
9dc1330
Update DynamicForm.js
rlreamy Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/actions/Packages/packageActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?shouldExclude=true')
.then(res => {
return res.data
})
Expand Down
4 changes: 2 additions & 2 deletions src/components/Nav/NavUser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class NavUser extends Component {
<DropdownToggle caret tag="a" className="text-dark"
>{this.props.displayName}</DropdownToggle>
<DropdownMenu id="nav-user-dropdown-menu">
<DropdownItem tag="a" target="_blank" href="https://kpmp.org/data-uploader-help/">
<DropdownItem tag="a" target="_blank" rel="noopener noreferrer" href="https://kpmp.org/data-uploader-help/">
Help
</DropdownItem>
<DropdownItem divider />
Expand All @@ -47,4 +47,4 @@ NavUser.propTypes = {
displayName: PropTypes.string.isRequired
};

export default NavUser;
export default NavUser;
25 changes: 4 additions & 21 deletions src/components/Upload/Forms/DynamicForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -219,26 +218,10 @@ class DynamicForm extends Component {
/>
<article id="largeFileSupport" className="upload-form-section container justify-content-center pt-4">
<section>
<h4>STEP 1: Determine the size of all files in this package</h4>
<p>Is the total size of all files you are uploading <strong>MORE THAN</strong> 15 gigabytes?</p>
<Row>
<Col md={12}>
<label>
<span className="largeFileSupportLabel">No</span>
<Switch
onChange={this.handleLargeFilesToggle}
checked={this.state.largeFilesChecked}
uncheckedIcon={false}
checkedIcon={false}
onColor="#08f"
height={25}
width={45}
className="react-switch"
/>
<span className="largeFileSupportLabel">Yes</span>
</label>
</Col>
</Row>
<h4>STEP 1: Verify you have completed the following required to upload your data: </h4>
<h6>1. Globus is installed and your local endpoint is set up</h6>
<h6>2. You have downloaded and filled out the current version of the <a href='https://kpmp.org/metadata' target='_blank' rel="noopener noreferrer">metadata template</a> for your technology </h6>
<h6>3. Your data is organized in your Globus endpoint and ready for upload</h6>
</section>
</article>
<article id="dynamicUploadForm" className="upload-form-section container justify-content-center pt-4">
Expand Down
Loading