Merge pull request #7836 from nocodb/nc-fix-lint

fix(nc-gui): lint

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

@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['expand-record', 'new-record'])
+const emit = defineEmits(['expandRecord', 'newRecord'])
 
 const meta = inject(MetaInj, ref())
 
@@ -192,7 +192,7 @@ const newRecord = () => {
       [calendarRange.value[0].fk_from_col!.title!]: selectedDate.value.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('new-record', record)
+  emit('newRecord', record)
 }
 </script>
 
@@ -221,7 +221,7 @@ const newRecord = () => {
           :resize="false"
           color="blue"
           size="small"
-          @click="emit('expand-record', record)"
+          @click="emit('expandRecord', record)"
         >
           <template v-if="!isRowEmpty(record, displayField)">
             <LazySmartsheetCalendarCell

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

@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['expandRecord', 'new-record'])
+const emit = defineEmits(['expandRecord', 'newRecord'])
 
 const {
   // activeCalendarView,
@@ -847,7 +847,7 @@ const newRecord = (hour: dayjs.Dayjs) => {
       [calendarRange.value[0].fk_from_col!.title!]: hour.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('new-record', record)
+  emit('newRecord', record)
 }
 </script>
 
@@ -909,7 +909,7 @@ const newRecord = (hour: dayjs.Dayjs) => {
                       },
                     }
                   }
-                  emit('new-record', record)
+                  emit('newRecord', record)
                 }
               "
             >
@@ -946,7 +946,7 @@ const newRecord = (hour: dayjs.Dayjs) => {
                 },
               }
             }
-            emit('new-record', record)
+            emit('newRecord', record)
           }
         "
       >

packages/nc-gui/components/smartsheet/calendar/MonthView.vue

@@ -4,7 +4,7 @@ import type { ColumnType } from 'nocodb-sdk'
 import { type Row, computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emit = defineEmits(['new-record', 'expandRecord'])
+const emit = defineEmits(['newRecord', 'expandRecord'])
 
 const {
   selectedDate,
@@ -635,7 +635,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emit('new-record', newRecord)
+  emit('newRecord', newRecord)
 }
 </script>
 
@@ -710,7 +710,7 @@ const addRecord = (date: dayjs.Dayjs) => {
                             [range.fk_from_col!.title!]: dayjs(day).format('YYYY-MM-DD HH:mm:ssZ'),
                           },
                         }
-                        emit('new-record', record)
+                        emit('newRecord', record)
                       }
                     "
                   >
@@ -738,7 +738,7 @@ const addRecord = (date: dayjs.Dayjs) => {
                       [calendarRange[0].fk_from_col!.title!]: (day).format('YYYY-MM-DD HH:mm:ssZ'),
                     },
                   }
-                  emit('new-record', record)
+                  emit('newRecord', record)
                 }
               "
             >

packages/nc-gui/components/smartsheet/calendar/SideMenu.vue

@@ -8,7 +8,7 @@ const props = defineProps<{
   visible: boolean
 }>()
 
-const emit = defineEmits(['expand-record', 'newRecord'])
+const emit = defineEmits(['expandRecord', 'newRecord'])
 
 const INFINITY_SCROLL_THRESHOLD = 100
 
@@ -428,7 +428,7 @@ onUnmounted(() => {
               "
                 color="blue"
                 data-testid="nc-sidebar-record-card"
-                @click="emit('expand-record', record)"
+                @click="emit('expandRecord', record)"
                 @dragstart="dragStart($event, record)"
                 @dragover.prevent
               >

packages/nc-gui/components/smartsheet/calendar/WeekView/DateField.vue

@@ -5,7 +5,7 @@ import type { Row } from '~/lib'
 import { computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emits = defineEmits(['expandRecord'])
+const emits = defineEmits(['expandRecord', 'newRecord'])
 
 const { selectedDateRange, formattedData, formattedSideBarData, calendarRange, selectedDate, displayField, updateRowProperty } =
   useCalendarViewStoreOrThrow()
@@ -529,7 +529,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emits('new-record', newRecord)
+  emits('newRecord', newRecord)
 }
 </script>
 
@@ -565,52 +565,53 @@ const addRecord = (date: dayjs.Dayjs) => {
       class="absolute nc-scrollbar-md overflow-y-auto mt-9 pointer-events-none inset-0"
       data-testid="nc-calendar-week-record-container"
     >
-      <div
-        v-for="(record, id) in calendarData"
-        :key="id"
-        :data-testid="`nc-calendar-week-record-${record.row[displayField!.title!]}`"
-        :data-unique-id="record.rowMeta.id"
-        :style="{
-          ...record.rowMeta.style,
-        }"
-        class="absolute group draggable-record pointer-events-auto nc-calendar-week-record-card"
-        @mousedown.stop="dragStart($event, record)"
-        @mouseleave="hoverRecord = null"
-        @mouseover="hoverRecord = record.rowMeta.id"
-      >
-        <LazySmartsheetRow :row="record">
-          <LazySmartsheetCalendarRecordCard
-            :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
-            :position="record.rowMeta.position"
-            :record="record"
-            :selected="dragRecord?.rowMeta?.id === record.rowMeta.id"
-            :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
-            color="blue"
-            @dblclick.stop="emits('expand-record', record)"
-            @resize-start="onResizeStart"
-          >
-            <template v-if="!isRowEmpty(record, displayField)">
-              <LazySmartsheetCalendarCell
-                v-model="record.row[displayField!.title!]"
-                :bold="getFieldStyle(displayField).bold"
-                :column="displayField"
-                :italic="getFieldStyle(displayField).italic"
-                :underline="getFieldStyle(displayField).underline"
-              />
-            </template>
-            <template v-for="(field, index) in fieldsWithoutDisplay" :key="index">
-              <LazySmartsheetCalendarCell
-                v-if="!isRowEmpty(record, field!)"
-                v-model="record.row[field!.title!]"
-                :bold="getFieldStyle(field).bold"
-                :column="field"
-                :italic="getFieldStyle(field).italic"
-                :underline="getFieldStyle(field).underline"
-              />
-            </template>
-          </LazySmartsheetCalendarRecordCard>
-        </LazySmartsheetRow>
-      </div>
+      <template v-for="(record, id) in calendarData" :key="id">
+        <div
+          v-if="record.rowMeta.style?.display !== 'none'"
+          :data-testid="`nc-calendar-week-record-${record.row[displayField!.title!]}`"
+          :data-unique-id="record.rowMeta.id"
+          :style="{
+            ...record.rowMeta.style,
+          }"
+          class="absolute group draggable-record pointer-events-auto nc-calendar-week-record-card"
+          @mouseleave="hoverRecord = null"
+          @mouseover="hoverRecord = record.rowMeta.id"
+          @mousedown.stop="dragStart($event, record)"
+        >
+          <LazySmartsheetRow :row="record">
+            <LazySmartsheetCalendarRecordCard
+              :hover="hoverRecord === record.rowMeta.id || record.rowMeta.id === dragRecord?.rowMeta?.id"
+              :position="record.rowMeta.position"
+              :record="record"
+              :resize="!!record.rowMeta.range?.fk_to_col && isUIAllowed('dataEdit')"
+              :selected="dragRecord?.rowMeta?.id === record.rowMeta.id"
+              color="blue"
+              @dblclick.stop="emits('expandRecord', record)"
+              @resize-start="onResizeStart"
+            >
+              <template v-if="!isRowEmpty(record, displayField)">
+                <LazySmartsheetCalendarCell
+                  v-model="record.row[displayField!.title!]"
+                  :bold="getFieldStyle(displayField).bold"
+                  :column="displayField"
+                  :italic="getFieldStyle(displayField).italic"
+                  :underline="getFieldStyle(displayField).underline"
+                />
+              </template>
+              <template v-for="(field, index) in fieldsWithoutDisplay" :key="index">
+                <LazySmartsheetCalendarCell
+                  v-if="!isRowEmpty(record, field!)"
+                  v-model="record.row[field!.title!]"
+                  :bold="getFieldStyle(field).bold"
+                  :column="field"
+                  :italic="getFieldStyle(field).italic"
+                  :underline="getFieldStyle(field).underline"
+                />
+              </template>
+            </LazySmartsheetCalendarRecordCard>
+          </LazySmartsheetRow>
+        </div>
+      </template>
     </div>
   </div>
 </template>

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

@@ -5,7 +5,7 @@ import type { Row } from '~/lib'
 import { computed, isPrimary, ref, useViewColumnsOrThrow } from '#imports'
 import { generateRandomNumber, isRowEmpty } from '~/utils'
 
-const emits = defineEmits(['expandRecord'])
+const emits = defineEmits(['expandRecord', 'newRecord'])
 
 const {
   selectedDateRange,
@@ -733,7 +733,7 @@ const addRecord = (date: dayjs.Dayjs) => {
       [fromCol.title!]: date.format('YYYY-MM-DD HH:mm:ssZ'),
     },
   }
-  emits('new-record', newRecord)
+  emits('newRecord', newRecord)
 }
 </script>