🐛 bug: now searches properly after jurisdiction change

lacuna-technologies · Jun 13, 2021 · 19d3f04 · 19d3f04
1 parent 1d55392
commit 19d3f04
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clerkent",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "private": true,
   "description": "quick search for international caselaw and legislation",
   "repository": "https://github.com/lacuna-technologies/clerkent.git",

diff --git a/src/Popup/Popup.tsx b/src/Popup/Popup.tsx
@@ -125,7 +125,7 @@ const Popup: React.FC = () => {
     if(!doNotStore){
       Storage.set(keys.SELECTED_JURISDICTION, value)
     }
-    doSearch({ inputJurisdiction: value})
+    doSearch({ inputJurisdiction: value })
   }, [doSearch])
 
   const applyClipboardText = useCallback((clipboardText) => {

diff --git a/src/utils/scraper/Scraper.ts b/src/utils/scraper/Scraper.ts
@@ -69,7 +69,7 @@ const getCaseByName = Memoize((
   ]) => `${targetCaseName.name.toLowerCase()}-${inputJurisdiction}`,
 })
 
-const getLegislation = Memoize(async (
+const getLegislation = Memoize((
   targetLegislation: LegislationFinderResult,
   inputJurisdiction: Law.JursidictionCode,
 ): Promise<Law.Legislation[]> => {
@@ -78,6 +78,9 @@ const getLegislation = Memoize(async (
   if(!targetJurisdiction || !(`getLegislation` in targetJurisdiction)){
     return Promise.resolve([])
   }
+
+  Logger.log(`Scraper: getLegislation`, targetLegislation, inputJurisdiction)
+
   return (
     targetJurisdiction as JurisdictionWithLegislationSearch
   ).getLegislation(targetLegislation)
@@ -86,10 +89,10 @@ const getLegislation = Memoize(async (
     provisionType,
     provisionNumber,
     statute,
-  }]) => `${provisionType}-${provisionNumber}-${statute}`,
+  }, inputJurisdiction]) => `${provisionType}-${provisionNumber}-${statute}-${inputJurisdiction}`,
 })
 
-const getPDF = (inputCase: Law.Case, inputDocumentType: Law.Link[`doctype`]): Promise<string> => {
+const getPDF = Memoize((inputCase: Law.Case, inputDocumentType: Law.Link[`doctype`]): Promise<string> => {
   const existingLink = inputCase.links.find(({ doctype, filetype }) => doctype === inputDocumentType && filetype === `PDF`)
   if(existingLink){
     return Promise.resolve(existingLink?.url)
@@ -103,7 +106,12 @@ const getPDF = (inputCase: Law.Case, inputDocumentType: Law.Link[`doctype`]): Pr
   return (
     targetJurisdiction as any
   ).getPDF(inputCase, inputDocumentType)
-}
+}, {
+  normalizer: ([inputCase, inputDocumentType]) => {
+    const { citation, jurisdiction } = inputCase
+    return `${jurisdiction}-${citation}-${inputDocumentType}`
+  },
+})
 
 const scraper = {
   AU,