diff --git a/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue
index 3a845b81d0..181a0d18d3 100644
--- a/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue
+++ b/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue
@@ -23,9 +23,10 @@ interface Props {
   hookId?: string
   showLoading?: boolean
   modelValue?: Filter[]
+  webHook?: boolean
 }
 
-const { nested = false, parentId, autoSave = true, hookId = null, modelValue, showLoading = true } = defineProps<Props>()
+const { nested = false, parentId, autoSave = true, hookId = null, modelValue, showLoading = true, webHook } = defineProps<Props>()
 
 const emit = defineEmits(['update:filtersLength'])
 
@@ -101,13 +102,13 @@ const types = computed(() => {
 watch(
   () => activeView.value?.id,
   (n, o) => {
-    if (n !== o) loadFilters(hookId as string)
+    if (n !== o && (hookId || !webHook)) loadFilters(hookId as string)
   },
   { immediate: true },
 )
 
 watch(
-  () => filters.value.length,
+  () => filters.value.length ,
   (length) => {
     emit('update:filtersLength', length ?? 0)
   },
@@ -137,7 +138,7 @@ defineExpose({
     :class="{ 'shadow min-w-[430px] max-w-[630px] max-h-[max(80vh,500px)] overflow-auto': !nested, 'border-1 w-full': nested }"
   >
     <div v-if="filters && filters.length" class="nc-filter-grid mb-2" @click.stop>
-      <template v-for="(filter, i) in filters" :key="filter.id || i">
+      <template v-for="(filter, i) in filters" :key="i">
         <template v-if="filter.status !== 'delete'">
           <template v-if="filter.is_group">
             <MdiCloseBox
@@ -280,7 +281,7 @@ defineExpose({
           {{ $t('activity.addFilter') }}
         </div>
       </a-button>
-      <a-button class="text-capitalize !text-gray-500" @click.stop="addFilterGroup">
+      <a-button class="text-capitalize !text-gray-500" v-if="!webHook" @click.stop="addFilterGroup">
         <div class="flex items-center gap-1">
           <!--      <v-icon small color="grey"> mdi-plus </v-icon> -->
           <!--          Add Filter Group -->
diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue
index 72f277cf9f..9b9e2c7aec 100644
--- a/packages/nc-gui/components/webhook/Editor.vue
+++ b/packages/nc-gui/components/webhook/Editor.vue
@@ -619,6 +619,7 @@ onMounted(async () => {
               :auto-save="false"
               :show-loading="false"
               :hook-id="hook.id"
+              web-hook
             />
           </a-card>
         </a-col>
diff --git a/packages/nc-gui/composables/useGlobal/index.ts b/packages/nc-gui/composables/useGlobal/index.ts
index 49ead004bf..4591ff46a0 100644
--- a/packages/nc-gui/composables/useGlobal/index.ts
+++ b/packages/nc-gui/composables/useGlobal/index.ts
@@ -62,6 +62,22 @@ export const useGlobal = (): UseGlobalReturn => {
     { immediate: true },
   )
 
+  watch(
+    state.jwtPayload,
+    (nextPayload) => {
+      if (nextPayload) {
+        state.user.value = {
+          id: nextPayload.id,
+          email: nextPayload.email,
+          firstname: nextPayload.firstname,
+          lastname: nextPayload.lastname,
+          roles: nextPayload.roles,
+        }
+      }
+    },
+    { immediate: true },
+  )
+
   const globalState = { ...state, ...getters, ...actions } as UseGlobalReturn
 
   /** provide a fresh state instance into nuxt app */
diff --git a/packages/nc-gui/composables/useGlobal/state.ts b/packages/nc-gui/composables/useGlobal/state.ts
index 5c90a25002..09181dbf07 100644
--- a/packages/nc-gui/composables/useGlobal/state.ts
+++ b/packages/nc-gui/composables/useGlobal/state.ts
@@ -49,7 +49,6 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
   /** State */
   const initialState: StoredState = {
     token: null,
-    user: null,
     lang: preferredLanguage,
     darkMode: prefersDarkMode,
     feedbackForm: {
@@ -102,6 +101,9 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
   /** global error */
   const error = ref()
 
+  /** our local user object */
+  const user = ref<User | null>(null)
+
   return {
     ...toRefs(storage.value),
     storage,
@@ -110,6 +112,7 @@ export function useGlobalState(storageKey = 'nocodb-gui-v2'): State {
     timestamp,
     runningRequests,
     error,
+    user,
     appInfo,
   }
 }
diff --git a/packages/nc-gui/composables/useGlobal/types.ts b/packages/nc-gui/composables/useGlobal/types.ts
index f1ec9534ee..18939fb7df 100644
--- a/packages/nc-gui/composables/useGlobal/types.ts
+++ b/packages/nc-gui/composables/useGlobal/types.ts
@@ -29,7 +29,6 @@ export interface AppInfo {
 
 export interface StoredState {
   token: string | null
-  user: User | null
   lang: keyof typeof Language
   darkMode: boolean
   feedbackForm: FeedbackForm
@@ -43,6 +42,7 @@ export interface StoredState {
 
 export type State = ToRefs<Omit<StoredState, 'token'>> & {
   storage: Ref<StoredState>
+  user: Ref<User | null>
   token: WritableComputedRef<StoredState['token']>
   jwtPayload: ComputedRef<(JwtPayload & User) | null>
   timestamp: Ref<number>
diff --git a/packages/nc-gui/composables/useViewFilters.ts b/packages/nc-gui/composables/useViewFilters.ts
index 45863e1a46..f02697773d 100644
--- a/packages/nc-gui/composables/useViewFilters.ts
+++ b/packages/nc-gui/composables/useViewFilters.ts
@@ -183,12 +183,12 @@ export function useViewFilters(
   }
 
   const addFilter = () => {
-    filters.value.push(placeholderFilter)
+    filters.value.push({ ...placeholderFilter })
     $e('a:filter:add', { length: filters.value.length })
   }
 
   const addFilterGroup = async () => {
-    const child = placeholderFilter
+    const child = { ...placeholderFilter }
     const placeHolderGroupFilter: Filter = {
       is_group: true,
       status: 'create',
diff --git a/scripts/cypress/integration/common/1b_table_column_operations.js b/scripts/cypress/integration/common/1b_table_column_operations.js
index a7c0c00494..c6f5471ef2 100644
--- a/scripts/cypress/integration/common/1b_table_column_operations.js
+++ b/scripts/cypress/integration/common/1b_table_column_operations.js
@@ -65,13 +65,26 @@ export const genTest = (apiType, dbType) => {
                     .trigger("mouseover", { force: true })
                     .click({ force: true });
 
-                cy.get(".nc-column-edit").click();
-                cy.get(".nc-column-edit").should("not.be.visible");
+                // cy.get(".nc-column-edit").click();
+                // cy.get(".nc-column-edit").should("not.be.visible");
+                cy.getActiveMenu(".nc-dropdown-column-operations")
+                  .find(".nc-column-edit")
+                  .click();
 
                 // change column type and verify
-                cy.get(".nc-column-type-input").last().click();
-                cy.getActiveSelection('.nc-dropdown-column-type').find('.ant-select-item-option').contains("LongText").click();
-                cy.get(".ant-btn-primary:visible").contains("Save").click();
+                // cy.get(".nc-column-type-input").last().click();
+                cy.getActiveMenu('.nc-dropdown-edit-column')
+                  .find(".nc-column-type-input")
+                  .last()
+                  .click();
+                cy.getActiveSelection('.nc-dropdown-column-type')
+                  .find('.ant-select-item-option')
+                  .contains("LongText")
+                  .click();
+                cy.getActiveMenu('.nc-dropdown-edit-column')
+                  .find(".ant-btn-primary:visible")
+                  .contains("Save")
+                  .click();
 
                 cy.toastWait("Column updated");
             }
@@ -83,15 +96,22 @@ export const genTest = (apiType, dbType) => {
                 .trigger("mouseover", { force: true })
                 .click({ force: true });
 
-            cy.get(".nc-column-edit").click();
-            cy.get(".nc-column-edit").should("not.be.visible");
+            // cy.get(".nc-column-edit").click();
+            // cy.get(".nc-column-edit").should("not.be.visible");
+            cy.getActiveMenu(".nc-dropdown-column-operations")
+              .find(".nc-column-edit")
+              .click();
 
             // rename column and verify
             cy.getActiveMenu(".nc-dropdown-edit-column").find('input.nc-column-name-input', { timeout: 3000 })
                 .should('exist')
                 .clear()
                 .type(updatedColName);
-            cy.get(".ant-btn-primary:visible").contains("Save").click();
+            // cy.get(".ant-btn-primary:visible").contains("Save").click();
+            cy.getActiveMenu('.nc-dropdown-edit-column')
+              .find(".ant-btn-primary:visible")
+              .contains("Save")
+              .click();
 
             cy.toastWait("Column updated");
 
diff --git a/scripts/cypress/integration/common/3b_formula_column.js b/scripts/cypress/integration/common/3b_formula_column.js
index 9d6e0a6171..f79ab26b56 100644
--- a/scripts/cypress/integration/common/3b_formula_column.js
+++ b/scripts/cypress/integration/common/3b_formula_column.js
@@ -57,10 +57,25 @@ export const genTest = (apiType, dbType) => {
               .should('exist')
               .clear()
               .type(columnName);
-            cy.get(".nc-column-type-input").last().click().type("Formula");
-            cy.getActiveSelection('.nc-dropdown-column-type').find('.ant-select-item-option').contains("Formula").click();
-            cy.get('textarea.nc-formula-input').click().type(formula, { parseSpecialCharSequences: false });
-            cy.get(".ant-btn-primary").contains("Save").should('exist').click();
+            // cy.get(".nc-column-type-input").last().click().type("Formula");
+            cy.getActiveMenu('.nc-dropdown-grid-add-column')
+              .find(".nc-column-type-input")
+              .last()
+              .click()
+              .type("Formula");
+            cy.getActiveSelection('.nc-dropdown-column-type')
+              .find('.ant-select-item-option')
+              .contains("Formula")
+              .click();
+            cy.getActiveMenu('.nc-dropdown-grid-add-column')
+              .find('textarea.nc-formula-input')
+              .click()
+              .type(formula, { parseSpecialCharSequences: false });
+            // cy.get(".ant-btn-primary").contains("Save").should('exist').click();
+            cy.getActiveMenu('.nc-dropdown-grid-add-column')
+              .find(".ant-btn-primary:visible")
+              .contains("Save")
+              .click();
 
             // cy.toastWait(`Column created`);
             cy.closeTableTab("City");
@@ -82,8 +97,11 @@ export const genTest = (apiType, dbType) => {
               .trigger("mouseover", { force: true })
               .click({ force: true });
 
-            cy.get(".nc-column-edit").click();
-            cy.get(".nc-column-edit").should("not.be.visible");
+            // cy.get(".nc-column-edit").click();
+            // cy.get(".nc-column-edit").should("not.be.visible");
+            cy.getActiveMenu(".nc-dropdown-column-operations")
+              .find(".nc-column-edit")
+              .click();
 
             cy.getActiveMenu(".nc-dropdown-edit-column").find('input.nc-column-name-input', { timeout: 3000 })
               .should('exist')
diff --git a/scripts/cypress/integration/common/3c_lookup_column.js b/scripts/cypress/integration/common/3c_lookup_column.js
index 2656041826..6db00e01c4 100644
--- a/scripts/cypress/integration/common/3c_lookup_column.js
+++ b/scripts/cypress/integration/common/3c_lookup_column.js
@@ -48,21 +48,40 @@ export const genTest = (apiType, dbType) => {
                 force: true,
             });
 
-            cy.getActiveMenu(".nc-dropdown-grid-add-column").find('input.nc-column-name-input', { timeout: 3000 })
+            cy.getActiveMenu(".nc-dropdown-grid-add-column")
+              .find('input.nc-column-name-input')
               .should('exist')
               .clear()
               .type(childCol);
-            cy.get(".nc-column-type-input").last().click().type("Lookup");
-            cy.getActiveSelection('.nc-dropdown-column-type').find('.ant-select-item-option').contains("Lookup").click();
+            // cy.get(".nc-column-type-input").last().click().type("Lookup");
+            cy.getActiveMenu('.nc-dropdown-grid-add-column')
+              .find(".nc-column-type-input")
+              .last()
+              .click()
+              .type("Lookup");
+            cy.getActiveSelection('.nc-dropdown-column-type')
+              .find('.ant-select-item-option')
+              .contains("Lookup")
+              .click();
 
             // Configure Child table & column names
             fetchParentFromLabel("Child table");
-            cy.getActiveSelection('.nc-dropdown-relation-table').find('.ant-select-item-option').contains(childTable).click();
+            cy.getActiveSelection('.nc-dropdown-relation-table')
+              .find('.ant-select-item-option')
+              .contains(childTable)
+              .click();
 
             fetchParentFromLabel("Child column");
-            cy.getActiveSelection('.nc-dropdown-relation-column').find('.ant-select-item-option').contains(childCol).click();
-
-            cy.get(".ant-btn-primary").contains("Save").should('exist').click();
+            cy.getActiveSelection('.nc-dropdown-relation-column')
+              .find('.ant-select-item-option')
+              .contains(childCol)
+              .click();
+
+            // cy.get(".ant-btn-primary").contains("Save").should('exist').click();
+            cy.getActiveMenu('.nc-dropdown-grid-add-column')
+              .find(".ant-btn-primary:visible")
+              .contains("Save")
+              .click();
             cy.toastWait(`Column created`);
 
             cy.get(`th[data-title="${childCol}"]`).should("exist");
diff --git a/scripts/cypress/integration/common/3d_rollup_column.js b/scripts/cypress/integration/common/3d_rollup_column.js
index a3867b008d..7446611c9d 100644
--- a/scripts/cypress/integration/common/3d_rollup_column.js
+++ b/scripts/cypress/integration/common/3d_rollup_column.js
@@ -54,24 +54,46 @@ export const genTest = (apiType, dbType) => {
                 force: true,
             });
 
-            cy.getActiveMenu(".nc-dropdown-grid-add-column").find('input.nc-column-name-input', { timeout: 3000 })
+            cy.getActiveMenu(".nc-dropdown-grid-add-column")
+              .find('input.nc-column-name-input')
               .should('exist')
               .clear()
               .type(columnName);
-            cy.get(".nc-column-type-input").last().click().type("RollUp");
-            cy.getActiveSelection('.nc-dropdown-column-type').find('.ant-select-item-option').contains("Rollup").click();
+            // cy.get(".nc-column-type-input").last().click().type("RollUp");
+            cy.getActiveMenu('.nc-dropdown-grid-add-column')
+              .find(".nc-column-type-input")
+              .last()
+              .click()
+              .type("RollUp")
+            cy.getActiveSelection('.nc-dropdown-column-type')
+              .find('.ant-select-item-option')
+              .contains("Rollup")
+              .click();
 
             // Configure Child table & column names
             fetchParentFromLabel("Child table");
-            cy.getActiveSelection('.nc-dropdown-relation-table').find('.ant-select-item-option').contains(childTable).click();
+            cy.getActiveSelection('.nc-dropdown-relation-table')
+              .find('.ant-select-item-option')
+              .contains(childTable)
+              .click();
 
             fetchParentFromLabel("Child column");
-            cy.getActiveSelection('.nc-dropdown-relation-column').find('.ant-select-item-option').contains(childCol).click();
+            cy.getActiveSelection('.nc-dropdown-relation-column')
+              .find('.ant-select-item-option')
+              .contains(childCol)
+              .click();
 
             fetchParentFromLabel("Aggregate function");
-            cy.getActiveSelection('.nc-dropdown-rollup-function').find('.ant-select-item-option').contains(aggregateFunc).click();
-
-            cy.get(".ant-btn-primary").contains("Save").should('exist').click();
+            cy.getActiveSelection('.nc-dropdown-rollup-function')
+              .find('.ant-select-item-option')
+              .contains(aggregateFunc)
+              .click();
+
+            // cy.get(".ant-btn-primary").contains("Save").should('exist').click();
+            cy.getActiveMenu('.nc-dropdown-grid-add-column')
+              .find(".ant-btn-primary:visible")
+              .contains("Save")
+              .click();
             cy.toastWait(`Column created`);
 
             cy.get(`th[data-title="${columnName}"]`).should("exist");
@@ -85,26 +107,26 @@ export const genTest = (apiType, dbType) => {
 
         // routine to edit column
         //
-        const editColumnByName = (oldName, newName) => {
-            // verify if column exists before delete
-            cy.get(`th:contains(${oldName})`).should("exist");
-
-            // delete opiton visible on mouse-over
-            cy.get(`th:contains(${oldName}) .mdi-menu-down`)
-                .trigger("mouseover")
-                .click();
-
-            // edit/ save on pop-up
-            cy.get(".nc-column-edit").click();
-            cy.get(".nc-column-name-input input").clear().type(newName);
-            cy.get(".nc-col-create-or-edit-card").contains("Save").click();
-
-            cy.toastWait("Successfully updated alias");
-
-            // validate if deleted (column shouldnt exist)
-            cy.get(`th:contains(${oldName})`).should("not.exist");
-            cy.get(`th:contains(${newName})`).should("exist");
-        };
+        // const editColumnByName = (oldName, newName) => {
+        //     // verify if column exists before delete
+        //     cy.get(`th:contains(${oldName})`).should("exist");
+        //
+        //     // delete opiton visible on mouse-over
+        //     cy.get(`th:contains(${oldName}) .mdi-menu-down`)
+        //         .trigger("mouseover")
+        //         .click();
+        //
+        //     // edit/ save on pop-up
+        //     cy.get(".nc-column-edit").click();
+        //     cy.get(".nc-column-name-input input").clear().type(newName);
+        //     cy.get(".nc-col-create-or-edit-card").contains("Save").click();
+        //
+        //     cy.toastWait("Successfully updated alias");
+        //
+        //     // validate if deleted (column shouldnt exist)
+        //     cy.get(`th:contains(${oldName})`).should("not.exist");
+        //     cy.get(`th:contains(${newName})`).should("exist");
+        // };
 
         ///////////////////////////////////////////////////
         // Test case
@@ -134,7 +156,7 @@ export const genTest = (apiType, dbType) => {
                 .contains("2")
                 .should("exist");
 
-            editColumnByName("RollUpCol_1", "RollUpCol_New");
+            // editColumnByName("RollUpCol_1", "RollUpCol_New");
             deleteColumnByName("RollUpCol_New");
         });
     });
diff --git a/scripts/cypress/integration/common/3e_duration_column.js b/scripts/cypress/integration/common/3e_duration_column.js
index 7aae994389..ce1a4d327d 100644
--- a/scripts/cypress/integration/common/3e_duration_column.js
+++ b/scripts/cypress/integration/common/3e_duration_column.js
@@ -44,18 +44,34 @@ export const genTest = (apiType, dbType) => {
                 force: true,
             });
 
-            cy.getActiveMenu(".nc-dropdown-grid-add-column").find('input.nc-column-name-input', { timeout: 3000 })
+            cy.getActiveMenu(".nc-dropdown-grid-add-column")
+              .find('input.nc-column-name-input', { timeout: 3000 })
               .should('exist')
               .clear()
               .type(columnName);
-            cy.get(".nc-column-type-input").last().click().type("Duration");
-            cy.getActiveSelection('.nc-dropdown-column-type').find('.ant-select-item-option').contains("Duration").click();
+            // cy.get(".nc-column-type-input").last().click().type("Duration");
+            cy.getActiveMenu('.nc-dropdown-grid-add-column')
+              .find(".nc-column-type-input")
+              .last()
+              .click()
+              .type("Duration")
+            cy.getActiveSelection('.nc-dropdown-column-type')
+              .find('.ant-select-item-option')
+              .contains("Duration")
+              .click();
 
             // Configure Duration format
             fetchParentFromLabel("Duration Format");
-            cy.getActiveSelection('.nc-dropdown-duration-option').find('.ant-select-item-option').contains(durationFormat).click();
-
-            cy.get(".ant-btn-primary").contains("Save").should('exist').click();
+            cy.getActiveSelection('.nc-dropdown-duration-option')
+              .find('.ant-select-item-option')
+              .contains(durationFormat)
+              .click();
+
+            // cy.get(".ant-btn-primary").contains("Save").should('exist').click();
+            cy.getActiveMenu('.nc-dropdown-grid-add-column')
+              .find(".ant-btn-primary:visible")
+              .contains("Save")
+              .click();
             cy.toastWait(`Column created`);
 
             cy.get(`th[data-title="${columnName}"]`).should("exist");
@@ -75,19 +91,30 @@ export const genTest = (apiType, dbType) => {
               .trigger("mouseover", { force: true })
               .click({ force: true });
 
-            cy.get(".nc-column-edit").click();
-            cy.get(".nc-column-edit").should("not.be.visible");
+            // cy.get(".nc-column-edit").click();
+            // cy.get(".nc-column-edit").should("not.be.visible");
+            cy.getActiveMenu(".nc-dropdown-column-operations")
+              .find(".nc-column-edit")
+              .click();
 
             // rename column and verify
-            cy.getActiveMenu(".nc-dropdown-column-operations").find('input.nc-column-name-input', { timeout: 3000 })
+            cy.getActiveMenu(".nc-dropdown-edit-column")
+              .find('input.nc-column-name-input', { timeout: 3000 })
               .should('exist')
               .clear()
               .type(newName);
             // Configure Duration format
             fetchParentFromLabel("Duration Format");
-            cy.getActiveSelection('.nc-dropdown-duration-option').find('.ant-select-item-option').contains(newDurationFormat).click();
-
-            cy.get(".ant-btn-primary:visible").contains("Save").click();
+            cy.getActiveSelection('.nc-dropdown-duration-option')
+              .find('.ant-select-item-option')
+              .contains(newDurationFormat)
+              .click();
+
+            // cy.get(".ant-btn-primary:visible").contains("Save").click();
+            cy.getActiveMenu('.nc-dropdown-edit-column')
+              .find(".ant-btn-primary:visible")
+              .contains("Save")
+              .click();
 
             cy.toastWait("Column updated");
 
diff --git a/scripts/cypress/integration/common/3f_link_to_another_record.js b/scripts/cypress/integration/common/3f_link_to_another_record.js
index dc25b2c8e2..0a8ed1f7a1 100644
--- a/scripts/cypress/integration/common/3f_link_to_another_record.js
+++ b/scripts/cypress/integration/common/3f_link_to_another_record.js
@@ -37,12 +37,18 @@ export const genTest = (apiType, dbType) => {
         .type(columnName);
 
       // Column type
-      cy.get(".nc-column-type-input").last()
+      // cy.get(".nc-column-type-input").last()
+      //   .click()
+      //   .type("Link");
+      cy.getActiveMenu('.nc-dropdown-grid-add-column')
+        .find(".nc-column-type-input")
+        .last()
         .click()
-        .type("Link");
+        .type("Link")
       cy.getActiveSelection('.nc-dropdown-column-type')
         .find('.ant-select-item-option')
-        .contains("LinkToAnotherRecord").click();
+        .contains("LinkToAnotherRecord")
+        .click();
 
       // relation type (hm/ mm)
       cy.get('.nc-ltar-relation-type')
@@ -62,9 +68,13 @@ export const genTest = (apiType, dbType) => {
         .click();
 
       // Save
-      cy.get(".ant-btn-primary")
+      // cy.get(".ant-btn-primary")
+      //   .contains("Save")
+      //   .should('exist')
+      //   .click();
+      cy.getActiveMenu('.nc-dropdown-grid-add-column')
+        .find(".ant-btn-primary:visible")
         .contains("Save")
-        .should('exist')
         .click();
 
       // Toast
diff --git a/scripts/cypress/support/commands.js b/scripts/cypress/support/commands.js
index 51d09da98b..5c8725db8f 100644
--- a/scripts/cypress/support/commands.js
+++ b/scripts/cypress/support/commands.js
@@ -352,26 +352,26 @@ Cypress.Commands.add('renameTable', (oldName, newName) => {
 
 });
 
-Cypress.Commands.add('createColumn', (table, columnName) => {
-  cy.get('.nc-project-tree')
-    .find('.v-list-item__title:contains(Tables)')
-    .should('exist')
-    .first()
-    .click();
-  cy.get('.nc-project-tree')
-    .contains(table)
-    .should('exist')
-    .first()
-    .click({ force: true });
-  cy.get(`.project-tab:contains(${table}):visible`).should('exist');
-  cy.get('.v-window-item--active .nc-grid  tr > th:last button').click({
-    force: true,
-  });
-  cy.get('.nc-column-name-input input').clear().type(columnName);
-  cy.getActiveMenu('Menu_CreateColumn');
-  cy.get('.nc-col-create-or-edit-card').contains('Save').click();
-  cy.get('th:contains(new_column)').should('exist');
-});
+// Cypress.Commands.add('createColumn', (table, columnName) => {
+//   cy.get('.nc-project-tree')
+//     .find('.v-list-item__title:contains(Tables)')
+//     .should('exist')
+//     .first()
+//     .click();
+//   cy.get('.nc-project-tree')
+//     .contains(table)
+//     .should('exist')
+//     .first()
+//     .click({ force: true });
+//   cy.get(`.project-tab:contains(${table}):visible`).should('exist');
+//   cy.get('.v-window-item--active .nc-grid  tr > th:last button').click({
+//     force: true,
+//   });
+//   cy.get('.nc-column-name-input input').clear().type(columnName);
+//   cy.getActiveMenu('Menu_CreateColumn');
+//   cy.get('.nc-col-create-or-edit-card').contains('Save').click();
+//   cy.get('th:contains(new_column)').should('exist');
+// });
 
 Cypress.Commands.add('toastWait', (msg) => {
   cy.get('.ant-message-notice-content:visible', { timeout: 60000 }).contains(msg).should('exist');
diff --git a/scripts/cypress/support/page_objects/mainPage.js b/scripts/cypress/support/page_objects/mainPage.js
index 2a6314681b..2d12a9e7b5 100644
--- a/scripts/cypress/support/page_objects/mainPage.js
+++ b/scripts/cypress/support/page_objects/mainPage.js
@@ -7,541 +7,645 @@ const path = require("path");
  * slate before starting.
  */
 export const deleteDownloadsFolder = () => {
-    const downloadsFolder = Cypress.config("downloadsFolder");
-    cy.task("deleteFolder", downloadsFolder);
+  const downloadsFolder = Cypress.config("downloadsFolder");
+  cy.task("deleteFolder", downloadsFolder);
 };
 
 export class _settingsPage {
-    constructor() {
-        // menu
-        this.TEAM_N_AUTH = "teamAndAuth";
-        this.APPSTORE = "appStore";
-        this.PROJ_METADATA = "metaData";
-        this.AUDIT = "audit";
-
-        // submenu
-        this.USER_MANAGEMENT = "usersManagement";
-        this.API_TOKEN_MANAGEMENT = "apiTokenManagement";
-        this.APPS = "new";
-        this.METADATA = "metaData";
-        this.UI_ACCESS_CONTROL = "acl";
-        this.AUDIT_LOG = "audit";
-    }
-
-    openMenu(menuId) {
-        // open settings tab
-        // cy.get('.nc-team-settings').should('exist').click()
-        // cy.get(`[data-menu-id=${menuId}]`).should('exist').click()
-        cy.get('.nc-project-menu').should('exist').click()
-        cy.getActiveMenu(".nc-dropdown-project-menu").find(`[data-menu-id="teamAndSettings"]`).should('exist').click()
-        cy.get(`[data-menu-id=${menuId}]`).should('exist').click()
-    }
-
-    openTab(tabId) {
-        cy.get(`[data-menu-id=${tabId}]`).should('exist').last().click()
-    }
-
-    closeMenu() {
-        cy.getActiveModal().find('.nc-modal-close').click({ force: true });
-    }
-
-    openProjectMenu() {
-        cy.get('.nc-project-menu').should('exist').click()
-    }
+  constructor() {
+    // menu
+    this.TEAM_N_AUTH = "teamAndAuth";
+    this.APPSTORE = "appStore";
+    this.PROJ_METADATA = "metaData";
+    this.AUDIT = "audit";
+
+    // submenu
+    this.USER_MANAGEMENT = "usersManagement";
+    this.API_TOKEN_MANAGEMENT = "apiTokenManagement";
+    this.APPS = "new";
+    this.METADATA = "metaData";
+    this.UI_ACCESS_CONTROL = "acl";
+    this.AUDIT_LOG = "audit";
+  }
+
+  openMenu(menuId) {
+    // open settings tab
+    // cy.get('.nc-team-settings').should('exist').click()
+    // cy.get(`[data-menu-id=${menuId}]`).should('exist').click()
+    cy.get(".nc-project-menu").should("exist").click();
+    cy.getActiveMenu(".nc-dropdown-project-menu")
+      .find(`[data-menu-id="teamAndSettings"]`)
+      .should("exist")
+      .click();
+    cy.get(`[data-menu-id=${menuId}]`).should("exist").click();
+  }
+
+  openTab(tabId) {
+    cy.get(`[data-menu-id=${tabId}]`).should("exist").last().click();
+  }
+
+  closeMenu() {
+    cy.getActiveModal().find(".nc-modal-close").click({ force: true });
+  }
+
+  openProjectMenu() {
+    cy.get(".nc-project-menu").should("exist").click();
+  }
 }
 
 // main page
 export class _mainPage {
-    constructor() {
-
-        // Top Left items
-        this.HOME = 0;
-
-        this.AUDIT = 0;
-        this.APPSTORE = 2;
-        this.TEAM_N_AUTH = 3;
-        this.PROJ_METADATA = 4;
-        this.ROLE_VIEW = 5;
-        this.ROLE_VIEW_EDITOR = 6;
-        this.ROLE_VIEW_COMMENTER = 7;
-        this.ROLE_VIEW_VIEWER = 8;
-        this.ROLE_VIEW_RESET = 9;
-
-        this.roleURL = {};
+  constructor() {
+    // Top Left items
+    this.HOME = 0;
+
+    this.AUDIT = 0;
+    this.APPSTORE = 2;
+    this.TEAM_N_AUTH = 3;
+    this.PROJ_METADATA = 4;
+    this.ROLE_VIEW = 5;
+    this.ROLE_VIEW_EDITOR = 6;
+    this.ROLE_VIEW_COMMENTER = 7;
+    this.ROLE_VIEW_VIEWER = 8;
+    this.ROLE_VIEW_RESET = 9;
+
+    this.roleURL = {};
+  }
+
+  toolBarTopLeft(toolBarItem) {
+    return cy
+      .get("header.v-toolbar", { timeout: 20000 })
+      .eq(0)
+      .find("a")
+      .eq(toolBarItem);
+  }
+
+  toolBarTopRight(toolBarItem) {
+    return cy
+      .get("header.v-toolbar", { timeout: 20000 })
+      .eq(0)
+      .find("button")
+      .eq(toolBarItem);
+  }
+
+  navigationDraw(item) {
+    // open settings tab
+    cy.get(".nc-project-menu").should("exist").click();
+    cy.getActiveMenu(".nc-dropdown-project-menu")
+      .find(`[data-menu-id="teamAndSettings"]`)
+      .should("exist")
+      .click();
+
+    switch (item) {
+      case this.AUDIT:
+        return cy.get(".nc-settings-audit:visible").should("exist");
+      case this.APPSTORE:
+        return cy.get(".nc-settings-appstore:visible").should("exist");
+      case this.TEAM_N_AUTH:
+        return cy.get(".nc-settings-teamauth:visible").should("exist");
+      case this.PROJ_METADATA:
+        return cy.get(".nc-settings-projmeta:visible").should("exist");
     }
-
-    toolBarTopLeft(toolBarItem) {
-        return cy
-            .get("header.v-toolbar", { timeout: 20000 })
-            .eq(0)
-            .find("a")
-            .eq(toolBarItem);
-    }
-
-    toolBarTopRight(toolBarItem) {
-        return cy
-            .get("header.v-toolbar", { timeout: 20000 })
-            .eq(0)
-            .find("button")
-            .eq(toolBarItem);
-    }
-
-    navigationDraw(item) {
-        // open settings tab
-        cy.get('.nc-project-menu').should('exist').click()
-        cy.getActiveMenu(".nc-dropdown-project-menu").find(`[data-menu-id="teamAndSettings"]`).should('exist').click()
-
-        switch (item) {
-            case this.AUDIT:
-                return cy.get(".nc-settings-audit:visible").should("exist");
-            case this.APPSTORE:
-                return cy.get(".nc-settings-appstore:visible").should("exist");
-            case this.TEAM_N_AUTH:
-                return cy.get(".nc-settings-teamauth:visible").should("exist");
-            case this.PROJ_METADATA:
-                return cy.get(".nc-settings-projmeta:visible").should("exist");
-        }
-    }
-
-    // add new user to specified role
-    //
-    addNewUserToProject = (userCred, roleType) => {
-        let linkText;
-        let roleIndex = ["creator", "editor", "commenter", "viewer"].indexOf(roleType)
-
-        // click on New User button, feed details
-        cy.get('button.nc-invite-team').click();
-
-        cy.get('input[placeholder="E-mail"]')
-            .type(userCred.username)
-
-        cy.get('.ant-select.nc-user-roles').click();
-
-        // opt-in requested role & submit
-        // cy.getActiveSelection().contains(roleType).click({force: true});
-        cy.getActiveSelection('.nc-dropdown-user-role').find('.nc-role-option').eq(roleIndex).should('exist').click()
-        cy.getActiveModal(".nc-modal-invite-user-and-share-base").find("button.ant-btn-primary").click();
-
-        cy.toastWait("Successfully updated the user details");
-
-        // get URL, invoke
-        cy.getActiveModal(".nc-modal-invite-user-and-share-base")
-            .find(".ant-alert-message")
-            .then(($obj) => {
-                linkText = $obj.text().trim();
-                cy.log(linkText);
-                this.roleURL[roleType] = linkText;
-
-                cy.get("body").click("right");
-            });
-    };
-
-    // addExistingUserToProject = (emailId, role) => {
-    //     cy.get('.v-list-item:contains("Team & Auth")').click();
-    //     cy.get(`tr:contains(${emailId})`)
-    //         .find(".mdi-plus", { timeout: 2000 })
-    //         .click();
-    //     cy.get(`tr:contains(${emailId})`)
-    //         .find(".mdi-pencil-outline", { timeout: 2000 })
-    //         .click();
-    //
-    //     cy.get("label:contains(Select User Role)").click();
-    //
-    //     // opt-in requested role & submit
-    //     //
-    //     cy.getActiveMenu().contains(role).click();
-    //     cy.get(".nc-invite-or-save-btn").click();
-    //     cy.toastWait("Successfully updated the user details");
-    //
-    //     this.roleURL[role] =
-    //         "http://localhost:3000/#/user/authentication/signin";
-    // };
-
-    getCell = (columnHeader, cellNumber) => {
-        return cy.get(
-            `:nth-child(${cellNumber}) > [data-title="${columnHeader}"]`
-        ).last();
-    };
-
-    getPagination = (pageNumber) => {
-        if (pageNumber == "<")
-            return cy.get(".nc-pagination > .ant-pagination-prev");
-        if (pageNumber == ">")
-            return cy.get(".nc-pagination > .ant-pagination-next");
-
-        return cy.get(
-            `.nc-pagination > .ant-pagination-item.ant-pagination-item-${pageNumber}`
-        );
-    };
-
-    getRow = (rowIndex) => {
-        return cy.get(".xc-row-table").find("tr").eq(rowIndex);
-    };
-
-    addColumn = (colName, tableName) => {
-        cy.get(".nc-column-add").click({
-            force: true,
-        });
-
-        cy.getActiveMenu(".nc-dropdown-grid-add-column").find('input.nc-column-name-input', { timeout: 3000 })
-          .should('exist')
-          .clear()
-          .type(colName);
-        cy.get(".ant-btn-primary").contains("Save").should('exist').click();
-        cy.toastWait(`Column created`);
-        cy.get(`th[data-title="${colName}"]`).should("exist");
-    };
-
-    addColumnWithType = (colName, colType, tableName) => {
-        cy.get(".nc-column-add").click({
-            force: true,
-        });
-
-        cy.getActiveMenu(".nc-dropdown-grid-add-column").find('input.nc-column-name-input', { timeout: 3000 })
-          .should('exist')
-          .clear()
-          .type(colName);
-
-        // change column type and verify
-        cy.get(".nc-column-type-input").last().click();
-        cy.getActiveSelection('.nc-dropdown-column-type').find('.ant-select-item-option').contains(colType).click();
-        cy.get(".ant-btn-primary:visible").contains("Save").click();
-
-        cy.toastWait(`Column created`);
-        cy.get(`th[data-title="${colName}"]`).should("exist");
-    };
-
-    deleteColumn = (colName) => {
-        cy.get(`th:contains(${colName})`).should("exist");
-
-        cy.get(`th:contains(${colName}) .nc-icon.ant-dropdown-trigger`)
-          .trigger("mouseover", { force: true })
-          .click({ force: true });
-
-        cy.wait(500)
-
-        cy.get(".nc-column-delete").click();
-        cy.wait(500)
-        cy.get(".nc-column-delete").should("not.be.visible");
-        cy.get(".ant-btn-dangerous:visible").contains("Delete").click();
-        cy.wait(500)
-
-        cy.get(`th:contains(${colName})`).should("not.exist");
-    };
-
-    getAuthToken = () => {
-        let obj = JSON.parse(localStorage["vuex"]);
-        return obj["users"]["token"];
-    };
-
-    configureSMTP = (from, host, port, secure) => {
-        cy.getActiveModal().find('.nc-app-store-card-SMTP').click().then((obj) => {
-            cy.wrap(obj).find('.nc-app-store-card-install').click({ force: true });
-        })
-
-        cy.getActiveModal().find('#form_item_from').should('exist').clear().type(from)
-        cy.getActiveModal().find('#form_item_host').should('exist').clear().type(host)
-        cy.getActiveModal().find('#form_item_port').should('exist').clear().type(port)
-        // cy.getActiveModal().find('#form_item_secure').should('exist').clear().type(secure)
-        cy.getActiveModal().find("button").contains("Save").click();
-
-        cy.toastWait('Successfully installed and email notification will use SMTP configuration');
-        settingsPage.closeMenu()
-    };
-
-    resetSMTP = () => {
-        cy.getActiveModal().find('.nc-app-store-card-SMTP').click().then((obj) => {
-            cy.wrap(obj).find('.nc-app-store-card-reset').click({ force: true });
-        })
-        cy.getActiveModal().find("button").contains("Confirm").click();
-
-        cy.toastWait("Plugin uninstalled successfully");
-        settingsPage.closeMenu()
-    };
-
-    shareView = () => {
-        return cy.get(".nc-btn-share-view").should("exist");
-    };
-
-    shareViewList = () => {
-        cy.get(".nc-actions-menu-btn").should('exist').click();
-        return cy.getActiveMenu(".nc-dropdown-actions-menu").find('.ant-dropdown-menu-item').contains('Shared View List');
-    };
-
-    downloadCsv = () => {
-        cy.get(".nc-actions-menu-btn").should('exist').click();
-        return cy.getActiveMenu(".nc-dropdown-actions-menu").find('.ant-dropdown-menu-item').contains('Download as CSV');
-    };
-
-    downloadExcel = () => {
-        cy.get(".nc-actions-menu-btn").should('exist').click();
-        return cy.getActiveMenu(".nc-dropdown-actions-menu").find('.ant-dropdown-menu-item').contains('Download as XLSX');
-    };
-
-    uploadCsv = () => {
-        cy.get(".nc-actions-menu-btn").should('exist').click();
-        return cy.getActiveMenu(".nc-dropdown-actions-menu").find('.ant-dropdown-menu-item').contains('Upload CSV');
-    };
-
-    automations = () => {
-        cy.get(".nc-actions-menu-btn").should('exist').click();
-        return cy.getActiveMenu(".nc-dropdown-actions-menu").find('.ant-dropdown-menu-item').contains('Webhooks');
-    };
-
-    hideAllColumns = () => {
-        cy.get(".nc-fields-menu-btn").should('exist').click();
-        cy.getActiveMenu(".nc-dropdown-fields-menu").find('.ant-btn').contains('Hide all').click();
-        cy.get(".nc-fields-menu-btn").should('exist').click();
+  }
+
+  // add new user to specified role
+  //
+  addNewUserToProject = (userCred, roleType) => {
+    let linkText;
+    let roleIndex = ["creator", "editor", "commenter", "viewer"].indexOf(
+      roleType
+    );
+
+    // click on New User button, feed details
+    cy.get("button.nc-invite-team").click();
+
+    cy.get('input[placeholder="E-mail"]').type(userCred.username);
+
+    cy.get(".ant-select.nc-user-roles").click();
+
+    // opt-in requested role & submit
+    // cy.getActiveSelection().contains(roleType).click({force: true});
+    cy.getActiveSelection(".nc-dropdown-user-role")
+      .find(".nc-role-option")
+      .eq(roleIndex)
+      .should("exist")
+      .click();
+    cy.getActiveModal(".nc-modal-invite-user-and-share-base")
+      .find("button.ant-btn-primary")
+      .click();
+
+    cy.toastWait("Successfully updated the user details");
+
+    // get URL, invoke
+    cy.getActiveModal(".nc-modal-invite-user-and-share-base")
+      .find(".ant-alert-message")
+      .then(($obj) => {
+        linkText = $obj.text().trim();
+        cy.log(linkText);
+        this.roleURL[roleType] = linkText;
+
+        cy.get("body").click("right");
+      });
+  };
+
+  // addExistingUserToProject = (emailId, role) => {
+  //     cy.get('.v-list-item:contains("Team & Auth")').click();
+  //     cy.get(`tr:contains(${emailId})`)
+  //         .find(".mdi-plus", { timeout: 2000 })
+  //         .click();
+  //     cy.get(`tr:contains(${emailId})`)
+  //         .find(".mdi-pencil-outline", { timeout: 2000 })
+  //         .click();
+  //
+  //     cy.get("label:contains(Select User Role)").click();
+  //
+  //     // opt-in requested role & submit
+  //     //
+  //     cy.getActiveMenu().contains(role).click();
+  //     cy.get(".nc-invite-or-save-btn").click();
+  //     cy.toastWait("Successfully updated the user details");
+  //
+  //     this.roleURL[role] =
+  //         "http://localhost:3000/#/user/authentication/signin";
+  // };
+
+  getCell = (columnHeader, cellNumber) => {
+    return cy
+      .get(`:nth-child(${cellNumber}) > [data-title="${columnHeader}"]`)
+      .last();
+  };
+
+  getPagination = (pageNumber) => {
+    if (pageNumber == "<")
+      return cy.get(".nc-pagination > .ant-pagination-prev");
+    if (pageNumber == ">")
+      return cy.get(".nc-pagination > .ant-pagination-next");
+
+    return cy.get(
+      `.nc-pagination > .ant-pagination-item.ant-pagination-item-${pageNumber}`
+    );
+  };
+
+  getRow = (rowIndex) => {
+    return cy.get(".xc-row-table").find("tr").eq(rowIndex);
+  };
+
+  addColumn = (colName, tableName) => {
+    cy.get(".nc-column-add").click({
+      force: true,
+    });
+
+    cy.getActiveMenu(".nc-dropdown-grid-add-column")
+      .find("input.nc-column-name-input")
+      .should("exist")
+      .clear()
+      .type(colName);
+    cy.getActiveMenu(".nc-dropdown-grid-add-column")
+      .find(".ant-btn-primary")
+      .contains("Save")
+      .should("exist")
+      .click();
+    cy.toastWait(`Column created`);
+    cy.get(`th[data-title="${colName}"]`).should("exist");
+  };
+
+  addColumnWithType = (colName, colType, tableName) => {
+    cy.get(".nc-column-add").click({
+      force: true,
+    });
+
+    cy.getActiveMenu(".nc-dropdown-grid-add-column")
+      .find("input.nc-column-name-input")
+      .should("exist")
+      .clear()
+      .type(colName);
+
+    // change column type and verify
+    // cy.get(".nc-column-type-input").last().click();
+    cy.getActiveMenu(".nc-dropdown-grid-add-column")
+      .find(".nc-column-type-input")
+      .last()
+      .click();
+    cy.getActiveSelection(".nc-dropdown-column-type")
+      .find(".ant-select-item-option")
+      .contains(colType)
+      .click();
+    // cy.get(".ant-btn-primary:visible").contains("Save").click();
+    cy.getActiveMenu(".nc-dropdown-grid-add-column")
+      .find(".ant-btn-primary:visible")
+      .contains("Save")
+      .click();
+
+    cy.toastWait(`Column created`);
+    cy.get(`th[data-title="${colName}"]`).should("exist");
+  };
+
+  deleteColumn = (colName) => {
+    cy.get(`th:contains(${colName})`).should("exist");
+
+    cy.get(`th:contains(${colName}) .nc-icon.ant-dropdown-trigger`)
+      .trigger("mouseover", { force: true })
+      .click({ force: true });
+
+    cy.wait(500);
+
+    cy.get(".nc-column-delete").click();
+    cy.wait(500);
+    cy.get(".nc-column-delete").should("not.be.visible");
+    cy.get(".ant-btn-dangerous:visible").contains("Delete").click();
+    cy.wait(500);
+
+    cy.get(`th:contains(${colName})`).should("not.exist");
+  };
+
+  getAuthToken = () => {
+    let obj = JSON.parse(localStorage["vuex"]);
+    return obj["users"]["token"];
+  };
+
+  configureSMTP = (from, host, port, secure) => {
+    cy.getActiveModal()
+      .find(".nc-app-store-card-SMTP")
+      .click()
+      .then((obj) => {
+        cy.wrap(obj).find(".nc-app-store-card-install").click({ force: true });
+      });
+
+    cy.getActiveModal()
+      .find("#form_item_from")
+      .should("exist")
+      .clear()
+      .type(from);
+    cy.getActiveModal()
+      .find("#form_item_host")
+      .should("exist")
+      .clear()
+      .type(host);
+    cy.getActiveModal()
+      .find("#form_item_port")
+      .should("exist")
+      .clear()
+      .type(port);
+    // cy.getActiveModal().find('#form_item_secure').should('exist').clear().type(secure)
+    cy.getActiveModal().find("button").contains("Save").click();
+
+    cy.toastWait(
+      "Successfully installed and email notification will use SMTP configuration"
+    );
+    settingsPage.closeMenu();
+  };
+
+  resetSMTP = () => {
+    cy.getActiveModal()
+      .find(".nc-app-store-card-SMTP")
+      .click()
+      .then((obj) => {
+        cy.wrap(obj).find(".nc-app-store-card-reset").click({ force: true });
+      });
+    cy.getActiveModal().find("button").contains("Confirm").click();
+
+    cy.toastWait("Plugin uninstalled successfully");
+    settingsPage.closeMenu();
+  };
+
+  shareView = () => {
+    return cy.get(".nc-btn-share-view").should("exist");
+  };
+
+  shareViewList = () => {
+    cy.get(".nc-actions-menu-btn").should("exist").click();
+    return cy
+      .getActiveMenu(".nc-dropdown-actions-menu")
+      .find(".ant-dropdown-menu-item")
+      .contains("Shared View List");
+  };
+
+  downloadCsv = () => {
+    cy.get(".nc-actions-menu-btn").should("exist").click();
+    return cy
+      .getActiveMenu(".nc-dropdown-actions-menu")
+      .find(".ant-dropdown-menu-item")
+      .contains("Download as CSV");
+  };
+
+  downloadExcel = () => {
+    cy.get(".nc-actions-menu-btn").should("exist").click();
+    return cy
+      .getActiveMenu(".nc-dropdown-actions-menu")
+      .find(".ant-dropdown-menu-item")
+      .contains("Download as XLSX");
+  };
+
+  uploadCsv = () => {
+    cy.get(".nc-actions-menu-btn").should("exist").click();
+    return cy
+      .getActiveMenu(".nc-dropdown-actions-menu")
+      .find(".ant-dropdown-menu-item")
+      .contains("Upload CSV");
+  };
+
+  automations = () => {
+    cy.get(".nc-actions-menu-btn").should("exist").click();
+    return cy
+      .getActiveMenu(".nc-dropdown-actions-menu")
+      .find(".ant-dropdown-menu-item")
+      .contains("Webhooks");
+  };
+
+  hideAllColumns = () => {
+    cy.get(".nc-fields-menu-btn").should("exist").click();
+    cy.getActiveMenu(".nc-dropdown-fields-menu")
+      .find(".ant-btn")
+      .contains("Hide all")
+      .click();
+    cy.get(".nc-fields-menu-btn").should("exist").click();
+  };
+
+  showAllColumns = () => {
+    cy.get(".nc-fields-menu-btn").should("exist").click();
+    cy.getActiveMenu(".nc-dropdown-fields-menu")
+      .find(".ant-btn")
+      .contains("Show all")
+      .click();
+    cy.get(".nc-fields-menu-btn").should("exist").click();
+  };
+
+  toggleShowSystemFields = () => {
+    cy.get(".nc-fields-menu-btn").should("exist").click();
+    cy.getActiveMenu(".nc-dropdown-fields-menu")
+      .find(".nc-fields-show-system-fields")
+      .click();
+    cy.get(".nc-fields-menu-btn").should("exist").click();
+  };
+
+  hideField = (field) => {
+    cy.get(`th[data-title="${field}"]`).should("be.visible");
+    cy.get(".nc-fields-menu-btn").click();
+    // cy.getActiveMenu(".nc-dropdown-fields-menu")
+    //   .find(`.nc-fields-list label:contains(${field}):visible`)
+    //   .click();
+    cy.getActiveMenu(".nc-dropdown-fields-menu")
+      .find(`.nc-fields-list label:visible`)
+      .contains(new RegExp("^" + field + "$", "g"))
+      .click();
+    cy.get(".nc-fields-menu-btn").click();
+    cy.get(`th[data-title="${field}"]`).should("not.exist");
+  };
+
+  unhideField = (field, viewType = "grid") => {
+    if (viewType === "grid") {
+      cy.get(`th[data-title="${field}"]`).should("not.exist");
     }
-
-    showAllColumns = () => {
-        cy.get(".nc-fields-menu-btn").should('exist').click();
-        cy.getActiveMenu(".nc-dropdown-fields-menu").find('.ant-btn').contains('Show all').click();
-        cy.get(".nc-fields-menu-btn").should('exist').click();
+    cy.get(`th[data-title="${field}"]`).should("not.exist");
+    cy.get(".nc-fields-menu-btn").click();
+    // cy.getActiveMenu(".nc-dropdown-fields-menu")
+    //   .find(`.nc-fields-list label:contains(${field}):visible`)
+    //   .click();
+    cy.getActiveMenu(".nc-dropdown-fields-menu")
+      .find(`.nc-fields-list label:visible`)
+      .contains(new RegExp("^" + field + "$", "g"))
+      .click();
+    cy.get(".nc-fields-menu-btn").click();
+    if (viewType === "grid") {
+      cy.get(`th[data-title="${field}"]`).should("be.visible");
     }
-
-    toggleShowSystemFields = () => {
-        cy.get(".nc-fields-menu-btn").should('exist').click();
-        cy.getActiveMenu(".nc-dropdown-fields-menu").find('.nc-fields-show-system-fields').click();
-        cy.get(".nc-fields-menu-btn").should('exist').click();
+  };
+
+  sortField = (field, criteria) => {
+    cy.get(".nc-sort-menu-btn").click();
+    cy.getActiveMenu(".nc-dropdown-sort-menu")
+      .find(".ant-btn-primary")
+      .contains("Add Sort Option")
+      .click();
+    cy.getActiveMenu(".nc-dropdown-sort-menu")
+      .find(".nc-sort-field-select div")
+      .first()
+      .click();
+    cy.getActiveSelection(".nc-dropdown-toolbar-field-list")
+      .find(`.ant-select-item`)
+      .contains(new RegExp("^" + field + "$", "g"))
+      .should("exist")
+      .click();
+    cy.getActiveMenu(".nc-dropdown-sort-menu")
+      .find(".nc-sort-dir-select div")
+      .first()
+      .click();
+    cy.getActiveSelection(".nc-dropdown-sort-dir")
+      .find(`.ant-select-item`)
+      .contains(criteria)
+      .should("exist")
+      .click();
+    cy.get(".nc-sort-menu-btn").click();
+  };
+
+  clearSort = () => {
+    cy.get(".nc-sort-menu-btn").click();
+    cy.getActiveMenu(".nc-dropdown-sort-menu")
+      .find(".nc-sort-item-remove-btn")
+      .click();
+    cy.getActiveMenu(".nc-dropdown-sort-menu")
+      .find(".nc-sort-item-remove-btn:visible")
+      .should("not.exist");
+    cy.get(".nc-sort-menu-btn").click();
+  };
+
+  filterField = (field, operation, value) => {
+    cy.get(".nc-filter-menu-btn").click();
+    cy.getActiveMenu(".nc-dropdown-filter-menu")
+      .find(".ant-btn-primary")
+      .contains("Add Filter")
+      .click();
+    cy.getActiveMenu(".nc-dropdown-filter-menu")
+      .find(".nc-filter-field-select")
+      .should("exist")
+      .last()
+      .click();
+    cy.getActiveSelection(".nc-dropdown-toolbar-field-list")
+      .find(`.ant-select-item`)
+      .contains(new RegExp("^" + field + "$", "g"))
+      .should("exist")
+      .click();
+    cy.getActiveMenu(".nc-dropdown-filter-menu")
+      .find(".nc-filter-operation-select")
+      .should("exist")
+      .last()
+      .click();
+    cy.getActiveSelection(".nc-dropdown-filter-comp-op")
+      .find(`.ant-select-item`)
+      .contains(operation)
+      .should("exist")
+      .click();
+    if (operation != "is null" && operation != "is not null") {
+      cy.get(".nc-filter-value-select").should("exist").last().type(value);
     }
-
-    hideField = (field) => {
-        cy.get(`th[data-title="${field}"]`).should("be.visible");
-        cy.get(".nc-fields-menu-btn").click();
-        cy.wait(500)
-        cy.getActiveMenu(".nc-dropdown-fields-menu").find(`.nc-fields-list label:visible`).contains(new RegExp("^" + field + "$", "g")).click();
-        cy.wait(500)
-        cy.get(".nc-fields-menu-btn").click();
-        cy.wait(500)
-        cy.get(`th[data-title="${field}"]`).should("not.exist");
-    };
-
-    unhideField = (field, viewType = 'grid') => {
-        if(viewType === 'grid') {
-            cy.get(`th[data-title="${field}"]`).should("not.exist");
-        }
-        cy.get(".nc-fields-menu-btn").click();
-        cy.wait(500)
-        cy.getActiveMenu(".nc-dropdown-fields-menu").find(`.nc-fields-list label:visible`).contains(new RegExp("^" + field + "$", "g")).click();
-        cy.wait(500)
-        cy.get(".nc-fields-menu-btn").click();
-        cy.wait(500)
-
-        if(viewType === 'grid') {
-            cy.get(`th[data-title="${field}"]`).should("be.visible");
-        }
-    };
-
-    sortField = (field, criteria) => {
-        cy.get(".nc-sort-menu-btn").click();
-        cy.wait(500)
-        cy.getActiveMenu('.nc-dropdown-sort-menu').contains("Add Sort Option").click();
-        cy.wait(500)
-        // cy.get(".nc-sort-field-select div").first().click().type(field);
-        cy.get(".nc-sort-field-select div").first().click();
-        cy.wait(500)
-        cy.get('.ant-select-dropdown:visible').find(`.ant-select-item`).contains(new RegExp("^" + field + "$", "g")).should('exist').click();
-        cy.wait(500)
-        cy.get(".nc-sort-dir-select div").first().click();
-        cy.wait(500)
-        cy.get('.sort-dir-dropdown.ant-select-dropdown:visible').find(`.ant-select-item`).contains(criteria).should('exist').click();
-        cy.wait(500)
-        cy.get(".nc-sort-menu-btn").click();
-        cy.wait(500)
-    };
-
-    clearSort = () => {
-        cy.get(".nc-sort-menu-btn").click();
-        cy.wait(500)
-        cy.get(".nc-sort-item-remove-btn").click();
-        cy.wait(500)
-        cy.get(".nc-sort-item-remove-btn:visible").should("not.exist");
-        cy.get(".nc-sort-menu-btn").click();
-        cy.wait(500)
-
-    };
-
-    filterField = (field, operation, value) => {
-        cy.get(".nc-filter-menu-btn").click();
-        cy.wait(500)
-        cy.contains("Add Filter").click();
-        cy.wait(500)
-        // cy.get(".nc-filter-field-select").should("exist").last().click().type(field);
-        cy.get(".nc-filter-field-select").should("exist").last().click();
-        cy.wait(500)
-        cy.get('.ant-select-dropdown:visible').should('exist').find(`.ant-select-item`).contains(new RegExp("^" + field + "$", "g")).should('exist').click();
-        cy.wait(500)
-        cy.get(".nc-filter-operation-select").should("exist").last().click();
-        cy.wait(500)
-        cy.get('.ant-select-dropdown:visible').should('exist').find(`.ant-select-item`).contains(operation).should('exist').click();
-        cy.wait(500)
-        if (operation != "is null" && operation != "is not null") {
-            cy.get(".nc-filter-value-select")
-                .should("exist")
-                .last()
-                .type(value);
-            cy.get(".nc-filter-operation-select").last().click();
-            cy.wait(500)
-        }
-        cy.get(".nc-filter-menu-btn").click();
-        cy.wait(500)
-    };
-
-    filterReset = () => {
-        cy.get(".nc-filter-menu-btn").click();
-        cy.wait(500)
-        cy.get(".nc-filter-item-remove-btn").click();
-        cy.wait(500)
-        cy.get(".nc-filter-item-remove-btn").should("not.exist");
-        cy.get(".nc-filter-menu-btn").click();
-        cy.wait(500)
-    };
-
-    // delete created views
-    //
-    deleteCreatedViews = () => {
-        this.shareViewList().click();
-
-        cy.get('th:contains("View Link")')
-            .should("be.visible")
-            .parent()
-            .parent()
-            .next()
-            .find("tr")
-            .each(($tableRow) => {
-                cy.log($tableRow[0].childElementCount);
-
-                // one of the row would contain seggregation header ('other views)
-                if (5 == $tableRow[0].childElementCount) {
-                    cy.wrap($tableRow).find(".nc-icon").last().click();
-                    cy.wait(100);
-                }
-            })
-            .then(() => {
-                cy.toastWait("Deleted shared view successfully");
-                cy.getActiveModal().find("button.ant-modal-close").should('exist').click();
-            });
-    };
-
-    // download CSV & verify
-    // download folder is configurable in cypress.
-    //      trigger download
-    //      wait for a while & check in configured download folder for the intended file
-    //      if it exists, verify it against 'expectedRecords' passed in as parameter
-    //
-    downloadAndVerifyCsv = (filename, verifyCsv, role) => {
-
-        if(role === 'commenter' || role === 'viewer') {
-            cy.get(".nc-actions-menu-btn").click();
-            cy.getActiveMenu(".nc-dropdown-actions-menu").find('.nc-project-menu-item').contains('Download as CSV').click();
-        } else {
-            cy.get(".nc-actions-menu-btn").click();
-            cy.getActiveMenu(".nc-dropdown-actions-menu").find('.nc-project-menu-item').contains('Download').click();
-            cy.wait(1000);
-            cy.get('.nc-project-menu-item').contains('Download as CSV').should('exist').click();
+    cy.get(".nc-filter-menu-btn").click();
+  };
+
+  filterReset = () => {
+    cy.get(".nc-filter-menu-btn").click();
+    cy.getActiveMenu(".nc-dropdown-filter-menu")
+      .find(".nc-filter-item-remove-btn")
+      .click();
+    cy.getActiveMenu(".nc-dropdown-filter-menu")
+      .find(".nc-filter-item-remove-btn")
+      .should("not.exist");
+    cy.get(".nc-filter-menu-btn").click();
+  };
+
+  // delete created views
+  //
+  deleteCreatedViews = () => {
+    this.shareViewList().click();
+
+    cy.get('th:contains("View Link")')
+      .should("be.visible")
+      .parent()
+      .parent()
+      .next()
+      .find("tr")
+      .each(($tableRow) => {
+        cy.log($tableRow[0].childElementCount);
+
+        // one of the row would contain seggregation header ('other views)
+        if (5 == $tableRow[0].childElementCount) {
+          cy.wrap($tableRow).find(".nc-icon").last().click();
+          cy.wait(100);
         }
-
-        cy.toastWait("Successfully exported all table data").then(() => {
-            // download folder path, read from config file
-            const downloadsFolder = Cypress.config("downloadsFolder");
-            let filePath = path.join(downloadsFolder, filename);
-
-            // append download folder path with filename to generate full file path, retrieve file
-            cy.readFile(filePath).then((fileData) => {
-                // from CSV, split into records (rows)
-                const rows = fileData.replace(/\r\n/g, "\n").split("\n");
-                verifyCsv(rows);
-                deleteDownloadsFolder();
-            });
-        });
-    };
-
-    downloadAndVerifyCsvFromSharedView = (filename, verifyCsv) => {
-        cy.get(".nc-actions-menu-btn").click();
-        cy.get('.nc-project-menu-item').contains('Download as CSV').should('exist').click();
-
-        cy.toastWait("Successfully exported all table data").then(() => {
-            // download folder path, read from config file
-            const downloadsFolder = Cypress.config("downloadsFolder");
-            let filePath = path.join(downloadsFolder, filename);
-
-            // append download folder path with filename to generate full file path, retrieve file
-            cy.readFile(filePath).then((fileData) => {
-                // from CSV, split into records (rows)
-                const rows = fileData.replace(/\r\n/g, "\n").split("\n");
-                verifyCsv(rows);
-                deleteDownloadsFolder();
-            });
-        });
-    };
-
-    getIFrameCell = (columnHeader, cellNumber) => {
-        return cy
-            .iframe()
-            .find(
-                `tbody > :nth-child(${cellNumber}) > [data-col="${columnHeader}"]`
-            );
-    };
-
-    // https://docs.cypress.io/guides/core-concepts/variables-and-aliases#Sharing-Context
-    getDatatype = (tableName, columnName) => {
-        cy.window().then((win) => {
-            const col = win.$nuxt.$store.state.meta.metas[tableName].columns;
-            let dataType = "";
-            col.forEach((element) => {
-                if (element.cn == columnName) dataType = element.uidt;
-            });
-            cy.wrap(dataType).as("ncDatatype");
-        });
-    };
-
-    openMetaTab() {
-        // open Project metadata tab
-        //
-        settingsPage.openMenu(settingsPage.PROJ_METADATA)
-        settingsPage.openTab(settingsPage.METADATA)
-    }
-
-    closeMetaTab() {
-        // close Project metadata tab
-        settingsPage.closeMenu()
-    }
-
-    metaSyncValidate(tbl, msg) {
-        cy.get(".nc-btn-metasync-reload")
-            .should("exist")
-            .click();
-        cy.wait(2000);
-        cy.get(`.nc-metasync-row-${tbl}`).contains(msg).should("exist");
-        cy.get(".nc-btn-metasync-sync-now")
-            .should("exist")
-            .click()
-            .then(() => {
-                cy.toastWait(`Table metadata recreated successfully`);
-            });
-        cy.get(".nc-metasync-row").then((row) => {
-            for (let i = 0; i < row.length; i++) {
-                cy.wrap(row).contains("No change identified").should("exist");
-            }
-        });
+      })
+      .then(() => {
+        cy.toastWait("Deleted shared view successfully");
+        cy.getActiveModal()
+          .find("button.ant-modal-close")
+          .should("exist")
+          .click();
+      });
+  };
+
+  // download CSV & verify
+  // download folder is configurable in cypress.
+  //      trigger download
+  //      wait for a while & check in configured download folder for the intended file
+  //      if it exists, verify it against 'expectedRecords' passed in as parameter
+  //
+  downloadAndVerifyCsv = (filename, verifyCsv, role) => {
+    if (role === "commenter" || role === "viewer") {
+      cy.get(".nc-actions-menu-btn").click();
+      cy.getActiveMenu(".nc-dropdown-actions-menu")
+        .find(".nc-project-menu-item")
+        .contains("Download as CSV")
+        .click();
+    } else {
+      cy.get(".nc-actions-menu-btn").click();
+      cy.getActiveMenu(".nc-dropdown-actions-menu")
+        .find(".nc-project-menu-item")
+        .contains("Download")
+        .click();
+      cy.wait(1000);
+      cy.get(".nc-project-menu-item")
+        .contains("Download as CSV")
+        .should("exist")
+        .click();
     }
 
-    tabReset() {
-        // temporary disable (kludge)
-        // mainPage.toolBarTopLeft(mainPage.HOME).click({ force: true });
-        // cy.get(".project-row").should("exist").click({ force: true });
-        // projectsPage.waitHomePageLoad();
-        // option-2
-        // cy.openTableTab("Country", 0);
-        // cy.get(".mdi-close").click({ multiple: true });
-        // cy.get("button.ant-tabs-tab-remove").click({ multiple: true });
-        // cy.get('.ant-tabs-tab-remove').should('not.exist')
-    }
-
-    toggleRightSidebar() {
-        cy.get(".nc-toggle-right-navbar").should("exist").click();
-    }
+    cy.toastWait("Successfully exported all table data").then(() => {
+      // download folder path, read from config file
+      const downloadsFolder = Cypress.config("downloadsFolder");
+      let filePath = path.join(downloadsFolder, filename);
+
+      // append download folder path with filename to generate full file path, retrieve file
+      cy.readFile(filePath).then((fileData) => {
+        // from CSV, split into records (rows)
+        const rows = fileData.replace(/\r\n/g, "\n").split("\n");
+        verifyCsv(rows);
+        deleteDownloadsFolder();
+      });
+    });
+  };
+
+  downloadAndVerifyCsvFromSharedView = (filename, verifyCsv) => {
+    cy.get(".nc-actions-menu-btn").click();
+    cy.get(".nc-project-menu-item")
+      .contains("Download as CSV")
+      .should("exist")
+      .click();
+
+    cy.toastWait("Successfully exported all table data").then(() => {
+      // download folder path, read from config file
+      const downloadsFolder = Cypress.config("downloadsFolder");
+      let filePath = path.join(downloadsFolder, filename);
+
+      // append download folder path with filename to generate full file path, retrieve file
+      cy.readFile(filePath).then((fileData) => {
+        // from CSV, split into records (rows)
+        const rows = fileData.replace(/\r\n/g, "\n").split("\n");
+        verifyCsv(rows);
+        deleteDownloadsFolder();
+      });
+    });
+  };
+
+  getIFrameCell = (columnHeader, cellNumber) => {
+    return cy
+      .iframe()
+      .find(`tbody > :nth-child(${cellNumber}) > [data-col="${columnHeader}"]`);
+  };
+
+  // https://docs.cypress.io/guides/core-concepts/variables-and-aliases#Sharing-Context
+  getDatatype = (tableName, columnName) => {
+    cy.window().then((win) => {
+      const col = win.$nuxt.$store.state.meta.metas[tableName].columns;
+      let dataType = "";
+      col.forEach((element) => {
+        if (element.cn == columnName) dataType = element.uidt;
+      });
+      cy.wrap(dataType).as("ncDatatype");
+    });
+  };
+
+  openMetaTab() {
+    // open Project metadata tab
+    //
+    settingsPage.openMenu(settingsPage.PROJ_METADATA);
+    settingsPage.openTab(settingsPage.METADATA);
+  }
+
+  closeMetaTab() {
+    // close Project metadata tab
+    settingsPage.closeMenu();
+  }
+
+  metaSyncValidate(tbl, msg) {
+    cy.get(".nc-btn-metasync-reload").should("exist").click();
+    cy.wait(2000);
+    cy.get(`.nc-metasync-row-${tbl}`).contains(msg).should("exist");
+    cy.get(".nc-btn-metasync-sync-now")
+      .should("exist")
+      .click()
+      .then(() => {
+        cy.toastWait(`Table metadata recreated successfully`);
+      });
+    cy.get(".nc-metasync-row").then((row) => {
+      for (let i = 0; i < row.length; i++) {
+        cy.wrap(row).contains("No change identified").should("exist");
+      }
+    });
+  }
+
+  tabReset() {
+    // temporary disable (kludge)
+    // mainPage.toolBarTopLeft(mainPage.HOME).click({ force: true });
+    // cy.get(".project-row").should("exist").click({ force: true });
+    // projectsPage.waitHomePageLoad();
+    // option-2
+    // cy.openTableTab("Country", 0);
+    // cy.get(".mdi-close").click({ multiple: true });
+    // cy.get("button.ant-tabs-tab-remove").click({ multiple: true });
+    // cy.get('.ant-tabs-tab-remove').should('not.exist')
+  }
+
+  toggleRightSidebar() {
+    cy.get(".nc-toggle-right-navbar").should("exist").click();
+  }
 }
 
 export const mainPage = new _mainPage();