Merge pull request #1391 from PhilanthropyDataCommons/1390-fix-base-fields

Fix base field lookup

Author: slifty

apps/admin-interface/package.json

@@ -6,7 +6,7 @@
 		"@dsb-norge/vue-keycloak-js": "^3.0.3",
 		"@fontsource/source-sans-pro": "^5.2.5",
 		"@heroicons/vue": "^2.2.0",
-		"@pdc/sdk": "^0.26.1",
+		"@pdc/sdk": "^0.35.1",
 		"@vitejs/plugin-vue": "^6.0.6",
 		"@vue/compiler-sfc": "^3.5.33",
 		"dayjs": "^1.11.20",

apps/admin-interface/src/baseFieldCategories.ts

@@ -0,0 +1,13 @@
+export enum BaseFieldCategory {
+	Project = 'project',
+	Organization = 'organization',
+	NeedsAssessment = 'needs_assessment',
+	Methodology = 'methodology',
+	Budget = 'budget',
+	Evaluation = 'evaluation',
+	Sustainability = 'sustainability',
+	Partnerships = 'partnerships',
+	Outcomes = 'outcomes',
+	Technical = 'technical',
+	Uncategorized = 'uncategorized',
+}

apps/admin-interface/src/components/BaseFieldForm.vue

@@ -16,6 +16,7 @@ import {
 } from '@pdc/components';
 import { getLogger } from '@pdc/utilities';
 import { ref, computed } from 'vue';
+import { BaseFieldCategory } from '../baseFieldCategories';
 import RelevanceDurationInput from './RelevanceDurationInput.vue';
 import CautionZone from './CautionZone.vue';
 
@@ -26,7 +27,6 @@ const props = defineProps<{
 }>();
 const {
 	DataTypeEnum: BaseFieldDataType,
-	CategoryEnum: BaseFieldCategory,
 	SensitivityClassificationEnum: BaseFieldSensitivityClassification,
 } = BaseField;
 const emit = defineEmits<{ 'update:base-field': [baseField: BaseField] }>();
@@ -140,11 +140,11 @@ const updateField = (field: string, value: string | number | null): void => {
 							</template>
 						</SelectInput>
 						<SelectInput
-							:model-value="props.baseField.category || ''"
+							:model-value="(props.baseField.category as string) || ''"
 							:options="
 								Object.values(BaseFieldCategory).map((category) => ({
-									label: category,
-									value: category,
+									label: category as string,
+									value: category as string,
 								}))
 							"
 							@update:model-value="

apps/admin-interface/src/pdc-api.ts

@@ -1,14 +1,14 @@
 import { usePdcApi, usePdcCallbackApi } from '@pdc/utilities';
-import type { BaseField, WritableBaseField } from '@pdc/sdk';
+import type { BaseField, BaseFieldBundle, WritableBaseField } from '@pdc/sdk';
 
 const DEFAULT_ENTITY_PAGE = 1;
 const DEFAULT_ENTITY_COUNT = 200;
 
 export function useBaseFields(
 	page: number = DEFAULT_ENTITY_PAGE,
 	count: number = DEFAULT_ENTITY_COUNT,
-): ReturnType<typeof usePdcApi<BaseField[]>> {
-	return usePdcApi<BaseField[]>(
+): ReturnType<typeof usePdcApi<BaseFieldBundle>> {
+	return usePdcApi<BaseFieldBundle>(
 		'/baseFields',
 		new URLSearchParams({
 			_page: page.toString(),

apps/admin-interface/src/views/AddBaseFieldView.vue

@@ -3,13 +3,13 @@ import { useRouter } from 'vue-router';
 import { ref } from 'vue';
 import { usePutBaseFieldsCallback } from '../pdc-api';
 import { BaseField } from '@pdc/sdk';
+import { BaseFieldCategory } from '../baseFieldCategories';
 import BaseFieldForm from '../components/BaseFieldForm.vue';
 
 const DEFAULT_RELEVANCE_HOURS = 0;
 const router = useRouter();
 const {
 	DataTypeEnum: BaseFieldDataType,
-	CategoryEnum: BaseFieldCategory,
 	SensitivityClassificationEnum: BaseFieldSensitivityClassification,
 } = BaseField;
 

apps/admin-interface/src/views/BaseFieldsView.vue

@@ -24,7 +24,7 @@ const caughtError = ref(false);
 
 const baseFieldsArray = computed(() => {
 	if (baseFields.value === null) return [];
-	return [...baseFields.value].sort((a, b) =>
+	return [...baseFields.value.entries].sort((a, b) =>
 		dateCompare(a.createdAt, b.createdAt),
 	);
 });

apps/admin-interface/src/views/EditBaseFieldView.vue

@@ -18,7 +18,7 @@ const { data: baseFields, fetchData: fetchBaseFields } = useBaseFields();
 onMounted(async () => {
 	try {
 		await fetchBaseFields();
-		baseField.value = baseFields.value?.find(
+		baseField.value = baseFields.value?.entries.find(
 			(baseField) => baseField.shortCode === baseFieldShortCode,
 		);
 	} catch (error: unknown) {

apps/user-tools/package.json

@@ -6,7 +6,7 @@
 		"@dsb-norge/vue-keycloak-js": "^3.0.3",
 		"@fontsource/source-sans-pro": "^5.2.5",
 		"@heroicons/vue": "^2.2.0",
-		"@pdc/sdk": "^0.33.1",
+		"@pdc/sdk": "^0.35.1",
 		"@vitejs/plugin-vue": "^6.0.6",
 		"@vue/compiler-sfc": "^3.5.33",
 		"dayjs": "^1.11.20",

apps/user-tools/src/components/bulk-upload/BaseFieldsTable.vue

@@ -7,18 +7,19 @@ import {
 	createColumnHelper,
 } from '@pdc/components';
 import { BaseField } from '@pdc/sdk';
+import type { BaseFieldBundle } from '@pdc/sdk';
 import { computed } from 'vue';
 
 export interface BaseFieldsTableProps {
-	baseFields: BaseField[] | null;
+	baseFields: BaseFieldBundle | null;
 	isLoading: boolean;
 }
 
 const props = defineProps<BaseFieldsTableProps>();
 
 const publicBaseFields = computed(
 	() =>
-		props.baseFields?.filter(
+		props.baseFields?.entries.filter(
 			(baseField) =>
 				baseField.sensitivityClassification ===
 				BaseField.SensitivityClassificationEnum.Public,

apps/user-tools/src/pdc-api.ts

@@ -10,7 +10,7 @@ import type {
 	BulkUploadTask,
 	SourceBundle,
 	FunderBundle,
-	BaseField,
+	BaseFieldBundle,
 	ApplicationFormBundle,
 	OpportunityBundle,
 	Opportunity,
@@ -183,8 +183,8 @@ export function useFunders(
 export function useBaseFields(
 	page: number = DEFAULT_ENTITY_PAGE,
 	count: number = DEFAULT_ENTITY_COUNT,
-): ReturnType<typeof usePdcApi<BaseField[]>> {
-	return usePdcApi<BaseField[]>(
+): ReturnType<typeof usePdcApi<BaseFieldBundle>> {
+	return usePdcApi<BaseFieldBundle>(
 		'/baseFields',
 		new URLSearchParams({
 			_page: page.toString(),