Merge pull request #5382 from nocodb/fix/icon-issues

fix: Rollup column icon missing and number column width issue

packages/nc-gui/components/smartsheet/Grid.vue

@@ -789,7 +789,7 @@ const closeAddColumnDropdown = () => {
                   :data-testid="`grid-row-${rowIndex}`"
                 >
                   <td key="row-index" class="caption nc-grid-cell pl-5 pr-1" :data-testid="`cell-Id-${rowIndex}`">
-                    <div class="items-center flex gap-1 min-w-[55px]">
+                    <div class="items-center flex gap-1 min-w-[60px]">
                       <div
                         v-if="!readOnly || !isLocked"
                         class="nc-row-no text-xs text-gray-500"

packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts

@@ -52,13 +52,13 @@ const renderIcon = (column: ColumnType, relationColumn?: ColumnType) => {
     case UITypes.Rollup:
       switch ((relationColumn?.colOptions as LinkToAnotherRecordType)?.type) {
         case RelationTypes.MANY_TO_MANY:
-          return { icon: iconMap, color: 'text-accent' }
+          return { icon: iconMap.rollup, color: 'text-accent' }
         case RelationTypes.HAS_MANY:
-          return { icon: iconMap, color: 'text-yellow-500' }
+          return { icon: iconMap.rollup, color: 'text-yellow-500' }
         case RelationTypes.BELONGS_TO:
-          return { icon: iconMap, color: 'text-sky-500' }
+          return { icon: iconMap.rollup, color: 'text-sky-500' }
       }
-      return { icon: iconMap, color: 'text-grey' }
+      return { icon: iconMap.rollup, color: 'text-grey' }
     case UITypes.Count:
       return { icon: CountIcon, color: 'text-grey' }
   }

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

@@ -272,7 +272,7 @@ const copyIframeCode = async () => {
       >
         <div class="flex-1 h-min text-xs text-gray-500">{{ sharedViewUrl }}</div>
 
-        <a v-e="['c:view:share:open-url']" :href="sharedViewUrl" target="_blank">
+        <a v-e="['c:view:share:open-url']" :href="sharedViewUrl" target="_blank" class="flex items-center !no-underline">
           <component :is="iconMap.share" class="text-sm text-gray-500" />
         </a>
 

packages/nc-gui/components/webhook/Editor.vue

@@ -697,15 +697,16 @@ onMounted(async () => {
       <a-row>
         <a-col :span="24">
           <div class="text-gray-600">
-            <em>Use context variable <strong>data</strong> to refer the record under consideration</em>
+            <div class="flex items-center=">
-
+              <em>Use context variable <strong>data</strong> to refer the record under consideration</em>
-            <a-tooltip bottom>
+
-              <template #title>
+              <a-tooltip bottom>
-                <span> <strong>data</strong> : Row data <br /> </span>
+                <template #title>
-              </template>
+                  <span> <strong>data</strong> : Row data <br /> </span>
-              <component :is="iconMap.info" class="ml-2" />
+                </template>
-            </a-tooltip>
+                <component :is="iconMap.info" class="ml-2" />
-
+              </a-tooltip>
+            </div>
             <div class="mt-3">
               <a href="https://docs.nocodb.com/developer-resources/webhooks/" target="_blank">
                 <!-- Document Reference -->

packages/nc-gui/pages/[projectType]/[projectId]/index.vue

@@ -509,11 +509,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
                     </a-sub-menu>
                   </template>
                   <!-- Language -->
-                  <a-sub-menu
+                  <a-sub-menu key="language" class="lang-menu !py-0">
-                    key="language"
-                    class="lang-menu !py-0"
-                    popup-class-name="scrollbar-thin-dull min-w-50 max-h-90vh !overflow-auto"
-                  >
                     <template #title>
                       <div class="nc-project-menu-item group">
                         <component :is="iconMap.translate" class="group-hover:text-accent nc-language" />
@@ -529,7 +525,9 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
 
                     <template #expandIcon></template>
 
-                    <LazyGeneralLanguageMenu />
+                    <div class="scrollbar-thin-dull min-w-50 max-h-90vh">
+                      <LazyGeneralLanguageMenu />
+                    </div>
                   </a-sub-menu>
 
                   <!-- Account -->

packages/nc-gui/utils/iconUtils.ts

@@ -177,7 +177,7 @@ import NcIconsRowHeightExtraTall from '~icons/nc-icons/row-height-extra-tall'
 } as const */
 
 export const iconMap = {
-  info: h('span', { class: 'material-symbols-outlined' }, 'info_outline'),
+  info: h('span', { class: 'material-symbols-outlined' }, 'info'),
   loading: h('span', { class: 'material-symbols-outlined' }, 'autorenew'),
   arrowCollapse: h('span', { class: 'material-symbols-outlined' }, 'keyboard_arrow_up'),
   markerAlert: h('span', { class: 'material-symbols-outlined' }, 'warning'),