From 56d15772e90e39b7a4d1a7ecda180aed10f5fefd Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Fri, 8 Jul 2022 18:02:41 +0530
Subject: [PATCH] fix(gui-v2): rating cell corrections

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui-v2/components/cell/Rating.vue | 13 +--
 .../components/smartsheet/Sidebar.vue         | 83 +++++++------------
 .../nc-gui-v2/components/tabs/Smartsheet.vue  |  7 +-
 packages/nc-gui-v2/composables/useMeta.ts     | 14 ----
 4 files changed, 36 insertions(+), 81 deletions(-)
 delete mode 100644 packages/nc-gui-v2/composables/useMeta.ts

diff --git a/packages/nc-gui-v2/components/cell/Rating.vue b/packages/nc-gui-v2/components/cell/Rating.vue
index ff22db79bb..8ac5ad9406 100644
--- a/packages/nc-gui-v2/components/cell/Rating.vue
+++ b/packages/nc-gui-v2/components/cell/Rating.vue
@@ -35,12 +35,13 @@ const localState = computed({
   <div class="d-100 h-100" :class="{ 'nc-cell-hover-show': localState === 0 || !localState }">
     <v-rating v-model="localState" :length="ratingMeta.max" dense x-small :readonly="readOnly" clearable>
       <template #item="{ isFilled, click }">
-        <v-icon v-if="isFilled" :size="15" :color="ratingMeta.color" @click="click">
-          <MdiStarIcon />
-        </v-icon>
-        <v-icon v-else :color="ratingMeta.color" :size="15" class="nc-cell-hover-show" @click="click">
-          <MdiStarOutlineIcon />
-        </v-icon>
+        <!--        todo : custom color and icon -->
+        <!--        <v-icon v-if="isFilled"- :size="15" :color="ratingMeta.color" @click="click"> -->
+        <MdiStarIcon v-if="isFilled" @click="click" />
+        <!--        </v-icon> -->
+        <!--        <v-icon v-else :color="ratingMeta.color" :size="15" class="nc-cell-hover-show" @click="click"> -->
+        <MdiStarOutlineIcon v-else @click="click" />
+        <!--        </v-icon> -->
       </template>
     </v-rating>
   </div>
diff --git a/packages/nc-gui-v2/components/smartsheet/Sidebar.vue b/packages/nc-gui-v2/components/smartsheet/Sidebar.vue
index daaff0ca1f..3b7b563908 100644
--- a/packages/nc-gui-v2/components/smartsheet/Sidebar.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Sidebar.vue
@@ -1,24 +1,19 @@
 <script setup lang="ts">
-import { inject } from "@vue/runtime-core";
-import type { TableType } from "nocodb-sdk";
-import type { Ref } from "vue";
-import { onMounted } from "vue";
-import { MetaInj } from "~/components";
-import useViews from "~/composables/useViews";
-import { viewIcons } from "~/utils/viewUtils";
-
-const meta = inject(MetaInj);
-const { views, loadViews } = useViews(meta as Ref<TableType>);
-const _isUIAllowed = (view: string) => {
-
-};
-
-onMounted(loadViews);
-
-const selectedViewIdLocal = ref("");
+import { inject } from '@vue/runtime-core'
+import type { TableType } from 'nocodb-sdk'
+import type { Ref } from 'vue'
+import { onMounted } from 'vue'
+import { MetaInj } from '~/components'
+import useViews from '~/composables/useViews'
+import { viewIcons } from '~/utils/viewUtils'
 
+const meta = inject(MetaInj)
+const { views, loadViews } = useViews(meta as Ref<TableType>)
+const _isUIAllowed = (view: string) => {}
 
+onMounted(loadViews)
 
+const selectedViewIdLocal = ref('')
 </script>
 
 <template>
@@ -34,15 +29,9 @@ const selectedViewIdLocal = ref("");
         <v-list v-if="views && views.length" dense>
           <v-list-item dense>
             <!-- Views -->
-            <span class="body-2 font-weight-medium">{{
-                $t("objects.views")
-              }}</span>
+            <span class="body-2 font-weight-medium">{{ $t('objects.views') }}</span>
           </v-list-item>
-          <v-list-group
-            v-model="selectedViewIdLocal"
-            mandatory
-            color="primary"
-          >
+          <v-list-group v-model="selectedViewIdLocal" mandatory color="primary">
             <!--
                todo: add sortable
                <draggable
@@ -62,8 +51,8 @@ const selectedViewIdLocal = ref("");
               v-t="['a:view:open', { view: view.type }]"
               dense
               :value="view.id"
-              active-class="x-active--text">
-
+              active-class="x-active--text"
+            >
               <!--                :class="`body-2  view nc-view-item nc-draggable-child nc-${
                       viewTypeAlias[view.type]
                     }-view-item`"
@@ -77,36 +66,22 @@ const selectedViewIdLocal = ref("");
                 mdi-drag-vertical
               </v-icon>
               <v-list-item-icon class="mr-n1">
-                <v-icon
-                  v-if="viewIcons[view.type]"
-                  x-small
-                  :color="viewIcons[view.type].color"
-                >
+                <v-icon v-if="viewIcons[view.type]" x-small :color="viewIcons[view.type].color">
                   {{ viewIcons[view.type].icon }}
                 </v-icon>
-                <v-icon v-else color="primary" small>
-                  mdi-table
-                </v-icon>
+                <v-icon v-else color="primary" small> mdi-table </v-icon>
               </v-list-item-icon>
               <v-list-item-title>
                 <v-tooltip bottom>
                   <template #activator="{ on }">
-                    <div
-                      class="font-weight-regular"
-                      style="overflow: hidden; text-overflow: ellipsis"
-                    >
-                      <input
-                        v-if="view.edit"
-                        :ref="`input${i}`"
-                        v-model="view.title_temp">
+                    <div class="font-weight-regular" style="overflow: hidden; text-overflow: ellipsis">
+                      <input v-if="view.edit" :ref="`input${i}`" v-model="view.title_temp" />
 
                       <!--                        @click.stop
                                               @keydown.enter.stop="updateViewName(view, i)"
                                               @blur="updateViewName(view, i)" -->
                       <template v-else>
-                              <span v-on="on">{{
-                                  view.alias || view.title
-                                }}</span>
+                        <span v-on="on">{{ view.alias || view.title }}</span>
                       </template>
                     </div>
                   </template>
@@ -114,8 +89,8 @@ const selectedViewIdLocal = ref("");
                 </v-tooltip>
               </v-list-item-title>
               <v-spacer />
-              <template v-if="_isUIAllowed('virtualViewsCreateOrEdit')">
-                <!-- Copy view -->
+              <!--              <template v-if="_isUIAllowed('virtualViewsCreateOrEdit')">
+                &lt;!&ndash; Copy view &ndash;&gt;
                 <x-icon
                   v-if="!view.edit"
                   :tooltip="$t('activity.copyView')"
@@ -126,7 +101,7 @@ const selectedViewIdLocal = ref("");
                 >
                   mdi-content-copy
                 </x-icon>
-                <!-- Rename view -->
+                &lt;!&ndash; Rename view &ndash;&gt;
                 <x-icon
                   v-if="!view.edit"
                   :tooltip="$t('activity.renameView')"
@@ -137,7 +112,7 @@ const selectedViewIdLocal = ref("");
                 >
                   mdi-pencil
                 </x-icon>
-                <!-- Delete view" -->
+                &lt;!&ndash; Delete view" &ndash;&gt;
                 <x-icon
                   v-if="!view.is_default"
                   :tooltip="$t('activity.deleteView')"
@@ -155,16 +130,14 @@ const selectedViewIdLocal = ref("");
                 class="check-icon"
               >
                 mdi-check-bold
-              </v-icon>
+              </v-icon> -->
             </v-list-item>
-            </transition-group>
-            </draggable>
+            <!--            </transition-group> -->
+            <!--            </draggable> -->
           </v-list-group>
         </v-list>
-
       </div>
     </div>
-
   </div>
 </template>
 
diff --git a/packages/nc-gui-v2/components/tabs/Smartsheet.vue b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
index 8f85eac9ea..93cf36404f 100644
--- a/packages/nc-gui-v2/components/tabs/Smartsheet.vue
+++ b/packages/nc-gui-v2/components/tabs/Smartsheet.vue
@@ -30,12 +30,7 @@ watch(
   <div class="overflow-auto">
     <SmartsheetToolbar />
     <template v-if="meta && tabMeta">
-      <div class="d-flex">
-        <div class="flex-grow-1" style="min-width: 0">
-          <SmartsheetGrid />
-        </div>
-        <SmartsheetSidebar />
-      </div>
+      <SmartsheetGrid />
     </template>
   </div>
 </template>
diff --git a/packages/nc-gui-v2/composables/useMeta.ts b/packages/nc-gui-v2/composables/useMeta.ts
deleted file mode 100644
index a369b28f8f..0000000000
--- a/packages/nc-gui-v2/composables/useMeta.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import useMetas from '~/composables/useMetas'
-
-export default function (metaIdOrTitle: string) {
-  const { metas, getMeta } = useMetas()
-  const meta = computed(() => {
-    return metas.value?.[metaIdOrTitle]
-  })
-
-  const loadMeta = async () => {
-    await getMeta(metaIdOrTitle)
-  }
-
-  return { meta, loadMeta }
-}