Release/v0.2.4

octree-gva · Sep 11, 2024 · 8e29648 · 8e29648
1 parent 9e7472f
commit 8e29648
Show file tree

Hide file tree

Showing 42 changed files with 1,756 additions and 842 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<h1 align="center"><img src="https://github.com/octree-gva/meta/blob/main/decidim/static/header.png?raw=true" alt="Decidim - Octree Participatory democracy on a robust and open source solution" /></h1>
+<h1 align="center"><img src="https://github.com/octree-gva/decidim-geo/blob/main/parners.png?raw=true" alt="Decidim - Octree Participatory democracy on a robust and open source solution" /></h1>
 <h4 align="center">
     <a href="https://octreegva.notion.site/Roadmap-Decidim-GEO-f191fcb9e220401f8135514a7bd41aab">Roadmap</a> |
     <a href="https://drive.google.com/file/d/1lfQJumDg0Ic-RZi-R3MM8frYtKN7PB_S/view?usp=sharing">Presentation</a> |

diff --git a/app/cells/decidim/geo/content_blocks/geo_maps_cell.rb b/app/cells/decidim/geo/content_blocks/geo_maps_cell.rb
@@ -42,7 +42,7 @@ def insert_map
             images: {
               not_geolocated: ActionController::Base.helpers.asset_pack_path("media/images/not-geolocated.svg")
             },
-            filters: @options[:filters] || [],
+            filters: (@options[:filters] || []).concat([{ timeFilter: { time: "active" } }]),
             map_config: {
               lat: geo_config[:latitude],
               lng: geo_config[:longitude],
@@ -99,8 +99,10 @@ def geo_i18n
             "decidim_geo.filters.type.only_assemblies": t("decidim.geo.filters.type.only_assemblies"),
             "decidim_geo.filters.type.only_proposals": t("decidim.geo.filters.type.only_proposals"),
             "decidim_geo.filters.type.only_meetings": t("decidim.geo.filters.type.only_meetings"),
-            "decidim_geo.filters.type.only_debates": t("decidim.geo.filters.type.only_debates")
-
+            "decidim_geo.filters.type.only_debates": t("decidim.geo.filters.type.only_debates"),
+            "decidim_geo.filters.empty_message": t("decidim.geo.filters.empty.message"),
+            "decidim_geo.filters.empty_reset_button": t("decidim.geo.filters.empty.reset_button"),
+            "decidim_geo.actions.view": t("decidim.geo.actions.view")
           }
         end
 

diff --git a/app/models/decidim/debates/debate.rb b/app/models/decidim/debates/debate.rb
@@ -25,7 +25,7 @@ class Debate < Debates::ApplicationRecord
       include Decidim::Endorsable
       include Decidim::Randomable
 
-      if Decidim.version == "0.27.4"
+      if Decidim.version >= "0.27.4"
         include Decidim::DownloadYourData
         include Decidim::FilterableResource
       end
@@ -59,7 +59,7 @@ class Debate < Debates::ApplicationRecord
         )
       }
 
-      scope_search_multi :with_any_state, [:open, :closed] if Decidim.version == "0.27.4"
+      scope_search_multi :with_any_state, [:open, :closed] if Decidim.version >= "0.27.4"
 
       def self.log_presenter_class_for(_log)
         Decidim::Debates::AdminLog::DebatePresenter

diff --git a/app/packs/src/decidim/geo/api/getFirstGeoDataSource.js b/app/packs/src/decidim/geo/api/getFirstGeoDataSource.js
@@ -1,21 +1,20 @@
-import {_getGeoDataSource, _getGeoDataSourceIds} from "./queries";
+import { _getGeoDataSource, _getGeoDataSourceIds } from "./queries";
 
-export const getFirstGeoDataSource = async (params = {}, fetchAll = true) => {
-    if (!params.variables) {
-      params.variables = {};
-    }
-    const apiQuery = fetchAll ? _getGeoDataSource : _getGeoDataSourceIds;
-    let page;
-    try {
-      page = await apiQuery(params);
-    } catch (error) {
-      console.error(error);
-      throw error;
-    }
-    if (!page) return { nodes: [], hasMore: false, endCursor: "" };
-    const { hasNextPage = false, endCursor = "" } = page?.pageInfo || {};
-    return { nodes: page.nodes, hasMore: hasNextPage, after: endCursor };
-  };
+export const getFirstGeoDataSource = async (params = {}, fetchComplete = true) => {
+  if (!params.variables) {
+    params.variables = {};
+  }
+  const apiQuery = fetchComplete ? _getGeoDataSource : _getGeoDataSourceIds;
+  let page;
+  try {
+    page = await apiQuery(params);
+  } catch (error) {
+    console.error(error);
+    throw error;
+  }
+  if (!page) return { nodes: [], hasMore: false, endCursor: "" };
+  const { hasNextPage = false, endCursor = "" } = page?.pageInfo || {};
+  return { nodes: page.nodes, hasMore: hasNextPage, after: endCursor };
+};
 
-
-  export default getFirstGeoDataSource;
+export default getFirstGeoDataSource;
diff --git a/app/packs/src/decidim/geo/api/getGeoDataSource.js b/app/packs/src/decidim/geo/api/getGeoDataSource.js
@@ -1,4 +1,4 @@
-import {_getGeoDataSource, _getGeoDataSourceIds} from "./queries";
+import { _getGeoDataSource, _getGeoDataSourceIds } from "./queries";
 
 const getGeoDataSource = async (params = {}, fetchAll = true) => {
   let results = [];
@@ -33,4 +33,4 @@ const getGeoDataSource = async (params = {}, fetchAll = true) => {
 
   return { nodes: results };
 };
-  export default getGeoDataSource;
+export default getGeoDataSource;
diff --git a/app/packs/src/decidim/geo/api/gql.js b/app/packs/src/decidim/geo/api/gql.js
@@ -1,6 +1,6 @@
 export const geoDatasource = `
   query geoDatasourceQuery ($defaultLocale: String!, $locale: String!, $filters: [GeoDatasourceFilter!], $after: String) {
-    geoDatasource(filters: $filters, locale: $locale, after: $after, first: 500){
+    geoDatasource(filters: $filters, locale: $locale, after: $after, first: 50){
       pageInfo {
         hasPreviousPage
         startCursor
@@ -45,7 +45,7 @@ export const geoDatasource = `
   }`;
 export const geoDatasourceIds = `
   query geoDatasourceQueryIds ($locale: String!, $filters: [GeoDatasourceFilter!], $after: String) {
-    geoDatasource(filters: $filters, locale: $locale, after: $after){
+    geoDatasource(filters: $filters, locale: $locale, after: $after, first: 50){
       pageInfo {
         hasPreviousPage
         startCursor

diff --git a/app/packs/src/decidim/geo/api/index.js b/app/packs/src/decidim/geo/api/index.js
@@ -1,6 +1,4 @@
+export { default as getGeoDataSource } from "./getGeoDataSource";
+export { default as getFirstGeoDataSource } from "./getFirstGeoDataSource";
 
-export {default as getGeoDataSource, } from './getGeoDataSource'
-export {default as getFirstGeoDataSource, } from './getFirstGeoDataSource'
-
-
-export {getGeoConfig, getGeoScopes} from './queries'
+export { getGeoConfig, getGeoScopes } from "./queries";
diff --git a/app/packs/src/decidim/geo/api/makeQuery.js b/app/packs/src/decidim/geo/api/makeQuery.js
@@ -13,4 +13,4 @@ const makeQuery =
     return response.data[_responseKey];
   };
 
-  export default makeQuery
+export default makeQuery;
diff --git a/app/packs/src/decidim/geo/api/queries.js b/app/packs/src/decidim/geo/api/queries.js
@@ -3,4 +3,4 @@ export const _getGeoDataSource = makeQuery("geoDatasource");
 export const _getGeoDataSourceIds = makeQuery("geoDatasourceIds", "geoDatasource");
 
 export const getGeoConfig = makeQuery("geoConfig");
-export const getGeoScopes = makeQuery("geoScope");
+export const getGeoScopes = makeQuery("geoScope");
diff --git a/app/packs/src/decidim/geo/models/GeoDatasourceNode.js b/app/packs/src/decidim/geo/models/GeoDatasourceNode.js
@@ -27,6 +27,7 @@ export default class GeoDatasourceNode {
           pinPoint == `${this.data.id}`
         ) {
           this.marker.setStyle(this.selectedState);
+          this.marker.bringToFront();
         } else {
           this.marker.setStyle(this.staledState);
         }

diff --git a/app/packs/src/decidim/geo/models/GeoScope.js b/app/packs/src/decidim/geo/models/GeoScope.js
@@ -20,7 +20,7 @@ export default class GeoScope {
   }
 
   isEmpty() {
-    if(this.data.geom === null) return true
+    if (this.data.geom === null) return true;
     const { points } = pointStore.getState();
     const currentScopeId = this.id;
     return !points.find(({ scopeId }) => `${scopeId}` === `${currentScopeId}`);
@@ -90,7 +90,7 @@ export default class GeoScope {
     );
   }
   scopeClickHandler() {
-    this.select("layer")
+    this.select("layer");
   }
   init() {
     const { map } = configStore.getState();

diff --git a/app/packs/src/decidim/geo/stores/dropdownFilterStore.js b/app/packs/src/decidim/geo/stores/dropdownFilterStore.js
@@ -46,6 +46,7 @@ const store = createStore(
     setFilter(name, value) {
       set((state) => ({
         selectedFilters: {
+          ...state.defaultFilters,
           ...state.selectedFilters,
           [`${name}`]: value || state.defaultFilters[`${name}`]
         }

diff --git a/app/packs/src/decidim/geo/stores/filterStore.js b/app/packs/src/decidim/geo/stores/filterStore.js
@@ -42,7 +42,7 @@ const store = createStore(
       const activeFilters = _.sortBy(filters, [sortingIteratee]);
       set((state) => {
         if (_.isEqual(state.activeFilters, activeFilters)) return {};
-        return { activeFilters: activeFilters };
+        return { activeFilters };
       });
     },
     resetFilters: () => {
@@ -84,11 +84,13 @@ const store = createStore(
           const timeFilterMatch = filters.find(
             ({ timeFilter = undefined }) => timeFilter
           );
+
           if (!timeFilterMatch) return defaultFilters.GeoTimeFilter;
           const timeFilter = timeFilterMatch.timeFilter.time;
           if (timeFilter === "past") return "only_past";
           if (timeFilter === "active") return "only_active";
           if (timeFilter === "future") return "only_future";
+          if (timeFilter === "all") return "all";
           return defaultFilters.GeoTimeFilter;
         case "GeoType":
           const typeFilterMatch = filters.find(

diff --git a/app/packs/src/decidim/geo/stores/pointStore.js b/app/packs/src/decidim/geo/stores/pointStore.js
@@ -27,8 +27,8 @@ const store = createStore(
     _lastFilter: "",
     _lastResponse: [],
     scopeForId: (scopeId) => {
-      const scope =  get().scopes.find(({ data }) => `${data.id}` === `${scopeId}`);
-      if(!scope || scope.isEmpty()) return null;
+      const scope = get().scopes.find(({ data }) => `${data.id}` === `${scopeId}`);
+      if (!scope || scope.isEmpty()) return null;
       return scope;
     },
     clearCache: () => {
@@ -44,16 +44,19 @@ const store = createStore(
     fetchAll: async (filters = []) => {
       const { points: fetchedPoints } = store.getState();
       if (fetchedPoints.length > 0) return;
+
       const locale = configStore.getState().locale;
       const defaultLocale = configStore.getState().defaultLocale;
       set(({ isLoading }) => ({ isLoading: isLoading + 1 }));
+      const filterWithoutTime = filters.filter(
+        (f) => typeof f.timeFilter === "undefined"
+      );
       const firstData = await getFirstGeoDataSource(
         {
-          variables: { filters, locale, defaultLocale }
+          variables: { filters: filterWithoutTime, locale, defaultLocale }
         },
         true
       );
-
       set(() => ({ points: firstData.nodes.map(mapNodeToPoint).filter(Boolean) }));
 
       const scopes = await getGeoScopes({
@@ -77,7 +80,11 @@ const store = createStore(
       if (firstData.hasMore) {
         const data = await getGeoDataSource(
           {
-            variables: { filters: filters, locale: locale, after: firstData.after }
+            variables: {
+              filters: filterWithoutTime,
+              locale: locale,
+              after: firstData.after
+            }
           },
           true
         );
@@ -122,7 +129,6 @@ const store = createStore(
         _lastResponse: filteredPoints,
         isLoading: isLoading - 1
       }));
-      console.log(ids.nodes.length, "LAST RESPONSE", filteredPoints)
       return filteredPoints;
     }
   }))