Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Server Based Colonies #1932

Merged
merged 28 commits into from
Dec 11, 2019
Merged

Conversation

rdig
Copy link
Member

@rdig rdig commented Nov 26, 2019

Description

This PR aims at adding, at least in the initial stages, the queries, mutations and types for the Apollo GraphQL server to be able to store Colony related data.

Alongside that, this branch will also touch Components, Actions, Action Creators and Saga, in order to make user of the above GraphQL data.

Rebased on feature/graphql-generation

@rdig rdig self-assigned this Nov 26, 2019
@chmanie chmanie force-pushed the feature/server-auth branch from f223780 to 97fc72b Compare November 27, 2019 21:52
@rdig rdig force-pushed the feature/server-based-colonies branch 2 times, most recently from 5cb575b to 5dcce30 Compare November 29, 2019 12:42
@rdig rdig force-pushed the feature/server-based-colonies branch from 5dcce30 to f9a35e9 Compare December 5, 2019 16:20
@rdig rdig requested a review from chmanie December 5, 2019 16:21
@rdig rdig marked this pull request as ready for review December 5, 2019 16:21
@rdig rdig changed the base branch from feature/server-auth to feature/graphql-generation December 9, 2019 10:52
@rdig rdig force-pushed the feature/server-based-colonies branch from f9a35e9 to 5fec089 Compare December 9, 2019 12:02
@rdig rdig mentioned this pull request Dec 9, 2019
Copy link
Member

@chmanie chmanie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, this seems mostly fine, just some tweaks and adjustments to data fetching mostly!

@chmanie chmanie changed the title Sever Based Colonies Server Based Colonies Dec 9, 2019
@JoinColony JoinColony deleted a comment from todo bot Dec 10, 2019
@JoinColony JoinColony deleted a comment from todo bot Dec 11, 2019
@JoinColony JoinColony deleted a comment from todo bot Dec 11, 2019
@JoinColony JoinColony deleted a comment from todo bot Dec 11, 2019
@JoinColony JoinColony deleted a comment from todo bot Dec 11, 2019
@JoinColony JoinColony deleted a comment from todo bot Dec 11, 2019
@JoinColony JoinColony deleted a comment from todo bot Dec 11, 2019
@JoinColony JoinColony deleted a comment from todo bot Dec 11, 2019
@JoinColony JoinColony deleted a comment from todo bot Dec 11, 2019
@JoinColony JoinColony deleted a comment from todo bot Dec 11, 2019
@JoinColony JoinColony deleted a comment from todo bot Dec 11, 2019
@rdig
Copy link
Member Author

rdig commented Dec 11, 2019

@chmanie

  • Reverted the COLONY_AVATAR_UPLOAD_SUCCESS and COLONY_AVATAR_UPLOAD_ERROR actions logic
  • Fixed the editColonyProfile mutation so that it's returning the whole colony profile props

This is ready to merge when you want to

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*
* import {
* canArchitect,
* hasRoot
* } from '../../../users/checks';


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*/
const canArchitect = () => true;
const hasRoot = () => true;
const navigationItems = (


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*/
// isFetching: isFetchingRoles
} = useDataFetcher(domainsAndRolesFetcher, [colonyAddress], [colonyAddress]);
const { data: colonyRecoveryRoles = [] } = useDataFetcher(


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*/
// !domains ||
// isFetchingRoles ||
) {
return <LoadingTemplate loadingText={MSG.loadingText} />;


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*/
// const { data: domains, isFetching: isFetchingDomains } = useDataFetcher(
// domainsAndRolesFetcher,
// [colonyAddress],
// [colonyAddress],


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*/
// const currentDomainUserRoles = useTransformer(getUserRoles, [
// domains,
// filteredDomainId || ROOT_DOMAIN,
// walletAddress,


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*
* !domains ||
* isFetchingDomains ||
*/
/*


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add nativeTokenRef

* @TODO Re-add nativeTokenRef
* Right now it gets hung up since the colony's data is no longer making it's way
* into the redux state
*
*!nativeTokenRef ||
*/


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*
* const canCreateTask = canAdminister(currentDomainUserRoles);
*/
const canCreateTask = true;
const isInRecoveryMode = isInRecoveryModeCheck(data.colony);


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*
* canAdminister={!isInRecoveryMode && canAdminister(rootUserRoles)}
*/
canAdminister
/*


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*
* domains={domains}
*/
filteredDomainId={filteredDomainId}
setFilteredDomainId={setFilteredDomainId}


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*/}
{/* <div className={styles.breadCrumbContainer}>
{domains && crumbs && <BreadCrumb elements={crumbs} />}
</div> */}
<Tabs>


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

@todo
Copy link

todo bot commented Dec 11, 2019

Re-add domains once they're available from mongo

* @TODO Re-add domains once they're available from mongo
*
* showQrCode={hasRoot(rootUserRoles)}
*/
/>
</TabPanel>


This comment was generated by todo based on a TODO comment in bdcf9b6 in #1932. cc @JoinColony.

Copy link
Member

@chmanie chmanie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes! Approved!

@rdig rdig merged commit 77a9de6 into feature/graphql-generation Dec 11, 2019
@rdig rdig deleted the feature/server-based-colonies branch December 11, 2019 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants