diff --git a/admin/index.ts b/admin/index.ts index 25a33b38..df3149f4 100644 --- a/admin/index.ts +++ b/admin/index.ts @@ -36,6 +36,7 @@ import { ModelAssumptionResource } from "./resources/model-assumptions/model-ass import { UserUploadCostInputs } from "@shared/entities/users/user-upload-cost-inputs.entity.js"; import { UserUploadConservationInputs } from "@shared/entities/users/user-upload-conservation-inputs.entity.js"; import { UserUploadRestorationInputs } from "@shared/entities/users/user-upload-restoration-inputs.entity.js"; +import { GLOBAL_COMMON_PROPERTIES } from "./resources/common/common.resources.js"; AdminJS.registerAdapter({ Database: AdminJSTypeorm.Database, @@ -70,6 +71,9 @@ const start = async () => { name: "User Data", icon: "File", }, + properties: { + ...GLOBAL_COMMON_PROPERTIES, + } }, }, { @@ -80,6 +84,9 @@ const start = async () => { name: "User Data", icon: "File", }, + properties: { + ...GLOBAL_COMMON_PROPERTIES, + } }, }, { @@ -90,6 +97,9 @@ const start = async () => { name: "User Data", icon: "File", }, + properties: { + ...GLOBAL_COMMON_PROPERTIES, + } }, }, ProjectSizeResource, diff --git a/admin/resources/conservation-and-planning-admin/conservation-and-planning-admin.resource.ts b/admin/resources/conservation-and-planning-admin/conservation-and-planning-admin.resource.ts index 99e18482..4cf58646 100644 --- a/admin/resources/conservation-and-planning-admin/conservation-and-planning-admin.resource.ts +++ b/admin/resources/conservation-and-planning-admin/conservation-and-planning-admin.resource.ts @@ -1,11 +1,11 @@ import { ResourceWithOptions } from "adminjs"; import { ConservationPlanningAndAdmin } from "@shared/entities/cost-inputs/conservation-and-planning-admin.entity.js"; -import { GLOBAL_COMMON_PROPERTIES, COMMON_RESOURCE_LIST_PROPERTIES } from "../common/common.resources.js"; +import { GLOBAL_COMMON_PROPERTIES } from "../common/common.resources.js"; export const ConservationAndPlanningAdminResource: ResourceWithOptions = { resource: ConservationPlanningAndAdmin, options: { - properties: {...COMMON_RESOURCE_LIST_PROPERTIES, ...GLOBAL_COMMON_PROPERTIES}, + properties: {...GLOBAL_COMMON_PROPERTIES}, sort: { sortBy: "planningCost", direction: "desc",