Merge pull request #5086 from 3liz/backport-5081-to-release_3_8

[Backport release_3_8] Speed up main view with project main data
3liz · Dec 5, 2024 · 0751b0c · 0751b0c
2 parents 41ccdb3 + cc63263
commit 0751b0c
Show file tree

Hide file tree

Showing 9 changed files with 709 additions and 4 deletions.
diff --git a/lizmap/modules/admin/classes/listProjectDatasource.class.php b/lizmap/modules/admin/classes/listProjectDatasource.class.php
@@ -26,7 +26,7 @@ public function getData($form)
         if ($criteria && array_key_exists($criteria, $this->data)) {
             $rep = lizmap::getRepository($criteria);
             // Get projects metadata
-            $metadata = $rep->getProjectsMetadata();
+            $metadata = $rep->getProjectsMainData();
             foreach ($metadata as $meta) {
                 if ($meta->getHidden()) {
                     continue;

diff --git a/lizmap/modules/lizmap/classes/lizmapRepository.class.php b/lizmap/modules/lizmap/classes/lizmapRepository.class.php
@@ -166,6 +166,11 @@ public function getProjectsMetadata()
         return $this->repo->getProjectsMetadata();
     }
 
+    public function getProjectsMainData()
+    {
+        return $this->repo->getProjectsMainData();
+    }
+
     /**
      * Return the value of the Access-Control-Allow-Origin HTTP header.
      *

diff --git a/lizmap/modules/lizmap/lib/Project/ProjectCache.php b/lizmap/modules/lizmap/lib/Project/ProjectCache.php
@@ -88,6 +88,7 @@ public function retrieveProjectData()
         try {
             $data = $this->appContext->getCache($this->fileKey, $this->profile);
             if ($data === false
+                || is_null($data)
                 || $data['qgsmtime'] < $this->qgsMtime
                 || $data['qgscfgmtime'] < $this->qgsCfgMtime
                 || !isset($data['format_version'])