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

Finish implementing EntityUpload except for warnings #961

Merged
merged 29 commits into from
Apr 19, 2024
Merged

Finish implementing EntityUpload except for warnings #961

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
66f0b00
Add icons for pagination
matthew-white Mar 18, 2024
6ddb404
Add tables to EntityUpload
matthew-white Mar 18, 2024
8b0f800
Merge branch 'master' into upload-tables
matthew-white Mar 19, 2024
f9972ba
Make changes related to tables in EntityUpload
matthew-white Mar 19, 2024
4e2dcf1
Parse entities CSV file
matthew-white Mar 19, 2024
5c93766
Handle empty rows
matthew-white Mar 27, 2024
5c92fdd
Handle empty file when parsing header
matthew-white Apr 10, 2024
d5dd800
Support additional delimiters
matthew-white Apr 10, 2024
4b55f6c
Replace .close with .icon-trash
matthew-white Apr 10, 2024
1138759
Add timestamp to filename of data template
matthew-white Apr 10, 2024
097e071
Make small changes
matthew-white Apr 10, 2024
438b824
Do not set max-height in EntityUploadTable
matthew-white Apr 10, 2024
2fdd260
Move panels from EntityUploadTable to EntityUpload
matthew-white Apr 10, 2024
0c0c1ac
Remove #entity-upload-popups, moving code to EntityUploadPopup
matthew-white Apr 10, 2024
5efb8dd
Increase threshold for largeCell warning
matthew-white Apr 10, 2024
3364a6b
Rename EntityUploadHelp and EntityUploadErrors to be about header
matthew-white Apr 11, 2024
de87a76
Show data error in its own panel
matthew-white Apr 11, 2024
3acaae6
Return warning if delimiter is not a comma
matthew-white Apr 12, 2024
9bf3f4a
Pass warnings to EntityUploadWarnings
matthew-white Apr 12, 2024
d5183e6
Move EntityUploadPopup so its focus order is before .modal-actions
matthew-white Apr 12, 2024
803bd0e
Improve how min-height is set in EntityUploadTable
matthew-white Apr 12, 2024
ccc7cb3
Convert Modal to Composition API
matthew-white Apr 12, 2024
c21d91f
Prevent mutation loop in Modal rather than using throttle()
matthew-white Apr 12, 2024
fec2505
Use built-in formatRange() rather than translating punctuation
matthew-white Apr 12, 2024
349d60b
testRequests(): accept function for url
matthew-white Apr 12, 2024
177ab07
Merge branch 'master' into upload-tables
matthew-white Apr 15, 2024
e46703e
Make small changes
matthew-white Apr 17, 2024
1f61fc7
Add some tests of EntityUploadTable
matthew-white Apr 17, 2024
38c5718
Make small changes after code review
matthew-white Apr 19, 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
109 changes: 95 additions & 14 deletions icomoon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,14 +1699,14 @@
"attrs": [],
"properties": {
"name": "info-circle",
"id": 89,
"id": 61,
"order": 5,
"prevSize": 28,
"code": 61530
},
"setIdx": 1,
"setId": 3,
"iconIdx": 89
"setIdx": 0,
"setId": 2,
"iconIdx": 61
},
{
"icon": {
Expand All @@ -1726,14 +1726,14 @@
"attrs": [],
"properties": {
"name": "exclamation-circle",
"id": 101,
"id": 62,
"order": 4,
"prevSize": 28,
"code": 61546
},
"setIdx": 1,
"setId": 3,
"iconIdx": 101
"setIdx": 0,
"setId": 2,
"iconIdx": 62
},
{
"icon": {
Expand All @@ -1753,14 +1753,14 @@
"attrs": [],
"properties": {
"name": "random",
"id": 110,
"id": 63,
"order": 2,
"prevSize": 28,
"code": 61556
},
"setIdx": 1,
"setId": 3,
"iconIdx": 110
"setIdx": 0,
"setId": 2,
"iconIdx": 63
},
{
"icon": {
Expand All @@ -1780,14 +1780,95 @@
"attrs": [],
"properties": {
"name": "external-link-square",
"id": 298,
"id": 64,
"order": 6,
"prevSize": 28,
"code": 61772
},
"setIdx": 0,
"setId": 2,
"iconIdx": 64
},
{
"icon": {
"paths": [
"M358.286 786.286c0 4.571-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8.571 5.714 13.143s-2.286 9.714-5.714 13.143l-224.571 224.571 224.571 224.571c3.429 3.429 5.714 8.571 5.714 13.143zM577.714 786.286c0 4.571-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8.571 5.714 13.143s-2.286 9.714-5.714 13.143l-224.571 224.571 224.571 224.571c3.429 3.429 5.714 8.571 5.714 13.143z"
],
"width": 603.4285714285714,
"attrs": [],
"isMulticolor": false,
"isMulticolor2": false,
"tags": [
"angle-double-left"
],
"defaultCode": 61696,
"grid": 14
},
"attrs": [],
"properties": {
"name": "angle-double-left",
"id": 229,
"order": 3,
"prevSize": 28,
"code": 61696
},
"setIdx": 1,
"setId": 3,
"iconIdx": 229
},
{
"icon": {
"paths": [
"M340 548.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l224.571-224.571-224.571-224.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143zM559.429 548.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l224.571-224.571-224.571-224.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z"
],
"width": 566.8571428571428,
"attrs": [],
"isMulticolor": false,
"isMulticolor2": false,
"tags": [
"angle-double-right"
],
"defaultCode": 61697,
"grid": 14
},
"attrs": [],
"properties": {
"name": "angle-double-right",
"id": 230,
"order": 4,
"prevSize": 28,
"code": 61697
},
"setIdx": 1,
"setId": 3,
"iconIdx": 230
},
{
"icon": {
"paths": [
"M358.286 310.857c0 4.571-2.286 9.714-5.714 13.143l-224.571 224.571 224.571 224.571c3.429 3.429 5.714 8.571 5.714 13.143s-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8 5.714 13.143z"
],
"width": 384,
"attrs": [],
"isMulticolor": false,
"isMulticolor2": false,
"tags": [
"angle-left"
],
"defaultCode": 61700,
"grid": 14
},
"attrs": [],
"properties": {
"name": "angle-left",
"id": 233,
"order": 2,
"prevSize": 28,
"code": 61700
},
"setIdx": 1,
"setId": 3,
"iconIdx": 298
"iconIdx": 233
}
],
"height": 1024,
Expand Down
3 changes: 3 additions & 0 deletions public/fonts/icomoon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/fonts/icomoon.ttf
View file
Open in desktop
Binary file not shown.
Binary file modified public/fonts/icomoon.woff
View file
Open in desktop
Binary file not shown.
50 changes: 0 additions & 50 deletions src/assets/css/bootstrap.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 13 additions & 4 deletions src/assets/css/icomoon.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@font-face {
font-family: 'icomoon';
src:
url('/fonts/icomoon.ttf?chm9v') format('truetype'),
url('/fonts/icomoon.woff?chm9v') format('woff'),
url('/fonts/icomoon.svg?chm9v#icomoon') format('svg');
url('/fonts/icomoon.ttf?z7okxk') format('truetype'),
url('/fonts/icomoon.woff?z7okxk') format('woff'),
url('/fonts/icomoon.svg?z7okxk#icomoon') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
Expand Down Expand Up @@ -251,4 +251,13 @@
}
.icon-external-link-square:before {
content: "\f14c";
}
}
.icon-angle-double-left:before {
content: "\f100";
}
.icon-angle-double-right:before {
content: "\f101";
}
.icon-angle-left:before {
content: "\f104";
}
5 changes: 5 additions & 0 deletions src/assets/scss/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
li { margin-bottom: 5px; }
}

@mixin form-control-background {
background-color: #eee;
.panel-body &, .modal-body & { background-color: #f7f7f7; }
}

@mixin clearfix {
&::before, &::after {
content: " ";
Expand Down
3 changes: 1 addition & 2 deletions src/assets/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ $color-action-background-disabled: #999;
$color-action-overlay: #0096c1;
$color-input: #555;
$color-input-inactive: #777;
$color-input-background: #eee;
$color-panel-input-background: #f7f7f7;
$font-size-btn: 12px;
$hpadding-btn: 10px;
$padding-bottom-btn: 5px;
Expand Down Expand Up @@ -81,6 +79,7 @@ $padding-top-table-data: 8px;

// Panels
$box-shadow-panel-main: 0 0 24px rgba(0, 0, 0, 0.25), 0 35px 115px rgba(0, 0, 0, 0.28);
$padding-panel-body: 15px;

// Navs
$hpadding-nav-tab: 8px;
Expand Down
Loading