Merge pull request #8471 from CitizenLabDotCo/master

Release 2024-07-22 (3)

back/db/migrate/20240722090955_remove_map_configs_without_mappable.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# This is a data migration. It does not change the schema.
+class RemoveMapConfigsWithoutMappable < ActiveRecord::Migration[7.0]
+  class MapConfig < ApplicationRecord
+    self.table_name = 'maps_map_configs'
+  end
+
+  class Layer < ApplicationRecord
+    self.table_name = 'maps_layers'
+
+    belongs_to :map_config, class_name: 'MapConfig'
+  end
+
+  def change
+    map_configs = MapConfig.where(mappable_id: nil, mappable_type: nil)
+    layers = Layer.where(map_config: map_configs)
+
+    layers.delete_all
+    map_configs.delete_all
+  end
+end

back/db/structure.sql

@@ -7510,6 +7510,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20240516113700'),
 ('20240606112752'),
 ('20240612134240'),
-('202407081751');
+('202407081751'),
+('20240722090955');
 
 

front/cypress/e2e/folder_page.cy.ts

@@ -52,12 +52,6 @@ describe('Project selection page', () => {
     cy.get('#e2e-folder-page');
   });
 
-  it('shows where you are', () => {
-    cy.get('.e2e-projects-dropdown-link')
-      .should('have.class', 'active')
-      .should('be.visible');
-  });
-
   it('shows the folder title', () => {
     cy.get('#e2e-folder-title').contains(folderTitle);
   });