Skip to content

S
slapos.core
Commit 619385ce authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Speedup RSS and cleanup for CRM 

See merge request !416
parents fdbc9fc4 95d11f41
Pipeline #23444 failed with stage
    in 0 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 1272 additions and 418 deletions
    master/bt5/slapos_crm/ActionTemplateItem/portal_types/Incident%20Response%20Module/rss_view.xml 0 → 100644
    View file @ 619385ce
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>action_type/object_jio_button</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>category</string> </key>
    <value> <string>object_jio_button</string> </value>
    </item>
    <item>
    <key> <string>condition</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>icon</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>rss_view</string> </value>
    </item>
    <item>
    <key> <string>permissions</string> </key>
    <value>
    <tuple>
    <string>View</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Action Information</string> </value>
    </item>
    <item>
    <key> <string>priority</string> </key>
    <value> <float>30.0</float> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>RSS Feed</string> </value>
    </item>
    <item>
    <key> <string>visible</string> </key>
    <value> <int>1</int> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>string:${object_url}/Folder_viewOpenTicketFeedURL</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="Expression" module="Products.CMFCore.Expression"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>string:rss_feed_image</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_crm/ActionTemplateItem/portal_types/Regularisation%20Request%20Module/rss_view.xml
    View file @ 619385ce
    ......@@ -62,7 +62,7 @@
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>RSS Monitoring Support Request List</string> </value>
    <value> <string>RSS Feed</string> </value>
    </item>
    <item>
    <key> <string>visible</string> </key>
    ......@@ -79,7 +79,7 @@
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>string:${object_url}/Folder_viewOpenTicketList?portal_skin=RSS</string> </value>
    <value> <string>string:${object_url}/Folder_viewOpenTicketFeedURL</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    master/bt5/slapos_crm/ActionTemplateItem/portal_types/Support%20Request%20Module/rss_view.xml
    View file @ 619385ce
    ......@@ -62,7 +62,7 @@
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>RSS Monitoring Support Request List</string> </value>
    <value> <string>RSS Feed</string> </value>
    </item>
    <item>
    <key> <string>visible</string> </key>
    ......@@ -79,7 +79,7 @@
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>string:${object_url}/Folder_viewOpenTicketList?portal_skin=RSS</string> </value>
    <value> <string>string:${object_url}/Folder_viewOpenTicketFeedURL</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Folder_getTicketFeedUrl.py 0 → 100644
    View file @ 619385ce
    portal = context.getPortalObject()
    person = portal.portal_membership.getAuthenticatedMember().getUserValue()
    if person is None:
    raise ValueError("User Not Found")
    request_url = "%s/Folder_viewOpenTicketList" % context.absolute_url()
    # XXX - Cannot search in catalog with parameter url_string
    access_token = None
    for token_item in portal.portal_catalog(
    portal_type="Restricted Access Token",
    default_agent_uid=person.getUid(),
    validation_state='validated'
    ):
    if token_item.getUrlString() == request_url:
    access_token = token_item
    reference = access_token.getReference()
    break
    if access_token is None:
    access_token = portal.access_token_module.newContent(
    portal_type="Restricted Access Token",
    url_string=request_url,
    url_method="GET",
    )
    access_token.setAgentValue(person)
    reference = access_token.getReference()
    access_token.validate()
    return "%s?portal_skin=RSS&access_token=%s&access_token_secret=%s" % (
    request_url,
    access_token.getId(),
    reference)
    master/bt5/slapos_rss_style/SkinTemplateItem/portal_skins/slapos_rss_style/WebSection_getRSSDateContent.xml → master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Folder_getTicketFeedUrl.xml
    View file @ 619385ce
    ......@@ -54,7 +54,7 @@
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>WebSection_getRSSDateContent</string> </value>
    <value> <string>Folder_getTicketFeedUrl</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Folder_viewOpenTicketFeedURL.xml 0 → 100644
    View file @ 619385ce
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ERP5 Form" module="erp5.portal_type"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_bind_names</string> </key>
    <value>
    <object>
    <klass>
    <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_asgns</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>_objects</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>action</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>action_title</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>edit_order</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>encoding</string> </key>
    <value> <string>UTF-8</string> </value>
    </item>
    <item>
    <key> <string>enctype</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>group_list</string> </key>
    <value>
    <list>
    <string>bottom</string>
    <string>hidden</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>groups</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>bottom</string> </key>
    <value>
    <list>
    <string>your_feed_url</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value>
    <list/>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>Folder_viewOpenTicketFeedURL</string> </value>
    </item>
    <item>
    <key> <string>method</string> </key>
    <value> <string>POST</string> </value>
    </item>
    <item>
    <key> <string>name</string> </key>
    <value> <string>Folder_viewOpenTicketFeedURL</string> </value>
    </item>
    <item>
    <key> <string>pt</string> </key>
    <value> <string>form_dialog</string> </value>
    </item>
    <item>
    <key> <string>row_length</string> </key>
    <value> <int>4</int> </value>
    </item>
    <item>
    <key> <string>stored_encoding</string> </key>
    <value> <string>UTF-8</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>RSS Feed</string> </value>
    </item>
    <item>
    <key> <string>unicode_mode</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>update_action</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>update_action_title</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm_monitoring/Ticket_getLatestEvent.py deleted 100644 → 0
    View file @ fdbc9fc4
    portal = context.getPortalObject()
    return portal.portal_catalog.getResultValue(
    follow_up_uid=context.getUid(),
    portal_type=portal.getPortalEventTypeList(),
    simulation_state=["confirmed", "started", "stopped", "delivered"],
    sort_on=(("modification_date", 'DESC'),))
    master/bt5/slapos_crm/bt/template_action_path_list
    View file @ 619385ce
    Compute Node Module | slapos_ticket_activity_report
    Compute Node | view_related_support_request
    Incident Response Module | rss_view
    Incident Response Module | view
    Incident Response | view
    Instance Tree Module | slapos_resilience_usage_report
    ......
    master/bt5/slapos_rss_style/SkinTemplateItem/portal_skins/slapos_rss_style/Ticket_getLatestEvent.py 0 → 100644
    View file @ 619385ce
    from Products.ERP5Type.Cache import CachingMethod
    portal = context.getPortalObject()
    def getLastEventRelativeUrl(uid):
    portal = context.getPortalObject()
    last_event = portal.portal_catalog.getResultValue(
    follow_up_uid=context.getUid(),
    portal_type=portal.getPortalEventTypeList(),
    simulation_state=["confirmed", "started", "stopped", "delivered"],
    sort_on=(("modification_date", 'DESC'),))
    if last_event is not None:
    return last_event.getRelativeUrl()
    else:
    return last_event
    last_event_url = CachingMethod(getLastEventRelativeUrl,
    id='Ticket_getLatestEventRelativeUrl',
    cache_factory='erp5_content_short')(context.getUid())
    if last_event_url is not None:
    return portal.restrictedTraverse(last_event_url)
    master/bt5/slapos_rss_style/SkinTemplateItem/portal_skins/slapos_rss_style/WebSection_getRSSDateContent.py deleted 100644 → 0
    View file @ fdbc9fc4
    portal = context.getPortalObject()
    event = portal.portal_catalog.getResultValue(
    follow_up_uid=context.getUid(),
    sort_on=[('modification_date', 'DESC')],
    )
    if event:
    return event.getModificationDate()
    return context.getModificationDate()
    master/bt5/slapos_rss_style/SkinTemplateItem/portal_skins/slapos_rss_style/WebSection_getRSSDescriptionContent.py deleted 100644 → 0
    View file @ fdbc9fc4
    portal = context.getPortalObject()
    event = portal.portal_catalog.getResultValue(
    follow_up_uid=context.getUid(),
    sort_on=[('modification_date', 'DESC')],
    )
    if event:
    return event.getTextContent()
    return context.getDescription()
    master/bt5/slapos_rss_style/SkinTemplateItem/portal_skins/slapos_rss_style/WebSection_getRSSDescriptionContent.xml deleted 100644 → 0
    View file @ fdbc9fc4
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>Script_magic</string> </key>
    <value> <int>3</int> </value>
    </item>
    <item>
    <key> <string>_bind_names</string> </key>
    <value>
    <object>
    <klass>
    <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_asgns</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>name_container</string> </key>
    <value> <string>container</string> </value>
    </item>
    <item>
    <key> <string>name_context</string> </key>
    <value> <string>context</string> </value>
    </item>
    <item>
    <key> <string>name_m_self</string> </key>
    <value> <string>script</string> </value>
    </item>
    <item>
    <key> <string>name_subpath</string> </key>
    <value> <string>traverse_subpath</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>_params</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>WebSection_getRSSDescriptionContent</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_rss_style/SkinTemplateItem/portal_skins/slapos_rss_style/WebSection_viewCriticalTicketListAsRSS/listbox_description.xml
    View file @ 619385ce
    ......@@ -154,6 +154,10 @@
    <key> <string>hidden</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>input_type</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_length</string> </key>
    <value> <string></string> </value>
    ......@@ -267,7 +271,7 @@
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>cell/WebSection_getRSSDescriptionContent</string> </value>
    <value> <string>python: cell.Ticket_getLatestEvent() and cell.Ticket_getLatestEvent().getTextContent() or cell.getDescription()</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    master/bt5/slapos_rss_style/SkinTemplateItem/portal_skins/slapos_rss_style/WebSection_viewCriticalTicketListAsRSS/listbox_modification_date.xml
    View file @ 619385ce
    ......@@ -176,6 +176,10 @@
    <key> <string>default_now</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>default_timezone</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    ......@@ -483,7 +487,7 @@
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>cell/WebSection_getRSSDateContent</string> </value>
    <value> <string>python: cell.Ticket_getLatestEvent() and cell.Ticket_getLatestEvent().getModificationDate() or cell.getModificationDate()</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    master/bt5/slapos_rss_style/SkinTemplateItem/portal_skins/slapos_rss_style/WebSection_viewTicketListAsRSS/listbox_description.xml
    View file @ 619385ce
    ......@@ -154,6 +154,10 @@
    <key> <string>hidden</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>input_type</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>max_length</string> </key>
    <value> <string></string> </value>
    ......@@ -267,7 +271,7 @@
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>cell/WebSection_getRSSDescriptionContent</string> </value>
    <value> <string>python: cell.Ticket_getLatestEvent() and cell.Ticket_getLatestEvent().getTextContent() or cell.getDescription()</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    master/bt5/slapos_rss_style/SkinTemplateItem/portal_skins/slapos_rss_style/WebSection_viewTicketListAsRSS/listbox_modification_date.xml
    View file @ 619385ce
    ......@@ -176,6 +176,10 @@
    <key> <string>default_now</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>default_timezone</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    ......@@ -483,7 +487,7 @@
    <dictionary>
    <item>
    <key> <string>_text</string> </key>
    <value> <string>cell/WebSection_getRSSDateContent</string> </value>
    <value> <string>python: cell.Ticket_getLatestEvent() and cell.Ticket_getLatestEvent().getModificationDate() or cell.getModificationDate()</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    master/bt5/slapos_rss_style/TestTemplateItem/portal_components/test.erp5.testSlapOSRSSStyleSkins.xml 0 → 100644
    View file @ 619385ce
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Test Component" module="erp5.portal_type"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>default_reference</string> </key>
    <value> <string>testSlapOSRSSStyleSkins</string> </value>
    </item>
    <item>
    <key> <string>default_source_reference</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>test.erp5.testSlapOSRSSStyleSkins</string> </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Test Component</string> </value>
    </item>
    <item>
    <key> <string>sid</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>text_content_error_message</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>text_content_warning_message</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>version</string> </key>
    <value> <string>erp5</string> </value>
    </item>
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>component_validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_rss_style/bt/dependency_list
    View file @ 619385ce
    slapos_web
    erp5_rss_style
    \ No newline at end of file
    erp5_rss_style
    slapos_crm
    \ No newline at end of file
    master/bt5/slapos_rss_style/bt/template_test_id_list 0 → 100644
    View file @ 619385ce
    test.erp5.testSlapOSRSSStyleSkins
    \ No newline at end of file
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7