From 5188f28c0d69b724bfb287fa256337cc52a1d4be Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 13 May 2022 15:31:05 +0530
Subject: [PATCH] fix: list display, minor UI fixes

---
 reports/GeneralLedger/GeneralLedger.ts |  4 +-
 src/components/Report/ListReport.vue   | 64 +++++++++++++-------------
 src/pages/ChartOfAccounts.vue          |  4 +-
 src/pages/DataImport.vue               |  4 +-
 src/pages/Desk.vue                     |  2 +-
 src/styles/index.css                   |  8 ++++
 6 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index 437984cd..c37c4740 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -279,7 +279,7 @@ export class GeneralLedger extends Report {
       'reverts',
     ];
 
-    const filters = {} ?? this._getQueryFilters();
+    const filters = this._getQueryFilters();
     const entries = (await this.fyo.db.getAllRaw(
       ModelNameEnum.AccountingLedgerEntry,
       {
@@ -493,8 +493,6 @@ export class GeneralLedger extends Report {
   /**
    * TODO: Order by date and then the number
    * TODO: Something is wrong with dummy data, there are entries from 2022 Dec
-   * TODO: Add pagination
    * TODO: Always visible scrollbar
-   * TODO: Extract out list view report to a different component
    */
 }
diff --git a/src/components/Report/ListReport.vue b/src/components/Report/ListReport.vue
index bc9dcf8c..b20da728 100644
--- a/src/components/Report/ListReport.vue
+++ b/src/components/Report/ListReport.vue
@@ -1,9 +1,9 @@
 <template>
-  <div>
+  <div class="overflow-hidden flex flex-col h-full">
     <!-- Report Outer Container -->
-    <div class="overflow-x-scroll">
+    <div class="overflow-x-scroll overflow-y-hidden">
+      <!-- Title Row -->
       <div class="inline-block">
-        <!-- Title Row -->
         <div
           class="flex items-center border-b"
           :style="{ height: `${hconst}px` }"
@@ -24,39 +24,43 @@
             {{ col.label }}
           </p>
         </div>
+      </div>
 
-        <!-- Report Rows Container -->
-        <div class="overflow-y-scroll">
-          <!-- :style="{ height: `${hconst * maxRows + 5}px` }" -->
-          <!-- Report Rows -->
+      <!-- Report Rows Container -->
+      <div
+        class="overflow-y-scroll inline-block"
+        style="height: calc(100% - 49px)"
+      >
+        <!-- Report Rows -->
+        <div
+          v-for="(row, r) in report.reportData.slice(pageStart, pageEnd)"
+          :key="r + '-row'"
+          class="flex items-center"
+          :style="{ height: `${hconst}px` }"
+          :class="r !== pageEnd - 1 ? 'border-b' : ''"
+        >
+          <!-- Report Cell -->
           <div
-            v-for="(row, r) in report.reportData.slice(pageStart, pageEnd)"
-            :key="r + '-row'"
-            class="border-b flex items-center"
-            :style="{ height: `${hconst}px` }"
+            v-for="(cell, c) in row"
+            :key="`${c}-${r}-cell`"
+            :style="getCellStyle(cell, c)"
+            class="
+              text-gray-900 text-base
+              px-3
+              flex-shrink-0
+              overflow-x-scroll
+              whitespace-nowrap
+            "
           >
-            <!-- Report Cell -->
-            <div
-              v-for="(cell, c) in row"
-              :key="`${c}-${r}-cell`"
-              :style="getCellStyle(cell, c)"
-              class="
-                text-gray-900 text-base
-                px-3
-                flex-shrink-0
-                overflow-x-scroll
-                whitespace-nowrap
-              "
-            >
-              {{ cell.value }}
-            </div>
+            {{ cell.value }}
           </div>
         </div>
+        <!-- </div> -->
       </div>
     </div>
 
     <!-- Pagination Footer -->
-    <div class="mt-auto">
+    <div class="mt-auto flex-shrink-0">
       <hr />
       <Paginator
         :item-count="report?.reportData?.length ?? 0"
@@ -78,16 +82,10 @@ export default defineComponent({
     return {
       wconst: 8,
       hconst: 48,
-      loading: false,
       pageStart: 0,
       pageEnd: 0,
     };
   },
-  computed: {
-    maxRows() {
-      return 18 - Math.ceil(this.report.filters.length / 5);
-    },
-  },
   methods: {
     setPageIndices({ start, end }) {
       this.pageStart = start;
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 0a32ae76..db342347 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="flex flex-col overflow-y-hidden">
+  <div class="flex flex-col h-full">
     <PageHeader :title="t`Chart of Accounts`" />
 
     <!-- Chart of Accounts -->
-    <div class="flex-1 flex flex-col px-8 overflow-y-auto" v-if="root">
+    <div class="flex-1 flex flex-col mx-4 overflow-y-auto mb-4" v-if="root">
       <!-- Chart of Accounts Indented List -->
       <template v-for="account in allAccounts" :key="account.name">
         <!-- Account List Item -->
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index 986bfcbb..28b4b06a 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -16,7 +16,7 @@
     </PageHeader>
 
     <div
-      class="flex px-8 mt-2 text-base w-full flex-col gap-8"
+      class="flex px-4 mt-2 text-base w-full flex-col gap-8"
       v-if="!complete"
     >
       <!-- Type selector -->
@@ -444,7 +444,7 @@ export default {
         label: this.t`Import Type`,
         fieldtype: 'AutoComplete',
         placeholder: this.t`Import Type`,
-        options: Object.keys(this.labelSchemaNameMap)
+        options: Object.keys(this.labelSchemaNameMap),
       };
     },
     labelSchemaNameMap() {
diff --git a/src/pages/Desk.vue b/src/pages/Desk.vue
index 7ae46b26..52076bf9 100644
--- a/src/pages/Desk.vue
+++ b/src/pages/Desk.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex overflow-hidden">
     <Sidebar
-      class="w-48 flex-shrink-0"
+      class="w-sidebar flex-shrink-0"
       @change-db-file="$emit('change-db-file')"
     />
     <div class="flex flex-1 overflow-y-hidden bg-white">
diff --git a/src/styles/index.css b/src/styles/index.css
index b08537db..345ab652 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -56,3 +56,11 @@ html {
 .w-600 {
   width: 600px;
 }
+
+.w-sidebar {
+  width: 12rem;
+}
+
+.w-desk {
+  width: calc(100vw - 12rem);
+}