feat: real project hydration

This commit is contained in:
cha0s 2022-03-20 03:34:49 -05:00
parent 842244e289
commit 11c4a53d32
6 changed files with 82 additions and 30 deletions

View File

@ -9,6 +9,7 @@ import {
import {Resource as ResourceComponent} from '@avocado/resource-persea'; import {Resource as ResourceComponent} from '@avocado/resource-persea';
import {classnames, PropTypes, React} from '@flecks/react'; import {classnames, PropTypes, React} from '@flecks/react';
import {useDispatch, useSelector} from '@flecks/redux'; import {useDispatch, useSelector} from '@flecks/redux';
import {userIdSelector} from '@flecks/user';
import styles from './index.module.scss'; import styles from './index.module.scss';
@ -26,13 +27,34 @@ import Login from './login';
function Resource({expanded}) { function Resource({expanded}) {
const dispatch = useDispatch(); const dispatch = useDispatch();
const project = useSelector(projectSelector) || 'c41ddaac-89c2-46a4-b3e5-1d634a1a7c36'; const project = useSelector(projectSelector);
const {structure} = useSelector(projectsSelector); const {structure} = useSelector(projectsSelector);
const {current} = useSelector(resourceSelector); const {current} = useSelector(resourceSelector);
const openResources = useSelector(openResourcesSelector); const openResources = useSelector(openResourcesSelector);
const projects = Object.entries(structure); const projects = Object.entries(structure);
const selectedIndex = openResources.findIndex(({uri}) => current === uri); const selectedIndex = openResources.findIndex(({uri}) => current === uri);
const resource = useSelector((state) => projectResourceSelector(state, project, current)); const resource = useSelector((state) => projectResourceSelector(state, project, current));
const userId = useSelector(userIdSelector);
if (!project) {
return (
<div className={classnames(styles.resource, expanded && styles.expanded)}>
{
0 !== userId
? (
<div className={classnames(styles.resource, expanded && styles.expanded)}>
<div className={styles.none}><p>No project loaded</p></div>
</div>
)
: (
<div className={styles.login}>
<p>You must log in to access your projects.</p>
<Login />
</div>
)
}
</div>
);
}
if (!resource) { if (!resource) {
dispatch(fetchProjectResource({uri: current, uuid: project})); dispatch(fetchProjectResource({uri: current, uuid: project}));
} }

View File

@ -9,24 +9,6 @@
width: calc(100% - 25rem); width: calc(100% - 25rem);
} }
.login {
p {
margin: 3em;
text-align: center;
}
}
.none {
color: rgba(255, 255, 255, 0.3);
font-family: var(--thick-title-font-family);
justify-content: space-around;
display: flex;
flex-direction: column;
font-size: 2em;
height: 100%;
text-align: center;
}
> :global(.react-tabs) { > :global(.react-tabs) {
overflow: auto; overflow: auto;
} }
@ -35,3 +17,21 @@
.content { .content {
flex-grow: 100; flex-grow: 100;
} }
.login {
p {
margin: 3em;
text-align: center;
}
}
.none {
color: rgba(255, 255, 255, 0.3);
font-family: var(--thick-title-font-family);
justify-content: space-around;
display: flex;
flex-direction: column;
font-size: 2em;
height: 100%;
text-align: center;
}

View File

@ -7,15 +7,25 @@ import {projectSelector, structureSelector} from '../../state';
import Organization from './organization'; import Organization from './organization';
function Content() { function Content() {
const project = useSelector(projectSelector) || 'c41ddaac-89c2-46a4-b3e5-1d634a1a7c36'; const project = useSelector(projectSelector);
const {label, resourcePaths} = useSelector((state) => structureSelector(state, project)); const structure = useSelector((state) => structureSelector(state, project));
return ( return (
<div className={styles.content}> <div className={styles.content}>
<Organization {
label={label} project
uuid={project} ? (
resourcePaths={resourcePaths} <Organization
/> label={structure.label}
uuid={project}
resourcePaths={structure.resourcePaths}
/>
)
: (
<div className={styles.empty}>
<p>You don&apos;t have any projects.</p>
</div>
)
}
</div> </div>
); );
} }

View File

@ -1,6 +1,14 @@
.content { .content {
} }
.empty {
p {
font-family: var(--message-font-family);
margin-top: 1em;
text-align: center;
}
}
.icon { .icon {
background-image: url('./icon_document.svg'); background-image: url('./icon_document.svg');
} }

View File

@ -6,7 +6,7 @@ import styles from './content.module.scss';
import {projectSelector, projectsSelector} from '../../state'; import {projectSelector, projectsSelector} from '../../state';
function Content() { function Content() {
const project = useSelector(projectSelector) || 'c41ddaac-89c2-46a4-b3e5-1d634a1a7c36'; const project = useSelector(projectSelector);
const {structure} = useSelector(projectsSelector); const {structure} = useSelector(projectsSelector);
const projects = Object.entries(structure); const projects = Object.entries(structure);
return ( return (

View File

@ -1,7 +1,10 @@
import { import {
createSlice, createSlice,
hydrateServer,
} from '@flecks/redux'; } from '@flecks/redux';
const HydrateServer = Symbol.for('$persea/core.project');
export const projectSelector = (state) => state.project; export const projectSelector = (state) => state.project;
const slice = createSlice({ const slice = createSlice({
@ -11,19 +14,28 @@ const slice = createSlice({
reducers: { reducers: {
setProject: (state, {payload}) => payload, setProject: (state, {payload}) => payload,
}, },
extraReducers: (builder) => {
builder.addCase(hydrateServer, (state, {payload}) => payload.req[HydrateServer]);
},
/* eslint-enable no-param-reassign */ /* eslint-enable no-param-reassign */
}); });
slice.reducer.hydrateServer = async (req) => { slice.reducer.hydrateServer = async (req) => {
const {user} = req; const {user} = req;
if (!user) { if (!user) {
return null; req[HydrateServer] = null;
return;
} }
const projects = await user.getProjects(); const projects = await user.getProjects();
if (0 === projects.length) { if (0 === projects.length) {
return null; req[HydrateServer] = null;
return;
} }
return projects[0].uuid; req[HydrateServer] = projects[0].uuid;
}; };
export const {
setProject,
} = slice.actions;
export default slice.reducer; export default slice.reducer;