test: 💍 fix broken test

jaskaransarkaria · Nov 24, 2021 · 3452f94 · 3452f94
1 parent b6a130e
commit 3452f94
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 185 deletions.
diff --git a/.routify/config.js b/.routify/config.js
@@ -8,5 +8,5 @@ module.exports = {
   noHashScroll: false,
   distDir: 'dist',
   extensions: ['svelte', 'html', 'svx', 'md'],
-  started: '2021-11-23T18:50:22.587Z',
+  started: '2021-11-24T19:14:39.743Z',
 };
diff --git a/.routify/routes.js b/.routify/routes.js
@@ -1,10 +1,10 @@
 /**
  * @roxi/routify 2.7.3
- * File generated Tue Nov 23 2021 18:50:25 GMT+0000 (Greenwich Mean Time)
+ * File generated Wed Nov 24 2021 19:14:42 GMT+0000 (Greenwich Mean Time)
  */
 
 export const __version = '2.7.3';
-export const __timestamp = '2021-11-23T18:50:25.549Z';
+export const __timestamp = '2021-11-24T19:14:42.752Z';
 
 //buildRoutes
 import { buildClientTree } from '@roxi/routify/runtime/buildRoutes';

diff --git a/public/index.html b/public/index.html
@@ -9,9 +9,9 @@
 
     <link rel='icon' type='image/png' href='/favicon.png'>
     <link rel='stylesheet' href='/global.css'>
-    <link rel='stylesheet' href='/build/bundle-1637693422585.css'>
+    <link rel='stylesheet' href='/build/bundle-1637781279741.css'>
 
-    <script defer src='/build/bundle-1637693422585.js'></script>
+    <script defer src='/build/bundle-1637781279741.js'></script>
   </head>
   <body>
   </body>

diff --git a/src/components/ProductView/ProductView.svelte b/src/components/ProductView/ProductView.svelte
@@ -1,37 +1,53 @@
 <script lang="typescript">
+  import { groupBy } from 'lodash-es';
   import { fade } from 'svelte/transition';
   import SingleProduct from '@/components/SingleProduct/SingleProduct.svelte';
-  import VariantProducts from '@/components/VariantProducts/VariantProducts.svelte';
-
   import type { Product } from '@/types/product';
 
   export let productArr: readonly Product[] = [];
   export let showDetailedView = false;
 
   let variantArr: readonly Product[] = [];
   let nonVariantArr: readonly Product[] = [];
+  let groupedVariantProducts: Array<readonly Product[]>;
+
+  $: groupedVariantProducts = Object.values(
+    groupBy(variantArr, 'VariantGroupId')
+  );
 
   $: if (productArr.length) {
     variantArr = productArr.filter(({ VariantGroupId }) => !!VariantGroupId);
     nonVariantArr = productArr.filter(({ VariantGroupId }) => !VariantGroupId);
   }
 </script>
 
-<div
-  in:fade={{ delay: 500 }}
-  class={showDetailedView || productArr.length - variantArr.length <= 2
-    ? 'detailed-products-container'
-    : 'products-container'}
->
-  {#if nonVariantArr.length}
-    {#each nonVariantArr as product}
-      <SingleProduct {product} {showDetailedView} />
-    {/each}
-  {/if}
-  {#if variantArr.length}
-    <VariantProducts variantProducts={variantArr} {showDetailedView} />
-  {/if}
-</div>
+{#if variantArr.length}
+  {#each groupedVariantProducts as variants (variants)}
+    <div
+      in:fade={{ delay: 500 }}
+      class={showDetailedView
+        ? 'detailed-products-container'
+        : 'products-container'}
+    >
+      {#each variants as variant (variant)}
+        <SingleProduct product={variant} />
+      {/each}
+    </div>
+  {/each}
+{:else}
+  <div
+    in:fade={{ delay: 500 }}
+    class={showDetailedView
+      ? 'detailed-products-container'
+      : 'products-container'}
+  >
+    {#if nonVariantArr.length}
+      {#each nonVariantArr as product}
+        <SingleProduct {product} {showDetailedView} />
+      {/each}
+    {/if}
+  </div>
+{/if}
 
 <style>
   .products-container {

diff --git a/src/components/VariantProducts/VariantProducts.svelte b/src/components/VariantProducts/VariantProducts.svelte
diff --git a/src/components/VariantProducts/VariantProducts.test.ts b/src/components/VariantProducts/VariantProducts.test.ts