Fixed create object URL after first save, fixed URL itself

main
Boris Sekachev 6 years ago
parent 73a7a7fd79
commit 5e2f2ecf31

@ -973,6 +973,8 @@ export function getJobAsync(
export function saveAnnotationsAsync(sessionInstance: any): export function saveAnnotationsAsync(sessionInstance: any):
ThunkAction<Promise<void>, {}, {}, AnyAction> { ThunkAction<Promise<void>, {}, {}, AnyAction> {
return async (dispatch: ActionCreator<Dispatch>): Promise<void> => { return async (dispatch: ActionCreator<Dispatch>): Promise<void> => {
const { filters, frame, showAllInterpolationTracks } = receiveAnnotationsParameters();
dispatch({ dispatch({
type: AnnotationActionTypes.SAVE_ANNOTATIONS, type: AnnotationActionTypes.SAVE_ANNOTATIONS,
payload: {}, payload: {},
@ -992,6 +994,8 @@ ThunkAction<Promise<void>, {}, {}, AnyAction> {
}); });
}); });
const states = await sessionInstance
.annotations.get(frame, showAllInterpolationTracks, filters);
await saveJobEvent.close(); await saveJobEvent.close();
await sessionInstance.logger.log( await sessionInstance.logger.log(
LogType.sendTaskInfo, LogType.sendTaskInfo,
@ -1001,7 +1005,9 @@ ThunkAction<Promise<void>, {}, {}, AnyAction> {
dispatch({ dispatch({
type: AnnotationActionTypes.SAVE_ANNOTATIONS_SUCCESS, type: AnnotationActionTypes.SAVE_ANNOTATIONS_SUCCESS,
payload: {}, payload: {
states,
},
}); });
} catch (error) { } catch (error) {
dispatch({ dispatch({

@ -63,10 +63,11 @@ function mapDispatchToProps(dispatch: any, own: OwnProps): DispatchToProps {
} }
} }
if (searchParams.has('object')) { if (searchParams.has('serverID') && searchParams.has('type')) {
const searchObject = +(searchParams.get('object') as string); const serverID = searchParams.get('serverID');
if (!Number.isNaN(searchObject)) { const type = searchParams.get('type');
initialFilters.push(`serverID==${searchObject}`); if (serverID && !Number.isNaN(+serverID)) {
initialFilters.push(`serverID==${serverID} & type=="${type}"`);
} }
} }

@ -255,7 +255,7 @@ class ObjectItemContainer extends React.PureComponent<Props> {
pathname, pathname,
} = window.location; } = window.location;
const search = `frame=${frameNumber}&object=${objectState.serverID}`; const search = `frame=${frameNumber}&type=${objectState.objectType}&serverID=${objectState.serverID}`;
const url = `${origin}${pathname}?${search}`; const url = `${origin}${pathname}?${search}`;
copy(url); copy(url);
}; };

@ -267,10 +267,12 @@ export default (state = defaultState, action: AnyAction): AnnotationState => {
}; };
} }
case AnnotationActionTypes.SAVE_ANNOTATIONS_SUCCESS: { case AnnotationActionTypes.SAVE_ANNOTATIONS_SUCCESS: {
const { states } = action.payload;
return { return {
...state, ...state,
annotations: { annotations: {
...state.annotations, ...state.annotations,
states,
saving: { saving: {
...state.annotations.saving, ...state.annotations.saving,
uploading: false, uploading: false,

Loading…
Cancel
Save