WuttaWeb 0.20.4__tar.gz → 0.20.6__tar.gz

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/CHANGELOG.md

@@ -5,6 +5,28 @@ All notable changes to wuttaweb will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## v0.20.6 (2025-01-26)
+
+### Fix
+
+- add `setup_enhance_admin_user()` method for initial setup
+- add `render_percent()` method for Grid
+- allow override for Admin menu title
+- add `index_title_controls()` def block for base template
+- add `make_users_grid()` method for RoleView
+- fallback to empty string for uvicorn `root_path`
+- add `root_path` config setting for running webapp via uvicorn
+
+## v0.20.5 (2025-01-23)
+
+### Fix
+
+- improve styling for grid tools section
+- add basic checkbox support for grids
+- add WuttaRequestMixin for ThisPage component
+- avoid literal `None` when rendering form field value
+- let header title be even wider
+
 ## v0.20.4 (2025-01-15)
 
 ### Fix

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: WuttaWeb
-Version: 0.20.4
+Version: 0.20.6
 Summary: Web App for Wutta Framework
 Project-URL: Homepage, https://wuttaproject.org/
 Project-URL: Repository, https://forgejo.wuttaproject.org/wutta/wuttaweb
@@ -39,7 +39,7 @@ Requires-Dist: pyramid-tm
 Requires-Dist: pyramid>=2
 Requires-Dist: waitress
 Requires-Dist: webhelpers2
-Requires-Dist: wuttjamaican[db]>=0.20.1
+Requires-Dist: wuttjamaican[db]>=0.20.2
 Requires-Dist: zope-sqlalchemy>=1.5
 Provides-Extra: continuum
 Requires-Dist: wutta-continuum; extra == 'continuum'

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "WuttaWeb"
-version = "0.20.4"
+version = "0.20.6"
 description = "Web App for Wutta Framework"
 readme = "README.md"
 authors = [{name = "Lance Edgar", email = "lance@wuttaproject.org"}]
@@ -44,7 +44,7 @@ dependencies = [
         "pyramid_tm",
         "waitress",
         "WebHelpers2",
-        "WuttJamaican[db]>=0.20.1",
+        "WuttJamaican[db]>=0.20.2",
         "zope.sqlalchemy>=1.5",
 ]
 

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/src/wuttaweb/cli/webapp.py

@@ -74,6 +74,7 @@ def webapp(
             'reload_dirs': config.get_list(f'{config.appname}.web.app.reload_dirs'),
             'factory': config.get_bool(f'{config.appname}.web.app.factory', default=False),
             'interface': config.get(f'{config.appname}.web.app.interface', default='auto'),
+            'root_path': config.get(f'{config.appname}.web.app.root_path', default=''),
         }
 
         # also must inject our config files to env, since there is no

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/src/wuttaweb/forms/base.py

@@ -1033,12 +1033,13 @@ class Form:
             # render static text if field not in deform/schema
             # TODO: need to abstract this somehow
             if self.model_instance:
-                html = str(self.model_instance[fieldname])
+                value = self.model_instance[fieldname]
+                html = str(value) if value is not None else ''
             else:
                 html = ''
 
         # mark all that as safe
-        html = HTML.literal(html)
+        html = HTML.literal(html or ' ')
 
         # render field label
         label = self.get_label(fieldname)

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/src/wuttaweb/grids/base.py

@@ -118,6 +118,11 @@ class Grid:
        See also :meth:`set_renderer()` and
        :meth:`set_default_renderers()`.
 
+    .. attribute:: checkable
+
+       Boolean indicating whether the grid should expose per-row
+       checkboxes.
+
     .. attribute:: row_class
 
        This represents the CSS ``class`` attribute for a row within
@@ -362,6 +367,7 @@ class Grid:
             data=None,
             labels={},
             renderers={},
+            checkable=False,
             row_class=None,
             actions=[],
             linked_columns=[],
@@ -388,6 +394,7 @@ class Grid:
         self.key = key
         self.data = data
         self.labels = labels or {}
+        self.checkable = checkable
         self.row_class = row_class
         self.actions = actions or []
         self.linked_columns = linked_columns or []
@@ -605,6 +612,7 @@ class Grid:
         * ``'date'`` -> :meth:`render_date()`
         * ``'datetime'`` -> :meth:`render_datetime()`
         * ``'quantity'`` -> :meth:`render_quantity()`
+        * ``'percent'`` -> :meth:`render_percent()`
 
         Renderer overrides are tracked via :attr:`renderers`.
         """
@@ -615,6 +623,7 @@ class Grid:
             'date': self.render_date,
             'datetime': self.render_datetime,
             'quantity': self.render_quantity,
+            'percent': self.render_percent,
         }
 
         if renderer in builtins:
@@ -1877,6 +1886,20 @@ class Grid:
         dt = getattr(obj, key)
         return self.app.render_datetime(dt)
 
+    def render_percent(self, obj, key, value, **kwargs):
+        """
+        Column renderer for percentage values.
+
+        This calls
+        :meth:`~wuttjamaican:wuttjamaican.app.AppHandler.render_percent()`
+        for the return value.
+
+        This is not used automatically but you can use it explicitly::
+
+            grid.set_renderer('foo', 'percent')
+        """
+        return self.app.render_percent(value, **kwargs)
+
     def render_quantity(self, obj, key, value):
         """
         Column renderer for quantity values.

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/src/wuttaweb/menus.py

@@ -143,6 +143,8 @@ class MenuHandler(GenericHandler):
         which will ultimately be one element of the final list of
         dicts as described in :class:`MenuHandler`.
 
+        :param title: Override the menu title; default is "Admin".
+
         :param include_people: You can pass this flag to indicate the
            admin menu should contain an entry for the "People" view.
         """
@@ -198,7 +200,7 @@ class MenuHandler(GenericHandler):
         ])
 
         return {
-            'title': "Admin",
+            'title': kwargs.get('title', "Admin"),
             'type': 'menu',
             'items': items,
         }

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/src/wuttaweb/templates/base.mako

@@ -155,7 +155,7 @@
     }
 
     #content-title h1 {
-        max-width: 85%;
+        max-width: 95%;
         overflow: hidden;
         padding-left: 0.5rem;
         text-overflow: ellipsis;
@@ -186,6 +186,11 @@
         width: 100%;
     }
 
+    .wutta-grid-tools-wrapper {
+        display: flex;
+        gap: 0.5rem;
+    }
+
     ##############################
     ## forms
     ##############################
@@ -243,12 +248,7 @@
                     % else:
                         <h1 class="title">${index_title}</h1>
                     % endif
-                    % if master and master.creatable and not master.creating and master.has_perm('create'):
-                        <wutta-button once type="is-primary"
-                                      tag="a" href="${url(f'{route_prefix}.create')}"
-                                      icon-left="plus"
-                                      label="Create New" />
-                    % endif
+                    ${self.index_title_controls()}
                 % endif
               </div>
             </div>
@@ -344,6 +344,15 @@
       </footer>
 </%def>
 
+<%def name="index_title_controls()">
+  % if master and master.creatable and not master.creating and master.has_perm('create'):
+      <wutta-button once type="is-primary"
+                    tag="a" href="${url(f'{route_prefix}.create')}"
+                    icon-left="plus"
+                    label="Create New" />
+  % endif
+</%def>
+
 <%def name="render_vue_template_whole_page()">
   <script type="text/x-template" id="whole-page-template">
 

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/src/wuttaweb/templates/grids/vue_template.mako

@@ -116,6 +116,13 @@
                 hoverable
                 icon-pack="fas"
 
+                ## checkboxes
+                % if grid.checkable:
+                    checkable
+                    checkbox-position="right"
+                    :checked-rows.sync="checkedRows"
+                % endif
+
                 ## sorting
                 % if grid.sortable:
                     ## nb. buefy/oruga only support *one* default sorter
@@ -267,6 +274,11 @@
           shareLink: null,
       % endif
 
+      ## checkboxes
+      % if grid.checkable:
+          checkedRows: [],
+      % endif
+
       ## filtering
       % if grid.filterable:
           filters: ${json.dumps(grid.get_vue_filters())|n},

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/src/wuttaweb/templates/page.mako

@@ -26,6 +26,7 @@
 
     const ThisPage = {
         template: '#this-page-template',
+        mixins: [WuttaRequestMixin],
         props: {
             ## configureFieldsHelp: Boolean,
         },

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/src/wuttaweb/views/common.py

@@ -245,6 +245,8 @@ class CommonView(View):
                 session.add(person)
                 user.person = person
 
+            self.setup_enhance_admin_user(user)
+
             # send user to /login
             self.request.session.flash("Account created! Please login below.")
             return self.redirect(self.request.route_url('login'))
@@ -254,6 +256,17 @@ class CommonView(View):
             'form': form,
         }
 
+    def setup_enhance_admin_user(self, user):
+        """
+        Further "enhance" the initial admin user when it is first created.
+
+        This does nothing by default; subclass can override if needed.
+
+        :param user: New admin
+           :class:`~wuttjamaican:wuttjamaican.db.model.auth.User`
+           which was just created as part of initial setup.
+        """
+
     @classmethod
     def defaults(cls, config):
         cls._defaults(config)

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/src/wuttaweb/views/master.py

@@ -189,6 +189,12 @@ class MasterView(View):
 
        This is optional; see also :meth:`get_grid_columns()`.
 
+    .. attribute:: checkable
+
+       Boolean indicating whether the grid should expose per-row
+       checkboxes.  This is passed along to set
+       :attr:`~wuttaweb.grids.base.Grid.checkable` on the grid.
+
     .. method:: grid_row_class(obj, data, i)
 
        This method is *not* defined on the ``MasterView`` base class;
@@ -395,6 +401,7 @@ class MasterView(View):
     # features
     listable = True
     has_grid = True
+    checkable = False
     filterable = True
     filter_defaults = None
     sortable = True
@@ -1992,6 +1999,7 @@ class MasterView(View):
 
             kwargs['tools'] = tools
 
+        kwargs.setdefault('checkable', self.checkable)
         if hasattr(self, 'grid_row_class'):
             kwargs.setdefault('row_class', self.grid_row_class)
         kwargs.setdefault('filterable', self.filterable)

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/src/wuttaweb/views/roles.py

@@ -28,7 +28,7 @@ from wuttjamaican.db.model import Role, Permission
 from wuttaweb.views import MasterView
 from wuttaweb.db import Session
 from wuttaweb.forms import widgets
-from wuttaweb.forms.schema import UserRefs, Permissions, RoleRef
+from wuttaweb.forms.schema import Permissions, RoleRef
 
 
 class RoleView(MasterView):
@@ -123,9 +123,7 @@ class RoleView(MasterView):
         # users
         if not (self.creating or self.editing):
             f.append('users')
-            f.set_readonly('users')
-            f.set_node('users', UserRefs(self.request))
-            f.set_default('users', [u.uuid for u in role.users])
+            f.set_grid('users', self.make_users_grid(role))
 
         # permissions
         f.append('permissions')
@@ -134,6 +132,39 @@ class RoleView(MasterView):
         if not self.creating:
             f.set_default('permissions', list(role.permissions))
 
+    def make_users_grid(self, role):
+        """
+        Make and return the grid for the Users field.
+
+        This grid is shown for the Users field when viewing a Role.
+
+        :returns: Fully configured :class:`~wuttaweb.grids.base.Grid`
+           instance.
+        """
+        model = self.app.model
+        route_prefix = self.get_route_prefix()
+
+        grid = self.make_grid(key=f'{route_prefix}.view.users',
+                              model_class=model.User,
+                              data=role.users,
+                              columns=[
+                                  'username',
+                                  'person',
+                                  'active',
+                              ])
+
+        if self.request.has_perm('users.view'):
+            url = lambda user, i: self.request.route_url('users.view', uuid=user.uuid)
+            grid.add_action('view', icon='eye', url=url)
+            grid.set_link('person')
+            grid.set_link('username')
+
+        if self.request.has_perm('users.edit'):
+            url = lambda user, i: self.request.route_url('users.edit', uuid=user.uuid)
+            grid.add_action('edit', url=url)
+
+        return grid
+
     def unique_name(self, node, value):
         """ """
         model = self.app.model

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/tests/cli/test_webapp.py

@@ -88,7 +88,8 @@ app.spec = wuttaweb.app:make_wsgi_app
                                                 reload=False,
                                                 reload_dirs=None,
                                                 factory=False,
-                                                interface='auto')
+                                                interface='auto',
+                                                root_path='')
 
         # with reload
         uvicorn.run.reset_mock()
@@ -101,4 +102,5 @@ app.spec = wuttaweb.app:make_wsgi_app
                                                 reload=True,
                                                 reload_dirs=None,
                                                 factory=False,
-                                                interface='auto')
+                                                interface='auto',
+                                                root_path='')

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/tests/grids/test_base.py

@@ -1409,6 +1409,24 @@ class TestGrid(WebTestCase):
         value = decimal.Decimal('-42.42')
         self.assertEqual(grid.render_currency(obj, 'foo', value), '($42.42)')
 
+    def test_render_percent(self):
+        grid = self.make_grid(columns=['foo', 'bar'])
+        obj = MagicMock()
+
+        # null
+        self.assertEqual(grid.render_percent(obj, 'foo', None), "")
+
+        # typical
+        self.assertEqual(grid.render_percent(obj, 'foo', 12.3419), '12.34 %')
+
+        # more decimal places
+        self.assertEqual(grid.render_percent(obj, 'foo', 12.3419, decimals=3), '12.342 %')
+        self.assertEqual(grid.render_percent(obj, 'foo', 12.3419, decimals=4), '12.3419 %')
+
+        # negative
+        self.assertEqual(grid.render_percent(obj, 'foo', -12.3419), '(12.34 %)')
+        self.assertEqual(grid.render_percent(obj, 'foo', -12.3419, decimals=3), '(12.342 %)')
+
     def test_render_quantity(self):
         grid = self.make_grid(columns=['foo', 'bar'])
         obj = MagicMock()
@@ -1433,7 +1451,7 @@ class TestGrid(WebTestCase):
         # null
         obj = MagicMock(dt=None)
         result = grid.render_date(obj, 'dt', None)
-        self.assertIsNone(result)
+        self.assertEqual(result, '')
 
         # typical
         dt = datetime.date(2025, 1, 13)
@@ -1446,7 +1464,7 @@ class TestGrid(WebTestCase):
 
         obj = MagicMock(dt=None)
         result = grid.render_datetime(obj, 'dt', None)
-        self.assertIsNone(result)
+        self.assertEqual(result, '')
 
         dt = datetime.datetime(2024, 12, 12, 13, 44, tzinfo=datetime.timezone.utc)
         obj = MagicMock(dt=dt)

{wuttaweb-0.20.4 → wuttaweb-0.20.6}/tests/views/test_roles.py

@@ -7,6 +7,7 @@ from sqlalchemy import orm
 import colander
 
 from wuttaweb.views import roles as mod
+from wuttaweb.grids import Grid
 from wuttaweb.forms.schema import RoleRef
 from wuttaweb.testing import WebTestCase
 
@@ -93,6 +94,27 @@ class TestRoleView(WebTestCase):
         view.configure_form(form)
         self.assertIsNotNone(form.validators['name'])
 
+    def test_make_users_grid(self):
+        model = self.app.model
+        view = self.make_view()
+        role = model.Role(name="Manager")
+
+        # basic
+        grid = view.make_users_grid(role)
+        self.assertIsInstance(grid, Grid)
+        self.assertFalse(grid.linked_columns)
+        self.assertFalse(grid.actions)
+
+        # view + edit actions
+        with patch.object(self.request, 'is_root', new=True):
+            grid = view.make_users_grid(role)
+            self.assertIsInstance(grid, Grid)
+            self.assertIn('person', grid.linked_columns)
+            self.assertIn('username', grid.linked_columns)
+            self.assertEqual(len(grid.actions), 2)
+            self.assertEqual(grid.actions[0].key, 'view')
+            self.assertEqual(grid.actions[1].key, 'edit')
+
     def test_unique_name(self):
         model = self.app.model
         view = self.make_view()