ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-10 10:05:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

landscape: update DMs for graph-store

Browse Source
This commit is contained in:
Liam Fitzgerald 2020-12-07 12:46:53 +10:00
parent 6f9b991e3f
commit 30ee107762
No known key found for this signature in database
GPG Key ID: D390E12C61D1CFFB
3 changed files with 51 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/interface/src/logic/reducers/graph-update.js
View File

@ -119,6 +119,7 @@ const addNodes = (json, state) => {
if (!(resource in state.graphs)) {
state.graphs[resource] = new BigIntOrderedMap();
}
state.graphKeys.add(resource);
for (let index in data.nodes) {
let node = data.nodes[index];

8
pkg/interface/src/views/components/Loading.tsx
View File

@ -1,13 +1,17 @@
import React from "react";
import { Center, LoadingSpinner } from "@tlon/indigo-react";
import { Text, Center, LoadingSpinner } from "@tlon/indigo-react";
import { Body } from "./Body";
export function Loading() {
interface LoadingProps {
text?: string;
}
export function Loading({ text }: LoadingProps) {
return (
<Body>
<Center height="100%">
<LoadingSpinner />
{!!text && <Text>{text}</Text>}
</Center>
</Body>
);

80
pkg/interface/src/views/landscape/index.tsx
View File

@ -1,5 +1,5 @@
import React, { Component } from 'react';
import { Route, Switch } from 'react-router-dom';
import React, { Component, useEffect } from 'react';
import { Route, Switch, RouteComponentProps } from 'react-router-dom';
import './css/custom.css';
@ -14,6 +14,7 @@ import { JoinGroup } from './components/JoinGroup';
import { cite } from '~/logic/lib/util';
import { Body } from '../components/Body';
import { Box } from '@tlon/indigo-react';
import { Loading } from '../components/Loading';
type LandscapeProps = StoreState & {
@ -22,6 +23,45 @@ type LandscapeProps = StoreState & {
subscription: GlobalSubscription;
}
export function DMRedirect(props: LandscapeProps & RouteComponentProps & { ship: string; }) {
const { ship, api, history, graphKeys } = props;
useEffect(() => {
const station = `/ship/~${window.ship}/dm--${ship}`;
const theirStation = `/ship/~${ship}/dm--${window.ship}`;
if (graphKeys.has(station)) {
history.push(`/~landscape/home/resource/chat${station}`);
return;
}
if (graphKeys.has(theirStation)) {
history.push(`/~landscape/home/resource/chat${theirStation}`);
return;
}
const aud = ship !== window.ship ? [`~${ship}`] : [];
const title = `${cite(window.ship)} <-> ${cite(ship)}`;
api.graph.createUnmanagedGraph(
`dm--${ship}`,
title,
'',
{ invite: { pending: aud } },
'chat'
).then(() => {
history.push(`/~landscape/home/resource/chat${station}`);
});
}, []);
return (
<Loading text="Creating DM" />
);
}
export default class Landscape extends Component<LandscapeProps, {}> {
componentDidMount() {
document.title = 'OS1 - Landscape';
@ -31,43 +71,11 @@ export default class Landscape extends Component<LandscapeProps, {}> {
}
createandRedirectToDM(api, ship, history, allStations) {
const station = `/~${window.ship}/dm--${ship}`;
const theirStation = `/~${ship}/dm--${window.ship}`;
if (allStations.indexOf(station) !== -1) {
history.push(`/~landscape/home/resource/chat${station}`);
return;
}
if (allStations.indexOf(theirStation) !== -1) {
history.push(`/~landscape/home/resource/chat${theirStation}`);
return;
}
const groupPath = `/ship/~${window.ship}/dm--${ship}`;
const aud = ship !== window.ship ? [`~${ship}`] : [];
const title = `${cite(window.ship)} <-> ${cite(ship)}`;
api.chat.create(
title,
'',
station,
groupPath,
{ invite: { pending: aud } },
aud,
true,
false
);
// TODO: make a pretty loading state
setTimeout(() => {
history.push(`/~landscape/home/resource/chat${station}`);
}, 5000);
}
render() {
const { props } = this;
const { api, inbox } = props;
const { api } = props;
return (
<Switch>
@ -112,7 +120,7 @@ export default class Landscape extends Component<LandscapeProps, {}> {
<Route path='/~landscape/dm/:ship?'
render={routeProps => {
const { ship } = routeProps.match.params;
return this.createandRedirectToDM(api, ship, routeProps.history, Object.keys(inbox));
return <DMRedirect {...routeProps} {...props} ship={ship} />
}}
/>
<Route path="/~landscape/join/:ship?/:name?"