From 38c0b477056dbeb179f043b60f72e82293bc836e Mon Sep 17 00:00:00 2001 From: ShootingStar91 Date: Mon, 25 Nov 2024 21:48:40 +0200 Subject: [PATCH] refactor: move shared code to frontend/src/shared --- backend/Dockerfile | 8 ++++---- backend/dev.Dockerfile | 2 +- backend/src/api-tests/crossSearch/get.test.ts | 2 +- backend/src/api-tests/locality/contradictory_loc.test.ts | 2 +- backend/src/api-tests/locality/create.test.ts | 2 +- backend/src/api-tests/locality/data.ts | 2 +- backend/src/api-tests/locality/update.test.ts | 2 +- backend/src/api-tests/reference/create.test.ts | 2 +- backend/src/api-tests/reference/data.ts | 2 +- backend/src/api-tests/reference/delete.test.ts | 2 +- backend/src/api-tests/species/create.test.ts | 2 +- backend/src/api-tests/species/data.ts | 2 +- backend/src/api-tests/species/update.test.ts | 2 +- backend/src/api-tests/timeBound/create.test.ts | 2 +- backend/src/api-tests/timeBound/data.ts | 2 +- backend/src/api-tests/timeBound/update.test.ts | 2 +- backend/src/api-tests/timeUnit/create.test.ts | 2 +- backend/src/api-tests/timeUnit/data.ts | 2 +- backend/src/api-tests/timeUnit/update.test.ts | 2 +- backend/src/api-tests/utils.ts | 2 +- backend/src/middlewares/authenticator.ts | 2 +- backend/src/routes/locality.ts | 2 +- backend/src/routes/reference.ts | 2 +- backend/src/routes/species.ts | 2 +- backend/src/routes/timeBound.ts | 2 +- backend/src/routes/timeUnit.ts | 2 +- backend/src/services/crossSearch.ts | 2 +- backend/src/services/locality.ts | 6 +++--- backend/src/services/localitySpeciesExport.ts | 2 +- backend/src/services/reference.ts | 6 +++--- backend/src/services/species.ts | 6 +++--- backend/src/services/timeBound.ts | 6 +++--- backend/src/services/timeUnit.ts | 6 +++--- backend/src/services/write/author.ts | 2 +- backend/src/services/write/journal.ts | 2 +- backend/src/services/write/locality.ts | 2 +- backend/src/services/write/reference.ts | 2 +- backend/src/services/write/species.ts | 2 +- backend/src/services/write/timeBound.ts | 2 +- backend/src/services/write/timeUnit.ts | 2 +- .../write/writeOperations/updateLogger/prepareUpdates.ts | 2 +- .../write/writeOperations/updateLogger/writeUpdates.ts | 2 +- backend/src/services/write/writeOperations/utils.ts | 2 +- .../src/services/write/writeOperations/writeHandler.ts | 2 +- backend/src/utils/cascadeHandler.ts | 2 +- documentation/components/frontend.md | 2 +- documentation/entities/reference.md | 2 +- .../functionality/put_requests_for_db_entries.md | 2 +- documentation/guides/creating_new_tableview.md | 2 +- frontend/src/common.tsx | 2 +- frontend/src/components/CrossSearch/CrossSearchTable.tsx | 2 +- .../src/components/DetailView/Context/DetailContext.tsx | 4 ++-- frontend/src/components/DetailView/DetailView.tsx | 4 ++-- frontend/src/components/DetailView/StagingView.tsx | 2 +- .../src/components/DetailView/common/EditableTable.tsx | 2 +- frontend/src/components/DetailView/common/EditingForm.tsx | 2 +- .../src/components/DetailView/common/SelectingTable.tsx | 2 +- frontend/src/components/DetailView/common/UpdateTab.tsx | 2 +- .../src/components/DetailView/common/defaultValues.ts | 2 +- .../components/DetailView/common/editingComponents.tsx | 2 +- .../src/components/DetailView/common/tabLayoutHelpers.tsx | 2 +- frontend/src/components/DetailView/components.tsx | 2 +- frontend/src/components/Locality/LocalityDetails.tsx | 4 ++-- frontend/src/components/Locality/LocalityTable.tsx | 2 +- frontend/src/components/Locality/Tabs/AgeTab.tsx | 2 +- frontend/src/components/Locality/Tabs/ArchaeologyTab.tsx | 2 +- frontend/src/components/Locality/Tabs/ClimateTab.tsx | 2 +- frontend/src/components/Locality/Tabs/EcometricsTab.tsx | 2 +- frontend/src/components/Locality/Tabs/LithologyTab.tsx | 2 +- frontend/src/components/Locality/Tabs/LocalityTab.tsx | 4 ++-- frontend/src/components/Locality/Tabs/MuseumTab.tsx | 2 +- frontend/src/components/Locality/Tabs/ProjectTab.tsx | 2 +- frontend/src/components/Locality/Tabs/SpeciesTab.tsx | 2 +- frontend/src/components/Locality/Tabs/TaphonomyTab.tsx | 2 +- frontend/src/components/Person/PersonDetails.tsx | 2 +- frontend/src/components/Person/PersonTable.tsx | 2 +- frontend/src/components/Person/Tabs/PersonTab.tsx | 2 +- frontend/src/components/Project/ProjectTable.tsx | 2 +- frontend/src/components/Project/Tabs/CoordinatorTab.tsx | 2 +- frontend/src/components/Reference/ReferenceDetails.tsx | 4 ++-- frontend/src/components/Reference/ReferenceTable.tsx | 2 +- frontend/src/components/Reference/Tabs/AuthorTab.tsx | 2 +- frontend/src/components/Reference/Tabs/JournalTab.tsx | 2 +- frontend/src/components/Reference/Tabs/ReferenceTab.tsx | 2 +- frontend/src/components/Region/RegionTable.tsx | 2 +- frontend/src/components/Region/Tabs/CoordinatorTab.tsx | 2 +- frontend/src/components/Sequence/SequenceTable.tsx | 2 +- frontend/src/components/Species/SpeciesDetails.tsx | 4 ++-- frontend/src/components/Species/SpeciesTable.tsx | 2 +- frontend/src/components/Species/Tabs/DietTab.tsx | 2 +- .../src/components/Species/Tabs/LocalitySpeciesTab.tsx | 2 +- frontend/src/components/Species/Tabs/LocalityTab.tsx | 2 +- frontend/src/components/Species/Tabs/LocomotionTab.tsx | 2 +- frontend/src/components/Species/Tabs/SizeTab.tsx | 2 +- frontend/src/components/Species/Tabs/SynonymTab.tsx | 2 +- frontend/src/components/Species/Tabs/TaxonomyTab.tsx | 2 +- frontend/src/components/Species/Tabs/TeethTab.tsx | 2 +- frontend/src/components/TimeBound/Tabs/BoundTab.tsx | 2 +- frontend/src/components/TimeBound/Tabs/TimeUnitTab.tsx | 2 +- frontend/src/components/TimeBound/TimeBoundDetails.tsx | 4 ++-- frontend/src/components/TimeBound/TimeBoundTable.tsx | 2 +- frontend/src/components/TimeUnit/Tabs/LocalityTab.tsx | 2 +- frontend/src/components/TimeUnit/Tabs/TimeUnitTab.tsx | 2 +- frontend/src/components/TimeUnit/TimeUnitDetails.tsx | 4 ++-- frontend/src/components/TimeUnit/TimeUnitTable.tsx | 2 +- frontend/src/components/pages.tsx | 2 +- frontend/src/redux/crossSearchReducer.ts | 2 +- frontend/src/redux/localityReducer.ts | 2 +- frontend/src/redux/museumReducer.ts | 2 +- frontend/src/redux/personReducer.ts | 2 +- frontend/src/redux/projectReducer.ts | 2 +- frontend/src/redux/referenceReducer.ts | 2 +- frontend/src/redux/regionReducer.ts | 2 +- frontend/src/redux/sedimentaryStructureReducer.ts | 2 +- frontend/src/redux/sequenceReducer.ts | 2 +- frontend/src/redux/speciesReducer.ts | 2 +- frontend/src/redux/timeBoundReducer.ts | 2 +- frontend/src/redux/timeUnitReducer.ts | 2 +- frontend/src/{backendTypes.d.ts => shared/types.d.ts} | 6 +++--- frontend/src/{ => shared}/validators/README.md | 0 frontend/src/{ => shared}/validators/calc.ts | 0 frontend/src/{ => shared}/validators/countryList.ts | 0 frontend/src/{ => shared}/validators/locality.ts | 2 +- frontend/src/{ => shared}/validators/reference.ts | 2 +- frontend/src/{ => shared}/validators/species.ts | 2 +- frontend/src/{ => shared}/validators/timeBound.ts | 2 +- frontend/src/{ => shared}/validators/timeUnit.ts | 2 +- frontend/src/{ => shared}/validators/validator.ts | 0 frontend/src/types.ts | 2 +- shared/types.d.ts | 0 130 files changed, 148 insertions(+), 148 deletions(-) rename frontend/src/{backendTypes.d.ts => shared/types.d.ts} (97%) rename frontend/src/{ => shared}/validators/README.md (100%) rename frontend/src/{ => shared}/validators/calc.ts (100%) rename frontend/src/{ => shared}/validators/countryList.ts (100%) rename frontend/src/{ => shared}/validators/locality.ts (98%) rename frontend/src/{ => shared}/validators/reference.ts (99%) rename frontend/src/{ => shared}/validators/species.ts (92%) rename frontend/src/{ => shared}/validators/timeBound.ts (89%) rename frontend/src/{ => shared}/validators/timeUnit.ts (96%) rename frontend/src/{ => shared}/validators/validator.ts (100%) delete mode 100644 shared/types.d.ts diff --git a/backend/Dockerfile b/backend/Dockerfile index 89cd8b8d..722fecbd 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -4,13 +4,13 @@ ENV TZ="Europe/Helsinki" RUN npm i -g npm WORKDIR /usr/src/app -RUN mkdir -p /usr/src/app/frontend/src/validators +RUN mkdir -p /usr/src/app/frontend/src/shared/validators USER node -COPY --chown=node frontend/src/backendTypes.d.ts /usr/src/app/frontend/src/backendTypes.d.ts +COPY --chown=node frontend/src/shared/types.d.ts /usr/src/app/frontend/src/shared/types.d.ts COPY --chown=node frontend/src/types.ts /usr/src/app/frontend/src/types.ts -COPY --chown=node frontend/src/validators /usr/src/app/frontend/src/validators +COPY --chown=node frontend/src/validators /usr/src/app/frontend/src/shared/validators COPY --chown=node backend/package.json backend/ COPY --chown=node backend/package-lock.json backend/ COPY --chown=node backend/prisma/schema.prisma backend @@ -41,7 +41,7 @@ RUN chown node:node /usr/src/app -R WORKDIR /usr/src/app USER node -COPY --from=backend-build --chown=node /usr/src/app/frontend/src/backendTypes.d.ts ../frontend/src/backendTypes.d.ts +COPY --from=backend-build --chown=node /usr/src/app/frontend/src/shared/types.d.ts ../frontend/src/shared/types.d.ts COPY --from=backend-build --chown=node /usr/src/app/frontend/src/types.ts ../frontend/src/types.ts COPY --from=backend-build --chown=node /usr/src/app/backend/build . COPY --from=backend-build --chown=node /usr/src/app/backend/node_modules ./backend/node_modules diff --git a/backend/dev.Dockerfile b/backend/dev.Dockerfile index 4112eed1..e5ad361f 100644 --- a/backend/dev.Dockerfile +++ b/backend/dev.Dockerfile @@ -8,7 +8,7 @@ RUN npm i -g npm USER node WORKDIR /usr/src/app -RUN mkdir -p /usr/src/app/frontend/src/validators +RUN mkdir -p /usr/src/app/frontend/src/shared/validators COPY --chown=node ./backend/package.json backend/ COPY --chown=node ./backend/package-lock.json backend/ diff --git a/backend/src/api-tests/crossSearch/get.test.ts b/backend/src/api-tests/crossSearch/get.test.ts index fb92d3d1..5fae6e26 100644 --- a/backend/src/api-tests/crossSearch/get.test.ts +++ b/backend/src/api-tests/crossSearch/get.test.ts @@ -1,4 +1,4 @@ -import type { CrossSearch } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/api-tests/locality/contradictory_loc.test.ts b/backend/src/api-tests/locality/contradictory_loc.test.ts index a21ba41c..af9024b2 100644 --- a/backend/src/api-tests/locality/contradictory_loc.test.ts +++ b/backend/src/api-tests/locality/contradictory_loc.test.ts @@ -1,5 +1,5 @@ import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals' -import { LocalityDetailsType } from '../../../../frontend/src/backendTypes' +import { LocalityDetailsType } from '../../../../frontend/src/shared/types' import { editedLocality, newLocalityBasis } from './data' import { login, resetDatabase, send, resetDatabaseTimeout } from '../utils' import { pool } from '../../utils/db' diff --git a/backend/src/api-tests/locality/create.test.ts b/backend/src/api-tests/locality/create.test.ts index a5669f20..06846728 100644 --- a/backend/src/api-tests/locality/create.test.ts +++ b/backend/src/api-tests/locality/create.test.ts @@ -1,5 +1,5 @@ import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals' -import { LocalityDetailsType, SpeciesDetailsType } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/api-tests/locality/data.ts b/backend/src/api-tests/locality/data.ts index 37c5a16f..1eb6e205 100644 --- a/backend/src/api-tests/locality/data.ts +++ b/backend/src/api-tests/locality/data.ts @@ -1,4 +1,4 @@ -import { Reference, SpeciesDetailsType } from '../../../../frontend/src/backendTypes' +import { Reference, SpeciesDetailsType } from '../../../../frontend/src/shared/types' export const newLocalityBasis = { bfa_max: 'bahean', diff --git a/backend/src/api-tests/locality/update.test.ts b/backend/src/api-tests/locality/update.test.ts index 8ed1e96f..fdf23545 100644 --- a/backend/src/api-tests/locality/update.test.ts +++ b/backend/src/api-tests/locality/update.test.ts @@ -1,5 +1,5 @@ import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals' -import { LocalityDetailsType, SpeciesDetailsType } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/api-tests/reference/create.test.ts b/backend/src/api-tests/reference/create.test.ts index 6f036e40..9c50da11 100644 --- a/backend/src/api-tests/reference/create.test.ts +++ b/backend/src/api-tests/reference/create.test.ts @@ -1,5 +1,5 @@ import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals' -import { ReferenceDetailsType } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/api-tests/reference/data.ts b/backend/src/api-tests/reference/data.ts index 7aeb40b7..c4fd32a2 100644 --- a/backend/src/api-tests/reference/data.ts +++ b/backend/src/api-tests/reference/data.ts @@ -1,4 +1,4 @@ -import { EditDataType, /*EditMetaData, Reference,*/ ReferenceDetailsType } from '../../../../frontend/src/backendTypes' +import { EditDataType, /*EditMetaData, Reference,*/ ReferenceDetailsType } from '../../../../frontend/src/shared/types' /* "ref_type_id": 1, "ref_type": "Journal"' diff --git a/backend/src/api-tests/reference/delete.test.ts b/backend/src/api-tests/reference/delete.test.ts index 52124f24..212de898 100644 --- a/backend/src/api-tests/reference/delete.test.ts +++ b/backend/src/api-tests/reference/delete.test.ts @@ -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/backendTypes' +import { ReferenceDetailsType } from '../../../../frontend/src/shared/types' import Prisma from '../../../prisma/generated/now_test_client' import { newReferenceBasis } from './data' diff --git a/backend/src/api-tests/species/create.test.ts b/backend/src/api-tests/species/create.test.ts index 0bb41977..e95cfae0 100644 --- a/backend/src/api-tests/species/create.test.ts +++ b/backend/src/api-tests/species/create.test.ts @@ -1,5 +1,5 @@ import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals' -import { LocalityDetailsType, SpeciesDetailsType } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/api-tests/species/data.ts b/backend/src/api-tests/species/data.ts index 4e1bf76f..bd2cf650 100644 --- a/backend/src/api-tests/species/data.ts +++ b/backend/src/api-tests/species/data.ts @@ -1,4 +1,4 @@ -import { EditDataType, EditMetaData, Reference, SpeciesDetailsType } from '../../../../frontend/src/backendTypes' +import { EditDataType, EditMetaData, Reference, SpeciesDetailsType } from '../../../../frontend/src/shared/types' export const newSpeciesBasis: EditDataType = { class_name: 'Mammalia', diff --git a/backend/src/api-tests/species/update.test.ts b/backend/src/api-tests/species/update.test.ts index 343580da..8b3ab223 100644 --- a/backend/src/api-tests/species/update.test.ts +++ b/backend/src/api-tests/species/update.test.ts @@ -1,5 +1,5 @@ import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals' -import { EditMetaData, SpeciesDetailsType } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/api-tests/timeBound/create.test.ts b/backend/src/api-tests/timeBound/create.test.ts index e3cd7ce2..b571dd04 100644 --- a/backend/src/api-tests/timeBound/create.test.ts +++ b/backend/src/api-tests/timeBound/create.test.ts @@ -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/backendTypes' +import { TimeBoundDetailsType } from '../../../../frontend/src/shared/types' import { pool } from '../../utils/db' let createdTimeBound: TimeBoundDetailsType | null = null diff --git a/backend/src/api-tests/timeBound/data.ts b/backend/src/api-tests/timeBound/data.ts index fe628737..17607c50 100644 --- a/backend/src/api-tests/timeBound/data.ts +++ b/backend/src/api-tests/timeBound/data.ts @@ -1,4 +1,4 @@ -import { EditDataType, EditMetaData, Reference, TimeBoundDetailsType } from '../../../../frontend/src/backendTypes' +import { EditDataType, EditMetaData, Reference, TimeBoundDetailsType } from '../../../../frontend/src/shared/types' export const newTimeBoundBasis: EditDataType = { b_name: 'C2N-y', diff --git a/backend/src/api-tests/timeBound/update.test.ts b/backend/src/api-tests/timeBound/update.test.ts index 69969bf5..1334ff0b 100644 --- a/backend/src/api-tests/timeBound/update.test.ts +++ b/backend/src/api-tests/timeBound/update.test.ts @@ -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/backendTypes' +import { TimeBoundDetailsType } from '../../../../frontend/src/shared/types' import { LogRow } from '../../services/write/writeOperations/types' import { pool } from '../../utils/db' diff --git a/backend/src/api-tests/timeUnit/create.test.ts b/backend/src/api-tests/timeUnit/create.test.ts index 85a47aeb..f4bcbbd2 100644 --- a/backend/src/api-tests/timeUnit/create.test.ts +++ b/backend/src/api-tests/timeUnit/create.test.ts @@ -1,5 +1,5 @@ import { beforeEach, beforeAll, afterAll, describe, it, expect } from '@jest/globals' -import { TimeUnitDetailsType } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/api-tests/timeUnit/data.ts b/backend/src/api-tests/timeUnit/data.ts index 41822b4a..e51b01b0 100644 --- a/backend/src/api-tests/timeUnit/data.ts +++ b/backend/src/api-tests/timeUnit/data.ts @@ -1,4 +1,4 @@ -import { EditDataType, EditMetaData, Reference, TimeUnitDetailsType } from '../../../../frontend/src/backendTypes' +import { EditDataType, EditMetaData, Reference, TimeUnitDetailsType } from '../../../../frontend/src/shared/types' export const newTimeUnitBasis: EditDataType = { tu_display_name: 'Bahean Test', diff --git a/backend/src/api-tests/timeUnit/update.test.ts b/backend/src/api-tests/timeUnit/update.test.ts index 0f61708a..85d5af2e 100644 --- a/backend/src/api-tests/timeUnit/update.test.ts +++ b/backend/src/api-tests/timeUnit/update.test.ts @@ -1,5 +1,5 @@ import { describe, it, beforeEach, beforeAll, afterAll, expect } from '@jest/globals' -import { TimeUnitDetailsType, EditDataType, EditMetaData } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/api-tests/utils.ts b/backend/src/api-tests/utils.ts index b1c5e033..02f16bc3 100644 --- a/backend/src/api-tests/utils.ts +++ b/backend/src/api-tests/utils.ts @@ -1,7 +1,7 @@ import request from 'supertest' import app from '../app' import { expect } from '@jest/globals' -import { UpdateLog } from '../../../frontend/src/backendTypes' +import { UpdateLog } from '../../../frontend/src/shared/types' import { LogRow } from '../services/write/writeOperations/types' let token: string | null = null diff --git a/backend/src/middlewares/authenticator.ts b/backend/src/middlewares/authenticator.ts index 48f39955..8449fb82 100644 --- a/backend/src/middlewares/authenticator.ts +++ b/backend/src/middlewares/authenticator.ts @@ -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/backendTypes' +import { User } from '../../../frontend/src/shared/types' import { Role } from '../../../frontend/src/types' /* diff --git a/backend/src/routes/locality.ts b/backend/src/routes/locality.ts index 79559745..9caf4ade 100644 --- a/backend/src/routes/locality.ts +++ b/backend/src/routes/locality.ts @@ -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/backendTypes' +import { EditDataType, EditMetaData, LocalityDetailsType } from '../../../frontend/src/shared/types' import { requireOneOf } from '../middlewares/authorizer' import { Role } from '../../../frontend/src/types' import { deleteLocality, writeLocality } from '../services/write/locality' diff --git a/backend/src/routes/reference.ts b/backend/src/routes/reference.ts index c0846776..d695f528 100644 --- a/backend/src/routes/reference.ts +++ b/backend/src/routes/reference.ts @@ -11,7 +11,7 @@ import { } from '../services/reference' import { requireOneOf } from '../middlewares/authorizer' import { Role } from '../../../frontend/src/types' -import { EditMetaData, ReferenceDetailsType, EditDataType } from '../../../frontend/src/backendTypes' +import { EditMetaData, ReferenceDetailsType, EditDataType } from '../../../frontend/src/shared/types' import { deleteReference, writeReference } from '../services/write/reference' const router = Router() diff --git a/backend/src/routes/species.ts b/backend/src/routes/species.ts index 548e8f06..40bd93a1 100644 --- a/backend/src/routes/species.ts +++ b/backend/src/routes/species.ts @@ -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/backendTypes' +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/types' diff --git a/backend/src/routes/timeBound.ts b/backend/src/routes/timeBound.ts index 2faa5f23..d90326ea 100644 --- a/backend/src/routes/timeBound.ts +++ b/backend/src/routes/timeBound.ts @@ -1,5 +1,5 @@ import { Request, Router } from 'express' -import { EditDataType, EditMetaData, TimeBoundDetailsType } from '../../../frontend/src/backendTypes' +import { EditDataType, EditMetaData, TimeBoundDetailsType } from '../../../frontend/src/shared/types' import { Role } from '../../../frontend/src/types' import { requireOneOf } from '../middlewares/authorizer' import { diff --git a/backend/src/routes/timeUnit.ts b/backend/src/routes/timeUnit.ts index bd509f38..10b003b3 100644 --- a/backend/src/routes/timeUnit.ts +++ b/backend/src/routes/timeUnit.ts @@ -1,5 +1,5 @@ import { Request, Router } from 'express' -import { EditDataType, EditMetaData, TimeUnitDetailsType } from '../../../frontend/src/backendTypes' +import { EditDataType, EditMetaData, TimeUnitDetailsType } from '../../../frontend/src/shared/types' import { Role } from '../../../frontend/src/types' import { requireOneOf } from '../middlewares/authorizer' import { getAllSequences } from '../services/sequence' diff --git a/backend/src/services/crossSearch.ts b/backend/src/services/crossSearch.ts index eae65d8c..c10120b1 100644 --- a/backend/src/services/crossSearch.ts +++ b/backend/src/services/crossSearch.ts @@ -1,4 +1,4 @@ -import { User, CrossSearch } from '../../../frontend/src/backendTypes' +import { User, CrossSearch } from '../../../frontend/src//shared/types' import { Role } from '../../../frontend/src/types' import { nowDb } from '../utils/db' import { diff --git a/backend/src/services/locality.ts b/backend/src/services/locality.ts index 57815c6d..2bd575e0 100644 --- a/backend/src/services/locality.ts +++ b/backend/src/services/locality.ts @@ -1,7 +1,7 @@ -import { EditDataType, LocalityDetailsType, User } from '../../../frontend/src/backendTypes' +import { EditDataType, LocalityDetailsType, User } from '../../../frontend/src/shared/types' import { Role } from '../../../frontend/src/types' -import { validateLocality } from '../../../frontend/src/validators/locality' -import { ValidationObject } from '../../../frontend/src/validators/validator' +import { validateLocality } from '../../../frontend/src/shared/validators/locality' +import { ValidationObject } from '../../../frontend/src/shared/validators/validator' import Prisma from '../../prisma/generated/now_test_client' import { AccessError } from '../middlewares/authorizer' import { fixBigInt } from '../utils/common' diff --git a/backend/src/services/localitySpeciesExport.ts b/backend/src/services/localitySpeciesExport.ts index 12db5e09..67cc6627 100644 --- a/backend/src/services/localitySpeciesExport.ts +++ b/backend/src/services/localitySpeciesExport.ts @@ -1,5 +1,5 @@ import { PoolConnection } from 'mariadb' -import { User } from '../../../frontend/src/backendTypes' +import { User } from '../../../frontend/src/shared/types' import { NOW_DB_NAME } from '../utils/config' import { Role } from '../../../frontend/src/types' import { pool } from '../utils/db' diff --git a/backend/src/services/reference.ts b/backend/src/services/reference.ts index 5437545b..e22eadce 100644 --- a/backend/src/services/reference.ts +++ b/backend/src/services/reference.ts @@ -1,7 +1,7 @@ import { nowDb } from '../utils/db' -import { EditDataType, ReferenceDetailsType } from '../../../frontend/src/backendTypes' -import { ValidationObject } from '../../../frontend/src/validators/validator' -import { validateReference } from '../../../frontend/src/validators/reference' +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' export const getAllReferences = async () => { diff --git a/backend/src/services/species.ts b/backend/src/services/species.ts index a3e93ff7..b49353d8 100644 --- a/backend/src/services/species.ts +++ b/backend/src/services/species.ts @@ -1,6 +1,6 @@ -import { EditDataType, SpeciesDetailsType } from '../../../frontend/src/backendTypes' -import { validateSpecies } from '../../../frontend/src/validators/species' -import { ValidationObject } from '../../../frontend/src/validators/validator' +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' import { fixBigInt } from '../utils/common' import { logDb, nowDb } from '../utils/db' diff --git a/backend/src/services/timeBound.ts b/backend/src/services/timeBound.ts index 5a89001e..5db5422a 100644 --- a/backend/src/services/timeBound.ts +++ b/backend/src/services/timeBound.ts @@ -1,8 +1,8 @@ import { logDb, nowDb } from '../utils/db' -import { validateTimeBound } from '../../../frontend/src/validators/timeBound' -import { TimeBoundDetailsType, EditDataType } from '../../../frontend/src/backendTypes' +import { validateTimeBound } from '../../../frontend/src/shared/validators/timeBound' +import { TimeBoundDetailsType, EditDataType } from '../../../frontend/src/shared/types' import Prisma from '../../prisma/generated/now_test_client' -import { ValidationObject } from '../../../frontend/src/validators/validator' +import { ValidationObject } from '../../../frontend/src/shared/validators/validator' export const getAllTimeBounds = async () => { const result = await nowDb.now_tu_bound.findMany({ diff --git a/backend/src/services/timeUnit.ts b/backend/src/services/timeUnit.ts index f0daae62..62689204 100644 --- a/backend/src/services/timeUnit.ts +++ b/backend/src/services/timeUnit.ts @@ -1,7 +1,7 @@ import { logDb, nowDb } from '../utils/db' -import { EditDataType, TimeUnitDetailsType } from '../../../frontend/src/backendTypes' -import { ValidationObject } from '../../../frontend/src/validators/validator' -import { validateTimeUnit } from '../../../frontend/src/validators/timeUnit' +import { EditDataType, TimeUnitDetailsType } from '../../../frontend/src/shared/types' +import { ValidationObject } from '../../../frontend/src/shared/validators/validator' +import { validateTimeUnit } from '../../../frontend/src/shared/validators/timeUnit' export const getAllTimeUnits = async () => { const result = await nowDb.now_time_unit.findMany({ diff --git a/backend/src/services/write/author.ts b/backend/src/services/write/author.ts index 5a1832a2..d7a82d40 100644 --- a/backend/src/services/write/author.ts +++ b/backend/src/services/write/author.ts @@ -1,4 +1,4 @@ -import { EditDataType, FixBigInt, ReferenceAuthorType } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/services/write/journal.ts b/backend/src/services/write/journal.ts index 74658523..860706f9 100644 --- a/backend/src/services/write/journal.ts +++ b/backend/src/services/write/journal.ts @@ -1,4 +1,4 @@ -import { EditDataType, FixBigInt, ReferenceJournalType } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/services/write/locality.ts b/backend/src/services/write/locality.ts index 3b921286..2c717fe0 100644 --- a/backend/src/services/write/locality.ts +++ b/backend/src/services/write/locality.ts @@ -1,4 +1,4 @@ -import { EditDataType, LocalityDetailsType, Reference, User } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/services/write/reference.ts b/backend/src/services/write/reference.ts index 59107793..f2690881 100644 --- a/backend/src/services/write/reference.ts +++ b/backend/src/services/write/reference.ts @@ -1,4 +1,4 @@ -import { EditDataType, FixBigInt, ReferenceDetailsType } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/services/write/species.ts b/backend/src/services/write/species.ts index e7481134..fc7c965c 100644 --- a/backend/src/services/write/species.ts +++ b/backend/src/services/write/species.ts @@ -1,4 +1,4 @@ -import { EditDataType, FixBigInt, Reference, SpeciesDetailsType, User } from '../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/services/write/timeBound.ts b/backend/src/services/write/timeBound.ts index e4cdf0ea..f639ff4d 100644 --- a/backend/src/services/write/timeBound.ts +++ b/backend/src/services/write/timeBound.ts @@ -5,7 +5,7 @@ import { LocalityDetailsType, TimeUnitDetailsType, User, -} from '../../../../frontend/src/backendTypes' +} from '../../../../frontend/src/shared/types' import { NOW_DB_NAME } from '../../utils/config' import { WriteHandler } from './writeOperations/writeHandler' import { getFieldsOfTables } from '../../utils/db' diff --git a/backend/src/services/write/timeUnit.ts b/backend/src/services/write/timeUnit.ts index f264ecb2..1c871ebe 100644 --- a/backend/src/services/write/timeUnit.ts +++ b/backend/src/services/write/timeUnit.ts @@ -4,7 +4,7 @@ import { TimeUnitDetailsType, LocalityDetailsType, User, -} from '../../../../frontend/src/backendTypes' +} from '../../../../frontend/src/shared/types' import { NOW_DB_NAME } from '../../utils/config' import { WriteHandler } from './writeOperations/writeHandler' import { getFieldsOfTables } from '../../utils/db' diff --git a/backend/src/services/write/writeOperations/updateLogger/prepareUpdates.ts b/backend/src/services/write/writeOperations/updateLogger/prepareUpdates.ts index 8017bf52..0f613b5f 100644 --- a/backend/src/services/write/writeOperations/updateLogger/prepareUpdates.ts +++ b/backend/src/services/write/writeOperations/updateLogger/prepareUpdates.ts @@ -1,4 +1,4 @@ -import { Reference } from '../../../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/services/write/writeOperations/updateLogger/writeUpdates.ts b/backend/src/services/write/writeOperations/updateLogger/writeUpdates.ts index 86c8d518..74b95dfe 100644 --- a/backend/src/services/write/writeOperations/updateLogger/writeUpdates.ts +++ b/backend/src/services/write/writeOperations/updateLogger/writeUpdates.ts @@ -1,4 +1,4 @@ -import { Reference } from '../../../../../../frontend/src/backendTypes' +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' diff --git a/backend/src/services/write/writeOperations/utils.ts b/backend/src/services/write/writeOperations/utils.ts index 17969eb3..56548b34 100644 --- a/backend/src/services/write/writeOperations/utils.ts +++ b/backend/src/services/write/writeOperations/utils.ts @@ -1,4 +1,4 @@ -import { Editable } from '../../../../../frontend/src/backendTypes' +import { Editable } from '../../../../../frontend/src/shared/types' import { DbWriteItem } from './databaseHandler' import { DbValue } from './types' diff --git a/backend/src/services/write/writeOperations/writeHandler.ts b/backend/src/services/write/writeOperations/writeHandler.ts index a798b0c3..9e586044 100644 --- a/backend/src/services/write/writeOperations/writeHandler.ts +++ b/backend/src/services/write/writeOperations/writeHandler.ts @@ -1,4 +1,4 @@ -import { Reference, RowState } from '../../../../../frontend/src/backendTypes' +import { Reference, RowState } from '../../../../../frontend/src/shared/types' import { logger } from '../../../utils/logger' import { logAllUpdates } from './updateLogger/prepareUpdates' import { DatabaseHandler, DbWriteItem } from './databaseHandler' diff --git a/backend/src/utils/cascadeHandler.ts b/backend/src/utils/cascadeHandler.ts index 05a69e9d..628c6c62 100644 --- a/backend/src/utils/cascadeHandler.ts +++ b/backend/src/utils/cascadeHandler.ts @@ -1,4 +1,4 @@ -import { EditDataType, TimeUnitDetailsType, TimeBoundDetailsType } from '../../../frontend/src/backendTypes' +import { EditDataType, TimeUnitDetailsType, TimeBoundDetailsType } from '../../../frontend/src/shared/types' import { nowDb } from './db' import { calculateLocalityMaxAge, calculateLocalityMinAge } from './ageCalculator' diff --git a/documentation/components/frontend.md b/documentation/components/frontend.md index 753bf591..0defef4e 100644 --- a/documentation/components/frontend.md +++ b/documentation/components/frontend.md @@ -45,7 +45,7 @@ The context can also be used to access, for example, the **setEditData** setter, **Documentation for validators** -[Validators](../../frontend/src/validators/README.md) +[Validators](../../frontend/src/shared/validators/README.md) **editingComponents** diff --git a/documentation/entities/reference.md b/documentation/entities/reference.md index b5916b02..ec44a14c 100644 --- a/documentation/entities/reference.md +++ b/documentation/entities/reference.md @@ -38,7 +38,7 @@ Not possible trough the interface. However if still necessary, here's some thing * You should create a new entry to the table for all of the connections between the new field & the 14 reference types & set the visibility to true or false depending on if you want the new field to be visible to the reference type * The field itself is not defined in one specific place and is something more of an emergent entity from all of these connections * The new field's field_name needs to match the name of the field in ref_ref where the information will be saved -* Most of the types relating to references need to be edited in forntend/src/backendTypes.ts +* Most of the types relating to references need to be edited in forntend/src/shared/types.ts * You can accomplish the above in testdata/sqlfiles/now_test.sql by adding some rows. Rows 3200+ add the existing fields so looks for help there diff --git a/documentation/functionality/put_requests_for_db_entries.md b/documentation/functionality/put_requests_for_db_entries.md index 4ecd1c7f..c9b71e2c 100644 --- a/documentation/functionality/put_requests_for_db_entries.md +++ b/documentation/functionality/put_requests_for_db_entries.md @@ -8,6 +8,6 @@ Both editing and creating new entries go via same route in the app. Following th - A validator and a write functions in [services](../../backend/src/services/species.ts) for the route to call. - Frontend: - - [Spesific validators](../../frontend/src/validators/species.ts) are defined here. + - [Spesific validators](../../frontend/src/shared/validators/species.ts) are defined here. - An api-endpoint for edit needs to be defined in [reducers](../../frontend/src/redux/speciesReducer.ts) (this serves for creating a new entry as well) - An onWrite-function needs to be defined with the help of the api-endpoint and call navigate-function to end up in the [details-view](../../frontend/src/components/Species/SpeciesDetails.tsx) of the edited/created entry. (At the moment there's a 15ms time-out before the navigation for species as sometimes it tried to navigate before knowing where to (no id yet). This could be investigated if this is a more general bug or something weird happening only in species) diff --git a/documentation/guides/creating_new_tableview.md b/documentation/guides/creating_new_tableview.md index 4a120990..21bd18f7 100644 --- a/documentation/guides/creating_new_tableview.md +++ b/documentation/guides/creating_new_tableview.md @@ -10,7 +10,7 @@ Following things are needed to create a new page with a table (examples are all - Earlier we used prisma.findMany-function to fetch the data, but with cross search's 90k rows, the GET-call took approx 40s in staging environment. We found out that prisma.rawSQL with LEFT JOIN would reduce time of the call from 10s to 3s in dev environment. This reduced the call time for staging to approx 10s. Could possible be implemented for other tables also for better performance. - Frontend: - - Create necessary types in [backendtypes](../../frontend/src/backendTypes.d.ts) + - Create necessary types in [backendtypes](../../frontend/src/shared/types.d.ts) - Create a button for the component in [navigation bar](../../frontend/src/components/NavBar.tsx) - Create a relevant page-object for [Pages](../../frontend/src/components/pages.tsx) - Add a route for the component to [App](../../frontend/src/App.tsx) diff --git a/frontend/src/common.tsx b/frontend/src/common.tsx index caa358cb..831120fe 100644 --- a/frontend/src/common.tsx +++ b/frontend/src/common.tsx @@ -1,5 +1,5 @@ import { MRT_ColumnDef } from 'material-react-table' -import { Reference } from './backendTypes' +import { Reference } from './shared/types' import { Cell } from './components/commonComponents' export const formatLastLoginDate = (date: Date) => { diff --git a/frontend/src/components/CrossSearch/CrossSearchTable.tsx b/frontend/src/components/CrossSearch/CrossSearchTable.tsx index e51a846f..6a529509 100644 --- a/frontend/src/components/CrossSearch/CrossSearchTable.tsx +++ b/frontend/src/components/CrossSearch/CrossSearchTable.tsx @@ -1,6 +1,6 @@ import { useMemo } from 'react' import { type MRT_ColumnDef } from 'material-react-table' -import { CrossSearch } from '@/backendTypes' +import { CrossSearch } from '@/shared/types' import { TableView } from '../TableView/TableView' import { useGetAllCrossSearchQuery } from '@/redux/crossSearchReducer' diff --git a/frontend/src/components/DetailView/Context/DetailContext.tsx b/frontend/src/components/DetailView/Context/DetailContext.tsx index 06cc79f5..6655832c 100644 --- a/frontend/src/components/DetailView/Context/DetailContext.tsx +++ b/frontend/src/components/DetailView/Context/DetailContext.tsx @@ -2,8 +2,8 @@ import { ReactNode, createContext, useState, JSX, useEffect, Context, useContext } from 'react' import { DropdownOption } from '../common/editingComponents' import { cloneDeep } from 'lodash-es' -import { ValidationObject } from '@/validators/validator' -import { EditDataType } from '@/backendTypes' +import { ValidationObject } from '@/shared/validators/validator' +import { EditDataType } from '@/shared/types' import { TextFieldOptions, OptionalRadioSelectionProps } from '../DetailView' export type ModeOptions = 'read' | 'new' | 'edit' | 'staging-edit' | 'staging-new' diff --git a/frontend/src/components/DetailView/DetailView.tsx b/frontend/src/components/DetailView/DetailView.tsx index 49942202..d274e9a1 100644 --- a/frontend/src/components/DetailView/DetailView.tsx +++ b/frontend/src/components/DetailView/DetailView.tsx @@ -14,8 +14,8 @@ import { import { DetailBrowser } from './DetailBrowser' import { StagingView } from './StagingView' import { ReturnButton, WriteButton } from './components' -import { ValidationObject } from '@/validators/validator' -import { EditDataType } from '@/backendTypes' +import { ValidationObject } from '@/shared/validators/validator' +import { EditDataType } from '@/shared/types' import { usePageContext } from '../Page' export type TabType = { diff --git a/frontend/src/components/DetailView/StagingView.tsx b/frontend/src/components/DetailView/StagingView.tsx index bb586357..7dfb8a8c 100644 --- a/frontend/src/components/DetailView/StagingView.tsx +++ b/frontend/src/components/DetailView/StagingView.tsx @@ -4,7 +4,7 @@ import { SelectingTable } from './common/SelectingTable' import { useGetAllReferencesQuery } from '@/redux/referenceReducer' import { referenceTableColumns } from '@/common' import { MRT_RowData } from 'material-react-table' -import { Editable, Reference } from '@/backendTypes' +import { Editable, Reference } from '@/shared/types' import { EditableTable } from './common/EditableTable' export const StagingView = () => { diff --git a/frontend/src/components/DetailView/common/EditableTable.tsx b/frontend/src/components/DetailView/common/EditableTable.tsx index c21d7039..c5bf8abd 100644 --- a/frontend/src/components/DetailView/common/EditableTable.tsx +++ b/frontend/src/components/DetailView/common/EditableTable.tsx @@ -1,4 +1,4 @@ -import { EditDataType, RowState } from '@/backendTypes' +import { EditDataType, RowState } from '@/shared/types' import { CircularProgress, Box, Button } from '@mui/material' import { type MRT_ColumnDef, diff --git a/frontend/src/components/DetailView/common/EditingForm.tsx b/frontend/src/components/DetailView/common/EditingForm.tsx index dcfba71a..2fb7ebba 100644 --- a/frontend/src/components/DetailView/common/EditingForm.tsx +++ b/frontend/src/components/DetailView/common/EditingForm.tsx @@ -1,7 +1,7 @@ import { Box, TextField } from '@mui/material' import { EditingModal } from './EditingModal' import { useForm } from 'react-hook-form' -import { EditDataType, Editable } from '@/backendTypes' +import { EditDataType, Editable } from '@/shared/types' import { useDetailContext } from '../Context/DetailContext' export type EditingFormField = { name: string; label: string; required?: boolean } diff --git a/frontend/src/components/DetailView/common/SelectingTable.tsx b/frontend/src/components/DetailView/common/SelectingTable.tsx index 6aadfdd7..fdc27ea1 100644 --- a/frontend/src/components/DetailView/common/SelectingTable.tsx +++ b/frontend/src/components/DetailView/common/SelectingTable.tsx @@ -4,7 +4,7 @@ import { TableView } from '@/components/TableView/TableView' import { useDetailContext } from '../Context/DetailContext' import { useMemo } from 'react' import { Box, CircularProgress } from '@mui/material' -import { EditDataType } from '@/backendTypes' +import { EditDataType } from '@/shared/types' /* If editabletable has different type than selectingtable rows, diff --git a/frontend/src/components/DetailView/common/UpdateTab.tsx b/frontend/src/components/DetailView/common/UpdateTab.tsx index 46867443..f875e918 100644 --- a/frontend/src/components/DetailView/common/UpdateTab.tsx +++ b/frontend/src/components/DetailView/common/UpdateTab.tsx @@ -1,4 +1,4 @@ -import { ReferenceOfUpdate, UpdateLog } from '@/backendTypes' +import { ReferenceOfUpdate, UpdateLog } from '@/shared/types' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' import { EditingModal } from '@/components/DetailView/common/EditingModal' import { SimpleTable } from '@/components/DetailView/common/SimpleTable' diff --git a/frontend/src/components/DetailView/common/defaultValues.ts b/frontend/src/components/DetailView/common/defaultValues.ts index 53c48cbd..6239d451 100644 --- a/frontend/src/components/DetailView/common/defaultValues.ts +++ b/frontend/src/components/DetailView/common/defaultValues.ts @@ -4,7 +4,7 @@ import { SpeciesDetailsType, TimeBoundDetailsType, TimeUnitDetailsType, -} from '@/backendTypes' +} from '@/shared/types' export const emptyLocality = { bfa_max: '', diff --git a/frontend/src/components/DetailView/common/editingComponents.tsx b/frontend/src/components/DetailView/common/editingComponents.tsx index 5eb56d7c..0cb315c9 100644 --- a/frontend/src/components/DetailView/common/editingComponents.tsx +++ b/frontend/src/components/DetailView/common/editingComponents.tsx @@ -19,7 +19,7 @@ import { RegisterOptions, FieldValues, UseFormRegisterReturn, FieldErrors } from import { useDetailContext } from '../Context/DetailContext' import { DataValue } from './tabLayoutHelpers' import { modalStyle } from './misc' -import { EditDataType } from '@/backendTypes' +import { EditDataType } from '@/shared/types' import { calculateLocalityMinAge, calculateLocalityMaxAge } from '@/util/ageCalculator' const fieldWidth = '14em' diff --git a/frontend/src/components/DetailView/common/tabLayoutHelpers.tsx b/frontend/src/components/DetailView/common/tabLayoutHelpers.tsx index 8dd190ea..05415df4 100644 --- a/frontend/src/components/DetailView/common/tabLayoutHelpers.tsx +++ b/frontend/src/components/DetailView/common/tabLayoutHelpers.tsx @@ -1,7 +1,7 @@ import { Card, Typography, Box, Grid, Divider } from '@mui/material' import { ReactNode } from 'react' import { useDetailContext } from '../Context/DetailContext' -import { EditDataType } from '@/backendTypes' +import { EditDataType } from '@/shared/types' export const ArrayToTable = ({ array, half }: { array: Array>; half?: boolean }) => { const maxRowLength = Math.max(...array.map(row => row.length)) diff --git a/frontend/src/components/DetailView/components.tsx b/frontend/src/components/DetailView/components.tsx index 342d6e3a..e6573f47 100644 --- a/frontend/src/components/DetailView/components.tsx +++ b/frontend/src/components/DetailView/components.tsx @@ -4,7 +4,7 @@ import ArrowBackIcon from '@mui/icons-material/ArrowBack' import SaveIcon from '@mui/icons-material/Save' import { usePageContext } from '../Page' import { useDetailContext } from './Context/DetailContext' -import { EditDataType } from '@/backendTypes' +import { EditDataType } from '@/shared/types' import { useState, useEffect } from 'react' export const WriteButton = ({ diff --git a/frontend/src/components/Locality/LocalityDetails.tsx b/frontend/src/components/Locality/LocalityDetails.tsx index 0e36f6ef..1ec7d95b 100644 --- a/frontend/src/components/Locality/LocalityDetails.tsx +++ b/frontend/src/components/Locality/LocalityDetails.tsx @@ -16,8 +16,8 @@ import { MuseumTab } from './Tabs/MuseumTab' import { ProjectTab } from './Tabs/ProjectTab' import { SpeciesTab } from './Tabs/SpeciesTab' import { TaphonomyTab } from './Tabs/TaphonomyTab' -import { EditDataType, LocalityDetailsType, ValidationErrors } from '@/backendTypes' -import { validateLocality } from '@/validators/locality' +import { EditDataType, LocalityDetailsType, ValidationErrors } from '@/shared/types' +import { validateLocality } from '@/shared/validators/locality' import { UpdateTab } from '../DetailView/common/UpdateTab' import { emptyLocality } from '../DetailView/common/defaultValues' import { useNotify } from '@/hooks/notification' diff --git a/frontend/src/components/Locality/LocalityTable.tsx b/frontend/src/components/Locality/LocalityTable.tsx index a685430e..331b982e 100644 --- a/frontend/src/components/Locality/LocalityTable.tsx +++ b/frontend/src/components/Locality/LocalityTable.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { type MRT_ColumnDef } from 'material-react-table' import { useGetAllLocalitiesQuery, useGetLocalitySpeciesListMutation } from '../../redux/localityReducer' -import { Locality } from '@/backendTypes' +import { Locality } from '@/shared/types' import { TableView } from '../TableView/TableView' import { useNotify } from '@/hooks/notification' diff --git a/frontend/src/components/Locality/Tabs/AgeTab.tsx b/frontend/src/components/Locality/Tabs/AgeTab.tsx index c201fcd5..cb734f1c 100644 --- a/frontend/src/components/Locality/Tabs/AgeTab.tsx +++ b/frontend/src/components/Locality/Tabs/AgeTab.tsx @@ -1,4 +1,4 @@ -import { LocalityDetailsType, TimeUnitDetailsType } from '@/backendTypes' +import { LocalityDetailsType, TimeUnitDetailsType } from '@/shared/types' import { BasisForAgeSelection } from '@/components/DetailView/common/editingComponents' import { emptyOption } from '@/components/DetailView/common/misc' import { ArrayFrame, HalfFrames } from '@/components/DetailView/common/tabLayoutHelpers' diff --git a/frontend/src/components/Locality/Tabs/ArchaeologyTab.tsx b/frontend/src/components/Locality/Tabs/ArchaeologyTab.tsx index 2bccbc81..aaae2129 100644 --- a/frontend/src/components/Locality/Tabs/ArchaeologyTab.tsx +++ b/frontend/src/components/Locality/Tabs/ArchaeologyTab.tsx @@ -1,4 +1,4 @@ -import { LocalityDetailsType } from '@/backendTypes' +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' diff --git a/frontend/src/components/Locality/Tabs/ClimateTab.tsx b/frontend/src/components/Locality/Tabs/ClimateTab.tsx index 95feceb6..ab114673 100644 --- a/frontend/src/components/Locality/Tabs/ClimateTab.tsx +++ b/frontend/src/components/Locality/Tabs/ClimateTab.tsx @@ -1,4 +1,4 @@ -import { LocalityDetailsType } from '@/backendTypes' +import { LocalityDetailsType } from '@/shared/types' import { emptyOption } from '@/components/DetailView/common/misc' import { ArrayFrame, HalfFrames } from '@/components/DetailView/common/tabLayoutHelpers' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' diff --git a/frontend/src/components/Locality/Tabs/EcometricsTab.tsx b/frontend/src/components/Locality/Tabs/EcometricsTab.tsx index d540aaf2..0700c8cf 100644 --- a/frontend/src/components/Locality/Tabs/EcometricsTab.tsx +++ b/frontend/src/components/Locality/Tabs/EcometricsTab.tsx @@ -1,4 +1,4 @@ -import { LocalityDetailsType } from '@/backendTypes' +import { LocalityDetailsType } from '@/shared/types' import { ArrayFrame } from '../../DetailView/common/tabLayoutHelpers' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' import { calculateMeanHypsodonty } from '@/types' diff --git a/frontend/src/components/Locality/Tabs/LithologyTab.tsx b/frontend/src/components/Locality/Tabs/LithologyTab.tsx index 5912a833..b3b21fa0 100644 --- a/frontend/src/components/Locality/Tabs/LithologyTab.tsx +++ b/frontend/src/components/Locality/Tabs/LithologyTab.tsx @@ -1,4 +1,4 @@ -import { Editable, LocalityDetailsType, SedimentaryStructure, SedimentaryStructureValues } from '@/backendTypes' +import { Editable, LocalityDetailsType, SedimentaryStructure, SedimentaryStructureValues } from '@/shared/types' import { EditableTable } from '@/components/DetailView/common/EditableTable' import { emptyOption } from '@/components/DetailView/common/misc' import { SelectingTable } from '@/components/DetailView/common/SelectingTable' diff --git a/frontend/src/components/Locality/Tabs/LocalityTab.tsx b/frontend/src/components/Locality/Tabs/LocalityTab.tsx index e703ab4c..633fec36 100644 --- a/frontend/src/components/Locality/Tabs/LocalityTab.tsx +++ b/frontend/src/components/Locality/Tabs/LocalityTab.tsx @@ -1,4 +1,4 @@ -import { Editable, LocalityDetailsType, LocalitySynonym } from '@/backendTypes' +import { Editable, LocalityDetailsType, LocalitySynonym } from '@/shared/types' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' import { Grouped, ArrayFrame, HalfFrames } from '@/components/DetailView/common/tabLayoutHelpers' import { Box, TextField } from '@mui/material' @@ -10,7 +10,7 @@ import { emptyOption } from '@/components/DetailView/common/misc' import { CoordinateSelectionMap } from '@/components/Map/CoordinateSelectionMap' import { useState } from 'react' import { convertDmsToDec, convertDecToDms } from '@/util/coordinateConversion' -import { validCountries } from '@/validators/countryList' +import { validCountries } from '@/shared/validators/countryList' export const LocalityTab = () => { const { textField, radioSelection, dropdown, dropdownWithSearch, mode, bigTextField } = diff --git a/frontend/src/components/Locality/Tabs/MuseumTab.tsx b/frontend/src/components/Locality/Tabs/MuseumTab.tsx index c0761a65..ee34c6ef 100644 --- a/frontend/src/components/Locality/Tabs/MuseumTab.tsx +++ b/frontend/src/components/Locality/Tabs/MuseumTab.tsx @@ -1,4 +1,4 @@ -import { Editable, LocalityDetailsType, Museum } from '@/backendTypes' +import { Editable, LocalityDetailsType, Museum } from '@/shared/types' import { EditableTable } from '@/components/DetailView/common/EditableTable' import { Grouped } from '@/components/DetailView/common/tabLayoutHelpers' import { SelectingTable } from '@/components/DetailView/common/SelectingTable' diff --git a/frontend/src/components/Locality/Tabs/ProjectTab.tsx b/frontend/src/components/Locality/Tabs/ProjectTab.tsx index afb5f196..70bddc02 100644 --- a/frontend/src/components/Locality/Tabs/ProjectTab.tsx +++ b/frontend/src/components/Locality/Tabs/ProjectTab.tsx @@ -1,4 +1,4 @@ -import { Editable, LocalityDetailsType, Project } from '@/backendTypes' +import { Editable, LocalityDetailsType, Project } from '@/shared/types' import { EditableTable } from '@/components/DetailView/common/EditableTable' import { Grouped } from '@/components/DetailView/common/tabLayoutHelpers' import { SelectingTable } from '@/components/DetailView/common/SelectingTable' diff --git a/frontend/src/components/Locality/Tabs/SpeciesTab.tsx b/frontend/src/components/Locality/Tabs/SpeciesTab.tsx index 82b43b8b..f034cba9 100644 --- a/frontend/src/components/Locality/Tabs/SpeciesTab.tsx +++ b/frontend/src/components/Locality/Tabs/SpeciesTab.tsx @@ -1,4 +1,4 @@ -import { LocalityDetailsType, LocalitySpecies, Species, SpeciesDetailsType } from '@/backendTypes' +import { LocalityDetailsType, LocalitySpecies, Species, SpeciesDetailsType } from '@/shared/types' import { EditableTable } from '@/components/DetailView/common/EditableTable' import { EditingForm } from '@/components/DetailView/common/EditingForm' import { SelectingTable } from '@/components/DetailView/common/SelectingTable' diff --git a/frontend/src/components/Locality/Tabs/TaphonomyTab.tsx b/frontend/src/components/Locality/Tabs/TaphonomyTab.tsx index 147d22f0..afe4c117 100644 --- a/frontend/src/components/Locality/Tabs/TaphonomyTab.tsx +++ b/frontend/src/components/Locality/Tabs/TaphonomyTab.tsx @@ -1,4 +1,4 @@ -import { Editable, LocalityDetailsType, CollectingMethod } from '@/backendTypes' +import { Editable, LocalityDetailsType, CollectingMethod } from '@/shared/types' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' import { Grouped, ArrayFrame, HalfFrames } from '@/components/DetailView/common/tabLayoutHelpers' import { MRT_ColumnDef } from 'material-react-table' diff --git a/frontend/src/components/Person/PersonDetails.tsx b/frontend/src/components/Person/PersonDetails.tsx index ec556c3c..32a0a9ff 100644 --- a/frontend/src/components/Person/PersonDetails.tsx +++ b/frontend/src/components/Person/PersonDetails.tsx @@ -4,7 +4,7 @@ import { CircularProgress } from '@mui/material' import { DetailView, TabType } from '../DetailView/DetailView' import { PersonTab } from './Tabs/PersonTab' import { useUser } from '@/hooks/user' -import { EditDataType, PersonDetailsType } from '@/backendTypes' +import { EditDataType, PersonDetailsType } from '@/shared/types' export const PersonDetails = () => { const { id: idFromUrl } = useParams() diff --git a/frontend/src/components/Person/PersonTable.tsx b/frontend/src/components/Person/PersonTable.tsx index 669399f9..2254c824 100644 --- a/frontend/src/components/Person/PersonTable.tsx +++ b/frontend/src/components/Person/PersonTable.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { type MRT_ColumnDef } from 'material-react-table' import { useGetAllPersonsQuery } from '../../redux/personReducer' -import { PersonDetailsType } from '@/backendTypes' +import { PersonDetailsType } from '@/shared/types' import { TableView } from '../TableView/TableView' import { formatLastLoginDate } from '@/common' diff --git a/frontend/src/components/Person/Tabs/PersonTab.tsx b/frontend/src/components/Person/Tabs/PersonTab.tsx index 6f6915fe..2ea6b4a4 100644 --- a/frontend/src/components/Person/Tabs/PersonTab.tsx +++ b/frontend/src/components/Person/Tabs/PersonTab.tsx @@ -1,4 +1,4 @@ -import { PersonDetailsType } from '@/backendTypes' +import { PersonDetailsType } from '@/shared/types' import { ArrayFrame, Grouped } from '../../DetailView/common/tabLayoutHelpers' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' import { formatLastLoginDate } from '@/common' diff --git a/frontend/src/components/Project/ProjectTable.tsx b/frontend/src/components/Project/ProjectTable.tsx index bd0c52ed..972bb3f5 100644 --- a/frontend/src/components/Project/ProjectTable.tsx +++ b/frontend/src/components/Project/ProjectTable.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { type MRT_ColumnDef } from 'material-react-table' import { useGetAllProjectsQuery } from '../../redux/projectReducer' -import { Project } from '@/backendTypes' +import { Project } from '@/shared/types' import { TableView } from '../TableView/TableView' export const ProjectTable = ({ selectorFn }: { selectorFn?: (id: Project) => void }) => { diff --git a/frontend/src/components/Project/Tabs/CoordinatorTab.tsx b/frontend/src/components/Project/Tabs/CoordinatorTab.tsx index 4ca63c3b..f49fd7e6 100644 --- a/frontend/src/components/Project/Tabs/CoordinatorTab.tsx +++ b/frontend/src/components/Project/Tabs/CoordinatorTab.tsx @@ -1,4 +1,4 @@ -import { ProjectDetailsType, ProjectPeople } from '@/backendTypes' +import { ProjectDetailsType, ProjectPeople } from '@/shared/types' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' import { ArrayFrame, Grouped } from '@/components/DetailView/common/tabLayoutHelpers' import { MRT_ColumnDef } from 'material-react-table' diff --git a/frontend/src/components/Reference/ReferenceDetails.tsx b/frontend/src/components/Reference/ReferenceDetails.tsx index a5dd55e7..4b03fb78 100644 --- a/frontend/src/components/Reference/ReferenceDetails.tsx +++ b/frontend/src/components/Reference/ReferenceDetails.tsx @@ -7,9 +7,9 @@ import { useGetReferenceDetailsQuery, useDeleteReferenceMutation, } from '@/redux/referenceReducer' -import { EditDataType, ReferenceDetailsType, ValidationErrors } from '@/backendTypes' +import { EditDataType, ReferenceDetailsType, ValidationErrors } from '@/shared/types' import { emptyReference } from '../DetailView/common/defaultValues' -import { validateReference } from '@/validators/reference' +import { validateReference } from '@/shared/validators/reference' import { useNotify } from '@/hooks/notification' import { useEffect } from 'react' diff --git a/frontend/src/components/Reference/ReferenceTable.tsx b/frontend/src/components/Reference/ReferenceTable.tsx index 41f8e4be..ea10a4ac 100644 --- a/frontend/src/components/Reference/ReferenceTable.tsx +++ b/frontend/src/components/Reference/ReferenceTable.tsx @@ -1,5 +1,5 @@ import { useGetAllReferencesQuery } from '../../redux/referenceReducer' -import { Reference } from '@/backendTypes' +import { Reference } from '@/shared/types' import { TableView } from '../TableView/TableView' import { referenceTableColumns } from '@/common' diff --git a/frontend/src/components/Reference/Tabs/AuthorTab.tsx b/frontend/src/components/Reference/Tabs/AuthorTab.tsx index b1e4a1c5..0dcd66b7 100644 --- a/frontend/src/components/Reference/Tabs/AuthorTab.tsx +++ b/frontend/src/components/Reference/Tabs/AuthorTab.tsx @@ -1,5 +1,5 @@ import React, { useEffect } from 'react' -import { ReferenceDetailsType, ReferenceAuthorType, RowState, EditDataType } from '@/backendTypes' +import { ReferenceDetailsType, ReferenceAuthorType, RowState, EditDataType } from '@/shared/types' import { EditableTable } from '@/components/DetailView/common/EditableTable' import { EditingForm } from '@/components/DetailView/common/EditingForm' import { SelectingTable } from '@/components/DetailView/common/SelectingTable' diff --git a/frontend/src/components/Reference/Tabs/JournalTab.tsx b/frontend/src/components/Reference/Tabs/JournalTab.tsx index 9cccbd60..8e39417a 100644 --- a/frontend/src/components/Reference/Tabs/JournalTab.tsx +++ b/frontend/src/components/Reference/Tabs/JournalTab.tsx @@ -1,5 +1,5 @@ /* eslint-disable react/prop-types */ -import { ReferenceDetailsType, ReferenceJournalType } from '@/backendTypes' +import { ReferenceDetailsType, ReferenceJournalType } from '@/shared/types' import { EditableTable } from '@/components/DetailView/common/EditableTable' import { EditingForm } from '@/components/DetailView/common/EditingForm' import { SelectingTable } from '@/components/DetailView/common/SelectingTable' diff --git a/frontend/src/components/Reference/Tabs/ReferenceTab.tsx b/frontend/src/components/Reference/Tabs/ReferenceTab.tsx index 8a2f1190..0becdc3b 100644 --- a/frontend/src/components/Reference/Tabs/ReferenceTab.tsx +++ b/frontend/src/components/Reference/Tabs/ReferenceTab.tsx @@ -1,4 +1,4 @@ -import { ReferenceDetailsType } from '@/backendTypes' +import { ReferenceDetailsType } from '@/shared/types' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' import { ArrayFrame } from '@/components/DetailView/common/tabLayoutHelpers' import { useGetReferenceTypesQuery } from '@/redux/referenceReducer' diff --git a/frontend/src/components/Region/RegionTable.tsx b/frontend/src/components/Region/RegionTable.tsx index cd0414e2..c4f98bc8 100644 --- a/frontend/src/components/Region/RegionTable.tsx +++ b/frontend/src/components/Region/RegionTable.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { type MRT_ColumnDef } from 'material-react-table' import { useGetAllRegionsQuery } from '../../redux/regionReducer' -import { Region } from '@/backendTypes' +import { Region } from '@/shared/types' import { TableView } from '../TableView/TableView' export const RegionTable = ({ selectorFn }: { selectorFn?: (id: Region) => void }) => { diff --git a/frontend/src/components/Region/Tabs/CoordinatorTab.tsx b/frontend/src/components/Region/Tabs/CoordinatorTab.tsx index 95739f37..2ce6e35f 100644 --- a/frontend/src/components/Region/Tabs/CoordinatorTab.tsx +++ b/frontend/src/components/Region/Tabs/CoordinatorTab.tsx @@ -1,4 +1,4 @@ -import { RegionDetails, RegionCoordinator, RegionCountry } from '@/backendTypes' +import { RegionDetails, RegionCoordinator, RegionCountry } from '@/shared/types' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' import { Grouped } from '@/components/DetailView/common/tabLayoutHelpers' import { MRT_ColumnDef } from 'material-react-table' diff --git a/frontend/src/components/Sequence/SequenceTable.tsx b/frontend/src/components/Sequence/SequenceTable.tsx index db1a5af8..1bdd5fd0 100644 --- a/frontend/src/components/Sequence/SequenceTable.tsx +++ b/frontend/src/components/Sequence/SequenceTable.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { type MRT_ColumnDef } from 'material-react-table' import { useGetSequencesQuery } from '../../redux/timeUnitReducer' -import { Sequence } from '@/backendTypes' +import { Sequence } from '@/shared/types' import { TableView } from '../TableView/TableView' export const SequenceTable = ({ selectorFn }: { selectorFn?: (id: Sequence) => void }) => { diff --git a/frontend/src/components/Species/SpeciesDetails.tsx b/frontend/src/components/Species/SpeciesDetails.tsx index 01954325..600da64c 100644 --- a/frontend/src/components/Species/SpeciesDetails.tsx +++ b/frontend/src/components/Species/SpeciesDetails.tsx @@ -11,8 +11,8 @@ import { SynonymTab } from './Tabs/SynonymTab' import { TaxonomyTab } from './Tabs/TaxonomyTab' import { TeethTab } from './Tabs/TeethTab' import { UpdateTab } from '../DetailView/common/UpdateTab' -import { EditDataType, SpeciesDetailsType, ValidationErrors } from '@/backendTypes' -import { validateSpecies } from '@/validators/species' +import { EditDataType, SpeciesDetailsType, ValidationErrors } from '@/shared/types' +import { validateSpecies } from '@/shared/validators/species' import { emptySpecies } from '../DetailView/common/defaultValues' import { useNotify } from '@/hooks/notification' import { useEffect } from 'react' diff --git a/frontend/src/components/Species/SpeciesTable.tsx b/frontend/src/components/Species/SpeciesTable.tsx index 2ee3be19..d18e3c51 100644 --- a/frontend/src/components/Species/SpeciesTable.tsx +++ b/frontend/src/components/Species/SpeciesTable.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { type MRT_ColumnDef } from 'material-react-table' import { useGetAllSpeciesQuery } from '../../redux/speciesReducer' -import { Species } from '@/backendTypes' +import { Species } from '@/shared/types' import { TableView } from '../TableView/TableView' export const SpeciesTable = ({ selectorFn }: { selectorFn?: (id: Species) => void }) => { diff --git a/frontend/src/components/Species/Tabs/DietTab.tsx b/frontend/src/components/Species/Tabs/DietTab.tsx index c5b07edc..ba32259f 100644 --- a/frontend/src/components/Species/Tabs/DietTab.tsx +++ b/frontend/src/components/Species/Tabs/DietTab.tsx @@ -1,4 +1,4 @@ -import { SpeciesDetailsType } from '@/backendTypes' +import { SpeciesDetailsType } from '@/shared/types' import { emptyOption } from '@/components/DetailView/common/misc' import { ArrayFrame } from '@/components/DetailView/common/tabLayoutHelpers' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' diff --git a/frontend/src/components/Species/Tabs/LocalitySpeciesTab.tsx b/frontend/src/components/Species/Tabs/LocalitySpeciesTab.tsx index efab84bf..4fe303e4 100644 --- a/frontend/src/components/Species/Tabs/LocalitySpeciesTab.tsx +++ b/frontend/src/components/Species/Tabs/LocalitySpeciesTab.tsx @@ -1,4 +1,4 @@ -import { Editable, SpeciesDetailsType, SpeciesLocality } from '@/backendTypes' +import { Editable, SpeciesDetailsType, SpeciesLocality } from '@/shared/types' import { EditableTable } from '@/components/DetailView/common/EditableTable' import { EditingModal } from '@/components/DetailView/common/EditingModal' import { Grouped } from '@/components/DetailView/common/tabLayoutHelpers' diff --git a/frontend/src/components/Species/Tabs/LocalityTab.tsx b/frontend/src/components/Species/Tabs/LocalityTab.tsx index 0e5d994c..db056b85 100644 --- a/frontend/src/components/Species/Tabs/LocalityTab.tsx +++ b/frontend/src/components/Species/Tabs/LocalityTab.tsx @@ -1,4 +1,4 @@ -import { Editable, Locality, SpeciesDetailsType } from '@/backendTypes' +import { Editable, Locality, SpeciesDetailsType } from '@/shared/types' import { Grouped } from '@/components/DetailView/common/tabLayoutHelpers' import { EditableTable } from '@/components/DetailView/common/EditableTable' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' diff --git a/frontend/src/components/Species/Tabs/LocomotionTab.tsx b/frontend/src/components/Species/Tabs/LocomotionTab.tsx index a36e804b..c3b81841 100644 --- a/frontend/src/components/Species/Tabs/LocomotionTab.tsx +++ b/frontend/src/components/Species/Tabs/LocomotionTab.tsx @@ -1,4 +1,4 @@ -import { SpeciesDetailsType } from '@/backendTypes' +import { SpeciesDetailsType } from '@/shared/types' import { ArrayFrame, HalfFrames } from '@/components/DetailView/common/tabLayoutHelpers' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' diff --git a/frontend/src/components/Species/Tabs/SizeTab.tsx b/frontend/src/components/Species/Tabs/SizeTab.tsx index 21120965..87a36eaa 100644 --- a/frontend/src/components/Species/Tabs/SizeTab.tsx +++ b/frontend/src/components/Species/Tabs/SizeTab.tsx @@ -1,4 +1,4 @@ -import { SpeciesDetailsType } from '@/backendTypes' +import { SpeciesDetailsType } from '@/shared/types' import { ArrayFrame, HalfFrames } from '@/components/DetailView/common/tabLayoutHelpers' import { useDetailContext } from '@components/DetailView/Context/DetailContext' diff --git a/frontend/src/components/Species/Tabs/SynonymTab.tsx b/frontend/src/components/Species/Tabs/SynonymTab.tsx index 95565cfd..560e7317 100644 --- a/frontend/src/components/Species/Tabs/SynonymTab.tsx +++ b/frontend/src/components/Species/Tabs/SynonymTab.tsx @@ -1,4 +1,4 @@ -import { Editable, EditDataType, Species, SpeciesDetailsType, SpeciesSynonym } from '@/backendTypes' +import { Editable, EditDataType, Species, SpeciesDetailsType, SpeciesSynonym } from '@/shared/types' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' import { Grouped } from '@/components/DetailView/common/tabLayoutHelpers' import { MRT_ColumnDef } from 'material-react-table' diff --git a/frontend/src/components/Species/Tabs/TaxonomyTab.tsx b/frontend/src/components/Species/Tabs/TaxonomyTab.tsx index 41950638..e466ed53 100644 --- a/frontend/src/components/Species/Tabs/TaxonomyTab.tsx +++ b/frontend/src/components/Species/Tabs/TaxonomyTab.tsx @@ -1,4 +1,4 @@ -import { SpeciesDetailsType } from '@/backendTypes' +import { SpeciesDetailsType } from '@/shared/types' import { ArrayFrame, HalfFrames } from '@/components/DetailView/common/tabLayoutHelpers' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' diff --git a/frontend/src/components/Species/Tabs/TeethTab.tsx b/frontend/src/components/Species/Tabs/TeethTab.tsx index d8caf139..ea6dcd03 100644 --- a/frontend/src/components/Species/Tabs/TeethTab.tsx +++ b/frontend/src/components/Species/Tabs/TeethTab.tsx @@ -1,4 +1,4 @@ -import { SpeciesDetailsType } from '@/backendTypes' +import { SpeciesDetailsType } from '@/shared/types' import { emptyOption } from '@/components/DetailView/common/misc' import { ArrayFrame, HalfFrames } from '@/components/DetailView/common/tabLayoutHelpers' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' diff --git a/frontend/src/components/TimeBound/Tabs/BoundTab.tsx b/frontend/src/components/TimeBound/Tabs/BoundTab.tsx index 4745602e..d044398f 100644 --- a/frontend/src/components/TimeBound/Tabs/BoundTab.tsx +++ b/frontend/src/components/TimeBound/Tabs/BoundTab.tsx @@ -1,4 +1,4 @@ -import { TimeBoundDetailsType } from '@/backendTypes' +import { TimeBoundDetailsType } from '@/shared/types' import { ArrayFrame } from '@/components/DetailView/common/tabLayoutHelpers' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' diff --git a/frontend/src/components/TimeBound/Tabs/TimeUnitTab.tsx b/frontend/src/components/TimeBound/Tabs/TimeUnitTab.tsx index aef82a89..04b3be53 100644 --- a/frontend/src/components/TimeBound/Tabs/TimeUnitTab.tsx +++ b/frontend/src/components/TimeBound/Tabs/TimeUnitTab.tsx @@ -1,4 +1,4 @@ -import { TimeUnit, TimeBoundDetailsType } from '@/backendTypes' +import { TimeUnit, TimeBoundDetailsType } from '@/shared/types' import { useGetTimeBoundTimeUnitsQuery } from '@/redux/timeBoundReducer' import { CircularProgress } from '@mui/material' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' diff --git a/frontend/src/components/TimeBound/TimeBoundDetails.tsx b/frontend/src/components/TimeBound/TimeBoundDetails.tsx index 24ee856c..5e3b35e1 100644 --- a/frontend/src/components/TimeBound/TimeBoundDetails.tsx +++ b/frontend/src/components/TimeBound/TimeBoundDetails.tsx @@ -1,4 +1,4 @@ -import { EditDataType, TimeBoundDetailsType, ValidationErrors } from '@/backendTypes.js' +import { EditDataType, TimeBoundDetailsType, ValidationErrors } from '@/shared/types.js' import { useNotify } from '@/hooks/notification.ts' import { CircularProgress } from '@mui/material' import { useEffect } from 'react' @@ -13,7 +13,7 @@ import { UpdateTab } from '../DetailView/common/UpdateTab.tsx' import { DetailView, TabType } from '../DetailView/DetailView' import { BoundTab } from './Tabs/BoundTab' import { TimeUnitTab } from './Tabs/TimeUnitTab.tsx' -import { validateTimeBound } from '@/validators/timeBound.ts' +import { validateTimeBound } from '@/shared/validators/timeBound.ts' export const TimeBoundDetails = () => { const { id } = useParams() diff --git a/frontend/src/components/TimeBound/TimeBoundTable.tsx b/frontend/src/components/TimeBound/TimeBoundTable.tsx index 06205fb3..dba858d9 100644 --- a/frontend/src/components/TimeBound/TimeBoundTable.tsx +++ b/frontend/src/components/TimeBound/TimeBoundTable.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { type MRT_ColumnDef } from 'material-react-table' import { useGetAllTimeBoundsQuery } from '../../redux/timeBoundReducer' -import { TimeBound } from '@/backendTypes' +import { TimeBound } from '@/shared/types' import { TableView } from '../TableView/TableView' export const TimeBoundTable = ({ diff --git a/frontend/src/components/TimeUnit/Tabs/LocalityTab.tsx b/frontend/src/components/TimeUnit/Tabs/LocalityTab.tsx index 0307900d..34124e5b 100644 --- a/frontend/src/components/TimeUnit/Tabs/LocalityTab.tsx +++ b/frontend/src/components/TimeUnit/Tabs/LocalityTab.tsx @@ -1,4 +1,4 @@ -import { TimeUnitDetailsType } from '@/backendTypes' +import { TimeUnitDetailsType } from '@/shared/types' import { useGetTimeUnitLocalitiesQuery } from '@/redux/timeUnitReducer' import { CircularProgress } from '@mui/material' import { useDetailContext } from '@/components/DetailView/Context/DetailContext' diff --git a/frontend/src/components/TimeUnit/Tabs/TimeUnitTab.tsx b/frontend/src/components/TimeUnit/Tabs/TimeUnitTab.tsx index a69848d7..0ac44d23 100644 --- a/frontend/src/components/TimeUnit/Tabs/TimeUnitTab.tsx +++ b/frontend/src/components/TimeUnit/Tabs/TimeUnitTab.tsx @@ -1,4 +1,4 @@ -import { SequenceDetailsType, TimeBoundDetailsType, TimeUnitDetailsType } from '@/backendTypes' +import { SequenceDetailsType, TimeBoundDetailsType, TimeUnitDetailsType } from '@/shared/types' import { FieldWithTableSelection, TimeBoundSelection } from '@/components/DetailView/common/editingComponents' import { emptyOption } from '@/components/DetailView/common/misc' import { ArrayFrame } from '@/components/DetailView/common/tabLayoutHelpers' diff --git a/frontend/src/components/TimeUnit/TimeUnitDetails.tsx b/frontend/src/components/TimeUnit/TimeUnitDetails.tsx index 0011f7e7..ff662dc4 100644 --- a/frontend/src/components/TimeUnit/TimeUnitDetails.tsx +++ b/frontend/src/components/TimeUnit/TimeUnitDetails.tsx @@ -1,4 +1,4 @@ -import { EditDataType, TimeUnitDetailsType, ValidationErrors } from '@/backendTypes' +import { EditDataType, TimeUnitDetailsType, ValidationErrors } from '@/shared/types' import { useNotify } from '@/hooks/notification' import { CircularProgress } from '@mui/material' import { useEffect } from 'react' @@ -13,7 +13,7 @@ import { UpdateTab } from '../DetailView/common/UpdateTab' import { DetailView, TabType } from '../DetailView/DetailView' import { LocalityTab } from './Tabs/LocalityTab' import { TimeUnitTab } from './Tabs/TimeUnitTab' -import { validateTimeUnit } from '@/validators/timeUnit' +import { validateTimeUnit } from '@/shared/validators/timeUnit' import { makeEditData } from '../DetailView/Context/DetailContext' export const TimeUnitDetails = () => { diff --git a/frontend/src/components/TimeUnit/TimeUnitTable.tsx b/frontend/src/components/TimeUnit/TimeUnitTable.tsx index b1c1aa91..dd29162c 100644 --- a/frontend/src/components/TimeUnit/TimeUnitTable.tsx +++ b/frontend/src/components/TimeUnit/TimeUnitTable.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react' import { type MRT_ColumnDef } from 'material-react-table' import { useGetAllTimeUnitsQuery } from '../../redux/timeUnitReducer' -import { TimeUnit } from '@/backendTypes' +import { TimeUnit } from '@/shared/types' import { TableView } from '../TableView/TableView' export const TimeUnitTable = ({ selectorFn }: { selectorFn?: (newTimeUnit: TimeUnit) => void }) => { diff --git a/frontend/src/components/pages.tsx b/frontend/src/components/pages.tsx index 14e663b7..8913b331 100644 --- a/frontend/src/components/pages.tsx +++ b/frontend/src/components/pages.tsx @@ -7,7 +7,7 @@ import { PersonDetailsType, ProjectDetailsType, RegionDetails as RegionDetailsType, -} from '@/backendTypes' +} from '@/shared/types' import { CrossSearchTable } from './CrossSearch/CrossSearchTable' import { LocalityDetails } from './Locality/LocalityDetails' import { LocalityTable } from './Locality/LocalityTable' diff --git a/frontend/src/redux/crossSearchReducer.ts b/frontend/src/redux/crossSearchReducer.ts index a7e8db49..4584eeba 100644 --- a/frontend/src/redux/crossSearchReducer.ts +++ b/frontend/src/redux/crossSearchReducer.ts @@ -1,5 +1,5 @@ import { api } from './api' -import { CrossSearch } from '@/backendTypes' +import { CrossSearch } from '@/shared/types' const crossSearchApi = api.injectEndpoints({ endpoints: builder => ({ diff --git a/frontend/src/redux/localityReducer.ts b/frontend/src/redux/localityReducer.ts index fcf9ffe4..b0996157 100644 --- a/frontend/src/redux/localityReducer.ts +++ b/frontend/src/redux/localityReducer.ts @@ -1,5 +1,5 @@ import { api } from './api' -import { EditDataType, Locality, LocalityDetailsType } from '@/backendTypes' +import { EditDataType, Locality, LocalityDetailsType } from '@/shared/types' const localitiesApi = api.injectEndpoints({ endpoints: builder => ({ diff --git a/frontend/src/redux/museumReducer.ts b/frontend/src/redux/museumReducer.ts index 397256fa..7d125466 100644 --- a/frontend/src/redux/museumReducer.ts +++ b/frontend/src/redux/museumReducer.ts @@ -1,4 +1,4 @@ -import { Museum } from '@/backendTypes' +import { Museum } from '@/shared/types' import { api } from './api' const museumsApi = api.injectEndpoints({ diff --git a/frontend/src/redux/personReducer.ts b/frontend/src/redux/personReducer.ts index 3f20d342..abe799e9 100644 --- a/frontend/src/redux/personReducer.ts +++ b/frontend/src/redux/personReducer.ts @@ -1,5 +1,5 @@ import { api } from './api' -import { PersonDetailsType } from '@/backendTypes' +import { PersonDetailsType } from '@/shared/types' const personsApi = api.injectEndpoints({ endpoints: builder => ({ diff --git a/frontend/src/redux/projectReducer.ts b/frontend/src/redux/projectReducer.ts index 00100ef6..21d1d2cb 100644 --- a/frontend/src/redux/projectReducer.ts +++ b/frontend/src/redux/projectReducer.ts @@ -1,5 +1,5 @@ import { api } from './api' -import { Project, ProjectDetailsType } from '@/backendTypes' +import { Project, ProjectDetailsType } from '@/shared/types' const projectsApi = api.injectEndpoints({ endpoints: builder => ({ diff --git a/frontend/src/redux/referenceReducer.ts b/frontend/src/redux/referenceReducer.ts index d45feeb6..9f82a587 100644 --- a/frontend/src/redux/referenceReducer.ts +++ b/frontend/src/redux/referenceReducer.ts @@ -6,7 +6,7 @@ import { ReferenceDetailsType, ReferenceJournalType, ReferenceType, -} from '@/backendTypes' +} from '@/shared/types' const referencesApi = api.injectEndpoints({ endpoints: builder => ({ diff --git a/frontend/src/redux/regionReducer.ts b/frontend/src/redux/regionReducer.ts index 75b5ce07..ffc85be0 100644 --- a/frontend/src/redux/regionReducer.ts +++ b/frontend/src/redux/regionReducer.ts @@ -1,5 +1,5 @@ import { api } from './api' -import { Region, RegionDetails } from '@/backendTypes' +import { Region, RegionDetails } from '@/shared/types' const regionsApi = api.injectEndpoints({ endpoints: builder => ({ diff --git a/frontend/src/redux/sedimentaryStructureReducer.ts b/frontend/src/redux/sedimentaryStructureReducer.ts index fb085434..3220229d 100644 --- a/frontend/src/redux/sedimentaryStructureReducer.ts +++ b/frontend/src/redux/sedimentaryStructureReducer.ts @@ -1,4 +1,4 @@ -import { SedimentaryStructureValues } from '@/backendTypes' +import { SedimentaryStructureValues } from '@/shared/types' import { api } from './api' const sedimentaryStructuresApi = api.injectEndpoints({ diff --git a/frontend/src/redux/sequenceReducer.ts b/frontend/src/redux/sequenceReducer.ts index 980a0b93..612daa7a 100644 --- a/frontend/src/redux/sequenceReducer.ts +++ b/frontend/src/redux/sequenceReducer.ts @@ -1,5 +1,5 @@ import { api } from './api' -import { Sequence, SequenceDetailsType } from '@/backendTypes' +import { Sequence, SequenceDetailsType } from '@/shared/types' const sequencesApi = api.injectEndpoints({ endpoints: builder => ({ diff --git a/frontend/src/redux/speciesReducer.ts b/frontend/src/redux/speciesReducer.ts index 952b5666..9e18289d 100644 --- a/frontend/src/redux/speciesReducer.ts +++ b/frontend/src/redux/speciesReducer.ts @@ -1,5 +1,5 @@ import { api } from './api' -import { EditDataType, Species, SpeciesDetailsType } from '@/backendTypes' +import { EditDataType, Species, SpeciesDetailsType } from '@/shared/types' const speciesApi = api.injectEndpoints({ endpoints: builder => ({ diff --git a/frontend/src/redux/timeBoundReducer.ts b/frontend/src/redux/timeBoundReducer.ts index 827c5330..f66a8fd3 100644 --- a/frontend/src/redux/timeBoundReducer.ts +++ b/frontend/src/redux/timeBoundReducer.ts @@ -1,5 +1,5 @@ import { api } from './api' -import { EditDataType, TimeBound, TimeBoundDetailsType, TimeUnit } from '@/backendTypes' +import { EditDataType, TimeBound, TimeBoundDetailsType, TimeUnit } from '@/shared/types' const timeboundsApi = api.injectEndpoints({ endpoints: builder => ({ diff --git a/frontend/src/redux/timeUnitReducer.ts b/frontend/src/redux/timeUnitReducer.ts index 73b5eda9..2a68731f 100644 --- a/frontend/src/redux/timeUnitReducer.ts +++ b/frontend/src/redux/timeUnitReducer.ts @@ -1,5 +1,5 @@ import { api } from './api' -import { EditDataType, Locality, Sequence, TimeUnit, TimeUnitDetailsType } from '@/backendTypes' +import { EditDataType, Locality, Sequence, TimeUnit, TimeUnitDetailsType } from '@/shared/types' const timeunitsApi = api.injectEndpoints({ endpoints: builder => ({ diff --git a/frontend/src/backendTypes.d.ts b/frontend/src/shared/types.d.ts similarity index 97% rename from frontend/src/backendTypes.d.ts rename to frontend/src/shared/types.d.ts index 7eec4e22..123b0dde 100644 --- a/frontend/src/backendTypes.d.ts +++ b/frontend/src/shared/types.d.ts @@ -1,6 +1,6 @@ -import * as Prisma from '../../backend/prisma/generated/now_test_client/default' -import * as LogPrisma from '../../backend/prisma/generated/now_log_test_client/default' -import { Role } from './types' +import * as Prisma from '../../../backend/prisma/generated/now_test_client/default' +import * as LogPrisma from '../../../backend/prisma/generated/now_log_test_client/default' +import { Role } from '../types' export type User = { username: string diff --git a/frontend/src/validators/README.md b/frontend/src/shared/validators/README.md similarity index 100% rename from frontend/src/validators/README.md rename to frontend/src/shared/validators/README.md diff --git a/frontend/src/validators/calc.ts b/frontend/src/shared/validators/calc.ts similarity index 100% rename from frontend/src/validators/calc.ts rename to frontend/src/shared/validators/calc.ts diff --git a/frontend/src/validators/countryList.ts b/frontend/src/shared/validators/countryList.ts similarity index 100% rename from frontend/src/validators/countryList.ts rename to frontend/src/shared/validators/countryList.ts diff --git a/frontend/src/validators/locality.ts b/frontend/src/shared/validators/locality.ts similarity index 98% rename from frontend/src/validators/locality.ts rename to frontend/src/shared/validators/locality.ts index 9fd960ed..aa1eee29 100644 --- a/frontend/src/validators/locality.ts +++ b/frontend/src/shared/validators/locality.ts @@ -1,4 +1,4 @@ -import { EditDataType, LocalityDetailsType } from '../backendTypes' +import { EditDataType, LocalityDetailsType } from '../types' import { Validators, validator } from './validator' import { validCountries } from './countryList' diff --git a/frontend/src/validators/reference.ts b/frontend/src/shared/validators/reference.ts similarity index 99% rename from frontend/src/validators/reference.ts rename to frontend/src/shared/validators/reference.ts index 53a234f3..6613f57e 100644 --- a/frontend/src/validators/reference.ts +++ b/frontend/src/shared/validators/reference.ts @@ -1,4 +1,4 @@ -import { EditDataType, ReferenceDetailsType, ReferenceAuthorType, ReferenceJournalType } from '../backendTypes' +import { EditDataType, ReferenceDetailsType, ReferenceAuthorType, ReferenceJournalType } from '../types' import { Validators, validator, ValidationError } from './validator' const authorCheck: (data: ReferenceAuthorType[]) => ValidationError = (data: ReferenceAuthorType[]) => { diff --git a/frontend/src/validators/species.ts b/frontend/src/shared/validators/species.ts similarity index 92% rename from frontend/src/validators/species.ts rename to frontend/src/shared/validators/species.ts index c292547a..694c216e 100644 --- a/frontend/src/validators/species.ts +++ b/frontend/src/shared/validators/species.ts @@ -1,4 +1,4 @@ -import { EditDataType, SpeciesDetailsType } from '../backendTypes' +import { EditDataType, SpeciesDetailsType } from '../types' import { Validators, validator } from './validator' export const validateSpecies = ( diff --git a/frontend/src/validators/timeBound.ts b/frontend/src/shared/validators/timeBound.ts similarity index 89% rename from frontend/src/validators/timeBound.ts rename to frontend/src/shared/validators/timeBound.ts index d9665981..a0873c00 100644 --- a/frontend/src/validators/timeBound.ts +++ b/frontend/src/shared/validators/timeBound.ts @@ -1,4 +1,4 @@ -import { EditDataType, TimeBoundDetailsType } from '../backendTypes' +import { EditDataType, TimeBoundDetailsType } from '../types' import { Validators, validator } from './validator' export const validateTimeBound = ( diff --git a/frontend/src/validators/timeUnit.ts b/frontend/src/shared/validators/timeUnit.ts similarity index 96% rename from frontend/src/validators/timeUnit.ts rename to frontend/src/shared/validators/timeUnit.ts index acd29af8..bc4ee7f7 100644 --- a/frontend/src/validators/timeUnit.ts +++ b/frontend/src/shared/validators/timeUnit.ts @@ -1,4 +1,4 @@ -import { EditDataType, TimeUnitDetailsType } from '../backendTypes' +import { EditDataType, TimeUnitDetailsType } from '../types' import { Validators, validator } from './validator' export const validateTimeUnit = (editData: EditDataType, fieldName: keyof TimeUnitDetailsType) => { diff --git a/frontend/src/validators/validator.ts b/frontend/src/shared/validators/validator.ts similarity index 100% rename from frontend/src/validators/validator.ts rename to frontend/src/shared/validators/validator.ts diff --git a/frontend/src/types.ts b/frontend/src/types.ts index 51ce0e9e..726ca29d 100644 --- a/frontend/src/types.ts +++ b/frontend/src/types.ts @@ -8,7 +8,7 @@ export enum Role { ReadOnly = 7, } -import { EditDataType, LocalityDetailsType } from '../src/backendTypes' +import { EditDataType, LocalityDetailsType } from '../src/shared/types' export const calculateMeanHypsodonty = (locality: LocalityDetailsType) => { // Mean hypsodonty calculation has been made based on html/include/database.php line 2567 onwards diff --git a/shared/types.d.ts b/shared/types.d.ts deleted file mode 100644 index e69de29b..00000000