Browse Source

refactor: ui corrections and lint

pull/9314/head
Pranav C 3 months ago
parent
commit
3eabfb655b
  1. 3
      packages/nc-gui/components/account/setup/ConfigModal.vue
  2. 3
      packages/nc-gui/components/account/setup/ListModal.vue
  3. 39
      tests/playwright/pages/Account/Setup.ts
  4. 65
      tests/playwright/tests/db/usersAccounts/accounSetup.spec.ts

3
packages/nc-gui/components/account/setup/ConfigModal.vue

@ -67,8 +67,7 @@ const doAction = async (action: Action) => {
</script> </script>
<template> <template>
<NcModal :visible="vOpen" centered width="70rem" wrap-class-name="nc-modal-create-source" <NcModal :visible="vOpen" centered width="70rem" wrap-class-name="nc-modal-create-source" @keydown.esc="vOpen = false">
@keydown.esc="vOpen = false">
<div class="flex-1 flex flex-col max-h-full min-h-400px"> <div class="flex-1 flex flex-col max-h-full min-h-400px">
<div class="px-4 pb-4 w-full flex items-center gap-3 border-b-1 border-gray-200"> <div class="px-4 pb-4 w-full flex items-center gap-3 border-b-1 border-gray-200">
<GeneralIcon icon="arrowLeft" class="cursor-pointer flex-none text-[20px]" @click="vOpen = false" /> <GeneralIcon icon="arrowLeft" class="cursor-pointer flex-none text-[20px]" @click="vOpen = false" />

3
packages/nc-gui/components/account/setup/ListModal.vue

@ -1,5 +1,4 @@
<script setup lang="ts"> <script setup lang="ts">
const props = defineProps<{ const props = defineProps<{
category: string category: string
modelValue?: boolean modelValue?: boolean
@ -43,7 +42,7 @@ const selectApp = (app: any) => {
<GeneralIcon v-else icon="mail" /> <GeneralIcon v-else icon="mail" />
<span class="title">{{ app.title }}</span> <span class="title">{{ app.title }}</span>
<div class="flex-grow" /> <div class="flex-grow" />
<GeneralIcon icon="circleCheckSolid" v-if="app.active" class="text-primary min-w-6 h-6 bg-white-500" /> <GeneralIcon v-if="app.active" icon="circleCheckSolid" class="text-primary min-w-6 h-6 bg-white-500" />
</div> </div>
</div> </div>
</div> </div>

39
tests/playwright/pages/Account/Setup.ts

@ -0,0 +1,39 @@
import { expect } from '@playwright/test';
import BasePage from '../Base';
import { AccountPage } from './index';
export class AccountSettingsPage extends BasePage {
private accountPage: AccountPage;
constructor(accountPage: AccountPage) {
super(accountPage.rootPage);
this.accountPage = accountPage;
}
async goto() {
await this.rootPage.goto('/#/account/setup');
await this.rootPage.locator(`[data-test-id="nc-setup"]`).waitForElementState('visible');
}
get() {
return this.accountPage.get().locator(`[data-test-id="nc-setup"]`);
}
openEmailSettings() {}
async getInviteOnlyCheckboxValue() {
// allow time for the checkbox to be rendered
await this.rootPage.waitForTimeout(1000);
return this.get().locator(`.nc-invite-only-signup-checkbox`).isChecked({ timeout: 1000 });
}
async checkInviteOnlySignupCheckbox(value: boolean) {
return expect(await this.getInviteOnlyCheckboxValue()).toBe(value);
}
async toggleInviteOnlyCheckbox() {
await this.getInviteOnlyCheckbox().click();
await this.verifyToast({ message: 'Settings saved successfully' });
}
}

65
tests/playwright/tests/db/usersAccounts/accounSetup.spec.ts

@ -0,0 +1,65 @@
import { test } from '@playwright/test';
import { AccountPage } from '../../../pages/Account';
import { AccountSettingsPage } from '../../../pages/Account/Settings';
import { SignupPage } from '../../../pages/SignupPage';
import setup, { unsetup } from '../../../setup';
import { getDefaultPwd } from '../../../tests/utils/general';
test.describe.skip('App setup', () => {
// hub will not have this feature
let accountSettingsPage: AccountSettingsPage;
let accountPage: AccountPage;
// @ts-ignore
let context: any;
test.beforeEach(async ({ page }) => {
context = await setup({ page, isEmptyProject: true });
accountPage = new AccountPage(page);
accountSettingsPage = accountPage.settings;
});
test.afterEach(async () => {
await unsetup(context);
});
test('Toggle invite only signup', async () => {
test.slow();
await accountSettingsPage.goto({ networkValidation: false });
// enable invite only signup
if (!(await accountSettingsPage.getInviteOnlyCheckboxValue())) {
await accountSettingsPage.toggleInviteOnlyCheckbox();
await accountSettingsPage.checkInviteOnlySignupCheckbox(true);
}
await accountPage.signOut();
const signupPage = new SignupPage(accountPage.rootPage);
await signupPage.goto();
await signupPage.signUp({
email: 'test-user-1@nocodb.com',
password: getDefaultPwd(),
expectedError: 'Not allowed to signup, contact super admin.',
});
await signupPage.rootPage.reload({ waitUntil: 'load' });
await accountSettingsPage.goto({ networkValidation: false });
await accountSettingsPage.checkInviteOnlySignupCheckbox(true);
await accountSettingsPage.toggleInviteOnlyCheckbox();
await accountSettingsPage.checkInviteOnlySignupCheckbox(false);
await accountPage.signOut();
await signupPage.goto();
await signupPage.signUp({
email: 'test-user-1@nocodb.com',
password: getDefaultPwd(),
});
});
});
Loading…
Cancel
Save