Skip to content

Complete User migration settings UI #97

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

Merged
PVince81 merged 24 commits into from
Apr 13, 2022
Merged

Complete User migration settings UI #97

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
965efff
Note that data may be overwritten on import
Pytal Apr 12, 2022
7c1efe2
Add logger
Pytal Apr 12, 2022
dc979ff
Remove unused page controller
Pytal Apr 12, 2022
aa296c8
Fix translations
Pytal Apr 12, 2022
9e1a7d5
Remove unused constant
Pytal Apr 12, 2022
35ce7b6
Fix translations
Pytal Apr 12, 2022
60b1c1e
Remove unused constant
Pytal Apr 12, 2022
a15204e
Start with empty selected migrators array
Pytal Apr 12, 2022
ff422f6
Increase priority
Pytal Apr 12, 2022
b7e2206
Remove deleted files from FilesMigrator description
Pytal Apr 12, 2022
bb13729
Add refresh status event
Pytal Apr 12, 2022
b271765
Update grid item size and spacing
Pytal Apr 12, 2022
9ccd2ec
Show error dialog on failure to fetch migrators or status
Pytal Apr 12, 2022
433f4c5
Show error dialog on export failure
Pytal Apr 12, 2022
9404483
Show error dialog on import file picker failure
Pytal Apr 12, 2022
d0e9a9d
Add spinner and update export modal state handling and styles
Pytal Apr 12, 2022
782432a
Update wording
Pytal Apr 12, 2022
1b1079b
Add readable status to API response
Pytal Apr 12, 2022
fb39041
Handle export status changes
Pytal Apr 13, 2022
22a3ba3
Cleanup export section
Pytal Apr 13, 2022
42b1723
Handle import status changes
Pytal Apr 13, 2022
71a97b0
Use min and max for grid columns
Pytal Apr 13, 2022
d48600d
Resolve style warnings
Pytal Apr 13, 2022
4d76488
Build js
Pytal Apr 13, 2022
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
Prev Previous commit
Next Next commit
Resolve style warnings 
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
@Pytal
Pytal committed Apr 13, 2022
commit d48600d5726a6f26bac686ac8b39946854952477
32 changes: 17 additions & 15 deletions src/components/ExportSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
<div class="section">
<h2>{{ t('user_migration', 'Export') }}</h2>

<h3 class="settings-hint">{{ t('user_migration', 'Please select the data you want to export') }}</h3>
<h3 class="settings-hint">
{{ t('user_migration', 'Please select the data you want to export') }}
</h3>

<div class="section__grid">
<!-- Base user data is permanently enabled -->
Expand All @@ -36,8 +38,8 @@
<em class="section__description">{{ t('user_migration', 'Basic user information including user ID and display name as well as your settings') }}</em>
</div>
<div v-for="({id, displayName, description}) in sortedMigrators"
class="section__checkbox"
:key="id">
:key="id"
class="section__checkbox">
<CheckboxRadioSwitch name="migrators"
:value="id"
:checked.sync="selectedMigrators">
Expand All @@ -57,7 +59,7 @@
</template>
{{ t('user_migration', 'Export') }}
</Button>
<div class="section__status" v-else>
<div v-else class="section__status">
<Button type="secondary"
:aria-label="t('user_migration', 'Show export status')"
:disabled="status.current === 'import'"
Expand Down Expand Up @@ -108,6 +110,15 @@ import { APP_ID } from '../shared/constants'
export default {
name: 'ExportSection',

components: {
Button,
CheckboxRadioSwitch,
CheckCircleOutline,
EmptyContent,
Modal,
PackageDown,
},

props: {
migrators: {
type: Array,
Expand All @@ -119,15 +130,6 @@ export default {
},
},

components: {
Button,
CheckboxRadioSwitch,
CheckCircleOutline,
EmptyContent,
Modal,
PackageDown,
},

data() {
return {
modalOpened: false,
Expand All @@ -148,7 +150,7 @@ export default {
sortedMigrators() {
// TODO sort migrators?
return this.migrators
}
},
},

methods: {
Expand Down Expand Up @@ -199,7 +201,7 @@ export default {

.settings-hint {
margin: auto 0;
};
}
}

.section__modal {
Expand Down
22 changes: 12 additions & 10 deletions src/components/ImportSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
<div class="section">
<h2>{{ t('user_migration', 'Import') }}</h2>

<h3 class="section__hint settings-hint">{{ t('user_migration', 'Please note that existing data may be overwritten') }}</h3>
<h3 class="section__hint settings-hint">
{{ t('user_migration', 'Please note that existing data may be overwritten') }}
</h3>

<!-- TODO use server API -->

Expand All @@ -38,7 +40,7 @@
</template>
{{ t('user_migration', 'Import') }}
</Button>
<div class="section__status" v-else>
<div v-else class="section__status">
<Button type="secondary"
:aria-label="t('user_migration', 'Show import status')"
:disabled="status.current === 'export'"
Expand Down Expand Up @@ -94,13 +96,6 @@ const picker = getFilePickerBuilder(t('user_migration', 'Choose a file to import
export default {
name: 'ImportSection',

props: {
status: {
type: Object,
default: () => ({}),
},
},

components: {
Button,
CheckCircleOutline,
Expand All @@ -109,6 +104,13 @@ export default {
PackageUp,
},

props: {
status: {
type: Object,
default: () => ({}),
},
},

data() {
return {
modalOpened: false,
Expand Down Expand Up @@ -176,7 +178,7 @@ export default {

.settings-hint {
margin: auto 0;
};
}
}

.section__picker-error {
Expand Down
2 changes: 1 addition & 1 deletion src/views/Personal/Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ export default {
onRefreshStatus() {
this.fetchStatus()
},
}
},
}
</script>