udata 12.0.2.dev18__py3-none-any.whl → 12.0.2.dev19__py3-none-any.whl

udata/core/dataservices/models.py

@@ -323,6 +323,10 @@ class Dataservice(Auditable, WithMetrics, Linkable, Owned, db.Document):
         "views",
     ]
 
+    @property
+    def is_visible(self):
+        return not self.is_hidden
+
     @property
     def is_hidden(self):
         return self.private or self.deleted_at or self.archived_at

udata/core/dataservices/search.py

@@ -79,7 +79,7 @@ class DataserviceSearch(ModelSearchAdapter):
 
     @classmethod
     def is_indexable(cls, dataservice: Dataservice) -> bool:
-        return dataservice.deleted_at is None and not dataservice.private
+        return dataservice.is_visible
 
     @classmethod
     def mongo_search(cls, args):

udata/core/dataset/search.py

@@ -54,8 +54,8 @@ class DatasetSearch(ModelSearchAdapter):
     }
 
     @classmethod
-    def is_indexable(cls, dataset):
-        return dataset.deleted is None and dataset.archived is None and not dataset.private
+    def is_indexable(cls, dataset: Dataset):
+        return dataset.is_visible
 
     @classmethod
     def mongo_search(cls, args):

udata/core/organization/search.py

@@ -29,7 +29,7 @@ class OrganizationSearch(search.ModelSearchAdapter):
     }
 
     @classmethod
-    def is_indexable(cls, org):
+    def is_indexable(cls, org: Organization):
         return org.deleted is None
 
     @classmethod

udata/core/reuse/search.py

@@ -40,7 +40,7 @@ class ReuseSearch(ModelSearchAdapter):
 
     @classmethod
     def is_indexable(cls, reuse: Reuse) -> bool:
-        return reuse.deleted is None and len(reuse.datasets) > 0 and not reuse.private
+        return reuse.is_visible
 
     @classmethod
     def mongo_search(cls, args):

{udata-12.0.2.dev18.dist-info → udata-12.0.2.dev19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: udata
-Version: 12.0.2.dev18
+Version: 12.0.2.dev19
 Summary: Open data portal
 Author-email: Opendata Team <opendatateam@data.gouv.fr>
 Maintainer-email: Opendata Team <opendatateam@data.gouv.fr>

{udata-12.0.2.dev18.dist-info → udata-12.0.2.dev19.dist-info}/RECORD

@@ -84,10 +84,10 @@ udata/core/dataservices/apiv2.py,sha256=pd4UWF6m7pQ5nmBRFmeiDyedhZSngz211to6qTsc
 udata/core/dataservices/constants.py,sha256=SxetyqvbWQlb-T9Bqn7mdfzV3vS-is7s56rzmGzTXY0,1029
 udata/core/dataservices/csv.py,sha256=HWI2JrN_Vuw0te9FHlJ6eyqcRcKHOKXuzg45D4Ti6F0,1106
 udata/core/dataservices/factories.py,sha256=pKVoArNSCIbvGA-cWUc7vr8TmjYsUvOXzzcuUB5JyF4,964
-udata/core/dataservices/models.py,sha256=aMjSl4BvW9kgG6__PoxOseOeLEEMsOkRo39xhcR_PB0,12373
+udata/core/dataservices/models.py,sha256=gVem9XwNCi2A6V5bE0P0THm2E3mVg4YsRX0rroKQKEk,12448
 udata/core/dataservices/permissions.py,sha256=98zM_R4v2ZtRubflB7ajaVQz-DVc-pZBMgtKUYy34oI,169
 udata/core/dataservices/rdf.py,sha256=lbOeH-2IG_4zz6WQtD4L_ADq9iZfdSQLAiutanxd8gU,8023
-udata/core/dataservices/search.py,sha256=Tt7CUqb49Rl4hvkfGO3AiNs1Oc7HhTeBp80xQK8wwXc,4911
+udata/core/dataservices/search.py,sha256=HwbOH0yZO_3s-VxU9KER2oCQmVFtu5nW_XTSfc5-S-0,4875
 udata/core/dataservices/tasks.py,sha256=fHG1r5ymfJRXJ_Lug6je3VKZoK30XKXE2rQ8x0R-jUk,1068
 udata/core/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataset/actions.py,sha256=mX6xox0PiMrbcAPZ3VZsI26rfM-ciYfEXxN6sqqImKA,1222
@@ -108,7 +108,7 @@ udata/core/dataset/permissions.py,sha256=zXQ6kU-Ni3Pl5tDtat-ZPupug9InsNeCN7xRLc2
 udata/core/dataset/preview.py,sha256=uFEpK-p5nIAlY8hVOMhd7mtkwFt6C_PQRMNxPvAyoo4,839
 udata/core/dataset/rdf.py,sha256=jHyHgay3g3Z04Ju5kLyMk3Vyb-kWJYtqqg8Smamv7WI,32970
 udata/core/dataset/recommendations.py,sha256=DlGSLU8D0nW6Ds1rjBav1WxC-0VW5yOCjkO5w-ltFcI,7171
-udata/core/dataset/search.py,sha256=0reOKadjjqeL9ujOAGfiVBFBX5lx7vHotDbvaWPaUN0,6068
+udata/core/dataset/search.py,sha256=UEYMPwj4kDkGlGaUmsYECh1c3_BjCt1RDcMLDGrV_dA,6019
 udata/core/dataset/signals.py,sha256=WN4sV-lJlNsRkhcnhoy0SYJvCoYmK_5QFYZd1u-h4gs,161
 udata/core/dataset/tasks.py,sha256=FgdPNQYOSYdt8kMCDA8F9GWuJ-yOvCnq0BO3jiL_9hQ,7582
 udata/core/dataset/transport.py,sha256=ihCXirY1dZjOfXKbf9HRCJTfIOc75rM1McwbeGjsW6A,1296
@@ -158,7 +158,7 @@ udata/core/organization/models.py,sha256=QYneMUDA99NsMHn4_pGn1dnnDK4dESVUy5ogo8T
 udata/core/organization/notifications.py,sha256=i_36-l2y7fOGmnBmr5NDWmGGmrGRaCWbU-6XS4c2wQs,917
 udata/core/organization/permissions.py,sha256=GD-9TMtRppVCPaC1ysXYrONvGJV-ArzAOXm2XMKf9yo,1256
 udata/core/organization/rdf.py,sha256=KYJXTE5Yxhp3Cb7GZsRT1BY3Bd7rcRfwFSK9dWG2xQ4,1807
-udata/core/organization/search.py,sha256=5XMZn7xehkTV4X9NvGys_1WyHDGlUVpCQ_uJ3oyWdsE,2227
+udata/core/organization/search.py,sha256=VDBbCfGykgYqgs5IHWg_scadVkP0WQKTEzRfF01XOGc,2241
 udata/core/organization/signals.py,sha256=Ft1MBU9S41uxFN-rUrKHhiwedR1OYGv-ncuroKg8orY,488
 udata/core/organization/tasks.py,sha256=2Pd9ixeKNd7BGxBHrHYbR9AelhqkflX3ocnGgtoa8Uc,5641
 udata/core/pages/api.py,sha256=lecERyPBHIVpkVi7NGSI5WwIzIgcZ9l6tRvTVki6fZM,1474
@@ -190,7 +190,7 @@ udata/core/reuse/factories.py,sha256=GrQqYTIvwQrwkvJrbTr38-2faFW_PC99gn3yOVpgFec
 udata/core/reuse/metrics.py,sha256=sVh7BlW3OKRvFDHFyD4pPUV91jOOhj8qeWbBkLPn5Gg,176
 udata/core/reuse/models.py,sha256=ATkYKe5fAqoKiHSe7IwTdxFGtYhDu1_dAQpD1picKws,8924
 udata/core/reuse/permissions.py,sha256=j-ancS7gvLl5vJu0TNYqpYD-2So-UzoDE4IHLxRoMGg,621
-udata/core/reuse/search.py,sha256=y1DwXYkBMBwuhn62CULkU1NNo89IYp0Ae7U01jcnjBY,3137
+udata/core/reuse/search.py,sha256=HGsl8j1kTR0y2kGGa_q_XTD1qWo8y6RL_RDRMRjiIOk,3082
 udata/core/reuse/signals.py,sha256=nDrEUpYKN0AdYiEbrR0z3nzXzjaRcD8SAMutwIDsQPM,155
 udata/core/reuse/tasks.py,sha256=cc6f06HMFCDHRsdgsG09FBYsITNQ8xzdZjE-pMY61a0,1688
 udata/core/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -623,9 +623,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=nv80xZLfIfUsSOMBcr29L268FDc_Gt
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=bUp-7Ray8t8ALgJk3Icw1jmiGIc9_pEJQHiGw_2EU2o,50989
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=Y_XpUxD074wXc63oJTnoVOyOQ2lmBxl-MrgluZ0Qdw4,27961
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=qh8mrz9AFuVQtXYSSP4QWsXLM_Lv3EHVifHT1NflWXY,57529
-udata-12.0.2.dev18.dist-info/licenses/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-12.0.2.dev18.dist-info/METADATA,sha256=oBc6qMjlsxKEswygumbRy97IcQ8y_hsIRVPqJ5EdJCg,5174
-udata-12.0.2.dev18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-udata-12.0.2.dev18.dist-info/entry_points.txt,sha256=v2u12qO11i2lyLNIp136WmLJ-NHT-Kew3Duu8J-AXPM,614
-udata-12.0.2.dev18.dist-info/top_level.txt,sha256=EF6CE6YSHd_og-8LCEA4q25ALUpWVe8D0okOLdMAE3A,6
-udata-12.0.2.dev18.dist-info/RECORD,,
+udata-12.0.2.dev19.dist-info/licenses/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-12.0.2.dev19.dist-info/METADATA,sha256=23Yw7BWp8JzOQNzJwn-qoxQq9t_NYa6RSCWDzdSw0aw,5174
+udata-12.0.2.dev19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+udata-12.0.2.dev19.dist-info/entry_points.txt,sha256=v2u12qO11i2lyLNIp136WmLJ-NHT-Kew3Duu8J-AXPM,614
+udata-12.0.2.dev19.dist-info/top_level.txt,sha256=EF6CE6YSHd_og-8LCEA4q25ALUpWVe8D0okOLdMAE3A,6
+udata-12.0.2.dev19.dist-info/RECORD,,