Skip to content

re-style upload page #716

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

re-style upload page #716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 25 additions & 13 deletions src/views/BulkUpload.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@
</div>
</ion-list>

<ion-list>
<ion-list-header>{{ translate("Select the following columns from the uploaded CSV") }}</ion-list-header>

<ion-item-divider>
<ion-list class="field-mappings">
<ion-item-divider color="light">
<ion-label>{{ translate("Required") }} </ion-label>
</ion-item-divider>
<ion-item :key="field" v-for="(fieldValues, field) in getFilteredFields(fields, true)">
Expand All @@ -44,7 +42,7 @@
<ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
</ion-select>
</ion-item>
<ion-item-divider>
<ion-item-divider color="light">
<ion-label>{{ translate("Optional") }} </ion-label>
</ion-item-divider>
<ion-item :key="field" v-for="(fieldValues, field) in getFilteredFields(fields, false)">
Expand All @@ -70,9 +68,9 @@
<p class="overline">{{ systemMessage.systemMessageId }}</p>
{{ extractFilename(systemMessage.messageText) }}
</ion-label>
<div class="system-message-action">
<ion-note slot="end">{{ getFileProcessingStatus(systemMessage) }}</ion-note>
<ion-button slot="end" fill="clear" color="medium" @click="openUploadActionPopover($event, systemMessage)">
<div slot="end" class="system-message-action">
<ion-note>{{ getFileProcessingStatus(systemMessage) }}</ion-note>
<ion-button fill="clear" color="medium" @click="openUploadActionPopover($event, systemMessage)">
<ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" />
</ion-button>
</div>
Expand Down Expand Up @@ -108,7 +106,7 @@
modalController,
popoverController
} from '@ionic/vue';
import { addOutline, cloudUploadOutline, ellipsisVerticalOutline, trashBinOutline } from "ionicons/icons";

Check warning on line 109 in src/views/BulkUpload.vue

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (20.x) 

'trashBinOutline' is defined but never used

Check warning on line 109 in src/views/BulkUpload.vue

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (18.x) 

'trashBinOutline' is defined but never used
import { translate } from '@/i18n';
import { computed, ref } from "vue";
import { useStore } from 'vuex';
Expand Down Expand Up @@ -312,14 +310,28 @@
</script>
<style scoped>
.main {
max-width: 732px;
max-width: 560px;
margin: var(--spacer-sm) auto 0;
}

.field-mappings {
border: 1px solid var(--ion-color-medium);
border-radius: 8px;
margin-block: var(--spacer-lg);
}

.field-mappings ion-select::part(label) {
max-width: 100%;
}

.field-mappings ion-select ion-label {
padding-block: var(--spacer-xs)
}

.system-message-section {
margin-bottom: 16px;
margin-bottom: var(--spacer-sm);
}
.system-message-action {
display: flex;
align-items: center;
.system-message-action>ion-button {
vertical-align: middle;
}
</style>
Loading