chore(deps): bump @ircsignpost/signpost-base from 16.15.0 to 16.26.0

Bumps [@ircsignpost/signpost-base](https://github.com/unitedforukraine/signpost-base) from 16.15.0 to 16.26.0. - [Commits](https://github.com/unitedforukraine/signpost-base/commits) --- updated-dependencies: - dependency-name: "@ircsignpost/signpost-base" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
theirc · Feb 20, 2024 · 91593a2 · 91593a2
1 parent f0dc704
commit 91593a2
Show file tree

Hide file tree

Showing 6 changed files with 727 additions and 91 deletions.
diff --git a/lib/constants.ts b/lib/constants.ts
@@ -1,14 +1,7 @@
 import { AlgoliaSearchIndex } from '@ircsignpost/signpost-base/dist/src/search-common';
-import { LatLngExpression } from 'leaflet';
 
 export const SITE_TITLE = 'Refugee.info Italy';
 
-export const COUNTRY_ID = 11;
-
-export const MAP_DEFAULT_COORDS: LatLngExpression = [
-  34.45830721078611, 65.09457416213823,
-];
-
 // Cache statically generated pages for 1 hour. The timeout was chosen
 // arbitrarily. Our website has static, non-urgent resources, so we probably do
 // not need to serve content faster.

diff --git a/lib/translations.tsx b/lib/translations.tsx
@@ -99,7 +99,6 @@ export const HOME_PAGE_DYNAMIC_CONTENT_PLACEHOLDERS = [
   'default_all_populations_option',
   'default_all_accessibilities_option',
   'default_distance_away_tooltip',
-  'default_seach_input_text',
   'default_contact_button_label',
   'default_view_service_label',
   'default_service_type_label',
@@ -184,11 +183,11 @@ export function populateServiceMapStrings(dynamicContent: {
       informationTooltip: dynamicContent['default_distance_away_tooltip'],
     },
     popupStrings: populatePopupStrings(dynamicContent),
-    labelSearchInput: { label: dynamicContent['default_seach_input_text'] },
     labelAccessibility: dynamicContent['default_accessibility_label'],
     labelPopulations: dynamicContent['default_populations_label'],
     labelProvider: dynamicContent['default_providers_label'],
     labelServicesTypes: dynamicContent['default_service_type_label'],
+    searchListString: dynamicContent['default_search_hint'],
   };
 }
 

diff --git a/package.json b/package.json
@@ -18,22 +18,22 @@
     "@algolia/autocomplete-core": "^1.7.1",
     "@algolia/autocomplete-js": "^1.7.1",
     "@algolia/client-search": "^4.14.2",
-    "@changey/react-leaflet-markercluster": "^4.0.0-rc1",
     "@directus/sdk": "^10.3.3",
-    "@ircsignpost/signpost-base": "16.15.0",
+    "@ircsignpost/signpost-base": "16.28.0",
+    "@mapbox/mapbox-gl-geocoder": "^5.0.2",
     "@next/env": "^12.2.4",
     "@react-spring/web": "^9.5.4",
-    "@vercel/og": "^0.5.10",
+    "@types/mapbox__mapbox-gl-geocoder": "^4.7.7",
+    "@vercel/og": "^0.5.6",
     "algoliasearch": "^4.14.2",
     "antd": "^4.23.1",
-    "geolib": "^3.3.4",
     "html-dom-parser": "^3.1.2",
     "html-react-parser": "^3.0.4",
     "http-status-codes": "^2.2.0",
-    "leaflet": "^1.9.1",
-    "leaflet.markercluster": "^1.5.3",
     "less": "^4.1.3",
     "less-loader": "^11.0.0",
+    "mapbox-gl": "^3.1.0",
+    "mapbox-gl-geocoder": "^2.0.1",
     "next": "12.3.0",
     "next-pwa": "^5.6.0",
     "next-share": "^0.19.0",
@@ -42,18 +42,20 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-instantsearch-hooks-web": "^6.32.0",
-    "react-leaflet": "^4.1.0",
+    "react-map-gl": "^7.1.0",
+    "supercluster": "^8.0.1",
     "usehooks-ts": "^2.6.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
     "@directus/sdk": "^10.3.3",
     "@trivago/prettier-plugin-sort-imports": "^3.3.0",
-    "@types/leaflet": "^1.8.0",
     "@types/node": "18.7.17",
     "@types/react": "18.0.19",
     "@types/react-dom": "18.0.6",
+    "@types/react-map-gl": "^6.1.6",
+    "@types/supercluster": "^7.1.3",
     "check-peer-dependencies": "^4.1.0",
     "cypress": "^10.7.0",
     "eslint": "^8.23.1",
@@ -65,7 +67,9 @@
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-preset-env": "^7.8.2",
     "prettier": "^2.7.1",
+    "react-map-gl": "^7.1.0",
     "start-server-and-test": "^1.14.0",
+    "supercluster": "^8.0.1",
     "tailwindcss": "^3.1.8",
     "typescript": "4.8.3",
     "webpack": "^5.74.0"

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -1,8 +1,8 @@
 import 'antd/dist/antd.less';
 import '../styles/globals.css';
-import 'leaflet/dist/leaflet.css';
-import "leaflet.markercluster/dist/MarkerCluster.css";
-import "leaflet.markercluster/dist/MarkerCluster.Default.css";
+import "mapbox-gl/dist/mapbox-gl.css";
+import 'mapbox-gl/dist/mapbox-gl.css';
+import '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css';
 import '@ircsignpost/signpost-base/styles/topic-with-articles.less';
 import '@ircsignpost/signpost-base/styles/footer-page.less';
 import '@ircsignpost/signpost-base/styles/header.less';

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -1,10 +1,13 @@
 import { Directus } from '@directus/sdk';
 import CookieBanner from '@ircsignpost/signpost-base/dist/src/cookie-banner';
 import {
+  DirectusServiceCategory,
   getDirectusAccessibility,
   getDirectusArticles,
+  getDirectusCities,
   getDirectusPopulationsServed,
   getDirectusProviders,
+  getDirectusRegions,
   getDirectusServiceCategories,
 } from '@ircsignpost/signpost-base/dist/src/directus';
 import { HeaderBannerStrings } from '@ircsignpost/signpost-base/dist/src/header-banner';
@@ -33,7 +36,6 @@ import {
   DIRECTUS_COUNTRY_ID,
   DIRECTUS_INSTANCE,
   GOOGLE_ANALYTICS_IDS,
-  MAP_DEFAULT_COORDS,
   REVALIDATION_TIMEOUT_SECONDS,
   SEARCH_BAR_INDEX,
   SECTION_ICON_NAMES,
@@ -199,10 +201,51 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
   );
   const uniquePopulationsIdsArray = Array.from(uniquePopulationsIdsSet);
 
+  const uniqueRegionsIds = new Set(services.map((service) => service.region));
+
+  const uniqueCitiesIds = new Set(services.map((service) => service.city));
+
   const uniqueProvidersIdsSet = new Set(services.flatMap((x) => x.provider.id));
   const uniqueProvidersIdsArray = Array.from(uniqueProvidersIdsSet);
 
-  const serviceTypes = await getDirectusServiceCategories(directus);
+  const regions = await getDirectusRegions(
+    Array.from(uniqueRegionsIds).filter((x) => x !== null),
+    directus
+  );
+  const cities = await getDirectusCities(
+    Array.from(uniqueCitiesIds).filter((x) => x !== null),
+    directus
+  );
+
+  const fetchServiceTypes = await getDirectusServiceCategories(directus);
+  const uniqueTypesSet = new Set<number>();
+  services.forEach((service) => {
+    service.categories.forEach((category) => {
+      uniqueTypesSet.add(category.service_categories_id.id);
+    });
+  });
+
+  const usedSubcategoryIds = new Set<number>();
+  services.forEach((service) => {
+    service.subcategories.forEach((subcategory) => {
+      usedSubcategoryIds.add(subcategory.services_subcategories_id);
+    });
+  });
+
+  const serviceTypes = fetchServiceTypes
+    .filter((type) => uniqueTypesSet.has(type.id))
+    .map((category) => {
+      const filteredSubcategories = category.services_subcategories.filter(
+        (subcategory) =>
+          usedSubcategoryIds.has(subcategory?.services_subcategories_id?.id)
+      );
+
+      return {
+        ...category,
+        services_subcategories: filteredSubcategories,
+      } as DirectusServiceCategory;
+    });
+
   const providersArray = await getDirectusProviders(
     directus,
     DIRECTUS_COUNTRY_ID
@@ -229,14 +272,15 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
       socialMediaLinks: populateSocialMediaLinks(dynamicContent),
       serviceMapProps: {
         services,
-        defaultCoords: MAP_DEFAULT_COORDS,
         shareButton: getShareButtonStrings(dynamicContent),
         serviceTypes,
         providers,
         populations,
         accessibility,
         showDirectus: true,
         currentLocale,
+        regions,
+        cities,
       },
       categories,
       aboutUsTextHtml,