load snapshot backend data view into vue, switch from slugh_hash to string id (fixes graphql)

Author: yvess

django/gsmap/admin.py

@@ -13,14 +13,14 @@ class SnapshotAdmin(admin.ModelAdmin):
     )
     fieldsets = (
         (_('Meta'), {
-            'fields': ('created', 'slug_hash', 'archived', 'deleted')
+            'fields': ('created', 'id', 'archived', 'deleted')
         }),
         (_('Main'), {
             'fields':
             ('data', 'screenshot', 'municipality', 'predecessor', 'user'),
         }),
     )
-    list_display = ('created', 'slug_hash')
+    list_display = ('id', 'created')
 
 
 admin.site.register(Municipality, MunicipalityAdmin)

django/gsmap/migrations/0006_auto_20200219_0816.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.3 on 2020-02-19 08:16
+
+from django.db import migrations, models
+import gsmap.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gsmap', '0005_auto_20200218_1558'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='snapshot',
+            name='slug_hash',
+        ),
+        migrations.AlterField(
+            model_name='snapshot',
+            name='id',
+            field=models.CharField(default=gsmap.models.create_slug_hash, max_length=8, primary_key=True, serialize=False, unique=True),
+        ),
+    ]

django/gsmap/models.py

@@ -62,9 +62,10 @@ def create_slug_hash():
 
 class Snapshot(models.Model):
     created = models.DateTimeField(auto_now_add=True)
-    slug_hash = models.CharField(max_length=8,
-                                 unique=True,
-                                 default=create_slug_hash)
+    id = models.CharField(
+        max_length=8, unique=True, primary_key=True,
+        default=create_slug_hash
+    )
     archived = models.BooleanField(default=False)
     deleted = models.BooleanField(default=False)
     data = pg_fields.JSONField(default=dict)
@@ -80,4 +81,4 @@ class Snapshot(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
 
     def __str__(self):
-        return self.slug_hash
+        return self.id

django/gsmap/schema.py

@@ -46,17 +46,18 @@ def resolve_thumbnail(self, info, size):
             size=size
         )
 
+
 class SnapshotNode(DjangoObjectType):
     class Meta:
         model = Snapshot
-        fields = ['slug_hash', 'data', 'screenshot']
-        filter_fields = {
-            'slug_hash': ['exact']
-        }
+        fields = ['data', 'screenshot']
+        filter_fields = ['created']
         interfaces = [graphene.relay.Node]
 
     data = generic.GenericScalar(source='data')
     screenshot = graphene.Field(ImageNode)
+    pk = graphene.String(source='id')
+
 
 class Query(object):
     municipality = graphene.relay.Node.Field(MunicipalityNode)

vue/src/views/Snapshot.vue

@@ -32,24 +32,27 @@ export default {
   },
 
   methods: {
-    async getSnapshot(val) {
+    async getSnapshot(hash) {
       const result = await this.$apollo.query({
-        query: gql`query snapshot(slugHash$: String!){
-          snapshot(ID: $slugHash) {
-            node {
-              id
-            }
+        query: gql`query getsnapshot($hash: ID!){
+          snapshot(id: $hash) {
+            id
+            pk
+            data
           }
         }`,
         variables: {
-          slugHash: val
+          hash: btoa(`SnapshotNode:${hash}`)
         }
       });
       return result;
     }
   },
 
-  mounted() {
+  async created() {
+    const hash = this.$route.params.hash;
+    const result = await this.getSnapshot(hash);
+    console.log(result);
   }
 };
 </script>