#746 fixes to be tested

- should component update for frequently rendered components
- do not deep clone tx objects
- removed from some functions getting created repeatedly

Author: petmongrels

packages/openchs-android/src/action/common/ObservationsHolderActions.js

@@ -1,11 +1,12 @@
 import _ from "lodash";
 import {Concept, Duration, FormElementGroup, ValidationResult} from 'avni-models';
 import RuleEvaluationService from "../../service/RuleEvaluationService";
+import General from "../../utility/General";
 
 class ObservationsHolderActions {
     static updateFormElements(formElementGroup, state, context) {
         const ruleService = context.get(RuleEvaluationService);
-        let formElementStatuses = ruleService.getFormElementsStatuses(state.getEntity(), state.getEntityType(), formElementGroup, state.getEntityContext());
+        const formElementStatuses = ruleService.getFormElementsStatuses(state.getEntity(), state.getEntityType(), formElementGroup, state.getEntityContext());
         state.filteredFormElements = FormElementGroup._sortedFormElements(formElementGroup.filterElements(formElementStatuses));
         return formElementStatuses;
     }

packages/openchs-android/src/action/individual/EncounterActions.js

@@ -15,8 +15,30 @@ import UserInfoService from "../../service/UserInfoService";
 import _ from "lodash";
 import {ObservationsHolder} from "openchs-models";
 
+function getPreviousEncounter(action, form, context) {
+    const previousEncounter = action.encounter.individual.findLastEncounterOfType(action.encounter, [action.encounter.encounterType.name]);
+    if (previousEncounter) {
+        action.encounter.observations = previousEncounter.cloneForEdit().observations;
+        const observationsHolder = new ObservationsHolder(action.encounter.observations);
+        let groupNo = 0;
+        const firstGroupWithAllVisibleElementsEmpty = _.find(form.getFormElementGroups(),
+            (formElementGroup) => {
+                groupNo = groupNo + 1;
+                const filteredFormElements = EncounterActions.filterFormElements(formElementGroup, context, previousEncounter);
+                if (filteredFormElements.length === 0) return false;
+                return formElementGroup.areAllFormElementsEmpty(filteredFormElements, observationsHolder);
+            });
+
+        if (_.isNil(firstGroupWithAllVisibleElementsEmpty))
+            action.allElementsFilledForImmutableEncounter = true;
+        else
+            action.pageNumber = groupNo;
+    }
+    return action.encounter;
+}
+
 export class EncounterActions {
-    static getInitialState(context) {
+    static getInitialState() {
         return {};
     }
 
@@ -31,29 +53,8 @@ export class EncounterActions {
         const form = formMapping && formMapping.form;
 
         const encounterType = action.encounter.encounterType;
-        const getPreviousEncounter = () => {
-            const previousEncounter = action.encounter.individual.findLastEncounterOfType(action.encounter, [encounterType.name]);
-            if (previousEncounter) {
-                action.encounter.observations = previousEncounter.cloneForEdit().observations;
-                const observationsHolder = new ObservationsHolder(action.encounter.observations);
-                let groupNo = 0;
-                const firstGroupWithAllVisibleElementsEmpty = _.find(form.getFormElementGroups(),
-                    (formElementGroup) => {
-                        groupNo = groupNo + 1;
-                        let filteredFormElements = EncounterActions.filterFormElements(formElementGroup, context, previousEncounter);
-                        if (filteredFormElements.length === 0) return false;
-                        return formElementGroup.areAllFormElementsEmpty(filteredFormElements, observationsHolder);
-                    });
-
-                if (_.isNil(firstGroupWithAllVisibleElementsEmpty))
-                    action.allElementsFilledForImmutableEncounter = true;
-                else
-                    action.pageNumber = groupNo;
-            }
-            return action.encounter;
-        };
-
-        const encounterToPass = encounterType.immutable && _.isUndefined(action.pageNumber) ? getPreviousEncounter() : action.encounter;
+        const encounterToPass = encounterType.immutable && _.isUndefined(action.pageNumber) ?
+                                    getPreviousEncounter(action, form, context) : action.encounter;
 
         const firstGroupWithAtLeastOneVisibleElement = _.find(_.sortBy(form.nonVoidedFormElementGroups(), [function (o) {
             return o.displayOrder

packages/openchs-android/src/codeExamples/RealmExamples.js

@@ -48,9 +48,14 @@ class AbstractComponent extends Component {
     didFocus() {
     }
 
-    componentDidUpdate() {
-        // General.logDebug((this.viewName ? this.viewName() : this.constructor.name), "DID UPDATE");
-    }
+    // shouldComponentUpdate(nextProps, nextState, nextContext): boolean {
+    //     General.logDebug((this.viewName ? this.viewName() : this.constructor.name), "SHOULD UPDATE");
+    //     return true;
+    // }
+    //
+    // componentDidUpdate() {
+    //     General.logDebug((this.viewName ? this.viewName() : this.constructor.name), "DID UPDATE");
+    // }
 
     dispatchAction(action, params) {
         const type = action instanceof Function ? action.Id : action;

packages/openchs-android/src/framework/view/AbstractComponent.js

@@ -28,7 +28,8 @@ class EncounterActionState extends AbstractDataEntryState {
 
     clone() {
         const newState = new EncounterActionState();
-        newState.encounter = _.isNil(this.encounter) ? this.encounter : this.encounter.cloneForEdit();
+        // newState.encounter = _.isNil(this.encounter) ? this.encounter : this.encounter.cloneForEdit();
+        newState.encounter = this.encounter;
         newState.previousEncountersDisplayed = this.previousEncountersDisplayed;
         newState.loadPullDownView = this.loadPullDownView;
         newState.messageDisplayed = this.messageDisplayed;

packages/openchs-android/src/state/EncounterActionState.js

@@ -59,6 +59,8 @@ class ProgressBarView extends AbstractComponent {
     }
 
     render() {
+        if (!this.props.syncing) return null;
+
         return (
             <Modal animationType={'fade'}
                    transparent={true}

packages/openchs-android/src/views/ProgressBarView.js

@@ -208,7 +208,7 @@ class SyncComponent extends AbstractComponent {
         });
         const entitySyncStatusService = this.context.getService(EntitySyncStatusService);
         const totalPending = entitySyncStatusService.getTotalEntitiesPending();
-        return !this.state.syncing && totalPending > 0 ? Badge(totalPending)(icon) : icon;
+        return !this.state.syncing && totalPending > 0 ? Badge(icon, totalPending) : icon;
     }
 
     render() {
@@ -234,9 +234,8 @@ class SyncComponent extends AbstractComponent {
 
 }
 
-
-const Badge = (number) => (icon) => {
-    const [height, width, fontSize, paddingLeft] = number > 99 ? [17, 17, 9, 0] : [17, 17, 11, 6];
+const Badge = function({icon, number}) {
+    const [height, width, fontSize] = number > 99 ? [17, 17, 9, 0] : [17, 17, 11, 6];
     return (
         <View style={{
             width: 50,

packages/openchs-android/src/views/SyncComponent.js

@@ -125,6 +125,10 @@ class FormElementLabelWithDocumentation extends AbstractComponent {
             ;
     }
 
+    shouldComponentUpdate(nextProps, nextState, nextContext): boolean {
+        return this.props.moreTextForLabel !== nextProps.moreTextForLabel;
+    }
+
     getContentHtml(element) {
         const currentLocale = _.get(this.getService(UserInfoService).getUserSettings(), 'locale', 'en');
         const documentationItems = _.get(element.documentation, 'documentationItems', []);
@@ -140,7 +144,7 @@ class FormElementLabelWithDocumentation extends AbstractComponent {
         if (_.isNil(element)) return null;
         if (_.isNil(element.documentation)) return this.labelDisplay();
         const contentHtml = this.getContentHtml(element);
-        return _.isEmpty(contentHtml) ? this.labelDisplay() : this.renderHtml(contentHtml)
+        return _.isEmpty(contentHtml) ? this.labelDisplay() : this.renderHtml(contentHtml);
     }
 }
 

packages/openchs-android/src/views/common/FormElementLabelWithDocumentation.js

@@ -20,4 +20,4 @@ class ValidationErrorMessage extends AbstractComponent {
     }
 }
 
-export default ValidationErrorMessage;
+export default ValidationErrorMessage;

packages/openchs-android/src/views/form/ValidationErrorMessage.js

@@ -1,11 +1,9 @@
-import {Text, View} from "react-native";
+import {View} from "react-native";
 import PropTypes from 'prop-types';
 import React from "react";
 import _ from "lodash";
 import AbstractFormElement from "./AbstractFormElement";
-import Colors from "../../primitives/Colors";
 import Distances from "../../primitives/Distances";
-import PresetOptionItem from "../../primitives/PresetOptionItem";
 import RadioGroup, {RadioLabelValue} from "../../primitives/RadioGroup";
 import FormElementLabelWithDocumentation from "../../common/FormElementLabelWithDocumentation";