Highlight folder when selected

This commit is contained in:
Maxime Lalo 2023-09-13 10:40:41 +02:00
parent 38cde6148e
commit 50d8d0f349
2 changed files with 11 additions and 2 deletions

View File

@ -19,6 +19,7 @@ type IProps = {
type IPropsClass = IProps & { type IPropsClass = IProps & {
router: NextRouter; router: NextRouter;
selectedFolder: string;
}; };
type IState = { type IState = {
@ -85,7 +86,11 @@ class FolderListContainerClass extends React.Component<IPropsClass, IState> {
}); });
return [...pendingFolders, ...otherFolders].map((folder) => { return [...pendingFolders, ...otherFolders].map((folder) => {
return { id: folder.uid!, name: folder.folder_number! + " - " + folder.name!, selected: false }; return {
id: folder.uid!,
name: folder.folder_number! + " - " + folder.name!,
selected: this.props.selectedFolder === folder.uid,
};
}); });
} }
private onSelectedFolder(block: IBlock) { private onSelectedFolder(block: IBlock) {
@ -118,5 +123,6 @@ class FolderListContainerClass extends React.Component<IPropsClass, IState> {
export default function FolderListContainer(props: IProps) { export default function FolderListContainer(props: IProps) {
const router = useRouter(); const router = useRouter();
return <FolderListContainerClass {...props} router={router} />; const { folderUid } = router.query;
return <FolderListContainerClass {...props} router={router} selectedFolder={folderUid as string} />;
} }

View File

@ -19,7 +19,10 @@ export default function Login() {
const redirectUserOnConnection = useCallback(() => { const redirectUserOnConnection = useCallback(() => {
async function getUser() { async function getUser() {
try { try {
// Super admin
await UserStore.instance.connect("jelkvelknvlkn"); await UserStore.instance.connect("jelkvelknvlkn");
// Notaire
// await UserStore.instance.connect("ljfeflecnmd");
await JwtService.getInstance().checkJwt(); await JwtService.getInstance().checkJwt();
router.push(Module.getInstance().get().modules.pages.Folder.props.path); router.push(Module.getInstance().get().modules.pages.Folder.props.path);
} catch (e) { } catch (e) {