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

updated notebook creation logic to be in line with groups/contacts

Browse Source 
added invite reducer
fixed page transition on new notebook creation
This commit is contained in:
Isaac Visintainer 2020-02-06 11:07:11 -08:00
parent ccdb4b0259
commit 45b82e04f0
10 changed files with 205 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
pkg/arvo/app/publish.hoon
View File

@ -173,7 +173,7 @@
=/ uid (sham %publish who book eny.bol)
=/ inv=invite
:* our.bol %publish /notebook/[book] who
'invite for notebook {<who>}/{<book>}'
(crip "invite for notebook {<who>}/{<book>}")
==
=/ act=invite-action [%invite /publish uid inv]
[%pass /invite %agent [who %invite-hook] %poke %invite-action !>(act)]
@ -191,12 +191,13 @@
[%web %publish @ %publish-info ~]
=/ book-name i.t.t.pax
=/ old=old-info .^(old-info %cx (welp our-beak:main pax))
=/ write-pax /~/publish/(scot %p our.bol)/[book-name]/write
=/ read-pax /~/publish/(scot %p our.bol)/[book-name]/read
=/ group-pax /~/publish/(scot %p our.bol)/[book-name]
=/ book=notebook-info
[title.old '' =(%open comments.old) write-pax read-pax]
=/ grp-car=(list card)
(make-groups ~ writers.book ~ subscribers.book %journal)
[title.old '' =(%open comments.old) / /]
=+ ^- [grp-car=(list card) write-pax=path read-pax=path]
(make-groups book-name group-pax ~ %.n %.n)
=. writers.book write-pax
=. subscribers.book read-pax
=/ inv-car (send-invites book-name (~(get ju old-subs) book-name))
:- :(weld car grp-car inv-car)
^- soba:clay
@ -522,12 +523,14 @@
now.bol
~ ~ ~
==
=? writers.new-book =(writers.new-book /)
/~/publish/(scot %p our.bol)/[book-name]/write
=? subscribers.new-book =(writers.new-book /)
/~/publish/(scot %p our.bol)/[book-name]/read
=/ grp-car=(list card)
(make-groups ~ writers.new-book ~ subscribers.new-book %journal)
=/ group-path=path
?: =(writers.new-book /)
/~/publish/(scot %p our.bol)/[book-name]
writers.new-book
=+ ^- [grp-car=(list card) write-pax=path read-pax=path]
(make-groups book-name group-path ~ %.n %.n)
=. writers.new-book write-pax
=. subscribers.new-book read-pax
=+ ^- [read-cards=(list card) notes=(map @tas note)]
(watch-notes /app/publish/notebooks/[book-name])
=. notes.new-book notes
@ -810,6 +813,11 @@
^- card
[%pass / %agent [our.bol %group-store] %poke %group-action !>(act)]
::
++ contact-view-create
|= act=[%create path (set ship)]
^- card
[%pass / %agent [our.bol %contact-view] %poke %contact-view-action !>(act)]
::
++ perm-hook-poke
|= act=permission-hook-action
^- card
@ -853,22 +861,80 @@
(perm-group-hook-poke [%associate write [[write write-type] ~ ~]])
==
::
++ make-groups
|= $: write-grp=(set ship) write-pax=path
read-grp=(set ship) read-pax=path
sec=rw-security
==
++ create-managed-group
|= [pax=path security=rw-security ships=(set ship)]
^- (list card)
;: weld
:~ (group-poke [%bundle write-pax])
(group-poke [%bundle read-pax])
(group-poke [%add write-grp write-pax])
(group-poke [%add read-grp read-pax])
=/ grp
.^((unit group) %gx ;:(weld /=group-store/(scot %da now.bol) pax /noun))
?^ grp
~
?> ?=(^ pax)
?: |(=('~' i.pax) !=(%village security))
[(group-poke [%bundle pax])]~
[(contact-view-create [%create pax ships])]~
::
++ generate-invites
|= [book=@tas invitees=(set ship)]
^- (list card)
%+ turn ~(tap in invitees)
|= who=ship
=/ uid (sham %publish who book eny.bol)
=/ inv=invite
:* our.bol %publish /notebook/[book] who
(crip "invite for notebook {<who>}/{<book>}")
==
(create-security read-pax write-pax sec)
:~ (perm-hook-poke [%add-owned write-pax write-pax])
(perm-hook-poke [%add-owned read-pax read-pax])
=/ act=invite-action [%invite /publish uid inv]
[%pass / %agent [our.bol %invite-hook] %poke %invite-action !>(act)]
::
++ make-groups
|= [book=@tas group=group-info]
^- [(list card) write=path read=path]
?> ?=(^ group-path.group)
?: use-preexisting.group
=/ scry-path
;:(weld /=group-store/(scot %da now.bol) group-path.group /noun)
=/ grp .^((unit ^group) %gx scry-path)
?~ grp !!
?> ?=(^ group-path.group)
?< =('~' i.group-path.group)
:_ [group-path.group group-path.group]
%- zing
:~ (create-security group-path.group group-path.group %channel)
[(perm-hook-poke [%add-owned group-path.group group-path.group])]~
(generate-invites book (~(del in u.grp) our.bol))
==
::
?: make-managed.group
=/ scry-path
;:(weld /=group-store/(scot %da now.bol) group-path.group /noun)
=/ grp .^((unit ^group) %gx scry-path)
?^ grp [~ group-path.group group-path.group]
?> ?=(^ group-path.group)
?< =('~' i.group-path.group)
:_ [group-path.group group-path.group]
%- zing
:~ [(contact-view-create [%create group-path.group invitees.group])]~
(create-security group-path.group group-path.group %channel)
[(perm-hook-poke [%add-owned group-path.group group-path.group])]~
(generate-invites book (~(del in invitees.group) our.bol))
==
:: make unmanaged group
?> ?=(^ group-path.group)
?> =('~' i.group-path.group)
=* write-path group-path.group
=/ read-path (weld write-path /read)
=/ scry-path=path
;:(weld /=group-store/(scot %da now.bol) group-path.group /noun)
=/ grp .^((unit ^group) %gx scry-path)
?^ grp [~ write-path read-path]
:_ [write-path read-path]
%- zing
:~ [(group-poke [%bundle write-path])]~
[(group-poke [%bundle read-path])]~
(create-security read-path write-path %journal)
[(perm-hook-poke [%add-owned write-path write-path])]~
[(perm-hook-poke [%add-owned read-path read-path])]~
(generate-invites book (~(del in invitees.group) our.bol))
==
::
++ poke-publish-action
@ -881,14 +947,7 @@
?: (~(has by books) book.act)
~|("notebook already exists: {<book.act>}" !!)
=+ ^- [cards=(list card) write-pax=path read-pax=path]
?. ?=(%new -.group.act)
[~ write-pax.group.act read-pax.group.act]
:_ [write-pax.group.act read-pax.group.act]
%- make-groups
:* write-grp.group.act write-pax.group.act
read-grp.group.act read-pax.group.act
sec.group.act
==
(make-groups book.act group.act)
=/ new-book=notebook-info
:* title.act
about.act
@ -959,14 +1018,7 @@
=+ ^- [cards=(list card) write-pax=path read-pax=path]
?~ group.act
[~ writers.u.book subscribers.u.book]
?. ?=(%new -.u.group.act)
[~ write-pax.u.group.act read-pax.u.group.act]
:_ [write-pax.u.group.act read-pax.u.group.act]
%- make-groups
:* write-grp.u.group.act write-pax.u.group.act
read-grp.u.group.act read-pax.u.group.act
sec.u.group.act
==
(make-groups book.act u.group.act)
=/ new-info=notebook-info
:* title.act
about.act

15
pkg/arvo/mar/publish/action.hoon
View File

@ -115,16 +115,13 @@
note+so
==
++ group-info
%- of
:~ old+(ot write-pax+pa read-pax+pa ~)
:- %new
%- ot
:~ write-grp+set-ship write-pax+pa
read-grp+set-ship read-pax+pa
sec+so
==
%- ot
:~ group-path+pa
invitees+set-ship
use-preexisting+bo
make-managed+bo
==
++ set-ship (ar (su fed:ag))
++ set-ship (as (su fed:ag))
--
--
--

11
pkg/arvo/sur/publish.hoon
View File

@ -2,15 +2,12 @@
|%
::
+$ group-info
$% [%old write-pax=path read-pax=path]
$: %new
write-grp=(set ship) write-pax=path
read-grp=(set ship) read-pax=path
sec=rw-security
==
$: group-path=path
invitees=(set ship)
use-preexisting=?
make-managed=?
==
::
::
+$ action
$% [%new-book book=@tas title=@t about=@t coms=? group=group-info]
[%new-note who=@p book=@tas note=@tas title=@t body=@t]

2
pkg/interface/publish/src/js/components/lib/join.js
View File

@ -64,8 +64,6 @@ export class JoinScreen extends Component {
}
}
console.log('actionData', actionData);
// TODO: askHistory setting
window.api.action("publish","publish-action", actionData);

73
pkg/interface/publish/src/js/components/lib/new.js
View File

@ -26,14 +26,11 @@ export class NewScreen extends Component {
componentDidUpdate(prevProps) {
const { props, state } = this;
if (prevProps !== props) {
if (props.notebooks && (("~" + window.ship) in props.notebooks)) {
let notebookId = stringToSymbol(state.idName)
if (notebookId in props.notebooks["~" + window.ship]) {
let notebook = `/~${window.ship}/${notebookId}`;
props.history.push("/~publish/notebook" + notebook);
}
if (props.notebooks && (("~" + window.ship) in props.notebooks)) {
let notebookId = stringToSymbol(state.idName)
if (notebookId in props.notebooks["~" + window.ship]) {
let notebook = `/~${window.ship}/${notebookId}`;
props.history.push("/~publish/notebook" + notebook);
}
}
}
@ -60,41 +57,33 @@ export class NewScreen extends Component {
onClickCreate() {
const { props, state } = this;
let bookId = stringToSymbol(state.idName);
let groupInfo = (state.invites.groups.length > 0)
? {
"group-path": state.invites.groups[0],
"invitees": [],
"use-preexisting": true,
"make-managed": false,
}
: {
// TODO remove /~ and set make-managed on toggle
"group-path": `/~/publish/~${window.ship}/${bookId}`,
"invitees": state.invites.ships,
"use-preexisting": false,
"make-managed": false,
};
this.setState({idName: "", description: ""});
let action = {
"new-book": {
book: bookId,
title: state.idName,
about: state.description,
coms: true,
group: groupInfo
}
}
// if (state.invites.groups.length > 0) {
// props.api.action("publish", "publish-action", {
// "new-book": {
// book: stringToSymbol(state.idName),
// title: state.idName,
// about: state.description,
// coms: true,
// group: {
// old: {
// writers: state.invites.groups[0],
// subscribers: state.invites.groups[0]
// }
// }
// }
// })
// } else {
// props.api.action("publish", "publish-action", {
// "new-book": {
// book: stringToSymbol(state.idName),
// title: state.idName,
// about: state.description,
// coms: true,
// group: {
// new: {
// writers: [window.ship],
// subscribers: state.invites.ships,
// sec: "journal"
// }
// }
// }
// })
// }
props.api.action("publish", "publish-action", action);
}
render() {
@ -199,4 +188,4 @@ export class NewScreen extends Component {
}
}
export default NewScreen;
export default NewScreen;

6
pkg/interface/publish/src/js/components/root.js
View File

@ -54,8 +54,10 @@ export class Root extends Component {
sidebarShown={true}
notebooks={state.notebooks}>
<NewScreen
groups={state.groups}
api={api}
notebooks={state.notebooks}
groups={state.groups}
api={api}
{...props}
/>
</Skeleton>
)

58
pkg/interface/publish/src/js/reducers/invite.js Normal file
View File

@ -0,0 +1,58 @@
import _ from 'lodash';
export class InviteReducer {
reduce(json, state) {
let initial = _.get(json, 'invite-initial', false);
if (initial) {
this.initial(initial, state);
}
let update = _.get(json, 'invite-update', false);
if (update) {
this.create(update, state);
this.delete(update, state);
this.invite(update, state);
this.accepted(update, state);
this.decline(update, state);
}
}
initial(json, state) {
state.invites = json;;
}
create(json, state) {
let data = _.get(json, 'create', false);
if (data) {
state.invites[data.path] = {};
}
}
delete(json, state) {
let data = _.get(json, 'delete', false);
if (data) {
delete state.invites[data.path];
}
}
invite(json, state) {
let data = _.get(json, 'invite', false);
if (data) {
state.invites[data.path][data.uid] = data.invite;
}
}
accepted(json, state) {
let data = _.get(json, 'accepted', false);
if (data) {
delete state.invites[data.path][data.uid];
}
}
decline(json, state) {
let data = _.get(json, 'decline', false);
if (data) {
delete state.invites[data.path][data.uid];
}
}
}

2
pkg/interface/publish/src/js/reducers/primary.js
View File

@ -292,4 +292,4 @@ export class PrimaryReducer {
data["edit-field"][edit[0]];
}
}
}
}

8
pkg/interface/publish/src/js/store.js
View File

@ -1,7 +1,8 @@
import { InitialReducer } from '/reducers/initial';
import { PrimaryReducer } from '/reducers/primary';
import { ResponseReducer } from '/reducers/response';
import { GroupReducer } from '/reducers/group';
import { GroupReducer } from '/reducers/group';
import { InviteReducer } from '/reducers/invite';
class Store {
constructor() {
@ -18,7 +19,8 @@ class Store {
this.initialReducer = new InitialReducer();
this.primaryReducer = new PrimaryReducer();
this.responseReducer = new ResponseReducer();
this.groupReducer = new GroupReducer();
this.groupReducer = new GroupReducer();
this.inviteReducer = new InviteReducer();
this.setState = () => {};
this.initialReducer.reduce(window.injectedState, this.state);
@ -29,12 +31,12 @@ class Store {
}
handleEvent(evt) {
console.log(evt);
if (evt.from && evt.from.path === '/all') {
this.groupReducer.reduce(evt.data, this.state);
}
else if (evt.from && evt.from.path === '/primary'){
this.primaryReducer.reduce(evt.data, this.state);
this.inviteReducer.reduce(evt.data, this.state);
} else if (evt.type) {
this.responseReducer.reduce(evt, this.state);
}

3
pkg/interface/publish/src/js/subscription.js
View File

@ -21,6 +21,9 @@ export class Subscription {
api.bind('/primary', 'PUT', api.authTokens.ship, 'contact-view',
this.handleEvent.bind(this),
this.handleError.bind(this));
api.bind('/primary', 'PUT', api.authTokens.ship, 'invite-view',
this.handleEvent.bind(this),
this.handleError.bind(this));
}
handleEvent(diff) {