muerwre/orchidmap-front
1
0
Fork 0
mirror of https://github.com/muerwre/orchidmap-front.git synced 2025-04-25 19:16:41 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions

redirecting editor if user accessing someone elses map

Browse source
This commit is contained in:
muerwre 2019-02-07 12:19:21 +07:00
parent 6f635c9840
commit 1b720fd40e
2 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/index.js
View file

@ -2,10 +2,10 @@
## BUGS ## BUGS
todo fix arrows (can't reproduce now :-( )
todo cancelling editing someone's else map return back to it's original address /razminochnyj/ todo cancelling editing someone's else map return back to it's original address /razminochnyj/
todo selecting logo on crop todo selecting logo on crop
todo delete sticker icon todo delete sticker icon
todo fix arrows (can't reproduce now :-( )
## FEATURES ## FEATURES

31
src/redux/user/sagas.js
View file

@ -113,10 +113,16 @@ function* iframeLoginVkSaga({ viewer_id, access_token, auth_key }) {
return yield console.log('GOT', { viewer_id, access_token, auth_key }); return yield console.log('GOT', { viewer_id, access_token, auth_key });
} }
function* replaceAddressIfItsBusy(destination, original) {
pushPath(`/${destination}/edit`);
}
function* mapInitSaga() { function* mapInitSaga() {
pushLoaderState(90); pushLoaderState(90);
const { hash } = getUrlData(); const { path, mode, hash } = getUrlData();
const { user: { id } } = yield select(getState);
if (hash && /^#map/.test(hash)) { if (hash && /^#map/.test(hash)) {
const [, newUrl] = hash.match(/^#map[:/?!](.*)$/); const [, newUrl] = hash.match(/^#map[:/?!](.*)$/);
@ -126,13 +132,16 @@ function* mapInitSaga() {
} }
} }
const { path, mode } = getUrlData();
if (path) { if (path) {
const map = yield call(loadMapSaga, path); const map = yield call(loadMapSaga, path);
if (map) { if (map) {
if (mode && mode === 'edit') { if (mode && mode === 'edit') {
if (map && map.owner && mode === 'edit' && map.owner.id !== id) {
hideLoader();
yield call(replaceAddressIfItsBusy, map.random_url);
}
yield put(setEditing(true)); yield put(setEditing(true));
editor.startEditing(); editor.startEditing();
} else { } else {
@ -257,7 +266,9 @@ function* clearSaga({ type }) {
yield put(setMode(MODES.NONE)); yield put(setMode(MODES.NONE));
} }
function* sendSaveRequestSaga({ title, address, force, is_public }) { function* sendSaveRequestSaga({
title, address, force, is_public
}) {
if (editor.isEmpty) return yield put(setSaveError(TIPS.SAVE_EMPTY)); if (editor.isEmpty) return yield put(setSaveError(TIPS.SAVE_EMPTY));
const { route, stickers, provider } = editor.dumpData(); const { route, stickers, provider } = editor.dumpData();
@ -277,7 +288,9 @@ function* sendSaveRequestSaga({ title, address, force, is_public }) {
if (result && result.mode === 'exists') return yield put(setSaveError(TIPS.SAVE_EXISTS)); if (result && result.mode === 'exists') return yield put(setSaveError(TIPS.SAVE_EXISTS));
if (timeout || !result || !result.success || !result.address) return yield put(setSaveError(TIPS.SAVE_TIMED_OUT)); if (timeout || !result || !result.success || !result.address) return yield put(setSaveError(TIPS.SAVE_TIMED_OUT));
return yield put(setSaveSuccess({ address: result.address, save_error: TIPS.SAVE_SUCCESS, title, is_public: result.is_public })); return yield put(setSaveSuccess({
address: result.address, save_error: TIPS.SAVE_SUCCESS, title, is_public: result.is_public
}));
} }
// function* refreshUserData() { // function* refreshUserData() {
@ -382,12 +395,12 @@ function* locationChangeSaga({ location }) {
const map = yield call(loadMapSaga, path); const map = yield call(loadMapSaga, path);
if (map && map.owner && mode === 'edit' && map.owner.id !== id) { if (map && map.owner && mode === 'edit' && map.owner.id !== id) {
pushPath(`/${map.random_url}/edit`); // pushPath(`/${map.random_url}/edit`);
return; return yield call(replaceAddressIfItsBusy, map.random_url);
} }
} else if (mode === 'edit' && editor.owner.id !== id) { } else if (mode === 'edit' && editor.owner.id !== id) {
pushPath(`/${random_url}/edit`); // pushPath(`/${random_url}/edit`);
return; return yield call(replaceAddressIfItsBusy, random_url);
} }
if (mode !== 'edit') { if (mode !== 'edit') {