Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

Commit

Permalink
Merge branch 'merge5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@megasanjay
megasanjay committed Sep 1, 2021
2 parents 0698f34 + f731e79 commit e5f26be
Show file tree
Hide file tree
Showing 22 changed files with 3,430 additions and 4,595 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,27 @@ All notable changes to SODA will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## v4.7.0 - 2021-08-31

### Feature additions:

- Changed user interface for `Prepare metadata - Create submission.xlsx file`. This user interface was changed to be even more user-friendly and consistent with the user interface of `Prepare metadata - Create dataset_description.xlsx file`.
- Added user oonboarding tutorials to help first time users of the app understand Step 3 of Organizing datasets better.
- Changed strain and species retrieval under Create subjects.xlsx and Create samples.xlsx from input search to button clicks.
- Changed all of the remaining status elements into Sweetalert popups for consistency in the app.
- Added an option to replace metadata files when generating if one already exists at the destination folder.
- Added restrictions to the folder creation user interface to be more in line with the requirements from Pennsieve.

### Bug fixes:

- Switched popover libraries to ensure that hyperlinks are clickable when required.
- Changed table tooltip (Edit/Copy/Delete a subject or sample) in the features: Create subjects.xlsx and Create samples.xlsx to be text-based for clearer instructions for users.
- Fixed a bug with samples file generation where copying fields would cause an error when generating the final file.
- Fixed an issue where libraries were being loaded out of order leading to errors when opening SODA for the first time.
- When uploading a dataset, we have now locked the sidebar to prevent accidental clicks that would take you out of the UI.
- Fixed a bug where loading an award from Airtable would require two attempts.
- Fixed a bug where macOS version of SODA would run the pre-check message everytime the app lost focus.

## v4.6.2 - 2021-08-13

### Bug fixes:
Expand Down Expand Up @@ -74,6 +95,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## v4.4.0 - 2021-06-03

### Feature additions:

- Added support for more stringent file check with regards to metadata files. This should prevent you from importing files that are not valid.
- Added a button to paste your API keys into the application more easily.
- Added better warnings for when a backend module fails. This should give tou more information about the status of SODA and if a restart of the app maybe neccessary.
Expand Down
81 changes: 50 additions & 31 deletions src/assets/css/individualtab.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -765,23 +765,23 @@

@keyframes shakingeffect {
0% {
transform: translateY(0px) rotate(0deg);
transform: translateY(0px) rotate(0deg);
}
20% {
transform: translateY(-2px) rotate(-4deg);
transform: translateY(-2px) rotate(-4deg);
}
40% {
transform: translateY(-2px) rotate(-2deg);
transform: translateY(-2px) rotate(-2deg);
}
60% {
transform: translateY(2px) rotate(4deg);
transform: translateY(2px) rotate(4deg);
}
80% {
transform: translateY(2px) rotate(2deg);
transform: translateY(2px) rotate(2deg);
}
100% {
transform: translateY(0px) rotate(0deg);
}
transform: translateY(0px) rotate(0deg);
}
}

.ui.positive.button.active {
Expand Down Expand Up @@ -953,29 +953,30 @@
text-align: center;
}

.ui.input.modified>input {
border-bottom: 1px solid rgba(34,36,38,.15) !important;
.ui.input.modified > input {
border-bottom: 1px solid rgba(34, 36, 38, 0.15) !important;
border-left: none !important;
border-right: none !important;
border-top: none !important;
border-radius: 0 !important;
}

.ui.input.modified>input:focus {
.ui.input.modified > input:focus {
border-bottom: 1px solid var(--color-light-green) !important;
}

.ui.styled.accordion .title {
background: #fff !important
background: #fff !important;
}

.ui.styled.accordion .title.active {
background: #e7f1ff !important;
color: #0c63e4 !important
color: #0c63e4 !important;
}

.ui.styled.accordion .accordion .title, .ui.styled.accordion .title {
color: rgba(0,0,0,.8) !important
.ui.styled.accordion .accordion .title,
.ui.styled.accordion .title {
color: rgba(0, 0, 0, 0.8) !important;
}

.invalid {
Expand Down Expand Up @@ -1316,7 +1317,7 @@
color: #363636 !important;
font-weight: 400 !important;
/* width: 140px !important; */
/* font-size: 14px !important;
/* font-size: 14px !important;
padding: 8px 10px !important;
background: #fff !important;
} */
Expand Down Expand Up @@ -1349,7 +1350,7 @@ body.swal2-shown > [aria-hidden="true"] {
}

.swal2-footer a {
text-decoration: underline !important;
text-decoration: underline;
/* color: var(--color-light-green) !important; */
}

Expand Down Expand Up @@ -1591,17 +1592,17 @@ body.swal2-shown > [aria-hidden="true"] {
}

.popover-tooltip.subjects-form {
padding: 0;
font-size: 16px;
padding: 0;
font-size: 16px;
}
.popover-tooltip.subjects-form div{
min-width:180px
.popover-tooltip.subjects-form div {
min-width: 180px;
}
.no_results_species{
.no_results_species {
line-height: 1.5;
padding: 3px 5px;
background: pink;
cursor: pointer
cursor: pointer;
}

.confirm-disabled {
Expand All @@ -1614,7 +1615,7 @@ body.swal2-shown > [aria-hidden="true"] {
}

.contributor-popup {
max-width: 90%
max-width: 90%;
}

.swal-content-additional-link #swal2-content {
Expand All @@ -1623,11 +1624,11 @@ body.swal2-shown > [aria-hidden="true"] {
}

.swal-content-additional-link #swal2-content label {
font-weight: 600
font-weight: 600;
}

.tagify.form-container-input-bf {
overflow-x: hidden
overflow-x: hidden;
}

#contributor-popup {
Expand All @@ -1646,27 +1647,45 @@ body.swal2-shown > [aria-hidden="true"] {
#contributor-popup select {
margin-bottom: 20px;
margin-top: 15px;
height: 45px
height: 45px;
}

#contributor-popup label {
font-weight: 600
font-weight: 600;
}

.autoComplete_wrapper > ul > li mark, .mark {
padding: 0 !important
.autoComplete_wrapper > ul > li mark,
.mark {
padding: 0 !important;
}

.autoComplete_wrapper {
width: 100% !important
width: 100% !important;
}

.autoComplete_wrapper > input {
width: 100% !important;
font-size: inherit !important;
min-height: 2.71428571em !important;
border: none !important;
border-bottom: 1px solid rgba(34,36,38,.15) !important;
border-bottom: 1px solid rgba(34, 36, 38, 0.15) !important;
border-radius: 0 !important;
color: inherit !important;
}

.button-add-species {
width: 115px;
height: 36px;
border-radius: 10px;
border: none;
background: #e7f1ff;
color: #0c63e4;
font-weight: 600;
font-size: 13px;
margin-left: 10px;
}

.button-add-species:hover {
background: #0c63e4;
color: #e7f1ff;
}
29 changes: 15 additions & 14 deletions src/assets/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ button[data-id="bf_list_users_pi"] {
padding: 8px 10px !important;
text-align: center;
vertical-align: middle;
margin-top:;
margin-top: ;
}

.modal-footer {
Expand Down Expand Up @@ -702,7 +702,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}
.myFile.doc:before {
background: url("../img/doc-file.png");
Expand All @@ -711,7 +711,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}
.myFile.docx:before {
background: url("../img/doc-file.png");
Expand All @@ -720,7 +720,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}
.myFile.png:before {
background: url("../img/png-file.png");
Expand All @@ -729,7 +729,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}
.myFile.PNG:before {
background: url("../img/png-file.png");
Expand All @@ -738,7 +738,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}
.myFile.jpg:before {
background: url("../img/jpeg-file.png");
Expand All @@ -747,7 +747,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}
.myFile.jpeg:before {
background: url("../img/jpeg-file.png");
Expand All @@ -756,7 +756,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}
.myFile.JPEG:before {
background: url("../img/jpeg-file.png");
Expand All @@ -765,7 +765,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}
.myFile.pdf:before {
background: url("../img/pdf-file.png");
Expand All @@ -774,7 +774,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}
.myFile.txt:before {
background: url("../img/txt-file.png");
Expand All @@ -783,7 +783,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}
.myFile.xlsx:before {
background: url("../img/excel-file.png");
Expand All @@ -792,7 +792,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}

.myFile.xls:before {
Expand All @@ -802,7 +802,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}

.myFile.other:before {
Expand All @@ -812,7 +812,7 @@ button[data-id="bf_list_users_pi"] {
position: absolute;
width: 55px;
height: 55px;
margin-left: 10px;
margin-left: 5px;
}

.myFile.deleted_file:before {
Expand Down Expand Up @@ -1130,6 +1130,7 @@ button[data-id="bf_list_users_pi"] {
height: auto;
bottom: 70px;
right: 0;
bottom: 70px;
border-radius: 10px 0 0 10px;
border: 1px solid #f0f0f0;
background: #f5f5f5;
Expand Down
Loading

0 comments on commit e5f26be

Please sign in to comment.