#212 Move some files around for cohesion

src/ts/content/extensions/util/tagValidation.ts → src/ts/content/extensions/util/tagValidation/appendTagValidator.ts

@@ -1,13 +1,9 @@
-import {getTagsFromElement, getTagTrees, TagTrees} from "../../adapters/tags";
-import {createModal} from "../../../common/ui/modal";
-import {loaderOverlaid} from "../../../common/ui/loadingIndicator";
-import {UIColour} from "../../../common/ui/colour";
-import {OffSave, OnSave} from "../../entities/bookForm";
-import {Highlight, Highlightable, highlighted} from "../../../common/ui/highlighter";
-import {getSheetLink} from "../../../common/entities/spreadsheet";
-import {insertTagsDialogs} from "../../dialogs/insertTags";
-
-type GetTagsOptions = {noCache: boolean};
+import {getTagsFromElement, getTagTrees, TagTrees} from "../../../adapters/tags";
+import {loaderOverlaid} from "../../../../common/ui/loadingIndicator";
+import {OffSave, OnSave} from "../../../entities/bookForm";
+import {Highlight, Highlightable, highlighted} from "../../../../common/ui/highlighter";
+import {getUserAcceptance} from "./dialogs/userAcceptance";
+import {GetTagsOptions} from "./types";
 
 const applyHighlights = async (text: string): Promise<Highlight[]> => {
 	const validTags = await getTagTrees().catch(() => new Map());
@@ -33,56 +29,6 @@ const applyHighlights = async (text: string): Promise<Highlight[]> => {
 const getInvalidTags = (tags: string[], trees: TagTrees): string[] =>
 	tags.filter((tag) => !trees.has(tag.toLowerCase()));
 
-const getUserAcceptance = (
-	invalidTags: string[],
-	saveHandler: (options: GetTagsOptions) => Promise<boolean>
-): Promise<boolean> =>
-	new Promise<boolean>((resolve) =>
-		createModal({
-			text: "Are you sure? The following tags are not in the Tag Index",
-			subText: invalidTags,
-			elements: [
-				{
-					kind: "button",
-					text: "Open the Tag Index",
-					colour: UIColour.GREY,
-					onClick: async () => resolve(getSecondaryAcceptance(saveHandler)),
-				},
-				{
-					kind: "button",
-					text: "Insert Tags",
-					colour: UIColour.GREY,
-					onClick: async () =>
-						resolve(insertTagsDialogs(invalidTags).then(() => saveHandler({noCache: true}))),
-				},
-				{kind: "button", text: "Save anyway", colour: UIColour.GREY, onClick: async () => resolve(true)},
-				{kind: "button", text: "Cancel", colour: UIColour.PURPLE, onClick: async () => resolve(false)},
-			],
-			colour: UIColour.PURPLE,
-			onCancel: async () => resolve(false),
-		})
-	);
-
-const getSecondaryAcceptance = async (saveHandler: (options: GetTagsOptions) => Promise<boolean>): Promise<boolean> => {
-	window.open(await getSheetLink());
-	return new Promise<boolean>((resolve) =>
-		createModal({
-			text: "Did you put the new tags in the Tag Index?",
-			elements: [
-				{
-					kind: "button",
-					text: "Yes!",
-					colour: UIColour.GREY,
-					onClick: async () => resolve(saveHandler({noCache: true})),
-				},
-				{kind: "button", text: "Cancel", colour: UIColour.PURPLE, onClick: async () => resolve(false)},
-			],
-			colour: UIColour.PURPLE,
-			onCancel: async () => resolve(false),
-		})
-	);
-};
-
 const fixTagsCase = (tags: string[], trees: TagTrees): string[] =>
 	tags.map((tag) => trees.get(tag.toLowerCase())?.tag ?? tag);
 

src/ts/content/dialogs/insertTags.ts → src/ts/content/extensions/util/tagValidation/dialogs/insertTags.ts

@@ -1,14 +1,14 @@
-import {createModal} from "../../common/ui/modal";
-import {UIColour} from "../../common/ui/colour";
+import {UIColour} from "../../../../../common/ui/colour";
+import {createModal} from "../../../../../common/ui/modal";
 
 const toInsertionButton = (remainingTags: string[], resolve: (value) => void) => (tag: string) => ({
 	kind: "button" as const,
 	colour: UIColour.BLUE,
 	text: tag,
-	onClick: async () => resolve(insertTag(tag, remainingTags).then(insertTagsDialogs)),
+	onClick: async () => resolve(insertTag(tag, remainingTags).then(insertTags)),
 });
 
-const insertTagsDialogs = async (tags: string[]): Promise<boolean> => {
+const insertTags = async (tags: string[]): Promise<boolean> => {
 	if (tags.length === 0) {
 		return Promise.resolve(true);
 	} else {
@@ -44,4 +44,4 @@ const insertTag = (tag: string, remainingTags: string[]): Promise<string[]> =>
 		})
 	);
 
-export {insertTagsDialogs};
+export {insertTags};

src/ts/content/extensions/util/tagValidation/dialogs/userAcceptance.ts

@@ -0,0 +1,56 @@
+import {createModal} from "../../../../../common/ui/modal";
+import {UIColour} from "../../../../../common/ui/colour";
+import {insertTags} from "./insertTags";
+import {getSheetLink} from "../../../../../common/entities/spreadsheet";
+import {GetTagsOptions} from "../types";
+
+const getUserAcceptance = (
+	invalidTags: string[],
+	saveHandler: (options: GetTagsOptions) => Promise<boolean>
+): Promise<boolean> =>
+	new Promise<boolean>((resolve) =>
+		createModal({
+			text: "Are you sure? The following tags are not in the Tag Index",
+			subText: invalidTags,
+			elements: [
+				{
+					kind: "button",
+					text: "Open the Tag Index",
+					colour: UIColour.GREY,
+					onClick: async () => resolve(getSecondaryAcceptance(saveHandler)),
+				},
+				{
+					kind: "button",
+					text: "Insert Tags",
+					colour: UIColour.GREY,
+					onClick: async () => resolve(insertTags(invalidTags).then(() => saveHandler({noCache: true}))),
+				},
+				{kind: "button", text: "Save anyway", colour: UIColour.GREY, onClick: async () => resolve(true)},
+				{kind: "button", text: "Cancel", colour: UIColour.PURPLE, onClick: async () => resolve(false)},
+			],
+			colour: UIColour.PURPLE,
+			onCancel: async () => resolve(false),
+		})
+	);
+
+const getSecondaryAcceptance = async (saveHandler: (options: GetTagsOptions) => Promise<boolean>): Promise<boolean> => {
+	window.open(await getSheetLink());
+	return new Promise<boolean>((resolve) =>
+		createModal({
+			text: "Did you put the new tags in the Tag Index?",
+			elements: [
+				{
+					kind: "button",
+					text: "Yes!",
+					colour: UIColour.GREY,
+					onClick: async () => resolve(saveHandler({noCache: true})),
+				},
+				{kind: "button", text: "Cancel", colour: UIColour.PURPLE, onClick: async () => resolve(false)},
+			],
+			colour: UIColour.PURPLE,
+			onCancel: async () => resolve(false),
+		})
+	);
+};
+
+export {getUserAcceptance};

src/ts/content/extensions/util/tagValidation/index.ts

@@ -0,0 +1,3 @@
+import {appendTagValidator} from "./appendTagValidator";
+
+export {appendTagValidator};

src/ts/content/extensions/util/tagValidation/types.ts

@@ -0,0 +1,3 @@
+type GetTagsOptions = {noCache: boolean};
+
+export type {GetTagsOptions};