refactor: test corrections

9 months ago · fc579bb3a4
14 changed files with 33 additions and 33 deletions
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@ -514,7 +514,7 @@ const projectDelete = () => {
                    @click.stop="
                      () => {
                        $e('c:base:api-docs')
-                        openLink(`/api/v1/db/meta/bases/${base.id}/swagger`, appInfo.ncSiteUrl)
+                        openLink(`/api/v1/db/meta/projects/${base.id}/swagger`, appInfo.ncSiteUrl)
                      }
                    "
                  >
--- a/packages/nc-gui/components/dlg/AirtableImport.vue
+++ b/packages/nc-gui/components/dlg/AirtableImport.vue
@ -132,7 +132,7 @@ async function createOrUpdate() {
        body: payload,
      })
    } else {
-      syncSource.value = await $fetch(`/api/v1/db/meta/bases/${baseId}/syncs/${sourceId}`, {
+      syncSource.value = await $fetch(`/api/v1/db/meta/projects/${baseId}/syncs/${sourceId}`, {
        baseURL,
        method: 'POST',
        headers: { 'xc-auth': $state.token.value as string },
@ -184,7 +184,7 @@ async function listenForUpdates() {
 }

 async function loadSyncSrc() {
-  const data: any = await $fetch(`/api/v1/db/meta/bases/${baseId}/syncs/${sourceId}`, {
+  const data: any = await $fetch(`/api/v1/db/meta/projects/${baseId}/syncs/${sourceId}`, {
    baseURL,
    method: 'GET',
    headers: { 'xc-auth': $state.token.value as string },
--- a/packages/nc-gui/components/general/HelpAndSupport.vue
+++ b/packages/nc-gui/components/general/HelpAndSupport.vue
@ -10,7 +10,7 @@ const { base } = storeToRefs(useBase())
 const route = useRoute()

 const openSwaggerLink = () => {
-  openLink(`./api/v1/db/meta/bases/${route.params.baseId}/swagger`, appInfo.value.ncSiteUrl)
+  openLink(`./api/v1/db/meta/projects/${route.params.baseId}/swagger`, appInfo.value.ncSiteUrl)
 }
 </script>

--- a/packages/nocodb/src/models/Base.ts
+++ b/packages/nocodb/src/models/Base.ts
@ -387,7 +387,7 @@ export default class Base implements BaseType {
    return baseData?.id && this.get(baseData?.id, ncMeta);
  }

-  static async getByTitleOrId(titleOrId: string, ncMeta = Noco.ncMeta) {
+    static async getByTitleOrId(titleOrId: string, ncMeta = Noco.ncMeta) {
    const baseId =
      titleOrId &&
      (await NocoCache.get(
--- a/packages/nocodb/tests/unit/factory/table.ts
+++ b/packages/nocodb/tests/unit/factory/table.ts
@ -12,7 +12,7 @@ const defaultTableValue = (context) => ({
 const createTable = async (context, base, args = {}) => {
  const defaultValue = defaultTableValue(context);
  const response = await request(context.app)
-    .post(`/api/v1/db/meta/bases/${base.id}/tables`)
+    .post(`/api/v1/db/meta/projects/${base.id}/tables`)
    .set('xc-auth', context.token)
    .send({ ...defaultValue, ...args });

--- a/packages/nocodb/tests/unit/rest/tests/attachment.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/attachment.test.ts
@ -134,7 +134,7 @@ function attachmentTests() {

      // invite user to base with editor role
      await request(context.app)
-        .post(`/api/v1/db/meta/bases/${newProject.id}/users`)
+        .post(`/api/v1/db/meta/projects/${newProject.id}/users`)
        .set('xc-auth', context.token)
        .send({
          roles: ProjectRoles.EDITOR,
--- a/packages/nocodb/tests/unit/rest/tests/table.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/table.test.ts
@ -40,7 +40,7 @@ function tableStaticTests() {

  it('Get table list', async function () {
    const response = await request(context.app)
-      .get(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .get(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({})
      .expect(200);
@ -50,7 +50,7 @@ function tableStaticTests() {

  it('Create table with no table name', async function () {
    const response = await request(context.app)
-      .post(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .post(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({
        table_name: undefined,
@ -79,7 +79,7 @@ function tableStaticTests() {

  it('Create table with same table name', async function () {
    const response = await request(context.app)
-      .post(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .post(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({
        table_name: table.table_name,
@ -101,7 +101,7 @@ function tableStaticTests() {

  it('Create table with same title', async function () {
    const response = await request(context.app)
-      .post(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .post(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({
        table_name: 'New_table_name',
@ -123,7 +123,7 @@ function tableStaticTests() {

  it('Create table with title length more than the limit', async function () {
    const response = await request(context.app)
-      .post(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .post(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({
        table_name: 'a'.repeat(256),
@ -145,7 +145,7 @@ function tableStaticTests() {

  it('Create table with title having leading white space', async function () {
    const response = await request(context.app)
-      .post(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .post(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({
        table_name: 'table_name_with_whitespace ',
@ -186,7 +186,7 @@ function tableTest() {

  it('Create table', async function () {
    const response = await request(context.app)
-      .post(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .post(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({
        table_name: 'table2',
@ -282,7 +282,7 @@ function tableTest() {

  it('Add and delete view should update hasNonDefaultViews', async () => {
    let response = await request(context.app)
-      .get(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .get(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({})
      .expect(200);
@ -296,7 +296,7 @@ function tableTest() {
    });

    response = await request(context.app)
-      .get(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .get(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({})
      .expect(200);
@ -306,7 +306,7 @@ function tableTest() {
    await deleteView(context, { viewId: view.id });

    response = await request(context.app)
-      .get(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .get(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({})
      .expect(200);
@ -316,7 +316,7 @@ function tableTest() {

  it('Project with empty meta should update hasNonDefaultViews', async () => {
    let response = await request(context.app)
-      .get(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .get(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({})
      .expect(200);
@ -337,7 +337,7 @@ function tableTest() {
    });

    response = await request(context.app)
-      .get(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .get(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({})
      .expect(200);
@ -347,7 +347,7 @@ function tableTest() {
    await deleteView(context, { viewId: view.id });

    response = await request(context.app)
-      .get(`/api/v1/db/meta/bases/${base.id}/tables`)
+      .get(`/api/v1/db/meta/projects/${base.id}/tables`)
      .set('xc-auth', context.token)
      .send({})
      .expect(200);
--- a/tests/playwright/pages/Dashboard/Settings/Miscellaneous.ts
+++ b/tests/playwright/pages/Dashboard/Settings/Miscellaneous.ts
@ -25,7 +25,7 @@ export class MiscSettingsPage extends BasePage {
  async clickShowNullEmptyFilters() {
    await this.waitForResponse({
      uiAction: () => this.get().locator('input[type="checkbox"]').last().click(),
-      requestUrlPathToMatch: '/api/v1/db/meta/bases',
+      requestUrlPathToMatch: '/api/v1/db/meta/projects',
      httpMethodsToMatch: ['PATCH'],
    });
  }
--- a/tests/playwright/pages/Dashboard/ShareProjectButton/index.ts
+++ b/tests/playwright/pages/Dashboard/ShareProjectButton/index.ts
@ -108,7 +108,7 @@ export class ShareProjectButtonPage extends BasePage {
    await this.waitForResponse({
      uiAction: () => this.rootPage.getByTestId('docs-base-share-public-toggle').click(),
      httpMethodsToMatch: ['PATCH'],
-      requestUrlPathToMatch: `//api/v1/db/meta/bases`,
+      requestUrlPathToMatch: `//api/v1/db/meta/projects`,
    });
  }

--- a/tests/playwright/pages/Dashboard/Sidebar/index.ts
+++ b/tests/playwright/pages/Dashboard/Sidebar/index.ts
@ -74,7 +74,7 @@ export class SidebarPage extends BasePage {
    await this.waitForResponse({
      uiAction: () => this.dashboard.get().getByTestId('docs-create-proj-dlg-create-btn').click(),
      httpMethodsToMatch: ['POST'],
-      requestUrlPathToMatch: `/api/v1/db/meta/bases/`,
+      requestUrlPathToMatch: `/api/v1/db/meta/projects/`,
    });

    if (type === ProjectTypes.DOCUMENTATION) {
--- a/tests/playwright/pages/Dashboard/TreeView.ts
+++ b/tests/playwright/pages/Dashboard/TreeView.ts
@ -143,7 +143,7 @@ export class TreeViewPage extends BasePage {
    await this.waitForResponse({
      uiAction: () => this.dashboard.get().locator('button:has-text("Create Table")').click(),
      httpMethodsToMatch: ['POST'],
-      requestUrlPathToMatch: `/api/v1/db/meta/bases/`,
+      requestUrlPathToMatch: `/api/v1/db/meta/projects/`,
      responseJsonMatcher: json => json.title === title && json.type === 'table',
    });

--- a/tests/playwright/pages/ProjectsPage/index.ts
+++ b/tests/playwright/pages/ProjectsPage/index.ts
@ -41,7 +41,7 @@ export class ProjectsPage extends BasePage {
    await this.waitForResponse({
      uiAction: createProjectSubmitAction,
      httpMethodsToMatch: ['POST'],
-      requestUrlPathToMatch: '/api/v1/db/meta/bases/',
+      requestUrlPathToMatch: '/api/v1/db/meta/projects/',
    });

    // wait for dashboard to render
@ -103,7 +103,7 @@ export class ProjectsPage extends BasePage {
    const reloadUiAction = () => this.get().locator('[data-testid="bases-reload-button"]').click();
    await this.waitForResponse({
      uiAction: reloadUiAction,
-      requestUrlPathToMatch: '//api/v1/db/meta/bases',
+      requestUrlPathToMatch: '//api/v1/db/meta/projects',
      httpMethodsToMatch: ['GET'],
    });
  }
@ -145,7 +145,7 @@ export class ProjectsPage extends BasePage {
      }

      const isRequiredResponse =
-        res.request().url().includes('//api/v1/db/meta/bases') &&
+        res.request().url().includes('/api/v1/db/meta/projects') &&
        ['GET'].includes(res.request().method()) &&
        json?.title === title;

@ -180,7 +180,7 @@ export class ProjectsPage extends BasePage {
    await this.waitForResponse({
      uiAction: deleteProjectAction,
      httpMethodsToMatch: ['DELETE'],
-      requestUrlPathToMatch: '/api/v1/db/meta/bases/',
+      requestUrlPathToMatch: '/api/v1/db/meta/projects/',
    });

    await this.get().locator('.ant-table-row', { hasText: title }).waitFor({ state: 'hidden' });
@ -212,7 +212,7 @@ export class ProjectsPage extends BasePage {
    const submitAction = () => base.locator('input.nc-metadb-base-name').press('Enter');
    await this.waitForResponse({
      uiAction: submitAction,
-      requestUrlPathToMatch: '/api/v1/db/meta/bases/',
+      requestUrlPathToMatch: '/api/v1/db/meta/projects/',
      httpMethodsToMatch: ['PATCH'],
    });
  }
--- a/tests/playwright/pages/WorkspacePage/ContainerPage.ts
+++ b/tests/playwright/pages/WorkspacePage/ContainerPage.ts
@ -140,7 +140,7 @@ export class ContainerPage extends BasePage {
    await this.waitForResponse({
      uiAction: () => this.rootPage.locator('.nc-metadb-base-name').press('Enter'),
      httpMethodsToMatch: ['POST'],
-      requestUrlPathToMatch: `/api/v1/db/meta/bases`,
+      requestUrlPathToMatch: `/api/v1/db/meta/projects`,
    });
  }

@ -154,7 +154,7 @@ export class ContainerPage extends BasePage {
    await this.waitForResponse({
      uiAction: () => row.locator('td.ant-table-cell').nth(0).locator('input').press('Enter'),
      httpMethodsToMatch: ['PATCH'],
-      requestUrlPathToMatch: `/api/v1/db/meta/bases/`,
+      requestUrlPathToMatch: `/api/v1/db/meta/projects/`,
    });
  }

@ -185,7 +185,7 @@ export class ContainerPage extends BasePage {
    await this.waitForResponse({
      uiAction: () => this.rootPage.locator('.ant-modal-content').locator('button:has-text("Delete")').click(),
      httpMethodsToMatch: ['DELETE'],
-      requestUrlPathToMatch: `/api/v1/db/meta/bases/`,
+      requestUrlPathToMatch: `/api/v1/db/meta/projects/`,
    });
  }

--- a/tests/playwright/tests/db/features/swagger.spec.ts
+++ b/tests/playwright/tests/db/features/swagger.spec.ts
@ -17,7 +17,7 @@ test.describe('Swagger', () => {

  test('Create column', async () => {
    // access swagger link
-    const link = `http://localhost:8080/api/v1/db/meta/bases/${context.base.id}/swagger`;
+    const link = `http://localhost:8080/api/v1/db/meta/projects/${context.base.id}/swagger`;
    await dashboard.rootPage.goto(link);

    const swagger = dashboard.rootPage;