Merge pull request #7035 from nocodb/develop

nocodb · Nov 20, 2023 · c12c56f · c12c56f
2 parents 667817e + 273ac81
commit c12c56f
Show file tree

Hide file tree

Showing 103 changed files with 26,099 additions and 6,621 deletions.
diff --git a/.github/uffizzi/docker-compose.uffizzi.yml b/.github/uffizzi/docker-compose.uffizzi.yml
@@ -31,7 +31,7 @@ services:
       MYSQL_PASSWORD: password
       MYSQL_ROOT_PASSWORD: password
       MYSQL_USER: noco
-    image: "mysql:8.0.32"
+    image: "mysql:8.0.35"
     deploy:
       resources:
         limits:

diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
@@ -92,7 +92,7 @@ jobs:
           export NODE_OPTIONS="--max_old_space_size=16384"
           NOCODB_SDK_PKG_NAME=nocodb-sdk-daily
           targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNocodbSdkVersion.js &&
-          pnpm --filter=${NOCODB_SDK_PKG_NAME} install --ignore-scripts --no-frozen-lockfile && pnpm --filter=${NOCODB_SDK_PKG_NAME} run build &&
+          pnpm --filter=${NOCODB_SDK_PKG_NAME} install --ignore-scripts --no-frozen-lockfile --ignore-workspace && pnpm --filter=${NOCODB_SDK_PKG_NAME} run build &&
           targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNocodbSdk.js &&
           targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNcGuiVersion.js &&
           pnpm --filter=nc-gui install --ignore-scripts --no-frozen-lockfile &&

diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
@@ -61,7 +61,7 @@ jobs:
           fi
           echo $NOCODB_SDK_PKG_NAME
           targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNocodbSdkVersion.js &&
-          pnpm --filter=${NOCODB_SDK_PKG_NAME} install --ignore-scripts --no-frozen-lockfile && pnpm --filter=${NOCODB_SDK_PKG_NAME} run build && pnpm --filter=${NOCODB_SDK_PKG_NAME} publish --no-git-checks &&
+          pnpm --filter=${NOCODB_SDK_PKG_NAME} install --ignore-scripts --no-frozen-lockfile --ignore-workspace && pnpm --filter=${NOCODB_SDK_PKG_NAME} run build && pnpm --filter=${NOCODB_SDK_PKG_NAME} publish --no-git-checks &&
           sleep 90 &&
           targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} node scripts/upgradeNocodbSdk.js &&
           targetEnv=${{ github.event.inputs.targetEnv || inputs.targetEnv }} targetVersion=${{ github.event.inputs.tag || inputs.tag }} node scripts/bumpNcGuiVersion.js &&

diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ Turns any MySQL, PostgreSQL, SQL Server, SQLite & MariaDB into a smart spreadshe
 </a>
  -->
 
-[![Stargazers repo roster for @nocodb/nocodb](https://reporoster.com/stars/nocodb/nocodb)](https://github.com/nocodb/nocodb/stargazers)
+[![Stargazers repo roster for @nocodb/nocodb](http://reporoster.com/stars/nocodb/nocodb)](https://github.com/nocodb/nocodb/stargazers)
 
 # Quick try
 

diff --git a/docker-compose/mysql/docker-compose.yml b/docker-compose/mysql/docker-compose.yml
@@ -27,7 +27,7 @@ services:
         - "-h"
         - localhost
       timeout: 20s
-    image: "mysql:8.0.32"
+    image: "mysql:8.0.35"
     restart: always
     volumes: 
       - "db_data:/var/lib/mysql"

diff --git a/docker-compose/nginx-proxy-manager/docker-compose.yml b/docker-compose/nginx-proxy-manager/docker-compose.yml
@@ -46,7 +46,7 @@ services:
         - "-h"
         - localhost
       timeout: 20s
-    image: "mysql:8.0.32"
+    image: "mysql:8.0.35"
     networks: 
       - default
     restart: always

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
   "devDependencies": {
     "fs": "0.0.1-security",
     "lerna": "^7.0.2",
-    "husky": "^8.0.0",
+    "husky": "^8.0.3",
     "xlsx": "^0.17.4"
   },
   "husky": {

diff --git a/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue b/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
@@ -93,17 +93,21 @@ onMounted(() => {
       </div>
       <template #overlay>
         <NcMenu data-testid="nc-sidebar-userinfo">
-          <NcMenuItem v-e="['c:user:logout']" data-testid="nc-sidebar-user-logout" @click="logout">
-            <GeneralLoader v-if="isLoggingOut" class="!ml-0.5 !mr-0.5 !max-h-4.5 !-mt-0.5" />
-            <GeneralIcon v-else icon="signout" class="menu-icon" />
-            <span class="menu-btn"> {{ $t('general.logout') }}</span>
+          <NcMenuItem data-testid="nc-sidebar-user-logout" @click="logout">
+            <div v-e="['c:user:logout']" class="flex gap-2 items-center">
+              <GeneralLoader v-if="isLoggingOut" class="!ml-0.5 !mr-0.5 !max-h-4.5 !-mt-0.5" />
+              <GeneralIcon v-else icon="signout" class="menu-icon" />
+              <span class="menu-btn"> {{ $t('general.logout') }}</span>
+            </div>
           </NcMenuItem>
           <template v-if="!isMobileMode">
-            <NcMenuItem v-e="['c:auth-token:copy']" @click="onCopy">
-              <GeneralIcon v-if="isAuthTokenCopied" icon="check" class="group-hover:text-black menu-icon" />
-              <GeneralIcon v-else icon="copy" class="menu-icon" />
-              <template v-if="isAuthTokenCopied"> {{ $t('title.copiedAuthToken') }} </template>
-              <template v-else> {{ $t('title.copyAuthToken') }} </template>
+            <NcMenuItem @click="onCopy">
+              <div v-e="['c:auth-token:copy']" class="flex gap-2 items-center">
+                <GeneralIcon v-if="isAuthTokenCopied" icon="check" class="group-hover:text-black menu-icon" />
+                <GeneralIcon v-else icon="copy" class="menu-icon" />
+                <template v-if="isAuthTokenCopied"> {{ $t('title.copiedAuthToken') }} </template>
+                <template v-else> {{ $t('title.copyAuthToken') }} </template>
+              </div>
             </NcMenuItem>
           </template>
           <NcDivider />
@@ -140,13 +144,17 @@ onMounted(() => {
           <template v-if="!appInfo.ee">
             <NcDivider />
             <a-popover key="language" class="lang-menu !py-1.5" placement="rightBottom">
-              <NcMenuItem v-e="['c:translate:open']">
-                <GeneralIcon icon="translate" class="group-hover:text-black nc-language ml-0.25 menu-icon" />
-                {{ $t('labels.language') }}
-                <div class="flex items-center text-gray-400 text-xs">{{ $t('labels.community.communityTranslated') }}</div>
-                <div class="flex-1" />
+              <NcMenuItem>
+                <div v-e="['c:translate:open']" class="flex gap-2 items-center">
+                  <GeneralIcon icon="translate" class="group-hover:text-black nc-language ml-0.25 menu-icon" />
+                  {{ $t('labels.language') }}
+                  <div class="flex items-center text-gray-400 text-xs">{{ $t('labels.community.communityTranslated') }}</div>
+                  <div class="flex-1" />
 
-                <MaterialSymbolsChevronRightRounded class="transform group-hover:(scale-115 text-accent) text-xl text-gray-400" />
+                  <MaterialSymbolsChevronRightRounded
+                    class="transform group-hover:(scale-115 text-accent) text-xl text-gray-400"
+                  />
+                </div>
               </NcMenuItem>
 
               <template #content>

diff --git a/packages/nc-gui/components/dashboard/TreeView/BaseOptions.vue b/packages/nc-gui/components/dashboard/TreeView/BaseOptions.vue
@@ -62,7 +62,6 @@ function openQuickImportDialog(type: string) {
   <NcSubMenu class="py-0" data-testid="nc-sidebar-base-import">
     <template #title>
       <GeneralIcon icon="download" />
-
       {{ $t('labels.importData') }}
     </template>
 
@@ -71,41 +70,41 @@ function openQuickImportDialog(type: string) {
     <NcMenuItem
       v-if="isUIAllowed('airtableImport', { roles: baseRole })"
       key="quick-import-airtable"
-      v-e="['c:import:airtable']"
       @click="openAirtableImportDialog(source.base_id, source.id)"
     >
-      <GeneralIcon icon="airtable" class="max-w-3.75 group-hover:text-black" />
-      <div class="ml-0.5">{{ $t('labels.airtable') }}</div>
+      <div v-e="['c:import:airtable']" class="flex gap-2 items-center">
+        <GeneralIcon icon="airtable" class="max-w-3.75 group-hover:text-black" />
+        <div class="ml-0.5">{{ $t('labels.airtable') }}</div>
+      </div>
     </NcMenuItem>
 
-    <NcMenuItem
-      v-if="isUIAllowed('csvImport', { roles: baseRole })"
-      key="quick-import-csv"
-      v-e="['c:import:csv']"
-      @click="openQuickImportDialog('csv')"
-    >
-      <GeneralIcon icon="csv" class="w-4 group-hover:text-black" />
-      {{ $t('labels.csvFile') }}
+    <NcMenuItem v-if="isUIAllowed('csvImport', { roles: baseRole })" key="quick-import-csv" @click="openQuickImportDialog('csv')">
+      <div v-e="['c:import:csv']" class="flex gap-2 items-center">
+        <GeneralIcon icon="csv" class="w-4 group-hover:text-black" />
+        {{ $t('labels.csvFile') }}
+      </div>
     </NcMenuItem>
 
     <NcMenuItem
       v-if="isUIAllowed('jsonImport', { roles: baseRole })"
       key="quick-import-json"
-      v-e="['c:import:json']"
       @click="openQuickImportDialog('json')"
     >
-      <GeneralIcon icon="code" class="w-4 group-hover:text-black" />
-      {{ $t('labels.jsonFile') }}
+      <div v-e="['c:import:json']" class="flex gap-2 items-center">
+        <GeneralIcon icon="code" class="w-4 group-hover:text-black" />
+        {{ $t('labels.jsonFile') }}
+      </div>
     </NcMenuItem>
 
     <NcMenuItem
       v-if="isUIAllowed('excelImport', { roles: baseRole })"
       key="quick-import-excel"
-      v-e="['c:import:excel']"
       @click="openQuickImportDialog('excel')"
     >
-      <GeneralIcon icon="excel" class="max-w-4 group-hover:text-black" />
-      {{ $t('labels.microsoftExcel') }}
+      <div v-e="['c:import:excel']" class="flex gap-2 items-center">
+        <GeneralIcon icon="excel" class="max-w-4 group-hover:text-black" />
+        {{ $t('labels.microsoftExcel') }}
+      </div>
     </NcMenuItem>
   </NcSubMenu>
 </template>