Merge pull request #1154 from owid/move-suggested-chart-revision-types

owid · Feb 14, 2022 · 67011d7 · 67011d7
2 parents 0ce5926 + 19761bb
commit 67011d7
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 19 deletions.
diff --git a/adminSiteClient/SuggestedChartRevision.ts b/adminSiteClient/SuggestedChartRevision.ts
@@ -1,11 +1,5 @@
 import { GrapherInterface } from "../grapher/core/GrapherInterface"
-
-export enum SuggestedChartRevisionStatus {
-    pending = "pending",
-    approved = "approved",
-    rejected = "rejected",
-    flagged = "flagged",
-}
+import { SuggestedChartRevisionStatus } from "../clientUtils/owidTypes"
 
 export interface SuggestedChartRevisionSerialized {
     id: number

diff --git a/adminSiteClient/SuggestedChartRevisionApproverPage.tsx b/adminSiteClient/SuggestedChartRevisionApproverPage.tsx
@@ -8,7 +8,10 @@ import Select from "react-select"
 import classNames from "classnames"
 import { Bounds } from "../clientUtils/Bounds"
 import { getStylesForTargetHeight } from "../clientUtils/react-select"
-import { SortOrder } from "../clientUtils/owidTypes"
+import {
+    SortOrder,
+    SuggestedChartRevisionStatus,
+} from "../clientUtils/owidTypes"
 import { Grapher } from "../grapher/core/Grapher"
 import { TextAreaField, NumberField, RadioGroup, Toggle } from "./Forms"
 import { PostReference } from "./ChartEditor"
@@ -32,10 +35,7 @@ import {
     VisionDeficiencyDropdown,
     VisionDeficiencyEntity,
 } from "./VisionDeficiencies"
-import {
-    SuggestedChartRevisionSerialized,
-    SuggestedChartRevisionStatus,
-} from "./SuggestedChartRevision"
+import { SuggestedChartRevisionSerialized } from "./SuggestedChartRevision"
 
 @observer
 export class SuggestedChartRevisionApproverPage extends React.Component<{

diff --git a/adminSiteClient/SuggestedChartRevisionList.tsx b/adminSiteClient/SuggestedChartRevisionList.tsx
@@ -12,7 +12,7 @@ import { AdminAppContext, AdminAppContextType } from "./AdminAppContext"
 import { BAKED_GRAPHER_URL } from "../settings/clientSettings"
 import { ChartListItem } from "./ChartList"
 import { Link } from "./Link"
-import { SuggestedChartRevisionStatus } from "./SuggestedChartRevision"
+import { SuggestedChartRevisionStatus } from "../clientUtils/owidTypes"
 
 export interface SuggestedChartRevisionListItem {
     id: number

diff --git a/adminSiteServer/apiRouter.ts b/adminSiteServer/apiRouter.ts
@@ -22,7 +22,7 @@ import {
     GrapherInterface,
     grapherKeysToSerialize,
 } from "../grapher/core/GrapherInterface"
-import { SuggestedChartRevisionStatus } from "../adminSiteClient/SuggestedChartRevision"
+import { SuggestedChartRevisionStatus } from "../clientUtils/owidTypes"
 import {
     VariableAnnotationsResponse,
     VariableAnnotationPatch,

diff --git a/baker/tsconfig.json b/baker/tsconfig.json
@@ -10,6 +10,7 @@
         { "path": "../db" },
         { "path": "../settings" },
         { "path": "../clientUtils" },
-        { "path": "../serverUtils" }
+        { "path": "../serverUtils" },
+        { "path": "../gitCms" }
     ]
 }
diff --git a/clientUtils/owidTypes.ts b/clientUtils/owidTypes.ts
@@ -265,6 +265,13 @@ export interface FullPost {
     glossary: boolean
 }
 
+export enum SuggestedChartRevisionStatus {
+    pending = "pending",
+    approved = "approved",
+    rejected = "rejected",
+    flagged = "flagged",
+}
+
 // Exception format that can be easily given as an API error
 export class JsonError extends Error {
     status: number

diff --git a/db/model/SuggestedChartRevision.ts b/db/model/SuggestedChartRevision.ts
@@ -1,6 +1,6 @@
 import { Entity, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm"
 
-import { SuggestedChartRevisionStatus } from "../../adminSiteClient/SuggestedChartRevision"
+import { SuggestedChartRevisionStatus } from "../../clientUtils/owidTypes"
 
 @Entity("suggested_chart_revisions")
 export class SuggestedChartRevision extends BaseEntity {

diff --git a/db/tsconfig.json b/db/tsconfig.json
@@ -7,7 +7,7 @@
     },
     "references": [
         { "path": "../clientUtils" },
-        { "path": "../adminSiteClient" },
-        { "path": "../settings" }
+        { "path": "../settings" },
+        { "path": "../grapher" }
     ]
 }
diff --git a/devTools/project-dependencies.md b/devTools/project-dependencies.md
@@ -39,14 +39,15 @@ graph TD;
     baker --> clientUtils;
     baker --> db;
     baker --> explorerAdminServer;
+    baker --> gitCms;
     baker --> serverUtils;
     baker --> settings;
     baker --> site;
 
     coreTable --> clientUtils;
 
-    db --> adminSiteClient;
     db --> clientUtils;
+    db --> grapher;
     db --> settings;
 
     explorer --> clientUtils;