Skip to content

fix: update handling of polymorphic foreign resources to correctly as… #157

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 2 commits into from
Mar 19, 2025
Merged

fix: update handling of polymorphic foreign resources to correctly as… #157

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6753a35
fix: update handling of polymorphic foreign resources to correctly as…
SerVitasik Mar 19, 2025
dafe8dc
Merge branch 'next' into polymorphic-resources
SerVitasik Mar 19, 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
20 changes: 9 additions & 11 deletions adminforth/modules/restApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,22 +764,14 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
}

data.data.forEach((item) => {
item[col.name] = targetDataMap[item[col.name]];
if (col.isArray?.enabled) {
if (item[col.name]?.length) {
item[col.name] = item[col.name].map((i) => targetDataMap[i]);
}
} else {
item[col.name] = targetDataMap[item[col.name]];
}

if (!item[col.name]) {
if (col.foreignResource && col.foreignResource.polymorphicResources) {
const systemResource = col.foreignResource.polymorphicResources.find(pr => pr.resourceId === null);
if (systemResource) {
item[col.foreignResource.polymorphicOn] = systemResource.whenValue;
}
}
}
});
})
);
Expand Down Expand Up @@ -1002,7 +994,10 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {

// for polymorphic foreign resources, we need to find out the value for polymorphicOn column
for (const column of resource.columns) {
if (column.foreignResource?.polymorphicOn && record[column.name]) {
if (column.foreignResource?.polymorphicOn && record[column.name] === null) {
const systemResource = column.foreignResource.polymorphicResources.find(pr => pr.resourceId === null);
record[column.foreignResource.polymorphicOn] = systemResource.whenValue;
} else if (column.foreignResource?.polymorphicOn && record[column.name]) {
const targetResources = {};
const targetConnectors = {};
const targetResourcePkFields = {};
Expand Down Expand Up @@ -1095,7 +1090,10 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {

// for polymorphic foreign resources, we need to find out the value for polymorphicOn column
for (const column of resource.columns) {
if (column.foreignResource?.polymorphicOn && record[column.name] !== undefined) {
if (column.foreignResource?.polymorphicOn && record[column.name] === null) {
const systemResource = column.foreignResource.polymorphicResources.find(pr => pr.resourceId === null);
record[column.foreignResource.polymorphicOn] = systemResource.whenValue;
} else if (column.foreignResource?.polymorphicOn && record[column.name]) {
let newPolymorphicOnValue = null;
if (record[column.name]) {
const targetResources = {};
Expand Down