Skip to content

Commit

Permalink
#1347 - lodash imports giving error randomly. model version update.
Browse files Browse the repository at this point in the history
  • Loading branch information
petmongrels committed Mar 18, 2024
1 parent 4073aec commit 2e8756b
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 21 deletions.
26 changes: 13 additions & 13 deletions packages/openchs-android/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/openchs-android/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"lodash": "4.17.21",
"moment": "2.29.4",
"native-base": "3.4.9",
"openchs-models": "1.31.50",
"openchs-models": "1.31.51",
"prop-types": "15.8.1",
"react": "18.2.0",
"react-native": "0.72.3",
Expand Down Expand Up @@ -96,7 +96,7 @@
"realm": "11.8.0",
"redux": "4.2.0",
"rn-fetch-blob": "0.13.0-beta-1",
"rules-config": "github:openchs/rules-config#982bb007c4f759639063159196edee386b48cac3",
"rules-config": "github:openchs/rules-config#279cdf88c979a4e50e7f1768449cec8f05e67500",
"stacktrace-js": "2.0.2",
"transducers-js": "0.4.174",
"uuid": "^9.0.1",
Expand Down
1 change: 0 additions & 1 deletion packages/openchs-android/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import KeepAwake from 'react-native-keep-awake';
import moment from "moment";
import AvniErrorBoundary from "./framework/errorHandling/AvniErrorBoundary";
import UnhandledErrorView from "./framework/errorHandling/UnhandledErrorView";
import AvniError from "./framework/errorHandling/AvniError";
import ErrorUtil from "./framework/errorHandling/ErrorUtil";

const {TamperCheckModule} = NativeModules;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import EntityService from "../../service/EntityService";
import _ from 'lodash';
import {ProgramEnrolment, Checklist} from 'avni-models';
import {ChecklistItemActionNames, ChecklistItemActions} from "./ChecklistItemActions";
import {EditFormRuleResponse} from "rules-config";
import RuleEvaluationService from "../../service/RuleEvaluationService";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React from 'react';
import RNRestart from "react-native-restart";
import {JSONStringify} from "../../utility/JsonStringify";
import Clipboard from "@react-native-clipboard/clipboard";
import _ from "lodash";

export function ErrorDisplay({avniError}) {
console.log("ErrorDisplay", "render", Config.allowServerURLConfig);
Expand Down
1 change: 1 addition & 0 deletions packages/openchs-android/src/framework/routing/Router.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React, {Component} from 'react';
import {BackHandler, View} from 'react-native';
import {Navigator} from 'react-native-deprecated-custom-components';
import General from "../../utility/General";
import _ from 'lodash';

export default class Router extends Component {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import CHSNavigator from "../../utility/CHSNavigator";
import AvniIcon from '../common/AvniIcon';
import MaterialIcons from 'react-native-vector-icons/MaterialIcons';


class ExitBeneficiaryModeButton extends AbstractComponent {

constructor(props, context) {
super(props, context);
}
Expand Down
1 change: 1 addition & 0 deletions packages/openchs-android/src/views/common/IconFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import MaterialCommunityIcons from "react-native-vector-icons/MaterialCommunityI
import FontAwesome5 from "react-native-vector-icons/FontAwesome5";
import Entypo from "react-native-vector-icons/Entypo";
import AntDesign from "react-native-vector-icons/AntDesign";
import _ from 'lodash';

const map = new Map();
map.set("MaterialIcons", MaterialIcons);
Expand Down
3 changes: 2 additions & 1 deletion packages/openchs-android/src/views/common/Pin.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React from 'react';
import Styles from "../primitives/Styles";
import {StyleSheet, Text, TextInput, TouchableOpacity, View, Button} from "react-native";
import {Button, Text, View} from "react-native";
import PropTypes from 'prop-types';
import SmoothPinCodeInput from 'react-native-smooth-pincode-input';
import Colors from "../primitives/Colors";
import _ from 'lodash';

export default class Pin extends React.Component {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {ActivityIndicator, Dimensions, StyleSheet, Text, TouchableNativeFeedback
import Icon from "react-native-vector-icons/MaterialIcons";
import React from 'react';
import {CountResult} from "./CountResult";
import {get} from "lodash";
import _, {get} from "lodash";

const renderIcon = function(iconName, textColor) {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {CustomFilter} from 'openchs-models';
import TestDashboardFilterConfigFactory from "../../model/TestDashboardFilterConfigFactory";
import TestDashboardFilterFactory from "../../model/TestDashboardFilterFactory";
import {assert} from 'chai';
import _ from 'lodash';

it('should update and apply date range filter', function () {
let state = FiltersActionsV2.getInitialState();
Expand Down

0 comments on commit 2e8756b

Please sign in to comment.