Merge pull request #53 from pvdthings/fix-hidden-item-due-back-date

Fix hidden item due back date
pvdthings · Aug 14, 2024 · c5b2e75 · c5b2e75
2 parents 58e3eb4 + 46e748c
commit c5b2e75
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pvdthings-api",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "description": "",
   "main": "server.js",
   "scripts": {

diff --git a/apps/api/services/things/mapThing.js b/apps/api/services/things/mapThing.js
@@ -2,16 +2,13 @@ function mapThing(record) {
   const available = Number(record.get('Available'));
   const stock = Number(record.get('Stock'));
 
-  const isAvailable = available > 0;
-  const isWanted = stock === 0;
-
   return {
       id: record.id,
       name: record.get('Name'),
       name_es: record.get('name_es'),
       stock,
       available,
-      availableDate: isAvailable || isWanted ? undefined : record.get('Next Due Back'),
+      availableDate: record.get('Next Due Back')?.[0],
       images: record.get('Image')?.map(image => image.thumbnails.large.url) || [],
       categories: record.get('Category') || [],
       hidden: Boolean(record.get('Hidden'))

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@library_os/web",
-	"version": "0.15.4",
+	"version": "0.15.5",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",

diff --git a/apps/web/src/lib/components/things/ThingDetails.svelte b/apps/web/src/lib/components/things/ThingDetails.svelte
@@ -36,6 +36,8 @@
       <div class="text-right text-xl">{new Date(thing.availableDate).toLocaleDateString($locale)}</div>
     {:else if thing.stock === 0}
       <div class="font-display text-neutral-500">{$t('Wanted')}</div>
+    {:else if thing.available === 0}
+      <div class="font-display text-neutral-500">{$t('Unavailable')}</div>
     {:else}
       <div class="font-display text-neutral-500">{$t('Available')}</div>
     {/if}