resolve conflicts and merge master into 44654

Author: Maria-Lordwill

.gitignore

@@ -8,11 +8,17 @@ nginx/keys
 nginx/config/nginx.conf
 firebase-push.json
 
-# Agent & IDE tools
-.agents
-.antigravity
-
 # Playwright / E2E
 frontend/e2e
 frontend/playwright-report
 frontend/test-results
+
+.vscode/
+.cursor/
+.cursorrules/
+.agents/
+.agent/
+.agents/
+.antigravity/
+
+

.python-version

@@ -0,0 +1 @@
+3.7.5

README.md

@@ -123,7 +123,15 @@ But you can almost immediately check that your backend is up by going to `http:/
 
 Once the containers are up and running go to http://your-server-address (http://localhost if you're connecting from the same machine) in your browser, register a free account and you're good to go.
 
-For more information about how to deploy Pneumatic in production see [Configuration](https://github.com/pneumaticapp/pneumaticworkflow/wiki/Configuration)
+
+### Deploying to Production
+
+Deploying an instance of Pneumatic in production involves such steps as:
+
+- setting up SSL
+- setting up SSO
+  
+These steps are described in detail in [this wiki article](https://github.com/pneumaticapp/pneumaticworkflow/wiki/Configuration)
 
 ## License
 

backend/.gitignore

@@ -71,7 +71,6 @@ coverage.xml
 
 # Translations
 *.mo
-*.pot
 
 # Sphinx documentation
 docs/_build/
@@ -82,7 +81,6 @@ target/
 
 ### Django ###
 *.log
-*.pot
 *.pyc
 __pycache__/
 local_settings.py
@@ -94,7 +92,7 @@ database/backups
 database/data
 database/postgres_data
 staticfiles/
-
+.cursor/
 # pyenv
 .python-version
 

backend/README.md

@@ -45,7 +45,12 @@ Open a terminal in the "backend" directory and run the following commands:
 1. Place the database dump file named ``dump.sql`` in the ``pneumaticworkflow/postgres/backups`` directory. 
 2. Recreate the pneumatic database with the command: ``docker exec -it pneumatic-postgres sh -c "dropdb -U postgres_user postgres_db && createdb -U postgres_user --owner postgres_user postgres_db"``.
 3. Load the dump file into the database with the command: ``docker exec -it pneumatic-postgres sh -c "psql -U postgres_user -h localhost postgres_db < /backups/dump.sql"``. This process will take several minutes.
-4. (Optional). Connect to the database and verify the schema. Command: ``docker exec -it pneumatic-postgres sh -c "psql -U postgres_user postgres_db"``
+
+#### Create a backup copy of the database
+Command: ``docker exec -it pneumatic-postgres sh -c "pg_dump -U postgres_user postgres_db > /backups/pneumatic-backup-$(date +%Y-%m-%d[%Hh:%Mm]%ZTZ).sql"``
+
+#### Connect to the database
+Command: ``docker exec -it pneumatic-postgres sh -c "psql -U postgres_user postgres_db"``
 
 ### Windows
 Open PowerShell in the backend directory and run the following commands:

backend/docker-compose.yml

@@ -72,6 +72,7 @@ services:
       FRONTEND_URL: ${FRONTEND_URL:-http://localhost}
       FORMS_URL: ${FORMS_URL:-http://form.localhost}
       ENVIRONMENT: ${ENVIRONMENT:-Production}
+      RELEASE: ${RELEASE:-1.0.0}
       LANGUAGE_CODE: ${LANGUAGE_CODE:-en} # Allowed values: en, fr, de, es, ru
       CAPTCHA: ${CAPTCHA:-no}
       ANALYTICS: ${ANALYTICS:-no}
@@ -80,35 +81,49 @@ services:
       MS_AUTH: ${MS_AUTH:-no}
       GOOGLE_AUTH: ${GOOGLE_AUTH:-no}
       SSO_AUTH: ${SSO_AUTH:-no}
-      SSO_PROVIDER: ${SSO_PROVIDER} # Allowed values: okta, auth0
-      OKTA_DOMAIN: ${OKTA_DOMAIN}
-      OKTA_CLIENT_ID: ${OKTA_CLIENT_ID}
-      OKTA_CLIENT_SECRET: ${OKTA_CLIENT_SECRET}
-      OKTA_REDIRECT_URI: ${OKTA_REDIRECT_URI}
-      AUTH0_CLIENT_ID: ${AUTH0_CLIENT_ID}
-      AUTH0_CLIENT_SECRET: ${AUTH0_CLIENT_SECRET}
-      AUTH0_DOMAIN: ${AUTH0_DOMAIN}
-      AUTH0_REDIRECT_URI: ${AUTH0_REDIRECT_URI}
+      SSO_PROVIDER: ${SSO_PROVIDER:-} # Allowed values: okta, auth0
+      OKTA_DOMAIN: ${OKTA_DOMAIN:-}
+      OKTA_CLIENT_ID: ${OKTA_CLIENT_ID:-}
+      OKTA_CLIENT_SECRET: ${OKTA_CLIENT_SECRET:-}
+      OKTA_REDIRECT_URI: ${OKTA_REDIRECT_URI:-}
+      AUTH0_CLIENT_ID: ${AUTH0_CLIENT_ID:-}
+      AUTH0_CLIENT_SECRET: ${AUTH0_CLIENT_SECRET:-}
+      AUTH0_DOMAIN: ${AUTH0_DOMAIN:-}
+      AUTH0_REDIRECT_URI: ${AUTH0_REDIRECT_URI:-}
       EMAIL: ${EMAIL:-no}           # Disable send emails
-      EMAIL_PROVIDER: ${EMAIL_PROVIDER}
-      CIO_WEBHOOK_API_VERSION: ${CIO_WEBHOOK_API_VERSION}
-      CIO_WEBHOOK_API_KEY: ${CIO_WEBHOOK_API_KEY}
-      CIO_TRANSACTIONAL_API_KEY: ${CIO_TRANSACTIONAL_API_KEY}
-      EMAIL_HOST: ${EMAIL_HOST}
-      EMAIL_PORT: ${EMAIL_PORT}
-      EMAIL_HOST_USER: ${EMAIL_HOST_USER}
-      EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
-      EMAIL_USE_TLS: ${EMAIL_USE_TLS}
-      EMAIL_USE_SSL: ${EMAIL_USE_SSL}
-      EMAIL_TIMEOUT: ${EMAIL_TIMEOUT}
+      EMAIL_PROVIDER: ${EMAIL_PROVIDER:-}
+      CIO_WEBHOOK_API_VERSION: ${CIO_WEBHOOK_API_VERSION:-}
+      CIO_WEBHOOK_API_KEY: ${CIO_WEBHOOK_API_KEY:-}
+      CIO_TRANSACTIONAL_API_KEY: ${CIO_TRANSACTIONAL_API_KEY:-}
+      CIO_TEMPLATE__RESET_PASSWORD: ${CIO_TEMPLATE__RESET_PASSWORD:-}
+      CIO_TEMPLATE__USER_DEACTIVATED: ${CIO_TEMPLATE__USER_DEACTIVATED:-}
+      CIO_TEMPLATE__NEW_TASK: ${CIO_TEMPLATE__NEW_TASK:-}
+      CIO_TEMPLATE__TASK_RETURNED: ${CIO_TEMPLATE__TASK_RETURNED:-}
+      CIO_TEMPLATE__ACCOUNT_VERIFICATION: ${CIO_TEMPLATE__ACCOUNT_VERIFICATION:-}
+      CIO_TEMPLATE__WORKFLOWS_DIGEST: ${CIO_TEMPLATE__WORKFLOWS_DIGEST:-}
+      CIO_TEMPLATE__TASKS_DIGEST: ${CIO_TEMPLATE__TASKS_DIGEST:-}
+      CIO_TEMPLATE__USER_TRANSFER: ${CIO_TEMPLATE__USER_TRANSFER:-}
+      CIO_TEMPLATE__UNREAD_NOTIFICATIONS: ${CIO_TEMPLATE__UNREAD_NOTIFICATIONS:-}
+      CIO_TEMPLATE__GUEST_NEW_TASK: ${CIO_TEMPLATE__GUEST_NEW_TASK:-}
+      CIO_TEMPLATE__OVERDUE_TASK: ${CIO_TEMPLATE__OVERDUE_TASK:-}
+      CIO_TEMPLATE__MENTION: ${CIO_TEMPLATE__MENTION:-}
+      CIO_TEMPLATE__TASK_REMINDER: ${CIO_TEMPLATE__TASK_REMINDER:-}
+      CIO_TEMPLATE__COMPLETE_WORKFLOW: ${CIO_TEMPLATE__COMPLETE_WORKFLOW:-}
+      EMAIL_HOST: ${EMAIL_HOST:-}
+      EMAIL_PORT: ${EMAIL_PORT:-}
+      EMAIL_HOST_USER: ${EMAIL_HOST_USER:-}
+      EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD:-}
+      EMAIL_USE_TLS: ${EMAIL_USE_TLS:-}
+      EMAIL_USE_SSL: ${EMAIL_USE_SSL:-}
+      EMAIL_TIMEOUT: ${EMAIL_TIMEOUT:-}
       AI: ${AI:-no}
-      AI_PROVIDER: ${AI_PROVIDER}
+      AI_PROVIDER: ${AI_PROVIDER:-}
       PUSH: ${PUSH:-no}
-      PUSH_PROVIDER: ${PUSH_PROVIDER}
+      PUSH_PROVIDER: ${PUSH_PROVIDER:-}
       STORAGE: ${STORAGE:-no}
-      STORAGE_PROVIDER: ${STORAGE_PROVIDER}
+      STORAGE_PROVIDER: ${STORAGE_PROVIDER:-}
       GOOGLE_APPLICATION_CREDENTIALS: /pneumatic_backend/google_api_credentials.json
-      SENTRY_DSN: ${SENTRY_DSN}
+      SENTRY_DSN: ${SENTRY_DSN:-}
       POSTGRES_HOST: ${POSTGRES_HOST:-postgres}
       POSTGRES_USER: ${POSTGRES_USER:-postgres_user}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres_password}
@@ -153,6 +168,7 @@ services:
       FRONTEND_URL: ${FRONTEND_URL:-http://localhost}
       FORMS_URL: ${FORMS_URL:-http://form.localhost}
       ENVIRONMENT: ${ENVIRONMENT:-Production}
+      RELEASE: ${RELEASE:-1.0.0}
       LANGUAGE_CODE: ${LANGUAGE_CODE:-en} # Allowed values: en, fr, de, es, ru
       CAPTCHA: ${CAPTCHA:-no}
       ANALYTICS: ${ANALYTICS:-no}
@@ -161,35 +177,49 @@ services:
       MS_AUTH: ${MS_AUTH:-no}
       GOOGLE_AUTH: ${GOOGLE_AUTH:-no}
       SSO_AUTH: ${SSO_AUTH:-no}
-      SSO_PROVIDER: ${SSO_PROVIDER} # Allowed values: okta, auth0
-      OKTA_DOMAIN: ${OKTA_DOMAIN}
-      OKTA_CLIENT_ID: ${OKTA_CLIENT_ID}
-      OKTA_CLIENT_SECRET: ${OKTA_CLIENT_SECRET}
-      OKTA_REDIRECT_URI: ${OKTA_REDIRECT_URI}
-      AUTH0_CLIENT_ID: ${AUTH0_CLIENT_ID}
-      AUTH0_CLIENT_SECRET: ${AUTH0_CLIENT_SECRET}
-      AUTH0_DOMAIN: ${AUTH0_DOMAIN}
-      AUTH0_REDIRECT_URI: ${AUTH0_REDIRECT_URI}
+      SSO_PROVIDER: ${SSO_PROVIDER:-} # Allowed values: okta, auth0
+      OKTA_DOMAIN: ${OKTA_DOMAIN:-}
+      OKTA_CLIENT_ID: ${OKTA_CLIENT_ID:-}
+      OKTA_CLIENT_SECRET: ${OKTA_CLIENT_SECRET:-}
+      OKTA_REDIRECT_URI: ${OKTA_REDIRECT_URI:-}
+      AUTH0_CLIENT_ID: ${AUTH0_CLIENT_ID:-}
+      AUTH0_CLIENT_SECRET: ${AUTH0_CLIENT_SECRET:-}
+      AUTH0_DOMAIN: ${AUTH0_DOMAIN:-}
+      AUTH0_REDIRECT_URI: ${AUTH0_REDIRECT_URI:-}
       EMAIL: ${EMAIL:-no}           # Disable send emails
-      EMAIL_PROVIDER: ${EMAIL_PROVIDER}
-      CIO_WEBHOOK_API_VERSION: ${CIO_WEBHOOK_API_VERSION}
-      CIO_WEBHOOK_API_KEY: ${CIO_WEBHOOK_API_KEY}
-      CIO_TRANSACTIONAL_API_KEY: ${CIO_TRANSACTIONAL_API_KEY}
-      EMAIL_HOST: ${EMAIL_HOST}
-      EMAIL_PORT: ${EMAIL_PORT}
-      EMAIL_HOST_USER: ${EMAIL_HOST_USER}
-      EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
-      EMAIL_USE_TLS: ${EMAIL_USE_TLS}
-      EMAIL_USE_SSL: ${EMAIL_USE_SSL}
-      EMAIL_TIMEOUT: ${EMAIL_TIMEOUT}
+      EMAIL_PROVIDER: ${EMAIL_PROVIDER:-}
+      CIO_WEBHOOK_API_VERSION: ${CIO_WEBHOOK_API_VERSION:-}
+      CIO_WEBHOOK_API_KEY: ${CIO_WEBHOOK_API_KEY:-}
+      CIO_TRANSACTIONAL_API_KEY: ${CIO_TRANSACTIONAL_API_KEY:-}
+      CIO_TEMPLATE__RESET_PASSWORD: ${CIO_TEMPLATE__RESET_PASSWORD:-}
+      CIO_TEMPLATE__USER_DEACTIVATED: ${CIO_TEMPLATE__USER_DEACTIVATED:-}
+      CIO_TEMPLATE__NEW_TASK: ${CIO_TEMPLATE__NEW_TASK:-}
+      CIO_TEMPLATE__TASK_RETURNED: ${CIO_TEMPLATE__TASK_RETURNED:-}
+      CIO_TEMPLATE__ACCOUNT_VERIFICATION: ${CIO_TEMPLATE__ACCOUNT_VERIFICATION:-}
+      CIO_TEMPLATE__WORKFLOWS_DIGEST: ${CIO_TEMPLATE__WORKFLOWS_DIGEST:-}
+      CIO_TEMPLATE__TASKS_DIGEST: ${CIO_TEMPLATE__TASKS_DIGEST:-}
+      CIO_TEMPLATE__USER_TRANSFER: ${CIO_TEMPLATE__USER_TRANSFER:-}
+      CIO_TEMPLATE__UNREAD_NOTIFICATIONS: ${CIO_TEMPLATE__UNREAD_NOTIFICATIONS:-}
+      CIO_TEMPLATE__GUEST_NEW_TASK: ${CIO_TEMPLATE__GUEST_NEW_TASK:-}
+      CIO_TEMPLATE__OVERDUE_TASK: ${CIO_TEMPLATE__OVERDUE_TASK:-}
+      CIO_TEMPLATE__MENTION: ${CIO_TEMPLATE__MENTION:-}
+      CIO_TEMPLATE__TASK_REMINDER: ${CIO_TEMPLATE__TASK_REMINDER:-}
+      CIO_TEMPLATE__COMPLETE_WORKFLOW: ${CIO_TEMPLATE__COMPLETE_WORKFLOW:-}
+      EMAIL_HOST: ${EMAIL_HOST:-}
+      EMAIL_PORT: ${EMAIL_PORT:-}
+      EMAIL_HOST_USER: ${EMAIL_HOST_USER:-}
+      EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD:-}
+      EMAIL_USE_TLS: ${EMAIL_USE_TLS:-}
+      EMAIL_USE_SSL: ${EMAIL_USE_SSL:-}
+      EMAIL_TIMEOUT: ${EMAIL_TIMEOUT:-}
       AI: ${AI:-no}
-      AI_PROVIDER: ${AI_PROVIDER}
+      AI_PROVIDER: ${AI_PROVIDER:-}
       PUSH: ${PUSH:-no}
-      PUSH_PROVIDER: ${PUSH_PROVIDER}
+      PUSH_PROVIDER: ${PUSH_PROVIDER:-}
       STORAGE: ${STORAGE:-no}
-      STORAGE_PROVIDER: ${STORAGE_PROVIDER}
+      STORAGE_PROVIDER: ${STORAGE_PROVIDER:-}
       GOOGLE_APPLICATION_CREDENTIALS: /pneumatic_backend/google_api_credentials.json
-      SENTRY_DSN: ${SENTRY_DSN}
+      SENTRY_DSN: ${SENTRY_DSN:-}
       POSTGRES_HOST: ${POSTGRES_HOST:-postgres}
       POSTGRES_USER: ${POSTGRES_USER:-postgres_user}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres_password}

backend/src/accounts/enums.py

@@ -3,17 +3,21 @@
 
 class NotificationType:
 
+    # TODO Union with the NotificationMethod
+
     SYSTEM = 'system'
     COMMENT = 'comment'
     MENTION = 'mention'
     URGENT = 'urgent'
     NOT_URGENT = 'not_urgent'
     OVERDUE_TASK = 'overdue_task'
+    REMINDER_TASK = 'reminder_task'
     DELAY_WORKFLOW = 'snooze_workflow'
     RESUME_WORKFLOW = 'resume_workflow'
     DUE_DATE_CHANGED = 'due_date_changed'
     REACTION = 'reaction'
     COMPLETE_TASK = 'complete_task'
+    COMPLETE_WORKFLOW = 'complete_workflow'
 
     URGENT_TYPES = (
         URGENT,
@@ -27,11 +31,13 @@ class NotificationType:
         (URGENT, 'urgent'),
         (NOT_URGENT, 'not urgent'),
         (OVERDUE_TASK, 'overdue task'),
+        (REMINDER_TASK, 'reminder task'),
         (DELAY_WORKFLOW, 'snooze workflow'),
         (RESUME_WORKFLOW, 'resume workflow'),
         (DUE_DATE_CHANGED, 'due date changed'),
         (REACTION, 'reaction'),
         (COMPLETE_TASK, 'complete task'),
+        (COMPLETE_WORKFLOW, 'complete workflow'),
     )
 
 
@@ -92,6 +98,16 @@ class UserFirstDayWeek:
         (SATURDAY, 'Saturday'),
     )
 
+    LITERALS = Literal[
+        SUNDAY,
+        MONDAY,
+        TUESDAY,
+        WEDNESDAY,
+        THURSDAY,
+        FRIDAY,
+        SATURDAY,
+    ]
+
 
 class UserDateFormat:
 
@@ -137,6 +153,7 @@ class UserDateFormat:
         PY_USA_24: API_USA_24,
         PY_EUROPE_24: API_EUROPE_24,
     }
+    LITERALS = Literal[PY_USA_12, PY_EUROPE_12, PY_USA_24, PY_EUROPE_24]
 
 
 class LeaseLevel:

backend/src/accounts/filters.py

@@ -41,6 +41,24 @@ class Meta:
     )
 
 
+class PublicUsersListFilterSet(FilterSet):
+
+    class Meta:
+        model = User
+        fields = (
+            'ordering',
+        )
+
+    ordering = DefaultOrderingFilter(
+        fields=(
+            ('first_name', 'first_name'),
+            ('last_name', 'last_name'),
+            ('status', 'status'),
+        ),
+        default=('last_name',),
+    )
+
+
 class UsersListFilterSet(FilterSet):
 
     class Meta: