Merge pull request #3349 from mariojsnunes/feat/question-filters

feat: update question filters
ONEARMY · Mar 25, 2024 · d7eaa82 · d7eaa82
2 parents 9472531 + 161bf52
commit d7eaa82
Show file tree

Hide file tree

Showing 24 changed files with 1,042 additions and 139 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,6 @@
 build
 .firebase
 storybook-static
-dist
+dist
+firestore.indexes.json
+firebase.json
diff --git a/firebase.json b/firebase.json
@@ -1,7 +1,12 @@
 {
+  "$schema": "./node_modules/firebase-tools/schema/firebase-config.json",
   "hosting": {
     "public": "build",
-    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ],
     "rewrites": [
       {
         "source": "/api",
@@ -86,7 +91,9 @@
     ]
   },
   "functions": {
-    "predeploy": ["yarn workspace functions build"],
+    "predeploy": [
+      "yarn workspace functions build"
+    ],
     "source": "functions/dist",
     "runtime": "nodejs20"
   },
@@ -122,5 +129,8 @@
   },
   "extensions": {
     "firestore-send-email": "firebase/[email protected]"
+  },
+  "firestore": {
+    "indexes": "./firestore.indexes.json"
   }
-}
+}
diff --git a/firestore.indexes.json b/firestore.indexes.json
@@ -0,0 +1,151 @@
+{
+  "indexes": [
+    {
+      "collectionGroup": "research_rev20201020",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "_createdBy",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "votedUsefulBy",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "research_rev20201020",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "collaborators",
+          "arrayConfig": "CONTAINS"
+        },
+        {
+          "fieldPath": "votedUsefulBy",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "research_rev20201020",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "moderation",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "votedUsefulBy",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "v3_howtos",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "_createdBy",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "moderation",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "votedUsefulBy",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "v3_howtos",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "_createdBy",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "votedUsefulBy",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "v3_howtos",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "_deleted",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "_modified",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "v3_howtos",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "moderation",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "votedUsefulBy",
+          "order": "ASCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "questions_rev20230926",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "_created",
+          "order": "DESCENDING"
+        },
+        {
+          "fieldPath": "_modified",
+          "order": "DESCENDING"
+        },
+        {
+          "fieldPath": "commentCount",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "commentCount",
+          "order": "DESCENDING"
+        },
+        {
+          "fieldPath": "latestCommentDate",
+          "order": "DESCENDING"
+        }
+      ]
+    },
+    {
+      "collectionGroup": "questions_rev20230926",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "questionCategory._id",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "_created",
+          "order": "DESCENDING"
+        },
+        {
+          "fieldPath": "__name__",
+          "order": "DESCENDING"
+        }
+      ]
+    }
+  ],
+  "fieldOverrides": []
+}
diff --git a/jest.config.ts b/jest.config.ts
@@ -0,0 +1,8 @@
+import type { JestConfigWithTsJest } from 'ts-jest'
+
+const config: JestConfigWithTsJest = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+}
+
+export default config
diff --git a/package.json b/package.json
@@ -175,6 +175,7 @@
     "start-server-and-test": "^1.11.0",
     "stream-browserify": "^3.0.0",
     "terser": "3.14.1",
+    "ts-jest": "^29.1.2",
     "ts-loader": "^7.0.5",
     "typescript": "^5.1.6",
     "wait-on": "^5.2.1",

diff --git a/packages/cypress/src/fixtures/searchResults.ts b/packages/cypress/src/fixtures/searchResults.ts
@@ -24,7 +24,7 @@ export const SingaporeReverseStubResponse = {
   osm_id: 733562800,
   lat: '1.3572387983345497',
   lon: '103.81937941431262',
-  display_name: 'Drongo Trail, Bishan, Singapore, Central, 578774, Singapore',
+  display_name: 'Drongo Trail, Bishan, Central, Singapore , 578774, Singapore',
   address: {
     road: 'Drongo Trail',
     suburb: 'Bishan',

diff --git a/packages/cypress/src/integration/settings.spec.ts b/packages/cypress/src/integration/settings.spec.ts
@@ -133,11 +133,11 @@ describe('[Settings]', () => {
         },
       ],
       location: {
-        administrative: 'Central',
+        administrative: '',
         country: 'Singapore',
         countryCode: 'sg',
         latlng: { lng: '103.8194992', lat: '1.357107' },
-        name: 'Drongo Trail, Bishan, Singapore, Central, 578774, Singapore',
+        name: 'Drongo Trail, Bishan, Central, Singapore, 578774, Singapore',
         postcode: '578774',
         value: 'Singapore',
       },
@@ -356,11 +356,11 @@ describe('[Settings]', () => {
         ],
         mapPinDescription: 'Fun, vibrant and full of amazing people',
         location: {
-          administrative: 'Central',
+          administrative: '',
           country: 'Singapore',
           countryCode: 'sg',
           latlng: { lng: '103.8194992', lat: '1.357107' },
-          name: 'Drongo Trail, Bishan, Singapore, Central, 578774, Singapore',
+          name: 'Drongo Trail, Bishan, Central, Singapore, 578774, Singapore',
           postcode: '578774',
           value: 'Singapore',
         },
@@ -493,11 +493,11 @@ describe('[Settings]', () => {
         },
       ],
       location: {
-        administrative: 'Central',
+        administrative: '',
         country: 'Singapore',
         countryCode: 'sg',
         latlng: { lng: '103.8194992', lat: '1.357107' },
-        name: 'Drongo Trail, Bishan, Singapore, Central, 578774, Singapore',
+        name: 'Drongo Trail, Bishan, Central, Singapore, 578774, Singapore',
         postcode: '578774',
         value: 'Singapore',
       },
@@ -592,11 +592,11 @@ describe('[Settings]', () => {
         },
       ],
       location: {
-        administrative: 'Central',
+        administrative: '',
         country: 'Singapore',
         countryCode: 'sg',
         latlng: { lng: '103.8194992', lat: '1.357107' },
-        name: 'Drongo Trail, Bishan, Singapore, Central, 578774, Singapore',
+        name: 'Drongo Trail, Bishan, Central, Singapore, 578774, Singapore',
         postcode: '578774',
         value: 'Singapore',
       },
@@ -687,11 +687,11 @@ describe('[Settings]', () => {
         },
       ],
       location: {
-        administrative: 'Central',
+        administrative: '',
         country: 'Singapore',
         countryCode: 'sg',
         latlng: { lng: '103.8194992', lat: '1.357107' },
-        name: 'Drongo Trail, Bishan, Singapore, Central, 578774, Singapore',
+        name: 'Drongo Trail, Bishan, Central, Singapore, 578774, Singapore',
         postcode: '578774',
         value: 'Singapore',
       },

diff --git a/src/pages/Howto/Category/CategoriesSelect.tsx b/src/pages/Howto/Category/CategoriesSelect.tsx
@@ -6,18 +6,19 @@ import { FieldContainer } from '../../../common/Form/FieldContainer'
 
 import type { ICategory } from 'src/models/categories.model'
 
+/**
+ * @deprecated in favor of CategoriesSelectV2
+ */
 export const CategoriesSelect = observer(
   ({ value, onChange, placeholder, isForm, type }) => {
+    const { categoriesStore, researchCategoriesStore } =
+      useCommonStores().stores
+
     let categories: ICategory[] = []
     if (type === 'howto') {
-      const { categoriesStore } = useCommonStores().stores
       categories = categoriesStore.allCategories
     } else if (type === 'research') {
-      const { researchCategoriesStore } = useCommonStores().stores
       categories = researchCategoriesStore.allResearchCategories
-    } else if (type === 'question') {
-      const { questionCategoriesStore } = useCommonStores().stores
-      categories = questionCategoriesStore.allQuestionCategories
     }
 
     const selectOptions = categories