remove some unused code

Signed-off-by: Steve Cassidy <steve.cassidy@mq.edu.au>
FAIMS · Nov 2, 2023 · 4146e31 · 4146e31
1 parent 362f9ab
commit 4146e31
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 84 deletions.
diff --git a/src/couchdb/index.ts b/src/couchdb/index.ts
@@ -25,7 +25,7 @@ import {
   COUCHDB_INTERNAL_URL,
   LOCAL_COUCHDB_AUTH,
 } from '../buildconfig';
-import {ProjectID} from '../datamodel/core';
+import {ProjectID} from 'faims3-datamodel';
 import {ProjectObject} from '../datamodel/database';
 import {
   initialiseDirectoryDB,

diff --git a/src/couchdb/notebooks.ts b/src/couchdb/notebooks.ts
@@ -26,7 +26,7 @@ import {
   getProjectsDB,
 } from '.';
 import {CLUSTER_ADMIN_GROUP_NAME} from '../buildconfig';
-import {ProjectID, resolve_project_id} from '../datamodel/core';
+import {ProjectID, resolve_project_id} from 'faims3-datamodel';
 import {
   ProjectMetadata,
   ProjectObject,

diff --git a/src/couchdb/users.ts b/src/couchdb/users.ts
@@ -22,7 +22,7 @@
 import {ProjectRole} from 'faims3-datamodel/build/src/types';
 import {getUsersDB} from '.';
 import {CLUSTER_ADMIN_GROUP_NAME} from '../buildconfig';
-import {NonUniqueProjectID, ProjectID} from '../datamodel/core';
+import {NonUniqueProjectID, ProjectID} from 'faims3-datamodel';
 import {
   AllProjectRoles,
   ConductorRole,

diff --git a/src/datamodel/core.ts b/src/datamodel/core.ts
diff --git a/src/datamodel/database.ts b/src/datamodel/database.ts
@@ -25,7 +25,7 @@ import {
   AttributeValuePairID,
   ProjectID,
   ListingID,
-} from './core';
+} from 'faims3-datamodel';
 
 export const UI_SPECIFICATION_NAME = 'ui-specification';
 export const PROJECT_SPECIFICATION_PREFIX = 'project-specification';
@@ -260,7 +260,3 @@ export interface ProjectUIModel {
  * discriminated by the prefix of the object's id
  */
 export type ProjectDataObject = AttributeValuePair | Revision | EncodedRecord;
-
-export function isRecord(doc: ProjectDataObject): doc is EncodedRecord {
-  return (<EncodedRecord>doc).record_format_version !== undefined;
-}
diff --git a/src/routes.ts b/src/routes.ts
@@ -22,7 +22,7 @@ import handlebars from 'handlebars';
 import {body, validationResult} from 'express-validator';
 import QRCode from 'qrcode';
 import {app} from './core';
-import {NonUniqueProjectID} from './datamodel/core';
+import {NonUniqueProjectID} from 'faims3-datamodel';
 import {AllProjectRoles} from './datamodel/users';
 
 // BBS 20221101 Adding this as a proxy for the pouch db url

diff --git a/src/types.ts b/src/types.ts
@@ -25,7 +25,7 @@ import type {
   OtherRoles,
   UserServiceProfiles,
 } from './datamodel/users';
-import type {NonUniqueProjectID} from './datamodel/core';
+import type {NonUniqueProjectID} from 'faims3-datamodel';
 
 export type DoneFunction = (err?: Error | null, profile?: any) => void;
 export type UserProfileCallback = (