django-smartbase-admin 0.2.54__py3-none-any.whl → 1.0.38__py3-none-any.whl

django_smartbase_admin/static/sb_admin/src/js/table.js

@@ -1,4 +1,4 @@
-import {TabulatorFull as Tabulator} from 'tabulator-tables'
+import {TabulatorFull as Tabulator, Renderer} from 'tabulator-tables'
 import {ViewsModule} from "./table_modules/views_module"
 import {SelectionModule} from "./table_modules/selection_module"
 import {ColumnDisplayModule} from "./table_modules/column_display_module"
@@ -106,12 +106,22 @@ class SBAdminTable {
         }
     }
 
+    isFiltered() {
+        const filterParams = this.getUrlParams()[this.constants.FILTER_DATA_NAME]
+        if(filterParams === undefined) {
+            return false
+        }
+        return Object.values(filterParams).some(val=>val)
+    }
+
     loadFromUrlAfterInit() {
         window.htmx.process(this.tabulator.rowManager.tableElement)
-        this.tabulator.on("dataProcessed", () => {
+        this.tabulator.on("dataProcessed", (data) => {
             window.htmx.process(this.tabulator.rowManager.tableElement)
+            document.body.dispatchEvent(new CustomEvent('tableDataProcessed', {"detail": {"data": data, "isFiltered": this.isFiltered()}}))
         })
         this.callModuleAction('loadFromUrlAfterInit')
+        document.body.dispatchEvent(new CustomEvent('tableDataProcessed', {"detail": {"data": this.tabulator.getData(), "isFiltered": this.isFiltered()}}))
     }
 
     initModules(modules) {
@@ -246,6 +256,16 @@ class SBAdminTable {
             document.getElementById(this.viewId + "-tabulator-header").style.display = "none"
         }
 
+        class NoRender extends Renderer {
+            render() {}
+        }
+        if(this.tabulatorOptions['renderVertical'] === "no-render") {
+            this.tabulatorOptions['renderVertical'] = NoRender
+        }
+        if(this.tabulatorOptions['renderHorizontal'] === "no-render") {
+            this.tabulatorOptions['renderHorizontal'] =NoRender
+        }
+
         let tabulatorOptions = {
             columns: this.tableColumns,
             ajaxURL: this.tableAjaxUrl,
@@ -271,12 +291,17 @@ class SBAdminTable {
         Tabulator.registerModule(SBAjaxParamsTabulatorModifier)
         this.tabulator = new Tabulator(this.tableElSelector, tabulatorOptions)
         this.tabulator.SBTable = this
-        document.addEventListener("SBAdminReloadTableData", function () {
+        document.addEventListener(window.sb_admin_const.TABLE_RELOAD_DATA_EVENT_NAME, function () {
             self.refreshTableDataIfNotUrlLoad()
         })
+        document.addEventListener(window.sb_admin_const.TABLE_UPDATE_ROW_DATA_EVENT_NAME, function (e) {
+            if (e.detail && e.detail.rowData) {
+                self.tabulator.updateData(e.detail.rowData)
+            }
+        })
     }
 
-    executeListAction(action_url, no_params) {
+    executeListAction(action_url, no_params, open_in_new_tab = false) {
         const params = this.getUrlParamsString()
         if (this.tabulatorOptions["ajaxConfig"]["method"] === "POST") {
             const urlParams = new URLSearchParams(params)
@@ -323,7 +348,11 @@ class SBAdminTable {
             if (!no_params) {
                 action_url += params
             }
-            window.location.href = action_url
+            if (open_in_new_tab) {
+                window.open(action_url, '_blank')
+            } else {
+                window.location.href = action_url
+            }
         }
     }
 }

django_smartbase_admin/static/sb_admin/src/js/table_modules/advanced_filter_module.js

@@ -1,5 +1,6 @@
 import { SBAdminTableModule } from "./base_module"
 import { filterInputValueChangedUtil, filterInputValueChangeListener } from "../utils"
+import {customActionsPlugin, monthYearViewsPlugin} from "../datepicker_plugins"
 
 export class AdvancedFilterModule extends SBAdminTableModule {
     constructor(table) {
@@ -16,13 +17,13 @@ export class AdvancedFilterModule extends SBAdminTableModule {
                 window.SBAdmin.range.initRange(widgetEl)
                 widgetEl.dispatchEvent(new CustomEvent("SBTableFilterFormLoad"))
             },
-            ".js-datepicker-not-inline": (rule, ruleEl, widgetEl) => {
+            ".js-datepicker-dynamic": (rule, ruleEl, widgetEl) => {
                 this.dateOperatorUpdate(rule, ruleEl, widgetEl)
             }
         }
         this.afterUpdateRuleOperatorFunctions = {
             ".js-range": this.rangeOperatorUpdate,
-            ".js-datepicker-not-inline": this.dateOperatorUpdate
+            ".js-datepicker-dynamic": this.dateOperatorUpdate.bind(this)
         }
     }
 
@@ -36,6 +37,9 @@ export class AdvancedFilterModule extends SBAdminTableModule {
         if(!filterData?.rules || filterData.rules.length === 0) {
             filterData = emptyRules
         }
+        document.querySelectorAll('.js-datepicker-dynamic').forEach(widgetEl => {
+            this.destroyDatePicker(widgetEl)
+        })
         window.dispatchEvent(new CustomEvent("SBinitOrUpdateQueryBuilder", { detail: { SBTable: this, filterData: filterData } }))
     }
 
@@ -95,26 +99,45 @@ export class AdvancedFilterModule extends SBAdminTableModule {
         }
     }
 
-    dateOperatorUpdate(rule, ruleEl, widgetEl) {
-        let newMode = "single"
-        if (["between", "not_between"].includes(rule.operator.type)) {
-            newMode = "range"
+    destroyDatePicker(widgetEl) {
+        if(widgetEl._flatpickr){
+            widgetEl._flatpickr.calendarContainer?.remove()
+            widgetEl._flatpickr.clear()
+            widgetEl._flatpickr.destroy()
+            widgetEl._flatpickr = undefined
+            return
         }
-        if (!widgetEl._flatpickr) {
-            // not yet initialized, init nad set right mode
-            const sbadminDatepickerData = JSON.parse(widgetEl.dataset.sbadminDatepicker)
-            sbadminDatepickerData.flatpickrOptions.mode = newMode
-            widgetEl.dataset.sbadminDatepicker = JSON.stringify(sbadminDatepickerData)
-            window.SBAdmin.datepicker.initWidgets(ruleEl)
-        } else {
-            // update mode
-            const flatPickr = widgetEl._flatpickr
-            const currentMode = flatPickr.config.mode
+        const dropdownInstance = window.bootstrap5.Dropdown.getInstance(widgetEl)
+        if(dropdownInstance) {
+            dropdownInstance.dispose()
+            widgetEl.removeAttribute('data-bs-toggle')
+            widgetEl.nextElementSibling?.remove()
+            widgetEl.readOnly = false
+            widgetEl.value = ""
+        }
+    }
 
-            if (newMode !== currentMode) {
-                flatPickr.set("mode", newMode)
-                flatPickr.clear()
-            }
+    dateOperatorUpdate(rule, ruleEl, widgetEl) {
+        let optionsOverride = {
+            inline: false,
+            mode: "single",
+            allowInput: true,
+            plugins: [
+                monthYearViewsPlugin,
+                customActionsPlugin
+            ],
+        }
+        if (["between", "not_between", "in_the_last", "in_the_next"].includes(rule.operator.type)) {
+            optionsOverride["mode"] = "range"
+        }
+        this.destroyDatePicker(widgetEl)
+        const shortcuts = JSON.parse(widgetEl.dataset.sbadminDatepickerShortcutsDict)
+        widgetEl.dataset.sbadminDatepickerShortcuts = JSON.stringify(shortcuts[rule.operator.type] || [])
+        if (["in_the_last", "in_the_next"].includes(rule.operator.type)) {
+            window.SBAdmin.datepicker.initShortcutsDropdown(widgetEl, {}, optionsOverride)
+        }
+        else {
+            window.SBAdmin.datepicker.initFlatPickr(widgetEl, {}, optionsOverride)
         }
     }
 }

django_smartbase_admin/static/sb_admin/src/js/table_modules/data_edit_module.js

@@ -11,16 +11,14 @@ export class DataEditModule extends SBAdminTableModule {
             editRequestData.set('currentRowId', currentRowId)
             editRequestData.set('columnFieldName', cell.getColumn().getField())
             editRequestData.set('cellValue', cell.getValue())
-            fetch(this.table.tableDataEditUrl, {
-                method: 'POST',
-                headers: {
-                    "X-CSRFToken": window.csrf_token,
-                },
-                body: editRequestData
-            }).then(response => response.json())
-                .then(res => {
-                    console.log(res)
-                })
+            window.htmx.ajax('POST', this.table.tableDataEditUrl, {
+                'swap': 'none',
+                'values': {
+                    'currentRowId': currentRowId,
+                    'columnFieldName': cell.getColumn().getField(),
+                    'cellValue': cell.getValue()
+                }
+            })
         })
     }
 }

django_smartbase_admin/static/sb_admin/src/js/table_modules/filter_module.js

@@ -21,10 +21,10 @@ export class FilterModule extends SBAdminTableModule {
             const wrapperEl = el.closest('.filter-wrapper')
             if(wrapperEl) {
                 if (!wrapperEl.hasAttribute('data-all-filters-visible')) {
-                    this.hideFilter(wrapperEl.getAttribute('data-filter-input-name'), true)
+                    this.hideFilter(wrapperEl.getAttribute('data-filter-input-name'))
                 }
             } else {
-                this.hideFilter(el.getAttribute('name'))
+                this.hideFilter(el.getAttribute('name'), false)
             }
         })
         if (filterData) {
@@ -101,7 +101,7 @@ export class FilterModule extends SBAdminTableModule {
         this.table.refreshTableDataIfNotUrlLoad()
     }
 
-    hideFilter(field, hideWrapper=false) {
+    hideFilter(field, hideWrapper=true) {
         const fieldElem = this.getFormField(field)
         const filterElem = document.querySelector(`#${this.table.viewId}-${field}-wrapper`)
         if (!fieldElem) {

django_smartbase_admin/static/sb_admin/src/js/table_modules/header_tabs_module.js

@@ -9,7 +9,7 @@ export class HeaderTabsModule extends SBAdminTableModule {
         if (!filterOptionsWrapper || !targetInput) {
             return
         }
-        filterOptionsWrapper.querySelectorAll('[data-bs-toggle]').forEach(el => {
+        filterOptionsWrapper.querySelectorAll('[data-bs-toggle="tab"]').forEach(el => {
             el.addEventListener("show.bs.tab", (event) => {
                 const targetId = event.target.id
                 if (targetId !== 'tab_saved_views') {
@@ -49,18 +49,18 @@ export class HeaderTabsModule extends SBAdminTableModule {
         if (!targetInput) {
             return
         }
-        const params = this.table.getParamsFromUrl()
-        if (targetInput.value === "") {
-            const filterOptionsWrapper = document.querySelector(".js-filters-options")
-            targetInput.value = filterOptionsWrapper.querySelector('[data-bs-toggle="tab"]').id
-        }
-        const targetTabValue = params[this.table.constants.FILTER_DATA_NAME]?.[this.table.constants.TABLE_PARAMS_SELECTED_FILTER_TYPE]
-        if (targetTabValue) {
-            targetInput.value = targetTabValue
+        const filterOptionsWrapper = document.querySelector(".js-filters-options")
+        const activeTab = filterOptionsWrapper.querySelector('[data-bs-toggle="tab"].active')
+        if (activeTab.id !== 'tab_saved_views') {
+            if (targetInput.value === "") {
+                const filterOptionsWrapper = document.querySelector(".js-filters-options")
+                targetInput.value = filterOptionsWrapper.querySelector('[data-bs-toggle="tab"]').id
+            }
+            document.getElementById(targetInput.value).click()
         }
-        if(window.location.search.includes('tabCreated')) {
+        if (window.location.search.includes('tabCreated')) {
             targetInput.value = 'tab_saved_views'
+            document.getElementById(targetInput.value).click()
         }
-        document.getElementById(targetInput.value).click()
     }
 }

django_smartbase_admin/static/sb_admin/src/js/table_modules/selection_module.js

@@ -18,15 +18,15 @@ export class SelectionModule extends SBAdminTableModule {
         this.tableSelectedRows = selectedRows
         this.tableDeselectedRows = deselectedRows
         if (selectedRows === this.table.constants.SELECT_ALL_KEYWORD) {
-            tableSelectedRowsInfo.innerHTML = this.table.tabulator.modules.page.remoteRowCountEstimate - deselectedRows.size
+            const count = this.table.tabulator.modules.page.remoteRowCountEstimate - deselectedRows.size
+            tableSelectedRowsInfo.innerHTML = window.sb_admin_translation_strings["selected"].replace('${value}', count)
             return
         }
-        tableSelectedRowsInfo.innerHTML = `${selectedRows.size} selected`
-        if(selectedRows.size > 0) {
+        tableSelectedRowsInfo.innerHTML = window.sb_admin_translation_strings["selected"].replace('${value}', selectedRows.size)
+        if (selectedRows.size > 0) {
             tableSelectedRowsBar.classList.add('show')
             document.getElementById('table-selected-rows-bar-select-all').checked = true
-        }
-        else {
+        } else {
             document.getElementById('table-selected-rows-bar-select-all').checked = false
             tableSelectedRowsBar.classList.remove('show')
         }
@@ -35,11 +35,13 @@ export class SelectionModule extends SBAdminTableModule {
     selectAllData() {
         this.table.tabulator.selectRow('all')
         this.setSelectedRows(this.table.constants.SELECT_ALL_KEYWORD, new Set())
+        document.body.dispatchEvent(new CustomEvent('treeSelectAllRows'))
     }
 
     selectNoData() {
         this.table.tabulator.deselectRow()
         this.setSelectedRows(new Set(), new Set())
+        document.body.dispatchEvent(new CustomEvent('treeDeselectAllRows'))
     }
 
     rowSelectionFormatter(tabulatorFormatterHandle, cell, formatterParams, onRendered) {
@@ -70,8 +72,7 @@ export class SelectionModule extends SBAdminTableModule {
             checkbox.setAttribute("name", `row-select-${this.table.viewId}`)
             label.setAttribute("for", `row-select-${rowData[this.table.tableIdColumnName]}`)
             wrapper.setAttribute("for", `row-select-${rowData[this.table.tableIdColumnName]}`)
-        }
-        else {
+        } else {
             checkbox.setAttribute("id", `row-select-all`)
             label.setAttribute("for", `row-select-all`)
             wrapper.setAttribute("for", `row-select-all`)
@@ -128,7 +129,7 @@ export class SelectionModule extends SBAdminTableModule {
     getUrlParams() {
         const params = {}
         const selectionData = {}
-        const selectedArray = Array.from(this.tableSelectedRows)
+        const selectedArray = this.table.constants.SELECT_ALL_KEYWORD === this.tableSelectedRows ? this.tableSelectedRows : Array.from(this.tableSelectedRows)
         const deselectedArray = Array.from(this.tableDeselectedRows)
         if (selectedArray.length > 0) {
             selectionData[this.table.constants.SELECTED_ROWS_KWARG_NAME] = selectedArray
@@ -149,9 +150,28 @@ export class SelectionModule extends SBAdminTableModule {
     afterInit() {
         this.table.tabulator.on("rowSelected", this.getSelectionHandler("rowSelected"))
         this.table.tabulator.on("rowDeselected", this.getSelectionHandler("rowDeselected"))
+        this.table.tabulator.on("rowSelectionChanged", (data)=> {
+            if(data.length === 0) {
+                document.body.dispatchEvent(new CustomEvent('treeDeselectAllRows'))
+            }
+        })
+        document.body.addEventListener("treeRowSelected", (e) => {
+            const selectedRowIds = this.table.tabulator.getSelectedData().map(rowData => rowData.id)
+            const newSelectedRowIds = e.detail.data
+            const newSelectedRowIdsSet = new Set(e.detail.data)
+
+            const rowIdsToDeselect = selectedRowIds.filter((e) => !newSelectedRowIdsSet.has(e))
+
+            this.table.tabulator.deselectRow(rowIdsToDeselect)
+            this.table.tabulator.selectRow(newSelectedRowIds)
+        })
     }
 
     loadFromUrlAfterInit() {
         this.selectNoData()
     }
+
+    beforeRefreshTableDataIfNotUrlLoad() {
+        this.selectNoData()
+    }
 }

django_smartbase_admin/static/sb_admin/src/js/table_modules/table_params_module.js

@@ -117,6 +117,9 @@ export class TableParamsModule extends SBAdminTableModule {
     }
 
     createPagination(paginationWidget) {
+        if(!paginationWidget) {
+            return
+        }
         const maxPage = this.table.tabulator.getPageMax()
         const currentPage = this.table.tabulator.getPage()
         const currentPageSize = this.table.tabulator.getPageSize()
@@ -242,6 +245,9 @@ export class TableParamsModule extends SBAdminTableModule {
     }
 
     createPageSize(pageSizeWidget) {
+        if(!pageSizeWidget) {
+            return
+        }
         pageSizeWidget.innerHTML = ''
         const pageSizeWrapper = document.createElement('div')
         pageSizeWrapper.classList.add('relative')

django_smartbase_admin/static/sb_admin/src/js/table_modules/views_module.js

@@ -28,6 +28,9 @@ export class ViewsModule extends SBAdminTableModule {
         }
 
         document.querySelectorAll('.js-view-button').forEach((item) => {
+            if(!item.dataset.params) {
+                return
+            }
             const itemParams = JSON.stringify(this.filterParamsForCompare(JSON.parse(item.dataset.params)))
             const sameAsUrlParams = (itemParams === searchParams)
             const sameAsSelectedParams = selectedParams === itemParams
@@ -67,6 +70,9 @@ export class ViewsModule extends SBAdminTableModule {
     }
 
     openView(e, params, view_id) {
+        if (!params) {
+            return
+        }
         if (e.target.closest("svg")) {
             return
         }