adminforth 3.19.0 → 3.20.0

package/dist/modules/recordId.js

@@ -0,0 +1,102 @@
+/**
+ * Separator used to glue values of composite primary key columns into one record id string.
+ * Values are URI-encoded before gluing, and '~' inside of value is escaped to '%7E',
+ * so separator can't appear in encoded parts.
+ */
+export const COMPOSITE_RECORD_ID_SEPARATOR = '~';
+/**
+ * Returns all columns marked with primaryKey: true, in order in which they are defined in resource.
+ * For resources with composite primary key returns more than one column.
+ */
+export function primaryKeyColumns(resource) {
+    var _a;
+    const columns = (((_a = resource.dataSourceColumns) === null || _a === void 0 ? void 0 : _a.length) ? resource.dataSourceColumns : resource.columns) || [];
+    return columns.filter((col) => col.primaryKey);
+}
+export function primaryKeyColumnNames(resource) {
+    return primaryKeyColumns(resource).map((col) => col.name);
+}
+export function isCompositePrimaryKey(resource) {
+    return primaryKeyColumns(resource).length > 1;
+}
+function escapeRecordIdPart(value) {
+    // encodeURIComponent does not escape '~' (it is unreserved), so escape it manually
+    return encodeURIComponent(String(value)).replace(/~/g, '%7E');
+}
+function unescapeRecordIdPart(part) {
+    return decodeURIComponent(part);
+}
+/**
+ * Foreign resource columns are returned to frontend as { pk, label } objects,
+ * so unwrap them when record id is built from such record
+ */
+function unwrapPrimaryKeyValue(value) {
+    if (value !== null && typeof value === 'object' && 'pk' in value) {
+        return value.pk;
+    }
+    return value;
+}
+/**
+ * Builds record id (value used in urls and in all AdminForth APIs) from record object.
+ *
+ * For resource with single primary key column returns raw value of that column (no encoding is done,
+ * so behavior is fully backward compatible).
+ *
+ * For resource with composite primary key returns string like 'BTC~ERC20' where each part is
+ * URI-encoded value of corresponding primary key column, in order of definition in resource.
+ */
+export function encodeRecordId(resource, record) {
+    const pkColumns = primaryKeyColumns(resource);
+    if (!pkColumns.length) {
+        throw new Error(`Resource '${resource.resourceId}' has no primaryKey column`);
+    }
+    if (pkColumns.length === 1) {
+        return unwrapPrimaryKeyValue(record === null || record === void 0 ? void 0 : record[pkColumns[0].name]);
+    }
+    return pkColumns.map((col) => {
+        const value = unwrapPrimaryKeyValue(record === null || record === void 0 ? void 0 : record[col.name]);
+        if (value === undefined || value === null) {
+            throw new Error(`Can't build record id for resource '${resource.resourceId}': primary key column '${col.name}' has no value in record`);
+        }
+        return escapeRecordIdPart(value);
+    }).join(COMPOSITE_RECORD_ID_SEPARATOR);
+}
+/**
+ * Splits record id back into values of primary key columns.
+ * Returns object like { assetSymbol: 'BTC', networkCode: 'ERC20' }.
+ *
+ * Values are returned as strings for composite keys (they come from url/API),
+ * connectors cast them to column types using setFieldValue.
+ */
+export function decodeRecordId(resource, recordId) {
+    const pkColumns = primaryKeyColumns(resource);
+    if (!pkColumns.length) {
+        throw new Error(`Resource '${resource.resourceId}' has no primaryKey column`);
+    }
+    if (pkColumns.length === 1) {
+        return { [pkColumns[0].name]: recordId };
+    }
+    const parts = String(recordId).split(COMPOSITE_RECORD_ID_SEPARATOR);
+    if (parts.length !== pkColumns.length) {
+        throw new Error(`Record id '${recordId}' is not valid for resource '${resource.resourceId}': expected ${pkColumns.length} ` +
+            `parts (${pkColumns.map((col) => col.name).join(', ')}) separated by '${COMPOSITE_RECORD_ID_SEPARATOR}', got ${parts.length}`);
+    }
+    return pkColumns.reduce((acc, col, i) => {
+        acc[col.name] = unescapeRecordIdPart(parts[i]);
+        return acc;
+    }, {});
+}
+/**
+ * Returns pkValues argument for connector's updateRecordOriginalValues/deleteRecord.
+ *
+ * Returns undefined for resources with single primary key, so connectors receive exactly the same
+ * arguments as before composite primary key support was added (pure extension, old path untouched).
+ */
+export function compositePkValues(connector, resource, recordId) {
+    var _a;
+    if (!isCompositePrimaryKey(resource)) {
+        return undefined;
+    }
+    return (_a = connector.getPrimaryKeyValues) === null || _a === void 0 ? void 0 : _a.call(connector, resource, recordId);
+}
+//# sourceMappingURL=recordId.js.map

package/dist/modules/recordId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recordId.js","sourceRoot":"","sources":["../../modules/recordId.ts"],"names":[],"mappings":"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"}

package/dist/modules/restApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"restApi.d.ts","sourceRoot":"","sources":["../../modules/restApi.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,WAAW,EAGhB,kBAAkB,EAMlB,kBAAkB,EAClB,kBAAkB,EAElB,SAAS,EAKV,MAAM,kBAAkB,CAAC;AAO1B,OAAO,EAA+F,WAAW,EAAE,MAAM,YAAY,CAAC;AAGtI,OAAO,EAAE,iBAAiB,EAEvB,SAAS,EAAsB,sBAAsB,EAGtC,MAAM,oBAAoB,CAAC;AAuO7C,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAI/E;AA0XD,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,kBAAkB,EAC5B,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,iBAAiB,EACzB,UAAU,EAAE,WAAW,GACtB,OAAO,CAAC;IAAC,cAAc,EAAE,sBAAsB,CAAA;CAAC,CAAC,CAyCnD;AAED,MAAM,CAAC,OAAO,OAAO,iBAAkB,YAAW,kBAAkB;IAElE,UAAU,EAAE,WAAW,CAAC;IACxB,iBAAiB,EAAE,WAAW,EAAE,CAAM;gBAE1B,UAAU,EAAE,WAAW;YAGrB,uBAAuB;IAerC,OAAO,CAAC,oBAAoB;IAkB5B;;OAEG;IACG,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,kBAAkB,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAYxH,qBAAqB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,EAAC,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,MAAM;IAsBpL,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO;IAOnD,iBAAiB,CAAC,MAAM,EAAE,WAAW;CA04DtC"}
+{"version":3,"file":"restApi.d.ts","sourceRoot":"","sources":["../../modules/restApi.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,WAAW,EAGhB,kBAAkB,EAMlB,kBAAkB,EAClB,kBAAkB,EAElB,SAAS,EAKV,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EAA+F,WAAW,EAAE,MAAM,YAAY,CAAC;AAGtI,OAAO,EAAE,iBAAiB,EAEvB,SAAS,EAAsB,sBAAsB,EAGtC,MAAM,oBAAoB,CAAC;AAuO7C,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAI/E;AA0XD,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,kBAAkB,EAC5B,IAAI,EAAE,GAAG,EACT,MAAM,EAAE,iBAAiB,EACzB,UAAU,EAAE,WAAW,GACtB,OAAO,CAAC;IAAC,cAAc,EAAE,sBAAsB,CAAA;CAAC,CAAC,CAyCnD;AAED,MAAM,CAAC,OAAO,OAAO,iBAAkB,YAAW,kBAAkB;IAElE,UAAU,EAAE,WAAW,CAAC;IACxB,iBAAiB,EAAE,WAAW,EAAE,CAAM;gBAE1B,UAAU,EAAE,WAAW;YAGrB,uBAAuB;IAerC,OAAO,CAAC,oBAAoB;IAkB5B;;OAEG;IACG,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,kBAAkB,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAYxH,qBAAqB,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,EAAC,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,MAAM;IAsBpL,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO;IAOnD,iBAAiB,CAAC,MAAM,EAAE,WAAW;CAo9DtC"}

package/dist/modules/restApi.js

@@ -11,6 +11,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { Filters, } from "../types/Back.js";
 import { cascadeChildrenDelete } from './utils.js';
+import { encodeRecordId, isCompositePrimaryKey, primaryKeyColumnNames } from './recordId.js';
 import { afLogger } from "./logger.js";
 import { ADMINFORTH_VERSION, listify, getLoginPromptHTML, hookResponseError, parseLooseJson, RateLimiter } from './utils.js';
 import AdminForthAuth from "../auth.js";
@@ -1170,7 +1171,20 @@ export default class AdminForthRestAPI {
                 }
                 const meta = { requestBody: body, pk: undefined };
                 if ((source === 'edit' || source === 'show') && body.filters) {
-                    meta.pk = (_a = body.filters.find((f) => f.field === resource.columns.find((col) => col.primaryKey).name)) === null || _a === void 0 ? void 0 : _a.value;
+                    if (isCompositePrimaryKey(resource)) {
+                        const pkFieldNames = primaryKeyColumnNames(resource);
+                        const pkValues = pkFieldNames.reduce((acc, name) => {
+                            var _a;
+                            acc[name] = (_a = body.filters.find((f) => f.field === name)) === null || _a === void 0 ? void 0 : _a.value;
+                            return acc;
+                        }, {});
+                        if (pkFieldNames.every((name) => pkValues[name] !== undefined)) {
+                            meta.pk = encodeRecordId(resource, pkValues);
+                        }
+                    }
+                    else {
+                        meta.pk = (_a = body.filters.find((f) => f.field === resource.columns.find((col) => col.primaryKey).name)) === null || _a === void 0 ? void 0 : _a.value;
+                    }
                 }
                 const { allowedActions } = await interpretResource(adminUser, resource, meta, {
                     'show': ActionCheckSource.ShowRequest,
@@ -1237,6 +1251,12 @@ export default class AdminForthRestAPI {
                             selectedDataSourceColumnNameSet.add(col.foreignResource.polymorphicOn);
                         }
                     }
+                    if (isCompositePrimaryKey(resource)) {
+                        // all key columns are needed to build record id out of the row
+                        for (const pkName of primaryKeyColumnNames(resource)) {
+                            selectedDataSourceColumnNameSet.add(pkName);
+                        }
+                    }
                 }
                 const selectedDataSourceColumns = selectedDataSourceColumnNameSet && !shouldAddListHelpers
                     ? (resource.dataSourceColumns.some((col) => selectedDataSourceColumnNameSet.has(col.name))
@@ -1287,6 +1307,12 @@ export default class AdminForthRestAPI {
                     getTotals: source === 'list',
                     columns: selectedDataSourceColumns,
                 });
+                if (shouldAddListHelpers && isCompositePrimaryKey(resource)) {
+                    // single primary key rows keep exactly the shape they had before, frontend derives id itself
+                    for (const item of data.data) {
+                        item._primaryKeyValue = encodeRecordId(resource, item);
+                    }
+                }
                 // for foreign keys, add references
                 await Promise.all(resource.columns.filter((col) => (col.foreignResource && (!selectedColumnNameSet || shouldAddListHelpers || selectedColumnNameSet.has(col.name)))).map(async (col) => {
                     let targetDataMap = {};
@@ -1412,6 +1438,9 @@ export default class AdminForthRestAPI {
                     };
                     for (const item of data.data) {
                         for (const key of Object.keys(item)) {
+                            if (key === '_primaryKeyValue') {
+                                continue;
+                            }
                             const col = resource.columns.find((c) => c.name === key);
                             const bo = col ? await isBackendOnly(col, ctx) : true;
                             if (!col || bo) {
@@ -1451,15 +1480,20 @@ export default class AdminForthRestAPI {
                 if (selectedColumnNameSet) {
                     for (const item of data.data) {
                         for (const key of Object.keys(item)) {
-                            if (!selectedColumnNameSet.has(key) && key !== '_label' && key !== '_clickUrl') {
+                            if (!selectedColumnNameSet.has(key) && key !== '_label' && key !== '_clickUrl' && key !== '_primaryKeyValue') {
                                 delete item[key];
                             }
                         }
                     }
                 }
                 if (source === 'list') {
-                    const pkField = resource.columns.find((col) => col.primaryKey).name;
-                    data.recordIds = data.data.map((item) => item[pkField]);
+                    if (isCompositePrimaryKey(resource)) {
+                        data.recordIds = data.data.map((item) => { var _a; return (_a = item._primaryKeyValue) !== null && _a !== void 0 ? _a : encodeRecordId(resource, item); });
+                    }
+                    else {
+                        const pkField = resource.columns.find((col) => col.primaryKey).name;
+                        data.recordIds = data.data.map((item) => item[pkField]);
+                    }
                 }
                 return data;
             },
@@ -1899,11 +1933,25 @@ export default class AdminForthRestAPI {
                         }
                     }
                 }
-                const primaryKeyColumn = resource.columns.find((col) => col.primaryKey);
-                if (record[primaryKeyColumn.name] !== undefined) {
-                    const existingRecord = await this.adminforth.resource(resource.resourceId).get([Filters.EQ(primaryKeyColumn.name, record[primaryKeyColumn.name])]);
-                    if (existingRecord) {
-                        return { error: `Record with ${primaryKeyColumn.name} '${record[primaryKeyColumn.name]}' already exists`, ok: false };
+                if (isCompositePrimaryKey(resource)) {
+                    const createPkColumnNames = primaryKeyColumnNames(resource);
+                    if (createPkColumnNames.every((name) => record[name] !== undefined)) {
+                        const existingRecord = await this.adminforth.resource(resource.resourceId).get(createPkColumnNames.map((name) => Filters.EQ(name, record[name])));
+                        if (existingRecord) {
+                            return {
+                                error: `Record with ${createPkColumnNames.map((name) => `${name} '${record[name]}'`).join(', ')} already exists`,
+                                ok: false,
+                            };
+                        }
+                    }
+                }
+                else {
+                    const primaryKeyColumn = resource.columns.find((col) => col.primaryKey);
+                    if (record[primaryKeyColumn.name] !== undefined) {
+                        const existingRecord = await this.adminforth.resource(resource.resourceId).get([Filters.EQ(primaryKeyColumn.name, record[primaryKeyColumn.name])]);
+                        if (existingRecord) {
+                            return { error: `Record with ${primaryKeyColumn.name} '${record[primaryKeyColumn.name]}' already exists`, ok: false };
+                        }
                     }
                 }
                 const ctxCreate = {
@@ -1999,9 +2047,12 @@ export default class AdminForthRestAPI {
                     };
                 }
                 const connector = this.adminforth.connectors[resource.dataSource];
+                const newRecordId = isCompositePrimaryKey(resource)
+                    ? encodeRecordId(resource, createRecordResponse.createdRecord)
+                    : createRecordResponse.createdRecord[connector.getPrimaryKey(resource)];
                 return {
-                    newRecordId: createRecordResponse.createdRecord[connector.getPrimaryKey(resource)],
-                    redirectToRecordId: createRecordResponse.createdRecord[connector.getPrimaryKey(resource)],
+                    newRecordId,
+                    redirectToRecordId: newRecordId,
                     ok: true
                 };
             }
@@ -2026,7 +2077,7 @@ export default class AdminForthRestAPI {
                 const oldRecord = await connector.getRecordByPrimaryKey(resource, recordId);
                 if (!oldRecord) {
                     const primaryKeyColumn = resource.columns.find((col) => col.primaryKey);
-                    return { error: `Record with ${primaryKeyColumn.name} ${recordId} not found` };
+                    return { error: `Record with ${isCompositePrimaryKey(resource) ? primaryKeyColumnNames(resource).join(', ') : primaryKeyColumn.name} ${recordId} not found` };
                 }
                 const record = body['record'];
                 const { allowedActions } = await interpretResource(adminUser, resource, { requestBody: body, newRecord: record, oldRecord, pk: recordId }, ActionCheckSource.EditRequest, this.adminforth);
@@ -2034,11 +2085,30 @@ export default class AdminForthRestAPI {
                 if (!allowed) {
                     return { error: allowedError };
                 }
-                const primaryKeyColumn = resource.columns.find((col) => col.primaryKey);
-                if (record[primaryKeyColumn.name] !== undefined) {
-                    const existingRecord = await this.adminforth.resource(resource.resourceId).get([Filters.EQ(primaryKeyColumn.name, record[primaryKeyColumn.name])]);
-                    if (existingRecord) {
-                        return { error: `Record with ${primaryKeyColumn.name} '${record[primaryKeyColumn.name]}' already exists`, ok: false };
+                if (isCompositePrimaryKey(resource)) {
+                    const pkColumnNames = primaryKeyColumnNames(resource);
+                    const pkIsChanged = pkColumnNames.some((name) => record[name] !== undefined && String(record[name]) !== String(oldRecord[name]));
+                    if (pkIsChanged) {
+                        const newPkValues = pkColumnNames.reduce((acc, name) => {
+                            acc[name] = record[name] !== undefined ? record[name] : oldRecord[name];
+                            return acc;
+                        }, {});
+                        const existingRecord = await this.adminforth.resource(resource.resourceId).get(pkColumnNames.map((name) => Filters.EQ(name, newPkValues[name])));
+                        if (existingRecord) {
+                            return {
+                                error: `Record with ${pkColumnNames.map((name) => `${name} '${newPkValues[name]}'`).join(', ')} already exists`,
+                                ok: false,
+                            };
+                        }
+                    }
+                }
+                else {
+                    const primaryKeyColumn = resource.columns.find((col) => col.primaryKey);
+                    if (record[primaryKeyColumn.name] !== undefined) {
+                        const existingRecord = await this.adminforth.resource(resource.resourceId).get([Filters.EQ(primaryKeyColumn.name, record[primaryKeyColumn.name])]);
+                        if (existingRecord) {
+                            return { error: `Record with ${primaryKeyColumn.name} '${record[primaryKeyColumn.name]}' already exists`, ok: false };
+                        }
                     }
                 }
                 const ctxEdit = {
@@ -2129,7 +2199,9 @@ export default class AdminForthRestAPI {
                     return { error };
                 }
                 return {
-                    recordId: record.id,
+                    recordId: isCompositePrimaryKey(resource)
+                        ? encodeRecordId(resource, Object.assign(Object.assign({}, oldRecord), record))
+                        : record.id,
                     ok: true
                 };
             }