Merge pull request #3533 from owid/migration-remove-tags-bulk-import

migrate(tags): delete tags with `isBulkImport` & delete column
owid · Apr 25, 2024 · d65c4ca · d65c4ca
2 parents 08f6dde + ac321c4
commit d65c4ca
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 61 deletions.
diff --git a/adminSiteClient/TagEditPage.tsx b/adminSiteClient/TagEditPage.tsx
@@ -20,7 +20,6 @@ interface TagPageData {
     charts: ChartListItem[]
     children: DbChartTagJoin[]
     possibleParents: DbChartTagJoin[]
-    isBulkImport: boolean
     slug: string | null
 }
 
@@ -140,67 +139,55 @@ class TagEditor extends React.Component<{ tag: TagPageData }> {
                         }}
                     >
                         <BindString
-                            disabled={tag.isBulkImport}
                             field="name"
                             store={newtag}
                             label="Name"
                             helpText="Category names should ideally be unique across the database and able to be understood without context"
                         />
-                        {!tag.isBulkImport && (
-                            <>
-                                <BindString
-                                    field="slug"
-                                    store={newtag}
-                                    label="Slug"
-                                    helpText="The slug for this tag's topic page, e.g. trade-and-globalization. If specified, we assume this tag is a topic."
-                                />
-                                <FieldsRow>
-                                    <NumericSelectField
-                                        label="Parent Category"
-                                        value={newtag.parentId || -1}
-                                        options={[
-                                            { value: -1, label: "None" },
-                                        ].concat(
-                                            tag.possibleParents.map((p) => ({
-                                                value: p.id as number,
-                                                label: p.name,
-                                            }))
-                                        )}
-                                        onValue={this.onChooseParent}
-                                    />
-                                    <div>
-                                        <br />
-                                        {this.parentTag && (
-                                            <TagBadge
-                                                tag={
-                                                    this
-                                                        .parentTag as DbChartTagJoin
-                                                }
-                                            />
-                                        )}
-                                    </div>
-                                </FieldsRow>
-                            </>
-                        )}
-                        {!tag.isBulkImport && (
+                        <BindString
+                            field="slug"
+                            store={newtag}
+                            label="Slug"
+                            helpText="The slug for this tag's topic page, e.g. trade-and-globalization. If specified, we assume this tag is a topic."
+                        />
+                        <FieldsRow>
+                            <NumericSelectField
+                                label="Parent Category"
+                                value={newtag.parentId || -1}
+                                options={[{ value: -1, label: "None" }].concat(
+                                    tag.possibleParents.map((p) => ({
+                                        value: p.id as number,
+                                        label: p.name,
+                                    }))
+                                )}
+                                onValue={this.onChooseParent}
+                            />
                             <div>
-                                <input
-                                    type="submit"
-                                    className="btn btn-success"
-                                    value="Update category"
-                                />{" "}
-                                {tag.datasets.length === 0 &&
-                                    tag.children.length === 0 &&
-                                    !tag.specialType && (
-                                        <button
-                                            className="btn btn-danger"
-                                            onClick={() => this.deleteTag()}
-                                        >
-                                            Delete category
-                                        </button>
-                                    )}
+                                <br />
+                                {this.parentTag && (
+                                    <TagBadge
+                                        tag={this.parentTag as DbChartTagJoin}
+                                    />
+                                )}
                             </div>
-                        )}
+                        </FieldsRow>
+                        <div>
+                            <input
+                                type="submit"
+                                className="btn btn-success"
+                                value="Update category"
+                            />{" "}
+                            {tag.datasets.length === 0 &&
+                                tag.children.length === 0 &&
+                                !tag.specialType && (
+                                    <button
+                                        className="btn btn-danger"
+                                        onClick={() => this.deleteTag()}
+                                    >
+                                        Delete category
+                                    </button>
+                                )}
+                        </div>
                     </form>
                 </section>
                 {tag.children.length > 0 && (

diff --git a/adminSiteServer/apiRouter.ts b/adminSiteServer/apiRouter.ts
@@ -1580,7 +1580,6 @@ getRouteWithROTransaction(
         SELECT t.id, t.name, p.name AS parentName
         FROM tags AS t
         JOIN tags AS p ON t.parentId=p.id
-        WHERE p.isBulkImport IS FALSE
     `
         )
         dataset.availableTags = availableTags
@@ -1844,12 +1843,11 @@ getRouteWithROTransaction(
                 | "updatedAt"
                 | "parentId"
                 | "slug"
-                | "isBulkImport"
             >
         >(
             trx,
             `-- sql
-        SELECT t.id, t.name, t.specialType, t.updatedAt, t.parentId, t.slug, p.isBulkImport
+        SELECT t.id, t.name, t.specialType, t.updatedAt, t.parentId, t.slug
         FROM tags t LEFT JOIN tags p ON t.parentId=p.id
         WHERE t.id = ?
     `,
@@ -1958,7 +1956,7 @@ getRouteWithROTransaction(
             trx,
             `-- sql
         SELECT t.id, t.name FROM tags t
-        WHERE t.parentId IS NULL AND t.isBulkImport IS FALSE
+        WHERE t.parentId IS NULL
     `
         )
         tag.possibleParents = possibleParents
@@ -2028,7 +2026,6 @@ getRouteWithROTransaction(apiRouter, "/tags.json", async (req, res, trx) => {
         `-- sql
         SELECT t.id, t.name, t.parentId, t.specialType
         FROM tags t LEFT JOIN tags p ON t.parentId=p.id
-        WHERE t.isBulkImport IS FALSE AND (t.parentId IS NULL OR p.isBulkImport IS FALSE)
         ORDER BY t.name ASC
     `
     )

diff --git a/db/migration/1713987607342-RemoveTagsBulkImport.ts b/db/migration/1713987607342-RemoveTagsBulkImport.ts
@@ -0,0 +1,36 @@
+import { MigrationInterface, QueryRunner } from "typeorm"
+
+export class RemoveTagsBulkImport1713987607342 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        // We need to run this query twice: There's a tags.parentId -> tags.id
+        // relation that we need to break in two steps; first deleting all the
+        // leaf tags, and then deleting those that used to be a parent but are
+        // now child-less.
+        for (let i = 0; i <= 1; i++) {
+            // Only delete those tags that are not the parent of any other tag
+            // - i.e. leaf tags.
+            await queryRunner.query(`-- sql
+            WITH leaf_tags AS (
+                SELECT t.id, t.name
+                FROM tags t
+                WHERE t.id NOT IN (
+                    SELECT parentId FROM tags WHERE parentId IS NOT NULL
+            ))
+            DELETE
+            FROM tags
+            WHERE isBulkImport = 1
+            and id IN (SELECT id FROM leaf_tags)
+        `)
+        }
+
+        await queryRunner.query(`-- sql
+            ALTER TABLE tags DROP COLUMN isBulkImport
+        `)
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`-- sql
+            ALTER TABLE tags ADD COLUMN isBulkImport TINYINT(1) NOT NULL DEFAULT 0
+        `)
+    }
+}
diff --git a/packages/@ourworldindata/types/src/dbTypes/Tags.ts b/packages/@ourworldindata/types/src/dbTypes/Tags.ts
@@ -3,7 +3,6 @@ export const TagsTableName = "tags"
 export interface DbInsertTag {
     createdAt?: Date
     id?: number
-    isBulkImport?: number
     name: string
     parentId?: number | null
     slug?: string | null