Skip to content

Commit 24b860f

Browse files
committed
run lint and format
1 parent 2f804fa commit 24b860f

File tree

21 files changed

+683
-543
lines changed

21 files changed

+683
-543
lines changed

backend/src/workflow/manager/actionmanager.py

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
from zope.component import queryUtility
2-
3-
from plone.memoize.instance import memoize
4-
from plone.contentrules.engine.interfaces import IRuleStorage, IRuleAssignmentManager
51
from plone.app.contentrules.conditions.wftransition import WorkflowTransitionCondition
2+
from plone.app.contentrules.rule import get_assignments
3+
from plone.app.contentrules.rule import Rule
64
from plone.contentrules.engine import utils
7-
from plone.app.contentrules.rule import Rule, get_assignments
85
from plone.contentrules.engine.assignments import RuleAssignment
6+
from plone.contentrules.engine.interfaces import IRuleAssignmentManager
7+
from plone.contentrules.engine.interfaces import IRuleStorage
8+
from plone.memoize.instance import memoize
99
from Products.CMFCore.interfaces._events import IActionSucceededEvent
1010
from Products.CMFCore.utils import getToolByName
11-
from workflow.manager.utils import generateRuleName, generateRuleNameOld
12-
11+
from workflow.manager.utils import generateRuleName
12+
from workflow.manager.utils import generateRuleNameOld
13+
from zope.component import queryUtility
1314
from zope.i18nmessageid import MessageFactory
14-
_ = MessageFactory("plone")
15+
16+
17+
_ = MessageFactory("plone")
1518

1619

1720
class RuleAdapter:
@@ -24,7 +27,7 @@ def __init__(self, rule, transition):
2427
@property
2528
@memoize
2629
def portal(self):
27-
return getToolByName(self.transition, 'portal_url').getPortalObject()
30+
return getToolByName(self.transition, "portal_url").getPortalObject()
2831

2932
def activate(self):
3033
"""
@@ -37,14 +40,12 @@ def activate(self):
3740
self.rule.event = IActionSucceededEvent
3841

3942
assignable = IRuleAssignmentManager(self.portal)
40-
path = '/'.join(self.portal.getPhysicalPath())
43+
path = "/".join(self.portal.getPhysicalPath())
4144
assignable[self.rule.__name__] = RuleAssignment(
42-
self.rule.id,
43-
enabled=True,
44-
bubbles=True
45+
self.rule.id, enabled=True, bubbles=True
4546
)
4647
assignments = get_assignments(self.rule)
47-
if path not in assignments:
48+
if path not in assignments:
4849
assignments.insert(path)
4950

5051
@property
@@ -58,7 +59,10 @@ def action_index(self, action):
5859
return self.rule.actions.index(action)
5960

6061
def action_url(self, action):
61-
return f'{self.portal.absolute_url()}/{self.rule.id}/++action++{self.action_index(action)}/edit'
62+
return (
63+
f"{self.portal.absolute_url()}/"
64+
f"{self.rule.id}/++action++{self.action_index(action)}/edit"
65+
)
6266

6367
def delete_action(self, index):
6468
self.rule.actions.remove(self.rule.actions[index])
@@ -76,7 +80,7 @@ def get_rule(self, transition):
7680
rulename_old = generateRuleNameOld(transition)
7781
if self.storage is not None:
7882
for rule in self.storage.values():
79-
if rule.__name__ in (rulename, rulename_old):
83+
if rule.__name__ in (rulename, rulename_old):
8084
return RuleAdapter(rule, transition)
8185
return None
8286

@@ -85,14 +89,14 @@ def create(self, transition):
8589
if rule is None:
8690
rule_id = generateRuleName(transition)
8791
r = Rule()
88-
r.title = _("%s transition content rule") % transition.id
92+
r.title = _("%s transition content rule") % transition.id
8993
r.description = _(
9094
"This content rule was automatically created by "
9195
"the workflow manager to create actions on "
9296
"workflow events. If you want the behavior to "
9397
"work as expected, do not modify this out of "
9498
"the workflow manager."
95-
)
99+
)
96100
self.storage[rule_id] = r
97101
rule = RuleAdapter(r, transition)
98102
rule.activate()
@@ -112,4 +116,4 @@ def available_actions(self):
112116
def delete_rule_for(self, transition):
113117
rule = self.get_rule(transition)
114118
if rule is not None:
115-
del self.storage[rule.rule.__name__]
119+
del self.storage[rule.rule.__name__]

backend/src/workflow/manager/api/configure.zcml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
xmlns="http://namespaces.zope.org/zope"
33
xmlns:browser="http://namespaces.zope.org/browser"
44
xmlns:plone="http://namespaces.plone.org/plone"
5-
i18n_domain="workflow.manager">
5+
i18n_domain="workflow.manager"
6+
>
67

78
<!-- -*- extra stuff goes here -*- -->
89

910
<include package=".services" />
1011

1112

12-
</configure>
13+
</configure>

backend/src/workflow/manager/api/services/configure.zcml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
xmlns="http://namespaces.zope.org/zope"
33
xmlns:browser="http://namespaces.zope.org/browser"
44
xmlns:plone="http://namespaces.plone.org/plone"
5-
i18n_domain="workflow.manager">
5+
i18n_domain="workflow.manager"
6+
>
67

78
<!-- -*- extra stuff goes here -*- -->
8-
<include package=".workflow" />
9+
<include package=".workflow" />
910

1011

1112

12-
</configure>
13+
</configure>

backend/src/workflow/manager/api/services/workflow/base.py

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
from AccessControl import Unauthorized
2-
from Products.CMFCore.utils import getToolByName
32
from plone.memoize.view import memoize
43
from plone.protect.interfaces import IDisableCSRFProtection
4+
from Products.CMFCore.utils import getToolByName
55
from workflow.manager.actionmanager import ActionManager
6-
from workflow.manager.permissions import (
7-
allowed_guard_permissions,
8-
managed_permissions,
9-
)
6+
from workflow.manager.permissions import allowed_guard_permissions
7+
from workflow.manager.permissions import managed_permissions
108
from zope.component import getMultiAdapter
9+
from zope.component import getUtility
1110
from zope.interface import alsoProvides
1211
from zope.schema.interfaces import IVocabularyFactory
13-
from zope.component import getUtility
14-
import json
1512

1613

1714
class Base:
1815
"""A stateless helper for workflow API services."""
1916

20-
def __init__(self, context, request, workflow_id=None, state_id=None, transition_id=None):
17+
def __init__(
18+
self, context, request, workflow_id=None, state_id=None, transition_id=None
19+
):
2120
"""
2221
Initialize with context, request, and specific IDs from the service.
2322
"""
@@ -56,7 +55,11 @@ def selected_workflow(self):
5655
def selected_state(self):
5756
"""Gets the state object based on the IDs provided at initialization."""
5857
workflow = self.selected_workflow
59-
if workflow and self._state_id and self._state_id in workflow.states.objectIds():
58+
if (
59+
workflow
60+
and self._state_id
61+
and self._state_id in workflow.states.objectIds()
62+
):
6063
return workflow.states.get(self._state_id)
6164
return None
6265

@@ -65,7 +68,11 @@ def selected_state(self):
6568
def selected_transition(self):
6669
"""Gets the transition object based on the IDs provided at initialization."""
6770
workflow = self.selected_workflow
68-
if workflow and self._transition_id and self._transition_id in workflow.transitions.objectIds():
71+
if (
72+
workflow
73+
and self._transition_id
74+
and self._transition_id in workflow.transitions.objectIds()
75+
):
6976
return workflow.transitions.get(self._transition_id)
7077
return None
7178

@@ -135,30 +142,36 @@ def validate_csrf_token(self, token):
135142
(self.context, self.request), name="authenticator"
136143
)
137144
# Temporarily set the token in the request
138-
original_token = self.request.form.get('_authenticator')
139-
self.request.form['_authenticator'] = token
140-
145+
original_token = self.request.form.get("_authenticator")
146+
self.request.form["_authenticator"] = token
147+
141148
result = authenticator.verify()
142-
149+
143150
# Restore original token
144151
if original_token is not None:
145-
self.request.form['_authenticator'] = original_token
152+
self.request.form["_authenticator"] = original_token
146153
else:
147-
self.request.form.pop('_authenticator', None)
148-
154+
self.request.form.pop("_authenticator", None)
155+
149156
return result
150157
except Exception:
151158
return False
152159

153160
def get_state(self, state_id):
154161
"""Safely gets a state by its ID from the selected workflow."""
155-
if self.selected_workflow and state_id in self.selected_workflow.states.objectIds():
162+
if (
163+
self.selected_workflow
164+
and state_id in self.selected_workflow.states.objectIds()
165+
):
156166
return self.selected_workflow.states[state_id]
157167
return None
158168

159169
def get_transition(self, transition_id):
160170
"""Safely gets a transition by its ID from the selected workflow."""
161-
if self.selected_workflow and transition_id in self.selected_workflow.transitions.objectIds():
171+
if (
172+
self.selected_workflow
173+
and transition_id in self.selected_workflow.transitions.objectIds()
174+
):
162175
return self.selected_workflow.transitions[transition_id]
163176
return None
164177

@@ -182,11 +195,12 @@ def allowed_guard_permissions(self):
182195
@memoize
183196
def assignable_types(self):
184197
"""Returns a list of all user-friendly content types."""
185-
vocab_factory = getUtility(IVocabularyFactory,
186-
name="plone.app.vocabularies.ReallyUserFriendlyTypes")
198+
vocab_factory = getUtility(
199+
IVocabularyFactory, name="plone.app.vocabularies.ReallyUserFriendlyTypes"
200+
)
187201
return sorted(
188202
[{"id": v.value, "title": v.title} for v in vocab_factory(self.context)],
189-
key=lambda v: v['title']
203+
key=lambda v: v["title"],
190204
)
191205

192206
def get_assigned_types_for(self, workflow_id):
@@ -199,11 +213,11 @@ def get_assigned_types_for(self, workflow_id):
199213

200214
def getGroups(self):
201215
"""Gets a list of all groups in the portal."""
202-
acl_users = getToolByName(self.context, 'acl_users')
216+
acl_users = getToolByName(self.context, "acl_users")
203217
return sorted(
204218
[
205-
{'id': g.getId(), 'title': g.getProperty('title') or g.getId()}
219+
{"id": g.getId(), "title": g.getProperty("title") or g.getId()}
206220
for g in acl_users.source_groups.getGroups()
207221
],
208-
key=lambda g: g['title'].lower()
222+
key=lambda g: g["title"].lower(),
209223
)

0 commit comments

Comments
 (0)