mirror of
https://github.com/nextcloud/tables.git
synced 2025-07-22 18:28:09 +00:00
Migrate NcModal
to NcDialog
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
This commit is contained in:

committed by
Julius Härtl

parent
6b20bffe53
commit
41148d09a5
@ -7,7 +7,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.modal__content {
|
.modal__content {
|
||||||
padding: 20px;
|
padding: 0 0 20px 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.modal__content h2 {
|
.modal__content h2 {
|
||||||
|
@ -30,10 +30,11 @@ describe('Test column ' + columnTitle, () => {
|
|||||||
|
|
||||||
// check if default value is set on row creation
|
// check if default value is set on row creation
|
||||||
cy.get('button').contains('Create row').click()
|
cy.get('button').contains('Create row').click()
|
||||||
cy.get('.modal__content h2').contains('Create row').should('be.visible')
|
cy.get('.modal-container__content h2').contains('Create row').should('be.visible')
|
||||||
cy.get('.modal__content .title').contains(columnTitle).should('be.visible')
|
cy.get('.modal__content .title').contains(columnTitle).should('be.visible')
|
||||||
cy.get('.modal__content span[title="first option"]').should('be.visible')
|
cy.get('.modal__content span[title="first option"]').should('be.visible')
|
||||||
cy.get('.modal__content span[title="second option"]').should('be.visible')
|
cy.get('.modal__content span[title="second option"]').should('be.visible')
|
||||||
|
cy.get('.modal__content .title').click() // focus out of the multiselect
|
||||||
cy.get('button').contains('Save').click()
|
cy.get('button').contains('Save').click()
|
||||||
cy.get('.custom-table table tr td div').contains('first option').should('be.visible')
|
cy.get('.custom-table table tr td div').contains('first option').should('be.visible')
|
||||||
cy.get('.custom-table table tr td div').contains('second option').should('be.visible')
|
cy.get('.custom-table table tr td div').contains('second option').should('be.visible')
|
||||||
@ -44,6 +45,7 @@ describe('Test column ' + columnTitle, () => {
|
|||||||
cy.get('.vs--multiple .vs__selected button').first().click()
|
cy.get('.vs--multiple .vs__selected button').first().click()
|
||||||
cy.get('.modal__content .slot input').first().click()
|
cy.get('.modal__content .slot input').first().click()
|
||||||
cy.get('ul.vs__dropdown-menu li span[title="👋 third option"]').click()
|
cy.get('ul.vs__dropdown-menu li span[title="👋 third option"]').click()
|
||||||
|
cy.get('.modal__content .title').click() // focus out of the multiselect
|
||||||
cy.get('button').contains('Save').click()
|
cy.get('button').contains('Save').click()
|
||||||
cy.get('.custom-table table tr td div').contains('third option').should('be.visible')
|
cy.get('.custom-table table tr td div').contains('third option').should('be.visible')
|
||||||
|
|
||||||
@ -58,6 +60,7 @@ describe('Test column ' + columnTitle, () => {
|
|||||||
cy.get('.NcTable tr td button').first().click()
|
cy.get('.NcTable tr td button').first().click()
|
||||||
cy.get('.modal__content .slot input').first().click()
|
cy.get('.modal__content .slot input').first().click()
|
||||||
cy.get('ul.vs__dropdown-menu li span[title="first option"]').click()
|
cy.get('ul.vs__dropdown-menu li span[title="first option"]').click()
|
||||||
|
cy.get('.modal__content .title').click() // focus out of the multiselect
|
||||||
cy.get('button').contains('Save').click()
|
cy.get('button').contains('Save').click()
|
||||||
cy.get('.custom-table table tr td div').contains('first option').should('be.visible')
|
cy.get('.custom-table table tr td div').contains('first option').should('be.visible')
|
||||||
cy.get('.custom-table table tr td div').contains('third option').should('be.visible')
|
cy.get('.custom-table table tr td div').contains('third option').should('be.visible')
|
||||||
@ -76,7 +79,7 @@ describe('Test column ' + columnTitle, () => {
|
|||||||
|
|
||||||
// check if default value is set on row creation
|
// check if default value is set on row creation
|
||||||
cy.get('button').contains('Create row').click()
|
cy.get('button').contains('Create row').click()
|
||||||
cy.get('.modal__content h2').contains('Create row').should('be.visible')
|
cy.get('.modal-container__content h2').contains('Create row').should('be.visible')
|
||||||
cy.get('button').contains('Save').click()
|
cy.get('button').contains('Save').click()
|
||||||
cy.get('.custom-table table tr td div').should('exist')
|
cy.get('.custom-table table tr td div').should('exist')
|
||||||
cy.get('.NcTable tr td button').should('exist')
|
cy.get('.NcTable tr td button').should('exist')
|
||||||
|
@ -30,7 +30,7 @@ describe('Test column ' + columnTitle, () => {
|
|||||||
|
|
||||||
// check if default value is set on row creation
|
// check if default value is set on row creation
|
||||||
cy.get('button').contains('Create row').click()
|
cy.get('button').contains('Create row').click()
|
||||||
cy.get('.modal__content h2').contains('Create row').should('be.visible')
|
cy.get('.modal-container__content h2').contains('Create row').should('be.visible')
|
||||||
cy.get('.modal__content .title').contains(columnTitle).should('be.visible')
|
cy.get('.modal__content .title').contains(columnTitle).should('be.visible')
|
||||||
cy.get('.modal__content .title').click()
|
cy.get('.modal__content .title').click()
|
||||||
cy.get('.vs__dropdown-toggle .vs__selected span[title="second option"]').should('exist')
|
cy.get('.vs__dropdown-toggle .vs__selected span[title="second option"]').should('exist')
|
||||||
@ -71,7 +71,7 @@ describe('Test column ' + columnTitle, () => {
|
|||||||
|
|
||||||
// check if default value is set on row creation
|
// check if default value is set on row creation
|
||||||
cy.get('button').contains('Create row').click()
|
cy.get('button').contains('Create row').click()
|
||||||
cy.get('.modal__content h2').contains('Create row').should('be.visible')
|
cy.get('.modal-container__content h2').contains('Create row').should('be.visible')
|
||||||
cy.get('button').contains('Save').click()
|
cy.get('button').contains('Save').click()
|
||||||
cy.get('.custom-table table tr td div').should('exist')
|
cy.get('.custom-table table tr td div').should('exist')
|
||||||
cy.get('.NcTable tr td button').should('exist')
|
cy.get('.NcTable tr td button').should('exist')
|
||||||
|
@ -30,7 +30,7 @@ describe('Test column text line', () => {
|
|||||||
|
|
||||||
// check if default value is set on row creation
|
// check if default value is set on row creation
|
||||||
cy.get('button').contains('Create row').click()
|
cy.get('button').contains('Create row').click()
|
||||||
cy.get('.modal__content h2').contains('Create row').should('be.visible')
|
cy.get('.modal-container__content h2').contains('Create row').should('be.visible')
|
||||||
cy.get('.modal__content .title').contains('text line').should('be.visible')
|
cy.get('.modal__content .title').contains('text line').should('be.visible')
|
||||||
cy.get('.modal__content input').first().should('be.visible')
|
cy.get('.modal__content input').first().should('be.visible')
|
||||||
cy.get('.modal__content input').first().clear().type('hello world')
|
cy.get('.modal__content input').first().clear().type('hello world')
|
||||||
|
@ -20,5 +20,6 @@
|
|||||||
import './commands.js'
|
import './commands.js'
|
||||||
|
|
||||||
Cypress.on('uncaught:exception', (err) => {
|
Cypress.on('uncaught:exception', (err) => {
|
||||||
return !err.message.includes('ResizeObserver loop limit exceeded')
|
return !err.message.includes('ResizeObserver loop limit exceeded') &&
|
||||||
|
!err.message.includes('ResizeObserver loop completed with undelivered notifications')
|
||||||
})
|
})
|
@ -3,13 +3,12 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal v-if="showModal" size="large" @close="actionCancel">
|
<NcDialog v-if="showModal"
|
||||||
|
:name="t('tables', 'Create column')"
|
||||||
|
size="large"
|
||||||
|
@closing="actionCancel">
|
||||||
<div class="modal__content create-column">
|
<div class="modal__content create-column">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-4">
|
|
||||||
<h2>{{ t('tables', 'Create column') }}</h2>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="fix-col-2">
|
<div class="fix-col-2">
|
||||||
<MainForm :description.sync="column.description"
|
<MainForm :description.sync="column.description"
|
||||||
:mandatory.sync="column.mandatory"
|
:mandatory.sync="column.mandatory"
|
||||||
@ -88,7 +87,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@ -103,7 +102,7 @@ import MainForm from '../../shared/components/ncTable/partials/columnTypePartial
|
|||||||
import DatetimeForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/DatetimeForm.vue'
|
import DatetimeForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/DatetimeForm.vue'
|
||||||
import DatetimeDateForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/DatetimeDateForm.vue'
|
import DatetimeDateForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/DatetimeDateForm.vue'
|
||||||
import DatetimeTimeForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/DatetimeTimeForm.vue'
|
import DatetimeTimeForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/DatetimeTimeForm.vue'
|
||||||
import { NcModal, NcCheckboxRadioSwitch } from '@nextcloud/vue'
|
import { NcDialog, NcCheckboxRadioSwitch } from '@nextcloud/vue'
|
||||||
import SelectionForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/SelectionForm.vue'
|
import SelectionForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/SelectionForm.vue'
|
||||||
import SelectionMultiForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/SelectionMultiForm.vue'
|
import SelectionMultiForm from '../../shared/components/ncTable/partials/columnTypePartials/forms/SelectionMultiForm.vue'
|
||||||
import { showError, showInfo, showSuccess, showWarning } from '@nextcloud/dialogs'
|
import { showError, showInfo, showSuccess, showWarning } from '@nextcloud/dialogs'
|
||||||
@ -117,7 +116,7 @@ export default {
|
|||||||
name: 'CreateColumn',
|
name: 'CreateColumn',
|
||||||
components: {
|
components: {
|
||||||
ColumnTypeSelection,
|
ColumnTypeSelection,
|
||||||
NcModal,
|
NcDialog,
|
||||||
NumberForm,
|
NumberForm,
|
||||||
TextLineForm,
|
TextLineForm,
|
||||||
TextLinkForm,
|
TextLinkForm,
|
||||||
|
@ -3,13 +3,12 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal v-if="showModal" size="normal" data-cy="createContextModal" @close="actionCancel">
|
<NcDialog v-if="showModal"
|
||||||
|
:name="t('tables', 'Create an application')"
|
||||||
|
size="normal"
|
||||||
|
data-cy="createContextModal"
|
||||||
|
@closing="actionCancel">
|
||||||
<div class="modal__content">
|
<div class="modal__content">
|
||||||
<div class="row">
|
|
||||||
<div class="col-4">
|
|
||||||
<h2>{{ t('tables', 'Create an application') }}</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row space-T">
|
<div class="row space-T">
|
||||||
<div class="col-4 mandatory">
|
<div class="col-4 mandatory">
|
||||||
{{ t('tables', 'Title') }}
|
{{ t('tables', 'Title') }}
|
||||||
@ -51,11 +50,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcModal, NcButton, NcIconSvgWrapper } from '@nextcloud/vue'
|
import { NcDialog, NcButton, NcIconSvgWrapper } from '@nextcloud/vue'
|
||||||
import { showError } from '@nextcloud/dialogs'
|
import { showError } from '@nextcloud/dialogs'
|
||||||
import '@nextcloud/dialogs/style.css'
|
import '@nextcloud/dialogs/style.css'
|
||||||
import NcContextResource from '../../shared/components/ncContextResource/NcContextResource.vue'
|
import NcContextResource from '../../shared/components/ncContextResource/NcContextResource.vue'
|
||||||
@ -66,7 +65,7 @@ import permissionBitmask from '../../shared/components/ncContextResource/mixins/
|
|||||||
export default {
|
export default {
|
||||||
name: 'CreateContext',
|
name: 'CreateContext',
|
||||||
components: {
|
components: {
|
||||||
NcModal,
|
NcDialog,
|
||||||
NcIconPicker,
|
NcIconPicker,
|
||||||
NcButton,
|
NcButton,
|
||||||
NcIconSvgWrapper,
|
NcIconSvgWrapper,
|
||||||
|
@ -3,15 +3,11 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal v-if="showModal" data-cy="createRowModal" @close="actionCancel">
|
<NcDialog v-if="showModal"
|
||||||
|
:name="t('tables', 'Create row')"
|
||||||
|
data-cy="createRowModal"
|
||||||
|
@closing="actionCancel">
|
||||||
<div class="modal__content" @keydown="onKeydown">
|
<div class="modal__content" @keydown="onKeydown">
|
||||||
<div class="row">
|
|
||||||
<div class="col-4">
|
|
||||||
<h2 style="padding: 0" tabindex="0">
|
|
||||||
{{ t('tables', 'Create row') }}
|
|
||||||
</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-for="column in nonMetaColumns" :key="column.id" :data-cy="column.title">
|
<div v-for="column in nonMetaColumns" :key="column.id" :data-cy="column.title">
|
||||||
<ColumnFormComponent
|
<ColumnFormComponent
|
||||||
:column="column"
|
:column="column"
|
||||||
@ -34,11 +30,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcModal, NcCheckboxRadioSwitch, NcNoteCard, NcButton } from '@nextcloud/vue'
|
import { NcDialog, NcCheckboxRadioSwitch, NcNoteCard, NcButton } from '@nextcloud/vue'
|
||||||
import { showError, showSuccess } from '@nextcloud/dialogs'
|
import { showError, showSuccess } from '@nextcloud/dialogs'
|
||||||
import '@nextcloud/dialogs/style.css'
|
import '@nextcloud/dialogs/style.css'
|
||||||
import ColumnFormComponent from '../main/partials/ColumnFormComponent.vue'
|
import ColumnFormComponent from '../main/partials/ColumnFormComponent.vue'
|
||||||
@ -48,7 +44,7 @@ import rowHelper from '../../shared/components/ncTable/mixins/rowHelper.js'
|
|||||||
export default {
|
export default {
|
||||||
name: 'CreateRow',
|
name: 'CreateRow',
|
||||||
components: {
|
components: {
|
||||||
NcModal,
|
NcDialog,
|
||||||
ColumnFormComponent,
|
ColumnFormComponent,
|
||||||
NcCheckboxRadioSwitch,
|
NcCheckboxRadioSwitch,
|
||||||
NcNoteCard,
|
NcNoteCard,
|
||||||
|
@ -3,20 +3,18 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal v-if="showModal" size="normal"
|
<NcDialog v-if="showModal"
|
||||||
data-cy="createTableModal" @close="actionCancel">
|
:name="t('tables', 'Create table')"
|
||||||
|
data-cy="createTableModal"
|
||||||
|
size="normal"
|
||||||
|
@closing="actionCancel">
|
||||||
<div class="modal__content">
|
<div class="modal__content">
|
||||||
<div class="row">
|
<div class="row space-T">
|
||||||
<div class="col-4">
|
|
||||||
<h2>{{ t('tables', 'Create table') }}</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-4 mandatory">
|
<div class="col-4 mandatory">
|
||||||
{{ t('tables', 'Title') }}
|
{{ t('tables', 'Title') }}
|
||||||
</div>
|
</div>
|
||||||
<div class="col-4 content-emoji">
|
<div class="col-4 content-emoji">
|
||||||
<NcEmojiPicker :close-on-select="true" @select="setIcon">
|
<NcEmojiPicker class="content--emoji" :close-on-select="true" @select="setIcon">
|
||||||
<NcButton type="tertiary"
|
<NcButton type="tertiary"
|
||||||
:aria-label="t('tables', 'Select emoji for table')"
|
:aria-label="t('tables', 'Select emoji for table')"
|
||||||
:title="t('tables', 'Select emoji')"
|
:title="t('tables', 'Select emoji')"
|
||||||
@ -82,11 +80,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcModal, NcEmojiPicker, NcButton } from '@nextcloud/vue'
|
import { NcDialog, NcEmojiPicker, NcButton } from '@nextcloud/vue'
|
||||||
import { showError } from '@nextcloud/dialogs'
|
import { showError } from '@nextcloud/dialogs'
|
||||||
import '@nextcloud/dialogs/style.css'
|
import '@nextcloud/dialogs/style.css'
|
||||||
import axios from '@nextcloud/axios'
|
import axios from '@nextcloud/axios'
|
||||||
@ -100,7 +98,7 @@ import { mapState } from 'vuex'
|
|||||||
export default {
|
export default {
|
||||||
name: 'CreateTable',
|
name: 'CreateTable',
|
||||||
components: {
|
components: {
|
||||||
NcModal,
|
NcDialog,
|
||||||
NcEmojiPicker,
|
NcEmojiPicker,
|
||||||
NcButton,
|
NcButton,
|
||||||
NcTile,
|
NcTile,
|
||||||
|
@ -3,16 +3,11 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal size="large" @close="actionCancel">
|
<NcDialog size="large"
|
||||||
|
:name="t('tables', 'Edit column')"
|
||||||
|
@closing="actionCancel">
|
||||||
<div class="modal__content">
|
<div class="modal__content">
|
||||||
<div v-if="loading" class="icon-loading" />
|
<div v-if="loading" class="icon-loading" />
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-4">
|
|
||||||
<h2>{{ t('tables', 'Edit column') }}</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row space-L">
|
<div class="row space-L">
|
||||||
<div class="col-2">
|
<div class="col-2">
|
||||||
<MainForm :description.sync="editColumn.description"
|
<MainForm :description.sync="editColumn.description"
|
||||||
@ -26,15 +21,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
<div class="flex">
|
<div class="edit-info">
|
||||||
<ColumnInfoPopover :column="column" />
|
<ColumnInfoPopover :column="column" />
|
||||||
<div class="last-edit-info">
|
<div class="last-edit-info">
|
||||||
{{ t('tables', 'Last edit') + ': ' }}
|
{{ t('tables', 'Last edit') + ': ' }}
|
||||||
{{ updateTime }}
|
{{ updateTime }}
|
||||||
<NcUserBubble :user="column.lastEditBy" :display-name="column.lastEditByDisplayName ? column.lastEditByDisplayName : column.lastEditBy" />
|
<NcUserBubble class="last-edit-info-bubble" :user="column.lastEditBy" :display-name="column.lastEditByDisplayName ? column.lastEditByDisplayName : column.lastEditBy" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex">
|
<div class="right-additional-button">
|
||||||
<div class="button-padding-right">
|
<div class="button-padding-right">
|
||||||
<NcButton type="secondary" :aria-label="t('tables', 'Cancel')" @click="actionCancel">
|
<NcButton type="secondary" :aria-label="t('tables', 'Cancel')" @click="actionCancel">
|
||||||
{{ t('tables', 'Cancel') }}
|
{{ t('tables', 'Cancel') }}
|
||||||
@ -46,11 +41,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcModal, NcActions, NcActionButton, NcButton, NcUserBubble } from '@nextcloud/vue'
|
import { NcDialog, NcActions, NcActionButton, NcButton, NcUserBubble } from '@nextcloud/vue'
|
||||||
import { showError, showSuccess } from '@nextcloud/dialogs'
|
import { showError, showSuccess } from '@nextcloud/dialogs'
|
||||||
import '@nextcloud/dialogs/style.css'
|
import '@nextcloud/dialogs/style.css'
|
||||||
import ColumnInfoPopover from '../main/partials/ColumnInfoPopover.vue'
|
import ColumnInfoPopover from '../main/partials/ColumnInfoPopover.vue'
|
||||||
@ -89,7 +84,7 @@ export default {
|
|||||||
MainForm,
|
MainForm,
|
||||||
SelectionForm,
|
SelectionForm,
|
||||||
SelectionMultiForm,
|
SelectionMultiForm,
|
||||||
NcModal,
|
NcDialog,
|
||||||
NcActions,
|
NcActions,
|
||||||
NcActionButton,
|
NcActionButton,
|
||||||
ColumnInfoPopover,
|
ColumnInfoPopover,
|
||||||
@ -222,12 +217,24 @@ export default {
|
|||||||
.last-edit-info {
|
.last-edit-info {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.buttons :deep(.user-bubble__wrapper) {
|
.buttons :deep(.user-bubble__wrapper) {
|
||||||
padding-top: 5px;
|
padding-top: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.flex { display: flex }
|
.edit-info {
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
.right-additional-button {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.last-edit-info-bubble {
|
||||||
|
display: flex!important;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
@ -3,14 +3,13 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal v-if="showModal" size="normal" data-cy="editContextModal" @close="actionCancel">
|
<NcDialog v-if="showModal"
|
||||||
|
:name="t('tables', 'Edit application')"
|
||||||
|
size="normal"
|
||||||
|
data-cy="editContextModal"
|
||||||
|
@closing="actionCancel">
|
||||||
<div class="modal__content" data-cy="editContextModal">
|
<div class="modal__content" data-cy="editContextModal">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-4">
|
|
||||||
<h2>{{ t('tables', 'Edit application') }}</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row space-T">
|
|
||||||
<div class="col-4 mandatory">
|
<div class="col-4 mandatory">
|
||||||
{{ t('tables', 'Title') }}
|
{{ t('tables', 'Title') }}
|
||||||
</div>
|
</div>
|
||||||
@ -59,11 +58,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcModal, NcButton, NcIconSvgWrapper } from '@nextcloud/vue'
|
import { NcDialog, NcButton, NcIconSvgWrapper } from '@nextcloud/vue'
|
||||||
import { showError, showSuccess } from '@nextcloud/dialogs'
|
import { showError, showSuccess } from '@nextcloud/dialogs'
|
||||||
import { getCurrentUser } from '@nextcloud/auth'
|
import { getCurrentUser } from '@nextcloud/auth'
|
||||||
import '@nextcloud/dialogs/style.css'
|
import '@nextcloud/dialogs/style.css'
|
||||||
@ -79,7 +78,7 @@ import permissionsMixin from '../../shared/components/ncTable/mixins/permissions
|
|||||||
export default {
|
export default {
|
||||||
name: 'EditContext',
|
name: 'EditContext',
|
||||||
components: {
|
components: {
|
||||||
NcModal,
|
NcDialog,
|
||||||
NcButton,
|
NcButton,
|
||||||
NcIconPicker,
|
NcIconPicker,
|
||||||
NcIconSvgWrapper,
|
NcIconSvgWrapper,
|
||||||
|
@ -3,15 +3,11 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal v-if="showModal" data-cy="editRowModal" @close="actionCancel">
|
<NcDialog v-if="showModal"
|
||||||
|
data-cy="editRowModal"
|
||||||
|
:name="t('tables', 'Edit row')"
|
||||||
|
@closing="actionCancel">
|
||||||
<div class="modal__content" @keydown="onKeydown">
|
<div class="modal__content" @keydown="onKeydown">
|
||||||
<div class="row">
|
|
||||||
<div class="col-4">
|
|
||||||
<h2 tabindex="0">
|
|
||||||
{{ t('tables', 'Edit row') }}
|
|
||||||
</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-for="column in nonMetaColumns" :key="column.id">
|
<div v-for="column in nonMetaColumns" :key="column.id">
|
||||||
<ColumnFormComponent
|
<ColumnFormComponent
|
||||||
:column="column"
|
:column="column"
|
||||||
@ -46,11 +42,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcModal, NcButton, NcNoteCard } from '@nextcloud/vue'
|
import { NcDialog, NcButton, NcNoteCard } from '@nextcloud/vue'
|
||||||
import { showError } from '@nextcloud/dialogs'
|
import { showError } from '@nextcloud/dialogs'
|
||||||
import { translate as t } from '@nextcloud/l10n'
|
import { translate as t } from '@nextcloud/l10n'
|
||||||
import '@nextcloud/dialogs/style.css'
|
import '@nextcloud/dialogs/style.css'
|
||||||
@ -61,7 +57,7 @@ import rowHelper from '../../shared/components/ncTable/mixins/rowHelper.js'
|
|||||||
export default {
|
export default {
|
||||||
name: 'EditRow',
|
name: 'EditRow',
|
||||||
components: {
|
components: {
|
||||||
NcModal,
|
NcDialog,
|
||||||
NcButton,
|
NcButton,
|
||||||
ColumnFormComponent,
|
ColumnFormComponent,
|
||||||
NcNoteCard,
|
NcNoteCard,
|
||||||
|
@ -3,15 +3,11 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal v-if="showModal"
|
<NcDialog v-if="showModal"
|
||||||
|
:name="t('tables', 'Edit table')"
|
||||||
size="normal"
|
size="normal"
|
||||||
@close="actionCancel">
|
@closing="actionCancel">
|
||||||
<div class="modal__content" data-cy="editTableModal">
|
<div class="modal__content" data-cy="editTableModal">
|
||||||
<div class="row">
|
|
||||||
<div class="col-4">
|
|
||||||
<h2>{{ t('tables', 'Edit table') }}</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-4 mandatory">
|
<div class="col-4 mandatory">
|
||||||
{{ t('tables', 'Title') }}
|
{{ t('tables', 'Title') }}
|
||||||
@ -73,11 +69,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcModal, NcEmojiPicker, NcButton, NcUserBubble } from '@nextcloud/vue'
|
import { NcDialog, NcEmojiPicker, NcButton, NcUserBubble } from '@nextcloud/vue'
|
||||||
import { showError, showSuccess } from '@nextcloud/dialogs'
|
import { showError, showSuccess } from '@nextcloud/dialogs'
|
||||||
import '@nextcloud/dialogs/style.css'
|
import '@nextcloud/dialogs/style.css'
|
||||||
import { mapGetters } from 'vuex'
|
import { mapGetters } from 'vuex'
|
||||||
@ -88,7 +84,7 @@ import TableDescription from '../main/sections/TableDescription.vue'
|
|||||||
export default {
|
export default {
|
||||||
name: 'EditTable',
|
name: 'EditTable',
|
||||||
components: {
|
components: {
|
||||||
NcModal,
|
NcDialog,
|
||||||
NcEmojiPicker,
|
NcEmojiPicker,
|
||||||
NcButton,
|
NcButton,
|
||||||
NcUserBubble,
|
NcUserBubble,
|
||||||
|
@ -3,10 +3,11 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal v-if="!importResults">
|
<NcDialog v-if="!importResults"
|
||||||
|
:name="t('tables', 'Import file into Tables')"
|
||||||
|
size="normal"
|
||||||
|
@closing="closeImportDialog">
|
||||||
<div class="modal__content">
|
<div class="modal__content">
|
||||||
<h2>{{ t('tables', 'Import file into Tables') }}</h2>
|
|
||||||
|
|
||||||
<RowFormWrapper
|
<RowFormWrapper
|
||||||
class="row"
|
class="row"
|
||||||
:title="t('tables', 'Import as new table')"
|
:title="t('tables', 'Import as new table')"
|
||||||
@ -86,7 +87,7 @@
|
|||||||
</NcButton>
|
</NcButton>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
|
|
||||||
<NcDialog v-else
|
<NcDialog v-else
|
||||||
:name="t('tables', 'Import successful')"
|
:name="t('tables', 'Import successful')"
|
||||||
@ -104,7 +105,6 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {
|
import {
|
||||||
NcModal,
|
|
||||||
NcDialog,
|
NcDialog,
|
||||||
NcButton,
|
NcButton,
|
||||||
NcSelect,
|
NcSelect,
|
||||||
@ -125,7 +125,6 @@ export default {
|
|||||||
name: 'FileActionImport',
|
name: 'FileActionImport',
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
NcModal,
|
|
||||||
NcButton,
|
NcButton,
|
||||||
NcDialog,
|
NcDialog,
|
||||||
ImportResults,
|
ImportResults,
|
||||||
@ -227,6 +226,9 @@ export default {
|
|||||||
|
|
||||||
this.importingFile = false
|
this.importingFile = false
|
||||||
},
|
},
|
||||||
|
closeImportDialog() {
|
||||||
|
this.$emit('close')
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,14 +3,11 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal v-if="showModal" size="normal" @close="actionCancel">
|
<NcDialog v-if="showModal"
|
||||||
|
:name="title"
|
||||||
|
size="normal"
|
||||||
|
@closing="actionCancel">
|
||||||
<div class="modal__content">
|
<div class="modal__content">
|
||||||
<div class="row">
|
|
||||||
<div class="col-4">
|
|
||||||
<h2>{{ title }}</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Starting -->
|
<!-- Starting -->
|
||||||
<div v-if="!loading && result === null && preview === null && !waitForReload">
|
<div v-if="!loading && result === null && preview === null && !waitForReload">
|
||||||
<div class="row space-T">
|
<div class="row space-T">
|
||||||
@ -108,11 +105,11 @@
|
|||||||
<NcLoadingIcon :name="t('tables', 'Loading table data')" :size="64" />
|
<NcLoadingIcon :name="t('tables', 'Loading table data')" :size="64" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcModal, NcButton, NcCheckboxRadioSwitch, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
|
import { NcDialog, NcButton, NcCheckboxRadioSwitch, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
|
||||||
import { getFilePickerBuilder, FilePickerType, showError, showWarning } from '@nextcloud/dialogs'
|
import { getFilePickerBuilder, FilePickerType, showError, showWarning } from '@nextcloud/dialogs'
|
||||||
import RowFormWrapper from '../../shared/components/ncTable/partials/rowTypePartials/RowFormWrapper.vue'
|
import RowFormWrapper from '../../shared/components/ncTable/partials/rowTypePartials/RowFormWrapper.vue'
|
||||||
import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
|
import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
|
||||||
@ -135,7 +132,7 @@ export default {
|
|||||||
IconFolder,
|
IconFolder,
|
||||||
IconUpload,
|
IconUpload,
|
||||||
IconFile,
|
IconFile,
|
||||||
NcModal,
|
NcDialog,
|
||||||
NcButton,
|
NcButton,
|
||||||
ImportResults,
|
ImportResults,
|
||||||
ImportPreview,
|
ImportPreview,
|
||||||
@ -496,11 +493,6 @@ export default {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
||||||
h2 {
|
|
||||||
margin-bottom: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
:deep(.slot), .middle {
|
:deep(.slot), .middle {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
@ -3,15 +3,11 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal v-if="showModal"
|
<NcDialog v-if="showModal"
|
||||||
|
:name="t('tables', 'Transfer application')"
|
||||||
size="normal"
|
size="normal"
|
||||||
@close="actionCancel">
|
@closing="actionCancel">
|
||||||
<div class="modal__content" data-cy="transferContextModal">
|
<div class="modal__content" data-cy="transferContextModal">
|
||||||
<div class="row">
|
|
||||||
<div class="col-4">
|
|
||||||
<h2>{{ t('tables', 'Transfer application') }}</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<h3>{{ t('tables', 'Transfer the application "{context}" to another user', { context: context.name }) }}</h3>
|
<h3>{{ t('tables', 'Transfer the application "{context}" to another user', { context: context.name }) }}</h3>
|
||||||
<NcUserPicker :select-users="true" :select-groups="false" :selected-user-id.sync="newOwnerId" />
|
<NcUserPicker :select-users="true" :select-groups="false" :selected-user-id.sync="newOwnerId" />
|
||||||
@ -24,11 +20,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcModal, NcButton } from '@nextcloud/vue'
|
import { NcDialog, NcButton } from '@nextcloud/vue'
|
||||||
import { showSuccess } from '@nextcloud/dialogs'
|
import { showSuccess } from '@nextcloud/dialogs'
|
||||||
import '@nextcloud/dialogs/style.css'
|
import '@nextcloud/dialogs/style.css'
|
||||||
import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
|
import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
|
||||||
@ -39,7 +35,7 @@ import { getCurrentUser } from '@nextcloud/auth'
|
|||||||
export default {
|
export default {
|
||||||
name: 'TransferContext',
|
name: 'TransferContext',
|
||||||
components: {
|
components: {
|
||||||
NcModal,
|
NcDialog,
|
||||||
NcButton,
|
NcButton,
|
||||||
NcUserPicker,
|
NcUserPicker,
|
||||||
},
|
},
|
||||||
|
@ -3,15 +3,11 @@
|
|||||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<NcModal v-if="showModal"
|
<NcDialog v-if="showModal"
|
||||||
|
:name="t('tables', 'Transfer table')"
|
||||||
size="normal"
|
size="normal"
|
||||||
@close="actionCancel">
|
@closing="actionCancel">
|
||||||
<div class="modal__content" data-cy="transferTableModal">
|
<div class="modal__content" data-cy="transferTableModal">
|
||||||
<div class="row">
|
|
||||||
<div class="col-4">
|
|
||||||
<h2>{{ t('tables', 'Transfer table') }}</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<h3>{{ t('tables', 'Transfer this table to another user') }}</h3>
|
<h3>{{ t('tables', 'Transfer this table to another user') }}</h3>
|
||||||
<NcUserPicker :select-users="true" :select-groups="false" :selected-user-id.sync="selectedUserId" />
|
<NcUserPicker :select-users="true" :select-groups="false" :selected-user-id.sync="selectedUserId" />
|
||||||
@ -24,11 +20,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</NcModal>
|
</NcDialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { NcModal, NcButton } from '@nextcloud/vue'
|
import { NcDialog, NcButton } from '@nextcloud/vue'
|
||||||
import { showSuccess } from '@nextcloud/dialogs'
|
import { showSuccess } from '@nextcloud/dialogs'
|
||||||
import '@nextcloud/dialogs/style.css'
|
import '@nextcloud/dialogs/style.css'
|
||||||
import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
|
import permissionsMixin from '../../shared/components/ncTable/mixins/permissionsMixin.js'
|
||||||
@ -39,7 +35,7 @@ import { getCurrentUser } from '@nextcloud/auth'
|
|||||||
export default {
|
export default {
|
||||||
name: 'TransferTable',
|
name: 'TransferTable',
|
||||||
components: {
|
components: {
|
||||||
NcModal,
|
NcDialog,
|
||||||
NcButton,
|
NcButton,
|
||||||
NcUserPicker,
|
NcUserPicker,
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user