Merge pull request #347 from rootcodelabs/refactoring-fixes

rowid fix

Author: pamodaDilranga

GUI/src/components/molecules/ValidationCriteria/DraggableItem/DraggableItem.tsx

@@ -69,7 +69,6 @@ const DraggableItem = ({
         item.id === id ? { ...item, fieldName: newValue } : item
       )
     );
-    if (newValue?.toLowerCase() === 'rowid') setValidationRuleError(true);
   }, []);
 
   const changeDataType = (id: string | number, value: string) => {
@@ -79,7 +78,7 @@ const DraggableItem = ({
     updatedItems && setValidationRules(updatedItems);
   };
 
-  const getErrorMessage = (item: ValidationRule) => {
+  const getErrorMessage = (item: ValidationRule) => {    
     if (validationRuleError) {
       if (!item.fieldName) {
         return t('datasetGroups.detailedView.fieldName');
@@ -95,7 +94,7 @@ const DraggableItem = ({
         });
       }
     }
-    return '';
+     return '';
   };
 
   return (

GUI/src/components/molecules/ValidationCriteria/RowsView.tsx

@@ -42,9 +42,7 @@ const ValidationCriteriaRowsView: FC<
     );
 
     if (
-      isFieldNameExisting(validationRules, newValue) ||
-      newValue?.toLowerCase() === 'rowid'
-    ) {
+      isFieldNameExisting(validationRules, newValue)) {
       setValidationRuleError(true);
     }
   };

GUI/src/pages/DatasetGroups/CreateDatasetGroup.tsx

@@ -54,7 +54,7 @@ const CreateDatasetGroup: FC = () => {
   const [validationErrorType, setValidationErrorType] =
     useState<ValidationErrorTypes>(ValidationErrorTypes.NULL);
 
-  const validateData = useCallback(() => {
+  const validateData = useCallback(() => {    
     setNodesError(validateClassHierarchy(nodes));
     setDatasetNameError(!datasetName);
     setValidationRuleError(validateValidationRules(validationRules));

GUI/src/utils/datasetGroupsUtils.ts

@@ -88,7 +88,7 @@ export const validateClassHierarchy = (data: Class[]) => {
 
 export const validateValidationRules = (data: ValidationRule[] | undefined) => {
   for (let item of data) {
-    if (item.fieldName === '' || item.dataType === '') {
+    if (item.fieldName === '' || item.dataType === '' || item.fieldName.toLowerCase() === 'rowid') {
       return true;
     }
   }