Merge remote-tracking branch 'origin/fix-limited-list-projection' int…

…o improvements-from-website
freon4dsl · Nov 28, 2024 · afb7d96 · afb7d96
2 parents 9d47606 + 756040d
commit afb7d96
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 27 deletions.
diff --git a/packages/core/src/editor/simplifiedBoxAPI/BoxUtil.ts b/packages/core/src/editor/simplifiedBoxAPI/BoxUtil.ts
@@ -291,11 +291,10 @@ export class BoxUtil {
         node: FreNode,
         propertyName: string,
         scoper: FreScoper,
-        isLimited: boolean,
         listInfo?: FreListInfo,
         initializer?: Partial<VerticalListBox>,
     ): VerticalListBox {
-        return UtilRefHelpers.verticalReferenceListBox(node, propertyName, scoper, isLimited, listInfo, initializer);
+        return UtilRefHelpers.verticalReferenceListBox(node, propertyName, scoper, listInfo, initializer);
     }
 
     /**
@@ -315,11 +314,10 @@ export class BoxUtil {
         node: FreNode,
         propertyName: string,
         scoper: FreScoper,
-        isLimited: boolean,
         listJoin?: FreListInfo,
         initializer?: Partial<HorizontalListBox>,
     ): HorizontalListBox {
-        return UtilRefHelpers.horizontalReferenceListBox(node, propertyName, scoper, isLimited, listJoin, initializer);
+        return UtilRefHelpers.horizontalReferenceListBox(node, propertyName, scoper, listJoin, initializer);
     }
 
 

diff --git a/packages/core/src/editor/simplifiedBoxAPI/box-util-helpers/UtilRefHelpers.ts b/packages/core/src/editor/simplifiedBoxAPI/box-util-helpers/UtilRefHelpers.ts
@@ -5,7 +5,6 @@ import {
     BoxFactory,
     ExternalRefListBox,
     HorizontalListBox,
-    LimitedDisplay,
     ReferenceBox,
     SelectOption,
     VerticalListBox,
@@ -93,7 +92,6 @@ export class UtilRefHelpers {
         node: FreNode,
         propertyName: string,
         scoper: FreScoper,
-        isLimited: boolean,
         listInfo?: FreListInfo,
         initializer?: Partial<VerticalListBox>,
     ): VerticalListBox {
@@ -106,7 +104,6 @@ export class UtilRefHelpers {
                     node,
                     property as FreNodeReference<FreNamedNode>[],
                     propertyName,
-                    isLimited,
                     scoper,
                     listInfo,
                 );
@@ -131,7 +128,6 @@ export class UtilRefHelpers {
         node: FreNode,
         propertyName: string,
         scoper: FreScoper,
-        isLimited: boolean,
         listJoin?: FreListInfo,
         initializer?: Partial<HorizontalListBox>,
     ): HorizontalListBox {
@@ -145,7 +141,6 @@ export class UtilRefHelpers {
                 node,
                 property as FreNodeReference<FreNamedNode>[],
                 propertyName,
-                isLimited,
                 scoper,
                 listJoin,
             );
@@ -187,7 +182,6 @@ export class UtilRefHelpers {
                 node,
                 property as FreNodeReference<FreNamedNode>[],
                 propertyName,
-                false,
                 scoper,
             );
             // determine the role
@@ -230,7 +224,6 @@ export class UtilRefHelpers {
         element: FreNode,
         properties: FreNodeReference<FreNamedNode>[],
         propertyName: string,
-        asSelect: boolean,
         scoper: FreScoper,
         listJoin?: FreListInfo,
     ): Box[] {
@@ -247,12 +240,7 @@ export class UtilRefHelpers {
                 listElem.name = selected;
                 return BehaviorExecutionResult.EXECUTED;
             };
-            let innerBox: Box;
-            if (asSelect) {
-                innerBox = BoxUtil.limitedBox(element, propertyName, setFunc, LimitedDisplay.SELECT, scoper, index);
-            } else {
-                innerBox = BoxUtil.referenceBox(element, propertyName, setFunc, scoper, index);
-            }
+            let innerBox = BoxUtil.referenceBox(element, propertyName, setFunc, scoper, index);
             if (listJoin !== null && listJoin !== undefined) {
                 result.push(...UtilCommon.addListJoin(listJoin, index, numberOfItems, element, roleName, propertyName, innerBox));
             } else {

diff --git a/packages/meta/src/editordef/generator/templates/boxproviderhelpers/ItemBoxHelper.ts b/packages/meta/src/editordef/generator/templates/boxproviderhelpers/ItemBoxHelper.ts
@@ -196,17 +196,15 @@ export class ItemBoxHelper {
                     language,
                     item.listInfo,
                     property,
-                    elementVarName,
-                    false
+                    elementVarName
                 );
             } else if (!!item.listInfo) {
                 // if there is information on how to project the property as a list, make it a list
                 innerResult = this._myListPropHelper.generateReferenceAsList(
                     language,
                     item.listInfo,
                     property,
-                    elementVarName,
-                    false
+                    elementVarName
                 );
             }
             if (!!item.externalInfo) {

diff --git a/packages/meta/src/editordef/generator/templates/boxproviderhelpers/LimitedBoxHelper.ts b/packages/meta/src/editordef/generator/templates/boxproviderhelpers/LimitedBoxHelper.ts
@@ -59,8 +59,7 @@ export class LimitedBoxHelper {
                         language,
                         listInfo,
                         property,
-                        elementVarName,
-                        true
+                        elementVarName
                     );
                 }
             }

diff --git a/packages/meta/src/editordef/generator/templates/boxproviderhelpers/ListPropertyBoxHelper.ts b/packages/meta/src/editordef/generator/templates/boxproviderhelpers/ListPropertyBoxHelper.ts
@@ -19,16 +19,15 @@ export class ListPropertyBoxHelper {
         language: FreMetaLanguage,
         listJoin: FreEditListInfo,
         reference: FreMetaConceptProperty,
-        element: string,
-        isLimited: boolean
+        element: string
     ): string {
         ListUtil.addIfNotPresent(this._myTemplate.coreImports, "BoxUtil");
         ListUtil.addIfNotPresent(this._myTemplate.configImports, Names.environment(language));
         const joinEntry = this.getJoinEntry(listJoin);
         if (listJoin.direction === FreEditProjectionDirection.Vertical) {
-            return `BoxUtil.verticalReferenceListBox(${element}, "${reference.name}", ${Names.environment(language)}.getInstance().scoper, ${isLimited}, ${joinEntry})`;
+            return `BoxUtil.verticalReferenceListBox(${element}, "${reference.name}", ${Names.environment(language)}.getInstance().scoper, ${joinEntry})`;
         } // else
-        return `BoxUtil.horizontalReferenceListBox(${element}, "${reference.name}", ${Names.environment(language)}.getInstance().scoper, ${isLimited}, ${joinEntry})`;
+        return `BoxUtil.horizontalReferenceListBox(${element}, "${reference.name}", ${Names.environment(language)}.getInstance().scoper, ${joinEntry})`;
     }
 
     public getJoinEntry(listJoin: FreEditListInfo): string {