Release v1.32.0 (#474)

* Feature/notificaiton (#424)

* fix: fix infinite scroll props

* feat: create with dot icons

* feat: replace conversation icon

* feat: create spinning loader

* feat: add bell icon

* fix: remove conversation message loader

* feat: api implementation

* feat: ui implementation

* feat: create notification table

* feat: update unseen notifcation function

* refactor: house keep

* refactor: house keep nav menue

* refactor: house keep

* refactor: text copies

* feat: message noti copy and ui

* feat: rename function and make it 24 hr

---------

Co-authored-by: Pjaijai <paul6a24@hotmail.com>

* Feature/allow compnay search on job journey search bar and sheet (#426)

* feat: replace job type with company

* style: style fix

* docs: adding back doc

* feat: update function

---------

Co-authored-by: Pjaijai <paul6a24@hotmail.com>

* Feature/Fire job journey (#427)

* fix: fix company folder

* feat(implement fire): implement fire

* fix: update fire table migration script

---------

Co-authored-by: Pjaijai <paul6a24@hotmail.com>

* style: update display company option style

* style: update company select style

* Update client/modules/job-journey/create/components/sections/preview.tsx

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* fix: fix type

* fix: fix location label display

* chore(release): 1.32.0

---------

Co-authored-by: Pjaijai <paul6a24@hotmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 3 people

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.32.0](https://github.com/Pjaijai/Referalah/compare/v1.21.1...v1.32.0) (2025-12-07)
+
+
+### Features
+
+* update copies ([#470](https://github.com/Pjaijai/Referalah/issues/470)) ([2cef9e3](https://github.com/Pjaijai/Referalah/commit/2cef9e369084fad3d624ea5c59a5a72d6561c21e))
+
+
+### Bug Fixes
+
+* fix location label display ([904b022](https://github.com/Pjaijai/Referalah/commit/904b022a4ac7abc794baac0c1a8caad45b4d07cf))
+* fix type ([9e13542](https://github.com/Pjaijai/Referalah/commit/9e135421b694dca9d09346e61be6bb83fa21f809))
+
 ## [1.31.0](https://github.com/Pjaijai/Referalah/compare/v1.21.1...v1.31.0) (2025-11-15)
 
 

client/hooks/common/options/location-options-list.tsx

@@ -21,31 +21,44 @@ const useLocationOptionsList = (
 
     // Helper function to get the hierarchical label
     const getLocationLabel = (location: TLocationData): string => {
-      const parts: string[] = [getName(location)]
-
-      // For Level 1 and Level 2, include emoji if present
-      if (location.level === 1 || location.level === 2) {
-        if (location.meta_data?.emoji) {
-          parts.unshift(location.meta_data.emoji)
-          return parts.join(" ")
-        }
+      const parts: string[] = []
+
+      // Add emoji if present for Level 1 and Level 2
+      if (
+        (location.level === 1 || location.level === 2) &&
+        location.meta_data?.emoji
+      ) {
+        parts.push(location.meta_data.emoji)
       }
 
-      // If no parent, return the name (and emoji if already added)
-      if (!location.parent_uuid) {
-        return parts.join(" ")
-      }
+      // Add current location name
+      parts.push(getName(location))
 
-      // Add parent name
-      if (location.parent_uuid) {
-        const parent = locationMap.get(location.parent_uuid)
-        if (parent) parts.push(getName(parent))
+      // If level 1 or no parent, return now
+      if (location.level === 1 || !location.parent_uuid) {
+        return parts.join(" ")
       }
 
-      // Add country name if applicable and not already added
-      if (location.country_uuid) {
+      // Add parent name if parent exists
+      const parent = locationMap.get(location.parent_uuid)
+      if (parent) {
+        parts.push(getName(parent))
+
+        // For level 3, also try to add country if it exists and is different from parent
+        if (
+          location.level === 3 &&
+          location.country_uuid &&
+          location.country_uuid !== location.parent_uuid
+        ) {
+          const country = locationMap.get(location.country_uuid)
+          if (country && country.uuid !== parent.uuid) {
+            parts.push(getName(country))
+          }
+        }
+      } else if (location.country_uuid) {
+        // If parent not found but country exists, add country
         const country = locationMap.get(location.country_uuid)
-        if (country && country.uuid !== location.parent_uuid) {
+        if (country) {
           parts.push(getName(country))
         }
       }
@@ -154,28 +167,71 @@ const useLocationOptionsList = (
     // Process Level 2 with parent_uuid that weren't processed as children of Level 1
     level2WithParent.forEach((location) => {
       if (!options.some((opt) => opt.value === location.uuid)) {
-        processLocation(location, 2)
+        // Add level 2 location
+        options.push({
+          value: location.uuid,
+          label: getLocationLabel(location),
+        })
+
+        // Add its level 3 children
+        const level3Children = level3WithParent.filter(
+          (loc) => loc.parent_uuid === location.uuid
+        )
+        level3Children.sort(sortByName)
+
+        level3Children.forEach((child) => {
+          options.push({
+            value: child.uuid,
+            label: getLocationLabel(child),
+          })
+        })
       }
     })
 
     // Process Level 3 with parent_uuid that weren't processed as children of Level 2
+    // BUT skip those whose parent is in level2WithoutParent (they'll be added with their parent)
     level3WithParent.forEach((location) => {
       if (!options.some((opt) => opt.value === location.uuid)) {
-        options.push({
-          value: location.uuid,
-          label: getLocationLabel(location),
-        })
+        // Check if parent is in level2WithoutParent
+        const parentIsOrphan = level2WithoutParent.some(
+          (l2) => l2.uuid === location.parent_uuid
+        )
+
+        // Only add if parent is not an orphan (without parent)
+        if (!parentIsOrphan) {
+          options.push({
+            value: location.uuid,
+            label: getLocationLabel(location),
+          })
+        }
       }
     })
 
-    // Step 6: Process Level 2 and Level 3 without parent_uuid last
+    // Step 6: Process Level 2 without parent_uuid and their Level 3 children
     level2WithoutParent.forEach((location) => {
       options.push({
         value: location.uuid,
         label: getLocationLabel(location),
       })
+
+      // Add level 3 children that belong to this level 2 location
+      const level3Children = level3WithParent.filter(
+        (loc) => loc.parent_uuid === location.uuid
+      )
+      level3Children.sort(sortByName)
+
+      level3Children.forEach((child) => {
+        // Only add if not already in options
+        if (!options.some((opt) => opt.value === child.uuid)) {
+          options.push({
+            value: child.uuid,
+            label: getLocationLabel(child),
+          })
+        }
+      })
     })
 
+    // Process Level 3 without parent_uuid last
     level3WithoutParent.forEach((location) => {
       options.push({
         value: location.uuid,
@@ -189,7 +245,7 @@ const useLocationOptionsList = (
     }
 
     return options
-  }, [locations, locale, searchTerm])
+  }, [locations, locale, searchTerm, showAllOption])
 }
 
 export default useLocationOptionsList

package.json

@@ -1,7 +1,7 @@
 {
   "name": "Referalah",
   "description": "An open source online platform for people to connect each other",
-  "version": "1.31.0",
+  "version": "1.32.0",
   "license": "Apache-2.0",
   "scripts": {
     "prepare": "husky install .husky",