Skip to content

Replace PrimaryDialog with KModal (and remove it along with DialogBox) #2984

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
rtibbles merged 6 commits into from
Feb 24, 2021
Merged

Replace PrimaryDialog with KModal (and remove it along with DialogBox) #2984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3756082
PrimaryDialog -> KModal in ChannelItem.vue
nucleogenesis Feb 10, 2021
81c9025
pass the delete button test
nucleogenesis Feb 10, 2021
8bf339e
Remove PrimaryDialog from SyncResourcesModal & CatalogFilterBar
nucleogenesis Feb 22, 2021
1221b77
Remove PrimaryDialog from ChannelTokenModal
nucleogenesis Feb 22, 2021
fbb8943
Remove PrimaryDialog and DialogBox from codebase as they are unused.
nucleogenesis Feb 22, 2021
8f281cc
Remove unnecessary test data from CatalogFilterBar
nucleogenesis Feb 22, 2021
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
43 changes: 19 additions & 24 deletions contentcuration/contentcuration/frontend/channelEdit/views/sync/SyncResourcesModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@

<div>
<!-- STEP 1 of 3: Sync dialog -->
<PrimaryDialog v-model="syncModal" :title="$tr('syncModalTitle')" lazy>
<KModal
v-if="syncModal"
:title="$tr('syncModalTitle')"
:submitDisabled="!continueAllowed"
:submitText="$tr('continueButtonLabel')"
:cancelText="$tr('cancelButtonLabel')"
@cancel="syncModal = false"
@submit="handleContinue"
>
<VList subheader two-line>
<VSubheader>{{ $tr('syncModalExplainer') }}</VSubheader>

Expand Down Expand Up @@ -47,19 +55,17 @@
</VListTile>
</VList>
<VSpacer />
<template v-slot:actions>
<VSpacer />
<VBtn flat @click="syncModal = false">
{{ $tr('cancelButtonLabel') }}
</VBtn>
<VBtn color="primary" :disabled="!continueAllowed" @click="handleContinue">
{{ $tr('continueButtonLabel') }}
</VBtn>
</template>
</PrimaryDialog>
</KModal>

<!-- STEP 2 of 3: Confirm sync dialog -->
<PrimaryDialog v-model="confirmSyncModal" :title="$tr('confirmSyncModalTitle')" lazy>
<KModal
v-if="confirmSyncModal"
:title="$tr('confirmSyncModalTitle')"
:submitText="$tr('syncButtonLabel')"
:cancelText="$tr('backButtonLabel')"
@cancel="handleBack"
@submit="handleSync"
>
<VSubheader>{{ $tr('confirmSyncModalExplainer') }}</VSubheader>
<VCardText>
<ul class="mb-4 ml-3 mt-2">
Expand All @@ -78,16 +84,7 @@
</ul>
</VCardText>
<VSpacer />
<template v-slot:actions>
<VSpacer />
<VBtn flat @click="handleBack">
{{ $tr('backButtonLabel') }}
</VBtn>
<VBtn color="primary" @click="handleSync">
{{ $tr('syncButtonLabel') }}
</VBtn>
</template>
</PrimaryDialog>
</KModal>

<!-- STEP 3 of 3: Syncing progress dialog -->
<!-- Handled by the asyncTasksModule, see channelEdit/vuex/task/index.js -->
Expand All @@ -99,12 +96,10 @@

import { Channel } from 'shared/data/resources';
import Checkbox from 'shared/views/form/Checkbox';
import PrimaryDialog from 'shared/views/PrimaryDialog';

export default {
name: 'SyncResourcesModal',
components: {
PrimaryDialog,
Checkbox,
},
props: {
Expand Down
18 changes: 7 additions & 11 deletions contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilterBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,18 @@
</VFlex>
</VLayout>

<PrimaryDialog
<KModal
v-if="displayToken"
:value="Boolean(displayToken)"
:title="$tr('copyTitle')"
:text="$tr('copyTokenInstructions')"
:cancelText="$tr('close')"
@cancel="displayToken = null"
>
<div class="mb-3">
{{ $tr('copyTokenInstructions') }}
</div>
<CopyToken :token="displayToken" />
<template #actions>
<VSpacer />
<VBtn color="greyBackground" @click="displayToken = null">
{{ $tr('close') }}
</VBtn>
</template>
</PrimaryDialog>
</KModal>

</div>
</VContainer>
Expand All @@ -93,7 +91,6 @@
import { catalogFilterMixin } from './mixins';
import { constantsTranslationMixin } from 'shared/mixins';
import IconButton from 'shared/views/IconButton';
import PrimaryDialog from 'shared/views/PrimaryDialog';
import CopyToken from 'shared/views/CopyToken';

const publicCollections = window.publicCollections || [];
Expand All @@ -113,7 +110,6 @@
name: 'CatalogFilterBar',
components: {
IconButton,
PrimaryDialog,
CopyToken,
},
mixins: [constantsTranslationMixin, catalogFilterMixin],
Expand Down
Loading