admin/imexmobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve delete on upload for LMS on iOS.

Browse Source
This commit is contained in:
Patrick Fic
2025-11-26 14:30:05 -08:00
parent c79556c04a
commit d0ad90a012
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/settings/upload-delete-switch.jsx
View File

@@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import { Platform } from "react-native"; import { Platform, Switch } from "react-native";
import { Switch } from "react-native-paper"; //import { Switch } from "react-native-paper";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import { toggleDeleteAfterUpload } from "../../redux/app/app.actions"; import { toggleDeleteAfterUpload } from "../../redux/app/app.actions";
@@ -18,12 +18,16 @@ export function UploadDeleteSwitch({
deleteAfterUpload, deleteAfterUpload,
toggleDeleteAfterUpload, toggleDeleteAfterUpload,
}) { }) {
//Required workaround to prevent double-tap issue.
const [state, setState] = React.useState(deleteAfterUpload);
return ( return (
<Switch <Switch
onValueChange={() => { onValueChange={() => {
setState(!state);
toggleDeleteAfterUpload(); toggleDeleteAfterUpload();
}} }}
value={Platform.OS === "android" ? false : deleteAfterUpload} value={Platform.OS === "android" ? false : state}
disabled={Platform.OS === "android"} disabled={Platform.OS === "android"}
/> />
); );

9
redux/photos/photos.sagas.js
View File

@@ -222,7 +222,6 @@ function* uploadToLocalMediaServer(photos, bodyshop, jobid) {
try { try {
const startTime = new Date(); const startTime = new Date();
const handleUploadProgress = (e) => { const handleUploadProgress = (e) => {
console.log("progress", e)
store.dispatch(mediaUploadProgressBulk({ progress: e.loaded / e.total, loaded: e.loaded, total: e.total, startTime })); store.dispatch(mediaUploadProgressBulk({ progress: e.loaded / e.total, loaded: e.loaded, total: e.total, startTime }));
}; };
@@ -410,7 +409,11 @@ function* mediaUploadCompletedAction({ payload: photos }) {
try { try {
const progress = yield select((state) => state.photos.progress); const progress = yield select((state) => state.photos.progress);
// Handle the completion of media uploads // Handle the completion of media uploads
const filesToDelete = Object.keys(progress).filter((key) => progress[key].status === 'completed').map((key) => progress[key]);
//If using LMS, the progress object has only 1 key and that can't be used here.
//We'd only be here if the upload was entirely succesful, so we can assume to delete all photos.
const uselocalmediaserver = yield select((state) => state.user.bodyshop.uselocalmediaserver);
const filesToDelete = uselocalmediaserver ? photos : Object.keys(progress).filter((key) => progress[key].status === 'completed').map((key) => progress[key]);
if (Platform.OS === "android") { if (Platform.OS === "android") {
Alert.alert( Alert.alert(
@@ -483,7 +486,7 @@ function* mediaUploadCompletedAction({ payload: photos }) {
yield put(deleteMediaSuccess(photos)); yield put(deleteMediaSuccess(photos));
} catch (error) { } catch (error) {
console.log("Saga Error: upload start", error, error.stack); console.log("Saga Error: upload completed", error, error.stack);
yield put(mediaUploadFailure(error.message)); yield put(mediaUploadFailure(error.message));
} }
} }