fix: Refactor data grids to preserve incomplete rows (#223)

* fix: refactor data grids to preserve incomplete rows

* fix: preserve rows when toggling Primary checkbox

Author: remonaadite009

packages/react-model-ui/src/views/common/AttributeMappingSourcesDataGrid.tsx

@@ -253,12 +253,10 @@ export function AttributeMappingSourcesDataGrid({
             // For uncommitted rows, check if anything actually changed
             const hasChanges = sourceToUpdate.value !== defaultEntry.value;
 
-            // Check if the value is valid (not empty or default value)
-            const isValidValue =
-               sourceToUpdate.value && sourceToUpdate.value.trim() !== '' && sourceToUpdate.value !== '_' && sourceToUpdate.value !== '-';
+            
 
-            if (!hasChanges || !isValidValue) {
-               // Remove the row if no changes or invalid value
+            if (!hasChanges) {
+               // Remove the row if no changes
                setGridData(current => current.filter(row => row.id !== sourceToUpdate.id));
                setEditingRows({});
                return;

packages/react-model-ui/src/views/common/CustomPropertiesDataGrid.tsx

@@ -72,8 +72,8 @@ export function CustomPropertiesDataGrid({
                customProperty.value !== defaultEntry.value ||
                customProperty.description !== defaultEntry.description;
 
-            if (!hasChanges || !customProperty.name) {
-               // Remove the row if no changes or no name
+            if (!hasChanges) {
+               // Remove the row if no changes
                setGridData(current => current.filter(row => row.id !== customProperty.id));
                setEditingRows({});
                return;

packages/react-model-ui/src/views/common/DataModelDependenciesDataGrid.tsx

@@ -7,8 +7,8 @@ import { DataTableRowEditEvent } from 'primereact/datatable';
 import * as React from 'react';
 import { useDataModel, useDiagnosticsManager, useModelDispatch, useModelQueryApi, useReadonly } from '../../ModelContext';
 import { ErrorView } from '../ErrorView';
-import { handleGridEditorKeyDown, wasSaveTriggeredByEnter } from './gridKeydownHandler';
 import { EditorProperty, GenericTextEditor } from './GenericEditors';
+import { handleGridEditorKeyDown, wasSaveTriggeredByEnter } from './gridKeydownHandler';
 import { GridColumn, PrimeDataGrid } from './PrimeDataGrid';
 
 export interface DataModelDependencyRow extends DataModelDependency {
@@ -228,12 +228,9 @@ export function DataModelDependenciesDataGrid(): React.ReactElement {
             // For uncommitted rows, check if anything actually changed
             const hasChanges = dependency.datamodel !== defaultEntry.datamodel || dependency.version !== defaultEntry.version;
 
-            // Also check if the datamodel is valid
-            const isValidDatamodel =
-               dependency.datamodel && dependency.datamodel.trim() !== '' && dependency.datamodel !== '_' && dependency.datamodel !== '-';
 
-            if (!hasChanges || !isValidDatamodel) {
-               // Remove the row if no changes or invalid datamodel
+            if (!hasChanges) {
+               // Remove the row if no changes
                setGridData(current => current.filter(row => row.id !== dependency.id));
                setEditingRows({});
                return;

packages/react-model-ui/src/views/common/EntityAttributesDataGrid.tsx

@@ -298,10 +298,11 @@ export function EntityAttributesDataGrid(): React.ReactElement {
             const hasChanges =
                attribute.name !== defaultEntry.name ||
                attribute.datatype !== defaultEntry.datatype ||
-               attribute.description !== defaultEntry.description;
+               attribute.description !== defaultEntry.description ||
+               !!attribute.identifier;
 
-            if (!hasChanges || !attribute.name) {
-               // Remove the row if no changes or no name
+            if (!hasChanges) {
+               // Remove the row if no changes
                setGridData(current => current.filter(row => row.id !== attribute.id));
                setEditingRows({});
                return;

packages/react-model-ui/src/views/common/EntityIdentifiersDataGrid.tsx

@@ -203,10 +203,11 @@ export function EntityIdentifiersDataGrid(): React.ReactElement {
             const hasChanges =
                identifier.name !== defaultEntry.name ||
                identifier.description !== defaultEntry.description ||
-               identifier.attributeIds.length > 0;
+               identifier.attributeIds.length > 0 ||
+               identifier.primary !== defaultEntry.primary;
 
-            if (!hasChanges || !identifier.name) {
-               // Remove the row if no changes or no name
+            if (!hasChanges) {
+               // Remove the row if no changes
                setGridData(current => current.filter(row => row.id !== identifier.id));
                setEditingRows({});
                return;

packages/react-model-ui/src/views/common/RelationshipAttributesDataGrid.tsx

@@ -231,8 +231,8 @@ export function RelationshipAttributesDataGrid(): React.ReactElement {
             // For uncommitted rows, check if anything actually changed
             const hasChanges = attribute.parent !== defaultEntry.parent || attribute.child !== defaultEntry.child;
 
-            if (!hasChanges || !attribute.parent || !attribute.child) {
-               // Remove the row if no changes or incomplete data
+            if (!hasChanges) {
+               // Remove the row if no changes
                setGridData(current => current.filter(row => row.id !== attribute.id));
                setEditingRows({});
                return;

packages/react-model-ui/src/views/common/SourceObjectConditionDataGrid.tsx

@@ -335,17 +335,8 @@ export function SourceObjectConditionDataGrid({ mapping, sourceObjectIdx }: Sour
                condition.operator !== defaultEntry.operator ||
                condition.right.value !== defaultEntry.right.value;
 
-            // Check if required fields are valid
-            const isValid =
-               condition.left.value?.trim() &&
-               condition.right.value?.trim() &&
-               condition.left.value !== '_' &&
-               condition.left.value !== '-' &&
-               condition.right.value !== '_' &&
-               condition.right.value !== '-';
-
-            if (!hasChanges || !isValid) {
-               // Remove the row if no changes or invalid
+            if (!hasChanges) {
+               // Remove the row if no changes
                setGridData(current => current.filter(row => row.id !== condition.id));
                setEditingRows({});
                return;

packages/react-model-ui/src/views/common/SourceObjectDependencyDataGrid.tsx

@@ -231,12 +231,8 @@ export function SourceObjectDependencyDataGrid({ mapping, sourceObjectIdx }: Sou
             // For uncommitted rows, check if anything actually changed
             const hasChanges = dependency.source !== defaultEntry.source;
 
-            // Check if the source is valid (not empty or default value)
-            const isValidSource =
-               dependency.source && dependency.source.trim() !== '' && dependency.source !== '_' && dependency.source !== '-';
-
-            if (!hasChanges || !isValidSource) {
-               // Remove the row if no changes or invalid source
+            if (!hasChanges) {
+               // Remove the row if no changes
                setGridData(current => current.filter(row => row.id !== dependency.id));
                setEditingRows({});
                return;