From 19bfba42829dab3054d0a6105495017dd6b00ae3 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 8 Sep 2022 14:48:39 +0300
Subject: [PATCH 1/4] fix(nc-gui): invite button clickable area

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 packages/nc-gui/components/general/ShareBaseButton.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/general/ShareBaseButton.vue b/packages/nc-gui/components/general/ShareBaseButton.vue
index 6f50d65dae..b81e0c4d10 100644
--- a/packages/nc-gui/components/general/ShareBaseButton.vue
+++ b/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" />

From 20eef38acb0284ddfe818f619de9e80608538bdc Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 9 Sep 2022 12:00:09 +0530
Subject: [PATCH 2/4] chore(swagger): provide required as an array

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 scripts/sdk/swagger.json | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/sdk/swagger.json b/scripts/sdk/swagger.json
index 5e8b6b1f02..d484f4d2be 100644
--- a/scripts/sdk/swagger.json
+++ b/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": [

From 93840ab1e302ff59de4dcd40dc18c984b4d4a8e5 Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Fri, 9 Sep 2022 13:23:38 +0530
Subject: [PATCH 3/4] fix: duplicate entry in rollup function table

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui/components/smartsheet-column/RollupOptions.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet-column/RollupOptions.vue b/packages/nc-gui/components/smartsheet-column/RollupOptions.vue
index f048f0176d..ebfe0cb776 100644
--- a/packages/nc-gui/components/smartsheet-column/RollupOptions.vue
+++ b/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' },

From 6769439f0e230afda13bab6cdd68f2d72bfdd90d Mon Sep 17 00:00:00 2001
From: Raju Udava <86527202+dstala@users.noreply.github.com>
Date: Fri, 9 Sep 2022 15:43:18 +0530
Subject: [PATCH 4/4] refactor: display text correction for collab/locked view
 menu

Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com>
---
 packages/nc-gui/components/smartsheet-toolbar/LockType.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet-toolbar/LockType.vue b/packages/nc-gui/components/smartsheet-toolbar/LockType.vue
index b34b580cce..947606bfed 100644
--- a/packages/nc-gui/components/smartsheet-toolbar/LockType.vue
+++ b/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',
   },
 }