Skip to content

Fix/edit provider refresh redirect #344

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

Open
ND68 wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Fix/edit provider refresh redirect #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcb9abe
refresh redirect fixed
ND68 Mar 3, 2025
7848bcb
selected provider persists on refresh when attempting to edit
ND68 Mar 3, 2025
9ed8d48
resizing window clears edited data fixed
ND68 Mar 4, 2025
2423644
fixed first edit render not working
ND68 Mar 4, 2025
a0dd10d
edits don't depend on facilityNames now, but rather item.id, fixed ad…
ND68 Mar 5, 2025
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
63 changes: 43 additions & 20 deletions src/components/dashboard/AddProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,35 +39,58 @@ let steps = [
];

function AddProvider(props) {
const defaultItem = {
facilityName: "",
address: [],
description: "",
buildingNum: [],
stationNum: "",
childcare: [false],
epic: [false],
hours: {},
links: {},
notes: [],
phoneNum: [],
website: [],
image: "modalimage.png",
imageURL: null,
content: {},
filters: {},
};
const { width } = useWindowSize();
const [step, setStep] = useState(0);
const [completed, setCompleted] = useState(false);
const [animate, setAnimate] = useState(true);
const [item, setItem] = useState(props.selected || {});
const [item, setItem] = useState((JSON.parse(sessionStorage.getItem("item")) !== null
? JSON.parse(sessionStorage.getItem("item")) :
(props.selected !== null && Object.keys(props.selected).length > 0
? props.selected : defaultItem)))
const [isLoading, setIsLoading] = useState(true);
const [filters, setFilters] = useState(null);
const [descriptions, setDescriptions] = useState(null);
const [single, setSingle] = useState(null);
const [error, setError] = useState("");
const [firstLoad, setFirstLoad] = useState(true);
const [content, setContent] = useState(
'ex. "Changing lives one bit at a time..."'
);
const handleUpdate = (updatedContent: string) => {
setContent(updatedContent);
};

// selected provider persists on refresh when attempting to edit
useEffect(() => {
console.log((sessionStorage.getItem("item")))
if (firstLoad === false) {
if (JSON.parse(sessionStorage.getItem("item")) == null || Object.keys(item).length > 0) {
sessionStorage.setItem('item', JSON.stringify(item))
} else {
if(JSON.parse(sessionStorage.getItem("item")) !== null) {
setItem(JSON.parse(sessionStorage.getItem("item")))
}
setFirstLoad(false)
console.log("stored")
}
console.log("item:", item)
}, [item]);

useEffect(() => {
if(JSON.parse(sessionStorage.getItem("item")) !== null) {
setItem(JSON.parse(sessionStorage.getItem("item")))
}
}, [item])
}, []);

useEffect(() => {
async function fetchData() {
Expand Down Expand Up @@ -392,14 +415,14 @@ function AddProvider(props) {
block
disabled={!completed}
onClick={
props.selected &&
props.selected.facilityName
item &&
item.id
? updateFirestore
: addFirestore
}
>
{props.selected &&
props.selected.facilityName
{item &&
item.id
? "Edit"
: "Add"}{" "}
Provider
Expand Down Expand Up @@ -445,9 +468,8 @@ function AddProvider(props) {
onClick={
step ===
steps.length - 1
? props.selected &&
props.selected
.facilityName
? item &&
item.id
? updateFirestore
: addFirestore
: next
Expand All @@ -461,9 +483,8 @@ function AddProvider(props) {
>
{step ===
steps.length - 1
? props.selected &&
props.selected
.facilityName
? item &&
item.id
? "Edit Provider"
: "Add Provider"
: "Next"}
Expand Down Expand Up @@ -497,6 +518,8 @@ function AddProvider(props) {
i
);
setItem(i);
console.log(item)
console.log("item set", i)
setCompleted(c);
}}
filters={filters}
Expand Down
21 changes: 2 additions & 19 deletions src/components/dashboard/RowForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,10 @@ function validURL(str) {
}

const RowForm = (props) => {
const defaultItem = {
facilityName: "",
address: [],
description: "",
buildingNum: [],
stationNum: "",
childcare: [false],
epic: [false],
hours: {},
links: {},
notes: [],
phoneNum: [],
website: [],
image: "modalimage.png",
imageURL: null,
content: {},
filters: {},
};


const [item, setItem] = useState(
props.item.facilityName ? props.item : JSON.parse(sessionStorage.getItem("item")) || defaultItem
props.item.id ? props.item : JSON.parse(sessionStorage.getItem("item"))
);
const [showModal, setShowModal] = useState(false);

Expand Down