changing wording of countries and teritories

Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1
-FROM node:22.2.0 AS s1
+FROM node:22.18.0 AS s1
 WORKDIR /proco
 COPY package.json ./
 RUN yarn install

src/@/admin/constants/giga-layer.constant.ts

@@ -60,7 +60,8 @@ export const defaultGigaLayerForm = {
       tooltip: ""
     }
   },
-  globalBenchmark: null
+  globalBenchmark: null,
+  supportedFunctions: null,
 } as GigaLayerFormType;
 
 export const DataSourceStatusChoices = {

src/@/admin/models/giga-layer.model.ts

@@ -39,6 +39,7 @@ $formData.on(onUdpateGigaLayerForm, (state, payload: [string, GigaLayerAllValueT
       sourceType: [],
       dataSource: [],
       dataSourceColumn: null,
+      supportedFunctions: null,
       globalBenchmark: null
     }
   }
@@ -107,6 +108,7 @@ sample({
   clock: $currentGigaLayerItem,
   fn: (layer) => {
     if (!layer) return defaultGigaLayerForm;
+    const dataSourceColumn = Object.values(layer?.data_source_column ?? [])[0];
     return ({
       code: layer?.code,
       name: layer?.name,
@@ -119,7 +121,8 @@ sample({
       })),
       isReverse: layer?.is_reverse,
       dataSource: layer?.data_sources_list?.map(source => source.id),
-      dataSourceColumn: Object.values(layer?.data_source_column ?? [])[0],
+      dataSourceColumn,
+      supportedFunctions: layer?.data_source_column_function,
       applicableCountries: layer.applicable_countries,
       globalBenchmark: layer?.global_benchmark,
       benchmarkConvertUnit: layer?.global_benchmark?.convert_unit,

src/@/admin/types/giga-layer.type.ts

@@ -13,6 +13,7 @@ export interface DataLayer {
   category: string
   applicable_countries: number[]
   legend_configs: LegendConfigType
+  data_source_column_function: SupportedFunctionType
   global_benchmark: GlobalBenchmark
   status: LayerStatusType
   published_by: null | CreatedBy
@@ -77,9 +78,18 @@ export interface ColumnConfig {
   type: string
   on?: string
   unit?: string
-  is_parameters: boolean
+  is_parameters: boolean;
+  base_benchmark: number;
+  display_unit: string;
+  supported_functions: SupportedFunctionType[]
 }
 
+export interface SupportedFunctionType {
+  description: string
+  name: string
+  sql: string
+  verbose: string
+}
 export interface DataSourceColumn {
   "1": N1
 }
@@ -188,10 +198,11 @@ export type GigaLayerFormType = {
   description: DataLayer['description'],
   type: DataLayer['type'] | undefined,
   dataSource: number[],
-  dataSourceColumn: DataLayer['data_source'] | null,
+  dataSourceColumn: ColumnConfig | null,
   applicableCountries: DataLayer['applicable_countries'],
   globalBenchmark: DataLayer['global_benchmark'] | null,
   benchmarkConvertUnit: string,
+  supportedFunctions: SupportedFunctionType | null,
 }
 
 export type GigaLayerAllValueType = ValuesType<GigaLayerFormType>;

src/@/admin/ui/giga-layer/common/giga-layer-form/giga-benchmark-form.view.tsx

@@ -8,7 +8,7 @@ import { DataLayerFieldContainer, DataLayerNameField, InputLabel, SelectLayerCon
 import { Div } from "~/@/common/style/styled-component-style";
 import { speedConverterUtil } from "~/lib/utils";
 
-const benchmarkUnitValues = ['bps', 'ms', 'mbps'];
+const benchmarkUnitValues = ['bps', 'ms', 'mbps', '%'];
 export default function GigaBenchmarkForm({ isDefaultLayer }: { readonly isDefaultLayer: boolean }) {
   const formData = useStore($formData);
 
@@ -96,4 +96,4 @@ export default function GigaBenchmarkForm({ isDefaultLayer }: { readonly isDefau
     </DataLayerNameField>
 
   </>
-}
+}

src/@/admin/ui/giga-layer/common/giga-layer-form/giga-fields-form.view.tsx

@@ -5,7 +5,7 @@ import { useMemo } from "react";
 import { DataSourceName, LayerDataSource, LayerTypeNames } from "~/@/admin/constants/giga-layer.constant";
 import { $appConfigValues } from "~/@/admin/models/admin-model";
 import { $apiSourceValues, $formData, onUdpateGigaLayerForm } from "~/@/admin/models/giga-layer.model";
-import { DataSource } from "~/@/admin/types/giga-layer.type";
+import { DataSource, LayerTypeChoices } from "~/@/admin/types/giga-layer.type";
 import { $countryList } from "~/@/api-docs/models/explore-api.model";
 import { CountryListType } from "~/@/api-docs/types/country-list.type";
 
@@ -25,6 +25,11 @@ export default function GigaFields({ isEditMode, isDefaultLayer }: { readonly is
     return Array.from(
       list.reduce((map, obj) => map.set(obj.name, obj), new Map()).values());
   }, [apiSourceSelected])
+
+  const supportedFunctions = useMemo(() => {
+    return parameters.find(item => item.name === formData?.dataSourceColumn?.name)?.supported_functions ?? [];
+  }, [parameters, formData?.dataSourceColumn])
+
   const selectedCountries = useMemo(() => {
     if (!countryList || !formData?.applicableCountries) return [];
     return countryList?.filter(item => formData?.applicableCountries.includes(item.id))
@@ -39,6 +44,8 @@ export default function GigaFields({ isEditMode, isDefaultLayer }: { readonly is
       name: DataSourceName[sourceName]
     }))
   }, [formData.type])
+  const isLive = String(formData.type) === String(LayerTypeChoices.LIVE);
+
   return <>
     <DataLayerFieldContainer>
       <InputLabel>
@@ -161,6 +168,18 @@ export default function GigaFields({ isEditMode, isDefaultLayer }: { readonly is
       <SelectItem value="" text="Select parameter" />
       {parameters?.map((parameter) => <SelectItem key={parameter?.name} value={parameter?.name} text={parameter?.alias} />)}
     </SelectLayerConfig>
+    {isLive && <SelectLayerConfig
+      name="supportedFunctions"
+      required
+      labelText="Parameter Aggregator Function"
+      id={`convert-function-select`}
+      value={formData.supportedFunctions?.name}
+      placeholder="Select Parameter Aggregator Function"
+      onChange={(e) => onUdpateGigaLayerForm([e.target.name, supportedFunctions?.find(item => e.target.value === item.name)])}
+    >
+      <SelectItem value="" text="Select Parameter Aggregator Function" />
+      {supportedFunctions?.map((item) => <SelectItem key={item?.name} value={item?.name} text={`${item?.verbose} ${item.description ? `(${item.description})` : ''}`} />)}
+    </SelectLayerConfig>}
     <MultiSelectLayerConfig
       required
       direction='top'

src/@/admin/ui/giga-layer/common/giga-layer-form/index.tsx

@@ -22,6 +22,8 @@ const GigaLayerForm = ({ isEditMode }: { isEditMode: boolean }) => {
   const countryList = useStore($countryList)
   const layerItem = useStore($currentGigaLayerItem);
   const isDefaultLayer = isEditMode && !layerItem?.created_by;
+  let dataSourceColumn = formData.dataSourceColumn;
+  const isLive = formData.type === LayerTypeChoices.LIVE;
 
   const updateOrCreateLayer = async () => {
     try {
@@ -32,11 +34,12 @@ const GigaLayerForm = ({ isEditMode }: { isEditMode: boolean }) => {
         description: formData.description,
         type: formData.type,
         data_sources_list: formData.dataSource,
-        data_source_column: formData.dataSourceColumn,
+        data_source_column: dataSourceColumn,
         is_reverse: formData.isReverse,
+        data_source_column_function: isLive ? formData.supportedFunctions : null,
         applicable_countries: countryList.filter((country) => formData.applicableCountries.includes(country.id)).map((item) => ({ name: item.code })),
         legend_configs: { ...defaultGigaLayerForm.legendConfigs, ...formData.legendConfigs },
-        global_benchmark: { ...(formData.type === LayerTypeChoices.LIVE ? { ...formData.globalBenchmark, convert_unit: formData.benchmarkConvertUnit } : { benchmark_name: formData?.globalBenchmark?.benchmark_name ?? 'Global' }) },
+        global_benchmark: { ...(isLive ? { ...formData.globalBenchmark, convert_unit: formData.benchmarkConvertUnit } : { benchmark_name: formData?.globalBenchmark?.benchmark_name ?? 'Global' }) },
         ...(!layerItem?.status ? { status: LayerStatusType.DRAFT } : {}),
       }
 

src/@/admin/ui/giga-layer/view-giga-layer.view.tsx

@@ -105,6 +105,10 @@ const AdminViewLayer = () => {
             <LayerLabel>Parameter</LayerLabel>
             <LayerDetail>{parameterName}</LayerDetail>
           </LayerContentWrapper>
+          {isLive && <LayerContentWrapper>
+            <LayerLabel>Parameter Aggregator Function</LayerLabel>
+            <LayerDetail>{`${layerItem?.data_source_column_function.verbose} ${layerItem.data_source_column_function.description ? `(${layerItem.data_source_column_function.description})` : ''}`}</LayerDetail>
+          </LayerContentWrapper>}
           <LayerContentWrapper>
             <LayerLabel>Countries</LayerLabel>
             <LayerDetail>{countriesNames}</LayerDetail>

src/@/map/map.init.ts

@@ -136,18 +136,33 @@ sample({
   target: $reloadStyle
 });
 
+const hasFilterParams = () => {
+  const params = new URLSearchParams(window.location.search);
+  return Array.from(params.keys()).some(key => key.startsWith('filter__'));
+};
+
 const $derivedCountryActiveFilterList = combine({
   countryActiveFiltersList: $countryActiveFiltersList,
   activeFiltersList: $advanceFilterList,
   schoolFocusLatLng: $schoolFocusLatLng,
 });
 
-// guard: only run when both filters loaded AND no school is focused
+// guard: apply default country filters only when:
+// - filter data is loaded
+// - no school is focused
+// - URL has no existing filter params (to avoid overriding shared URLs)
 const activeFiltersListClock = guard({
   source: $derivedCountryActiveFilterList,
   clock: merge([fetchCountryFx.doneData, fetchAdvanceFilterFx.doneData]),
-  filter: ({ countryActiveFiltersList, activeFiltersList, schoolFocusLatLng }) =>
-    countryActiveFiltersList != null && activeFiltersList != null && schoolFocusLatLng === null,
+  filter: ({ countryActiveFiltersList, activeFiltersList, schoolFocusLatLng }) => {
+    if (hasFilterParams()) return false; // 🚨 IMPORTANT FIX
+
+    return (
+      countryActiveFiltersList != null &&
+      activeFiltersList != null &&
+      schoolFocusLatLng === null
+    );
+  },
 });
 
 sample({

src/@/map/popup/popup.util.ts

@@ -64,7 +64,9 @@ export const createAndSetPopupTemplate = ({ popupElement, feature, stylePaintDat
 
   const schoolCoords = JSON.parse(JSON.stringify((feature?.geopoint?.coordinates ?? [])));
   const isLiveNotUnknown = isLive && feature?.connectivityType !== UNKNOWN;
-  const connectivityValue = isLiveNotUnknown ? `${feature?.liveAvg ?? 0} ${unit}` : t.getState()('unknown');
+  const connectivityValue = isLiveNotUnknown
+    ? `${feature?.liveAvg ?? 0}${unit === '%' ? unit : ` ${unit}`}`
+    : t.getState()('unknown');
 
   setContentHTML(popupTemplate, '.map-school-name', feature?.name);
   setContentHTML(popupTemplate, '.map-school-id', `${feature?.externalId}`);

src/@/map/tests/__snapshots__/map-page.test.tsx.snap

@@ -1865,7 +1865,7 @@ exports[`Render Map-page MapPage snapshot 1`] = `
                     <p>
                       0 /6M 
                       <span>
-                        schools location mapped
+                        Schools mapped
                       </span>
                     </p>
                     <span
@@ -1949,7 +1949,7 @@ exports[`Render Map-page MapPage snapshot 1`] = `
                     <p>
                       0 
                       <span>
-                        schools connectivity status mapped
+                        Schools with connectivity status
                       </span>
                     </p>
                     <span
@@ -2047,7 +2047,7 @@ exports[`Render Map-page MapPage snapshot 1`] = `
                     <p>
                       0 
                       <span>
-                        schools with real-time data mapped
+                        Schools sending real-time connectivity measurements
                       </span>
                     </p>
                     <span

src/@/map/ui/advanced-filter/filter-popup-content.tsx

@@ -74,13 +74,22 @@ const FilterPopupContent = ({ setOpen }: PropsWithChildren<{ setOpen: (open: boo
   const onApply = async (e: MouseEvent) => {
     e.preventDefault();
     const prefix = 'filter__';
-    const params = new URLSearchParams();
+    const params = new URLSearchParams(window.location.search);
+    for (const key of Array.from(params.keys())) {
+      if (key.startsWith(prefix)) {
+        params.delete(key);
+      }
+    }
+
     for (const [key, value] of Object.entries(selectedFields)) {
       if (value) {
         if (typeof value === 'object') {
           const { none_range, value: rangeValue } = value;
           if (none_range) {
-            params.set(`${prefix}${key.replace('__range', '__none_range')}`, String(rangeValue) || "null,null");
+            params.set(
+              `${prefix}${key.replace('__range', '__none_range')}`,
+              String(rangeValue) || "null,null"
+            );
           } else if (rangeValue) {
             params.set(`${prefix}${key}`, String(rangeValue));
           }
@@ -92,6 +101,20 @@ const FilterPopupContent = ({ setOpen }: PropsWithChildren<{ setOpen: (open: boo
     router.navigate(`${window.location.pathname}?${params.toString()}`);
     setOpen(false);
   }
+
+  const onReset = async (e: MouseEvent) => {
+    e.preventDefault();
+    const params = new URLSearchParams(window.location.search);
+    for (const key of Array.from(params.keys())) {
+      if (key.startsWith('filter__')) {
+        params.delete(key);
+      }
+    }
+
+    router.navigate(`${window.location.pathname}?${params.toString()}`);
+    setOpen(false)
+  }
+
   // const items = ['All data layers']
   if (!isReady) return null;
   return (
@@ -128,9 +151,8 @@ const FilterPopupContent = ({ setOpen }: PropsWithChildren<{ setOpen: (open: boo
           <Button
             type="reset"
             kind="secondary"
-            onClick={() => {
-              router.navigate(`${window.location.pathname}`);
-              setOpen(false)
+            onClick={(event: MouseEvent<Element, globalThis.MouseEvent>) => {
+              void onReset(event);
             }}>
             {t('reset')}
           </Button>

src/@/map/ui/map-school-popup/school-popup-hook.ts

@@ -33,6 +33,10 @@ const useSchoolPopupData = () => {
     intervalUnit,
     false
   );
+  const formatConnectivityValue = (value: number, unit?: string) => {
+    if (!unit) return String(value);
+    return unit === '%' ? `${value}${unit}` : `${value} ${unit}`;
+  };
   const getFeatureInfo = (feature: any) => {
     const unit = global_benchmark?.convert_unit;
     const connectivityStatusValue = feature?.connectivityStatus;
@@ -41,7 +45,7 @@ const useSchoolPopupData = () => {
     const connecitivityColor = stylePaintData[feature?.connectivityType ?? UNKNOWN];
     const schoolCoords = JSON.parse(JSON.stringify((feature?.geopoint?.coordinates ?? [])));
     const isLiveNotUnknown = isLive && feature?.connectivityType !== UNKNOWN;
-    const connectivityValue = isLiveNotUnknown ? `${feature?.liveAvg ?? 0} ${unit}` : t('unknown');
+    const connectivityValue = isLiveNotUnknown ? formatConnectivityValue(feature?.liveAvg ?? 0, unit) : t('unknown');
     const benchmarkTitle = connectivityBenchMarks === ConnectivityBenchMarks.global ? benchmarkNamesAllLayers[selectedLayerData?.id ?? ""] : countryConnectivityNames[selectedLayerData?.id ?? ""]
     let staticValue = feature?.staticValue as boolean | undefined | string;
     const staticColor = stylePaintData[feature?.staticType ?? UNKNOWN]

src/@/sidebar/ui/breadcrumb/global-bdb.view.tsx

@@ -18,8 +18,7 @@ const GlobalBDB = () => {
 
   return (<div className="sidebar-worldview-global-indication">
     <div className="sidebar-worldview-global-indication-text-and-contries">
-      <span className="sidebar-worldview-globalText">{t('worldwide')}</span>
-      <span className="sidebar-worldview-contriesText">{`${noOfCounties} ${t('countries')}`}</span>
+      <span className="sidebar-worldview-contriesText">{t('countries-and-territories', { count: noOfCounties })}</span>
     </div>
     {/* <Tooltip align="bottom" label="worldwide information for register countries" className='side-info-panel-infomartion-of-worldwideview'>
       <button>

src/@/sidebar/ui/landing-page-side-bar/landing-page.tsx

@@ -76,7 +76,7 @@ const LandingPage = () => {
                 </SchoolNumberWrapper>
                 <MappedInfoWrapper>
                   <p>
-                    {t('across-no-countries', { count: globalstats?.no_of_countries ?? 0 })}
+                    {t('across-no-countries-and-territories', { count: globalstats?.no_of_countries ?? 0 })}
                   </p>
                 </MappedInfoWrapper>
               </>}
@@ -100,7 +100,7 @@ const LandingPage = () => {
                 </SchoolNumberWrapper>
                 <MappedInfoWrapper>
                   <p data-title={`${globalstats?.countries_with_connectivity_status_mapped}`}>
-                    {t('across-no-countries', { count: globalstats?.countries_with_connectivity_status_mapped ?? 0 })}
+                    {t('across-no-countries-and-territories', { count: globalstats?.countries_with_connectivity_status_mapped ?? 0 })}
                   </p>
                   <span data-title={t('int', { val: globalstats?.schools_with_connectivity_status_mapped ?? 0 })}>
                     {formatNumber(globalstats?.schools_with_connectivity_status_mapped ?? 0, lng)}
@@ -134,7 +134,7 @@ const LandingPage = () => {
               </SchoolNumberWrapper>
               <MappedInfoWrapper>
                 <p data-title={t('int', { val: connectivityStats?.countries_with_realtime_data ?? 0 })}>
-                  {t('across-no-countries', { count: connectivityStats?.countries_with_realtime_data ?? 0 })}
+                  {t('across-no-countries-and-territories', { count: connectivityStats?.countries_with_realtime_data ?? 0 })}
                 </p>
                 <span data-title={t('int', { val: connectivityStats?.no_of_schools_measure ?? 0 })}>
                   {formatNumber(connectivityStats?.no_of_schools_measure, lng)}