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

Merge pull request #4412 from urbit/la/fix-385

Browse Source 
interface: redirect to base url when unsubscribing, removing, or arch…
This commit is contained in:
L 2021-02-11 13:52:46 -06:00 committed by GitHub
commit 7176577d13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/interface/src/views/landscape/components/ChannelPopoverRoutes/index.tsx
View File

@ -43,13 +43,16 @@ export function ChannelPopoverRoutes(props: ChannelPopoverRoutesProps) {
const handleUnsubscribe = async () => { const handleUnsubscribe = async () => {
const [,,ship,name] = association.resource.split('/'); const [,,ship,name] = association.resource.split('/');
await api.graph.leaveGraph(ship, name); await api.graph.leaveGraph(ship, name);
history.push(props.rootUrl);
}; };
const handleRemove = async () => { const handleRemove = async () => {
await api.metadata.remove('graph', association.resource, association.group); await api.metadata.remove('graph', association.resource, association.group);
history.push(props.rootUrl);
}; };
const handleArchive = async () => { const handleArchive = async () => {
const [,,,name] = association.resource.split('/'); const [,,,name] = association.resource.split('/');
await api.graph.deleteGraph(name); await api.graph.deleteGraph(name);
history.push(props.baseUrl);
}; };
const canAdmin = isChannelAdmin(group, association.resource); const canAdmin = isChannelAdmin(group, association.resource);

2
pkg/interface/src/views/landscape/components/Resource.tsx
View File

@ -33,7 +33,6 @@ export function Resource(props: ResourceProps) {
const rid = association.resource; const rid = association.resource;
const selectedGroup = association.group; const selectedGroup = association.group;
const relativePath = (p: string) => const relativePath = (p: string) =>
`${props.baseUrl}/resource/${app}${rid}${p}`; `${props.baseUrl}/resource/${app}${rid}${p}`;
const skelProps = { api, association, groups, contacts }; const skelProps = { api, association, groups, contacts };
let title = props.association.metadata.title; let title = props.association.metadata.title;
@ -71,6 +70,7 @@ export function Resource(props: ResourceProps) {
contacts={props.contacts} contacts={props.contacts}
api={props.api} api={props.api}
baseUrl={relativePath("")} baseUrl={relativePath("")}
rootUrl={props.baseUrl}
notificationsGraphConfig={notificationsGraphConfig} notificationsGraphConfig={notificationsGraphConfig}
/> />
); );