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

Show asset import progress #6400

Merged
merged 2 commits into from
Oct 5, 2023
Merged

Show asset import progress #6400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f4585a
Show asset import progress
Ashesh3 Oct 5, 2023
bd95384
Fix cypress
Ashesh3 Oct 5, 2023
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
2 changes: 1 addition & 1 deletion cypress/support/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Cypress.Commands.add(

Cypress.Commands.add("verifyNotification", (text) => {
cy.get(".pnotify-container").should("exist").contains(text);
return cy.get(".pnotify-container").click({ force: true });
return cy.get(".pnotify-container").contains(text).click({ force: true });
});

Cypress.on("uncaught:exception", () => {
Expand Down
68 changes: 43 additions & 25 deletions src/Components/Assets/AssetImportModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { Cancel, Submit } from "../Common/components/ButtonV2";
import { listFacilityAssetLocation } from "../../Redux/actions";
import { useDispatch } from "react-redux";
import { Link } from "raviger";
import SelectMenuV2 from "../Form/SelectMenuV2";
import readXlsxFile from "read-excel-file";
import {
LocalStorageKeys,
Expand All @@ -17,6 +16,7 @@ import {
import { parseCsvFile } from "../../Utils/utils";
import useConfig from "../../Common/hooks/useConfig";
import DialogModal from "../Common/Dialog";
import { SelectFormField } from "../Form/FormFields/SelectFormField";

interface Props {
open: boolean;
Expand All @@ -25,14 +25,18 @@ interface Props {
}

const AssetImportModal = ({ open, onClose, facility }: Props) => {
const [isImporting, setIsUploading] = useState(false);
const [isImporting, setIsImporting] = useState(false);
const [selectedFile, setSelectedFile] = useState<any>();
const [preview, setPreview] =
useState<(AssetData & { notes?: string; last_serviced_on?: string })[]>();
const [location, setLocation] = useState("");
const [errors, setErrors] = useState<any>({
location: "",
});
const [locations, setLocations] = useState<any>([]);
const dispatchAction: any = useDispatch();
const { sample_format_asset_import } = useConfig();
const [locationsLoading, setLocationsLoading] = useState(false);

const closeModal = () => {
setPreview(undefined);
Expand All @@ -41,9 +45,11 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
};

useEffect(() => {
setLocationsLoading(true);
dispatchAction(
listFacilityAssetLocation({}, { facility_external_id: facility.id })
).then(({ data }: any) => {
setLocationsLoading(false);
if (data.count > 0) {
setLocations(data.results);
}
Expand Down Expand Up @@ -110,7 +116,16 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
closeModal();
return;
}
if (!location) {
setErrors({
...errors,
location: "Please select a location",
});
return;
}
setIsImporting(true);
let error = false;
Notification.Success({ msg: "Importing assets..." });

for (const asset of preview || []) {
const asset_data: any = {
Expand Down Expand Up @@ -156,16 +171,22 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
});
error = true;
} else {
if (preview) setPreview(preview.filter((a) => a.id !== asset.id));
setPreview((preview) => {
return preview?.slice(1);
});
}
}
if (!error) {
Notification.Success({ msg: "Assets imported successfully" });
await sleep(1000);
setIsUploading(false);
closeModal();
setIsImporting(false);
window.location.reload();
} else Notification.Error({ msg: "Error importing some assets" });
} else {
Notification.Error({ msg: "Error importing some assets" });
await sleep(1000);
setIsImporting(false);
closeModal();
}
};

const dragProps = useDragAndDrop();
Expand Down Expand Up @@ -193,7 +214,7 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
fixedWidth={false}
>
<span className="mt-1 text-gray-700">{facility.name}</span>
{locations.length === 0 ? (
{!locationsLoading && locations.length === 0 ? (
<>
<div className="flex h-full flex-col items-center justify-center">
<h1 className="m-7 text-2xl font-medium text-gray-700">
Expand All @@ -218,31 +239,28 @@ const AssetImportModal = ({ open, onClose, facility }: Props) => {
{preview && preview?.length > 0 ? (
<div className="flex flex-col items-center justify-center rounded-lg">
<h1 className="m-7 text-2xl font-medium text-gray-700">
{preview.length} assets will be imported
{preview.length} assets {isImporting ? "are being" : "will be"}{" "}
imported
</h1>
<div className="w-1/2 p-4">
<label htmlFor="asset-location">
Select location for import *
<label htmlFor="asset-location" className="flex gap-1">
Select location for import{" "}
<p className="font-semibold text-danger-500">*</p>
</label>
<div className="mt-2" data-testid="select-import-location">
<SelectMenuV2
required
options={[
{
title: "Select",
description: "Select the location",
value: "0",
},
...locations.map((location: any) => ({
title: location.name,
description: location.facility.name,
value: location.id,
})),
]}
<SelectFormField
name="asset-import-location"
options={locations.map((location: any) => ({
title: location.name,
description: location.facility.name,
value: location.id,
}))}
optionLabel={(o) => o.title}
optionValue={(o) => o.value}
placeholder="Select a location"
value={location}
onChange={(e) => setLocation(e)}
onChange={({ value }) => setLocation(value)}
error={errors.location}
/>
</div>
</div>
Expand Down
Loading