WuttaWeb 0.21.1__tar.gz → 0.21.3__tar.gz

{wuttaweb-0.21.1 → wuttaweb-0.21.3}/CHANGELOG.md

@@ -5,6 +5,20 @@ 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.21.3 (2025-02-19)
+
+### Fix
+
+- add click handler support in simple grid table element
+- hide columns when applicable, for simple grid table element
+- add `render_form_tag()` customization hook in /form template
+
+## v0.21.2 (2025-02-18)
+
+### Fix
+
+- add hidden flag for grid columns
+
 ## v0.21.1 (2025-02-17)
 
 ### Fix

{wuttaweb-0.21.1 → wuttaweb-0.21.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: WuttaWeb
-Version: 0.21.1
+Version: 0.21.3
 Summary: Web App for Wutta Framework
 Project-URL: Homepage, https://wuttaproject.org/
 Project-URL: Repository, https://forgejo.wuttaproject.org/wutta/wuttaweb

{wuttaweb-0.21.1 → wuttaweb-0.21.3}/docs/conf.py

@@ -33,11 +33,11 @@ intersphinx_mapping = {
     'fanstatic': ('https://www.fanstatic.org/en/latest/', None),
     'pyramid': ('https://docs.pylonsproject.org/projects/pyramid/en/latest/', None),
     'python': ('https://docs.python.org/3/', None),
-    'rattail-manual': ('https://rattailproject.org/docs/rattail-manual/', None),
+    'rattail-manual': ('https://docs.wuttaproject.org/rattail-manual/', None),
     'sqlalchemy': ('http://docs.sqlalchemy.org/en/latest/', None),
     'webhelpers2': ('https://webhelpers2.readthedocs.io/en/latest/', None),
-    'wuttjamaican': ('https://rattailproject.org/docs/wuttjamaican/', None),
-    'wutta-continuum': ('https://rattailproject.org/docs/wutta-continuum/', None),
+    'wuttjamaican': ('https://docs.wuttaproject.org/wuttjamaican/', None),
+    'wutta-continuum': ('https://docs.wuttaproject.org/wutta-continuum/', None),
 }
 
 

{wuttaweb-0.21.1 → wuttaweb-0.21.3}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "WuttaWeb"
-version = "0.21.1"
+version = "0.21.3"
 description = "Web App for Wutta Framework"
 readme = "README.md"
 authors = [{name = "Lance Edgar", email = "lance@wuttaproject.org"}]

{wuttaweb-0.21.1 → wuttaweb-0.21.3}/src/wuttaweb/grids/base.py

@@ -156,6 +156,15 @@ class Grid:
 
        See also :meth:`set_link()` and :meth:`is_linked()`.
 
+    .. attribute:: hidden_columns
+
+       List of column names which should be hidden from view.
+
+       Hidden columns are sometimes useful to pass "extra" data into
+       the grid, for use by other component logic etc.
+
+       See also :meth:`set_hidden()` and :meth:`is_hidden()`.
+
     .. attribute:: sortable
 
        Boolean indicating whether *any* column sorting is allowed for
@@ -372,6 +381,7 @@ class Grid:
             row_class=None,
             actions=[],
             linked_columns=[],
+            hidden_columns=[],
             sortable=False,
             sort_multiple=True,
             sort_on_backend=True,
@@ -399,6 +409,7 @@ class Grid:
         self.row_class = row_class
         self.actions = actions or []
         self.linked_columns = linked_columns or []
+        self.hidden_columns = hidden_columns or []
         self.joiners = joiners or {}
 
         self.config = self.request.wutta_config
@@ -535,6 +546,43 @@ class Grid:
             if key in self.columns:
                 self.columns.remove(key)
 
+    def set_hidden(self, key, hidden=True):
+        """
+        Set/override the hidden flag for a column.
+
+        Hidden columns are sometimes useful to pass "extra" data into
+        the grid, for use by other component logic etc.
+
+        See also :meth:`is_hidden()`; the list is tracked via
+        :attr:`hidden_columns`.
+
+        :param key: Column key as string.
+
+        :param hidden: Flag indicating whether column should be hidden
+           (vs. shown).
+        """
+        if hidden:
+            if key not in self.hidden_columns:
+                self.hidden_columns.append(key)
+        else: # un-hide
+            if self.hidden_columns and key in self.hidden_columns:
+                self.hidden_columns.remove(key)
+
+    def is_hidden(self, key):
+        """
+        Returns boolean indicating if the column is hidden from view.
+
+        See also :meth:`set_hidden()` and :attr:`hidden_columns`.
+
+        :param key: Column key as string.
+
+        :rtype: bool
+        """
+        if self.hidden_columns:
+            if key in self.hidden_columns:
+                return True
+        return False
+
     def set_label(self, key, label, column_only=False):
         """
         Set/override the label for a column.
@@ -2090,6 +2138,7 @@ class Grid:
             columns.append({
                 'field': name,
                 'label': self.get_label(name),
+                'hidden': self.is_hidden(name),
                 'sortable': self.is_sortable(name),
                 'searchable': self.is_searchable(name),
             })

{wuttaweb-0.21.1 → wuttaweb-0.21.3}/src/wuttaweb/templates/form.mako

@@ -17,11 +17,15 @@
 <%def name="page_content()">
   % if form is not Undefined:
       <div class="wutta-form-wrapper">
-        ${form.render_vue_tag()}
+        ${self.render_form_tag()}
       </div>
   % endif
 </%def>
 
+<%def name="render_form_tag()">
+  ${form.render_vue_tag()}
+</%def>
+
 <%def name="tool_panels_wrapper()">
   <div class="tool-panels-wrapper">
     ${self.tool_panels()}

{wuttaweb-0.21.1 → wuttaweb-0.21.3}/src/wuttaweb/templates/grids/table_element.mako

@@ -2,18 +2,20 @@
 <${b}-table :data="gridContext['${grid.key}'].data">
 
   % for column in grid.get_vue_columns():
-      <${b}-table-column field="${column['field']}"
-                         label="${column['label']}"
-                         v-slot="props"
-                        :sortable="${json.dumps(column.get('sortable', False))|n}"
-                         cell-class="c_${column['field']}">
-        % if grid.is_linked(column['field']):
-            <a :href="props.row._action_url_view"
-               v-html="props.row.${column['field']}" />
-        % else:
-            <span v-html="props.row.${column['field']}"></span>
-        % endif
-      </${b}-table-column>
+      % if not column['hidden']:
+          <${b}-table-column field="${column['field']}"
+                             label="${column['label']}"
+                             v-slot="props"
+                            :sortable="${json.dumps(column.get('sortable', False))|n}"
+                             cell-class="c_${column['field']}">
+            % if grid.is_linked(column['field']):
+                <a :href="props.row._action_url_view"
+                   v-html="props.row.${column['field']}" />
+            % else:
+                <span v-html="props.row.${column['field']}"></span>
+            % endif
+          </${b}-table-column>
+      % endif
   % endfor
 
   % if grid.actions:
@@ -23,6 +25,9 @@
         % for action in grid.actions:
             <a v-if="props.row._action_url_${action.key}"
                :href="props.row._action_url_${action.key}"
+               % if action.click_handler:
+                   @click.prevent="${action.click_handler}"
+               % endif
                class="${action.link_class}">
               ${action.render_icon_and_label()}
             </a>

{wuttaweb-0.21.1 → wuttaweb-0.21.3}/src/wuttaweb/templates/grids/vue_template.mako

@@ -165,19 +165,21 @@
                 >
 
       % for column in grid.get_vue_columns():
-          <${b}-table-column field="${column['field']}"
-                             label="${column['label']}"
-                             v-slot="props"
-                            :sortable="${json.dumps(column.get('sortable', False))|n}"
-                            :searchable="${json.dumps(column.get('searchable', False))|n}"
-                             cell-class="c_${column['field']}">
-            % if grid.is_linked(column['field']):
-                <a :href="props.row._action_url_view"
-                   v-html="props.row.${column['field']}" />
-            % else:
-                <span v-html="props.row.${column['field']}"></span>
-            % endif
-          </${b}-table-column>
+          % if not column['hidden']:
+              <${b}-table-column field="${column['field']}"
+                                 label="${column['label']}"
+                                 v-slot="props"
+                                :sortable="${json.dumps(column.get('sortable', False))|n}"
+                                :searchable="${json.dumps(column.get('searchable', False))|n}"
+                                 cell-class="c_${column['field']}">
+                % if grid.is_linked(column['field']):
+                    <a :href="props.row._action_url_view"
+                       v-html="props.row.${column['field']}" />
+                % else:
+                    <span v-html="props.row.${column['field']}"></span>
+                % endif
+              </${b}-table-column>
+          % endif
       % endfor
 
       % if grid.actions:

{wuttaweb-0.21.1 → wuttaweb-0.21.3}/tests/grids/test_base.py

@@ -281,6 +281,26 @@ class TestGrid(WebTestCase):
         self.assertFalse(grid.is_linked('foo'))
         self.assertTrue(grid.is_linked('bar'))
 
+    def test_hidden_columns(self):
+        grid = self.make_grid(columns=['foo', 'bar'])
+        self.assertEqual(grid.hidden_columns, [])
+        self.assertFalse(grid.is_hidden('foo'))
+
+        grid.set_hidden('foo')
+        self.assertEqual(grid.hidden_columns, ['foo'])
+        self.assertTrue(grid.is_hidden('foo'))
+        self.assertFalse(grid.is_hidden('bar'))
+
+        grid.set_hidden('bar')
+        self.assertEqual(grid.hidden_columns, ['foo', 'bar'])
+        self.assertTrue(grid.is_hidden('foo'))
+        self.assertTrue(grid.is_hidden('bar'))
+
+        grid.set_hidden('foo', False)
+        self.assertEqual(grid.hidden_columns, ['bar'])
+        self.assertFalse(grid.is_hidden('foo'))
+        self.assertTrue(grid.is_hidden('bar'))
+
     def test_searchable_columns(self):
         grid = self.make_grid(columns=['foo', 'bar'])
         self.assertEqual(grid.searchable_columns, set())