JNG-6010 enum column inline selector (#501)

BlackBeltTechnology · Dec 21, 2024 · 6c3366d · 6c3366d
1 parent bb795bf
commit 6c3366d
Show file tree

Hide file tree

Showing 12 changed files with 437 additions and 371 deletions.
diff --git a/.../containers/View/Matter/Table/components/ViewMatterTableTableComponent/index.tsx.snapshot b/.../containers/View/Matter/Table/components/ViewMatterTableTableComponent/index.tsx.snapshot
@@ -155,14 +155,25 @@ export function ViewMatterTableTableComponent(props: ViewMatterTableTableCompone
         const errors = rowValidation.current.get(props.row.__identifier);
         error = errors?.get('type');
       }
-      return <CellEditInput {...props} error={error} cellEditorType={'text'} />;
+      return <CellEditInput {...props} error={error} cellEditorType={'singleSelect'} />;
     },
     filterable: false && true,
     valueFormatter: (value?: string) => {
       if (value !== undefined && value !== null) {
         return t(`enumerations.MatterType.${value}`, { defaultValue: value });
       }
     },
+    valueOptions: [
+      { value: 'dark', label: t('enumerations.MatterType.dark', { defaultValue: 'dark' }) },
+      {
+        value: 'interstellarMedium',
+        label: t('enumerations.MatterType.interstellarMedium', { defaultValue: 'interstellarMedium' }),
+      },
+      {
+        value: 'intergalacticDust',
+        label: t('enumerations.MatterType.intergalacticDust', { defaultValue: 'intergalacticDust' }),
+      },
+    ],
   };
   const massColumn: GridColDef<ViewMatterStored> = {
     ...baseColumnConfig,

diff --git a/...ources/snapshots/frontend-react/src/pages/God/God/Earth/AccessViewPage/index.tsx.snapshot b/...ources/snapshots/frontend-react/src/pages/God/God/Earth/AccessViewPage/index.tsx.snapshot
@@ -548,7 +548,7 @@ export default function GodGodEarthAccessViewPage() {
     }
   };
   // OpenOperationInputSelectorAction: God/(esm/_a2C4RT0wEe-oxNmZsPxMmA)/OperationFormTableRowCallAction/(discriminator/God/(esm/_oaE_YM_fEe6fibzd7gNETg)/AccessViewPageDefinition)
-  const creaturesTalkToGodAction = async (target?: ViewPlanetStored) => {
+  const creaturesTalkToGodAction = async (target?: ViewCreatureStored) => {
     const { result, data: returnedData } =
       await openViewPlanetViewGroup_2RightCreaturesTalkToGodRelationTableCallSelector({
         ownerData: target!,

diff --git a/.../snapshots/frontend-react/src/pages/View/Star/Planets/RelationViewPage/index.tsx.snapshot b/.../snapshots/frontend-react/src/pages/View/Star/Planets/RelationViewPage/index.tsx.snapshot
@@ -477,7 +477,7 @@ export default function ViewStarPlanetsRelationViewPage() {
     }
   };
   // OpenOperationInputSelectorAction: God/(esm/_a2C4RT0wEe-oxNmZsPxMmA)/OperationFormTableRowCallAction/(discriminator/God/(esm/_Hfxf0E7sEeycO-gUAWxcVg)/RelationFeatureView)
-  const creaturesTalkToGodAction = async (target?: ViewPlanetStored) => {
+  const creaturesTalkToGodAction = async (target?: ViewCreatureStored) => {
     const { result, data: returnedData } =
       await openViewPlanetViewGroup_2RightCreaturesTalkToGodRelationTableCallSelector({
         ownerData: target!,

diff --git a/judo-ui-react-itest/ActionGroupTest/model/ActionGroupTest-ui.model b/judo-ui-react-itest/ActionGroupTest/model/ActionGroupTest-ui.model
diff --git a/judo-ui-react-itest/ActionGroupTestPro/model/ActionGroupTestPro-ui.model b/judo-ui-react-itest/ActionGroupTestPro/model/ActionGroupTestPro-ui.model
diff --git a/judo-ui-react-itest/CRUDActionsTest/model/CRUDActionsTest-ui.model b/judo-ui-react-itest/CRUDActionsTest/model/CRUDActionsTest-ui.model
diff --git a/judo-ui-react-itest/OperationParametersTest/model/OperationParametersTest-ui.model b/judo-ui-react-itest/OperationParametersTest/model/OperationParametersTest-ui.model
diff --git a/judo-ui-react-itest/RelationTest/model/RelationTest-ui.model b/judo-ui-react-itest/RelationTest/model/RelationTest-ui.model
diff --git a/...shots/frontend-react/src/pages/Actor/InlineEditTransfer/AccessViewPage/index.tsx.snapshot b/...shots/frontend-react/src/pages/Actor/InlineEditTransfer/AccessViewPage/index.tsx.snapshot
@@ -120,20 +120,20 @@ export default function ActorInlineEditTransferAccessViewPage() {
   const getPageQueryCustomizer: () => InlineEditTransferQueryCustomizer = () => ({
     _mask: actions.getMask
       ? actions.getMask!()
-      : '{field,manyAggregationAssociation{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr},manyAggregationComposition{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr},manyDerivedAggregationAssociation{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr},manyDerivedAggregationComposition{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr}}',
+      : '{field,manyAggregationAssociation{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr},manyAggregationComposition{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr},manyDerivedAggregationAssociation{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr},manyDerivedAggregationComposition{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr}}',
   });
 
   // Masks
   const getMask = () =>
-    '{field,manyAggregationAssociation{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr},manyAggregationComposition{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr},manyDerivedAggregationAssociation{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr},manyDerivedAggregationComposition{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr}}';
+    '{field,manyAggregationAssociation{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr},manyAggregationComposition{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr},manyDerivedAggregationAssociation{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr},manyDerivedAggregationComposition{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr}}';
   const getManyAggregationAssociationMask = () =>
-    '{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr}';
+    '{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr}';
   const getManyAggregationCompositionMask = () =>
-    '{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr}';
+    '{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr}';
   const getManyDerivedAggregationAssociationMask = () =>
-    '{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr}';
+    '{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr}';
   const getManyDerivedAggregationCompositionMask = () =>
-    '{booleanAttr,dateAttr,doubleAttr,emailAttr,intAttr,stringAttr,timestampAttr}';
+    '{booleanAttr,dateAttr,doubleAttr,emailAttr,grade,intAttr,stringAttr,timestampAttr}';
 
   // Private actions
   const submit = async () => {

diff --git a/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiWidgetHelper.java b/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiWidgetHelper.java
@@ -540,7 +540,7 @@ public static String getCellEditType(Column column) {
         if (dataType instanceof DateType || dataType instanceof TimestampType) {
             return "date";
         } else if (dataType instanceof EnumerationType) {
-            return "text";
+            return "singleSelect";
         } else if (dataType instanceof BooleanType) {
             if (!column.getAttributeType().isIsRequired()) {
                 return "optionalBoolean";

diff --git a/judo-ui-react/src/main/resources/actor/src/components/table/table-editor.tsx.hbs b/judo-ui-react/src/main/resources/actor/src/components/table/table-editor.tsx.hbs
@@ -8,6 +8,7 @@ import {
   GridEditDateCell,
   GridEditInputCell,
   GridEditBooleanCell,
+  GridEditSingleSelectCell,
   type GridRenderEditCellParams,
 } from '@mui/x-data-grid{{ getMUIDataGridPlanSuffix }}';
 import { AdapterDateFns } from '@mui/x-date-pickers{{ getMUIPickersPlanSuffix }}/AdapterDateFns';
@@ -25,7 +26,7 @@ const StyledTooltip = styled(({ className, ...props }: TooltipProps) => (
   },
 }));
 
-export type CellEditorType = 'text' | 'boolean' | 'optionalBoolean' | 'date';
+export type CellEditorType = 'text' | 'boolean' | 'optionalBoolean' | 'date' | 'singleSelect';
 
 export function BooleanSelectEditInputCell(props: GridRenderEditCellParams<any>) {
   const { id, value, field, api, error } = props;
@@ -77,12 +78,16 @@ export function CellEditInput(props: GridRenderEditCellParams & { error?: string
     EditComponent = GridEditBooleanCell;
   } else if (cellEditorType === 'optionalBoolean') {
     EditComponent = BooleanSelectEditInputCell;
+  } else if (cellEditorType === 'singleSelect') {
+    EditComponent = GridEditSingleSelectCell;
   }
 
   return (
     <LocalizationProvider dateAdapter={AdapterDateFns} adapterLocale={locales[locale]}>
       <StyledTooltip open={!!error} title={error}>
-        <EditComponent {...otherProps} error={error !== null && error !== undefined} />
+        <div style={ { display: 'flex', width: '100%' } }>
+          <EditComponent {...otherProps} error={error !== null && error !== undefined} />
+        </div>
       </StyledTooltip>
     </LocalizationProvider>
   );

diff --git a/judo-ui-react/src/main/resources/actor/src/fragments/relation/column.fragment.hbs b/judo-ui-react/src/main/resources/actor/src/fragments/relation/column.fragment.hbs
@@ -57,13 +57,13 @@ valueFormatter: (value?: string) => {
     return t(`enumerations.{{ restParamName column.attributeType.dataType }}.${value}`, { defaultValue: value });
   }
 },
+valueOptions: [
+  {{# each column.attributeType.dataType.members as |member| }}
+  { value: '{{ member.name }}', label: t('enumerations.{{ restParamName column.attributeType.dataType }}.{{ member.name }}', { defaultValue: '{{ member.name }}' }) },
+  {{/ each }}
+],
 {{# if isUseInlineColumnFilters }}
   filterOperators: singleSelectColumnOperators,
-  valueOptions: [
-    {{# each column.attributeType.dataType.members as |member| }}
-    { value: '{{ member.name }}', label: t('enumerations.{{ restParamName column.attributeType.dataType }}.{{ member.name }}', { defaultValue: '{{ member.name }}' }) as string },
-    {{/ each }}
-  ],
 {{/ if }}
 {{/ if }}
 {{# if (isColumnTimestamp column) }}