WuttaWeb 0.22.0__tar.gz → 0.23.0__tar.gz

wuttaweb-0.23.0/.hgignore

@@ -0,0 +1,3 @@
+syntax:glob
+*.pyc
+*~

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/CHANGELOG.md

@@ -5,6 +5,24 @@ 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.23.0 (2025-08-09)
+
+### Feat
+
+- add tools to manage user API tokens
+
+### Fix
+
+- add default sorter, tools for basic table-element grid
+- add custom password+confirmation widget for Vue3 + Oruga
+- fix butterfly wrapper for b-notification component
+- add butterfly wrapper for b-timepicker component
+- style tweaks for butterfly/oruga; mostly expand fields
+- fix b-datepicker component wrapper per oruga 0.9.0
+- fix b-button component wrapper per oruga 0.9.0
+- update butterfly component for b-autocomplete, per oruga 0.11.4
+- update default versions for Vue3 + Oruga + FontAwesome
+
 ## v0.22.0 (2025-06-29)
 
 ### Feat

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: WuttaWeb
-Version: 0.22.0
+Version: 0.23.0
 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.6
+Requires-Dist: wuttjamaican[db]>=0.22.0
 Requires-Dist: zope-sqlalchemy>=1.5
 Provides-Extra: continuum
 Requires-Dist: wutta-continuum; extra == 'continuum'

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "WuttaWeb"
-version = "0.22.0"
+version = "0.23.0"
 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.6",
+        "WuttJamaican[db]>=0.22.0",
         "zope.sqlalchemy>=1.5",
 ]
 

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/forms/widgets.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  wuttaweb -- Web App for Wutta Framework
-#  Copyright © 2024 Lance Edgar
+#  Copyright © 2024-2025 Lance Edgar
 #
 #  This file is part of Wutta Framework.
 #
@@ -153,6 +153,21 @@ class WuttaCheckboxChoiceWidget(CheckboxChoiceWidget):
         self.app = self.config.get_app()
 
 
+class WuttaCheckedPasswordWidget(PasswordWidget):
+    """
+    Custom widget for password+confirmation field.
+
+    This widget is used only for Vue 3 + Oruga, but is *not* used for
+    Vue 2 + Buefy.
+
+    This is a subclass of :class:`deform:deform.widget.PasswordWidget`
+    and uses these Deform templates:
+
+    * ``wutta_checked_password``
+    """
+    template = 'wutta_checked_password'
+
+
 class WuttaDateWidget(DateInputWidget):
     """
     Custom widget for :class:`python:datetime.date` fields.

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/grids/base.py

@@ -2041,9 +2041,9 @@ class Grid:
         """
         Render a simple Vue table element for the grid.
 
-        This is what you want for a "simple" grid which does require a
-        unique Vue component, but can instead use the standard table
-        component.
+        This is what you want for a "simple" grid which does not
+        require a unique Vue component, but can instead use the
+        standard table component.
 
         This returns something like:
 
@@ -2227,6 +2227,35 @@ class Grid:
                             'order': sorter['dir']})
         return sorters
 
+    def get_vue_first_sorter(self):
+        """
+        Returns the first active sorter, if applicable.
+
+        This method is used to declare the initial sort for a simple
+        table component, i.e. for use with the ``table-element.mako``
+        template.  It generally is assumed that frontend sorting is in
+        use, as opposed to backend sorting, although it should work
+        for either scenario.
+
+        This checks :attr:`active_sorters` and if set, will use the
+        first sorter from that.  Note that ``active_sorters`` will
+        *not* be set unless :meth:`load_settings()` has been called.
+
+        Otherwise this will use the first sorter from
+        :attr:`sort_defaults` which is defined in constructor.
+
+        :returns: The first sorter in format ``[sortkey, sortdir]``,
+           or ``None``.
+        """
+        if hasattr(self, 'active_sorters'):
+            if self.active_sorters:
+                sorter = self.active_sorters[0]
+                return [sorter['key'], sorter['dir']]
+
+        elif self.sort_defaults:
+            sorter = self.sort_defaults[0]
+            return [sorter.sortkey, sorter.sortdir]
+
     def get_vue_filters(self):
         """
         Returns a list of Vue-compatible filter definitions.

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/templates/appinfo/configure.mako

@@ -112,31 +112,36 @@
       <b-field label="Default Sender">
         <b-input name="${app.appname}.email.default.sender"
                  v-model="simpleSettings['${app.appname}.email.default.sender']"
-                 @input="settingsNeedSaved = true" />
+                 @input="settingsNeedSaved = true"
+                 expanded />
       </b-field>
 
       <b-field label="Default Recipient(s)">
         <b-input name="${app.appname}.email.default.to"
                  v-model="simpleSettings['${app.appname}.email.default.to']"
-                 @input="settingsNeedSaved = true" />
+                 @input="settingsNeedSaved = true"
+                 expanded />
       </b-field>
 
       <b-field label="Default Subject (optional)">
         <b-input name="${app.appname}.email.default.subject"
                  v-model="simpleSettings['${app.appname}.email.default.subject']"
-                 @input="settingsNeedSaved = true" />
+                 @input="settingsNeedSaved = true"
+                 expanded />
       </b-field>
 
       <b-field label="Feedback Recipient(s) (optional)">
         <b-input name="${app.appname}.email.feedback.to"
                  v-model="simpleSettings['${app.appname}.email.feedback.to']"
-                 @input="settingsNeedSaved = true" />
+                 @input="settingsNeedSaved = true"
+                 expanded />
       </b-field>
 
       <b-field label="Feedback Subject (optional)">
         <b-input name="${app.appname}.email.feedback.subject"
                  v-model="simpleSettings['${app.appname}.email.feedback.subject']"
-                 @input="settingsNeedSaved = true" />
+                 @input="settingsNeedSaved = true"
+                 expanded />
       </b-field>
 
     </div>

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/templates/base.mako

@@ -498,23 +498,26 @@
                        % if request.user:
                            disabled
                        % endif
-                       />
+                       expanded />
             </b-field>
 
             <b-field label="Referring URL">
               <b-input v-model="referrer"
-                       disabled="true" />
+                       disabled="true"
+                       expanded />
             </b-field>
 
             <b-field label="Message"
                      :type="message && message.trim() ? null : 'is-danger'">
               <b-input type="textarea"
                        v-model="message"
-                       ref="textarea" />
+                       ref="textarea"
+                       expanded />
             </b-field>
           </section>
 
           <footer class="modal-card-foot">
+            <div style="display: flex; gap: 0.5rem;">
             <b-button @click="showDialog = false">
               Cancel
             </b-button>
@@ -525,6 +528,7 @@
                       :disabled="submitDisabled">
               {{ sendingFeedback ? "Working, please wait..." : "Send Message" }}
             </b-button>
+            </div>
           </footer>
         </div>
       </${b}-modal>

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/templates/deform/checked_password.pt

@@ -5,10 +5,12 @@
   <b-input name="${name}"
            value="${field.widget.redisplay and cstruct or ''}"
            type="password"
+           expanded
            placeholder="Password" />
   <b-input name="${name}-confirm"
            value="${field.widget.redisplay and confirm or ''}"
            type="password"
+           expanded
            placeholder="Confirm Password" />
   ${field.end_mapping()}
 </div>

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/templates/deform/dateinput.pt

@@ -1,6 +1,7 @@
 <div>
   ${field.start_mapping()}
   <wutta-datepicker name="date"
-                    value="${cstruct}" />
+                    value="${cstruct}"
+                    expanded />
   ${field.end_mapping()}
 </div>

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/templates/deform/datetimeinput.pt

@@ -2,9 +2,11 @@
   ${field.start_mapping()}
   <wutta-datepicker name="date"
                     style="flex-grow: 1;"
+                    expanded
                     value="${date}" />
   <wutta-timepicker name="time"
                     style="flex-grow: 1;"
+                    expanded
                     value="${time}" />
   ${field.end_mapping()}
 </div>

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/templates/deform/moneyinput.pt

@@ -3,5 +3,6 @@
                       vmodel vmodel|'modelData.'+oid;">
   <b-input name="${name}"
            v-model="${vmodel}"
+           expanded
            tal:attributes="attributes|field.widget.attributes|{};" />
 </tal:omit>

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/templates/deform/password.pt

@@ -5,5 +5,6 @@
   <b-input name="${name}"
            v-model="${vmodel}"
            type="password"
+           expanded
            tal:attributes="attributes|field.widget.attributes|{};" />
 </div>

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/templates/deform/textarea.pt

@@ -7,5 +7,6 @@
   <b-input name="${name}"
            v-model="${vmodel}"
            type="textarea"
+           expanded
            tal:attributes="attributes|field.widget.attributes|{};" />
 </div>

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/templates/deform/textinput.pt

@@ -4,5 +4,6 @@
                  vmodel vmodel|'modelData.'+oid;">
   <b-input name="${name}"
            v-model="${vmodel}"
+           expanded
            tal:attributes="attributes|field.widget.attributes|{};" />
 </div>

wuttaweb-0.23.0/src/wuttaweb/templates/deform/wutta_checked_password.pt

@@ -0,0 +1,8 @@
+<div tal:omit-tag
+     tal:define="name name|field.name;
+                 oid oid|field.oid;
+                 vmodel vmodel|'modelData.'+oid;">
+  <wutta-checked-password name="${name}"
+                          v-model="${vmodel}"
+                          tal:attributes="attributes|field.widget.attributes|{};" />
+</div>

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/templates/grids/table_element.mako

@@ -1,5 +1,22 @@
 ## -*- coding: utf-8; -*-
-<${b}-table :data="gridContext['${grid.key}'].data">
+<div>
+
+  % if grid.tools:
+      <div class="table-tools-wrapper">
+        % for html in grid.tools.values():
+            ${html}
+        % endfor
+      </div>
+  % endif
+
+<${b}-table :data="gridContext['${grid.key}'].data"
+
+            ## sorting
+            % if grid.sortable:
+                :default-sort="${grid.get_vue_first_sorter() or 'null'}"
+            % endif
+
+            icon-pack="fas">
 
   % for column in grid.get_vue_columns():
       % if not column['hidden']:
@@ -52,3 +69,5 @@
   </template>
 
 </${b}-table>
+
+</div>

{wuttaweb-0.22.0 → wuttaweb-0.23.0}/src/wuttaweb/templates/themes/butterfly/buefy-components.mako

@@ -5,6 +5,7 @@
   ${self.make_b_checkbox_component()}
   ${self.make_b_collapse_component()}
   ${self.make_b_datepicker_component()}
+  ${self.make_b_timepicker_component()}
   ${self.make_b_dropdown_component()}
   ${self.make_b_dropdown_item_component()}
   ${self.make_b_field_component()}
@@ -25,16 +26,10 @@
 
 <%def name="make_b_autocomplete_component()">
   <script type="text/x-template" id="b-autocomplete-template">
-    <o-autocomplete v-model="orugaValue"
-                    :data="data"
-                    :field="field"
-                    :open-on-focus="openOnFocus"
-                    :keep-first="keepFirst"
-                    :clearable="clearable"
-                    :clear-on-select="clearOnSelect"
-                    :formatter="customFormatter"
-                    :placeholder="placeholder"
-                    @update:model-value="orugaValueUpdated"
+    <o-autocomplete v-model:input="orugaValue"
+                    :options="options"
+                    clear-icon="circle-xmark"
+                    @update:input="orugaValueUpdated"
                     ref="autocomplete">
     </o-autocomplete>
   </script>
@@ -45,12 +40,7 @@
             modelValue: String,
             data: Array,
             field: String,
-            openOnFocus: Boolean,
-            keepFirst: Boolean,
-            clearable: Boolean,
-            clearOnSelect: Boolean,
             customFormatter: null,
-            placeholder: String,
         },
         data() {
             return {
@@ -64,13 +54,33 @@
                 }
             },
         },
+        computed: {
+            options() {
+                const options = []
+                const field = this.field || 'label'
+                for (let opt of this.data) {
+                    const newOpt = {
+                        label: opt[field],
+                        value: opt,
+                    }
+                    if (this.customFormatter) {
+                        newOpt.label = this.customFormatter(opt)
+                    }
+                    options.push(newOpt)
+                }
+                return options
+            },
+        },
         methods: {
             focus() {
                 const input = this.$refs.autocomplete.$el.querySelector('input')
                 input.focus()
             },
             orugaValueUpdated(value) {
-                this.$emit('update:modelValue', value)
+                if (this.field) {
+                    value = value[this.field]
+                }
+                this.$emit('update:modelValue', value || '')
             },
         },
     }
@@ -82,7 +92,7 @@
   <script type="text/x-template" id="b-button-template">
     <o-button :variant="variant"
               :size="orugaSize"
-              :native-type="nativeType"
+              :type="nativeType"
               :tag="tag"
               :href="href"
               :icon-left="iconLeft">
@@ -181,8 +191,8 @@
                   @update:model-value="orugaValueUpdated"
                   :value="value"
                   :placeholder="placeholder"
-                  :date-formatter="dateFormatter"
-                  :date-parser="dateParser"
+                  :formatter="dateFormatter"
+                  :parser="dateParser"
                   :disabled="disabled"
                   :editable="editable"
                   :icon="icon"
@@ -228,6 +238,45 @@
   <% request.register_component('b-datepicker', 'BDatepicker') %>
 </%def>
 
+<%def name="make_b_timepicker_component()">
+  <script type="text/x-template" id="b-timepicker-template">
+    <o-timepicker v-model="orugaValue"
+                  @update:model-value="orugaValueUpdated"
+                  :formatter="timeFormatter"
+                  :parser="timeParser" />
+  </script>
+  <script>
+    const BTimepicker = {
+        template: '#b-timepicker-template',
+        props: {
+            modelValue: null,
+            timeFormatter: null,
+            timeParser: null,
+        },
+        data() {
+            return {
+                orugaValue: this.modelValue,
+            }
+        },
+        watch: {
+            modelValue(to, from) {
+                if (this.orugaValue != to) {
+                    this.orugaValue = to
+                }
+            },
+        },
+        methods: {
+            orugaValueUpdate(value) {
+                if (this.modelValue != value) {
+                    this.$emit('update:modelValue', value)
+                }
+            },
+        },
+    }
+  </script>
+  <% request.register_component('b-timepicker', 'BTimepicker') %>
+</%def>
+
 <%def name="make_b_dropdown_component()">
   <script type="text/x-template" id="b-dropdown-template">
     <o-dropdown :position="buefyPosition"
@@ -364,15 +413,7 @@
         },
         methods: {
             focus() {
-                if (this.type == 'textarea') {
-                    // TODO: this does not always work right?
-                    this.$refs.input.$el.querySelector('textarea').focus()
-                } else {
-                    // TODO: pretty sure we can rely on the <o-input> focus()
-                    // here, but not sure why we weren't already doing that?
-                    //this.$refs.input.$el.querySelector('input').focus()
-                    this.$refs.input.focus()
-                }
+                this.$refs.input.focus()
             },
         },
     }
@@ -445,7 +486,8 @@
 <%def name="make_b_notification_component()">
   <script type="text/x-template" id="b-notification-template">
     <o-notification :variant="variant"
-                    :closable="closable">
+                    ## nb. prop name changed for oruga
+                    :closeable="closable">
       <slot />
     </o-notification>
   </script>

wuttaweb-0.23.0/src/wuttaweb/templates/users/view.mako

@@ -0,0 +1,126 @@
+## -*- coding: utf-8; -*-
+<%inherit file="/master/view.mako" />
+
+<%def name="page_content()">
+  ${parent.page_content()}
+
+  % if master.has_perm('manage_api_tokens'):
+      <b-modal :active.sync="newTokenShowDialog"
+               has-modal-card>
+        <div class="modal-card">
+          <header class="modal-card-head">
+            <p class="modal-card-title">
+              New API Token
+            </p>
+          </header>
+          <section class="modal-card-body">
+
+            <div v-if="!newTokenSaved">
+              <b-field label="Description"
+                       :type="{'is-danger': !newTokenDescription}">
+                <b-input v-model.trim="newTokenDescription"
+                         expanded
+                         ref="newTokenDescription">
+                </b-input>
+              </b-field>
+            </div>
+
+            <div v-if="newTokenSaved">
+              <p class="block">
+                Your new API token is shown below.
+              </p>
+              <p class="block">
+                IMPORTANT:&nbsp; You must record this token elsewhere
+                for later reference.&nbsp; You will NOT be able to
+                recover the value if you lose it.
+              </p>
+              <b-field horizontal label="API Token">
+                {{ newTokenRaw }}
+              </b-field>
+              <b-field horizontal label="Description">
+                {{ newTokenDescription }}
+              </b-field>
+            </div>
+
+          </section>
+          <footer class="modal-card-foot">
+            <b-button @click="newTokenShowDialog = false">
+              {{ newTokenSaved ? "Close" : "Cancel" }}
+            </b-button>
+            <b-button v-if="!newTokenSaved"
+                      type="is-primary"
+                      icon-pack="fas"
+                      icon-left="save"
+                      @click="newTokenSave()"
+                      :disabled="!newTokenDescription || newTokenSaving">
+              {{ newTokenSaving ? "Working, please wait..." : "Save" }}
+            </b-button>
+          </footer>
+        </div>
+      </b-modal>
+  % endif
+</%def>
+
+<%def name="render_form_tag()">
+  % if master.has_perm('manage_api_tokens'):
+      ${form.render_vue_tag(**{'@new-token': 'newTokenInit', '@delete-token': 'deleteTokenInit'})}
+  % else:
+      ${form.render_vue_tag()}
+  % endif
+</%def>
+
+<%def name="modify_vue_vars()">
+  ${parent.modify_vue_vars()}
+  <script>
+    % if master.has_perm('manage_api_tokens'):
+
+        ThisPageData.newTokenShowDialog = false
+        ThisPageData.newTokenDescription = null
+        ThisPageData.newTokenRaw = null
+        ThisPageData.newTokenSaved = false
+        ThisPageData.newTokenSaving = false
+
+        ThisPage.methods.newTokenInit = function() {
+            this.newTokenDescription = null
+            this.newTokenRaw = null
+            this.newTokenSaved = false
+            this.newTokenShowDialog = true
+            this.$nextTick(() => {
+                this.$refs.newTokenDescription.focus()
+            })
+        }
+
+        ThisPage.methods.newTokenSave = function() {
+            this.newTokenSaving = true
+
+            const url = '${master.get_action_url('add_api_token', instance)}'
+            const params = {
+                description: this.newTokenDescription,
+            }
+
+            this.wuttaPOST(url, params, response => {
+                this.newTokenSaving = false
+                this.newTokenRaw = response.data.token_string
+                ${form.vue_component}Data.gridContext['users.view.api_tokens'].data.push(response.data)
+                this.newTokenSaved = true
+            }, response => {
+                this.newTokenSaving = false
+            })
+        }
+
+        ThisPage.methods.deleteTokenInit = function(token) {
+            if (!confirm("Really delete this API token?")) {
+                return
+            }
+
+            const url = '${master.get_action_url('delete_api_token', instance)}'
+            const params = {uuid: token.uuid}
+            this.wuttaPOST(url, params, response => {
+                const i = ${form.vue_component}Data.gridContext['users.view.api_tokens'].data.indexOf(token)
+                ${form.vue_component}Data.gridContext['users.view.api_tokens'].data.splice(i, 1)
+            })
+        }
+
+    % endif
+  </script>
+</%def>