diff --git a/packages/nc-gui/components/dashboard/settings/Modal.vue b/packages/nc-gui/components/dashboard/settings/Modal.vue index cc6788f60e..655a4cf1ba 100644 --- a/packages/nc-gui/components/dashboard/settings/Modal.vue +++ b/packages/nc-gui/components/dashboard/settings/Modal.vue @@ -159,6 +159,7 @@ watch( :footer="null" width="max(90vw, 600px)" :closable="false" + wrap-class-name="nc-modal-settings" @cancel="emits('update:modelValue', false)" > diff --git a/packages/nc-gui/components/dlg/TableRename.vue b/packages/nc-gui/components/dlg/TableRename.vue index 5652ec1293..8398f319b9 100644 --- a/packages/nc-gui/components/dlg/TableRename.vue +++ b/packages/nc-gui/components/dlg/TableRename.vue @@ -125,6 +125,7 @@ const renameTable = async () => { v-model:visible="dialogShow" :title="$t('activity.renameTable')" :mask-closable="false" + wrap-class-name="nc-modal-table-rename" @keydown.esc="dialogShow = false" @finish="renameTable" > diff --git a/packages/nc-gui/components/shared-view/AskPassword.vue b/packages/nc-gui/components/shared-view/AskPassword.vue index 83f0481245..a12e00a433 100644 --- a/packages/nc-gui/components/shared-view/AskPassword.vue +++ b/packages/nc-gui/components/shared-view/AskPassword.vue @@ -33,6 +33,7 @@ const onFinish = async () => { centered :footer="null" :mask-closable="false" + wrap-class-name="nc-modal-shared-view-password-dlg" @close="vModel = false" >
diff --git a/packages/nc-gui/components/smartsheet-toolbar/ShareView.vue b/packages/nc-gui/components/smartsheet-toolbar/ShareView.vue index a2a555f9b9..8d44e32bdc 100644 --- a/packages/nc-gui/components/smartsheet-toolbar/ShareView.vue +++ b/packages/nc-gui/components/smartsheet-toolbar/ShareView.vue @@ -132,6 +132,7 @@ watch(passwordProtected, (value) => { :title="$t('msg.info.privateLink')" :footer="null" width="min(100vw,640px)" + wrap-class-name="nc-modal-share-view" >
{{ sharedViewUrl }}
diff --git a/packages/nc-gui/pages/[projectType]/form/[viewId]/index.vue b/packages/nc-gui/pages/[projectType]/form/[viewId]/index.vue index 9a84a99208..550698274b 100644 --- a/packages/nc-gui/pages/[projectType]/form/[viewId]/index.vue +++ b/packages/nc-gui/pages/[projectType]/form/[viewId]/index.vue @@ -136,6 +136,7 @@ function isRequired(_columnObj: Record, required = false) { centered :footer="null" :mask-closable="false" + wrap-class-name="nc-modal-shared-form-password-dlg" @close="passwordDlg = false" >
diff --git a/packages/nc-gui/pages/index/index/create-external.vue b/packages/nc-gui/pages/index/index/create-external.vue index 47238a5db3..4d696df589 100644 --- a/packages/nc-gui/pages/index/index/create-external.vue +++ b/packages/nc-gui/pages/index/index/create-external.vue @@ -556,6 +556,7 @@ onMounted(() => { width="600px" :ok-text="$t('general.ok')" :cancel-text="$t('general.cancel')" + wrap-class-name="nc-modal-connection-url" @ok="handleImportURL" > diff --git a/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js b/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js index d0ffcb4944..f281e9c420 100644 --- a/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js +++ b/scripts/cypress/integration/common/1d_pg_table_view_drag_drop_reorder.js @@ -87,7 +87,7 @@ export const genTest = (apiType, dbType) => { cy.snipActiveModal(`Modal_createView_${viewType}`); // Pop up window, click Submit (accepting default name for view) - cy.getActiveModal().find("button:contains(Submit)").click(); + cy.getActiveModal(".nc-modal-view-create").find("button:contains(Submit)").click(); cy.toastWait("View created successfully"); } diff --git a/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js b/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js index 6d29b2f25a..49fdfae329 100644 --- a/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js +++ b/scripts/cypress/integration/common/1d_table_view_drag_drop_reorder.js @@ -90,7 +90,7 @@ export const genTest = (apiType, dbType) => { cy.snipActiveModal(`Modal_createView_${viewType}`); // Pop up window, click Submit (accepting default name for view) - cy.getActiveModal().find("button:contains(Submit)").click(); + cy.getActiveModal(".nc-modal-view-create").find("button:contains(Submit)").click(); cy.toastWait("View created successfully"); } diff --git a/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js b/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js index 137ab4a2c1..f2bf2146a7 100644 --- a/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js +++ b/scripts/cypress/integration/common/2a_table_with_belongs_to_colulmn.js @@ -59,26 +59,26 @@ export const genTest = (apiType, dbType) => { }); it("Expand Link record, validate", () => { - cy.getActiveModal() + cy.getActiveModal(".nc-modal-link-record") .find("button:contains(Link to 'City')") .click() .then(() => { // Link record form validation - cy.getActiveModal().contains("Link record").should("exist"); - cy.getActiveModal() + cy.getActiveModal(".nc-modal-link-record").contains("Link record").should("exist"); + cy.getActiveModal(".nc-modal-link-record") .find(".nc-reload") .should("exist"); - cy.getActiveModal() + cy.getActiveModal(".nc-modal-link-record") .find('button:contains("Add new record")') .should("exist"); - cy.getActiveModal() + cy.getActiveModal(".nc-modal-link-record") .find(".ant-card") .eq(0) .contains("A Corua (La Corua)") .should("exist"); - cy.getActiveModal() + cy.getActiveModal(".nc-modal-link-record") .find("button.ant-modal-close") .click(); // .then(() => { diff --git a/scripts/cypress/integration/common/2b_table_with_m2m_column.js b/scripts/cypress/integration/common/2b_table_with_m2m_column.js index ea3c2ecbeb..8aa1fc8dd3 100644 --- a/scripts/cypress/integration/common/2b_table_with_m2m_column.js +++ b/scripts/cypress/integration/common/2b_table_with_m2m_column.js @@ -70,19 +70,19 @@ export const genTest = (apiType, dbType) => { .click() .then(() => { // Link record form validation - cy.getActiveModal().contains("Link record").should("exist"); - cy.getActiveModal() + cy.getActiveModal(".nc-modal-link-record").contains("Link record").should("exist"); + cy.getActiveModal(".nc-modal-link-record") .find(".nc-reload") .should("exist"); - cy.getActiveModal() + cy.getActiveModal(".nc-modal-link-record") .find('button:contains("Add new record")') .should("exist"); - cy.getActiveModal() + cy.getActiveModal(".nc-modal-link-record") .find(".ant-card") .eq(0) .contains("ACE GOLDFINGER") .should("exist"); - cy.getActiveModal().find("button.ant-modal-close").click(); + cy.getActiveModal(".nc-modal-link-record").find("button.ant-modal-close").click(); }); }); diff --git a/scripts/cypress/integration/common/4a_table_view_grid_gallery_form.js b/scripts/cypress/integration/common/4a_table_view_grid_gallery_form.js index fde2c003b4..361dc23423 100644 --- a/scripts/cypress/integration/common/4a_table_view_grid_gallery_form.js +++ b/scripts/cypress/integration/common/4a_table_view_grid_gallery_form.js @@ -45,7 +45,7 @@ export const genTest = (apiType, dbType) => { cy.get(`.nc-create-${viewType}-view`).click(); // Pop up window, click Submit (accepting default name for view) - cy.getActiveModal().find(".ant-btn-primary").click(); + cy.getActiveModal(".nc-modal-view-create").find(".ant-btn-primary").click(); cy.toastWait("View created successfully"); // kludge: right navbar closes abruptly. force it open again @@ -83,7 +83,7 @@ export const genTest = (apiType, dbType) => { // click on delete icon (becomes visible on hovering mouse) cy.get(".nc-view-delete-icon").click({ force: true }); cy.wait(300) - cy.getActiveModal().find('.ant-btn-dangerous').click(); + cy.getActiveModal(".nc-modal-view-delete").find('.ant-btn-dangerous').click(); cy.toastWait("View deleted successfully"); // kludge: right navbar closes abruptly. force it open again diff --git a/scripts/cypress/integration/common/4b_table_view_share.js b/scripts/cypress/integration/common/4b_table_view_share.js index 5e406bb350..9d3deb9d85 100644 --- a/scripts/cypress/integration/common/4b_table_view_share.js +++ b/scripts/cypress/integration/common/4b_table_view_share.js @@ -7,21 +7,21 @@ let linkText = ""; const generateLinkWithPwd = () => { mainPage.shareView().click(); - cy.getActiveModal().find(".ant-modal-title").contains("This view is shared via a private link").should("be.visible"); + cy.getActiveModal(".nc-modal-share-view").find(".ant-modal-title").contains("This view is shared via a private link").should("be.visible"); // enable checkbox & feed pwd, save - cy.getActiveModal().find('.ant-collapse').should('exist').click() - cy.getActiveModal().find('.ant-checkbox-input').should('exist').first().then(($el) => { - if (!$el.prop("checked")) { - cy.wrap($el).click({ force: true }); - cy.getActiveModal().find('input[type="password"]').clear().type("1"); - cy.getActiveModal().find('button:contains("Save password")').click(); - cy.toastWait("Successfully updated"); - } + cy.getActiveModal(".nc-modal-share-view").find('.ant-collapse').should('exist').click(); + cy.getActiveModal(".nc-modal-share-view").find('.ant-checkbox-input').should('exist').first().then(($el) => { + if (!$el.prop("checked")) { + cy.wrap($el).click({ force: true }); + cy.getActiveModal(".nc-modal-share-view").find('input[type="password"]').clear().type("1"); + cy.getActiveModal(".nc-modal-share-view").find('button:contains("Save password")').click(); + cy.toastWait("Successfully updated"); + } }); // copy link text, visit URL - cy.getActiveModal() + cy.getActiveModal(".nc-modal-share-view") .find(".nc-share-link-box") .then(($obj) => { linkText = $obj.text().trim(); @@ -62,25 +62,25 @@ export const genTest = (apiType, dbType) => { baseUrl: null, }); - cy.getActiveModal().should("exist"); + cy.getActiveModal(".nc-modal-shared-view-password-dlg").should("exist"); // feed password - cy.getActiveModal().find('input[type="password"]').clear().type("a"); - cy.getActiveModal().find('button:contains("Unlock")').click(); + cy.getActiveModal(".nc-modal-shared-view-password-dlg").find('input[type="password"]').clear().type("a"); + cy.getActiveModal(".nc-modal-shared-view-password-dlg").find('button:contains("Unlock")').click(); // if pwd is incorrect, active modal requesting to feed in password again will persist - cy.getActiveModal().find('button:contains("Unlock")').should('exist'); + cy.getActiveModal(".nc-modal-shared-view-password-dlg").find('button:contains("Unlock")').should('exist'); }); // fallover test- use previously opened view & continue verification instead of opening again it("Share view with correct password", () => { // feed password - cy.getActiveModal() + cy.getActiveModal(".nc-modal-shared-view-password-dlg") .find('input[type="password"]') .clear() .type("1"); - cy.getActiveModal().find('button:contains("Unlock")').click(); + cy.getActiveModal(".nc-modal-shared-view-password-dlg").find('button:contains("Unlock")').click(); // if pwd is incorrect, active modal requesting to feed in password again will persist // cy.getActiveModal().find('button:contains("Unlock")').should('not.exist'); diff --git a/scripts/cypress/integration/common/4c_form_view_detailed.js b/scripts/cypress/integration/common/4c_form_view_detailed.js index 175701beb9..d56ccc0655 100644 --- a/scripts/cypress/integration/common/4c_form_view_detailed.js +++ b/scripts/cypress/integration/common/4c_form_view_detailed.js @@ -100,7 +100,7 @@ export const genTest = (apiType, dbType) => { cy.get(`.nc-create-${viewType}-view`).click(); // Pop up window, click Submit (accepting default name for view) - cy.getActiveModal().find("button:contains(Submit)").click(); + cy.getActiveModal(".nc-modal-view-create").find("button:contains(Submit)").click(); cy.toastWait("View created successfully"); @@ -420,7 +420,7 @@ export const genTest = (apiType, dbType) => { // click on delete icon (becomes visible on hovering mouse) cy.get(".nc-view-delete-icon").click({ force: true }); cy.wait(1000) - cy.getActiveModal().find('.ant-btn-dangerous').click(); + cy.getActiveModal(".nc-modal-view-delete").find('.ant-btn-dangerous').click(); cy.toastWait("View deleted successfully"); // confirm if the number of veiw entries is reduced by 1 diff --git a/scripts/cypress/integration/common/4e_form_view_share.js b/scripts/cypress/integration/common/4e_form_view_share.js index 91b53980ac..34695a53e2 100644 --- a/scripts/cypress/integration/common/4e_form_view_share.js +++ b/scripts/cypress/integration/common/4e_form_view_share.js @@ -53,7 +53,7 @@ export const genTest = (apiType, dbType) => { cy.get(`.nc-create-${viewType}-view`).click(); // Pop up window, click Submit (accepting default name for view) - cy.getActiveModal().find("button:contains(Submit)").click(); + cy.getActiveModal(".nc-modal-view-create").find("button:contains(Submit)").click(); cy.toastWait("View created successfully"); @@ -108,7 +108,7 @@ export const genTest = (apiType, dbType) => { mainPage.shareView().click(); // copy link text, visit URL - cy.getActiveModal() + cy.getActiveModal(".nc-modal-share-view") .should('exist') .find(".share-link-box") .contains("/nc/form/", { timeout: 10000 }) @@ -210,7 +210,7 @@ export const genTest = (apiType, dbType) => { // click on delete icon (becomes visible on hovering mouse) cy.get(".nc-view-delete-icon").click({ force: true }); cy.wait(1000); - cy.getActiveModal().find('.ant-btn-dangerous').should('exist').click(); + cy.getActiveModal(".nc-modal-view-delete").find('.ant-btn-dangerous').should('exist').click(); cy.toastWait("View deleted successfully"); // confirm if the number of veiw entries is reduced by 1 diff --git a/scripts/cypress/integration/common/4f_grid_view_share.js b/scripts/cypress/integration/common/4f_grid_view_share.js index 64a61934f7..4f1b666d22 100644 --- a/scripts/cypress/integration/common/4f_grid_view_share.js +++ b/scripts/cypress/integration/common/4f_grid_view_share.js @@ -21,13 +21,13 @@ export const genTest = (apiType, dbType) => { cy.wait(1000); // wait, as URL initially will be /undefined - cy.getActiveModal() + cy.getActiveModal(".nc-modal-share-view") .find(".share-link-box") .contains("/nc/view/", { timeout: 10000 }) .should("exist"); // copy link text, visit URL - cy.getActiveModal() + cy.getActiveModal(".nc-modal-share-view") .find(".share-link-box") .contains("/nc/view/", { timeout: 10000 }) .then(($obj) => { @@ -82,7 +82,7 @@ export const genTest = (apiType, dbType) => { // create a normal public view cy.get(`.nc-create-${viewType}-view`).click(); - cy.getActiveModal().find("button:contains(Submit)").click(); + cy.getActiveModal(".nc-modal-view-create").find("button:contains(Submit)").click(); cy.toastWait("View created successfully"); // store base URL- to re-visit and delete form view later @@ -373,7 +373,7 @@ export const genTest = (apiType, dbType) => { cy.get(".nc-view-item").its("length").should("eq", 2); cy.get(".nc-view-delete-icon").eq(0).click({ force: true }); - cy.getActiveModal().find(".ant-btn-dangerous").click(); + cy.getActiveModal(".nc-modal-view-delete").find(".ant-btn-dangerous").click(); cy.toastWait("View deleted successfully"); // confirm if the number of veiw entries is reduced by 1 diff --git a/scripts/cypress/integration/common/4f_pg_grid_view_share.js b/scripts/cypress/integration/common/4f_pg_grid_view_share.js index f42f32a14e..07c895ade3 100644 --- a/scripts/cypress/integration/common/4f_pg_grid_view_share.js +++ b/scripts/cypress/integration/common/4f_pg_grid_view_share.js @@ -25,13 +25,13 @@ export const genTest = (apiType, dbType) => { cy.wait(5000); // wait, as URL initially will be /undefined - cy.getActiveModal() + cy.getActiveModal(".nc-modal-share-view") .find(".share-link-box") .contains("/nc/view/", { timeout: 10000 }) .should("exist"); // copy link text, visit URL - cy.getActiveModal() + cy.getActiveModal(".nc-modal-share-view") .find(".share-link-box") .contains("/nc/view/", { timeout: 10000 }) .then(($obj) => { @@ -75,7 +75,7 @@ export const genTest = (apiType, dbType) => { it(`Create ${viewType.toUpperCase()} view`, () => { // create a normal public view cy.get(`.nc-create-${viewType}-view`).click(); - cy.getActiveModal().find("button:contains(Submit)").click(); + cy.getActiveModal(".nc-modal-view-create").find("button:contains(Submit)").click(); cy.toastWait("View created successfully"); // store base URL- to re-visit and delete form view later diff --git a/scripts/cypress/integration/common/6f_attachments.js b/scripts/cypress/integration/common/6f_attachments.js index b4fbf5ea5f..25fc8597c4 100644 --- a/scripts/cypress/integration/common/6f_attachments.js +++ b/scripts/cypress/integration/common/6f_attachments.js @@ -68,7 +68,7 @@ export const genTest = (apiType, dbType) => { // create form-view cy.get(`.nc-create-form-view`).click(); - cy.getActiveModal().find("button:contains(Submit)").click(); + cy.getActiveModal(".nc-modal-view-create").find("button:contains(Submit)").click(); cy.toastWait("View created successfully"); @@ -77,7 +77,7 @@ export const genTest = (apiType, dbType) => { cy.wait(5000); // copy link text, visit URL - cy.getActiveModal() + cy.getActiveModal(".nc-modal-share-view") .find(".share-link-box") .contains("/nc/form/", { timeout: 10000 }) .should('exist') diff --git a/scripts/cypress/integration/common/6g_base_share.js b/scripts/cypress/integration/common/6g_base_share.js index 56d3170860..d35178d62f 100644 --- a/scripts/cypress/integration/common/6g_base_share.js +++ b/scripts/cypress/integration/common/6g_base_share.js @@ -90,7 +90,7 @@ export const genTest = (apiType, dbType) => { .click(); // Copy URL - cy.getActiveModal() + cy.getActiveModal(".nc-modal-invite-user-and-shared-base") .find(".nc-url") .then(($obj) => { cy.log($obj[0]); diff --git a/scripts/cypress/integration/common/7b_import_from_airtable.js b/scripts/cypress/integration/common/7b_import_from_airtable.js index 62f61f1680..5cd6d1c88f 100644 --- a/scripts/cypress/integration/common/7b_import_from_airtable.js +++ b/scripts/cypress/integration/common/7b_import_from_airtable.js @@ -32,9 +32,9 @@ export const genTest = (apiType, dbType) => { cy.get('.nc-import-menu').should('exist').click() cy.getActiveMenu(".nc-dropdown-import-menu").find('.ant-dropdown-menu-item').contains('Airtable').click() - cy.getActiveModal().find(".nc-input-api-key").should('exist').clear().type(apiKey) - cy.getActiveModal().find(".nc-input-shared-base").should('exist').clear().type(sharedBase) - cy.getActiveModal().find(".nc-btn-airtable-import").should('exist').click() + cy.getActiveModal(".nc-modal-airtable-import").find(".nc-input-api-key").should('exist').clear().type(apiKey) + cy.getActiveModal(".nc-modal-airtable-import").find(".nc-input-shared-base").should('exist').clear().type(sharedBase) + cy.getActiveModal(".nc-modal-airtable-import").find(".nc-btn-airtable-import").should('exist').click() // it will take a while for import to finish // cy.getActiveModal().find(".nc-btn-go-dashboard", {timeout: 180000}).should('exist').click() diff --git a/scripts/cypress/support/commands.js b/scripts/cypress/support/commands.js index 4774cfd48b..2057b8b043 100644 --- a/scripts/cypress/support/commands.js +++ b/scripts/cypress/support/commands.js @@ -363,10 +363,10 @@ Cypress.Commands.add('renameTable', (oldName, newName) => { .click({ force: true }); // feed new name - cy.getActiveModal().find('input').clear().type(newName); + cy.getActiveModal(".nc-modal-table-rename").find('input').clear().type(newName); // submit - cy.getActiveModal().find('button').contains('Submit').click(); + cy.getActiveModal(".nc-modal-table-rename").find('button').contains('Submit').click(); cy.toastWait('Table renamed successfully'); diff --git a/scripts/cypress/support/page_objects/mainPage.js b/scripts/cypress/support/page_objects/mainPage.js index 8f5396108e..a9d7cf37e3 100644 --- a/scripts/cypress/support/page_objects/mainPage.js +++ b/scripts/cypress/support/page_objects/mainPage.js @@ -120,12 +120,12 @@ export class _mainPage { // opt-in requested role & submit // cy.getActiveSelection().contains(roleType).click({force: true}); cy.getActiveSelection().find('.nc-role-option').eq(roleIndex).should('exist').click() - cy.getActiveModal().find("button.ant-btn-primary").click(); + cy.getActiveModal(".invite-user-and-shared-base").find("button.ant-btn-primary").click(); cy.toastWait("Successfully updated the user details"); // get URL, invoke - cy.getActiveModal() + cy.getActiveModal(".nc-modal-invite-user-and-shared-base") .find(".ant-alert-message") .then(($obj) => { linkText = $obj.text().trim();