-
Notifications
You must be signed in to change notification settings - Fork 2
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
Add a scrollbar to the duplicate import modal #71
Changes from 6 commits
7e20d4a
4ff29a6
c86dcbb
a8d4da0
83a8e63
465f7fe
31a0061
52902fb
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,31 +21,33 @@ | |
|
||
<div class="apos-import-duplicate__section"> | ||
<table class="apos-table"> | ||
<thead> | ||
<tr> | ||
Check warning on line 25 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 6.0)
Check warning on line 25 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 5.0)
Check warning on line 25 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 6.0)
Check warning on line 25 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 5.0)
Check warning on line 25 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 5.0)
Check warning on line 25 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 4.4)
Check warning on line 25 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 6.0)
Check warning on line 25 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 4.4)
|
||
<th class="apos-table__header"> | ||
Check warning on line 26 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 6.0)
Check warning on line 26 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 5.0)
Check warning on line 26 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 6.0)
Check warning on line 26 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 5.0)
Check warning on line 26 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 5.0)
Check warning on line 26 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 4.4)
Check warning on line 26 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 6.0)
Check warning on line 26 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 4.4)
|
||
<AposButton | ||
Check warning on line 27 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 6.0)
Check warning on line 27 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 5.0)
Check warning on line 27 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 6.0)
Check warning on line 27 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 5.0)
Check warning on line 27 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 5.0)
Check warning on line 27 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 4.4)
Check warning on line 27 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 6.0)
Check warning on line 27 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 4.4)
|
||
class="apos-toggle" | ||
Check warning on line 28 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 6.0)
Check warning on line 28 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 5.0)
Check warning on line 28 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 6.0)
Check warning on line 28 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 5.0)
Check warning on line 28 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 5.0)
Check warning on line 28 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 4.4)
Check warning on line 28 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 6.0)
Check warning on line 28 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 4.4)
|
||
:class="{ 'apos-toggle--blank': !checked.length }" | ||
Check warning on line 29 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 6.0)
Check warning on line 29 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 5.0)
Check warning on line 29 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 6.0)
Check warning on line 29 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 5.0)
Check warning on line 29 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 5.0)
Check warning on line 29 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 4.4)
Check warning on line 29 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 6.0)
Check warning on line 29 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 4.4)
|
||
data-apos-test="contextMenuTrigger" | ||
Check warning on line 30 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 6.0)
Check warning on line 30 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 5.0)
Check warning on line 30 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 6.0)
Check warning on line 30 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 5.0)
Check warning on line 30 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 5.0)
Check warning on line 30 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 4.4)
Check warning on line 30 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 6.0)
Check warning on line 30 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 4.4)
|
||
type="quiet" | ||
Check warning on line 31 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 6.0)
Check warning on line 31 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 5.0)
Check warning on line 31 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 6.0)
Check warning on line 31 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 5.0)
Check warning on line 31 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 5.0)
Check warning on line 31 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 4.4)
Check warning on line 31 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 6.0)
Check warning on line 31 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 4.4)
|
||
:text-color="checkboxIconColor" | ||
Check warning on line 32 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 6.0)
Check warning on line 32 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 5.0)
Check warning on line 32 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 6.0)
Check warning on line 32 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 5.0)
Check warning on line 32 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 5.0)
Check warning on line 32 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 4.4)
Check warning on line 32 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 6.0)
Check warning on line 32 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 4.4)
|
||
:icon="checkboxIcon" | ||
Check warning on line 33 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 6.0)
Check warning on line 33 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 5.0)
Check warning on line 33 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 6.0)
Check warning on line 33 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 5.0)
Check warning on line 33 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 5.0)
Check warning on line 33 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 4.4)
Check warning on line 33 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 6.0)
Check warning on line 33 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 4.4)
|
||
:icon-only="true" | ||
Check warning on line 34 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 6.0)
Check warning on line 34 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 5.0)
Check warning on line 34 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 6.0)
Check warning on line 34 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (20, 5.0)
Check warning on line 34 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 5.0)
Check warning on line 34 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 4.4)
Check warning on line 34 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (18, 6.0)
Check warning on line 34 in ui/apos/components/AposDuplicateImportModal.vue GitHub Actions / build (16, 4.4)
|
||
:icon-size="10" | ||
@click.stop="toggle" | ||
/> | ||
</th> | ||
<th class="apos-table__header"> | ||
{{ $t('aposImportExport:title') }} | ||
</th> | ||
<th class="apos-table__header"> | ||
{{ $t('aposImportExport:type') }} | ||
</th> | ||
<th class="apos-table__header"> | ||
{{ $t('aposImportExport:lastEdited') }} | ||
</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
<tr> | ||
<th class="apos-table__header"> | ||
<AposButton | ||
class="apos-toggle" | ||
:class="{ 'apos-toggle--blank': !checked.length }" | ||
data-apos-test="contextMenuTrigger" | ||
type="quiet" | ||
:text-color="checkboxIconColor" | ||
:icon="checkboxIcon" | ||
:icon-only="true" | ||
:icon-size="10" | ||
@click.stop="toggle" | ||
/> | ||
</th> | ||
<th class="apos-table__header"> | ||
{{ $t('aposImportExport:title') }} | ||
</th> | ||
<th class="apos-table__header"> | ||
{{ $t('aposImportExport:type') }} | ||
</th> | ||
<th class="apos-table__header"> | ||
{{ $t('aposImportExport:lastEdited') }} | ||
</th> | ||
</tr> | ||
<tr | ||
v-for="doc in duplicatedDocs" | ||
:key="doc.aposDocId" | ||
|
@@ -243,7 +245,7 @@ | |
: this.duplicatedDocs.map(({ aposDocId }) => aposDocId); | ||
}, | ||
docLabel(doc) { | ||
const moduleOptions = apos.modules[this.type]; | ||
const moduleOptions = apos.modules[doc.type]; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes! 👌 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks |
||
|
||
return moduleOptions?.label | ||
? this.$t(moduleOptions?.label) | ||
|
@@ -323,6 +325,15 @@ | |
display: flex; | ||
flex-direction: column; | ||
align-items: baseline; | ||
max-height: 210px; | ||
overflow-y: auto; | ||
} | ||
|
||
.apos-import-duplicate__section thead { | ||
position: sticky; | ||
top: 0; | ||
z-index: 1; | ||
background-color: var(--a-background-primary); | ||
} | ||
|
||
.apos-import-duplicate__section .apos-table__header { | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks