wip: rename all dbtypes refrences to point to types index, rename calculations imports

This commit is contained in:
ShootingStar91
2024-12-08 13:29:41 +02:00
parent d9259e5ed3
commit 45a4ec39bf
50 changed files with 50 additions and 51 deletions
@@ -1,4 +1,4 @@
import type { CrossSearch } from '../../../../frontend/src/shared/types/dbTypes'
import type { CrossSearch } from '../../../../frontend/src/shared/types'
import { beforeAll, afterAll, describe, it, expect } from '@jest/globals'
import { resetDatabase, send, resetDatabaseTimeout, login, logout } from '../utils'
import { pool } from '../../utils/db'
@@ -1,5 +1,5 @@
import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals'
import { LocalityDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { LocalityDetailsType } from '../../../../frontend/src/shared/types'
import { editedLocality, newLocalityBasis } from './data'
import { login, resetDatabase, send, resetDatabaseTimeout } from '../utils'
import { pool } from '../../utils/db'
@@ -1,5 +1,5 @@
import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals'
import { LocalityDetailsType, SpeciesDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { LocalityDetailsType, SpeciesDetailsType } from '../../../../frontend/src/shared/types'
import { LogRow } from '../../services/write/writeOperations/types'
import { newLocalityBasis } from './data'
import { login, logout, resetDatabase, send, testLogRows, resetDatabaseTimeout, noPermError } from '../utils'
+1 -1
View File
@@ -1,4 +1,4 @@
import { Reference, SpeciesDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { Reference, SpeciesDetailsType } from '../../../../frontend/src/shared/types'
export const newLocalityBasis = {
bfa_max: 'bahean',
@@ -1,5 +1,5 @@
import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals'
import { LocalityDetailsType, SpeciesDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { LocalityDetailsType, SpeciesDetailsType } from '../../../../frontend/src/shared/types'
import { LogRow } from '../../services/write/writeOperations/types'
import { editedLocality } from './data'
import { login, resetDatabase, send, testLogRows, resetDatabaseTimeout } from '../utils'
@@ -1,5 +1,5 @@
import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals'
import { ReferenceDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { ReferenceDetailsType } from '../../../../frontend/src/shared/types'
//import { LogRow } from '../../services/write/writeOperations/types'
import { newReferenceBasis, emptyReferenceBasis } from './data'
import { login, logout, resetDatabase, send, /*testLogRows,*/ resetDatabaseTimeout, noPermError } from '../utils'
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, /*EditMetaData, Reference,*/ ReferenceDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { EditDataType, /*EditMetaData, Reference,*/ ReferenceDetailsType } from '../../../../frontend/src/shared/types'
/*
"ref_type_id": 1, "ref_type": "Journal"'
@@ -1,7 +1,7 @@
import { afterAll, beforeAll, beforeEach, describe, expect, it } from '@jest/globals'
import { pool } from '../../utils/db'
import { login, logout, resetDatabase, resetDatabaseTimeout, send } from '../utils'
import { ReferenceDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { ReferenceDetailsType } from '../../../../frontend/src/shared/types'
import Prisma from '../../../prisma/generated/now_test_client'
import { newReferenceBasis } from './data'
+1 -1
View File
@@ -1,5 +1,5 @@
import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals'
import { LocalityDetailsType, SpeciesDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { LocalityDetailsType, SpeciesDetailsType } from '../../../../frontend/src/shared/types'
import { LogRow } from '../../services/write/writeOperations/types'
import { newSpeciesBasis, newSpeciesWithoutRequiredFields } from './data'
import { login, logout, resetDatabase, send, testLogRows, resetDatabaseTimeout, noPermError } from '../utils'
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, EditMetaData, Reference, SpeciesDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { EditDataType, EditMetaData, Reference, SpeciesDetailsType } from '../../../../frontend/src/shared/types'
export const newSpeciesBasis: EditDataType<SpeciesDetailsType> = {
class_name: 'Mammalia',
+1 -1
View File
@@ -1,5 +1,5 @@
import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals'
import { EditMetaData, SpeciesDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { EditMetaData, SpeciesDetailsType } from '../../../../frontend/src/shared/types'
import { LogRow } from '../../services/write/writeOperations/types'
import { login, resetDatabase, send, testLogRows, resetDatabaseTimeout } from '../utils'
import { editedSpecies } from './data'
@@ -2,7 +2,7 @@ import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/glo
import { LogRow } from '../../services/write/writeOperations/types'
import { login, logout, resetDatabase, send, testLogRows, resetDatabaseTimeout, noPermError } from '../utils'
import { newTimeBoundBasis } from './data'
import { TimeBoundDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { TimeBoundDetailsType } from '../../../../frontend/src/shared/types'
import { pool } from '../../utils/db'
let createdTimeBound: TimeBoundDetailsType | null = null
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, EditMetaData, Reference, TimeBoundDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { EditDataType, EditMetaData, Reference, TimeBoundDetailsType } from '../../../../frontend/src/shared/types'
export const newTimeBoundBasis: EditDataType<TimeBoundDetailsType & EditMetaData> = {
b_name: 'C2N-y',
@@ -1,7 +1,7 @@
import { describe, it, beforeAll, afterAll, beforeEach, expect } from '@jest/globals'
import { editedTimeBound, newTimeBoundBasis } from './data'
import { send, resetDatabase, login, resetDatabaseTimeout, testLogRows } from '../utils'
import { TimeBoundDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { TimeBoundDetailsType } from '../../../../frontend/src/shared/types'
import { LogRow } from '../../services/write/writeOperations/types'
import { pool } from '../../utils/db'
@@ -1,5 +1,5 @@
import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals'
import { TimeUnitDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { TimeUnitDetailsType } from '../../../../frontend/src/shared/types'
import { LogRow } from '../../services/write/writeOperations/types'
import { login, logout, resetDatabase, send, testLogRows, resetDatabaseTimeout, noPermError } from '../utils'
import { newTimeUnitBasis } from './data'
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, EditMetaData, Reference, TimeUnitDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { EditDataType, EditMetaData, Reference, TimeUnitDetailsType } from '../../../../frontend/src/shared/types'
export const newTimeUnitBasis: EditDataType<TimeUnitDetailsType & EditMetaData> = {
tu_display_name: 'Bahean Test',
@@ -1,5 +1,5 @@
import { describe, it, beforeEach, beforeAll, afterAll, expect } from '@jest/globals'
import { TimeUnitDetailsType, EditDataType, EditMetaData } from '../../../../frontend/src/shared/types/dbTypes'
import { TimeUnitDetailsType, EditDataType, EditMetaData } from '../../../../frontend/src/shared/types'
import { login, resetDatabase, send, resetDatabaseTimeout, testLogRows } from '../utils'
import { editedTimeUnit, newTimeUnitBasis, conflictingTimeUnit } from './data'
import { pool } from '../../utils/db'
+1 -1
View File
@@ -1,7 +1,7 @@
import request from 'supertest'
import app from '../app'
import { expect } from '@jest/globals'
import { UpdateLog } from '../../../frontend/src/shared/types/dbTypes'
import { UpdateLog } from '../../../frontend/src/shared/types'
import { LogRow } from '../services/write/writeOperations/types'
let token: string | null = null
+1 -1
View File
@@ -2,7 +2,7 @@ import { Middleware } from '../types'
import { SECRET } from '../utils/config'
import jwt, { Secret, TokenExpiredError } from 'jsonwebtoken'
import { nowDb } from '../utils/db'
import { User } from '../../../frontend/src/shared/types/dbTypes'
import { User } from '../../../frontend/src/shared/types'
import { Role } from '../../../frontend/src/shared/types'
/*
+1 -1
View File
@@ -1,7 +1,7 @@
import { Request, Router } from 'express'
import { getAllLocalities, getLocalityDetails, validateEntireLocality } from '../services/locality'
import { fixBigInt } from '../utils/common'
import { EditDataType, EditMetaData, LocalityDetailsType } from '../../../frontend/src/shared/types/dbTypes'
import { EditDataType, EditMetaData, LocalityDetailsType } from '../../../frontend/src/shared/types'
import { requireOneOf } from '../middlewares/authorizer'
import { Role } from '../../../frontend/src/shared/types'
import { deleteLocality, writeLocality } from '../services/write/locality'
+1 -1
View File
@@ -11,7 +11,7 @@ import {
} from '../services/reference'
import { requireOneOf } from '../middlewares/authorizer'
import { Role } from '../../../frontend/src/shared/types'
import { EditMetaData, ReferenceDetailsType, EditDataType } from '../../../frontend/src/shared/types/dbTypes'
import { EditMetaData, ReferenceDetailsType, EditDataType } from '../../../frontend/src/shared/types'
import { deleteReference, writeReference } from '../services/write/reference'
const router = Router()
+1 -1
View File
@@ -1,7 +1,7 @@
import { Request, Router } from 'express'
import { getAllSpecies, getSpeciesDetails, validateEntireSpecies } from '../services/species'
import { fixBigInt } from '../utils/common'
import { EditMetaData, SpeciesDetailsType } from '../../../frontend/src/shared/types/dbTypes'
import { EditMetaData, SpeciesDetailsType } from '../../../frontend/src/shared/types'
import { deleteSpecies, writeSpecies } from '../services/write/species'
import { requireOneOf } from '../middlewares/authorizer'
import { Role } from '../../../frontend/src/shared/types'
+1 -1
View File
@@ -1,5 +1,5 @@
import { Request, Router } from 'express'
import { EditDataType, EditMetaData, TimeBoundDetailsType } from '../../../frontend/src/shared/types/dbTypes'
import { EditDataType, EditMetaData, TimeBoundDetailsType } from '../../../frontend/src/shared/types'
import { Role } from '../../../frontend/src/shared/types'
import { requireOneOf } from '../middlewares/authorizer'
import {
+1 -1
View File
@@ -1,5 +1,5 @@
import { Request, Router } from 'express'
import { EditDataType, EditMetaData, TimeUnitDetailsType } from '../../../frontend/src/shared/types/dbTypes'
import { EditDataType, EditMetaData, TimeUnitDetailsType } from '../../../frontend/src/shared/types'
import { Role } from '../../../frontend/src/shared/types'
import { requireOneOf } from '../middlewares/authorizer'
import { getAllSequences } from '../services/sequence'
+1 -1
View File
@@ -1,4 +1,4 @@
import { User, CrossSearch } from '../../../frontend/src/shared/types/dbTypes'
import { User, CrossSearch } from '../../../frontend/src/shared/types'
import { Role } from '../../../frontend/src/shared/types'
import { nowDb } from '../utils/db'
import {
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, LocalityDetailsType, User } from '../../../frontend/src/shared/types/dbTypes'
import { EditDataType, LocalityDetailsType, User } from '../../../frontend/src/shared/types'
import { Role } from '../../../frontend/src/shared/types'
import { validateLocality } from '../../../frontend/src/shared/validators/locality'
import { ValidationObject } from '../../../frontend/src/shared/validators/validator'
@@ -1,5 +1,5 @@
import { PoolConnection } from 'mariadb'
import { User } from '../../../frontend/src/shared/types/dbTypes'
import { User } from '../../../frontend/src/shared/types'
import { NOW_DB_NAME } from '../utils/config'
import { Role } from '../../../frontend/src/shared/types'
import { pool } from '../utils/db'
+1 -1
View File
@@ -1,5 +1,5 @@
import { nowDb } from '../utils/db'
import { EditDataType, ReferenceDetailsType } from '../../../frontend/src/shared/types/dbTypes'
import { EditDataType, ReferenceDetailsType } from '../../../frontend/src/shared/types'
import { ValidationObject } from '../../../frontend/src/shared/validators/validator'
import { validateReference } from '../../../frontend/src/shared/validators/reference'
import Prisma from '../../prisma/generated/now_test_client'
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, SpeciesDetailsType } from '../../../frontend/src/shared/types/dbTypes'
import { EditDataType, SpeciesDetailsType } from '../../../frontend/src/shared/types'
import { validateSpecies } from '../../../frontend/src/shared/validators/species'
import { ValidationObject } from '../../../frontend/src/shared/validators/validator'
import Prisma from '../../prisma/generated/now_test_client'
+1 -1
View File
@@ -1,6 +1,6 @@
import { logDb, nowDb } from '../utils/db'
import { validateTimeBound } from '../../../frontend/src/shared/validators/timeBound'
import { TimeBoundDetailsType, EditDataType } from '../../../frontend/src/shared/types/dbTypes'
import { TimeBoundDetailsType, EditDataType } from '../../../frontend/src/shared/types'
import Prisma from '../../prisma/generated/now_test_client'
import { ValidationObject } from '../../../frontend/src/shared/validators/validator'
+1 -1
View File
@@ -1,5 +1,5 @@
import { logDb, nowDb } from '../utils/db'
import { EditDataType, TimeUnitDetailsType } from '../../../frontend/src/shared/types/dbTypes'
import { EditDataType, TimeUnitDetailsType } from '../../../frontend/src/shared/types'
import { ValidationObject } from '../../../frontend/src/shared/validators/validator'
import { validateTimeUnit } from '../../../frontend/src/shared/validators/timeUnit'
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, FixBigInt, ReferenceAuthorType } from '../../../../frontend/src/shared/types/dbTypes'
import { EditDataType, FixBigInt, ReferenceAuthorType } from '../../../../frontend/src/shared/types'
import { getFieldsOfTables, nowDb } from '../../utils/db'
import { filterAllowedKeys } from './writeOperations/utils'
import Prisma from '../../../prisma/generated/now_test_client'
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, FixBigInt, ReferenceJournalType } from '../../../../frontend/src/shared/types/dbTypes'
import { EditDataType, FixBigInt, ReferenceJournalType } from '../../../../frontend/src/shared/types'
import { getFieldsOfTables, nowDb } from '../../utils/db'
import { filterAllowedKeys } from './writeOperations/utils'
import Prisma from '../../../prisma/generated/now_test_client'
+2 -2
View File
@@ -1,8 +1,8 @@
import { EditDataType, LocalityDetailsType, Reference, User } from '../../../../frontend/src/shared/types/dbTypes'
import { EditDataType, LocalityDetailsType, Reference, User } from '../../../../frontend/src/shared/types'
import { NOW_DB_NAME } from '../../utils/config'
import { WriteHandler } from './writeOperations/writeHandler'
import { getFieldsOfTables } from '../../utils/db'
import { getHomininSkeletalRemains } from '../../../../frontend/src/shared/types'
import { getHomininSkeletalRemains } from '../../../../frontend/src/shared/calculations'
import { getLocalityDetails, filterDuplicateLocalitySpecies } from '../locality'
import { ActionType } from './writeOperations/types'
import { makeListRemoved, fixRadioSelection } from './writeOperations/utils'
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, FixBigInt, ReferenceDetailsType } from '../../../../frontend/src/shared/types/dbTypes'
import { EditDataType, FixBigInt, ReferenceDetailsType } from '../../../../frontend/src/shared/types'
import { getFieldsOfTables, nowDb } from '../../utils/db'
import { getReferenceDetails } from '../reference'
import { filterAllowedKeys, convertToPrismaDate } from './writeOperations/utils'
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, FixBigInt, Reference, SpeciesDetailsType, User } from '../../../../frontend/src/shared/types/dbTypes'
import { EditDataType, FixBigInt, Reference, SpeciesDetailsType, User } from '../../../../frontend/src/shared/types'
import { NOW_DB_NAME } from '../../utils/config'
import { WriteHandler } from './writeOperations/writeHandler'
import { getFieldsOfTables } from '../../utils/db'
+1 -1
View File
@@ -5,7 +5,7 @@ import {
LocalityDetailsType,
TimeUnitDetailsType,
User,
} from '../../../../frontend/src/shared/types/dbTypes'
} from '../../../../frontend/src/shared/types'
import { NOW_DB_NAME } from '../../utils/config'
import { WriteHandler } from './writeOperations/writeHandler'
import { getFieldsOfTables } from '../../utils/db'
+1 -1
View File
@@ -4,7 +4,7 @@ import {
TimeUnitDetailsType,
LocalityDetailsType,
User,
} from '../../../../frontend/src/shared/types/dbTypes'
} from '../../../../frontend/src/shared/types'
import { NOW_DB_NAME } from '../../utils/config'
import { WriteHandler } from './writeOperations/writeHandler'
import { getFieldsOfTables } from '../../utils/db'
@@ -1,4 +1,4 @@
import { Reference } from '../../../../../../frontend/src/shared/types/dbTypes'
import { Reference } from '../../../../../../frontend/src/shared/types'
import { COORDINATOR } from '../../../../utils/config'
import { AllowedTables, ActionType, Item, LogRow, PrimaryTables, WriteItem, UpdateEntry } from '../types'
import { WriteHandler } from '../writeHandler'
@@ -1,4 +1,4 @@
import { Reference } from '../../../../../../frontend/src/shared/types/dbTypes'
import { Reference } from '../../../../../../frontend/src/shared/types'
import { LOG_DB_NAME } from '../../../../utils/config'
import { LogRow, ActionType, AllowedTables, UpdateEntry } from '../types'
import { WriteHandler } from '../writeHandler'
@@ -1,4 +1,4 @@
import { Editable } from '../../../../../frontend/src/shared/types/dbTypes'
import { Editable } from '../../../../../frontend/src/shared/types'
import { DbWriteItem } from './databaseHandler'
import { DbValue } from './types'
@@ -1,4 +1,4 @@
import { Reference, RowState } from '../../../../../frontend/src/shared/types/dbTypes'
import { Reference, RowState } from '../../../../../frontend/src/shared/types'
import { logger } from '../../../utils/logger'
import { logAllUpdates } from './updateLogger/prepareUpdates'
import { DatabaseHandler, DbWriteItem } from './databaseHandler'
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, TimeUnitDetailsType, TimeBoundDetailsType } from '../../../frontend/src/shared/types/dbTypes'
import { EditDataType, TimeUnitDetailsType, TimeBoundDetailsType } from '../../../frontend/src/shared/types'
import { nowDb } from './db'
import { calculateLocalityMaxAge, calculateLocalityMinAge } from './ageCalculator'
+1 -1
View File
@@ -1,5 +1,5 @@
import { MRT_ColumnDef } from 'material-react-table'
import { Reference } from './shared/types/dbTypes'
import { Reference } from './shared/types'
import { Cell } from './components/commonComponents'
export const formatLastLoginDate = (date: Date) => {
@@ -2,7 +2,7 @@ import { LocalityDetailsType } from '@/shared/types'
import { emptyOption } from '@/components/DetailView/common/misc'
import { ArrayFrame } from '@/components/DetailView/common/tabLayoutHelpers'
import { useDetailContext } from '@/components/DetailView/Context/DetailContext'
import { getHomininSkeletalRemains } from '@/types'
import { getHomininSkeletalRemains } from '@/shared/calculations'
export const ArchaeologyTab = () => {
const { dropdown, radioSelection, data } = useDetailContext<LocalityDetailsType>()
@@ -1,7 +1,7 @@
import { LocalityDetailsType } from '@/shared/types'
import { ArrayFrame } from '../../DetailView/common/tabLayoutHelpers'
import { useDetailContext } from '@/components/DetailView/Context/DetailContext'
import { calculateMeanHypsodonty } from '@/types'
import { calculateMeanHypsodonty } from '@/shared/calculations'
export const EcometricsTab = () => {
const { textField, data } = useDetailContext<LocalityDetailsType>()
-1
View File
@@ -1,4 +1,3 @@
export * from './misc';
export * from './dbTypes';
export * from './util';
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, ReferenceDetailsType, ReferenceAuthorType, ReferenceJournalType } from '../types/dbTypes'
import { EditDataType, ReferenceDetailsType, ReferenceAuthorType, ReferenceJournalType } from '../types'
import { Validators, validator, ValidationError } from './validator'
const authorCheck: (data: ReferenceAuthorType[]) => ValidationError = (data: ReferenceAuthorType[]) => {
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, SpeciesDetailsType } from '../types/dbTypes'
import { EditDataType, SpeciesDetailsType } from '../types'
import { Validators, validator } from './validator'
export const validateSpecies = (
+1 -1
View File
@@ -1,4 +1,4 @@
import { EditDataType, TimeBoundDetailsType } from '../types/dbTypes'
import { EditDataType, TimeBoundDetailsType } from '../types'
import { Validators, validator } from './validator'
export const validateTimeBound = (