Skip to content
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

Extend DataTableLookUp with optional argument: default row #624

Open
wants to merge 6 commits into
base: maintenance/mps20213
Choose a base branch
from
Open

Extend DataTableLookUp with optional argument: default row #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
39b5bc5
Extend DataTableLookUp with optional argument: default row
AlexeiQ Nov 21, 2022
45b6c56
Fixed: Entering "," after empty default column for DataTableLookup ad…
mgronover Jan 10, 2023
02f1a08
Fixed: correct removal of deafult row used in DataTableLookUp editor.
mgronover Jan 10, 2023
52b1ac0
Fixed: Correct removal of deafult row.
mgronover Jan 23, 2023
45122af
Fixed: Correct removal of deafult row using #alias#.
mgronover Jan 24, 2023
a12a4d1
Merge branch 'maintenance/mps20211' into feature/data-table-look-up-w…
mgronover Jan 24, 2023
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
297 changes: 297 additions & 0 deletions ...pensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.behavior.mps
View file
Open in desktop

Large diffs are not rendered by default.

59 changes: 58 additions & 1 deletion ...source/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.constraints.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:d01b97ee-eb54-4b3c-b85e-f72b7435869b(org.iets3.core.expr.data.constraints)">
<persistence version="9" />
<attribute name="doNotGenerate" value="false" />
<languages>
<use id="5dae8159-ab99-46bb-a40d-0cee30ee7018" name="jetbrains.mps.lang.constraints.rules.kinds" version="0" />
<use id="ea3159bf-f48e-4720-bde2-86dba75f0d34" name="jetbrains.mps.lang.context.defs" version="0" />
Expand All @@ -16,11 +17,12 @@
</languages>
<imports>
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
<import index="e9k1" ref="r:00903dee-f0b0-48de-9335-7cb3f90ae462(org.iets3.core.expr.data.structure)" implicit="true" />
<import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
<import index="hwgx" ref="r:fd2980c8-676c-4b19-b524-18c70e02f8b7(com.mbeddr.core.base.behavior)" implicit="true" />
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" implicit="true" />
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
<import index="ux24" ref="r:74ad67c1-3cf0-4c00-bd30-edf8df02cfe5(org.iets3.core.expr.data.behavior)" implicit="true" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
Expand Down Expand Up @@ -458,5 +460,60 @@
</node>
</node>
</node>
<node concept="1M2fIO" id="1WMFq5x4gkL">
<ref role="1M2myG" to="e9k1:1WMFq5x4fLm" resolve="DataRowRefForLookup" />
<node concept="1N5Pfh" id="1WMFq5x4gm0" role="1Mr941">
<ref role="1N5Vy1" to="e9k1:1WMFq5x4fLn" resolve="dataRow" />
<node concept="3dgokm" id="1WMFq5x4gm1" role="1N6uqs">
<node concept="3clFbS" id="1WMFq5x4gm2" role="2VODD2">
<node concept="3clFbF" id="1WMFq5x4gm3" role="3cqZAp">
<node concept="2YIFZM" id="1WMFq5x4gm4" role="3clFbG">
<ref role="37wK5l" to="o8zo:4IP40Bi3eAf" resolve="forNamedElements" />
<ref role="1Pybhc" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
<node concept="2OqwBi" id="1WMFq5x4gm5" role="37wK5m">
<node concept="2OqwBi" id="1WMFq5x4gm6" role="2Oq$k0">
<node concept="2OqwBi" id="5nzoslouWGn" role="2Oq$k0">
<node concept="2OqwBi" id="5nzoslouW5T" role="2Oq$k0">
<node concept="2rP1CM" id="1WMFq5x4gmb" role="2Oq$k0" />
<node concept="2Xjw5R" id="5nzoslouWot" role="2OqNvi">
<node concept="1xMEDy" id="5nzoslouWov" role="1xVPHs">
<node concept="chp4Y" id="5nzoslouWvn" role="ri$Ld">
<ref role="cht4Q" to="e9k1:stdmzxm7Y2" resolve="DataTableLookUp" />
</node>
</node>
</node>
</node>
<node concept="2qgKlT" id="5nzoslouWNj" role="2OqNvi">
<ref role="37wK5l" to="ux24:5nzoslouECc" resolve="getDataSelector" />
</node>
</node>
<node concept="3TrEf2" id="1WMFq5x4gmh" role="2OqNvi">
<ref role="3Tt5mk" to="e9k1:cPLa7FstD4" resolve="table" />
</node>
</node>
<node concept="3Tsc0h" id="1WMFq5x4gmi" role="2OqNvi">
<ref role="3TtcxE" to="e9k1:cPLa7FpRVO" resolve="rows" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="9S07l" id="1WMFq5x4jil" role="9Vyp8">
<node concept="3clFbS" id="1WMFq5x4jim" role="2VODD2">
<node concept="3clFbF" id="1WMFq5x4jiH" role="3cqZAp">
<node concept="2OqwBi" id="67dYdlPOTzy" role="3clFbG">
<node concept="nLn13" id="67dYdlPOSXB" role="2Oq$k0" />
<node concept="1mIQ4w" id="67dYdlPOTJ9" role="2OqNvi">
<node concept="chp4Y" id="67dYdlPOTT1" role="cj9EA">
<ref role="cht4Q" to="e9k1:stdmzxm7Y2" resolve="DataTableLookUp" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</model>

165 changes: 160 additions & 5 deletions ....opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.editor.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@
</imports>
<registry>
<language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
<concept id="1402906326895675325" name="jetbrains.mps.lang.editor.structure.CellActionMap_FunctionParm_selectedNode" flags="nn" index="0IXxy" />
<concept id="5991739802479784074" name="jetbrains.mps.lang.editor.structure.MenuTypeNamed" flags="ng" index="22hDWg" />
<concept id="1071666914219" name="jetbrains.mps.lang.editor.structure.ConceptEditorDeclaration" flags="ig" index="24kQdi">
<child id="1078153129734" name="inspectedCellModel" index="6VMZX" />
</concept>
<concept id="1597643335227097138" name="jetbrains.mps.lang.editor.structure.QueryFunctionParameter_TransformationMenu_node" flags="ng" index="7Obwk" />
<concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
<property id="1140524450557" name="separatorText" index="2czwfO" />
<child id="1140524464360" name="cellLayout" index="2czzBx" />
Expand All @@ -46,6 +49,17 @@
<child id="1080736633877" name="cellModel" index="2wV5jI" />
</concept>
<concept id="795210086017940429" name="jetbrains.mps.lang.editor.structure.ReadOnlyStyleClassItem" flags="lg" index="xShMh" />
<concept id="6718020819487620873" name="jetbrains.mps.lang.editor.structure.TransformationMenuReference_Named" flags="ng" index="A1WHu">
<reference id="6718020819487620874" name="menu" index="A1WHt" />
</concept>
<concept id="3473224453637651916" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform_PlaceInCellHolder" flags="ng" index="CtIbL">
<property id="3473224453637651917" name="placeInCell" index="CtIbK" />
</concept>
<concept id="1638911550608610798" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Execute" flags="ig" index="IWg2L" />
<concept id="1638911550608610278" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Action" flags="ng" index="IWgqT">
<child id="1638911550608610281" name="executeFunction" index="IWgqQ" />
<child id="5692353713941573325" name="textFunction" index="1hCUd6" />
</concept>
<concept id="1078938745671" name="jetbrains.mps.lang.editor.structure.EditorComponentDeclaration" flags="ig" index="PKFIW" />
<concept id="1078939183254" name="jetbrains.mps.lang.editor.structure.CellModel_Component" flags="sg" stub="3162947552742194261" index="PMmxH">
<reference id="1078939183255" name="editorComponent" index="PMmxG" />
Expand All @@ -62,8 +76,25 @@
</concept>
<concept id="1186414860679" name="jetbrains.mps.lang.editor.structure.EditableStyleClassItem" flags="ln" index="VPxyj" />
<concept id="1186414928363" name="jetbrains.mps.lang.editor.structure.SelectableStyleSheetItem" flags="ln" index="VPM3Z" />
<concept id="1630016958697344083" name="jetbrains.mps.lang.editor.structure.IMenu_Concept" flags="ng" index="2ZABuq">
<reference id="6591946374543067572" name="conceptDeclaration" index="aqKnT" />
<child id="5991739802479788259" name="type" index="22hAXT" />
</concept>
<concept id="1233758997495" name="jetbrains.mps.lang.editor.structure.PunctuationLeftStyleClassItem" flags="ln" index="11L4FC" />
<concept id="1233759184865" name="jetbrains.mps.lang.editor.structure.PunctuationRightStyleClassItem" flags="ln" index="11LMrY" />
<concept id="2896773699153795590" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform" flags="ng" index="3cWJ9i">
<child id="3473224453637651919" name="placeInCell" index="CtIbM" />
</concept>
<concept id="1139535219966" name="jetbrains.mps.lang.editor.structure.CellActionMapDeclaration" flags="ig" index="1h_SRR">
<reference id="1139535219968" name="applicableConcept" index="1h_SK9" />
<child id="1139535219969" name="item" index="1h_SK8" />
</concept>
<concept id="1139535280617" name="jetbrains.mps.lang.editor.structure.CellActionMapItem" flags="lg" index="1hA7zw">
<property id="1139535298778" name="actionId" index="1hAc7j" />
<child id="1139535280620" name="executeFunction" index="1hA7z_" />
</concept>
<concept id="1139535439104" name="jetbrains.mps.lang.editor.structure.CellActionMap_ExecuteFunction" flags="in" index="1hAIg9" />
<concept id="5692353713941573329" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_ActionLabelText" flags="ig" index="1hCUdq" />
<concept id="1088013125922" name="jetbrains.mps.lang.editor.structure.CellModel_RefCell" flags="sg" stub="730538219795941030" index="1iCGBv">
<child id="1088186146602" name="editorComponent" index="1sWHZn" />
</concept>
Expand All @@ -83,7 +114,9 @@
<reference id="1140103550593" name="relationDeclaration" index="1NtTu8" />
</concept>
<concept id="1073389214265" name="jetbrains.mps.lang.editor.structure.EditorCellModel" flags="ng" index="3EYTF0">
<reference id="1139959269582" name="actionMap" index="1ERwB7" />
<child id="1142887637401" name="renderingCondition" index="pqm2j" />
<child id="4202667662392416064" name="transformationMenu" index="3vIgyS" />
</concept>
<concept id="1073389446423" name="jetbrains.mps.lang.editor.structure.CellModel_Collection" flags="sn" stub="3013115976261988961" index="3EZMnI">
<child id="1106270802874" name="cellLayout" index="2iSdaV" />
Expand All @@ -107,12 +140,20 @@
<concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
<child id="1225900141900" name="modelAccessor" index="1HlULh" />
</concept>
<concept id="5624877018226900666" name="jetbrains.mps.lang.editor.structure.TransformationMenu" flags="ng" index="3ICUPy" />
<concept id="5624877018228267058" name="jetbrains.mps.lang.editor.structure.ITransformationMenu" flags="ng" index="3INCJE">
<child id="1638911550608572412" name="sections" index="IW6Ez" />
</concept>
<concept id="1088612959204" name="jetbrains.mps.lang.editor.structure.CellModel_Alternation" flags="sg" stub="8104358048506729361" index="1QoScp">
<property id="1088613081987" name="vertical" index="1QpmdY" />
<child id="1145918517974" name="alternationCondition" index="3e4ffs" />
<child id="1088612958265" name="ifTrueCellModel" index="1QoS34" />
<child id="1088612973955" name="ifFalseCellModel" index="1QoVPY" />
</concept>
<concept id="7980428675268276156" name="jetbrains.mps.lang.editor.structure.TransformationMenuSection" flags="ng" index="1Qtc8_">
<child id="7980428675268276157" name="locations" index="1Qtc8$" />
<child id="7980428675268276159" name="parts" index="1Qtc8A" />
</concept>
<concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
<concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
<reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
Expand Down Expand Up @@ -1239,14 +1280,29 @@
<node concept="VechU" id="6_rxy3GUPdE" role="3F10Kt">
<property role="Vb096" value="fLJRk5_/gray" />
</node>
<node concept="A1WHu" id="4dez30I2Dxr" role="3vIgyS">
<ref role="A1WHt" node="5NQtOFqdCUu" resolve="DataTableLookUp_SideTransformationForEmptyDefaultColumn" />
</node>
</node>
</node>
<node concept="3F0ifn" id="7F9023_KKU3" role="3EZMnx">
<property role="3F0ifm" value="&gt;" />
<node concept="11L4FC" id="7F9023_KKUj" role="3F10Kt">
<property role="VOm3f" value="true" />
<node concept="_tjkj" id="67dYdlPPfmg" role="3EZMnx">
<node concept="3EZMnI" id="67dYdlPPfLs" role="_tjki">
<node concept="3F0ifn" id="67dYdlPPfLD" role="3EZMnx">
<property role="3F0ifm" value="," />
<node concept="11L4FC" id="2sfIqvUwT3E" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="3F1sOY" id="67dYdlPOe94" role="3EZMnx">
<ref role="1NtTu8" to="e9k1:3RQ2yxdeEit" resolve="defaultRow" />
</node>
<node concept="2iRfu4" id="67dYdlPPfLv" role="2iSdaV" />
<node concept="VPM3Z" id="67dYdlPPfLw" role="3F10Kt" />
</node>
<node concept="11LMrY" id="7F9023_KKUo" role="3F10Kt">
</node>
<node concept="3F0ifn" id="67dYdlPMe4a" role="3EZMnx">
<property role="3F0ifm" value="&gt;" />
<node concept="11L4FC" id="2sfIqvUwT3C" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
Expand Down Expand Up @@ -1413,5 +1469,104 @@
</node>
</node>
</node>
<node concept="1h_SRR" id="4dez30I6DgH">
<property role="TrG5h" value="DataRowRefForLookup_Actions" />
<ref role="1h_SK9" to="e9k1:1WMFq5x4fLm" resolve="DataRowRefForLookup" />
<node concept="1hA7zw" id="4dez30I6DgI" role="1h_SK8">
<property role="1hAc7j" value="7P1WhNABvta/backspace_action_id" />
<node concept="1hAIg9" id="4dez30I6DgJ" role="1hA7z_">
<node concept="3clFbS" id="4dez30I6DgK" role="2VODD2">
<node concept="3clFbF" id="4dez30I7H_a" role="3cqZAp">
<node concept="2OqwBi" id="4dez30I7K9X" role="3clFbG">
<node concept="0IXxy" id="4dez30I7H_9" role="2Oq$k0" />
<node concept="3YRAZt" id="4dez30I7L4n" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
<node concept="1hA7zw" id="4dez30I6DgW" role="1h_SK8">
<property role="1hAc7j" value="g_hAxAO/delete_action_id" />
<node concept="1hAIg9" id="4dez30I6DgX" role="1hA7z_">
<node concept="3clFbS" id="4dez30I6DgY" role="2VODD2">
<node concept="3clFbF" id="4dez30I8hnq" role="3cqZAp">
<node concept="2OqwBi" id="4dez30I8hnr" role="3clFbG">
<node concept="0IXxy" id="4dez30I8hns" role="2Oq$k0" />
<node concept="3YRAZt" id="4dez30I8hnt" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3ICUPy" id="5NQtOFqdCUu">
<ref role="aqKnT" to="e9k1:stdmzxm7Y2" resolve="DataTableLookUp" />
<node concept="22hDWg" id="5NQtOFqdCUv" role="22hAXT">
<property role="TrG5h" value="DataTableLookUp_SideTransformationForEmptyDefaultColumn" />
</node>
<node concept="1Qtc8_" id="5NQtOFqe3BP" role="IW6Ez">
<node concept="IWgqT" id="5NQtOFqe3C1" role="1Qtc8A">
<node concept="1hCUdq" id="5NQtOFqe3C3" role="1hCUd6">
<node concept="3clFbS" id="5NQtOFqe3C5" role="2VODD2">
<node concept="3clFbF" id="5NQtOFqe3GT" role="3cqZAp">
<node concept="Xl_RD" id="5NQtOFqe3GS" role="3clFbG">
<property role="Xl_RC" value="," />
</node>
</node>
</node>
</node>
<node concept="IWg2L" id="5NQtOFqe3C7" role="IWgqQ">
<node concept="3clFbS" id="5NQtOFqe3C9" role="2VODD2">
<node concept="3clFbF" id="4dez30I4tkc" role="3cqZAp">
<node concept="37vLTI" id="4dez30I4ulX" role="3clFbG">
<node concept="2ShNRf" id="4dez30I4uoo" role="37vLTx">
<node concept="3zrR0B" id="4dez30I4uom" role="2ShVmc">
<node concept="3Tqbb2" id="4dez30I4uon" role="3zrR0E">
<ref role="ehGHo" to="e9k1:1WMFq5x4fLm" resolve="DataRowRefForLookup" />
</node>
</node>
</node>
<node concept="2OqwBi" id="4dez30I4tux" role="37vLTJ">
<node concept="7Obwk" id="4dez30I4tkb" role="2Oq$k0" />
<node concept="3TrEf2" id="4dez30I4tMV" role="2OqNvi">
<ref role="3Tt5mk" to="e9k1:3RQ2yxdeEit" resolve="defaultRow" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cWJ9i" id="5NQtOFqe3BT" role="1Qtc8$">
<node concept="CtIbL" id="5NQtOFqe3BV" role="CtIbM">
<property role="CtIbK" value="30NnNOohrQL/RIGHT" />
</node>
</node>
</node>
</node>
<node concept="24kQdi" id="1WMFq5x4fLo">
<ref role="1XX52x" to="e9k1:1WMFq5x4fLm" resolve="DataRowRefForLookup" />
<node concept="3EZMnI" id="7EHDEMiDE42" role="2wV5jI">
<node concept="PMmxH" id="5$Ug$eZ8DzN" role="3EZMnx">
<ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
<ref role="1ERwB7" node="4dez30I6DgH" resolve="DataRowRefForLookup_Actions" />
<node concept="VPxyj" id="5$Ug$eZ8DzU" role="3F10Kt" />
</node>
<node concept="3F0ifn" id="30tzQ1E08BO" role="3EZMnx">
<property role="3F0ifm" value="=" />
</node>
<node concept="2iRfu4" id="7EHDEMiDE43" role="2iSdaV" />
<node concept="1iCGBv" id="1WMFq5x4fLp" role="3EZMnx">
<ref role="1NtTu8" to="e9k1:1WMFq5x4fLn" resolve="dataRow" />
<ref role="1ERwB7" node="4dez30I6DgH" resolve="DataRowRefForLookup_Actions" />
<node concept="1sVBvm" id="1WMFq5x4fLq" role="1sWHZn">
<node concept="3F0A7n" id="1WMFq5x4fLr" role="2wV5jI">
<property role="1Intyy" value="true" />
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</model>

18 changes: 18 additions & 0 deletions ...ensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.structure.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,12 @@
<property role="20kJfa" value="col" />
<ref role="20lvS9" node="7F9023_OqBf" resolve="DataColDefRef" />
</node>
<node concept="1TJgyj" id="3RQ2yxdeEit" role="1TKVEi">
<property role="IQ2ns" value="4464767248795083933" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="defaultRow" />
<ref role="20lvS9" node="1WMFq5x4fLm" resolve="DataRowRefForLookup" />
</node>
<node concept="1TJgyj" id="stdmzxm7Y5" role="1TKVEi">
<property role="IQ2ns" value="512624657163648901" />
<property role="20kJfa" value="col_old" />
Expand Down Expand Up @@ -284,5 +290,17 @@
<ref role="20lvS9" node="cPLa7Fpiy9" resolve="DataRow" />
</node>
</node>
<node concept="1TIwiD" id="1WMFq5x4fLm">
<property role="EcuMT" value="2248050072641141846" />
<property role="TrG5h" value="DataRowRefForLookup" />
<property role="34LRSv" value="default" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="1WMFq5x4fLn" role="1TKVEi">
<property role="20lbJX" value="fLJekj4/1" />
<property role="IQ2ns" value="2248050072641141847" />
<property role="20kJfa" value="dataRow" />
<ref role="20lvS9" node="cPLa7Fpiy9" resolve="DataRow" />
</node>
</node>
</model>

Loading