[#433] connects nation community (connects #433) #440

Rupesh87 · 2018-02-26T11:10:31Z

No description provided.

paulbert · 2018-02-27T02:31:43Z

src/app/home/home.component.html

@@ -29,10 +29,10 @@
 <p class="menu-item-text" *ngIf="notification.doc.status==='unread' && notification.doc.link ===''">
 {{notification.doc.message}} {{notification.doc.time | date: 'MMM d, yyyy'}}
 </p>
- <p *ngIf="notification.status!=='unread' && notification.doc.link">


These changes from the Duplicate notification commit should be removed as they are for a different PR. Please make sure to begin branches from the master branch.

Rupesh87 · 2018-03-07T11:11:53Z

@paulbert @dogi when connecting between nation and community we use the same data in configurations and communityregistrationrequests databases. Do we want to replicate data in between or make them different entities with different ID?

paulbert · 2018-03-09T20:28:37Z

@Rupesh87 I think different entities. That way we avoid conflicts if the uuid assigned locally to the configuration is the same as one that already exists on the nation in communityregistrationrequests. An unlikely scenario, but it's easy for us to avoid.

Also, please make sure to fix linting errors before pushing:

paulbert · 2018-03-09T20:59:54Z

src/app/community/community.component.ts

+ community.registrationRequest = 'accepted';
+ this.couchService.get('_users/_all_docs?include_docs=true')
+ .subscribe((data) => {
+ data.rows.map(data => {


This block includes 4 levels of nested CouchDB requests/subscribes, 3 of which are nested in a map.

Please do not loop over even 1 couch request. Use _bulk_docs instead.

Do not nest subscribes. Create different functions and/or use the switchMap rxjs operator to clean this up.

empeje · 2018-03-16T17:54:27Z

Please add karma test if possible
hints:

paulbert · 2018-03-16T20:46:23Z

src/app/shared/couchdb.service.ts

@@ -14,8 +14,8 @@ export class CouchService {
 return Object.assign({}, this.defaultOpts, opts) || this.defaultOpts;
 }

- private couchDBReq(type: string, db: string, opts: any, data?: any) {
- const url = this.baseUrl + db;
+ private couchDBReq(type: string, db: string, opts: any, data?: any, parentLink?: any) {


We should include parentLink in the opts variable and adjust the rest of the code to match. I'd rather we have one optional parameter for the methods available on the CouchService.

@paulbert httpRequest is using opts so we used another optional (parentLink). If we are going to include parentLink inside opts then we have to remove parentLink while requesting. so which approach we should follow???

paulbert · 2018-03-16T20:47:25Z

src/app/configuration/configuration.component.ts

+ 'password': this.loginForm.value.password,
+ roles: [],
+ 'type': 'user',
+ 'isUserAdmin': true,


isUserAdmin should only be set on the local user, not the parent user

paulbert · 2018-03-16T20:48:11Z

src/app/configuration/configuration.component.ts

+ this.couchService.post('communityregistrationrequests', configuration, {}, configuration.parent_domain)
+ ]).debug('Sending request to parent planet').subscribe((data) => {
+ userDetail['request_id'] = data[3].id;
+ this.couchService.put('/_users/org.couchdb.user:' + this.loginForm.value.username,


Please use switchMap rather than nesting observables.

paulbert · 2018-03-23T18:49:53Z

A few things noted today:

User needs to be logged out of both child and parent when logout clicked.
User needs to renew session with parent. Otherwise viewing parent resources will not work after session resets (10 minutes).
We should handle the situation when the parent is not accessible (someone has access to the nation because they are on the same network, but that network does not have access to the internet & center). We will also need to allow the user to log into the center when it becomes available.
Password changes need to be synced with all accounts (need to handle the above case for this as well)

I think these should be dealt with in a new issue, but if any of these can be fixed quickly feel free to add them in this PR.

paulbert · 2018-03-29T14:51:50Z

Just raising a question: do we want to add a document to login_activities of the parent (nation) in addition to the child?

We'll have to make some adjustments if so, notably the ids will not match so if we sync the two dbs we will have duplicate sessions recorded. Also we should have a field that stores the nation/community name in the session so we know what the user logged into.

Rupesh87 · 2018-03-30T06:07:14Z

Yes, we think we need to maintain login activities in parent environment as well. But it is not necessary to do that. So, what’s your plan? Should we remove the login activities to the parent planet ?

paulbert

This was poorly merged with the changes to the master. The service should not be reliant on the route, and services should not directly affect a template.

Rupesh87 added the WIP label Feb 26, 2018

Rupesh87 self-assigned this Feb 26, 2018

Rupesh87 requested review from lmmrssa, nirojdyola, paulbert, dogi, razu9861, MacNew and BasnetSamriddhi February 26, 2018 11:10

Rupesh87 added the in progress label Feb 26, 2018

paulbert reviewed Feb 27, 2018

View reviewed changes

paulbert reviewed Mar 9, 2018

View reviewed changes

Rupesh87 removed the WIP label Mar 15, 2018

paulbert reviewed Mar 16, 2018

View reviewed changes

Rupesh87 added 12 commits March 27, 2018 11:18

[#433] Add user to nation

1d2418d

[#433] Created user on nation/center

163463c

[#433] Approve feature added

2a426ab

[#433] Removed console log

d158abe

[#433] Added filter in nation component

488935c

[#433] Remove unwanted code

6dedf5d

[#433] Removed extra line

944e8aa

Update manager-dashboard.component.ts

b72fc81

[#433] Meetup fetch from parent domain

d63e249

[#433] Filter section

984537a

[#433] Travis fix

9e39de3

[#433] Removed mock data

a8e80b2

[#433] Logged out of both child and parent

7780c87

Rupesh87 and others added 8 commits April 3, 2018 11:40

Merge branch 'master' into 433-connects-nation-community

01176d5

[#433] Merge conflict fix

a3a80b7

[#433] Removed maintaining login activies code

d05c89b

Fix extra spaces

fa58bb0

Remove jsonp module

114b8e9

Add comments

123af57

Refactor updateCommunity

b6f8c39

Refactor setting configuration

6974454

paulbert requested changes Apr 4, 2018

View reviewed changes

paulbert added 6 commits April 4, 2018 10:41

Revert changes: ResourcesViewComponent & ResourcesService

53ed800

Support for parent_domain

74fae94

No add rating for parent

550fd1b

Go back to parent resource list from parent resource view

d495c53

No nested observables

81245a0

Fix e2e test

fa3b24e

paulbert force-pushed the 433-connects-nation-community branch from 67083a5 to fa3b24e Compare April 4, 2018 19:24

paulbert added 7 commits April 4, 2018 16:20

Do not get configurations in testing environment

4b12d12

Fix environment imports and test ignore config

9dc2767

Fix e2e error - remove waitForAngular

0403328

Move ngOnInit CommunityComponent

b01e930

Fix configuration

7796ee7

Add comments and minor fixes

2fc65ea

Deduplicate templates

495e35f

paulbert approved these changes Apr 5, 2018

View reviewed changes

paulbert merged commit c7ebf31 into master Apr 5, 2018

paulbert removed the in progress label Apr 5, 2018

lmmrssa deleted the 433-connects-nation-community branch April 10, 2018 02:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[#433] connects nation community (connects #433) #440

[#433] connects nation community (connects #433) #440

Rupesh87 commented Feb 26, 2018

paulbert Feb 27, 2018

Rupesh87 commented Mar 7, 2018

paulbert commented Mar 9, 2018

paulbert Mar 9, 2018

empeje commented Mar 16, 2018

paulbert Mar 16, 2018

Rupesh87 Mar 19, 2018

paulbert Mar 16, 2018

paulbert Mar 16, 2018

paulbert commented Mar 23, 2018 •

edited

Loading

paulbert commented Mar 29, 2018

Rupesh87 commented Mar 30, 2018

paulbert left a comment

[#433] connects nation community (connects #433) #440

[#433] connects nation community (connects #433) #440

Conversation

Rupesh87 commented Feb 26, 2018

paulbert Feb 27, 2018

Choose a reason for hiding this comment

Rupesh87 commented Mar 7, 2018

paulbert commented Mar 9, 2018

paulbert Mar 9, 2018

Choose a reason for hiding this comment

empeje commented Mar 16, 2018

paulbert Mar 16, 2018

Choose a reason for hiding this comment

Rupesh87 Mar 19, 2018

Choose a reason for hiding this comment

paulbert Mar 16, 2018

Choose a reason for hiding this comment

paulbert Mar 16, 2018

Choose a reason for hiding this comment

paulbert commented Mar 23, 2018 • edited Loading

paulbert commented Mar 29, 2018

Rupesh87 commented Mar 30, 2018

paulbert left a comment

Choose a reason for hiding this comment

paulbert commented Mar 23, 2018 •

edited

Loading