Merged in stage (pull request #18)

release merge, snapshot legend (svg icons, collapsable), permissions for snapshot, not listed, workspaces

Author: yvess

Makefile

@@ -1,3 +1,5 @@
+SHELL = /bin/bash
+
 .PHONY: all
 
 init:
@@ -37,6 +39,19 @@ deploy_dev:
 	source env.hosts.prod && ssh $$DJANGO_DEV_HOST -t "cd $$DJANGO_DEV_PATH && COMPOSE_FILE=$$COMPOSE_DEV docker-compose exec django make migrate"
 	source env.hosts.prod && ssh $$DJANGO_DEV_HOST -t "cd $$DJANGO_DEV_PATH && COMPOSE_FILE=$$COMPOSE_DEV docker-compose exec django killall -TERM gunicorn"
 
+deploy_local:
+	docker-compose up -d
+	make -f vue/Makefile build
+	source env.hosts.prod && rsync -av --delete vue/dist $$VUE_LOCAL_PATH
+	docker-compose exec -T django make migrate
+	docker-compose exec -T django killall -TERM gunicorn
+
+slack-push:
+	source env.hosts.prod && test -v SLACK_APP_HOOK && curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"$$SLACK_APP_TEXT\"}" "https://hooks.slack.com/services/$$SLACK_APP_HOOK"
+
+update:
+	make deploy_local && make slack-push; exit 0
+
 ab-graphql:
 	ab -p tests/graphql-autocomplete-post.json -T application/json -c 10 -n 2000 http://gemeindescan.ch/graphql/
 

django/Makefile

@@ -1,4 +1,4 @@
-GEMEINDESCAN_WEBUI_DJANGO=0.3.1
+GEMEINDESCAN_WEBUI_DJANGO=0.3.3
 DOCKER_EXEC=$(shell command -v docker > /dev/null && echo "docker-compose exec django")
 
 .PHONY: all

django/docker/django/Dockerfile

@@ -48,6 +48,10 @@ RUN apk --no-cache add yajl build-base yajl-dev python3-dev \
     && pip3 install -r /tmp/requirements.txt \
     && apk del build-base yajl-dev python3-dev
 
+# python requirements 02 layer
+COPY ./requirements/02.txt /tmp/requirements.txt
+RUN cd /opt && pip3 install -r /tmp/requirements.txt
+
 COPY s6/etc/services.d /etc/services.d
 COPY s6/etc/cont-init.d /etc/cont-init.d
 ENTRYPOINT ["/init"]

django/docker/django/requirements/02.txt

@@ -0,0 +1,58 @@
+aniso8601==7.0.0
+asgiref==3.2.3
+astroid==2.3.3
+attrs==19.3.0
+blessings==1.7
+bpython==0.18
+certifi==2019.11.28
+chardet==3.0.4
+Click==7.0
+curtsies==0.3.1
+Django==3.0.3
+django-cors-headers==3.2.1
+django-filter==2.2.0
+django-json-widget==1.0.0
+django-sortedm2m==3.0.0
+-e git+https://github.com/svleeuwen/sortedm2m-filter-horizontal-widget.git@4ce03f6b7e6022014838afb4a8aa4691fceb9e94#egg=django_sortedm2m_filter_horizontal_widget
+future==0.18.2
+graphene==2.1.8
+graphene-django==2.8.1
+graphql-core==2.2.1
+graphql-relay==2.0.1
+greenlet==0.4.15
+gunicorn==19.9.0
+h11==0.9.0
+httptools==0.0.13
+idna==2.9
+isort==4.3.21
+jsonslicer==0.1.5
+lazy-object-proxy==1.4.3
+mccabe==0.6.1
+more-itertools==8.2.0
+olefile==0.46
+packaging==20.1
+Pillow==6.2.1
+pluggy==0.13.1
+promise==2.3
+psycopg2==2.8.4
+py==1.8.1
+Pygments==2.5.2
+pylint==2.4.4
+pylint-django==2.0.13
+pylint-plugin-utils==0.6
+pyparsing==2.4.6
+pytest==5.3.5
+pytz==2019.3
+requests==2.23.0
+Rx==1.6.1
+singledispatch==3.4.0.3
+six==1.14.0
+sorl-thumbnail==12.6.3
+sqlparse==0.3.0
+urllib3==1.25.8
+uvicorn==0.11.2
+uvloop==0.14.0
+wcwidth==0.1.8
+websockets==8.1
+wrapt==1.11.2
+yapf==0.29.0

django/gsmap/admin.py

@@ -1,19 +1,23 @@
 from django.contrib.gis import admin
+from django.contrib.postgres import fields
 from django.utils.translation import gettext as _
-from gsmap.models import Municipality, Snapshot
+from django_json_widget.widgets import JSONEditorWidget
+from sortedm2m_filter_horizontal_widget.forms import SortedFilteredSelectMultiple
+from gsmap.models import Municipality, Snapshot, Workspace
 
 
 class MunicipalityAdmin(admin.OSMGeoAdmin):
     pass
 
 
 class SnapshotAdmin(admin.OSMGeoAdmin):
-    readonly_fields = (
-        'id', 'created',
-    )
+    readonly_fields = ('id', 'created', 'modified', 'get_absolute_link')
     fieldsets = (
         (_('Meta'), {
-            'fields': ('created', 'id', 'is_showcase', 'archived', 'deleted')
+            'fields': (
+                'id', 'get_absolute_link', 'created', 'modified',
+                'is_showcase', 'archived', 'deleted', 'permission'
+            )
         }),
         (_('Main'), {
             'fields':
@@ -28,8 +32,41 @@ class SnapshotAdmin(admin.OSMGeoAdmin):
         #     ('perimeter',),
         # }),
     )
-    list_display = ('id', 'created')
+
+    formfield_overrides = {
+        fields.JSONField: {
+            'widget': JSONEditorWidget
+        },
+    }
+
+    list_display = ('id', 'title', 'municipality', 'permission', 'is_showcase',
+                    'created', 'modified')
+    list_filter = ('is_showcase', 'permission')
+    search_fields = ['title', 'municipality__name', 'municipality__canton']
+
+
+class WorkspaceAdmin(admin.OSMGeoAdmin):
+    readonly_fields = ('id', 'created', 'modified', 'get_absolute_link')
+    fieldsets = (
+        (_('Meta'), {
+            'fields': (
+                'id', 'get_absolute_link',
+                'created', 'modified'
+            )
+        }),
+        (_('Main'), {
+            'fields': ('title', 'description', 'snapshots'),
+        }),
+    )
+    list_display = ('id', 'title', 'created', 'modified')
+    search_fields = ['title']
+
+    def formfield_for_manytomany(self, db_field, request=None, **kwargs):
+        if db_field.name == 'snapshots':
+            kwargs['widget'] = SortedFilteredSelectMultiple()
+        return super().formfield_for_manytomany(db_field, request, **kwargs)
 
 
 admin.site.register(Municipality, MunicipalityAdmin)
 admin.site.register(Snapshot, SnapshotAdmin)
+admin.site.register(Workspace, WorkspaceAdmin)

django/gsmap/migrations/0012_auto_20200405_0850.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.0.3 on 2020-04-05 08:50
+
+from django.db import migrations, models
+import gsmap.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gsmap', '0011_auto_20200306_1539'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='snapshot',
+            name='modified',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AddField(
+            model_name='snapshot',
+            name='permission',
+            field=models.IntegerField(choices=[(gsmap.models.SnapshotPermission['PUBLIC'], 0), (gsmap.models.SnapshotPermission['NOT_LISTED'], 10)], default=gsmap.models.SnapshotPermission['PUBLIC']),
+        ),
+    ]

django/gsmap/migrations/0013_auto_20200405_1555.py

@@ -0,0 +1,34 @@
+# Generated by Django 3.0.3 on 2020-04-05 15:55
+
+from django.db import migrations, models
+import gsmap.models
+import sortedm2m.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gsmap', '0012_auto_20200405_0850'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='snapshot',
+            name='permission',
+            field=models.IntegerField(choices=[(0, 'PUBLIC'), (10, 'NOT_LISTED')], default=gsmap.models.SnapshotPermission['PUBLIC']),
+        ),
+        migrations.CreateModel(
+            name='Workspace',
+            fields=[
+                ('id', models.CharField(default=gsmap.models.create_slug_hash, max_length=8, primary_key=True, serialize=False, unique=True)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('modified', models.DateTimeField(auto_now=True)),
+                ('title', models.CharField(default='', max_length=150)),
+                ('description', models.TextField(default='')),
+                ('snapshots', sortedm2m.fields.SortedManyToManyField(help_text=None, to='gsmap.Snapshot')),
+            ],
+            options={
+                'ordering': ['-created'],
+            },
+        ),
+    ]

django/gsmap/migrations/0014_auto_20200405_1622.py

@@ -0,0 +1,30 @@
+# Generated by Django 3.0.3 on 2020-04-05 16:22
+
+from django.db import migrations
+import sortedm2m.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gsmap', '0013_auto_20200405_1555'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SnapshotRaw',
+            fields=[
+            ],
+            options={
+                'proxy': True,
+                'indexes': [],
+                'constraints': [],
+            },
+            bases=('gsmap.snapshot',),
+        ),
+        migrations.AlterField(
+            model_name='workspace',
+            name='snapshots',
+            field=sortedm2m.fields.SortedManyToManyField(help_text=None, to='gsmap.SnapshotRaw'),
+        ),
+    ]

django/gsmap/migrations/0015_auto_20200406_1803.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.0.3 on 2020-04-06 18:03
+
+from django.db import migrations
+import sortedm2m.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gsmap', '0014_auto_20200405_1622'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='SnapshotRaw',
+        ),
+        migrations.AlterField(
+            model_name='workspace',
+            name='snapshots',
+            field=sortedm2m.fields.SortedManyToManyField(help_text=None, to='gsmap.Snapshot'),
+        ),
+    ]