Remove time tickets from bottom tab navigation, and update version for production deployment.

2023-08-16 12:48:54 -07:00
parent a3500af72d
commit 1311b0f8e7
6 changed files with 1086 additions and 380 deletions
--- a/app.json
+++ b/app.json
@@ -4,7 +4,7 @@
    "slug": "rome-mobile",
    "version": "1.5.0",
    "extra": {
-      "expover": "2",
+      "expover": "3",
      "eas": {
        "projectId": "df105e21-a07f-4425-af10-2200a7704a48"
      }
@@ -14,7 +14,7 @@
    "ios": {
      "supportsTablet": true,
      "bundleIdentifier": "com.rome.mobile",
-      "buildNumber": "2",
+      "buildNumber": "3",
      "googleServicesFile": "./GoogleService-Info.plist",
      "infoPlist": {
        "NSPhotoLibraryUsageDescription": "Allow $(PRODUCT_NAME) to access your photos.",
@@ -23,7 +23,7 @@
    },
    "android": {
      "package": "com.rome.mobile",
-      "versionCode": 2,
+      "versionCode": 3,
      "googleServicesFile": "./google-services.json",
      "permissions": [
        "android.permission.READ_EXTERNAL_STORAGE",
@@ -47,14 +47,13 @@
      "favicon": "./assets/RomeIcon.png",
      "config": {
        "firebase": {
-          "apiKey": "AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU",
-          "authDomain": "imex-prod.firebaseapp.com",
-          "databaseURL": "https://imex-prod.firebaseio.com",
-          "projectId": "imex-prod",
-          "storageBucket": "imex-prod.appspot.com",
-          "messagingSenderId": "253497221485",
-          "appId": "1:253497221485:web:9b65736a635a45ce227a64",
-          "measurementId": "G-96694D66L2"
+          "apiKey": "AIzaSyAuLQR9SV5LsVxjU8wh9hvFLdhcAHU6cxE",
+          "authDomain": "rome-prod-1.firebaseapp.com",
+          "projectId": "rome-prod-1",
+          "storageBucket": "rome-prod-1.appspot.com",
+          "messagingSenderId": "147786367145",
+          "appId": "1:147786367145:web:9d4cba68071c3f29a8a9b8",
+          "measurementId": "G-G8Z9DRHTZS"
        }
      }
    },
--- a/components/Modals/JobSearchAndSelectModal.jsx
+++ b/components/Modals/JobSearchAndSelectModal.jsx
@@ -2,13 +2,20 @@ import { useLazyQuery, useQuery } from "@apollo/client";
 import { Ionicons } from "@expo/vector-icons";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { FlatList, RefreshControl, Text, View } from "react-native";
+import {
+  FlatList,
+  Keyboard,
+  KeyboardAvoidingView,
+  RefreshControl,
+  Text,
+  View,
+} from "react-native";
 import { Button, List, Modal, Portal, Searchbar } from "react-native-paper";
 import { connect } from "react-redux";
 import { SEARCH_JOBS_FOR_AUTOCOMPLETE } from "../../graphql/jobs.queries";
 import ErrorDisplay from "../error-display/error-display.component";
 import _ from "lodash";
-import { useCallback,useRef, useEffect } from "react";
+import { useCallback, useRef, useEffect } from "react";

 const useIsMounted = () => {
  const isMounted = useRef(false);
@@ -23,7 +30,6 @@ const useIsMounted = () => {
 };

 export function JobSearchAndSelectModal(props) {
-  
  const { t } = useTranslation();
  const jobSrchNotExported =
    props?.notExported !== undefined ? props.notExported : true;
@@ -35,7 +41,7 @@ export function JobSearchAndSelectModal(props) {
  const jobSrchCurrentValue =
    props?.currentValue !== undefined
      ? props.currentValue
-      : { id:"temp", ro_number:t("selectjobid.labels.noselection") };
+      : { id: "temp", ro_number: t("selectjobid.labels.noselection") };
  const jobSrchOnSetCurrentValue =
    props?.onSetCurrentValue !== undefined
      ? props.onSetCurrentValue
@@ -50,7 +56,8 @@ export function JobSearchAndSelectModal(props) {
  const hideModal = () => setVisible(false);

  const [searchQuery, { loading, error, data, refetch }] = useLazyQuery(
-    SEARCH_JOBS_FOR_AUTOCOMPLETE,{fetchPolicy: "cache-and-network",}
+    SEARCH_JOBS_FOR_AUTOCOMPLETE,
+    { fetchPolicy: "cache-and-network" }
  );
  if (error) return <ErrorDisplay errorMessage={error.message} />;
  const onRefresh = async () => {
@@ -61,8 +68,10 @@ export function JobSearchAndSelectModal(props) {
      search: searchText,
    });
  };
-  const search = (v) => {if (v && v !== "") searchQuery(v);};
-  const searchDebouncer = useCallback(_.debounce(search, 1000),[]);
+  const search = (v) => {
+    if (v && v !== "") searchQuery(v);
+  };
+  const searchDebouncer = useCallback(_.debounce(search, 1000), []);
  const onChangeSearch = (query) => {
    setSearchText(query);
    searchDebouncer({
@@ -87,104 +96,109 @@ export function JobSearchAndSelectModal(props) {
  }, []);

  useEffect(() => {
-      setTimeout(() => {
-        if (visible) {
-          setFocus();
-        }
-      }, 300);
+    setTimeout(() => {
+      if (visible) {
+        setFocus();
+      }
+    }, 300);
  }, [visible, isMounted]);

  return (
    <>
-      <Portal>
-        <Modal
-          visible={visible}
-          onDismiss={hideModal}
-          contentContainerStyle={{
-            paddingTop: 20,
-            paddingBottom: 20,
-            margin: 12,
-            flex: 1,
-            backgroundColor: "white",
-          }}
-        >
-          <View
-            style={{
-              display: "flex",
-              flexDirection: "row",
-              alignItems: "center",
-              margin: 8,
+      <KeyboardAvoidingView>
+        <Portal>
+          <Modal
+            visible={visible}
+            onDismiss={hideModal}
+            contentContainerStyle={{
+              paddingTop: 20,
+              paddingBottom: 20,
+              margin: 12,
+              flex: 1,
+              backgroundColor: "white",
            }}
          >
-            <Button onPress={() => hideModal()}>
-              <Ionicons name="ios-arrow-back" size={32} color="dodgerblue" />
-            </Button>
-            <Searchbar
-              style={{ flex: 1 }}
-              onChangeText={onChangeSearch}
-              value={searchText}
-              ref={inputSearch}
-              placeholder={t("selectjobid.labels.searchplaceholder")}
-            />
-          </View>
-          <FlatList
-            refreshControl={
-              <RefreshControl refreshing={loading} onRefresh={onRefresh} />
-            }
-            data={data?.search_jobs}
-            keyExtractor={(item) => item.id}
-            renderItem={(object) => (
-              <List.Item
-                onPress={() => {
-                  jobSrchOnSetCurrentValue(object.item);
-                  hideModal();
-                  setSearchText("");
-                }}
-                left={() => {
-                  if (object.item.id !== jobSrchCurrentValue?.id) return null;
-                  return (
-                    <Ionicons
-                      name="ios-checkmark-circle"
-                      size={24}
-                      color="dodgerblue"
-                      style={{ alignSelf: "center" }}
-                    />
-                  );
-                }}
-                titleStyle={{
-                  ...(object.item.id === jobSrchCurrentValue?.id
-                    ? { color: "dodgerblue" }
-                    : {}),
-                }}
-                title={`${
-                  object.item.ro_number ? `${object.item.ro_number} ` : ``
-                }${object.item.ownr_fn || ""} ${object.item.ownr_ln || ""}${
-                  object.item.v_model_yr ? `- ${object.item.v_model_yr}` : ""
-                }${
-                  object.item.v_make_desc ? `- ${object.item.v_make_desc}` : ""
-                }${
-                  object.item.v_model_desc
-                    ? `- ${object.item.v_model_desc}`
-                    : ""
-                }`}
-                key={object.item.id}
+            <View
+              style={{
+                display: "flex",
+                flexDirection: "row",
+                alignItems: "center",
+                margin: 8,
+              }}
+            >
+              <Button onPress={() => hideModal()}>
+                <Ionicons name="ios-arrow-back" size={32} color="dodgerblue" />
+              </Button>
+              <Searchbar
+                style={{ flex: 1 }}
+                onChangeText={onChangeSearch}
+                value={searchText}
+                ref={inputSearch}
+                placeholder={t("selectjobid.labels.searchplaceholder")}
              />
-            )}
-            ListEmptyComponent={
-              <View
-                style={{
-                  flex: 1,
-                  padding: 10,
-                  alignItems: "center",
-                  justifyContent: "center",
-                }}
-              >
-                <Text>{t("selectjobid.labels.nodata")}</Text>
-              </View>
-            }
-          />
-        </Modal>
-      </Portal>
+            </View>
+            <FlatList
+              refreshControl={
+                <RefreshControl refreshing={loading} onRefresh={onRefresh} />
+              }
+              data={data?.search_jobs}
+              keyExtractor={(item) => item.id}
+              renderItem={(object) => (
+                <List.Item
+                  onPress={() => {
+                    jobSrchOnSetCurrentValue(object.item);
+                    hideModal();
+                    setSearchText("");
+                  }}
+                  left={() => {
+                    if (object.item.id !== jobSrchCurrentValue?.id) return null;
+                    return (
+                      <Ionicons
+                        name="ios-checkmark-circle"
+                        size={24}
+                        color="dodgerblue"
+                        style={{ alignSelf: "center" }}
+                      />
+                    );
+                  }}
+                  titleStyle={{
+                    ...(object.item.id === jobSrchCurrentValue?.id
+                      ? { color: "dodgerblue" }
+                      : {}),
+                  }}
+                  title={`${
+                    object.item.ro_number ? `${object.item.ro_number} ` : ``
+                  }${object.item.ownr_fn || ""} ${object.item.ownr_ln || ""}${
+                    object.item.v_model_yr ? `- ${object.item.v_model_yr}` : ""
+                  }${
+                    object.item.v_make_desc
+                      ? `- ${object.item.v_make_desc}`
+                      : ""
+                  }${
+                    object.item.v_model_desc
+                      ? `- ${object.item.v_model_desc}`
+                      : ""
+                  }`}
+                  key={object.item.id}
+                />
+              )}
+              ListEmptyComponent={
+                <View
+                  style={{
+                    flex: 1,
+                    padding: 10,
+                    alignItems: "center",
+                    justifyContent: "center",
+                  }}
+                >
+                  <Text>{t("selectjobid.labels.nodata")}</Text>
+                </View>
+              }
+            />
+          </Modal>
+        </Portal>
+      </KeyboardAvoidingView>
+
      <Button
        mode="outlined"
        style={{
--- a/components/camera-select-job/camera-select-job.component.jsx
+++ b/components/camera-select-job/camera-select-job.component.jsx
@@ -2,7 +2,7 @@ import { useQuery } from "@apollo/client";
 import { Ionicons } from "@expo/vector-icons";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { FlatList, RefreshControl, View } from "react-native";
+import { FlatList, RefreshControl, KeyboardAvoidingView } from "react-native";
 import { Button, List, Modal, Portal, Searchbar } from "react-native-paper";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -100,7 +100,7 @@ export function CameraSelectJob({
            backgroundColor: "white",
          }}
        >
-          <View
+          <KeyboardAvoidingView
            style={{
              display: "flex",
              flexDirection: "row",
@@ -116,7 +116,7 @@ export function CameraSelectJob({
              onChangeText={onChangeSearch}
              value={searchQuery}
            />
-          </View>
+          </KeyboardAvoidingView>
          <FlatList
            refreshControl={
              <RefreshControl refreshing={loading} onRefresh={onRefresh} />
--- a/components/screen-main/screen-main.component.jsx
+++ b/components/screen-main/screen-main.component.jsx
@@ -147,13 +147,13 @@ const TimeTicketBrowserStackNavigator = connect(

  return (
    <TimeTicketBrowserStack.Navigator>
-      {currentEmployee === null ? (
+      {currentEmployee === null || !currentEmployee.authorized ? (
        <TimeTicketBrowserStack.Screen
          name="EmployeeSignIn"
          options={() => ({ title: i18n.t("employeesignin.titles.signin") })}
          component={EmployeeSignIn}
        />
-      ) : currentEmployee.authorized ? (
+      ) : (
        <>
          <TimeTicketBrowserStack.Screen
            name="TimeTicketBrowser"
@@ -179,14 +179,6 @@ const TimeTicketBrowserStackNavigator = connect(
            component={ScreenTimeTicketClockoffComponent}
          />
        </>
-      ) : (
-        <TimeTicketBrowserStack.Screen
-          name="EmployeeSignIn"
-          options={() => ({
-            title: i18n.t("employeesignin.titles.signin"),
-          })}
-          component={EmployeeSignIn}
-        />
      )}
    </TimeTicketBrowserStack.Navigator>
  );
@@ -230,14 +222,16 @@ const BottomTabsNavigator = () => (
      }}
      component={MediaBrowserStackNavigator}
    />
-    <BottomTabs.Screen
-      name="TimeTicketBrowserTab"
-      options={{
-        title: i18n.t("timeticketbrowser.titles.timeticketbrowsertab"),
-        headerShown: false,
-      }}
-      component={TimeTicketBrowserStackNavigator}
-    />
+    {
+      // <BottomTabs.Screen
+      //   name="TimeTicketBrowserTab"
+      //   options={{
+      //     title: i18n.t("timeticketbrowser.titles.timeticketbrowsertab"),
+      //     headerShown: false,
+      //   }}
+      //   component={TimeTicketBrowserStackNavigator}
+      // />
+    }
    <BottomTabs.Screen
      name="MoreTab"
      options={{ title: i18n.t("more.titles.moretab"), headerShown: false }}
--- a/package.json
+++ b/package.json
@@ -16,20 +16,20 @@
    "build:production:local:android": "eas build --profile production --platform android --local"
  },
  "dependencies": {
-    "@apollo/client": "^3.7.0-alpha.3",
-    "@babel/preset-env": "7.1.6",
+    "@apollo/client": "^3.7.17",
+    "@babel/preset-env": "7.22.9",
    "@expo/vector-icons": "^13.0.0",
-    "@react-native-async-storage/async-storage": "1.18.2",
+    "@react-native-async-storage/async-storage": "1.19.1",
    "@react-native-community/art": "^1.2.0",
-    "@react-native-community/cli-debugger-ui": "^9.0.0",
-    "@react-native-community/datetimepicker": "7.2.0",
+    "@react-native-community/cli-debugger-ui": "^11.3.6",
+    "@react-native-community/datetimepicker": "7.4.1",
    "@react-native-community/masked-view": "^0.1.11",
-    "@react-navigation/bottom-tabs": "^6.3.3",
-    "@react-navigation/drawer": "^6.4.4",
-    "@react-navigation/native": "^6.0.12",
-    "@react-navigation/native-stack": "^6.8.0",
-    "@react-navigation/stack": "^6.2.3",
-    "axios": "^0.27.2",
+    "@react-navigation/bottom-tabs": "^6.5.8",
+    "@react-navigation/drawer": "^6.6.3",
+    "@react-navigation/native": "^6.1.7",
+    "@react-navigation/native-stack": "^6.9.13",
+    "@react-navigation/stack": "^6.3.17",
+    "axios": "^1.4.0",
    "cloudinary-core": "^2.13.0",
    "dinero.js": "^1.9.1",
    "expo": "^49.0.0",
@@ -50,9 +50,9 @@
    "expo-updates": "~0.18.11",
    "expo-video-thumbnails": "~7.4.0",
    "firebase": "^9.8.3",
-    "formik": "^2.2.9",
-    "graphql": "^16.6.0",
-    "i18next": "^21.9.1",
+    "formik": "^2.4.3",
+    "graphql": "^16.7.1",
+    "i18next": "^23.4.1",
    "intl": "^1.2.5",
    "lodash": "^4.17.20",
    "luxon": "^3.0.3",
@@ -61,35 +61,35 @@
    "normalize-url": "^7.0.3",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
-    "react-i18next": "^11.17.2",
+    "react-i18next": "^13.0.3",
    "react-is": ">= 16.8.0",
    "react-native": "0.72.3",
-    "react-native-draggable-flatlist": "^3.1.2",
+    "react-native-draggable-flatlist": "^4.0.1",
    "react-native-element-dropdown": "^2.9.0",
    "react-native-gesture-handler": "~2.12.0",
    "react-native-image-gallery": "^2.1.5",
    "react-native-image-viewing": "^0.2.2",
    "react-native-indicators": "^0.17.0",
-    "react-native-modal-datetime-picker": "^15.0.0",
+    "react-native-modal-datetime-picker": "^17.0.0",
    "react-native-pager-view": "6.2.0",
-    "react-native-paper": "^4.12.4",
+    "react-native-paper": "^4.12.5",
    "react-native-progress": "^5.0.0",
-    "react-native-reanimated": "~3.3.0",
+    "react-native-reanimated": "~3.4.2",
    "react-native-safe-area-context": "4.6.3",
-    "react-native-screens": "~3.22.0",
-    "react-native-svg": "13.9.0",
-    "react-native-tab-view": "3.1.1",
+    "react-native-screens": "~3.24.0",
+    "react-native-svg": "13.10.0",
+    "react-native-tab-view": "3.5.2",
    "react-native-toast-message": "^2.1.5",
-    "react-native-vector-icons": "*",
+    "react-native-vector-icons": "10.0.0",
    "react-native-web": "~0.19.6",
-    "react-redux": "^7.2.6",
+    "react-redux": "^8.1.2",
    "redux": "^4.1.2",
    "redux-logger": "^3.0.6",
    "redux-persist": "^6.0.0",
    "redux-saga": "^1.1.3",
-    "reselect": "^4.1.6",
+    "reselect": "^4.1.8",
    "sentry-expo": "~7.0.0",
-    "subscriptions-transport-ws": "^0.9.18"
+    "subscriptions-transport-ws": "^0.11.0"
  },
  "devDependencies": {
    "@babel/core": "^7.19.3",
--- a/yarn.lock
+++ b/yarn.lock