Spicy version of the Map UI optimisaiton

hub/graphql/types/model_types.py

@@ -632,6 +632,8 @@ class GenericData(CommonData):
 
     @strawberry_django.field
     def postcode_data(self) -> Optional[PostcodesIOResult]:
+        if not self.postcode_data:
+            return None
         return benedict(self.postcode_data)
 
     @strawberry_django.field

hub/management/commands/seed.py

@@ -0,0 +1,49 @@
+from django.conf import settings
+from django.core.management.base import BaseCommand
+from asgiref.sync import async_to_sync
+
+from hub.models import HubHomepage, User, Organisation, AirtableSource, MapReport
+
+class Command(BaseCommand):
+    def handle(self, *args, **kwargs):
+        # Create an org for the first user
+        user = User.objects.create_user(
+            settings.DJANGO_SUPERUSER_USERNAME,
+            settings.DJANGO_SUPERUSER_EMAIL,
+            settings.DJANGO_SUPERUSER_PASSWORD
+        )
+        org = Organisation.get_or_create_for_user(user)
+
+        # Create a data source
+        source: AirtableSource = AirtableSource.objects.create(
+            name="CK's test airtable",
+            data_type=AirtableSource.DataSourceType.EVENT,
+            organisation=org,
+            api_key=settings.SEED_AIRTABLE_MEMBERLIST_API_KEY,
+            base_id=settings.SEED_AIRTABLE_MEMBERLIST_BASE_ID,
+            table_id=settings.SEED_AIRTABLE_MEMBERLIST_TABLE_NAME,
+            geography_column_type=AirtableSource.GeographyTypes.POSTCODE,
+            geography_column="Postcode",
+            postcode_field="Postcode",
+            start_time_field="Start",
+            title_field="Name",
+            auto_update_enabled=False,
+            auto_import_enabled=False,
+            can_display_points_publicly=True,
+            can_display_details_publicly=True,
+            update_mapping=[],
+        )
+
+        async_to_sync(AirtableSource.deferred_import_all)(external_data_source_id=source.id)
+
+        # Create a hub for the org
+        hub = HubHomepage.create_for_user(user=1, hostname="testdomain.org", org=org)
+        hub.layers = [
+            MapReport.MapLayer(
+                id=str(source.id),
+                name="Test data",
+                source=str(source.id)
+            ),
+            # TODO: add some event source
+        ]
+        hub.save()

hub/migrations/0133_alter_hubhomepage_organisation.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.11 on 2024-06-20 09:57
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("hub", "0132_alter_membership_role"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="hubhomepage",
+            name="organisation",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="hubs",
+                to="hub.organisation",
+            ),
+        ),
+    ]

hub/models.py

@@ -2323,11 +2323,11 @@ def user_permissions(
         )
 
         source = ExternalDataSource.objects.get(pk=external_data_source_id)
-        default_source_permissions = source.default_data_permissions()
+        permissions: cls.DataPermissions = source.default_data_permissions()
 
         if user is None or not user.is_authenticated:
             logger.debug("No user provided, returning default permissions")
-            return default_source_permissions
+            return permissions
 
         # Check for cached permissions on this source
         user_id = user if not hasattr(user, "id") else str(user.id)
@@ -2350,29 +2350,28 @@ def user_permissions(
                     can_display_details=False,
                 )
         if user_id is None or external_data_source.organisation is None:
-            return default_source_permissions
+            return permissions
         else:
             # If the user's org owns the source, they can see everything
-            can_display_points = external_data_source.organisation.members.filter(
+            is_owner = external_data_source.organisation.members.filter(
                 user=user_id
             ).exists()
-            can_display_details = can_display_points
+            if is_owner:
+                permissions['can_display_points'] = True
+                permissions['can_display_details'] = True
         # Otherwise, check if their org has sharing permissions at any granularity
-        if not can_display_points:
+        if not is_owner:
             permission = SharingPermission.objects.filter(
                 external_data_source=external_data_source,
                 organisation__members__user=user_id,
             ).first()
             if permission is not None:
                 if permission.visibility_record_coordinates:
-                    can_display_points = True
+                    permissions['can_display_points'] = True
                     if permission.visibility_record_details:
-                        can_display_details = True
+                        permissions['can_display_details'] = True
 
-        permissions_dict[user_id] = cls.DataPermissions(
-            can_display_points=can_display_points,
-            can_display_details=can_display_details,
-        )
+        permissions_dict[user_id] = permissions
 
         cache.set(
             permission_cache_key,
@@ -2382,7 +2381,12 @@ def user_permissions(
             timeout=60 * 60,
         )
 
-        return permissions_dict[user_id]
+        perms = permissions_dict[user_id]
+
+        logger.debug(
+            f"Calculated new user permissions for user {user}: {perms}"
+        )
+        return perms
 
     def filter(self, filter: dict) -> dict:
         """
@@ -3535,7 +3539,7 @@ class HubHomepage(Page):
     subpage_types = ["hub.HubContentPage"]
 
     organisation = models.ForeignKey(
-        Organisation, on_delete=models.PROTECT, related_name="hubs"
+        Organisation, on_delete=models.CASCADE, related_name="hubs"
     )
 
     layers = models.JSONField(blank=True, null=True, default=list)
@@ -3593,25 +3597,29 @@ def create_for_user(
         user,
         hostname,
         port=80,
-        org_id=None,
+        org=None,
     ):
         """
         Create a new HubHomepage for a user.
         """
-        if org_id:
-            organisation = Organisation.objects.get(id=org_id)
+        if org:
+            if not isinstance(org, Organisation):
+                org = Organisation.objects.get(id=org)
         else:
-            organisation = Organisation.get_or_create_for_user(user)
+            org = Organisation.get_or_create_for_user(user)
+        if site := Site.objects.filter(hostname=hostname, port=port).first():
+            return site.root_page.specific
+
         hub = HubHomepage(
             title=hostname,
             slug=slugify(hostname),
-            organisation=organisation,
+            organisation=org,
         )
         # get root
         root_page = Page.get_first_root_node()
         root_page.add_child(instance=hub)
         hub.save()
-        Site.objects.create(
+        Site.objects.get_or_create(
             hostname=hostname, port=port, site_name=hostname, root_page=hub
         )
         return hub

hub/views/vector_tiles.py

@@ -58,7 +58,7 @@ def get(self, request, *args, **kwargs):
             user_or_error: UserOrError = get_user_or_error(request)
             user = user_or_error.user if user_or_error.user else None
             permissions = ExternalDataSource.user_permissions(user, self.get_id())
-            logger.info(
+            logger.debug(
                 f"Got user permissions for {self.get_id()}, user {user}: {permissions}"
             )
             if not permissions.get("can_display_points", False):

local_intelligence_hub/settings.py

@@ -49,7 +49,13 @@
     TEST_MAILCHIMP_MEMBERLIST_API_KEY=(str, ""),
     TEST_MAILCHIMP_MEMBERLIST_AUDIENCE_ID=(str, ""),
     TEST_ACTIONNETWORK_MEMBERLIST_API_KEY=(str, ""),
+    SEED_AIRTABLE_MEMBERLIST_API_KEY=(str, ""),
+    SEED_AIRTABLE_MEMBERLIST_BASE_ID=(str, ""),
+    SEED_AIRTABLE_MEMBERLIST_TABLE_NAME=(str, ""),
     TEST_TICKET_TAILOR_API_KEY=(str, ""),
+    DJANGO_SUPERUSER_USERNAME=(str, ""),
+    DJANGO_SUPERUSER_PASSWORD=(str, ""),
+    DJANGO_SUPERUSER_EMAIL=(str, ""),
     DJANGO_LOG_LEVEL=(str, "INFO"),
     DJANGO_HUB_LOG_LEVEL=(str, None),
     POSTHOG_API_KEY=(str, False),
@@ -123,6 +129,16 @@
     "TEST_AIRTABLE_CUSTOMDATALAYER_TABLE_NAME"
 )
 TEST_AIRTABLE_CUSTOMDATALAYER_API_KEY = env("TEST_AIRTABLE_CUSTOMDATALAYER_API_KEY")
+
+# Seed data
+SEED_AIRTABLE_MEMBERLIST_API_KEY = env("SEED_AIRTABLE_MEMBERLIST_API_KEY")
+SEED_AIRTABLE_MEMBERLIST_BASE_ID = env("SEED_AIRTABLE_MEMBERLIST_BASE_ID")
+SEED_AIRTABLE_MEMBERLIST_TABLE_NAME = env("SEED_AIRTABLE_MEMBERLIST_TABLE_NAME")
+DJANGO_SUPERUSER_USERNAME = env("DJANGO_SUPERUSER_USERNAME")
+DJANGO_SUPERUSER_PASSWORD = env("DJANGO_SUPERUSER_PASSWORD")
+DJANGO_SUPERUSER_EMAIL = env("DJANGO_SUPERUSER_EMAIL")
+
+#
 DJANGO_LOG_LEVEL = env("DJANGO_LOG_LEVEL")
 DJANGO_HUB_LOG_LEVEL = env("DJANGO_HUB_LOG_LEVEL")
 DJANGO_HUB_LOG_LEVEL = (

nextjs/package.json

@@ -56,7 +56,6 @@
     "d3-scale": "^4.0.2",
     "d3-scale-chromatic": "^3.1.0",
     "date-fns": "^3.6.0",
-    "env-var": "^7.5.0",
     "fuse.js": "^7.0.0",
     "graphiql": "^3.1.1",
     "graphql": "^16.8.1",