chore: prepare release v24.6.0

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: f-eld-ch

.github/workflows/docker-image.yml

@@ -15,7 +15,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     name: "Test and Build"
-    steps:
+    steps:        
       - name: Checkout
         uses: actions/checkout@v4
       - uses: actions/checkout@v4
@@ -24,6 +24,9 @@ jobs:
           node-version-file: ".nvmrc"
           cache: yarn
           cache-dependency-path: "ui/yarn.lock"
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
@@ -70,8 +73,11 @@ jobs:
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           build-args: |
             VERSION=${{ steps.meta.outputs.version }}
             GIT_SHA=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
@@ -97,6 +103,9 @@ jobs:
         with:
           context: .
           file: Dockerfile.hasura
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta-hasura.outputs.tags }}
           labels: ${{ steps.meta-hasura.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

README.md

@@ -9,8 +9,8 @@
 
 ## Demo-Environment
 
-The current develop version is automatically deployed to: [https://sitrep-dev.zso-uri.ch](https://sitrep-dev.zso-uri.ch)
-Login is possible with your Github account.
+The current develop version is automatically deployed to: [https://demo.sitrep.ch](https://demo.sitrep.ch)
+Login is possible with your Github account or sign-up for a new account at Auth0.
 
 ### Local Development Environment
 
@@ -48,5 +48,9 @@ cd ui && yarn start
 
 ### Translations
 
-- To correct or add **translations** we invite you to help us out [on Weblate](https://hosted.weblate.org/projects/sitrep).<br>
-  [![Translation status](https://hosted.weblate.org/widgets/sitrep/-/287x66-grey.png)](https://hosted.weblate.org/engage/sitrep/)
+To correct or add **translations** we invite you to help us out [on Transifex](https://explore.transifex.com/f-eld/sitrep/).
+We currently support the following languages:
+- German (de)
+- English (en)
+- Italian (it)
+- French (fr)

config.yaml → hasura/config.yaml

@@ -1,6 +1,6 @@
 version: 3
 endpoint: http://localhost:8080
-admin_secret: myadminsecretkey
+admin_secret: 388HMfQ00gEyg636O63S1jxRODTSoAiu_XHa0fXhtRo=
 metadata_directory: metadata
 actions:
   kind: synchronous

hasura/metadata/backend_configs.yaml

@@ -0,0 +1 @@
+{}

hasura/metadata/databases/Postgres/tables/public_features.yaml

@@ -0,0 +1,54 @@
+table:
+  name: features
+  schema: public
+object_relationships:
+  - name: layer
+    using:
+      foreign_key_constraint_on: layer_id
+insert_permissions:
+  - role: editor
+    permission:
+      check: {}
+      columns:
+        - created_at
+        - geometry
+        - id
+        - layer_id
+        - properties
+    comment: ""
+select_permissions:
+  - role: editor
+    permission:
+      columns:
+        - geometry
+        - properties
+        - created_at
+        - deleted_at
+        - updated_at
+        - id
+        - layer_id
+      filter: {}
+    comment: ""
+  - role: viewer
+    permission:
+      columns:
+        - geometry
+        - properties
+        - created_at
+        - deleted_at
+        - updated_at
+        - id
+        - layer_id
+      filter: {}
+    comment: ""
+update_permissions:
+  - role: editor
+    permission:
+      columns:
+        - deleted_at
+        - geometry
+        - properties
+        - updated_at
+      filter: {}
+      check: null
+    comment: ""

hasura/metadata/databases/Postgres/tables/public_incidents.yaml

@@ -20,6 +20,13 @@ array_relationships:
         table:
           name: journals
           schema: public
+  - name: layers
+    using:
+      foreign_key_constraint_on:
+        column: incident_id
+        table:
+          name: layers
+          schema: public
 insert_permissions:
   - role: editor
     permission:

hasura/metadata/databases/Postgres/tables/public_layers.yaml

@@ -0,0 +1,58 @@
+table:
+  name: layers
+  schema: public
+object_relationships:
+  - name: incident
+    using:
+      foreign_key_constraint_on: incident_id
+array_relationships:
+  - name: features
+    using:
+      foreign_key_constraint_on:
+        column: layer_id
+        table:
+          name: features
+          schema: public
+insert_permissions:
+  - role: editor
+    permission:
+      check: {}
+      columns:
+        - created_at
+        - id
+        - incident_id
+        - name
+    comment: ""
+select_permissions:
+  - role: editor
+    permission:
+      columns:
+        - name
+        - created_at
+        - deleted_at
+        - updated_at
+        - id
+        - incident_id
+      filter: {}
+    comment: ""
+  - role: viewer
+    permission:
+      columns:
+        - name
+        - created_at
+        - deleted_at
+        - updated_at
+        - id
+        - incident_id
+      filter: {}
+    comment: ""
+update_permissions:
+  - role: editor
+    permission:
+      columns:
+        - deleted_at
+        - name
+        - updated_at
+      filter: {}
+      check: null
+    comment: ""

hasura/metadata/databases/Postgres/tables/public_message_division.yaml

@@ -61,5 +61,4 @@ select_permissions:
 delete_permissions:
   - role: editor
     permission:
-      backend_only: false
       filter: {}

hasura/metadata/databases/Postgres/tables/tables.yaml

@@ -1,6 +1,8 @@
 - "!include public_divisions.yaml"
+- "!include public_features.yaml"
 - "!include public_incidents.yaml"
 - "!include public_journals.yaml"
+- "!include public_layers.yaml"
 - "!include public_locations.yaml"
 - "!include public_medium.yaml"
 - "!include public_message_division.yaml"

hasura/metadata/metrics_config.yaml

@@ -0,0 +1 @@
+{}

hasura/metadata/opentelemetry.yaml

@@ -0,0 +1 @@
+{}

hasura/migrations/Postgres/1707469071936_create_table_public_layers/down.sql

@@ -0,0 +1 @@
+DROP TABLE "public"."layers";

hasura/migrations/Postgres/1707469071936_create_table_public_layers/up.sql

@@ -0,0 +1,2 @@
+CREATE TABLE "public"."layers" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "incident_id" uuid NOT NULL, "name" text NOT NULL, "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz, "deleted_at" timestamptz, PRIMARY KEY ("id") , FOREIGN KEY ("incident_id") REFERENCES "public"."incidents"("id") ON UPDATE restrict ON DELETE cascade, UNIQUE ("id"));COMMENT ON TABLE "public"."layers" IS E'Layers for Maps';
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

hasura/migrations/Postgres/1707469130324_alter_table_public_layers_add_unique_incident_id_name/down.sql

@@ -0,0 +1 @@
+alter table "public"."layers" drop constraint "layers_incident_id_name_key";

hasura/migrations/Postgres/1707469130324_alter_table_public_layers_add_unique_incident_id_name/up.sql

@@ -0,0 +1 @@
+alter table "public"."layers" add constraint "layers_incident_id_name_key" unique ("incident_id", "name");

hasura/migrations/Postgres/1707469301937_create_table_public_features/down.sql

@@ -0,0 +1 @@
+DROP TABLE "public"."features";

hasura/migrations/Postgres/1707469301937_create_table_public_features/up.sql

@@ -0,0 +1,2 @@
+CREATE TABLE "public"."features" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "geometry" jsonb NOT NULL, "properties" jsonb NOT NULL, "layer_id" uuid NOT NULL, "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz, "deleted_at" timestamptz, PRIMARY KEY ("id") , FOREIGN KEY ("layer_id") REFERENCES "public"."layers"("id") ON UPDATE restrict ON DELETE no action, UNIQUE ("id"));COMMENT ON TABLE "public"."features" IS E'Features for Layers';
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

hasura/migrations/Postgres/1707469588967_set_update_at_trigger_for_layers_and_features/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE TRIGGER set_public_layers_updated_at BEFORE UPDATE ON public.layers FOR EACH ROW EXECUTE FUNCTION public.set_current_timestamp_updated_at();
+-- CREATE TRIGGER set_public_features_updated_at BEFORE UPDATE ON public.features FOR EACH ROW EXECUTE FUNCTION public.set_current_timestamp_updated_at();

hasura/migrations/Postgres/1707469588967_set_update_at_trigger_for_layers_and_features/up.sql

@@ -0,0 +1,2 @@
+CREATE TRIGGER set_public_layers_updated_at BEFORE UPDATE ON public.layers FOR EACH ROW EXECUTE FUNCTION public.set_current_timestamp_updated_at();
+CREATE TRIGGER set_public_features_updated_at BEFORE UPDATE ON public.features FOR EACH ROW EXECUTE FUNCTION public.set_current_timestamp_updated_at();

scripts/cleanup-closed.sql

@@ -18,8 +18,26 @@ WHERE incident_id IN (
     SELECT id FROM incidents WHERE closed_at IS NOT NULL
 );
 
+DELETE FROM features
+WHERE layer_id IN (
+    SELECT id FROM layers
+    WHERE incident_id IN (
+        SELECT id FROM incidents WHERE closed_at IS NOT NULL
+    )
+);
+
+DELETE FROM layers
+WHERE incident_id IN (
+    SELECT id FROM incidents WHERE closed_at IS NOT NULL
+);
 
 DELETE FROM incidents
 WHERE closed_at IS NOT NULL;
 
 COMMIT;
+
+BEGIN TRANSACTION;
+UPDATE incidents SET closed_at = now()
+WHERE closed_at IS NULL AND created_at <= now() - interval '24 hours';
+COMMIT;
+