fix: review comments

packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue

@@ -72,9 +72,20 @@ const customFormState = ref<ProjectCreateForm>({
   extraParameters: [],
 })
 
+const easterEgg = ref(false)
+
+const easterEggCount = ref(0)
+
+const onEasterEgg = () => {
+  easterEggCount.value += 1
+  if (easterEggCount.value >= 2) {
+    easterEgg.value = true
+  }
+}
+
 const clientTypes = computed(() => {
   return _clientTypes.filter((type) => {
-    return ![ClientType.SNOWFLAKE, ClientType.DATABRICKS].includes(type.value)
+    return ![ClientType.SNOWFLAKE, ClientType.DATABRICKS, ...(easterEgg.value ? [ClientType.MSSQL] : [])].includes(type.value)
   })
 })
 
@@ -404,7 +415,11 @@ const allowMetaWrite = computed({
   get: () => !formState.value.is_schema_readonly,
   set: (v) => {
     formState.value.is_schema_readonly = !v
-    $e('c:source:schema-write-toggle', {allowed: !v})
+    // if schema write is allowed, data write should be allowed too
+    if (v) {
+      formState.value.is_data_readonly = false
+    }
+    $e('c:source:schema-write-toggle', { allowed: !v, edit: true })
   },
 })
 
@@ -550,18 +565,30 @@ const allowDataWrite = computed({
               <a-form-item>
                 <template #label>
                   <div class="flex gap-1 justify-end">
-                    <span>
+                <span>
-                      {{ $t('labels.allowDataWrite') }}
+                  {{ $t('labels.allowDataWrite') }}
-                    </span>
+                </span>
                     <NcTooltip>
                       <template #title>
                         <span>{{ $t('tooltip.allowDataWrite') }}</span>
                       </template>
-                      <GeneralIcon class="text-gray-500" icon="info"/>
+                      <GeneralIcon class="text-gray-500" icon="info" />
                     </NcTooltip>
                   </div>
                 </template>
-                <a-switch v-model:checked="allowDataWrite"  data-testid="nc-allow-data-write" size="small"></a-switch>
+                <div class="flex justify-start">
+                  <NcTooltip :disabled="!allowMetaWrite" placement="topLeft">
+                    <template #title>
+                      {{ $t('tooltip.dataWriteOptionDisabled') }}
+                    </template>
+                    <a-switch
+                        v-model:checked="allowDataWrite"
+                        :disabled="allowMetaWrite"
+                        data-testid="nc-allow-data-write"
+                        size="small"
+                    ></a-switch>
+                  </NcTooltip>
+                </div>
               </a-form-item>
 
               <div class="flex items-right justify-end gap-2">
@@ -730,6 +757,7 @@ const allowDataWrite = computed({
 
           <a-form-item class="flex justify-end !mt-5">
             <div class="flex justify-end gap-2">
+              <div class="w-[15px] h-[15px] cursor-pointer" @dblclick="onEasterEgg"></div>
               <NcButton
                   :type="testSuccess ? 'ghost' : 'primary'"
                   size="small"

packages/nc-gui/components/dashboard/settings/data-sources/EditBase.vue

@@ -369,6 +369,10 @@ const allowMetaWrite = computed({
   get: () => !formState.value.is_schema_readonly,
   set: (v) => {
     formState.value.is_schema_readonly = !v
+    // if schema write is allowed, data write should be allowed too
+    if (v) {
+      formState.value.is_data_readonly = false
+    }
     $e('c:source:schema-write-toggle', { allowed: !v, edit: true })
   },
 })
@@ -579,7 +583,19 @@ const allowDataWrite = computed({
                 </NcTooltip>
               </div>
             </template>
-            <a-switch v-model:checked="allowDataWrite" data-testid="nc-allow-data-write" size="small"></a-switch>
+            <div class="flex justify-start">
+              <NcTooltip :disabled="!allowMetaWrite" placement="topLeft">
+                <template #title>
+                  {{ $t('tooltip.dataWriteOptionDisabled') }}
+                </template>
+                <a-switch
+                  v-model:checked="allowDataWrite"
+                  :disabled="allowMetaWrite"
+                  data-testid="nc-allow-data-write"
+                  size="small"
+                ></a-switch>
+              </NcTooltip>
+            </div>
           </a-form-item>
           <!--                Use Connection URL -->
           <div class="flex justify-end gap-2">

packages/nc-gui/components/smartsheet/calendar/DayView/DateTimeField.vue

@@ -996,7 +996,7 @@ watch(
           </template>
         </NcDropdown>
         <NcButton
-          v-else-if="!isPublic"
+          v-else-if="!isPublic && isUIAllowed('dataEdit')"
           :class="{
             '!block': hour.isSame(selectedTime),
             '!hidden': !hour.isSame(selectedTime),

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

@@ -27,7 +27,7 @@ const inputRef = ref()
 const activeFieldIndex = ref(-1)
 
 const onClick = (uidt: UITypes) => {
-  if (!uidt) return
+  if (!uidt || isDisabledUIType(uidt)) return
 
   emits('selected', uidt)
 }

packages/nc-gui/components/smartsheet/grid/Table.vue

@@ -209,7 +209,10 @@ const isGridCellMouseDown = ref(false)
 // #Context Menu
 const _contextMenu = ref(false)
 const contextMenu = computed({
-  get: () => _contextMenu.value,
+  get: () => {
+    if (props.data?.some((r) => r.rowMeta.selected) && isDataReadOnly.value) return false
+    return _contextMenu.value
+  },
   set: (val) => {
     _contextMenu.value = val
   },
@@ -2172,7 +2175,9 @@ onKeyStroke('ArrowDown', onDown)
         <template #overlay>
           <NcMenu class="!rounded !py-0" @click="contextMenu = false">
             <NcMenuItem
-              v-if="isEeUI && !contextMenuClosing && !contextMenuTarget && data.some((r) => r.rowMeta.selected)"
+              v-if="
+                isEeUI && !contextMenuClosing && !contextMenuTarget && data.some((r) => r.rowMeta.selected) && !isDataReadOnly
+              "
               @click="emits('bulkUpdateDlg')"
             >
               <div v-e="['a:row:update-bulk']" class="flex gap-2 items-center">

packages/nc-gui/components/smartsheet/header/Menu.vue

@@ -43,7 +43,7 @@ const { gridViewCols } = useViewColumnsOrThrow()
 
 const { fieldsToGroupBy, groupByLimit } = useViewGroupByOrThrow(view)
 
-const { isUIAllowed, isMetaReadOnly } = useRoles()
+const { isUIAllowed, isMetaReadOnly, isDataReadOnly } = useRoles()
 
 const isLoading = ref<'' | 'hideOrShow' | 'setDisplay'>('')
 
@@ -325,7 +325,11 @@ const isDeleteAllowed = computed(() => {
   return column?.value && !column.value.system
 })
 const isDuplicateAllowed = computed(() => {
-  return column?.value && !column.value.system
+  return (
+    column?.value &&
+    !column.value.system &&
+    ((!isMetaReadOnly.value && !isDataReadOnly.value) || readonlyMetaAllowedTypes.includes(column.value?.uidt))
+  )
 })
 const isFilterSupported = computed(
   () =>
@@ -394,7 +398,7 @@ const isColumnUpdateAllowed = computed(() => {
         </NcMenuItem>
         <NcMenuItem
           v-if="isUIAllowed('duplicateColumn') && isExpandedForm && !column?.pk"
-          :disabled="!isDuplicateAllowed || !isColumnUpdateAllowed"
+          :disabled="!isDuplicateAllowed"
           @click="openDuplicateDlg"
         >
           <div v-e="['a:field:duplicate']" class="nc-column-duplicate nc-header-menu-item">
@@ -530,14 +534,16 @@ const isColumnUpdateAllowed = computed(() => {
           </NcMenuItem>
         </template>
         <a-divider v-if="!column?.pv" class="!my-0" />
-
         <NcMenuItem
           v-if="!column?.pv && isUIAllowed('fieldDelete')"
           :disabled="!isDeleteAllowed || !isColumnUpdateAllowed"
           class="!hover:bg-red-50"
           @click="handleDelete"
         >
-          <div class="nc-column-delete nc-header-menu-item text-red-600">
+          <div
+            class="nc-column-delete nc-header-menu-item"
+            :class="{ ' text-red-600': isDeleteAllowed && isColumnUpdateAllowed }"
+          >
             <component :is="iconMap.delete" />
             <!-- Delete -->
             {{ $t('general.delete') }}

packages/nc-gui/lang/en.json

@@ -456,8 +456,8 @@
     "looksLikeThisStackIsEmpty": "Looks like this stack does not have any records"
   },
   "labels": {
-    "allowMetaWrite" : "Allow Schema Change",
+    "allowMetaWrite" : "Allow Schema Edit",
-    "allowDataWrite" : "Allow Data Write/Edit",
+    "allowDataWrite" : "Allow Data Edit",
     "selectView": "Select a View",
     "connectionDetails": "Connection Details",
     "metaSync": "Meta Sync",
@@ -1040,6 +1040,7 @@
     "group": "Group"
   },
   "tooltip": {
+    "dataWriteOptionDisabled": "Data editing can disable only when ‘Schema edit’ is disabled and becomes enabled otherwise",
     "allowMetaWrite": "Enable this option to allow modifications to the database schema, including adding, altering, or deleting tables and columns. Use with caution, as changes may affect application functionality.",
     "allowDataWrite": "Enable this option to allow updating, deleting, or inserting data within the database tables. Ideal for administrative users who need to manage data directly.",
     "reachedSourceLimit": "Limited to only one data source for the moment",

tests/playwright/pages/Dashboard/TreeView.ts

@@ -366,6 +366,19 @@ export class TreeViewPage extends BasePage {
     await this.rootPage.locator('div.ant-modal-content').locator(`button.ant-btn:has-text("Delete")`).click();
   }
 
+  async duplicateProject(param: { title: string; context: NcContext }) {
+    param.title = this.scopedProjectTitle({ title: param.title, context: param.context });
+
+    await this.openProjectContextMenu({ baseTitle: param.title });
+    const contextMenu = this.dashboard.get().locator('.ant-dropdown-menu.nc-scrollbar-md:visible');
+    await contextMenu.waitFor();
+    await contextMenu.locator(`.ant-dropdown-menu-item:has-text("Duplicate")`).click();
+
+    await this.rootPage.locator('div.ant-modal-content').locator(`button.ant-btn:has-text("Confirm")`).click();
+
+    await this.rootPage.waitForTimeout(10000);
+  }
+
   async openProjectSourceSettings(param: { title: string; context: NcContext }) {
     param.title = this.scopedProjectTitle({ title: param.title, context: param.context });
 

tests/playwright/tests/db/general/sourceRestrictions.spec.ts

@@ -34,6 +34,7 @@ test.describe('Source Restrictions', () => {
     await settingsPage.selectTab({ tab: 'dataSources' });
     await dashboard.rootPage.waitForTimeout(300);
 
+    await settingsPage.source.updateSchemaReadOnly({ sourceName: 'Default', readOnly: true });
     await settingsPage.source.updateDataReadOnly({ sourceName: 'Default', readOnly: true });
     await settingsPage.close();
 
@@ -78,6 +79,13 @@ test.describe('Source Restrictions', () => {
       .locator('.nc-ui-dt-dropdown')
       .scrollIntoViewIfNeeded();
     await dashboard.grid.get().locator(`th[data-title="LastName"]`).first().locator('.nc-ui-dt-dropdown').click();
-    await expect(await dashboard.rootPage.locator('li[role="menuitem"]:has-text("Edit"):visible').last()).toBeVisible();
+    for (const item of ['Edit', 'Delete', 'Duplicate']) {
+      await expect(
+        await dashboard.rootPage.locator(`li[role="menuitem"]:has-text("${item}"):visible`).last()
+      ).toBeVisible();
+      await expect(
+        await dashboard.rootPage.locator(`li[role="menuitem"]:has-text("${item}"):visible`).last()
+      ).toHaveClass(/ant-dropdown-menu-item-disabled/);
+    }
   });
 });