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.

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

Dataup 224 add check boxes to staging #1874

Merged
merged 50 commits into from
Nov 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
0f0a823
add different event to startup
briehl Sep 29, 2020
0b0b9a5
add a different event for detecting kernel connections, some cleanup …
briehl Oct 5, 2020
82ddc5b
fix linting of kbaseNarrative.js
briehl Oct 5, 2020
f380cf5
add missing files to coverage
briehl Oct 5, 2020
7f517e1
got tests working, now to actually tests what we want
briehl Oct 6, 2020
6014420
got init happy test working
briehl Oct 7, 2020
2165fc3
fix tests
briehl Oct 7, 2020
d640baa
fix tests to make codacy happy
briehl Oct 7, 2020
c09cacc
update comments
briehl Oct 7, 2020
e11daec
make jobsReadyCallback optional
briehl Oct 7, 2020
28d7ce5
initial changes to file type selector button styling
leia-sefkin Oct 14, 2020
bfff4d7
putting css back to active, moving things around slightly
leia-sefkin Oct 15, 2020
57efdea
fixing initialization of selector dropdowns - select2 does not like r…
leia-sefkin Oct 15, 2020
7d8f2eb
styling changes for import as dropdown
leia-sefkin Oct 16, 2020
264ff79
fixing table positioning
leia-sefkin Oct 16, 2020
7b7e3d7
adding a simple test for the import as dropdown
leia-sefkin Oct 17, 2020
6b7eadf
merging in latest truss
leia-sefkin Oct 19, 2020
72dc9c5
making test more better with array check
leia-sefkin Oct 20, 2020
6729bca
setting class names for dropdown container, reworking css
leia-sefkin Oct 20, 2020
54fcb05
removing unnecessary .select2 class
leia-sefkin Oct 20, 2020
6113662
Remove old NarrativeManager.js
briehl Oct 22, 2020
cb1d413
Merge pull request #1883 from kbase/remove-narrativemanager
briehl Oct 23, 2020
9a9fded
fix some minor things in the tests
briehl Oct 23, 2020
76355e4
remove unused event listener
briehl Oct 23, 2020
a37e97a
minor visual cleanup
briehl Oct 23, 2020
23c728e
Dataup 224 adding checkboxes (#1884)
Oct 24, 2020
813e8b9
merging with truss latest
leia-sefkin Oct 26, 2020
ac254b9
Bump puppeteer from 5.3.1 to 5.4.0
dependabot[bot] Oct 26, 2020
ad31ace
Merge pull request #1840 from kbase/DATAUP-176-slow-startup
briehl Oct 26, 2020
30836bc
Merge pull request #1895 from kbase/dependabot/npm_and_yarn/puppeteer…
briehl Oct 27, 2020
8a2e26f
Dataup 224 import button (#1889)
Oct 28, 2020
820a7e4
small fix for file/folder element position
leia-sefkin Oct 28, 2020
3b6d06b
quick fixes for tests
leia-sefkin Oct 28, 2020
23e2ec0
fixing tests and a bug
leia-sefkin Oct 28, 2020
dd4656a
some initial tests
leia-sefkin Oct 28, 2020
cdb534d
PR feedback updates
leia-sefkin Oct 29, 2020
0f9b872
codacy fixes
leia-sefkin Oct 29, 2020
ac5b110
sonarcloud fix
leia-sefkin Oct 29, 2020
10a6f48
some more spacing stuff for sonarcloud
leia-sefkin Oct 29, 2020
7fbd574
more sonarcloud fixes:
leia-sefkin Oct 29, 2020
d24e483
some spacing stuff for codacy
leia-sefkin Oct 30, 2020
0e0cc79
tests finally added
leia-sefkin Oct 30, 2020
12085d5
merging in latest from truss
leia-sefkin Oct 30, 2020
c58f296
merging with latest changes from truss
leia-sefkin Oct 30, 2020
ad8f36f
Merge branch 'truss' of https://github.com/kbase/narrative into DATAU…
leia-sefkin Oct 30, 2020
250f705
Merge branch 'develop' into truss-dev-resolve
briehl Oct 30, 2020
8b8c7af
minor design tweaks
leia-sefkin Oct 30, 2020
a601b7d
fix for button hover state
leia-sefkin Oct 30, 2020
2f141cf
Merge pull request #1861 from kbase/truss-dev-resolve
briehl Oct 30, 2020
69b2bba
Merge remote-tracking branch 'origin' into DATAUP-224-add-check-boxes…
leia-sefkin Nov 2, 2020
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
263 changes: 235 additions & 28 deletions kbase-extension/static/kbase/css/kbaseNarrative.css
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
.btn__text:disabled {
color: #929292;
border: 1px solid #FAFAFA;
background-color: #FAFAFA;
background-color: #fafafa;
}

.clear-all-dropzone {
Expand Down Expand Up @@ -117,44 +117,252 @@
color: #DF0002;
}

#kb-data-staging-table_wrapper {
margin-top: 44px;
/* BEGIN staging data table modifiers */
.kb-staging-table {
table-layout: fixed;
}

.kb-data-staging-decompress {
border: 1px solid #ccc;
border-radius: 1px;
.kb-staging-table-header__checkbox {
width: 2%;
}

.kb-data-staging-table-name {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.kb-staging-table-header__file {
width: 4%;
}

.kb-data-staging-folder:hover {
cursor: pointer;
text-decoration: underline;
.kb-staging-table-header__name {
width: 26%;
}

.kb-data-breadcrumb .kb-pointer a {
cursor: pointer;
.kb-staging-table-header__size,
.kb-staging-table-header__age {
width: 8%;
}

.kb-data-staging__container {
height: 604px;
padding: 5px;
overflow-y: auto;
.kb-staging-table-header__import {
width: 22%;
}

.kb-data-staging-footer {
font-family: Oxygen, Arial, sans-serif;
font-weight: bold;
font-size: 105%;
text-align: center;
background-color: #eee;
height: 32px;
padding: 8px;
/* Overriding default datatables sort icons so they come before the header title rather than after */
.kb-staging-table-header .sorting:before,
.kb-staging-table-header .sorting_desc:before,
.kb-staging-table-header .sorting_asc:before {
opacity: 0.2;
content: "\e150";
position: relative;
top: 1px;
right: 4px;
display: inline-block;
font-family: 'Glyphicons Halflings', Arial, sans-serif;
}

.kb-staging-table-header .sorting_asc:before {
content: "\e155";
}

.kb-staging-table-header .sorting_desc:before {
content: "\e156";
}

.kb-staging-table .kb-staging-table-header .sorting:after,
.kb-staging-table .kb-staging-table-header .sorting_desc:after,
.kb-staging-table .kb-staging-table-header .sorting_asc:after {
display: none;
}

/* Special positioning for folder sort icon as there is no title*/
.kb-staging-table-header .kb-staging-table-header__file.sorting:before,
.kb-staging-table-header .kb-staging-table-header__file.sorting_desc:before,
.kb-staging-table-header .kb-staging-table-header__file.sorting_asc:before {
left: 9px;
}

.kb-staging-table .kb-staging-table-body td {
vertical-align: middle;
}

.kb-staging-table-body__expander {
text-align: center;
}

.kb-staging-table-body__decompress {
border: 1px solid #cccccc;
border-radius : 1px;
}

.kb-staging-table-body__name {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

.kb-staging-table-body__folder:hover {
cursor: pointer;
text-decoration: underline;
}

/* style for Import As dropdown container */

/* set the width here
otherwise it will get overriden by datatables when changing the sort order
it gets set directly on the element via inline css so we have to use important to override
*/

.kb-staging-table-body .select2 {
width: 160px !important;
margin: 4px 0;
}

/* TODO: can this class be merged with the one above? */
.kb-staging-table-body .kb-staging-table-body__import-dropdown {
height: 38px;
background: #FFFFFF;
border: 1px solid #DF0002;
box-sizing: border-box;
border-radius: 4px;
}

/* When user clicks into the dropdown or chooses a selection box change border color */
.select2-container--open .kb-staging-table-body__import-dropdown,
.select2-container--focus .kb-staging-table-body__import-dropdown,
.kb-staging-table-body__import-dropdown.kb-staging-table-body__import-type-selected {
border: 1px solid #C4C4C4;
}

/* style for Import As dropdown container text */
.kb-staging-table-body .kb-staging-table-body__import-dropdown .select2-selection__rendered {
position: absolute;
left: 8.87%;
right: 5.41%;
top: 30.95%;
bottom: 30.95%;
font-size: 14px;
line-height: 16px;
display: flex;
align-items: center;
color: #000000;
}

/* Import as dropdown placeholder text is red */
.kb-staging-table-body .kb-staging-table-body__import-dropdown .select2-selection__placeholder {
color: #DF0002;
}

/* Change placeholder color when user clicks in */
.kb-staging-table-body .select2-container--open .select2-selection__placeholder,
.select2-container--focus .select2-selection__placeholder {
color: #000000;
}

/* style for Import As dropdown container arrow */
.kb-staging-table-body .kb-staging-table-body__import-dropdown .select2-selection__arrow {
position: absolute;
height: 16px;
left: 87.76%;
right: 5.44%;
top: 30.95%;
bottom: 30.95%;
}

/* Before user makes a selection arrow is red */
.kb-staging-table-body .kb-staging-table-body__import-dropdown .select2-selection__arrow b {
border-color: #DF0002 transparent transparent transparent;
}

/* after user makes a selection, or when in focus, arrow is grey */
.kb-staging-table-body .kb-staging-table-body__import-dropdown:focus .select2-selection__arrow b,
.kb-staging-table-body .kb-staging-table-body__import-dropdown.kb-staging-table-body__import-type-selected .select2-selection__arrow b {
border-color: #888 transparent transparent transparent;
}

.kb-staging-table-body__download {
font-size: 9px;
margin-left: 5px;
}

.kb-staging-table-body__delete {
color: #4379B1;
background: none;
font-size: 16px;
line-height: 18.4px;
box-shadow: none;
}

.kb-staging-table-body__delete:hover,
.kb-staging-table-body__delete:active {
color: #286090;
background: none;
}

.kb-staging-table-notice {
font-family: Oxygen, Arial, sans-serif;
font-weight: bold;
font-size: 105%;
text-align: center;
background-color: #EEEEEE;
height: 32px;
padding: 8px;
}

.kb-staging-table-import__button {
width: 160px;
height: 42px;
border-radius: 4px;
font-family: Public Sans, Arial, sans-serif;
font-style: normal;
font-weight: bold;
font-size: 14px;
line-height: 16px;
position: absolute;
right: 10px;
bottom: -50px;
}

.kb-staging-table-import__button.kb-staging-table-import__button__disabled,
.kb-staging-table-import__button.kb-staging-table-import__button__disabled:active {
background-color: #8EAFD0;
}

.kb-staging-table-import__button.kb-staging-table-import__button__disabled:focus {
outline: none;
}

/* TODO: check in with design on positioning of tooltip, whether we want to display arrow */
.kb-staging-table-import .tooltip {
background: #FFF;
box-shadow: 2px 4px 6px rgba(0, 0, 0, 0.15);
border-radius: 4px;
}

.kb-staging-table-import .tooltip .tooltip-inner {
background: #FFF;
color: #000;
font-family: Public Sans, Arial, sans-serif;
font-style: normal;
font-weight: normal;
font-size: 12px;
line-height: 16px;
display: flex;
align-items: center;
width: 135px;
height: 56px;
}

.kb-staging-table-import .tooltip .tooltip-arrow {
display: none;
}
/*
END staging data table modifiers
*/

.kb-data-breadcrumb .kb-pointer a {
cursor: pointer;
}

.kb-data-staging__container {
height: 604px;
padding: 10px;
overflow-y: auto;
}

.kb-data-staging-metadata-list {
Expand Down Expand Up @@ -3326,7 +3534,6 @@ button.kb-data-obj {
/* End kbaseData.css */

/* styling for data import overlay */

.kb-import-content {
position: relative;
margin: 0 0 0 0;
Expand Down
Loading