Skip to content

Polymorphic #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 7, 2025
Merged

Polymorphic #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67fba60
polymor
SerVitasik Mar 7, 2025
9873c6f
fix: handle null resourceId in polymorphic foreign resources
SerVitasik Mar 7, 2025
6e9d900
Merge branch 'next' of github.com:devforth/adminforth into polymorphic
SerVitasik Mar 7, 2025
e7544c3
Merge branch 'next' of github.com:devforth/adminforth into polymorphic
SerVitasik Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions adminforth/modules/configValidator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,6 @@ export default class ConfigValidator implements IConfigValidator {
}

if (col.foreignResource) {

if (!col.foreignResource.resourceId) {
// resourceId is absent or empty
if (!col.foreignResource.polymorphicResources && !col.foreignResource.polymorphicOn) {
Expand All @@ -550,11 +549,11 @@ export default class ConfigValidator implements IConfigValidator {
}
// we do || here because 'resourceId' might yet not be assigned from 'table'
col.foreignResource.polymorphicResources.forEach((polymorphicResource, polymorphicResourceIndex) => {
if (!polymorphicResource.resourceId) {
if (polymorphicResource.resourceId === undefined) {
errors.push(`Resource "${res.resourceId}" column "${col.name}" has polymorphic foreign resource without resourceId`);
} else if (!polymorphicResource.whenValue) {
errors.push(`Resource "${res.resourceId}" column "${col.name}" has polymorphic foreign resource without whenValue`);
} else {
} else if (polymorphicResource.resourceId !== null) {
const resource = this.inputConfig.resources.find((r) => r.resourceId === polymorphicResource.resourceId || r.table === polymorphicResource.resourceId);
if (!resource) {
const similar = suggestIfTypo(this.inputConfig.resources.map((r) => r.resourceId || r.table), polymorphicResource.resourceId);
Expand Down
36 changes: 32 additions & 4 deletions adminforth/modules/restApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,14 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
const targetResourcePkFields = {};
const pksUniques = {};
col.foreignResource.polymorphicResources.forEach((pr) => {
targetResources[pr.whenValue] = this.adminforth.config.resources.find((res) => res.resourceId == pr.resourceId);
if (pr.resourceId === null) {
return;
}
const targetResource = this.adminforth.config.resources.find((res) => res.resourceId == pr.resourceId);
if (!targetResource) {
return;
}
targetResources[pr.whenValue] = targetResource;
targetConnectors[pr.whenValue] = this.adminforth.connectors[targetResources[pr.whenValue].dataSource];
targetResourcePkFields[pr.whenValue] = targetResources[pr.whenValue].columns.find((col) => col.primaryKey).name;
const pksUnique = [...new Set(data.data.filter((item) => item[col.foreignResource.polymorphicOn] === pr.whenValue).map((item) => item[col.name]))];
Expand Down Expand Up @@ -747,6 +754,13 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {

data.data.forEach((item) => {
item[col.name] = targetDataMap[item[col.name]];

if (!item[col.name]) {
const systemResource = col.foreignResource.polymorphicResources.find(pr => pr.resourceId === null);
if (systemResource) {
item[col.foreignResource.polymorphicOn] = systemResource.whenValue;
}
}
});
})
);
Expand Down Expand Up @@ -819,7 +833,7 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
return { error: `Column '${column}' in resource '${resourceId}' is not a foreign key` };
}

const targetResourceIds = columnConfig.foreignResource.resourceId ? [columnConfig.foreignResource.resourceId] : columnConfig.foreignResource.polymorphicResources.map((pr) => pr.resourceId);
const targetResourceIds = columnConfig.foreignResource.resourceId ? [columnConfig.foreignResource.resourceId] : columnConfig.foreignResource.polymorphicResources.filter(pr => pr.resourceId !== null).map((pr) => pr.resourceId);
const targetResources = targetResourceIds.map((trId) => this.adminforth.config.resources.find((res) => res.resourceId == trId));

const responses = (await Promise.all(
Expand Down Expand Up @@ -974,7 +988,14 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
const targetConnectors = {};
const targetResourcePkFields = {};
column.foreignResource.polymorphicResources.forEach((pr) => {
targetResources[pr.whenValue] = this.adminforth.config.resources.find((res) => res.resourceId == pr.resourceId);
if (pr.resourceId === null) {
return;
}
const targetResource = this.adminforth.config.resources.find((res) => res.resourceId == pr.resourceId);
if (!targetResource) {
return;
}
targetResources[pr.whenValue] = targetResource;
targetConnectors[pr.whenValue] = this.adminforth.connectors[targetResources[pr.whenValue].dataSource];
targetResourcePkFields[pr.whenValue] = targetResources[pr.whenValue].columns.find((col) => col.primaryKey).name;
});
Expand Down Expand Up @@ -1062,7 +1083,14 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
const targetConnectors = {};
const targetResourcePkFields = {};
column.foreignResource.polymorphicResources.forEach((pr) => {
targetResources[pr.whenValue] = this.adminforth.config.resources.find((res) => res.resourceId == pr.resourceId);
if (pr.resourceId === null) {
return;
}
const targetResource = this.adminforth.config.resources.find((res) => res.resourceId == pr.resourceId);
if (!targetResource) {
return;
}
targetResources[pr.whenValue] = targetResource;
targetConnectors[pr.whenValue] = this.adminforth.connectors[targetResources[pr.whenValue].dataSource];
targetResourcePkFields[pr.whenValue] = targetResources[pr.whenValue].columns.find((col) => col.primaryKey).name;
});
Expand Down
4 changes: 4 additions & 0 deletions dev-demo/resources/api_keys.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ export default {
resourceId: 'providers',
whenValue: 'provider',
},
{
resourceId: null,
whenValue: 'Syst1em',
},
],
polymorphicOn: 'owner',
},
Expand Down