urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-26 13:31:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3722 from urbit/mp/landscape/channel-menu

Browse Source 
landscape: check workspace in channel menu
This commit is contained in:
matildepark 2020-10-16 12:28:46 -04:00 committed by GitHub
commit e7b1f840f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/interface/src/views/landscape/components/ChannelMenu.tsx
View File

@ -34,7 +34,9 @@ export function ChannelMenu(props: ChannelMenuProps) {
const history = useHistory();
const { metadata } = association;
const app = metadata.module || association["app-name"];
const baseUrl = `/~landscape${association?.["group-path"]}/resource/${app}${association["app-path"]}`;
const workspace = history.location.pathname.startsWith('/~landscape/home')
? '/home' : association?.['group-path'];
const baseUrl = `/~landscape${workspace}/resource/${app}${association["app-path"]}`;
const appPath = association["app-path"];
const [, ship, name] = appPath.startsWith("/ship/")
@ -59,7 +61,7 @@ export function ChannelMenu(props: ChannelMenuProps) {
default:
throw new Error("Invalid app name");
}
history.push(`/~landscape${association?.["group-path"]}`);
history.push(`/~landscape${workspace}`);
}, [api, association]);
const onDelete = useCallback(async () => {
@ -77,7 +79,7 @@ export function ChannelMenu(props: ChannelMenuProps) {
default:
throw new Error("Invalid app name");
}
history.push(`/~landscape${association?.["group-path"]}`);
history.push(`/~landscape${workspace}`);
}, [api, association]);
return (