fix: rewrite the data entry grid

src/pages/ImportWizard.vue

@@ -87,67 +87,37 @@
           class="text-base ms-2"
           :class="fileName ? 'text-gray-900 font-semibold' : 'text-gray-700'"
         >
-          <span v-if="fileName" class="font-normal"
+          <span v-if="fileName" class="font-normal">{{ t`Selected` }} </span>
-            >{{ t`Selected file` }}
-          </span>
           {{ helperMessage }}{{ fileName ? ',' : '' }}
           <span v-if="fileName" class="font-normal">
-            {{ t`verify data and click on` }} </span
+            {{ t`check values and click on` }} </span
           >{{ ' ' }}<span v-if="fileName">{{ t`Import Data.` }}</span>
           <span
             v-if="hasImporter && importer.valueMatrix.length > 0"
             class="font-normal"
-            >{{ ' ' + t`${importer.valueMatrix.length} rows added.` }}</span
+            >{{
+              ' ' +
+              (importer.valueMatrix.length === 2
+                ? t`${importer.valueMatrix.length} row added.`
+                : t`${importer.valueMatrix.length} rows added.`)
+            }}</span
           >
         </p>
       </div>
 
-      <!-- Bulk Entries Grid -->
+      <!-- Assignment Row and Value Grid container -->
-      <div v-if="hasImporter">
       <div
-          class="flex justify-start"
+        v-if="hasImporter"
+        class="overflow-auto custom-scroll"
         style="max-height: calc(100vh - (2 * var(--h-row-largest)) - 2px)"
       >
-          <!-- Index Column -->
+        <!-- Column Assignment Row -->
         <div
-            class="
+          class="grid sticky top-0 py-4 pe-4 bg-white border-b gap-4"
-              w-12
+          style="z-index: 1; width: fit-content"
-              p-4
+          :style="gridTemplateColumn"
-              border-e
-              flex-shrink-0
-              text-gray-600
-              grid grid-cols-1
-              items-center
-              justify-items-center
-              gap-4
-            "
         >
-            <div class="flex items-center h-7 flex-shrink-0">#</div>
+          <div class="index-cell">#</div>
-            <div
-              v-for="(_, i) of importer.valueMatrix"
-              :key="i"
-              class="flex items-center group h-7 flex-shrink-0"
-            >
-              <span class="hidden group-hover:inline-block">
-                <feather-icon
-                  name="x"
-                  class="w-4 h-4 -ms-1 cursor-pointer"
-                  :button="true"
-                  @click="importer.removeRow(i)"
-                />
-              </span>
-              <span class="group-hover:hidden">
-                {{ i + 1 }}
-              </span>
-            </div>
-          </div>
-
-          <!-- Grid -->
-          <div
-            class="overflow-auto gap-4 p-4 grid"
-            :style="`grid-template-columns: repeat(${columnCount}, 10rem)`"
-          >
-            <!-- Grid Title Row Cells, Allow Column Selection -->
           <AutoComplete
             v-for="index in columnIterator"
             class="flex-shrink-0"
@@ -158,9 +128,31 @@
             :value="importer.assignedTemplateFields[index]"
             @change="(value: string | null) => importer.setTemplateField(index, value)"
           />
+        </div>
 
+        <!-- Values Grid -->
+        <div
+          v-if="importer.valueMatrix.length"
+          class="grid py-4 pe-4 bg-white gap-4"
+          style="width: fit-content"
+          :style="gridTemplateColumn"
+        >
           <!-- Grid Value Row Cells, Allow Editing Values -->
-            <template v-for="(row, ridx) of importer.valueMatrix">
+          <template v-for="(row, ridx) of importer.valueMatrix" :key="ridx">
+            <div
+              class="index-cell group cursor-pointer"
+              @click="importer.removeRow(ridx)"
+            >
+              <feather-icon
+                name="x"
+                class="w-4 h-4 hidden group-hover:inline-block -me-1"
+                :button="true"
+              />
+              <span class="group-hover:hidden">
+                {{ ridx + 1 }}
+              </span>
+            </div>
+
             <template
               v-for="(val, cidx) of row.slice(0, columnCount)"
               :key="`cell-${ridx}-${cidx}`"
@@ -208,23 +200,11 @@
             </template>
           </template>
         </div>
-        </div>
-        <hr />
-      </div>
-    </div>
 
-    <!-- How to Use Link -->
+        <div v-else class="p-4 text-gray-700 sticky left-0">
-    <!-- Not shown cause video is outdated -->
+          {{ t`No rows added. Select a file or add rows.` }}
-    <div
+        </div>
-      v-if="false"
+      </div>
-      class="flex justify-center h-full w-full items-center mb-16"
-    >
-      <HowTo
-        link="https://youtu.be/ukHAgcnVxTQ"
-        class="text-gray-900 rounded-lg text-base border px-3 py-2"
-      >
-        {{ t`How to Use the Import Wizard` }}
-      </HowTo>
     </div>
 
     <!-- Loading Bar when Saving Docs -->
@@ -397,7 +377,6 @@ import Data from 'src/components/Controls/Data.vue';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import DropdownWithActions from 'src/components/DropdownWithActions.vue';
 import FormHeader from 'src/components/FormHeader.vue';
-import HowTo from 'src/components/HowTo.vue';
 import Modal from 'src/components/Modal.vue';
 import PageHeader from 'src/components/PageHeader.vue';
 import { getColumnLabel, Importer, TemplateField } from 'src/importer';
@@ -433,7 +412,6 @@ export default defineComponent({
     FormControl,
     Button,
     DropdownWithActions,
-    HowTo,
     Loading,
     AutoComplete,
     Data,
@@ -464,6 +442,9 @@ export default defineComponent({
     }
   },
   computed: {
+    gridTemplateColumn(): string {
+      return `grid-template-columns: 4rem repeat(${this.columnCount}, 10rem)`;
+    },
     duplicates(): string[] {
       if (!this.hasImporter) {
         return [];
@@ -637,7 +618,7 @@ export default defineComponent({
       if (!this.importType) {
         return this.t`Set an Import Type`;
       } else if (!this.fileName) {
-        return this.t`Select a file or add rows.`;
+        return '';
       }
 
       return this.fileName;
@@ -935,3 +916,8 @@ export default defineComponent({
   },
 });
 </script>
+<style scoped>
+.index-cell {
+  @apply flex pe-4 justify-end items-center border-e  bg-white sticky left-0 -my-4 text-gray-600;
+}
+</style>