Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/components/Project.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ import {
import ProjectDetailsForm from "./forms/ProjectDetailsForm";
import ModellingHeaderButtons from "./utils/ModellingHeaderButtons";
import { get } from 'http';
import { selectSharedUniverseState } from '../sharedUniverse';
import { bindLegacyUniverseDispatch, selectSharedUniverseState } from '../sharedUniverse';

const debug = false;

const Project = (props) => {


const dispatch = useDispatch();
const rawDispatch = useDispatch();
const dispatch = bindLegacyUniverseDispatch(rawDispatch);
Comment on lines +21 to +22
const projectModalRef = useRef(null);
const router = useRouter();
// const modeldata = useSelector((state: { phData: { metis: { models: any[], name: string, description: string } } }) => state);
Expand Down
1 change: 0 additions & 1 deletion src/components/loadModelData/ProjectMenuBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ export const ProjectMenuBar = (props: any) => {
const router = useRouter(); // Initialize router
if (!props.phData) return null;
const project = props.phData.metis;
const domain = props.phData.domain;
const source = props.phSource;
const activeMetisScope = normalizeMetisScope(getWorkspaceSnapshotMeta(props.phUser)?.activeMetisScope);
const metisScopeOptions = getMetisScopeOptions();
Expand Down
3 changes: 3 additions & 0 deletions src/sharedUniverse/legacyDispatch.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { AnyAction, Dispatch } from '@reduxjs/toolkit';
import {
loadLegacyUniverseSnapshot,
setUniverseDomain,
setUniverseFocus,
setUniversePhData,
setUniverseSource,
Expand All @@ -22,6 +23,8 @@ export const toSharedUniverseAction = (action: AnyAction): AnyAction => {
return setUniverseUser(action.data) as AnyAction;
case 'LOAD_TOSTORE_PHSOURCE':
return setUniverseSource(action.data) as AnyAction;
case 'UPDATE_DOMAIN_PROPERTIES':
return setUniverseDomain(action.data) as AnyAction;
default:
return action;
}
Expand Down
31 changes: 31 additions & 0 deletions src/sharedUniverse/universeSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,24 @@ export type LegacyUniverseSnapshot = {

const EMPTY_DOCUMENTS: unknown[] = [];

const mergeDomainPatch = (domain: unknown, patch: unknown) => {
if (
domain &&
patch &&
typeof domain === 'object' &&
typeof patch === 'object' &&
!Array.isArray(domain) &&
!Array.isArray(patch)
) {
return {
...(domain as Record<string, unknown>),
...(patch as Record<string, unknown>),
};
}

return patch;
};
Comment on lines +47 to +63

export const initialUniverseState: SharedUniverseState = {
world: {
worldDefinition: {
Expand Down Expand Up @@ -87,6 +105,7 @@ export const loadLegacyUniverseSnapshot = (snapshot: LegacyUniverseSnapshot) =>

export const setUniverseState = createAction<SharedUniverseState>('universe/setUniverseState');
export const setUniversePhData = createAction<LegacyPhData>('universe/setUniversePhData');
export const setUniverseDomain = createAction<unknown>('universe/setUniverseDomain');
export const setUniverseUser = createAction<unknown>('universe/setUniverseUser');
export const setUniverseSource = createAction<unknown>('universe/setUniverseSource');
export const setUniverseFocus = createAction<unknown>('universe/setUniverseFocus');
Expand Down Expand Up @@ -121,6 +140,18 @@ export const universeReducer = (
},
};
}
if (setUniverseDomain.match(action)) {
return {
...state,
world: {
...state.world,
worldDefinition: {
...state.world.worldDefinition,
domain: mergeDomainPatch(state.world.worldDefinition.domain, action.payload),
},
},
};
}
if (setUniverseUser.match(action)) {
return {
...state,
Expand Down