Fixes #703

packages/api/migrations/committed/000299.sql

@@ -0,0 +1,352 @@
+--! Previous: sha1:555fe91651bf60d45b9ccc601c94793b40b2afff
+--! Hash: sha1:be119207467db0bbd7532d5cc8856d13a57a6b52
+
+-- Enter migration here
+CREATE OR REPLACE FUNCTION public.publish_table_of_contents("projectId" integer) RETURNS SETOF public.table_of_contents_items
+    LANGUAGE plpgsql SECURITY DEFINER
+    AS $$
+    declare
+      lid int;
+      item table_of_contents_items;
+      source_id int;
+      copied_source_id int;
+      acl_type access_control_list_type;
+      acl_id int;
+      orig_acl_id int;
+      new_toc_id int;
+      new_interactivity_settings_id int;
+    begin
+      -- check permissions
+      if session_is_admin("projectId") = false then
+        raise 'Permission denied. Must be a project admin';
+      end if;
+      -- delete existing published table of contents items, layers, sources, and interactivity settings
+      delete from 
+        interactivity_settings 
+      where
+        id in (
+          select 
+            data_layers.interactivity_settings_id
+          from
+            data_layers
+          inner JOIN
+            table_of_contents_items
+          on
+            data_layers.id = table_of_contents_items.data_layer_id
+          where
+            table_of_contents_items.project_id = "projectId" and
+            is_draft = false
+        );
+
+      delete from data_sources where data_sources.id in (
+        select 
+          data_source_id 
+        from
+          data_layers
+        inner JOIN
+          table_of_contents_items
+        on
+          data_layers.id = table_of_contents_items.data_layer_id
+        where
+          table_of_contents_items.project_id = "projectId" and
+          is_draft = false
+      );
+      delete from data_layers where id in (
+        select 
+          data_layer_id 
+        from 
+          table_of_contents_items 
+        where 
+          project_id = "projectId" and
+          is_draft = false
+      );
+      delete from 
+        table_of_contents_items 
+      where 
+        project_id = "projectId" and 
+        is_draft = false;
+
+      -- one-by-one, copy related layers and link table of contents items
+      for item in 
+        select 
+          * 
+        from 
+          table_of_contents_items 
+        where 
+          is_draft = true and 
+          project_id = "projectId"
+      loop
+        if item.is_folder = false then
+          -- copy interactivity settings first
+          insert into interactivity_settings (
+            type,
+            short_template,
+            long_template,
+            cursor,
+            title
+          ) select
+              type,
+              short_template,
+              long_template,
+              cursor,
+              title
+            from
+              interactivity_settings
+            where
+              interactivity_settings.id = (
+                select interactivity_settings_id from data_layers where data_layers.id = item.data_layer_id
+              )
+            returning
+              id
+            into
+              new_interactivity_settings_id;
+
+          insert into data_layers (
+            project_id,
+            data_source_id,
+            source_layer,
+            sublayer,
+            sublayer_type,
+            render_under,
+            mapbox_gl_styles,
+            interactivity_settings_id,
+            z_index
+          )
+          select "projectId", 
+            data_source_id, 
+            source_layer, 
+            sublayer, 
+            sublayer_type
+            render_under, 
+            mapbox_gl_styles,
+            new_interactivity_settings_id,
+            z_index
+          from 
+            data_layers
+          where 
+            id = item.data_layer_id
+          returning id into lid;
+        else
+          lid = item.data_layer_id;
+        end if;
+        -- TODO: this will have to be modified with the addition of any columns
+        insert into table_of_contents_items (
+          is_draft,
+          project_id,
+          path,
+          stable_id,
+          parent_stable_id,
+          title,
+          is_folder,
+          show_radio_children,
+          is_click_off_only,
+          metadata,
+          bounds,
+          data_layer_id,
+          sort_index,
+          hide_children,
+          geoprocessing_reference_id,
+          translated_props,
+          enable_download
+        ) values (
+          false,
+          "projectId",
+          item.path,
+          item.stable_id,
+          item.parent_stable_id,
+          item.title,
+          item.is_folder,
+          item.show_radio_children,
+          item.is_click_off_only,
+          item.metadata,
+          item.bounds,
+          lid,
+          item.sort_index,
+          item.hide_children,
+          item.geoprocessing_reference_id,
+          item.translated_props,
+          item.enable_download
+        ) returning id into new_toc_id;
+        select 
+          type, id into acl_type, orig_acl_id 
+        from 
+          access_control_lists 
+        where 
+          table_of_contents_item_id = (
+            select 
+              id 
+            from 
+              table_of_contents_items 
+            where is_draft = true and stable_id = item.stable_id
+          );
+        -- copy access control list settings
+        if acl_type != 'public' then
+          update 
+            access_control_lists 
+          set type = acl_type 
+          where table_of_contents_item_id = new_toc_id 
+          returning id into acl_id;
+          if acl_type = 'group' then
+            insert into 
+              access_control_list_groups (
+                access_control_list_id, 
+                group_id
+              ) 
+            select 
+              acl_id, 
+              group_id 
+            from 
+              access_control_list_groups 
+            where 
+              access_control_list_id = orig_acl_id;
+          end if;
+        end if;
+      end loop;
+      -- one-by-one, copy related sources and update foreign keys of layers
+      for source_id in
+        select distinct(data_source_id) from data_layers where id in (
+          select 
+            data_layer_id 
+          from 
+            table_of_contents_items 
+          where 
+            is_draft = false and 
+            project_id = "projectId" and 
+            is_folder = false
+        )
+      loop
+        -- TODO: This function will have to be updated whenever the schema 
+        -- changes since these columns are hard coded... no way around it.
+        insert into data_sources (
+          project_id,
+          type,
+          attribution,
+          bounds,
+          maxzoom,
+          minzoom,
+          url,
+          scheme,
+          tiles,
+          tile_size,
+          encoding,
+          buffer,
+          cluster,
+          cluster_max_zoom,
+          cluster_properties,
+          cluster_radius,
+          generate_id,
+          line_metrics,
+          promote_id,
+          tolerance,
+          coordinates,
+          urls,
+          query_parameters,
+          use_device_pixel_ratio,
+          import_type,
+          original_source_url,
+          enhanced_security,
+          byte_length,
+          supports_dynamic_layers,
+          uploaded_source_filename,
+          uploaded_source_layername,
+          normalized_source_object_key,
+          normalized_source_bytes,
+          geostats,
+          upload_task_id,
+          translated_props,
+          arcgis_fetch_strategy
+        )
+          select 
+            "projectId", 
+          type,
+          attribution,
+          bounds,
+          maxzoom,
+          minzoom,
+          url,
+          scheme,
+          tiles,
+          tile_size,
+          encoding,
+          buffer,
+          cluster,
+          cluster_max_zoom,
+          cluster_properties,
+          cluster_radius,
+          generate_id,
+          line_metrics,
+          promote_id,
+          tolerance,
+          coordinates,
+          urls,
+          query_parameters,
+          use_device_pixel_ratio,
+          import_type,
+          original_source_url,
+          enhanced_security,
+          byte_length,
+          supports_dynamic_layers,
+          uploaded_source_filename,
+          uploaded_source_layername,
+          normalized_source_object_key,
+          normalized_source_bytes,
+          geostats,
+          upload_task_id,
+          translated_props,
+          arcgis_fetch_strategy
+          from 
+            data_sources 
+          where
+            id = source_id
+          returning id into copied_source_id;
+        -- copy data_upload_outputs
+        insert into data_upload_outputs (
+          data_source_id,
+          project_id,
+          type,
+          created_at,
+          url,
+          remote,
+          is_original,
+          size,
+          filename,
+          original_filename
+        ) select 
+            copied_source_id,
+            project_id,
+            type,
+            created_at,
+            url,
+            remote,
+            is_original,
+            size,
+            filename,
+            original_filename
+          from 
+            data_upload_outputs 
+          where 
+            data_source_id = source_id;
+        -- update data_layers that should now reference the copy
+        update 
+          data_layers 
+        set data_source_id = copied_source_id 
+        where 
+          data_source_id = source_id and
+          data_layers.id in ((
+            select distinct(data_layer_id) from table_of_contents_items where is_draft = false and 
+            project_id = "projectId" and 
+            is_folder = false
+          ));
+      end loop;
+      update 
+        projects 
+      set 
+        draft_table_of_contents_has_changes = false, 
+        table_of_contents_last_published = now() 
+      where 
+        id = "projectId";
+      -- return items
+      return query select * from table_of_contents_items 
+        where project_id = "projectId" and is_draft = false;
+    end;
+  $$;

packages/api/schema.sql

@@ -11156,6 +11156,7 @@ CREATE FUNCTION public.publish_table_of_contents("projectId" integer) RETURNS SE
             data_source_id,
             source_layer,
             sublayer,
+            sublayer_type,
             render_under,
             mapbox_gl_styles,
             interactivity_settings_id,
@@ -11165,6 +11166,7 @@ CREATE FUNCTION public.publish_table_of_contents("projectId" integer) RETURNS SE
             data_source_id, 
             source_layer, 
             sublayer, 
+            sublayer_type
             render_under, 
             mapbox_gl_styles,
             new_interactivity_settings_id,
@@ -11194,7 +11196,8 @@ CREATE FUNCTION public.publish_table_of_contents("projectId" integer) RETURNS SE
           sort_index,
           hide_children,
           geoprocessing_reference_id,
-          translated_props
+          translated_props,
+          enable_download
         ) values (
           false,
           "projectId",
@@ -11211,7 +11214,8 @@ CREATE FUNCTION public.publish_table_of_contents("projectId" integer) RETURNS SE
           item.sort_index,
           item.hide_children,
           item.geoprocessing_reference_id,
-          item.translated_props
+          item.translated_props,
+          item.enable_download
         ) returning id into new_toc_id;
         select 
           type, id into acl_type, orig_acl_id