Skip to content

Commit

Permalink
fix: Data browser redirects to wrong class when changing app (parse-c…
Browse files Browse the repository at this point in the history
  • Loading branch information
AshishBarvaliya authored Feb 15, 2024
1 parent b37ca74 commit 7713f54
Showing 1 changed file with 45 additions and 17 deletions.
62 changes: 45 additions & 17 deletions src/dashboard/Data/Browser/Browser.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ class Browser extends DashboardView {
processedScripts: 0,
};

this.addLocation = this.addLocation.bind(this);
this.removeLocation = this.removeLocation.bind(this);
this.prefetchData = this.prefetchData.bind(this);
this.fetchData = this.fetchData.bind(this);
this.fetchRelation = this.fetchRelation.bind(this);
Expand Down Expand Up @@ -186,29 +188,18 @@ class Browser extends DashboardView {
}

componentDidMount() {
if (window.localStorage) {
const pathname = window.localStorage.getItem(BROWSER_LAST_LOCATION);
window.localStorage.removeItem(BROWSER_LAST_LOCATION);
if (pathname) {
setTimeout(
function () {
this.props.navigate(pathname);
}.bind(this)
);
}
}
this.addLocation(this.props.params.appId);
}

componentWillUnmount() {
if (window.localStorage) {
window.localStorage.setItem(
BROWSER_LAST_LOCATION,
this.props.location.pathname + this.props.location.search
);
}
this.removeLocation();
}

componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.params.appId !== this.props.params.appId) {
this.removeLocation();
this.addLocation(nextProps.params.appId);
}
if (
this.props.params.appId !== nextProps.params.appId ||
this.props.params.className !== nextProps.params.className ||
Expand All @@ -228,6 +219,43 @@ class Browser extends DashboardView {
}
}

addLocation(appId) {
if (window.localStorage) {
let pathname = null;
const newLastLocations = [];

const lastLocations = JSON.parse(window.localStorage.getItem(BROWSER_LAST_LOCATION));
lastLocations?.forEach(lastLocation => {
if (lastLocation.appId !== appId) {
newLastLocations.push(lastLocation);
} else {
pathname = lastLocation.location;
}
});

window.localStorage.setItem(BROWSER_LAST_LOCATION, JSON.stringify(newLastLocations));
if (pathname) {
setTimeout(
function () {
this.props.navigate(pathname);
}.bind(this)
);
}
}
}

removeLocation() {
if (window.localStorage) {
const lastLocation = {
appId: this.props.params.appId,
location: `${this.props.location.pathname}${this.props.location.search}`,
};
const currentLastLocation = JSON.parse(window.localStorage.getItem(BROWSER_LAST_LOCATION));
const updatedLastLocation = [...(currentLastLocation || []), lastLocation];
window.localStorage.setItem(BROWSER_LAST_LOCATION, JSON.stringify(updatedLastLocation));
}
}

async prefetchData(props, context) {
const filters = this.extractFiltersFromQuery(props);
const { className, entityId, relationName } = props.params;
Expand Down

0 comments on commit 7713f54

Please sign in to comment.