Skip to content

fix: migrate conflictpicker to NcDialog and remove incorrect semantic closing icon #1113

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
emoral435 merged 3 commits into from
Mar 15, 2024
Merged

fix: migrate conflictpicker to NcDialog and remove incorrect semantic closing icon #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf69d9c
fix: migrate conflictpicker to NcDialog and remove incorrect semantic…
emoral435 Mar 13, 2024
1a78911
fix: added name to ConflictPicker dialog
emoral435 Mar 14, 2024
87da200
fix(cypress): updated cypress tests to new ConflictPicker dialog
emoral435 Mar 15, 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
4 changes: 2 additions & 2 deletions cypress/components/ConflictPicker.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ describe('ConflictPicker rendering', { testIsolation: true }, () => {
cy.get('[data-cy-conflict-picker-fieldset="all"]').should('exist')
cy.get('[data-cy-conflict-picker-fieldset="image.jpg"]').should('exist')

cy.get('[data-cy-conflict-picker-skip]').should('be.visible')
cy.get('[data-cy-conflict-picker-skip]').scrollIntoView().should('be.visible')
cy.get('[data-cy-conflict-picker-submit]').should('be.visible')

// Force close and cancel
cy.get('[data-cy-conflict-picker] .modal-container__close').click({ force: true })
cy.get('[data-cy-conflict-picker-skip]').click({ force: true })
})
})

Expand Down
14 changes: 7 additions & 7 deletions lib/components/ConflictPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<template>
<NcModal class="conflict-picker"
<NcDialog class="conflict-picker"
data-cy-conflict-picker
:close-on-click-outside="false"
:can-close="false"
:show="opened"
:name="name"
size="large"
@close="onCancel">
<!-- Header -->
<div class="conflict-picker__header">
<h2 class="conflict-picker__title" v-text="name" />

<!-- Description -->
<p id="conflict-picker-description" class="conflict-picker__description">
{{ t('Which files do you want to keep?') }}<br>
Expand Down Expand Up @@ -67,7 +67,7 @@
{{ t('Continue') }}
</NcButton>
</div>
</NcModal>
</NcDialog>
</template>

<script lang="ts">
Expand All @@ -81,7 +81,7 @@ import Vue from 'vue'

import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
import ArrowRight from 'vue-material-design-icons/ArrowRight.vue'
import Close from 'vue-material-design-icons/Close.vue'

Expand All @@ -99,7 +99,7 @@ export default Vue.extend({
Close,
NcButton,
NcCheckboxRadioSwitch,
NcModal,
NcDialog,
NodesPicker,
},

Expand Down Expand Up @@ -372,7 +372,7 @@ export default Vue.extend({
position: sticky;
z-index: 10;
top: 0;
padding: var(--margin);
padding: 0 var(--margin);
Copy link
Contributor Author

@emoral435 emoral435 Mar 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lessen the padding for the header, as without this, the header has more padding than previously and looks really bloated

padding-bottom: 0;
}

Expand Down