Merge branch 'develop' of github.com:nocodb/nocodb into develop

packages/nc-gui/components/general/ShareBaseButton.vue

@@ -9,7 +9,7 @@ const { isUIAllowed } = useUIPermission()
 </script>
 
 <template>
-  <div class="flex items-center w-full pl-3 hover:(text-primary bg-primary bg-opacity-5)">
+  <div class="flex items-center w-full pl-3 hover:(text-primary bg-primary bg-opacity-5)" @click="showUserModal = true">
     <div
       v-if="
         isUIAllowed('newUser') &&
@@ -18,7 +18,6 @@ const { isUIAllowed } = useUIPermission()
         route.name !== 'index-index-create-external' &&
         route.name !== 'index-user-index'
       "
-      @click="showUserModal = true"
     >
       <div class="flex items-center space-x-1">
         <MdiAccountPlusOutline class="mr-1 nc-share-base" />

packages/nc-gui/components/smartsheet-column/RollupOptions.vue

@@ -35,7 +35,6 @@ const aggrFunctionsList = [
   { text: 'min', value: 'min' },
   { text: 'max', value: 'max' },
   { text: 'avg', value: 'avg' },
-  { text: 'min', value: 'min' },
   { text: 'sum', value: 'sum' },
   { text: 'countDistinct', value: 'countDistinct' },
   { text: 'sumDistinct', value: 'sumDistinct' },

packages/nc-gui/components/smartsheet-toolbar/LockType.vue

@@ -13,17 +13,17 @@ const types = {
   [LockType.Personal]: {
     title: 'title.personalView',
     icon: MdiAccountIcon,
-    subtitle: 'msg.info.collabView',
+    subtitle: 'msg.info.personalView',
   },
   [LockType.Collaborative]: {
     title: 'title.collabView',
     icon: MdiAccountGroupIcon,
-    subtitle: 'msg.info.lockedView',
+    subtitle: 'msg.info.collabView',
   },
   [LockType.Locked]: {
     title: 'title.lockedView',
     icon: MdiLockOutlineIcon,
-    subtitle: 'msg.info.personalView',
+    subtitle: 'msg.info.lockedView',
   },
 }
 

scripts/sdk/swagger.json

@@ -5821,9 +5821,6 @@
           "pageInfo": {
             "$ref": "#/components/schemas/Paginated"
           }
-        },
-        "": {
-          "type": "string"
         }
       },
       "Base": {
@@ -6148,8 +6145,7 @@
             "type": "string"
           },
           "title": {
-            "type": "string",
-            "required": true
+            "type": "string"
           },
           "deleted": {
             "type": "boolean"
@@ -6193,7 +6189,8 @@
               }
             ]
           }
-        }
+        },
+        "required": ["title"]
       },
       "TableInfo": {
         "title": "Table",
@@ -6981,10 +6978,12 @@
         "properties": {
           "options": {
             "type": "array",
-            "required": true,
             "$ref": "#/components/schemas/SelectOption"
           }
         },
+        "required": [
+          "options"
+        ],
         "examples": [
           {
             "options": [