Skip to content

Commit 00e560e

Browse files
fugal-dyluytenaopen-dynaMIXDavid Vogtczosel
committed
rebase graphene update branch on main (#1664)
* feat(form): enable hint messages on questions (#1655) Add a hint text field on all question types except for form, static and action button questions. This functionality requires a db migration. * feat(workflow): implement WorkItem redo pattern (#1656) This commit implements a possibility to redo an already finished WorkItem and all the ones that were finished in between. Closes #1510 * chore: update dependencies (#1660) * chore: cleanup `WorkItem.get_redoable()` * chore: update dependencies * chore: release 7.15 (#1661) * chore: add a code of conduct (#1651) * chore(deps): update graphene-django Update to graphene-django 2.12.1 and fix connection field, schema. * chore(deps): add pytest-xfaillist plugin * chore(deps): switch to graphql 3.0 * chore: fix ResolveInfo fixture * chore(test): ensure name is valid identifier * chore(deps): remove XPASSing tests from xfails * chore(deps): handle enum in JSONValueFilter * chore(deps): remove passing tests from xfails.list * fix(tests): hand over UUID as string * chore(deps): get ordering value from Enum if any * chore(deps): use graphene's updated data types issue #814 * chore(deps): update and sort xfaillist * chore(deps): remove passing test from xfaillist #814 * chore(deps): handle enum in filter #814 * check if these tests are correct if so fixup commit with previous * chore(deps): upgrade pytest-xfaillist * chore(deps): pass kwargs to data source resolver (#1643) * fix(graphene): make more tests work (#1644) * Introduce our own choices field (for now): Graphene seems to already instantiate Enum instances from the request data, which causes the regular DRF choice field to fail, as the enum object isn't handled * Fix a few resolvers which now receive additional (unused by use) parameters * Graphene django v3 (#1645) * fix(datasource): accept new additional parameters from graphene * fix(filters): overload resolve_queryset() to support multi order_by Graphene does not really support order_by with multiple values like we need it. There's a bug in graphene that we need to work around: graphql-python/graphene-django#1280 While we're at it, also clean up some more data. * fix(historical): fix uuid and resolver params (#1646) * fix(historical): fix uuid and resolver params * fix(form): accept new additional resolver args * Graphene django v3 (#1647) * fix(tests): adjust test to new error message style graphene 3.0 returns a text fragment of the offending query * fix(middleware): use new visitor and ast conventions The node types are not CamelCase named, but snake_cased. Also, the operation is an AST object, not a bare string. In queries without variables, the variables MUST NOT be set to an empty string. (None works however...) * fix(cases): various fixes in csae filter and tests * fix(schema): make schema tests work again (sort of) The schema test relies on stringification of the root schema object. This currently fails due to a function within the graphql core package being unable to handle django lazy translation objects. The test setup is rigged such that once upstream fixes the problem, it will trigger a failure here and we can remove the hacky workaround. * fix(tests): more tests fixed with correct (non-uuid) input objects Also remove passing some info objects to schema_executor(), it doesn't accept them anymore (just pass context_value as that's the interesting bit) * fix(tests): stringify localized fields when passing to gql * chore(coverage): improve coverage Most of the lines that were "not covered" will never happen or are error cases such as raising validation errors, or other non-problematic parts. * fix(tests): sort the schema type map (#1648) A sorted type map (as it used to be in older graphene versions) helps better comparing / diffing the schema * Graphene django v3 (#1649) * chore: coverage back to 100% * chore: fix conflict in setup.py * fix(schema): use explicit types for case status and workitem status Graphene would otherwise use an automatic naming scheme that breaks our clients * fix: coverage in new status fields (#1650) Those status fields are only used for the type system, but not as actual input types. Thus, they're never actually instantiated * fix: pin graphql-relay to <3.1.1 the minor version includes deprecation of backwards compatibility measures. See graphql-python/graphql-relay-py#45 Might include other changes that are unrelated to the above that break a number of our tests. * update snapshots for test_question * fix(test): fix UUID * fix(tests): update test_workflow snapshot * fix: remove schema workaround and update snapshot Co-authored-by: luytena <[email protected]> Co-authored-by: Fabio Ambauen <[email protected]> Co-authored-by: David Vogt <[email protected]> Co-authored-by: Christian Zosel <[email protected]> Co-authored-by: Stefan Borer <[email protected]> Co-authored-by: Jean-Louis Fuchs <[email protected]>
1 parent f9e021b commit 00e560e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1110
-177
lines changed

‎.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ updates:
1111
ignore:
1212
- dependency-name: django
1313
versions:
14-
- ">=3"
14+
- ">=3.3"
1515
commit-message:
1616
prefix: chore
1717
include: scope

‎.reuse/dep5

+6
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,9 @@ Files:
4949
CHANGELOG.md
5050
Copyright: 2019 Adfinis SyGroup AG <[email protected]>
5151
License: GFDL-1.3-or-later
52+
53+
# Code of conduct
54+
Files:
55+
CODE_OF_CONDUCT.md
56+
Copyright: Coraline Ada Ehmke <https://where.coraline.codes/>
57+
License: CC-BY-4.0

‎CHANGELOG.md

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
# v7.14.0
1+
# v7.15.0 (25 January 2022)
2+
3+
### Feature
4+
* **workflow:** Implement WorkItem redo pattern ([#1656](https://github.com/projectcaluma/caluma/issues/1656)) ([`d01e284`](https://github.com/projectcaluma/caluma/commit/d01e28405e8d1419a6e357149b543c39ea8025f6))
5+
* **form:** Enable hint messages on questions ([#1655](https://github.com/projectcaluma/caluma/issues/1655)) ([`7adf401`](https://github.com/projectcaluma/caluma/commit/7adf4014c220bdf582c3b7fcbaf98f421ef40092))
6+
7+
### Fix
8+
* **settings:** Use int for MINIO_PRESIGNED_TTL_MINUTES ([#1632](https://github.com/projectcaluma/caluma/issues/1632)) ([`cc9f89f`](https://github.com/projectcaluma/caluma/commit/cc9f89f7d356038851f1fa3f9ec343d60e5ee256))
9+
10+
11+
# v7.14.0 (1 December 2021)
212

313
### Feature
414
* **config:** Validate permission decorators ([#1615](https://github.com/projectcaluma/caluma/issues/1615)) ([`a63a6d3`](https://github.com/projectcaluma/caluma/commit/a63a6d34e075fd086647cdfbd36b5eb8cbf83850))
@@ -18,7 +28,7 @@
1828
* **guide:** Update guide to use ember-caluma v9 addons ([`4d3c9fc`](https://github.com/projectcaluma/caluma/commit/4d3c9fcd0b4d78cefa58c73bb4383daf318c03be))
1929

2030

21-
# v7.13.0
31+
# v7.13.0 (27 August 2021)
2232

2333
### Feature
2434
* **config:** Introduce configurable user factory ([`8a49aaf`](https://github.com/projectcaluma/caluma/commit/8a49aaf7f911d4df50a354915530bfcd034ec91b))

‎CODE_OF_CONDUCT.md

+128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
[email protected].
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.7.6@sha256:46e17eae392c2d99e0ac9c26e867807c5022958ec19a9cc46b9668962e0dff78
1+
FROM python:3.7.12@sha256:3908249ce6b2d28284e3610b07bf406c3035bc2e3ce328711a2b42e1c5a75fc1
22

33
WORKDIR /app
44

0 commit comments

Comments
 (0)