fix(model): Fix clone method in QTableMetaData and QHelpContent, whic… #33

Merged
darinkelkhoff merged 1 commits from feature/table-meta-data-clone into develop 2025-10-16 17:06:48 +00:00
3 changed files with 71 additions and 26 deletions

No files matched your search

+7 -4
View File
@@ -116,10 +116,13 @@ export class QHelpContent
rolesClone.add(role);
});
const clone = new QHelpContent({
...this,
roles: rolesClone
});
const clone = new QHelpContent({...this});
////////////////////////////////////////////////////////////////////////////////
// sets don't quite work as expected for this kind of clone, so copy manually //
////////////////////////////////////////////////////////////////////////////////
clone.roles = rolesClone
return (clone);
}
+17 -18
View File
@@ -119,16 +119,16 @@ export class QTableMetaData
public clone(): QTableMetaData
{
const fieldsClone = this.fields ? new Map() : undefined;
if(this.fields && fieldsClone)
if (this.fields && fieldsClone)
{
this.fields.forEach((field, name) =>
{
fieldsClone.set(name, field.clone());
})
});
}
const sectionsClone: QTableSection[] | undefined = this.sections ? [] : undefined;
if(this.sections && sectionsClone)
if (this.sections && sectionsClone)
{
for (let section of this.sections)
{
@@ -137,7 +137,7 @@ export class QTableMetaData
}
const exposedJoinsClone: QExposedJoin[] | undefined = this.exposedJoins ? [] : undefined;
if(this.exposedJoins && exposedJoinsClone)
if (this.exposedJoins && exposedJoinsClone)
{
for (let exposedJoin of this.exposedJoins)
{
@@ -145,8 +145,8 @@ export class QTableMetaData
}
}
const capabilitiesClone = this.capabilities ? new Set() : undefined;
if(this.capabilities && capabilitiesClone)
const capabilitiesClone = new Set<string>();
if (this.capabilities && capabilitiesClone)
{
this.capabilities.forEach((capability) =>
{
@@ -155,31 +155,30 @@ export class QTableMetaData
}
const helpContentsClone = this.helpContent ? new Map() : undefined;
if(this.helpContent && helpContentsClone)
if (this.helpContent && helpContentsClone)
{
this.helpContent.forEach((helpContentArray, name) =>
{
if(helpContentArray)
if (helpContentArray)
{
const helpContentArrayClone: QHelpContent[] = [];
for (let qHelpContent of helpContentArray)
{
helpContentArrayClone.push((qHelpContent as any).clone())
helpContentArrayClone.push((qHelpContent as any).clone());
}
helpContentsClone.set(name, helpContentArrayClone);
}
});
}
const clone = new QTableMetaData({
...this,
fields: fieldsClone,
sections: sectionsClone,
exposedJoins: exposedJoinsClone,
capabilities: capabilitiesClone,
supplementalTableMetaData: new Map(this.supplementalTableMetaData),
helpContent: helpContentsClone
});
const clone = new QTableMetaData({...this});
clone.fields = fieldsClone;
clone.sections = sectionsClone;
clone.exposedJoins = exposedJoinsClone;
clone.capabilities = capabilitiesClone;
clone.supplementalTableMetaData = new Map(this.supplementalTableMetaData);
clone.helpContent = helpContentsClone;
return (clone);
}
+47 -4
View File
@@ -20,6 +20,7 @@
*/
import {QHelpContent} from "../../../src/model/metaData/QHelpContent";
import {QTableMetaData} from "../../../src/model/metaData/QTableMetaData";
describe("QTableMetaData tests", () =>
@@ -94,6 +95,14 @@ describe("QTableMetaData tests", () =>
{
"type": "REVEAL"
}
],
"helpContents": [
{
"content": "Field Help",
"format": "MARKDOWN",
"roles": ["WRITE_SCREENS"],
"contentAsHtml": "Field Help"
}
]
},
"type": {
@@ -162,7 +171,17 @@ describe("QTableMetaData tests", () =>
"editPermission": true,
"deletePermission": true,
"usesVariants": false,
"iconName": "link"
"iconName": "link",
"helpContents": {
"key": [
{
"content": "Table Help",
"format": "MARKDOWN",
"roles": ["WRITE_SCREENS"],
"contentAsHtml": "Table Help"
}
]
}
});
////////////////////////////////////////////////////////////////
@@ -175,19 +194,43 @@ describe("QTableMetaData tests", () =>
expect(cloneTable.sections?.length).toEqual(table.sections?.length);
expect(cloneTable.sections?.[0].name).toEqual(table.sections?.[0].name);
expect(cloneTable.capabilities.size).toEqual(table.capabilities.size);
expect(cloneTable.helpContent?.size).toEqual(table.helpContent?.size);
expect(cloneTable.helpContent?.get("key")?.[0].roles.size).not.toEqual(0);
expect(cloneTable.helpContent?.get("key")?.[0].roles.size).toEqual(table.helpContent?.get("key")?.[0].roles.size);
///////////////////////////////////////////////////////////////////////////////////////////
// change some things in the clone - assert that they are then not equal to the original //
///////////////////////////////////////////////////////////////////////////////////////////
cloneTable.name = "changed"
cloneTable.name = "changed";
expect(cloneTable.name).not.toEqual(table.name);
if(cloneTable.sections)
if (cloneTable.sections)
{
cloneTable.sections[0].name = "changed"
cloneTable.sections[0].name = "changed";
cloneTable.sections[0].isHidden = true;
}
expect(cloneTable.sections?.[0].name).not.toEqual(table.sections?.[0].name);
expect(cloneTable.sections?.[0].isHidden).not.toEqual(table.sections?.[0].isHidden);
cloneTable.capabilities.delete("TABLE_COUNT");
expect(cloneTable.capabilities.size).not.toEqual(table.capabilities.size);
if(cloneTable.helpContent && table.helpContent) // avoid possibly-undef and ?. on left-hand sides below
{
cloneTable.helpContent.set("key2", []);
expect(cloneTable.helpContent.size).not.toEqual(table.helpContent.size);
cloneTable.helpContent.get("key")?.push(new QHelpContent({}));
expect(cloneTable.helpContent.get("key")?.length).not.toEqual(table.helpContent.get("key")?.length);
cloneTable.helpContent.get("key")?.[0].roles.add("READ_SCREENS");
expect(cloneTable.helpContent.get("key")?.[0].roles.size).not.toEqual(table.helpContent.get("key")?.[0].roles.size);
}
else
{
fail("help content wasn't set in either table or cloneTable (or neither)")
}
});
});