Merge pull request #7001 from nocodb/develop

.github/workflows/ci-cd.yml

@@ -45,6 +45,8 @@ jobs:
           uses: actions/checkout@v3
           with:
             fetch-depth: 0
+        - name: remove use-node-version from .npmrc 
+          run:  sed -i '/^use-node-version/d' .npmrc
         - name: Get pnpm store directory
           shell: bash
           run: |
@@ -78,6 +80,8 @@ jobs:
           uses: actions/checkout@v3
           with:
             fetch-depth: 0
+        - name: remove use-node-version from .npmrc 
+          run:  sed -i '/^use-node-version/d' .npmrc           
         - name: Get pnpm store directory
           shell: bash
           run: |

.github/workflows/playwright-test-workflow.yml

@@ -18,31 +18,21 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Check node,pnpm Installation and set Path
-        shell: bash
-        working-directory: scripts/self-hosted-gh-runner
-        timeout-minutes: 1
-        run: |
-          ./node-pnpm-check.sh
-          echo "make sure below mentioned versions are expected versions"
-          echo "If you are expecting the node and pnpm versions to be updated. Please update the node-pnpm-check.sh script"
-          env
+      - name: remove use-node-version from .npmrc 
+        run:  sed -i '/^use-node-version/d' .npmrc
       - name: Setup Node
-        if: ${{ env.SETUP_NODE != 'false' }}
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.NC_REQ_NODE_V }}
+          node-version: 18.14.0
       - name: Setup pnpm
-        if: ${{ env.SETUP_PNPM != 'false' }}
         uses: pnpm/action-setup@v2
         with:
-          version: ${{ env.NC_REQ_PNPM_V }}
+          version: 8
       - name: Get pnpm store directory
         shell: bash
         run: |
           echo "STORE_PATH=/root/setup-pnpm/node_modules/.bin/store/v3" >> $GITHUB_ENV          
       - uses: actions/cache@v3
-        if: env.IS_NPM_CACHE_DOWNLOAD_REQUIRED == 'true'
         name: Setup pnpm cache
         with:
           path: ${{ env.STORE_PATH }}

.github/workflows/pre-build-for-playwright.yml

@@ -2,45 +2,29 @@ name: pre-build-for-playwright
 
 on:
   workflow_call:
-    inputs:
-      FORCE_RUN_PRERQUISITE_STEPS:
-        description: 'FORCE_RUN_PRERQUISITE_STEPS'
-        required: false
-        type: string  
-        default: 'false'
-
+
 jobs:
   playwright:
     runs-on: [self-hosted, v3]
     timeout-minutes: 100
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Check node,pnpm Installation and set Path
-        shell: bash
-        working-directory: scripts/self-hosted-gh-runner
-        timeout-minutes: 1
-        run: |
-          ./node-pnpm-check.sh
-          echo "make sure below mentioned versions are expected versions"
-          echo "If you are expecting the node and pnpm versions to be updated. Please update the node-pnpm-check.sh script"
-          env
       - name: Setup Node
-        if: ${{ env.SETUP_NODE != 'false' }}
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.NC_REQ_NODE_V }}
+          node-version: 18.14.0
       - name: Setup pnpm
-        if: ${{ env.SETUP_PNPM != 'false' }}
         uses: pnpm/action-setup@v2
         with:
-          version: ${{ env.NC_REQ_PNPM_V }}        
+          version: 8
+      - name: remove use-node-version from .npmrc 
+        run:  sed -i '/^use-node-version/d' .npmrc                   
       - name: Get pnpm store directory
         shell: bash
         run: |
           echo "STORE_PATH=/root/setup-pnpm/node_modules/.bin/store/v3" >> $GITHUB_ENV          
       - uses: actions/cache@v3
-        if: env.IS_NPM_CACHE_DOWNLOAD_REQUIRED == 'true'
         name: Setup pnpm cache
         with:
           path: ${{ env.STORE_PATH }}

.github/workflows/release-executables.yml

@@ -25,6 +25,7 @@ jobs:
       - name: Get pnpm store directory
         shell: bash
         run: |
+          sed -i '/^use-node-version/d' .npmrc
           echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
       - uses: actions/cache@v3
         name: Setup pnpm cache

.github/workflows/unit-test.yml

@@ -34,6 +34,8 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
+      - name: remove use-node-version from .npmrc 
+        run:  sed -i '/^use-node-version/d' .npmrc                
       - name: install dependencies
         run: pnpm bootstrap
       - name: run unit tests

.github/workflows/update-sdk-path.yml

@@ -20,9 +20,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          fetch-depth: 0
-
+          fetch-depth: 0        
       - run: |
+          sed -i '/^use-node-version/d' .npmrc      
           pnpm bootstrap
 
       - name: Create Pull Request

README.md

@@ -29,7 +29,7 @@ Turns any MySQL, PostgreSQL, SQL Server, SQLite & MariaDB into a smart spreadshe
     <a href="https://docs.nocodb.com/"><b>Documentation</b></a>
 </p>
 
-![All Views](https://user-images.githubusercontent.com/35857179/194825053-3aa3373d-3e0f-4b42-b3f1-42928332054a.gif)
+![video avi](https://github.com/nocodb/nocodb/assets/86527202/e2fad786-f211-4dcb-9bd3-aaece83a6783)
 
 <div align="center">
 
@@ -106,6 +106,8 @@ nocodb/nocodb:latest
 
 > If you plan to input some special characters, you may need to change the character set and collation yourself when creating the database. Please check out the examples for [MySQL Docker](https://github.com/nocodb/nocodb/issues/1340#issuecomment-1049481043).
 
+> Different commands just indicate the database that NocoDB will use internally for metadata storage, but that doesn't influence the ability to connect to a different database type. 
+
 ## Binaries
 
 ##### MacOS (x64)
@@ -305,4 +307,4 @@ Thank you for your contributions! We appreciate all the contributions from the c
 
 <a href="https://github.com/nocodb/nocodb/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=nocodb/nocodb" />
-</a>
+</a>

packages/nc-gui/assets/style.scss

@@ -2,6 +2,10 @@
 @import '@vue-flow/core/dist/style.css';
 @import '@vue-flow/core/dist/theme-default.css';
 
+html {
+  overflow: hidden;
+}
+
 body {
   line-height: 1.3125rem;
 }
@@ -54,7 +58,7 @@ main {
 }
 
 .mobile {
-  .nc-scrollbar-md, nc-scrollbar-dark-md, nc-scrollbar-dark-md, nc-scrollbar-sm-dark, nc-scrollbar-x-md {
+  .nc-scrollbar-md, .nc-scrollbar-x-md, .nc-scrollbar-dark-md, .nc-scrollbar-x-md-dark, .nc-scrollbar-x-lg {
     &::-webkit-scrollbar {
       width: 0px;
     }
@@ -64,6 +68,7 @@ main {
 .nc-scrollbar-md {
   overflow-y: scroll;
   overflow-x: hidden;
+  scrollbar-width: thin !important;
 
   &::-webkit-scrollbar {
     width: 4px;
@@ -77,16 +82,46 @@ main {
   }
   &::-webkit-scrollbar-thumb {
     width: 4px;
+    @apply bg-gray-200;
+  }
+  &::-webkit-scrollbar-thumb:hover {
     @apply bg-gray-300;
   }
+}
+
+.nc-scrollbar-x-md {
+  overflow-x: scroll;
+  scrollbar-width: thin !important;
+
+
+  &::-webkit-scrollbar {
+    width: 4px;
+    height: 4px;
+  }
+  &::-webkit-scrollbar-track-piece {
+    width: 0px;
+  }
+  &::-webkit-scrollbar {
+    @apply bg-transparent;
+  }
+  &::-webkit-scrollbar-thumb {
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+
+
+    width: 4px;
+    @apply bg-gray-200;
+  }
   &::-webkit-scrollbar-thumb:hover {
-    @apply bg-gray-400;
+    @apply bg-gray-300;
   }
 }
 
 .nc-scrollbar-dark-md {
   overflow-y: scroll;
   overflow-x: hidden;
+  scrollbar-width: thin !important;
+
 
   &::-webkit-scrollbar {
     width: 4px;
@@ -115,13 +150,14 @@ main {
   }
 }
 
-.nc-scrollbar-sm-dark {
-  overflow-y: scroll;
-  overflow-x: hidden;
+.nc-scrollbar-x-md-dark {
+  overflow-x: scroll;
+  scrollbar-width: thin !important;
 
+
   &::-webkit-scrollbar {
-    width: 2px;
-    height: 2px;
+    width: 4px;
+    height: 4px;
   }
   &::-webkit-scrollbar-track-piece {
     width: 0px;
@@ -130,20 +166,26 @@ main {
     @apply bg-transparent;
   }
   &::-webkit-scrollbar-thumb {
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+
+
     width: 4px;
-    @apply bg-gray-300;
+    background-color: rgba(0, 0, 0, 0.3)
+
   }
   &::-webkit-scrollbar-thumb:hover {
-    @apply bg-gray-400;
+    background-color: rgba(0, 0, 0, 0.4)
+
   }
 }
 
-.nc-scrollbar-x-md {
+.nc-scrollbar-x-lg {
   overflow-x: scroll;
 
   &::-webkit-scrollbar {
-    width: 4px;
-    height: 4px;
+    width: 8px;
+    height: 8px;
   }
   &::-webkit-scrollbar-track-piece {
     width: 0px;
@@ -152,18 +194,18 @@ main {
     @apply bg-transparent;
   }
   &::-webkit-scrollbar-thumb {
-    width: 4px;
+    -webkit-border-radius: 10px;
+    border-radius: 10px;
+
+
+    width: 8px;
     @apply bg-gray-200;
   }
   &::-webkit-scrollbar-thumb:hover {
     @apply bg-gray-300;
   }
 }
 
-html {
-  overflow-y: auto !important;
-}
-
 main {
   @apply flex-0 w-full relative scrollbar-thin-dull;
   overflow-x: hidden;
@@ -194,7 +236,7 @@ a {
 }
 
 .nc-base-menu-item {
-  @apply cursor-pointer flex items-center gap-2 py-2 after:(content-[''] absolute top-0 left-0 bottom-0 right-0 w-full h-full bg-current opacity-0 transition transition-opacity duration-100) hover:(after:(opacity-5));
+  @apply cursor-pointer flex items-center gap-2 py-2;
 
   // &:hover {
   //   .nc-icon {
@@ -437,6 +479,9 @@ a {
 .nc-toolbar-btn {
   @apply !shadow-none rounded hover:(ring-1 ring-gray-200 ring-opacity-100 bg-gray-100 !text-gray-800) focus:(ring-1 ring-gray-300 ring-opacity-100 !text-gray-800 bg-gray-100) text-gray-600 text-xs font-medium px-2 border-0;
 }
+.nc-toolbar-btn[disabled] {
+  @apply !text-gray-400 !cursor-not-allowed !hover:ring-0;
+}
 
 .nc-warning-info {
   @apply !shadow-none rounded ring-1 ring-red-600;
@@ -633,3 +678,7 @@ input[type='number'] {
     @apply xs:(visible opacity-100 !text-gray-500)
   }
 }
+
+.ant-message-notice-content {
+  @apply !rounded-md;
+}

packages/nc-gui/components/account/License.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useNuxtApp } from '#app'
+import { useNuxtApp } from '#imports'
 import { message } from 'ant-design-vue'
 import { extractSdkResponseErrorMsg, useApi, useGlobal } from '#imports'
 

packages/nc-gui/components/account/Profile.vue

@@ -69,7 +69,7 @@ const onValidate = async (_: any, valid: boolean) => {
         <div class="flex text-gray-500" data-rec="true">{{ $t('labels.controlAppearance') }}</div>
         <div class="flex flex-row mt-4">
           <div class="flex h-20 mt-1.5">
-            <GeneralUserIcon size="xlarge" :email="user?.email" />
+            <GeneralUserIcon size="xlarge" :email="user?.email" :name="user?.display_name" />
           </div>
           <div class="flex w-10"></div>
           <a-form