2nd set of WIP changes.

2024-02-28 08:50:51 -08:00
parent 8e9fa7f81b
commit 93f77255e2
19 changed files with 748 additions and 10814 deletions
--- a/components/camera-select-job/camera-select-job.component.jsx
+++ b/components/camera-select-job/camera-select-job.component.jsx
@@ -109,7 +109,7 @@ export function CameraSelectJob({
            }}
          >
            <Button onPress={() => hideModal()}>
-              <Ionicons name="ios-arrow-back" size={32} color="dodgerblue" />
+              <Ionicons name="arrow-back" size={32} color="dodgerblue" />
            </Button>
            <Searchbar
              style={{ flex: 1 }}
@@ -135,7 +135,7 @@ export function CameraSelectJob({
                  if (object.item.id !== cameraJobId) return null;
                  return (
                    <Ionicons
-                      name="ios-checkmark-circle"
+                      name="checkmark-circle"
                      size={24}
                      color="dodgerblue"
                      style={{ alignSelf: "center" }}
--- a/components/job-documents/job-documents-local.component.jsx
+++ b/components/job-documents/job-documents-local.component.jsx
@@ -8,7 +8,7 @@ import {
  View,
 } from "react-native";
 import MediaCacheOverlay from "../media-cache-overlay/media-cache-overlay.component";
-import * as Sentry from "sentry-expo";
+import * as Sentry from '@sentry/react-native';
 import Toast from "react-native-toast-message";

 import cleanAxios from "../../util/CleanAxios";
--- a/components/job-list-item/job-list-item.component.jsx
+++ b/components/job-list-item/job-list-item.component.jsx
@@ -77,7 +77,7 @@ export function JobListItem({ setCameraJob, setCameraJobId, item }) {
        >
          <Ionicons
            style={[style, { alignSelf: "center" }]}
-            name="ios-add"
+            name="add"
            size={32}
            color="dodgerblue"
          />
--- a/components/local-upload-progress/local-upload-progress.component.jsx
+++ b/components/local-upload-progress/local-upload-progress.component.jsx
@@ -18,7 +18,7 @@ import {
  selectCurrentCameraJobId,
  selectDeleteAfterUpload,
 } from "../../redux/app/app.selectors";
-import * as Sentry from "sentry-expo";
+import * as Sentry from '@sentry/react-native';

 import { formatBytes } from "../../util/document-upload.utility";
 import { handleLocalUpload } from "../../util/local-document-upload.utility";
--- a/components/screen-main/screen-main.component.jsx
+++ b/components/screen-main/screen-main.component.jsx
@@ -74,7 +74,7 @@ const JobsTabNavigator = connect(
              navigation.navigate("MediaBrowserTab");
            }}
          >
-            <Ionicons name="ios-add" size={32} color="dodgerblue" />
+            <Ionicons name="add" size={32} color="dodgerblue" />
          </Button>
        ),
      })}
@@ -111,11 +111,11 @@ const BottomTabsNavigator = () => (
      tabBarIcon: ({ color, size }) => {
        let iconName;
        if (route.name === "JobTab") {
-          iconName = "ios-list";
+          iconName = "list";
        } else if (route.name === "MoreTab") {
-          iconName = "ios-settings";
+          iconName = "settings";
        } else if (route.name === "MediaBrowserTab") {
-          iconName = "ios-camera";
+          iconName = "camera";
        } else {
          //iconName = "customerservice";
        }
--- a/components/screen-media-browser/screen-media-browser.component.jsx
+++ b/components/screen-media-browser/screen-media-browser.component.jsx
@@ -105,13 +105,13 @@ export function ImageBrowserScreen({ bodyshop, selectedCameraJobId }) {
      widgetWidth: 99,
      videoIcon: {
        Component: Ionicons,
-        iconName: "ios-videocam",
+        iconName: "videocam",
        color: "white",
        size: 20,
      },
      selectedIcon: {
        Component: Ionicons,
-        iconName: "ios-checkmark-circle-outline",
+        iconName: "checkmark-circle-outline",
        color: "white",
        bg: "rgba(35,35,35, 0.75)",
        size: 32,
--- a/components/screen-settings/screen-settings.component.jsx
+++ b/components/screen-settings/screen-settings.component.jsx
@@ -21,7 +21,7 @@ export default function ScreenSettingsComponent() {
    >
      <Title>
        {t("settings.labels.version", {
-          number: `${Constants.manifest.version}-${Constants.manifest.extra.expover}`,
+          number: `${Constants.expoConfig.version}-${Constants.expoConfig.extra.expover}`,
        })}
      </Title>

--- a/components/screen-sign-in/screen-sign-in.component.jsx
+++ b/components/screen-sign-in/screen-sign-in.component.jsx
@@ -90,7 +90,7 @@ export function SignIn({ emailSignInStart, signingIn }) {
      </View>
      <Text style={{ padding: 10, alignSelf: "center" }}>
        {t("settings.labels.version", {
-          number: Constants.manifest.version,
+          number: Constants.expoConfig.version,
        })}
      </Text>
    </View>
--- a/components/upload-progress/upload-progress.component.jsx
+++ b/components/upload-progress/upload-progress.component.jsx
@@ -1,8 +1,8 @@
-import { useApolloClient } from "@apollo/client";
-import * as FileSystem from "expo-file-system";
-import * as MediaLibrary from "expo-media-library";
-import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
+import { useApolloClient } from '@apollo/client';
+import * as FileSystem from 'expo-file-system';
+import * as MediaLibrary from 'expo-media-library';
+import React, { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import {
  ActivityIndicator,
  Alert,
@@ -11,23 +11,23 @@ import {
  StyleSheet,
  Text,
  View,
-} from "react-native";
-import { Divider, ProgressBar } from "react-native-paper";
-import Toast from "react-native-toast-message";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import * as Sentry from "sentry-expo";
-import { logImEXEvent } from "../../firebase/firebase.analytics";
-import { GET_DOC_SIZE_TOTALS } from "../../graphql/documents.queries";
+} from 'react-native';
+import { Divider, ProgressBar } from 'react-native-paper';
+import Toast from 'react-native-toast-message';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+import * as Sentry from '@sentry/react-native';
+import { logImEXEvent } from '../../firebase/firebase.analytics';
+import { GET_DOC_SIZE_TOTALS } from '../../graphql/documents.queries';
 import {
  selectCurrentCameraJobId,
  selectDeleteAfterUpload,
-} from "../../redux/app/app.selectors";
+} from '../../redux/app/app.selectors';
 import {
  selectBodyshop,
  selectCurrentUser,
-} from "../../redux/user/user.selectors";
-import { formatBytes, handleUpload } from "../../util/document-upload.utility";
+} from '../../redux/user/user.selectors';
+import { formatBytes, handleUpload } from '../../util/document-upload.utility';

 const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser,
@@ -110,10 +110,10 @@ export function UploadProgress({
    });
  }
  function handleOnError(error) {
-    logImEXEvent("imexmobile_upload_documents_error", { error });
+    logImEXEvent('imexmobile_upload_documents_error', { error });
    Toast.show({
-      type: "error",
-      text1: "Unable to upload document.",
+      type: 'error',
+      text1: 'Unable to upload document.',
      text2: error,
      autoHide: false,
    });
@@ -124,7 +124,7 @@ export function UploadProgress({
      return {
        ...progress,
        uploadInProgress: true,
-        statusText: "Preparing upload...",
+        statusText: 'Preparing upload...',
      };
    });

@@ -138,10 +138,10 @@ export function UploadProgress({
      return (await acc) + info.size;
    }, 0);

-    if (selectedCameraJobId !== "temp") {
+    if (selectedCameraJobId !== 'temp') {
      const queryData = await client.query({
        query: GET_DOC_SIZE_TOTALS,
-        fetchPolicy: "network-only",
+        fetchPolicy: 'network-only',
        variables: {
          jobId: selectedCameraJobId,
        },
@@ -161,8 +161,8 @@ export function UploadProgress({
          uploadInProgress: false,
        }));
        Alert.alert(
-          t("mediabrowser.labels.storageexceeded_title"),
-          t("mediabrowser.labels.storageexceeded")
+          t('mediabrowser.labels.storageexceeded_title'),
+          t('mediabrowser.labels.storageexceeded')
        );
        return;
      }
@@ -203,56 +203,56 @@ export function UploadProgress({
    //Everything is uploaded, delete the succesful ones.
    if (deleteAfterUpload) {
      try {
-        console.log("Trying to Delete", filesToDelete);
-        if (Platform.OS === "android") {
+        console.log('Trying to Delete', filesToDelete);
+        if (Platform.OS === 'android') {
          //Create a new asset with the first file to delete.
-          console.log("Trying new delete.");
+          // console.log('Trying new delete.');

-          const delres = await MediaLibrary.removeAssetsFromAlbumAsync(
-            filesToDelete,
-            filesToDelete[0].albumId
+          // const delres = await MediaLibrary.removeAssetsFromAlbumAsync(
+          //   filesToDelete,
+          //   filesToDelete[0].albumId
+          // );
+          // await MediaLibrary.deleteAssetsAsync(filesToDelete.map((f) => f.id));
+
+          // const res = Promise.all(filesToDelete.map(f =>  FileSystem.deleteAsync(f.uri, { idempotent: true })))
+          // console.log("🚀 ~ onDone ~ res:", res)
+          // console.log('🚀 ~ onDone ~ filesToDelete:', filesToDelete);
+
+          await MediaLibrary.getPermissionsAsync(false);
+          const album = await MediaLibrary.createAlbumAsync(
+            'ImEX Mobile Deleted',
+            filesToDelete.pop(),
+            false
          );

-          // const album = await MediaLibrary.createAlbumAsync(
-          //   "Deleted",
-          //   filesToDelete.pop(),
-          //   false
-          // );
-          // console.log(
-          //   "🚀  ~ file: upload-progress.component.jsx  ~ line 215  ~ album",
-          //   album
-          // );
-          // //Move the rest.
-          // const moveResult = await MediaLibrary.addAssetsToAlbumAsync(
-          //   filesToDelete,
-          //   album.id,
-          //   false
-          // );
-          // console.log(
-          //   "🚀  ~ file: upload-progress.component.jsx  ~ line 221  ~ moveResult",
-          //   moveResult
-          // );
-          // //Delete the album.
+          //Move the rest.
+          if (filesToDelete.length > 0) {
+            const moveResult = await MediaLibrary.addAssetsToAlbumAsync(
+              filesToDelete,
+              album,
+              false
+            );
+            console.log(
+              'Were assets succesfully moved to the new album?',
+              moveResult
+            );
+          }
+          //Delete the album.

-          // const deleteResult = await MediaLibrary.deleteAlbumsAsync(
-          //   album.id,
-          //   true
-          // );
-          // console.log(
-          //   "🚀  ~ file: upload-progress.component.jsx  ~ line 228  ~ deleteResult",
-          //   deleteResult
-          // );
+          //This defaults to delete all assets in the album.
+          const deleteResult = await MediaLibrary.deleteAlbumsAsync(album);
+          console.log('Did the albume delete succesfully?', deleteResult);
        } else {
          await MediaLibrary.deleteAssetsAsync(filesToDelete.map((f) => f.id));
        }
      } catch (error) {
-        console.log("Unable to delete picture.", error);
+        console.log('Unable to delete picture.', error);
        Sentry.Native.captureException(error);
      }
    }
    filesToDelete = [];
    Toast.show({
-      type: "success",
+      type: 'success',
      text1: ` Upload completed.`,
      //
      //   text2: duration,
@@ -284,7 +284,7 @@ export function UploadProgress({
      },
      {
        bodyshop: bodyshop,
-        jobId: selectedCameraJobId !== "temp" ? selectedCameraJobId : null,
+        jobId: selectedCameraJobId !== 'temp' ? selectedCameraJobId : null,
        uploaded_by: currentUser.email,
        photo: p,
      }
@@ -294,12 +294,12 @@ export function UploadProgress({
  return (
    <Modal
      visible={progress.uploadInProgress}
-      animationType="slide"
+      animationType='slide'
      transparent={true}
      onRequestClose={() => {
-        Alert.alert("Cancel?", "Do you want to abort the upload?", [
+        Alert.alert('Cancel?', 'Do you want to abort the upload?', [
          {
-            text: "Yes",
+            text: 'Yes',
            onPress: () => {
              setUploads(null);
              setProgress({
@@ -314,7 +314,7 @@ export function UploadProgress({
              });
            },
          },
-          { text: "No" },
+          { text: 'No' },
        ]);
      }}
    >
@@ -329,13 +329,13 @@ export function UploadProgress({
                <ProgressBar
                  progress={progress.files[key].percent}
                  style={styles.progress}
-                  color={progress.files[key].percent === 1 ? "green" : "blue"}
+                  color={progress.files[key].percent === 1 ? 'green' : 'blue'}
                />
                <View
                  style={{
-                    display: "flex",
-                    flexDirection: "row",
-                    alignItems: "center",
+                    display: 'flex',
+                    flexDirection: 'row',
+                    alignItems: 'center',
                  }}
                >
                  <Text>{`${formatBytes(
@@ -377,19 +377,19 @@ export function UploadProgress({
 }
 const styles = StyleSheet.create({
  modalContainer: {
-    display: "flex",
+    display: 'flex',
    flex: 1,
-    justifyContent: "center",
+    justifyContent: 'center',
  },
  modal: {
    //flex: 1,
-    display: "flex",
+    display: 'flex',
    marginLeft: 20,
    marginRight: 20,
-    backgroundColor: "white",
+    backgroundColor: 'white',
    borderRadius: 20,
    padding: 18,
-    shadowColor: "#000",
+    shadowColor: '#000',
    shadowOffset: {
      width: 0,
      height: 2,
@@ -399,14 +399,14 @@ const styles = StyleSheet.create({
    elevation: 5,
  },
  centeredView: {
-    justifyContent: "center",
-    alignItems: "center",
+    justifyContent: 'center',
+    alignItems: 'center',
    marginTop: 22,
  },
  progressItem: {
-    display: "flex",
-    flexDirection: "row",
-    alignItems: "center",
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center',
    marginBottom: 12,
    marginLeft: 12,
    marginRight: 12,