Move some files around

Author: odarbelaeze

src/components/tree/Tree.tsx

@@ -4,10 +4,10 @@ import sortBy from "lodash.sortby";
 import StarImgage from "../vectors/StarImage";
 
 import Reference from "./Reference";
+import { mostCommon } from "../../utils/arrays";
 import { Article } from "../../utils/customTypes";
 
 import "./Tree.css";
-import { mostCommon } from "../../utils/isiUtils";
 
 interface Props {
   data: { [section: string]: Article[] };

src/components/upload/FileCard.tsx

@@ -3,7 +3,7 @@ import React, { FC } from "react";
 import CancelFile from "../vectors/CancelFile";
 import MoveFirstIcon from "../vectors/MoveFirstIcon";
 
-import { round } from "../../utils/mathUtils";
+import { round } from "../../utils/math";
 import { MAX_SIZE } from "../../utils/computeQuantities";
 
 import "./FileCard.css";

src/components/upload/FileDropper.tsx

@@ -2,8 +2,8 @@ import React, { FC, useCallback } from "react";
 import { useDropzone } from "react-dropzone";
 import "./FileDropper.css";
 
-import { looksLikeIsi } from "../../utils/isiUtils";
-import { looksLikeScopus } from "../../utils/scopusUtils";
+import { looksLikeIsi } from "../../utils/isi";
+import { looksLikeScopus } from "../../utils/scopus";
 import useUpload from "../../hooks/useUpload";
 import useError from "../../hooks/useError";
 

src/components/upload/Home.tsx

@@ -11,7 +11,7 @@ import useFiles from "../../hooks/useFiles";
 import FirebaseContext from "../../context/FirebaseContext";
 
 import computeQuantities, { MAX_SIZE } from "../../utils/computeQuantities";
-import { round } from "../../utils/mathUtils";
+import { round } from "../../utils/math";
 
 import "./Home.css";
 

src/components/upload/UploadIndicator.tsx

@@ -1,11 +1,12 @@
 import React, { FC, useContext, useEffect, useState } from "react";
-import "./UploadIndicator.css";
 
 import FileCard from "./FileCard";
 import FileContext from "../../context/FileContext";
 import useFiles from "../../hooks/useFiles";
 import { MAX_SIZE } from "../../utils/computeQuantities";
 
+import "./UploadIndicator.css";
+
 interface Props {}
 
 const UploadIndicator: FC<Props> = () => {

src/utils/arrays.ts

@@ -0,0 +1,12 @@
+const mostCommon = (keywordsList: string[], max: number): string[] => {
+  let count: { [keyword: string]: number } = {};
+  for (let keyword of keywordsList) {
+    count[keyword] = (count[keyword] ? count[keyword] : 0) + 1;
+  }
+  const sortCount = Object.entries(count).sort((first, second) =>
+    first[1] < second[1] ? 1 : -1
+  );
+  return sortCount.slice(0, max).map((item) => item[0]);
+};
+
+export { mostCommon };

src/utils/isiUtils.tsx renamed to src/utils/isi.ts

@@ -30,22 +30,6 @@ const keywords = (text: string): string[] => {
     .flat();
 };
 
-function mostCommon(keywordsList: string[], max: number): string[] {
-  let count: { [keyword: string]: number } = {};
-  for (let keyword of keywordsList) {
-    count[keyword] = (count[keyword] ? count[keyword] : 0) + 1;
-  }
-  const sortCount = Object.entries(count).sort((first, second) =>
-    first[1] < second[1] ? 1 : -1
-  );
-  return sortCount.slice(0, max).map((item) => item[0]);
-}
-
-const mostCommonKeywords = (text: string, max: number = 3) => {
-  const keywordsList = keywords(text);
-  return mostCommon(keywordsList, max);
-};
-
 const countArticles = (text: string): number => {
   const identifier = "PT ";
   return text.split("\n").filter((line) => line.startsWith(identifier)).length;
@@ -60,12 +44,4 @@ const countReferences = (text: string): number => {
     .reduce((n, m) => n + m, 0);
 };
 
-export {
-  ISI_PATTERN,
-  looksLikeIsi,
-  keywords,
-  mostCommonKeywords,
-  mostCommon,
-  countArticles,
-  countReferences,
-};
+export { ISI_PATTERN, looksLikeIsi, keywords, countArticles, countReferences };

src/utils/mathUtils.ts renamed to src/utils/math.ts

@@ -1,6 +1,7 @@
 import { FileMetadata } from "./customTypes";
-import * as isi from "./isiUtils";
-import * as scopus from "./scopusUtils";
+import { mostCommon } from "./arrays";
+import * as isi from "./isi";
+import * as scopus from "./scopus";
 import md5 from "md5";
 
 const metadata = async (name: string, blob: Blob): Promise<FileMetadata> => {
@@ -12,7 +13,7 @@ const metadata = async (name: string, blob: Blob): Promise<FileMetadata> => {
       name,
       blob,
       hash,
-      keywords: isi.mostCommon(isi.keywords(content), 3),
+      keywords: mostCommon(isi.keywords(content), 3),
       articles: isi.countArticles(content),
       citations: isi.countReferences(content),
       valid: true,
@@ -24,7 +25,7 @@ const metadata = async (name: string, blob: Blob): Promise<FileMetadata> => {
       name,
       blob,
       hash,
-      keywords: isi.mostCommon(scopus.keywords(content), 3),
+      keywords: mostCommon(scopus.keywords(content), 3),
       articles: scopus.countArticles(content),
       citations: scopus.countReferences(content),
       valid: true,