0001-api-include-roles-in-bundle-export-68036.patch

Frédéric Péters, 09 août 2022 09:38

Voir les différences: en ligne côte à côte

Subject: [PATCH] api: include roles in bundle export (#68036)

 tests/api/test_export_import.py | 29 +++++++++++++++++++++++------
 wcs/api_export_import.py        | 19 ++++++++++++++++---
 wcs/roles.py                    |  4 ++++
 wcs/wf/dispatch.py              | 12 +++++++++++-
 wcs/wf/form.py                  |  1 +
 wcs/wf/roles.py                 |  5 ++++-
 wcs/wf/sendmail.py              |  1 +
 wcs/workflows.py                | 30 +++++++++++++++++++++++++++++-
 8 files changed, 89 insertions(+), 12 deletions(-)

     def test_export_import_dependencies(pub):
         role = pub.role_class(name='Test role')
         role.store()
         formdef = FormDef()
         formdef.name = 'Test'
         formdef.store()
-...
         workflow.variables_formdef.fields = [StringField(label='Test', id='1')]
         status = workflow.add_status('New')
         status.add_action('form')
         action = status.add_action('form')
         action.by = [role.id]
         data_source = NamedDataSource(name='foobar')
         data_source.store()
-...
         display_form.formdef.fields.append(StringField(label='Test', data_source={'type': 'foobar'}))
         send_mail = status.add_action('sendmail')
         send_mail.to = [role.id]
         workflow.store()
-...
         resp = get_app(pub).get(sign_uri('/api/export-import/forms/'))
         resp = get_app(pub).get(sign_uri(resp.json['data'][0]['urls']['dependencies']))
         assert resp.json['data']
         assert {(x['id'], x['type']) for x in resp.json['data']} == {('test', 'workflows'), ('test', 'blocks')}
         for dependency in resp.json['data']:
             get_app(pub).get(sign_uri(dependency['urls']['export']))
         resp = get_app(pub).get(sign_uri('/api/export-import/workflows/'))
         resp = get_app(pub).get(sign_uri(resp.json['data'][0]['urls']['dependencies']))
         assert resp.json['data']
         assert {(x['id'], x['type']) for x in resp.json['data']} == {
             ('foobar', 'data-sources'),
             ('test', 'blocks'),
             ('test-role', 'roles'),
+        }
         for dependency in resp.json['data']:
             resp = get_app(pub).get(sign_uri(dependency['urls']['export']))
             if 'test-role' in dependency['urls']['export']:
                 assert resp.json == {'name': 'Test role', 'slug': 'test-role', 'uuid': None}
                 assert resp.content_type == 'application/json'
             else:
                 assert resp.content_type == 'text/xml'
         mail_template = MailTemplate(name='test mail template')
         mail_template.store()
-...
         workflow.store()
         resp = get_app(pub).get(sign_uri('/api/export-import/workflows/'))
         resp = get_app(pub).get(sign_uri(resp.json['data'][0]['urls']['dependencies']))
         assert resp.json['data']
         assert {(x['id'], x['type']) for x in resp.json['data']} == {
             ('foobar', 'data-sources'),
             ('test', 'blocks'),
             ('test-mail-template', 'mail-templates'),
             ('test-role', 'roles'),
+        }
         for dependency in resp.json['data']:
             get_app(pub).get(sign_uri(dependency['urls']['export']))
         resp = get_app(pub).get(sign_uri(resp.json['data'][-1]['urls']['dependencies']))
         assert resp.json['data'] == []
-...
         resp = get_app(pub).get(sign_uri('/api/export-import/workflows/'))
         resp = get_app(pub).get(sign_uri(resp.json['data'][0]['urls']['dependencies']))
         resp = get_app(pub).get(sign_uri(resp.json['data'][-1]['urls']['dependencies']))
         assert resp.json['data']
         assert {(x['id'], x['type']) for x in resp.json['data']} == {('cat', 'mail-templates-categories')}
         for dependency in resp.json['data']:
             get_app(pub).get(sign_uri(dependency['urls']['export']))
         resp = get_app(pub).get(sign_uri('/api/export-import/workflows/'))
         resp = get_app(pub).get(sign_uri(resp.json['data'][0]['urls']['dependencies']))
-...
         data_source.store()
         resp = get_app(pub).get(sign_uri('/api/export-import/workflows/'))
         resp = get_app(pub).get(sign_uri(resp.json['data'][0]['urls']['dependencies']))
         resp = get_app(pub).get(sign_uri(resp.json['data'][1]['urls']['dependencies']))
         data_sources_entry = [x for x in resp.json['data'] if x['type'] == 'data-sources'][0]
         resp = get_app(pub).get(sign_uri(data_sources_entry['urls']['dependencies']))
         assert {(x['id'], x['type']) for x in resp.json['data']} == {('cat', 'data-sources-categories')}

     from wcs.data_sources import NamedDataSource, StubNamedDataSource
     from wcs.formdef import FormDef
     from wcs.mail_templates import MailTemplate
     from wcs.sql import Role
     from wcs.workflows import Workflow
     from wcs.wscalls import NamedWsCall
-...
         'data-sources-categories': DataSourceCategory,
         'forms-categories': Category,
         'forms': FormDef,
         'roles': Role,
         'mail-templates-categories': MailTemplateCategory,
         'mail-templates': MailTemplate,
         'workflows-categories': WorkflowCategory,
-...
                 'singular': _('Category (data Sources)'),
                 'minor': True,
             },
+            {
                 'id': 'roles',
                 'text': _('Roles'),
                 'singular': _('Role'),
                 'minor': True,
             },
+        ]
         for obj in response:
             obj['urls'] = {
-...
         obj = get_object(objects, slug)
         if obj is None:
             raise Http404()
         etree = obj.export_to_xml(include_id=True)
         indent_xml(etree)
         return HttpResponse(ET.tostring(etree), content_type='text/xml')
         if hasattr(obj, 'export_for_application'):
             content, content_type = obj.export_for_application()
         else:
             etree = obj.export_to_xml(include_id=True)
             indent_xml(etree)
             content = ET.tostring(etree)
             content_type = 'text/xml'
         return HttpResponse(content, content_type=content_type)
     @signature_required

     # You should have received a copy of the GNU General Public License
     # along with this program; if not, see <http://www.gnu.org/licenses/>.
     import json
     import urllib.parse
     import xml.etree.ElementTree as ET
-...
                 ET.SubElement(root, boolean_attribute).text = value
             return root
         def export_for_application(self):
             return (json.dumps({'name': self.name, 'slug': self.slug, 'uuid': self.uuid}), 'application/json')
         @classmethod
         def import_from_xml(cls, fd, charset=None, include_id=False):
             try:

     from quixote.html import htmltext
     from wcs.roles import get_user_roles
     from wcs.workflows import WorkflowStatusItem, XmlSerialisable, get_role_name_and_slug, register_item_class
     from wcs.workflows import (
         WorkflowStatusItem,
         XmlSerialisable,
         get_role_dependencies,
         get_role_name_and_slug,
         register_item_class,
+    )
     from ..qommon import _
     from ..qommon.form import (
-...
             if rules:
                 self.rules = rules
         def get_dependencies(self):
             yield from get_role_dependencies([self.role_id])
             yield from get_role_dependencies([x.get('role_id') for x in self.rules])
         def get_line_details(self):
             if self.role_key:
                 function_label = self.parent.parent.roles.get(self.role_key, '?')

wcs/wf/form.py
193	193	return changed
194	194
195	195	def get_dependencies(self):
	196	yield from super().get_dependencies()
196	197	if self.formdef and self.formdef.fields:
197	198	for field in self.formdef.fields:
198	199	yield from field.get_dependencies()

     from wcs.api_utils import MissingSecret, get_secret_and_orig, sign_url
     from wcs.roles import get_user_roles
     from wcs.workflows import WorkflowStatusItem, register_item_class
     from wcs.workflows import WorkflowStatusItem, get_role_dependencies, register_item_class
     from ..qommon import _
     from ..qommon.form import SingleSelectWidgetWithOther
-...
                 return role.name
             return _('unknown - %s') % self.role_id
         def get_dependencies(self):
             yield from get_role_dependencies([self.role_id])
     class AddRoleWorkflowStatusItem(RoleMixin, WorkflowStatusItem):
         description = _('Role Addition')

wcs/wf/sendmail.py
70	70	comment = None
71	71
72	72	def get_dependencies(self):
	73	yield from super().get_dependencies()
73	74	yield MailTemplate.get_by_slug(self.mail_template)
74	75
75	76	def _get_role_id_from_xml(self, elem, charset, include_id=False, snapshot=False):

         pass
     def get_role_dependencies(roles):
         for role_id in roles or []:
             if not role_id:
                 continue
             role_id = str(role_id)
             if role_id.startswith('_') or role_id == 'logged-users':
                 continue
             yield get_publisher().role_class.get(role_id, ignore_errors=True)
     class AttachmentSubstitutionProxy:
         def __init__(self, formdata, attachment_evolution_part):
             self.formdata = formdata
-...
             if self.possible_status:
                 for status in self.possible_status:
                     yield from status.get_dependencies()
             if self.global_actions:
                 for action in self.global_actions:
                     yield from action.get_dependencies()
         @classmethod
         def get(cls, id, ignore_errors=False, ignore_migration=False):
-...
         def roles_init_with_xml(self, elem, charset, include_id=False, snapshot=False):
             self._roles_init_with_xml('roles', elem, charset, include_id=include_id, snapshot=snapshot)
         def get_dependencies(self):
             yield from get_role_dependencies(self.roles)
     class WorkflowGlobalActionTimeoutTriggerMarker(EvolutionPart):
         def __init__(self, timeout_id):
-...
+                            )
                             break
         def get_dependencies(self):
             return []
     class WorkflowGlobalActionWebserviceTrigger(WorkflowGlobalActionManualTrigger):
         key = 'webservice'
-...
             return [('hooks', WorkflowGlobalActionWebserviceHooksDirectory(formdata))]
         def get_dependencies(self):
             return []
     class SerieOfActionsMixin:
         items = None
-...
                 trigger_o.parent = self
                 trigger_o.init_with_xml(trigger, charset, include_id=include_id, snapshot=snapshot)
         def get_dependencies(self):
             yield from super().get_dependencies()
             for trigger in self.triggers or []:
                 yield from trigger.get_dependencies()
     class WorkflowCriticalityLevel:
         id = None
-...
             return self.parent.parent.get_add_role_label()
         def get_dependencies(self):
             return []
             yield from get_role_dependencies(getattr(self, 'by', None))
             yield from get_role_dependencies(getattr(self, 'to', None))
         @noop_mark
         def perform(self, formdata):
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-api-include-roles-in-bundle-export-68036.patch