From f61674ebd3c9f8468e67526da706538d82c79aaf Mon Sep 17 00:00:00 2001 From: Arild Matsson Date: Tue, 1 Oct 2024 12:14:18 +0200 Subject: [PATCH] refactor: corpus_chooser/ => corpus-chooser/ --- .../{corpus_chooser => corpus-chooser}/corpus-chooser.ts | 6 +++--- .../{corpus_chooser => corpus-chooser}/corpus-time-graph.ts | 0 .../{corpus_chooser => corpus-chooser}/info-box.ts | 0 .../components/{corpus_chooser => corpus-chooser}/tree.ts | 0 .../components/{corpus_chooser => corpus-chooser}/util.ts | 0 app/scripts/components/header.js | 2 +- app/scripts/data_init.ts | 6 +++--- 7 files changed, 7 insertions(+), 7 deletions(-) rename app/scripts/components/{corpus_chooser => corpus-chooser}/corpus-chooser.ts (98%) rename app/scripts/components/{corpus_chooser => corpus-chooser}/corpus-time-graph.ts (100%) rename app/scripts/components/{corpus_chooser => corpus-chooser}/info-box.ts (100%) rename app/scripts/components/{corpus_chooser => corpus-chooser}/tree.ts (100%) rename app/scripts/components/{corpus_chooser => corpus-chooser}/util.ts (100%) diff --git a/app/scripts/components/corpus_chooser/corpus-chooser.ts b/app/scripts/components/corpus-chooser/corpus-chooser.ts similarity index 98% rename from app/scripts/components/corpus_chooser/corpus-chooser.ts rename to app/scripts/components/corpus-chooser/corpus-chooser.ts index 44347a53..312c576a 100644 --- a/app/scripts/components/corpus_chooser/corpus-chooser.ts +++ b/app/scripts/components/corpus-chooser/corpus-chooser.ts @@ -14,9 +14,9 @@ import { recalcFolderStatus, updateLimitedAccess, } from "./util" -import "@/components/corpus_chooser/corpus-time-graph" -import "@/components/corpus_chooser/info-box" -import "@/components/corpus_chooser/tree" +import "@/components/corpus-chooser/corpus-time-graph" +import "@/components/corpus-chooser/info-box" +import "@/components/corpus-chooser/tree" import { RootScope } from "@/root-scope.types" import { LocationService } from "@/urlparams" import { CorpusTransformed } from "@/settings/config-transformed.types" diff --git a/app/scripts/components/corpus_chooser/corpus-time-graph.ts b/app/scripts/components/corpus-chooser/corpus-time-graph.ts similarity index 100% rename from app/scripts/components/corpus_chooser/corpus-time-graph.ts rename to app/scripts/components/corpus-chooser/corpus-time-graph.ts diff --git a/app/scripts/components/corpus_chooser/info-box.ts b/app/scripts/components/corpus-chooser/info-box.ts similarity index 100% rename from app/scripts/components/corpus_chooser/info-box.ts rename to app/scripts/components/corpus-chooser/info-box.ts diff --git a/app/scripts/components/corpus_chooser/tree.ts b/app/scripts/components/corpus-chooser/tree.ts similarity index 100% rename from app/scripts/components/corpus_chooser/tree.ts rename to app/scripts/components/corpus-chooser/tree.ts diff --git a/app/scripts/components/corpus_chooser/util.ts b/app/scripts/components/corpus-chooser/util.ts similarity index 100% rename from app/scripts/components/corpus_chooser/util.ts rename to app/scripts/components/corpus-chooser/util.ts diff --git a/app/scripts/components/header.js b/app/scripts/components/header.js index e6bf10a5..2b90c325 100644 --- a/app/scripts/components/header.js +++ b/app/scripts/components/header.js @@ -10,7 +10,7 @@ import settings from "@/settings" import currentMode from "@/mode" import { collatorSort, html } from "@/util" import "@/services/utils" -import "@/components/corpus_chooser/corpus-chooser" +import "@/components/corpus-chooser/corpus-chooser" import "@/components/radio-list" angular.module("korpApp").component("header", { diff --git a/app/scripts/data_init.ts b/app/scripts/data_init.ts index 5be261b8..ed205a9a 100644 --- a/app/scripts/data_init.ts +++ b/app/scripts/data_init.ts @@ -4,7 +4,7 @@ import memoize from "lodash/memoize" import settings, { setDefaultConfigValues } from "@/settings" import currentMode from "@/mode" import timeProxyFactory from "@/backend/time-proxy" -import * as treeUtil from "./components/corpus_chooser/util" +import { getAllCorporaInFolders } from "./components/corpus-chooser/util" import { CorpusListing } from "./corpus_listing" import { ParallelCorpusListing } from "./parallel/corpus_listing" import { fromKeys, getUrlHash, httpConfAddMethodFetch } from "@/util" @@ -207,7 +207,7 @@ function setInitialCorpora(): void { let expandedCorpora: string[] = [] for (let preItem of settings.preselected_corpora) { preItem = preItem.replace(/^__/g, "") - expandedCorpora.push(...treeUtil.getAllCorporaInFolders(settings.folders, preItem)) + expandedCorpora.push(...getAllCorporaInFolders(settings.folders, preItem)) } // folders expanded, save settings.preselected_corpora = expandedCorpora @@ -216,7 +216,7 @@ function setInitialCorpora(): void { const corpusParam = getUrlHash("corpus") const currentCorpora = corpusParam - ? _.flatten(_.map(corpusParam.split(","), (val) => treeUtil.getAllCorporaInFolders(settings.folders, val))) + ? _.flatten(_.map(corpusParam.split(","), (val) => getAllCorporaInFolders(settings.folders, val))) : settings.preselected_corpora settings.corpusListing.select(currentCorpora)