First version of CRM functionality by johanlundberg · Pull Request #2 · NORDUnet/ni

johanlundberg · 2019-07-29T15:12:58Z

Depends on NORDUnet/python-norduniclient#18

mkrogh · 2019-09-04T08:48:25Z

src/niweb/apps/noclook/management/commands/csvimport.py

@@ -0,0 +1,342 @@
+# -*- coding: utf-8 -*-


Not really sure if doing a manage command for this is the right thing... but not really sure if it is a bad way to go about it.

Normally I would have put it in a script in src/scripts.

I have to say I think it worked fine. I would also have done it in a script.

mkrogh

Still need to boot it up locally to see the changes.

mkrogh · 2019-09-04T09:05:48Z

src/niweb/apps/noclook/helpers.py

+    return relationship, created
+
+
+def set_of_member(user, node, contact_id):


This method name is super confusing, and not a helper, it seem like it the name set_member_of_contract would be more fitting.

Same goes for the set_member_of above, it adds a node to a group.

mkrogh · 2019-09-04T09:21:36Z

src/niweb/apps/noclook/migrations/0007_auto_20190410_1341.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-


A bit unsure about this migration.

I guess it adds the Relation dropdown.

But what about the other migrations? just updated help text or?

mkrogh · 2019-09-04T09:29:05Z

src/niweb/apps/noclook/migrations/0010_merge_20190903_1136.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-


Migrations in general seems a bit messy (lots of empty merge migrations, and one big squash). Guess I should just ignore them.

The migrations scare me too but I guess we should trust that Django has it figured out?

mkrogh · 2019-09-04T09:32:59Z

src/niweb/apps/noclook/models.py

+    'it_technical_contact': { 'name': 'NOC Technical', 'description': '' },
+    'it_security_contact': { 'name': 'NOC Security', 'description': '' },
+    'it_manager_contact': { 'name': 'NOC Manager', 'description': '' },
+    DEFAULT_ROLE_KEY: { 'name': nc.models.RoleRelationship.DEFAULT_ROLE_NAME, 'description': '' },


This seems a bit nasty, using the name from the nordunetclient lib, while using the DEFAULT_ROLE_KEY.

mkrogh · 2019-09-04T09:36:32Z

src/niweb/apps/noclook/templates/noclook/create/create_contact.html

@@ -0,0 +1,47 @@
+{% extends "base.html" %}


I would really have preferred if the forms were done using the crispy_fields instead to give inline errors.

I agree but I didn't catch it as I forgot about crispy_fields.

mkrogh · 2019-09-04T10:46:42Z

src/niweb/apps/noclook/views/detail.py

+    return render(request, 'noclook/detail/group_detail.html',
+                  {'node_handle': nh, 'node': node, 'location_path': location_path})
+
+def _contact_with_role_table(con, org=None):


Nicely spotted that there was something for tables 👍

mkrogh · 2019-09-04T11:03:59Z

src/niweb/apps/scan/migrations/0003_auto_20190410_1341.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-


Also quite unsure about this migration?

src/niweb/niweb/settings/common.py

src/niweb/niweb/settings/dev.py

mkrogh · 2019-09-04T11:08:51Z

src/niweb/niweb/templates/base.html

-                        <li class="nav-header"><i class="icon-map-marker"></i> Maps</li>
-                        <li><a href="/gmaps/sites/">Site map</a></li>
-                        <li><a href="/gmaps/optical-nodes/">Optical node map</a></li>
+                        {% ifequal menu_mode 'ni' %}


Hmm what does menu_mode 'ni' really mean?

This just hides the NI specific menu items when in "sri"-mode. menu_mode ni is the default in global preferences.

mkrogh · 2019-09-04T13:03:15Z

src/niweb/apps/noclook/views/create.py

+global_preferences = global_preferences_registry.manager()
+menu_mode = global_preferences['general__menu_mode']
+
+if menu_mode == 'ni':


Are all these changes meant to be in a separate parallel sri instance?
If that is the case then I think it should perhaps have been a separate app instead of being baked into noclook...

The goal is to keep both NI data and SRI data in the same backend. So this is a first step.
That said, we can wait with this PR until we have the new frontend and graphql api done. Then these special cases can be removed.

Candidate

Removed management command

CORS whitelist is defined in the SRI_FRONTEND_URL envvar

Corrections on how CORS policy should be run in the different envs

If the user profile doesn't exists, create it

Change not logged exception when the user doesn't have rigths over nodes

Bugfix: relationship_parent_of field was not using relay id for update

Enabled validators and fixed test

Fix: An empty connection is returned if the user doesn't have rights

Fix:The GroupContextAuthzAction objs are created regardless of the users

Bugfix and config change: Session expires at browser close

johanlundberg · 2020-03-31T10:54:14Z

There was a mix up of branches and merge_upstream was reused for merging upstream to SUNET/ni.
I will close this PR until we can make a nicer one.

mkrogh · 2020-03-31T10:55:22Z

Hehe no problem, it happens.

mkrogh reviewed Sep 4, 2019

View reviewed changes

PaKZer0 and others added 27 commits October 31, 2019 09:19

Validators test fixed

ef56fc0

Merge pull request #36 from SUNET/candidate

9f9f71e

Candidate

Added queries for role models and groups

c01bfae

Added queries to tests

1a49de2

Added test with the parent_id call

b8ad5cf

Added manual create/update class to the mutation factory

11483d9

Change of the var name

e440eb9

The stacked filters are mixed with an AND instead an OR

4bd0e81

Added query parenthesis

c054965

Added fix util to rename existent organization property

62985de

Small fix on move property function

d057e0b

Added validation on organization_id

73f44b5

Added edit check

8c768b8

Changes in order to allow subentity string filtering

88bccb1

Check condition, so it doesn't try to filter a non string value

efb494a

Ignore non string query functions if the subentity value is not a string

47c8491

Fixed multiple subentity query

9d62e32

Added boolean fields to filter

eab98f3

The affiliation fields are now set to false through a migration

f0d68c6

Add counter query and change contact_type from string to choice

a158b21

Add choicescalar to filtrable attributes

6b6ffea

Added organization_number field

87ca291

Added organization_number

ec8385d

Improved validation

fa78d2e

Add check existent organization_id to a graphql query

c1a8902

Merge branch 'multiple-org' into candidate

e3dcc33

Merge branch 'and-filter' into candidate

71357c4

PaKZer0 and others added 26 commits March 18, 2020 14:38

Merge pull request #48 from SUNET/remove-cmd

a315915

Removed management command

CORS whitelist is defined in the SRI_FRONTEND_URL envvar

f8004ff

Merge pull request #49 from SUNET/cors-improv

c2e59a7

CORS whitelist is defined in the SRI_FRONTEND_URL envvar

Added fallback to clean rogue nodetype.

8d29247

Corrections on how CORS policy should be run in the different envs

c7f6303

Merge pull request #50 from SUNET/cors-fix

4fb1d0b

Corrections on how CORS policy should be run in the different envs

If the user profile doesn't exists, create it

b83490c

Merge pull request #51 from SUNET/userprofile-fix

f8fd7a7

If the user profile doesn't exists, create it

Change not logged exception when the user doesn't have rigths over nodes

5dd939a

Merge pull request #52 from SUNET/empty-lists

8ba4770

Change not logged exception when the user doesn't have rigths over nodes

Bugfix: relationship_parent_of field was not using relay id for update

8ecfd6d

Merge pull request #53 from SUNET/org-parentid

249088f

Bugfix: relationship_parent_of field was not using relay id for update

Enabled validators and fixed test

d917b9f

Merge pull request #54 from SUNET/validation-fix

f539aa3

Enabled validators and fixed test

Fix: An empty connection is returned if the user doesn't have rights

8c73669

Merge pull request #55 from SUNET/null-connection-fix

60be876

Fix: An empty connection is returned if the user doesn't have rights

Fix:The GroupContextAuthzAction objs are created regardless of the users

bb30c5d

Merge pull request #56 from SUNET/groupaacontext-fix

bc74843

Fix:The GroupContextAuthzAction objs are created regardless of the users

Merge branch 'master' into merge_upstream

7bab73c

Merge br 'master' of https://github.com/NORDUnet/ni into merge_upstream

5954481

Add migration left out by merge

f4ab6b1

Bugfix and config change: Session expires at browser close

37298b7

Merge pull request #57 from SUNET/cookie-expire

3ac3eb3

Bugfix and config change: Session expires at browser close

Merge branch 'master' into merge_upstream

6d63dd7

Merge migration

fc4a3d9

Fix on userprofile_link tag

bba7fb4

johanlundberg closed this Mar 31, 2020

johanlundberg deleted the merge_upstream branch March 31, 2020 11:21

		return relationship, created


		def set_of_member(user, node, contact_id):

Conversation

johanlundberg commented Jul 29, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mkrogh left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

johanlundberg commented Mar 31, 2020

Uh oh!

mkrogh commented Mar 31, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants