Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Download files from Order #35

Merged
merged 6 commits into from
Feb 22, 2024
Merged

Download files from Order #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7725648
added file section and download the files from the app
doljko Feb 21, 2024
47eede1
fixed ui
doljko Feb 21, 2024
bb19d21
fix android
doljko Feb 21, 2024
9b0e8c5
removed
doljko Feb 21, 2024
cce4381
changed name
doljko Feb 22, 2024
b4ec835
removed console
doljko Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ target 'NavigatorApp' do
pod 'Permission-Contacts', :path => "#{permissions_path}/Contacts"
pod 'Permission-Camera', :path => "#{permissions_path}/Camera"
# pod 'RNDeviceInfo', :path => '../node_modules/react-native-device-info'
pod 'RNFileViewer', :path => '../node_modules/react-native-file-viewer'

target 'NavigatorAppTests' do
inherit! :complete
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"dependencies": {
"@babel/plugin-proposal-async-generator-functions": "^7.17.12",
"@fleetbase/sdk": "1.2.7",
"@fleetbase/sdk": "1.2.8",
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-brands-svg-icons": "^5.15.4",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
Expand Down Expand Up @@ -73,6 +73,7 @@
"react-native-dropdown-picker": "^5.4.6",
"react-native-event-listeners": "^1.0.7",
"react-native-fast-image": "^8.5.11",
"react-native-file-viewer": "^2.1.5",
"react-native-fs": "^2.18.0",
"react-native-geolocation-service": "^5.3.0-beta.1",
"react-native-gesture-handler": "^1.10.3",
Expand Down
65 changes: 57 additions & 8 deletions src/features/Shared/OrderScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Order } from '@fleetbase/sdk';
import { faBell, faLightbulb, faMapMarkerAlt, faMoneyBillWave, faRoute, faTimes } from '@fortawesome/free-solid-svg-icons';
import { faBell, faFile, faLightbulb, faMapMarkerAlt, faMoneyBillWave, faRoute, faTimes } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome';
import { useNetInfo } from '@react-native-community/netinfo';
import OrderStatusBadge from 'components/OrderStatusBadge';
Expand All @@ -11,6 +11,8 @@ import { ActivityIndicator, Alert, Dimensions, Linking, RefreshControl, ScrollVi
import ActionSheet from 'react-native-actions-sheet';
import { EventRegister } from 'react-native-event-listeners';
import FastImage from 'react-native-fast-image';
import FileViewer from 'react-native-file-viewer';
import RNFS from 'react-native-fs';
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import tailwind from 'tailwind';
import { calculatePercentage, formatCurrency, formatMetaValue, getColorCode, getStatusColors, isArray, isEmpty, logError, titleize, translate } from 'utils';
Expand All @@ -29,7 +31,6 @@ const isObjectEmpty = obj => isEmpty(obj) || Object.values(obj).length === 0;
const OrderScreen = ({ navigation, route }) => {
const { data } = route.params;
const { isConnected } = useNetInfo();
const [netInfo, setNetInfo] = useState('');
const insets = useSafeAreaInsets();
const isMounted = useMountedState();
const actionSheetRef = createRef();
Expand All @@ -39,7 +40,6 @@ const OrderScreen = ({ navigation, route }) => {

const [order, setOrder] = useState(new Order(data, fleetbase.getAdapter()));
const [isLoadingAction, setIsLoadingAction] = useState(false);
const [isLoading, setIsLoading] = useState(false);
const [isLoadingActivity, setIsLoadingActivity] = useState(false);
const [isRefreshing, setIsRefreshing] = useState(false);
const [nextActivity, setNextActivity] = useState(null);
Expand All @@ -65,7 +65,7 @@ const OrderScreen = ({ navigation, route }) => {
const isAdhoc = order.getAttribute('adhoc') === true;
const isDriverAssigned = order.getAttribute('driver_assigned') !== null;
const isOrderPing = isDriverAssigned === false && isAdhoc === true && !['completed', 'canceled'].includes(order.getAttribute('status'));

const documents = order.getAttribute('files', []);
const entitiesByDestination = (() => {
const groups = [];

Expand Down Expand Up @@ -418,6 +418,49 @@ const OrderScreen = ({ navigation, route }) => {
focusPlaceOnMap(destination);
}

const openMedia = async url => {
// Extract filename from URL
const fileNameParts = url?.split('/')?.pop()?.split('?');
const fileName = fileNameParts.length > 0 ? fileNameParts[0] : '';

// Create local file path
const localFile = `${RNFS.DocumentDirectoryPath}/${fileName}`;

// Set up download options
const options = {
fromUrl: url,
toFile: localFile,
};

RNFS.downloadFile(options).promise.then(() => {
RNFS.readDir(RNFS.DocumentDirectoryPath);
FileViewer.open(localFile);
});
};

const checkIsImage = documentType => {
return documentType.content_type.startsWith('image/');
};

const renderDocumentItem = (document, index) => {
return (
<View style={tailwind('flex rounded-md bg-white mt-2 mr-3 ')} key={index.toString()}>
<TouchableOpacity
onPress={() => {
openMedia(document.url);
}}>
{checkIsImage(document) ? (
<FastImage style={tailwind('w-18 h-18 m-1 ')} source={{ uri: document.url }} resizeMode={FastImage.resizeMode.contain} />
) : (
<View style={tailwind('items-center justify-between p-1 ')}>
<FontAwesomeIcon size={70} icon={faFile} style={tailwind('text-gray-400')} />
</View>
)}
</TouchableOpacity>
</View>
);
};

return (
<View style={[tailwind('bg-gray-800 h-full')]}>
<View style={[tailwind('z-50 bg-gray-800 border-b border-gray-900 shadow-lg pt-2')]}>
Expand Down Expand Up @@ -515,10 +558,6 @@ const OrderScreen = ({ navigation, route }) => {
<FontAwesomeIcon icon={faRoute} style={tailwind('text-blue-50 mb-1')} />
<Text style={tailwind('text-blue-50')}>Change</Text>
</TouchableOpacity>
{/* <TouchableOpacity style={tailwind('flex-1 px-2 py-2 border-r border-blue-700 flex items-center justify-center')}>
<FontAwesomeIcon icon={faMagic} style={tailwind('text-blue-50 mb-1')} />
<Text style={tailwind('text-blue-50')}>Optimize</Text>
</TouchableOpacity> */}
</View>
</View>
</View>
Expand Down Expand Up @@ -779,6 +818,16 @@ const OrderScreen = ({ navigation, route }) => {
</View>
</View>
)}
<View style={tailwind('mt-2')}>
<View style={tailwind('flex flex-col items-center')}>
<View style={tailwind('flex flex-row items-center justify-between w-full p-4 border-t border-b border-gray-700')}>
<View style={tailwind('flex flex-row items-center')}>
<Text style={tailwind('font-semibold text-gray-100')}>Documents & Files</Text>
</View>
</View>
<View style={tailwind('w-full p-4 flex items-start flex-row ')}>{documents.map((document, index) => renderDocumentItem(document, index))}</View>
</View>
</View>
{isArray(order.getAttribute('payload.entities', [])) && order.getAttribute('payload.entities', []).length > 0 && (
<View>
<View style={tailwind('mt-2')}>
Expand Down
Loading