WuttaWeb 0.11.0__tar.gz → 0.12.1__tar.gz

{wuttaweb-0.11.0 → wuttaweb-0.12.1}/CHANGELOG.md

@@ -5,6 +5,36 @@ 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.12.1 (2024-08-22)
+
+### Fix
+
+- improve home, login page styles for large logo image
+
+## v0.12.0 (2024-08-22)
+
+### Feat
+
+- add "copy link" button for sharing a grid view
+- add initial support for proper grid filters
+- add initial filtering logic to grid class
+- add "searchable" column support for grids
+- improve page linkage between role/user/person
+- add basic autocomplete support, for Person
+
+### Fix
+
+- cleanup templates for home, login pages
+- cleanup logic for appinfo/configure
+- expose settings for app node title, type
+- show installed python packages on appinfo page
+- tweak login form to stop extending size of background card
+- add setting to auto-redirect anon users to login, from home page
+- add form padding, validators for /configure pages
+- add padding around main form, via wrapper css
+- show CRUD buttons in header only if relevant and user has access
+- tweak style config for home link app title in main menu
+
 ## v0.11.0 (2024-08-20)
 
 ### Feat

{wuttaweb-0.11.0 → wuttaweb-0.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: WuttaWeb
-Version: 0.11.0
+Version: 0.12.1
 Summary: Web App for Wutta Framework
 Project-URL: Homepage, https://wuttaproject.org/
 Project-URL: Repository, https://forgejo.wuttaproject.org/wutta/wuttaweb
@@ -35,7 +35,7 @@ Requires-Dist: pyramid-tm
 Requires-Dist: pyramid>=2
 Requires-Dist: waitress
 Requires-Dist: webhelpers2
-Requires-Dist: wuttjamaican[db]>=0.12.0
+Requires-Dist: wuttjamaican[db]>=0.12.1
 Requires-Dist: zope-sqlalchemy>=1.5
 Provides-Extra: docs
 Requires-Dist: furo; extra == 'docs'

{wuttaweb-0.11.0 → wuttaweb-0.12.1}/pyproject.toml

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

{wuttaweb-0.11.0 → wuttaweb-0.12.1}/src/wuttaweb/forms/base.py

@@ -25,6 +25,7 @@ Base form classes
 """
 
 import logging
+from collections import OrderedDict
 
 import colander
 import deform
@@ -311,6 +312,9 @@ class Form:
 
         self.set_fields(fields or self.get_fields())
 
+        # nb. this tracks grid JSON data for inclusion in page template
+        self.grid_vue_data = OrderedDict()
+
     def __contains__(self, name):
         """
         Custom logic for the ``in`` operator, to allow easily checking
@@ -750,6 +754,10 @@ class Form:
                     kwargs['appstruct'] = self.model_instance
 
             form = deform.Form(schema, **kwargs)
+            # nb. must give a reference back to wutta form; this is
+            # for sake of field schema nodes and widgets, e.g. to
+            # access the main model instance
+            form.wutta_form = self
             self.deform_form = form
 
         return self.deform_form
@@ -818,6 +826,17 @@ class Form:
         output = render(template, context)
         return HTML.literal(output)
 
+    def add_grid_vue_data(self, grid):
+        """ """
+        if not grid.key:
+            raise ValueError("grid must have a key!")
+
+        if grid.key in self.grid_vue_data:
+            log.warning("grid data with key '%s' already registered, "
+                        "but will be replaced", grid.key)
+
+        self.grid_vue_data[grid.key] = grid.get_vue_data()
+
     def render_vue_field(
             self,
             fieldname,

{wuttaweb-0.11.0 → wuttaweb-0.12.1}/src/wuttaweb/forms/schema.py

@@ -246,6 +246,9 @@ class ObjectRef(colander.SchemaType):
                 values.insert(0, self.empty_option)
             kwargs['values'] = values
 
+        if 'url' not in kwargs:
+            kwargs['url'] = lambda person: self.request.route_url('people.view', uuid=person.uuid)
+
         return widgets.ObjectRefWidget(self.request, **kwargs)
 
 
@@ -321,6 +324,28 @@ class RoleRefs(WuttaSet):
         return widgets.RoleRefsWidget(self.request, **kwargs)
 
 
+class UserRefs(WuttaSet):
+    """
+    Form schema type for the Role
+    :attr:`~wuttjamaican:wuttjamaican.db.model.auth.Role.users`
+    association proxy field.
+
+    This is a subclass of :class:`WuttaSet`.  It uses a ``set`` of
+    :class:`~wuttjamaican:wuttjamaican.db.model.auth.User` ``uuid``
+    values for underlying data format.
+    """
+
+    def widget_maker(self, **kwargs):
+        """
+        Constructs a default widget for the field.
+
+        :returns: Instance of
+           :class:`~wuttaweb.forms.widgets.UserRefsWidget`.
+        """
+        kwargs.setdefault('session', self.session)
+        return widgets.UserRefsWidget(self.request, **kwargs)
+
+
 class Permissions(WuttaSet):
     """
     Form schema type for the Role

{wuttaweb-0.11.0 → wuttaweb-0.12.1}/src/wuttaweb/forms/widgets.py

@@ -44,6 +44,7 @@ from deform.widget import (Widget, TextInputWidget, TextAreaWidget,
 from webhelpers2.html import HTML
 
 from wuttaweb.db import Session
+from wuttaweb.grids import Grid
 
 
 class ObjectRefWidget(SelectWidget):
@@ -83,9 +84,19 @@ class ObjectRefWidget(SelectWidget):
     """
     readonly_template = 'readonly/objectref'
 
-    def __init__(self, request, *args, **kwargs):
+    def __init__(self, request, url=None, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.request = request
+        self.url = url
+
+    def get_template_values(self, field, cstruct, kw):
+        """ """
+        values = super().get_template_values(field, cstruct, kw)
+
+        if 'url' not in values and self.url and field.schema.model_instance:
+            values['url'] = self.url(field.schema.model_instance)
+
+        return values
 
 
 class NotesWidget(TextAreaWidget):
@@ -137,12 +148,17 @@ class RoleRefsWidget(WuttaCheckboxChoiceWidget):
     """
     Widget for use with User
     :attr:`~wuttjamaican:wuttjamaican.db.model.auth.User.roles` field.
+    This is the default widget for the
+    :class:`~wuttaweb.forms.schema.RoleRefs` type.
 
     This is a subclass of :class:`WuttaCheckboxChoiceWidget`.
     """
+    readonly_template = 'readonly/rolerefs'
 
     def serialize(self, field, cstruct, **kw):
         """ """
+        model = self.app.model
+
         # special logic when field is editable
         readonly = kw.get('readonly', self.readonly)
         if not readonly:
@@ -159,10 +175,78 @@ class RoleRefsWidget(WuttaCheckboxChoiceWidget):
                           if val[0] != admin.uuid]
                 kw['values'] = values
 
+        else: # readonly
+
+            # roles
+            roles = []
+            if cstruct:
+                for uuid in cstruct:
+                    role = self.session.query(model.Role).get(uuid)
+                    if role:
+                        roles.append(role)
+            kw['roles'] = roles
+
+            # url
+            url = lambda role: self.request.route_url('roles.view', uuid=role.uuid)
+            kw['url'] = url
+
         # default logic from here
         return super().serialize(field, cstruct, **kw)
 
 
+class UserRefsWidget(WuttaCheckboxChoiceWidget):
+    """
+    Widget for use with Role
+    :attr:`~wuttjamaican:wuttjamaican.db.model.auth.Role.users` field.
+    This is the default widget for the
+    :class:`~wuttaweb.forms.schema.UserRefs` type.
+
+    This is a subclass of :class:`WuttaCheckboxChoiceWidget`; however
+    it only supports readonly mode and does not use a template.
+    Rather, it generates and renders a
+    :class:`~wuttaweb.grids.base.Grid` showing the users list.
+    """
+
+    def serialize(self, field, cstruct, **kw):
+        """ """
+        readonly = kw.get('readonly', self.readonly)
+        if not readonly:
+            raise NotImplementedError("edit not allowed for this widget")
+
+        model = self.app.model
+        columns = ['person', 'username', 'active']
+
+        # generate data set for users
+        users = []
+        if cstruct:
+            for uuid in cstruct:
+                user = self.session.query(model.User).get(uuid)
+                if user:
+                    users.append(dict([(key, getattr(user, key))
+                                       for key in columns + ['uuid']]))
+
+        # grid
+        grid = Grid(self.request, key='roles.view.users',
+                    columns=columns, data=users)
+
+        # view action
+        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')
+
+        # edit action
+        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)
+
+        # render as simple <b-table>
+        # nb. must indicate we are a part of this form
+        form = getattr(field.parent, 'wutta_form', None)
+        return grid.render_table_element(form)
+
+
 class PermissionsWidget(WuttaCheckboxChoiceWidget):
     """
     Widget for use with Role