fix(nc-gui): pr review changes

packages/nc-gui/components/nc/DateWeekSelector.vue

@@ -182,13 +182,7 @@ const paginate = (action: 'next' | 'prev') => {
           class="h-9 w-9 px-1 py-2 relative font-medium flex items-center cursor-pointer justify-center"
           @click="handleSelectDate(date)"
         >
-          <span
-            v-if="isActiveDate(date)"
-            :class="{
-              'border-1 border-white !h-2 !w-2': dayjs(date).isSame(dayjs(), 'date'),
-            }"
-            class="absolute z-2 h-1.5 w-1.5 rounded-full bg-brand-500 top-1 right-1"
-          ></span>
+          <span v-if="isActiveDate(date)" class="absolute z-2 h-1.5 w-1.5 rounded-full bg-brand-500 top-1 right-1"></span>
           <span class="z-2">
             {{ date.get('date') }}
           </span>

packages/nc-gui/components/nc/MonthYearSelector.vue

@@ -90,7 +90,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
           <component :is="iconMap.doubleLeftArrow" class="h-4 w-4" />
         </NcButton>
         <template #title>
-          <span>{{ $t('labels.previousYear') }}</span>
+          <span>{{ $t('labels.previous') }}</span>
         </template>
       </NcTooltip>
       <span class="font-bold text-gray-700">{{ yearPicker ? 'Select Year' : pageDate.year() }}</span>
@@ -99,7 +99,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
           <component :is="iconMap.doubleRightArrow" class="h-4 w-4" />
         </NcButton>
         <template #title>
-          <span>{{ $t('labels.nextYear') }}</span>
+          <span>{{ $t('labels.next') }}</span>
         </template>
       </NcTooltip>
     </div>

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

@@ -188,20 +188,20 @@ const dropEvent = (event: DragEvent) => {
           <template v-if="!isRowEmpty(record, displayField)">
             <div
               :class="{
-                '!mt-2': displayField.uidt === UITypes.SingleLineText,
+                '!mt-1.5 ml-1': displayField.uidt === UITypes.SingleLineText,
                 '!mt-1': displayField.uidt === UITypes.MultiSelect || displayField.uidt === UITypes.SingleSelect,
               }"
             >
               <LazySmartsheetVirtualCell
-                v-if="isVirtualCol(displayField)"
-                v-model="record.row[displayField.title]"
+                v-if="isVirtualCol(displayField!)"
+                v-model="record.row[displayField!.title!]"
                 :column="displayField"
                 :row="record"
               />
 
               <LazySmartsheetCell
                 v-else
-                v-model="record.row[displayField.title]"
+                v-model="record.row[displayField!.title!]"
                 :column="displayField"
                 :edit-enabled="false"
                 :read-only="true"
@@ -219,7 +219,7 @@ const dropEvent = (event: DragEvent) => {
     class="w-full h-full flex text-md font-bold text-gray-500 items-center justify-center"
     @drop="dropEvent"
   >
-    No Records in this day
+    No records in this day
   </div>
 </template>
 

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

@@ -717,7 +717,7 @@ const dragStart = (event: MouseEvent, record: Row) => {
   </div>
 
   <div v-else ref="container" class="w-full h-full flex text-md font-bold text-gray-500 items-center justify-center">
-    No Records in this day
+    No records in this day
   </div>
 </template>
 

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

@@ -74,11 +74,12 @@ const emit = defineEmits(['resize-start'])
 
     <div class="ml-3 pr-3 text-ellipsis overflow-hidden w-full h-8 absolute">
       <span v-if="position === 'rightRounded' || position === 'none'"> .... </span>
-      <span class="text-sm text-gray-800">
+      <span class="absolute ml-1 text-sm text-gray-800">
         <slot />
       </span>
       <span v-if="position === 'leftRounded' || position === 'none'" class="absolute my-0 right-5"> .... </span>
     </div>
+
     <div
       v-if="(position === 'rightRounded' || position === 'rounded') && resize"
       :class="{

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

@@ -4,12 +4,14 @@ interface Props {
   color?: string
   resize?: boolean
   selected?: boolean
+  hover?: boolean
   position?: 'topRounded' | 'bottomRounded' | 'rounded' | 'none'
 }
 
 withDefaults(defineProps<Props>(), {
   resize: true,
   selected: false,
+  hover: false,
   color: 'blue',
   position: 'rounded',
 })
@@ -47,7 +49,7 @@ const emit = defineEmits(['resize-start'])
       'bg-pink-50': color === 'pink',
       'bg-purple-50': color === 'purple',
       'group-hover:(border-brand-500)': resize,
-      'border-brand-500': selected,
+      '!border-brand-500 border-2': selected || hover,
     }"
     class="relative h-full border-2 border-white"
   >

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

@@ -729,12 +729,12 @@ const viewMore = (hour: dayjs.Dayjs) => {
       <div
         v-for="date in datesHours"
         :key="date[0].toISOString()"
-        class="w-1/7 text-center text-sm text-gray-500 w-full py-1 border-gray-200 border-b-1 border-r-1 bg-gray-50"
+        class="w-1/7 text-center text-sm text-gray-500 w-full py-1 border-gray-200 last:border-r-0 border-b-1 border-r-1 bg-gray-50"
       >
         {{ dayjs(date[0]).format('DD ddd') }}
       </div>
     </div>
-    <div ref="container" class="h-[calc(100vh-11.7rem)] relative flex w-full mt-7.5 overflow-y-auto nc-scrollbar-md">
+    <div ref="container" class="h-[calc(100vh-11.7rem)] relative flex w-full mt-7.1 overflow-y-auto nc-scrollbar-md">
       <div v-for="(date, index) in datesHours" :key="index" class="h-full w-1/7">
         <div
           v-for="(hour, hourIndex) in date"
@@ -742,7 +742,7 @@ const viewMore = (hour: dayjs.Dayjs) => {
           :class="{
             'border-1 !border-brand-500': hour.isSame(selectedTime, 'hour'),
           }"
-          class="text-center relative h-56 text-sm text-gray-500 w-full py-1 border-gray-200 border-1 border-r-white border-t-white last:border-r-white bg-gray-50"
+          class="text-center relative h-20 text-sm text-gray-500 w-full py-1 border-gray-200 first:border-l-none border-1 border-r-gray-50 border-t-gray-50 bg-gray-50"
           @click="selectedTime = hour"
         >
           <span v-if="date[0].day() === selectedDateRange.start?.day()" class="absolute left-1">

packages/nc-gui/composables/useCalendarViewStore.ts

@@ -258,13 +258,6 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
                             comparison_sub_op: 'exactDate',
                             value: fromDate,
                           },
-                          {
-                            fk_column_id: toCol.id,
-                            comparison_op: 'eq',
-                            logical_op: 'or',
-                            comparison_sub_op: 'exactDate',
-                            value: toDate,
-                          },
                         ],
                       },
                     ],
@@ -441,13 +434,6 @@ const [useProvideCalendarViewStore, useCalendarViewStore] = useInjectionState(
                           comparison_sub_op: 'exactDate',
                           value: fromDate,
                         },
-                        {
-                          fk_column_id: toCol.id,
-                          comparison_op: 'eq',
-                          logical_op: 'or',
-                          comparison_sub_op: 'exactDate',
-                          value: toDate,
-                        },
                       ],
                     },
                   ],

packages/nc-gui/lang/en.json

@@ -437,10 +437,9 @@
     "ssoSettings": "SSO Settings",
     "organizeRecordsBy": "Organize records by",
     "organizeBy": "Organize by",
-    "previousYear": "Previous Year",
-    "previousMonth": "Previous Month",
+    "previous": "Previous",
     "nextMonth": "Next Month",
-    "nextYear": "Next Year",
+    "next": "Next",
     "organiseBy": "Organise by",
     "heading1": "Heading 1",
     "heading2": "Heading 2",