edu-rdm-integration 3.8.0__py3-none-any.whl → 3.8.1__py3-none-any.whl

edu_rdm_integration/models.py

@@ -9,6 +9,10 @@ from typing import (
     Optional,
 )
 
+from edu_rdm_integration.uploader_log.enums import (
+    RequestResultStatus,
+)
+
 from django.db.models import (
     CASCADE,
     PROTECT,
@@ -917,6 +921,13 @@ class UploaderClientLog(Entry):
         """Ошибка запроса."""
         return self.error
 
+    @property
+    def result_status_display(self) -> str:
+        """Результат запроса."""
+        result_status = getattr(self, 'result_status', RequestResultStatus.ERROR)
+
+        return RequestResultStatus.values.get(result_status) or RequestResultStatus.values[RequestResultStatus.ERROR]
+
     class Meta:
         proxy = True
 

edu_rdm_integration/uploader_log/actions.py

@@ -11,6 +11,13 @@ from typing import (
     Optional,
 )
 
+from django.conf import (
+    settings,
+)
+from edu_rdm_integration.uploader_log.enums import (
+    RequestResultStatus,
+)
+
 from django.db.models import (
     Q,
 )
@@ -42,7 +49,9 @@ from edu_rdm_integration.models import (
 )
 from edu_rdm_integration.uploader_log.ui import (
     UploaderLogInfoWindow,
-    UploaderLogListWindow,
+)
+from objectpack.filters import (
+    CustomFilter,
 )
 
 
@@ -54,7 +63,6 @@ class UploaderLogPack(ObjectPack):
     title = 'Журнал логов РВД'
     model = UploaderClientLog
 
-    list_window = UploaderLogListWindow
     edit_window = UploaderLogInfoWindow
 
     _is_primary_for_model = False
@@ -108,8 +116,13 @@ class UploaderLogPack(ObjectPack):
         },
         {
             'header': 'Результат',
-            'data_index': 'http_response_status',
+            'data_index': 'result_status_display',
             'sortable': False,
+            'filter': ChoicesFilter(
+                choices=RequestResultStatus.get_choices(),
+                parser=int,
+                lookup='result_status',
+            ),
             'width': 5,
         },
         {
@@ -129,8 +142,13 @@ class UploaderLogPack(ObjectPack):
         {
             'header': 'Код статуса загрузки',
             'data_index': 'status_code',
-            'sortable': False,
+            'sortable': True,
             'searchable': True,
+            'filter': CustomFilter(
+                xtype='field',
+                parser=str,
+                lookup=lambda v: Q(response__icontains=f'"code": {v}'),
+            ),
             'width': 10,
         },
         {
@@ -151,7 +169,7 @@ class UploaderLogPack(ObjectPack):
             ),
             'column_renderer': boolean_column_renderer(),
             'width': 5,
-        }
+        },
     ]
 
     def __init__(self):
@@ -204,6 +222,10 @@ class UploaderLogPack(ObjectPack):
         """Конфигурирование грида окна списка."""
         super().configure_grid(grid, *args, **kwargs)
 
+        if self.allow_paging:
+            grid.allow_paging = self.allow_paging
+            grid.paging_bar.page_size = self._DEFAULT_PAGING_LIMIT
+
         grid.url_edit = None
         add_one_row_button(
             'Просмотр',
@@ -224,11 +246,24 @@ class UploaderLogPack(ObjectPack):
 
         return params
 
-    def extend_menu(self, menu):  # noqa D102
-        return menu.SubMenu(
-            'Администрирование', menu.SubMenu(
-                'Региональная витрина данных', menu.Item(
-                    self.title, self.list_window_action
-                )
+    def extend_menu(self, menu):
+        """Размещение в меню подменю "Администрирование -> Региональная витрина данных -> Журнал логов РВД".
+
+        Args:
+            menu: Объект меню.
+        Returns:
+            Подменю "Администрирование -> Региональная витрина данных -> Журнал логов РВД".
+        """
+
+        if settings.RDM_MENU_ITEM:
+            return menu.SubMenu(
+                'Администрирование',
+                menu.SubMenu(
+                    'Региональная витрина данных',
+                    menu.Item(
+                        self.title,
+                        self.list_window_action,
+                    ),
+                    icon='menu-dicts-16',
+                ),
             )
-        )

edu_rdm_integration/uploader_log/ui.py

@@ -3,7 +3,6 @@ from m3_ext.ui.fields import (
 )
 from objectpack.ui import (
     BaseEditWindow,
-    BaseListWindow,
 )
 
 from educommon.utils.ui import (
@@ -62,13 +61,3 @@ class UploaderLogInfoWindow(BaseEditWindow):
 
         switch_window_in_read_only_mode(self)
         self.make_read_only()
-
-
-class UploaderLogListWindow(BaseListWindow):
-    """Окно для списка  логов Загрузчика данных в витрину."""
-
-    def _init_components(self):
-        super()._init_components()
-
-        self.grid.allow_paging = True
-        self.grid.paging_bar.page_size = 35

{edu_rdm_integration-3.8.0.dist-info → edu_rdm_integration-3.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edu-rdm-integration
-Version: 3.8.0
+Version: 3.8.1
 Summary: Интеграция с Региональной витриной данных
 Author-email: BARS Group <education_dev@bars.group>
 Project-URL: Homepage, https://stash.bars-open.ru/projects/EDUBASE/repos/edu_rdm_integration/browse

{edu_rdm_integration-3.8.0.dist-info → edu_rdm_integration-3.8.1.dist-info}/RECORD

@@ -8,7 +8,7 @@ edu_rdm_integration/entities.py,sha256=mhVeB88A-VD5IAzZCNeI1qnkvNoZ8LPiLBdqk1yA3
 edu_rdm_integration/enums.py,sha256=RpQIZM1iSgFbYDHfwrbT-BwgRf-N9ZZnJgx8UyRFQ2o,4978
 edu_rdm_integration/helpers.py,sha256=qwSyeIDBVEhdYG9raf3uLZPd1_2eXuNAaosSR7bLa50,14759
 edu_rdm_integration/mapping.py,sha256=1B6TsC4Os9wiM8L8BChnCNv_iWqjeWu3bdDsqKVsId0,616
-edu_rdm_integration/models.py,sha256=lrlJUAJJr29rrNwNdyCkswyRGmnm8XVDQDArWVO2ivc,31907
+edu_rdm_integration/models.py,sha256=4IR5gdNX6YVvGysQQeixcjIOCrMQ37RVhmyvSwucLdc,32297
 edu_rdm_integration/redis_cache.py,sha256=SP_rcL5t6PTVLOnEYn_NTX0Z666VdZT4By2pyED24Z4,1537
 edu_rdm_integration/signals.py,sha256=3eRlpkDcFCF6TN80-QM8yBYLcyozzcmoPjz6r4_ApWg,73
 edu_rdm_integration/storages.py,sha256=G4Q4tIyJdEyb9ka551PADCFIm66bpsJe9VBRcvQhLMI,6745
@@ -176,14 +176,14 @@ edu_rdm_integration/registry/actions.py,sha256=-CHe95jbxO9JAEaOx6nV6Avn75ynppvZR
 edu_rdm_integration/registry/ui.py,sha256=v4GqbQUcoeHxfUPUYORuj4DfzIp49diY-F1hyL3TCPo,2592
 edu_rdm_integration/templates/ui-js/transferred-entity-list.js,sha256=IWEZ9JoTxD5-CLic5v07XHWW0iGRWk-cjeGVSzU4yKg,1117
 edu_rdm_integration/uploader_log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edu_rdm_integration/uploader_log/actions.py,sha256=2ckgI1PKgVcLYkbhtbK_bfv_6lDxpiIRSk1uPCIL-gg,6755
+edu_rdm_integration/uploader_log/actions.py,sha256=K06pkaWGjPnt6cpPYdSk8X7nqQEfW-vXXvNVORRbDCs,7957
 edu_rdm_integration/uploader_log/apps.py,sha256=tYJj4-sDlq8fLOSvw18L_yys7SILpTKWNmE2Qug6GnE,265
 edu_rdm_integration/uploader_log/enums.py,sha256=rgSO3BL2rh2xpfm0Pt4waQW8fB1VMJLdsGmr3SXwH_U,266
 edu_rdm_integration/uploader_log/managers.py,sha256=OFdToWV8qhdfeGNpd-UWAmSEISzixmVQ6LF75EW7gzA,3248
-edu_rdm_integration/uploader_log/ui.py,sha256=YM9Buqp2wxE95Wf5gvAATBzuYzDOossK1sEmvFk07cI,2110
+edu_rdm_integration/uploader_log/ui.py,sha256=7O63XJJYnJBLVU9aGuSyMOxFYtcj_Kyf5u6HIiuxl9A,1788
 edu_rdm_integration/uploader_log/templates/ui-js/object-grid-buttons.js,sha256=2xyGe0wdVokM0RhpzRzcRvJPBkBmPe3SlZry4oP4Nzs,6201
-edu_rdm_integration-3.8.0.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
-edu_rdm_integration-3.8.0.dist-info/METADATA,sha256=RG6vIjFCjWp4m7xz-Eey7SLDFCFRIhi3AX6D24dHRcQ,35263
-edu_rdm_integration-3.8.0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-edu_rdm_integration-3.8.0.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
-edu_rdm_integration-3.8.0.dist-info/RECORD,,
+edu_rdm_integration-3.8.1.dist-info/licenses/LICENSE,sha256=uw43Gjjj-1vXWCItfSrNDpbejnOwZMrNerUh8oWbq8Q,3458
+edu_rdm_integration-3.8.1.dist-info/METADATA,sha256=dEub92knjtp-P5cvuOvD1Fvfx9ZDv_Uwg7eR6JSW6_c,35263
+edu_rdm_integration-3.8.1.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+edu_rdm_integration-3.8.1.dist-info/top_level.txt,sha256=nRJV0O14UtNE-jGIYG03sohgFnZClvf57H5m6VBXe9Y,20
+edu_rdm_integration-3.8.1.dist-info/RECORD,,