feat: improve page linkage between role/user/person

- show Users grid when viewing a Role
- add hyperlinks between things

tests/forms/test_base.py

@@ -10,6 +10,7 @@ from pyramid import testing
 from wuttjamaican.conf import WuttaConfig
 from wuttaweb.forms import base, widgets
 from wuttaweb import helpers
+from wuttaweb.grids import Grid
 
 
 class TestForm(TestCase):
@@ -405,6 +406,29 @@ class TestForm(TestCase):
         self.assertIn('<script type="text/x-template" id="wutta-form-template">', html)
         self.assertNotIn('@submit', html)
 
+    def test_add_grid_vue_data(self):
+        form = self.make_form()
+
+        # grid must have key
+        grid = Grid(self.request)
+        self.assertRaises(ValueError, form.add_grid_vue_data, grid)
+
+        # otherwise it works
+        grid = Grid(self.request, key='foo')
+        self.assertEqual(len(form.grid_vue_data), 0)
+        form.add_grid_vue_data(grid)
+        self.assertEqual(len(form.grid_vue_data), 1)
+        self.assertIn('foo', form.grid_vue_data)
+        self.assertEqual(form.grid_vue_data['foo'], [])
+
+        # calling again with same key will replace data
+        records = [{'foo': 1}, {'foo': 2}]
+        grid = Grid(self.request, key='foo', columns=['foo'], data=records)
+        form.add_grid_vue_data(grid)
+        self.assertEqual(len(form.grid_vue_data), 1)
+        self.assertIn('foo', form.grid_vue_data)
+        self.assertEqual(form.grid_vue_data['foo'], records)
+
     def test_render_vue_finalize(self):
         form = self.make_form()
         html = form.render_vue_finalize()

tests/forms/test_schema.py

@@ -9,6 +9,7 @@ from sqlalchemy import orm
 
 from wuttjamaican.conf import WuttaConfig
 from wuttaweb.forms import schema as mod
+from wuttaweb.forms import widgets
 from tests.util import DataTestCase
 
 
@@ -200,6 +201,19 @@ class TestPersonRef(DataTestCase):
         self.assertIsNot(sorted_query, query)
 
 
+class TestUserRefs(DataTestCase):
+
+    def setUp(self):
+        self.setup_db()
+        self.request = testing.DummyRequest(wutta_config=self.config)
+
+    def test_widget_maker(self):
+        model = self.app.model
+        typ = mod.UserRefs(self.request, session=self.session)
+        widget = typ.widget_maker()
+        self.assertIsInstance(widget, widgets.UserRefsWidget)
+
+
 class TestRoleRefs(DataTestCase):
 
     def setUp(self):

tests/forms/test_widgets.py

@@ -1,11 +1,13 @@
 # -*- coding: utf-8; -*-
 
+from unittest.mock import patch
+
 import colander
 import deform
 from pyramid import testing
 
 from wuttaweb.forms import widgets as mod
-from wuttaweb.forms.schema import PersonRef, RoleRefs, Permissions
+from wuttaweb.forms.schema import PersonRef, RoleRefs, UserRefs, Permissions
 from tests.util import WebTestCase
 
 
@@ -36,7 +38,18 @@ class TestObjectRefWidget(WebTestCase):
         widget = mod.ObjectRefWidget(self.request)
         field = self.make_field(node)
         html = widget.serialize(field, person.uuid, readonly=True)
-        self.assertEqual(html.strip(), '<span>Betty Boop</span>')
+        self.assertIn('Betty Boop', html)
+        self.assertNotIn('<a', html)
+
+        # with hyperlink
+        node = colander.SchemaNode(PersonRef(self.request, session=self.session))
+        node.model_instance = person
+        widget = mod.ObjectRefWidget(self.request, url=lambda p: '/foo')
+        field = self.make_field(node)
+        html = widget.serialize(field, person.uuid, readonly=True)
+        self.assertIn('Betty Boop', html)
+        self.assertIn('<a', html)
+        self.assertIn('href="/foo"', html)
 
 
 class TestRoleRefsWidget(WebTestCase):
@@ -48,6 +61,7 @@ class TestRoleRefsWidget(WebTestCase):
         return deform.Field(node, **kwargs)
 
     def test_serialize(self):
+        self.pyramid_config.add_route('roles.view', '/roles/{uuid}')
         model = self.app.model
         auth = self.app.get_auth_handler()
         admin = auth.get_role_administrator(self.session)
@@ -77,6 +91,49 @@ class TestRoleRefsWidget(WebTestCase):
         self.assertIn(blokes.uuid, html)
 
 
+class TestUserRefsWidget(WebTestCase):
+
+    def make_field(self, node, **kwargs):
+        # TODO: not sure why default renderer is in use even though
+        # pyramid_deform was included in setup?  but this works..
+        kwargs.setdefault('renderer', deform.Form.default_renderer)
+        return deform.Field(node, **kwargs)
+
+    def test_serialize(self):
+        model = self.app.model
+
+        # nb. we let the field construct the widget via our type
+        node = colander.SchemaNode(UserRefs(self.request, session=self.session))
+        field = self.make_field(node)
+        widget = field.widget
+
+        # readonly is required
+        self.assertRaises(NotImplementedError, widget.serialize, field, set())
+        self.assertRaises(NotImplementedError, widget.serialize, field, set(), readonly=False)
+
+        # empty
+        html = widget.serialize(field, set(), readonly=True)
+        self.assertIn('<b-table ', html)
+
+        # with data, no actions
+        user = model.User(username='barney')
+        self.session.add(user)
+        self.session.commit()
+        html = widget.serialize(field, {user.uuid}, readonly=True)
+        self.assertIn('<b-table ', html)
+        self.assertNotIn('Actions', html)
+        self.assertNotIn('View', html)
+        self.assertNotIn('Edit', html)
+
+        # with view/edit actions
+        with patch.object(self.request, 'is_root', new=True):
+            html = widget.serialize(field, {user.uuid}, readonly=True)
+        self.assertIn('<b-table ', html)
+        self.assertIn('Actions', html)
+        self.assertIn('View', html)
+        self.assertIn('Edit', html)
+
+
 class TestPermissionsWidget(WebTestCase):
 
     def make_field(self, node, **kwargs):

tests/grids/test_base.py

@@ -10,7 +10,8 @@ from pyramid import testing
 
 from wuttjamaican.conf import WuttaConfig
 from wuttaweb.grids import base as mod
-from wuttaweb.forms import FieldList
+from wuttaweb.util import FieldList
+from wuttaweb.forms import Form
 from tests.util import WebTestCase
 
 
@@ -186,6 +187,14 @@ class TestGrid(WebTestCase):
         self.assertFalse(grid.is_linked('foo'))
         self.assertTrue(grid.is_linked('bar'))
 
+    def test_add_action(self):
+        grid = self.make_grid()
+        self.assertEqual(len(grid.actions), 0)
+
+        grid.add_action('view')
+        self.assertEqual(len(grid.actions), 1)
+        self.assertIsInstance(grid.actions[0], mod.GridAction)
+
     def test_get_pagesize_options(self):
         grid = self.make_grid()
 
@@ -855,6 +864,25 @@ class TestGrid(WebTestCase):
         html = grid.render_vue_template()
         self.assertIn('<script type="text/x-template" id="wutta-grid-template">', html)
 
+    def test_render_table_element(self):
+        self.pyramid_config.include('pyramid_mako')
+        self.pyramid_config.add_subscriber('wuttaweb.subscribers.before_render',
+                                           'pyramid.events.BeforeRender')
+
+        grid = self.make_grid(key='foobar', columns=['foo', 'bar'])
+
+        # form not required
+        html = grid.render_table_element()
+        self.assertNotIn('<script ', html)
+        self.assertIn('<b-table ', html)
+
+        # form will register grid data
+        form = Form(self.request)
+        self.assertEqual(len(form.grid_vue_data), 0)
+        html = grid.render_table_element(form)
+        self.assertEqual(len(form.grid_vue_data), 1)
+        self.assertIn('foobar', form.grid_vue_data)
+
     def test_render_vue_finalize(self):
         grid = self.make_grid()
         html = grid.render_vue_finalize()

tests/views/test_people.py

@@ -35,11 +35,26 @@ class TestPersonView(WebTestCase):
         model = self.app.model
         view = self.make_view()
         form = view.make_form(model_class=model.Person)
-        form.set_fields(form.get_model_fields())
-        self.assertEqual(form.required_fields, {})
-        view.configure_form(form)
-        self.assertTrue(form.required_fields)
-        self.assertFalse(form.required_fields['middle_name'])
+
+        # required fields
+        with patch.object(view, 'creating', new=True):
+            form.set_fields(form.get_model_fields())
+            self.assertEqual(form.required_fields, {})
+            view.configure_form(form)
+            self.assertTrue(form.required_fields)
+            self.assertFalse(form.required_fields['middle_name'])
+
+        person = model.Person(full_name="Barney Rubble")
+        user = model.User(username='barney', person=person)
+        self.session.add(user)
+        self.session.commit()
+
+        # users field
+        with patch.object(view, 'viewing', new=True):
+            form = view.make_form(model_instance=person)
+            self.assertEqual(form.defaults, {})
+            view.configure_form(form)
+            self.assertIn('_users', form.defaults)
 
     def test_autocomplete_query(self):
         model = self.app.model