Merge pull request #37 from HALFpipe/fix-import

Fix import

Author: HippocampusGirl

jest.config.mjs

@@ -15,4 +15,5 @@ export default {
   transform: {
     "^.+\\.(ts|tsx)$": "ts-jest"
   },
+  verbose: true,
 };

src/model/__tests__/database.test.ts

@@ -16,11 +16,11 @@ describe("Database", () => {
   database.put(imgsArray);
 
   it("gets closest image", () => {
-    let closestImg = database.closest({"sub": "01", "type": "tsnr_rpt"});
+    let closestImg = database.closest({sub: "01", type: "tsnr_rpt"});
     expect(closestImg.sub).toBe("01");
     expect(closestImg.type).toBe("skull_strip_report");
 
-    closestImg = database.closest({"sub": "03", "type": "tsnr_rpt"});
+    closestImg = database.closest({sub: "03", type: "tsnr_rpt"});
     expect(closestImg.sub).toBe("01");
     expect(closestImg.type).toBe("skull_strip_report");
   });
@@ -29,7 +29,10 @@ describe("Database", () => {
     let [ exactImg ] = database.findAll({sub: "01", type: "skull_strip_report"});
     expect(exactImg.hash).toBe("1");
 
-    let result = database.findAll({sub: "03"});
+    let result = database.findAll({sub: "03", type: "skull_strip_report"});
+    expect(result.length).toBe(0);
+
+    result = database.findAll({sub: "03"});
     expect(result.length).toBe(0);
   });
 

src/model/database.ts

@@ -46,23 +46,33 @@ export class Database {
     for (const key of basedOnEntities) {
       const value = obj[key];
 
-      if (value === null) {
+      if (value == null) {  // == catches both `null` and `undefined`
         continue;
       }
-      if (!(value in this.indexSets[key])) {
-        continue;
+      if (!(value in this.indexSets[key])) {  // unknown value
+        if (exact) {
+          return null;
+        } else {
+          continue;
+        }
       }
 
-      let indexSet = this.indexSets[key][value];
-      if (matches === null) {
+      const indexSet = this.indexSets[key][value];
+
+      if (matches == null) {
         matches = indexSet;
       } else {
-        indexSet = matches.intersection(indexSet);
-        if (!exact && indexSet.length === 0) {
-          break;
+        const intersectionSet = matches.intersection(indexSet);
+
+        if (intersectionSet.length === 0) {
+          if (exact) {
+            return null;
+          } else {
+            break;  // return what we have
+          }
         }
 
-        matches = indexSet;
+        matches = intersectionSet;
       }
     }
 

src/styles/explore.scss

@@ -216,11 +216,15 @@ qc-explorer {
           font-weight: 600;
           font-size: 12.5px;
         }
+
         img {
-          object-fit: contain;
           width: 100%;
           height: 100%;
+
           background-color: white;
+
+          object-fit: contain;
+          image-rendering: crisp-edges;
         }
       }
     }

src/styles/zoom.scss

@@ -18,7 +18,9 @@ qc-zoom {
     img {
       width: 100%;
       height: 100%;
+
       object-fit: cover;
+      image-rendering: crisp-edges;
     }
   }
 

src/view/sidebar.ts

@@ -36,7 +36,7 @@ export class Sidebar extends HTMLElement {
     const importButton = h(
       "a",
       [new Attribute("class", "dropdown-item")],
-      [t("Import...")]
+      [t("Import")]
     );
     const fileInput = h(
       "input",
@@ -134,11 +134,12 @@ export class Sidebar extends HTMLElement {
           const { rating } = obj;
           delete obj["rating"];
 
-          if (rating == "none") {
+          if (rating === "none") {
             continue;
           }
 
-          for (const img of database.findAll(obj)) {
+          const imgs = database.findAll(obj);
+          for (const img of imgs) {
             viewModel.ratingsViewModel.set(img.hash, rating);
           }
         }