tag and no user injectable HTML + }).then(({isConfirmed}) => { + //If the dialog was confirmed, then submit the form. + if (isConfirmed) { + //Set a flag to prevent the dialog from popping up again and allowing turbo to submit the form + that._confirmed = true; - //Create a submit button in the form and click it to submit the form - //Before a submit event was dispatched, but this caused weird issues on Firefox causing the delete request being posted twice (and the second time was returning 404). See https://github.com/Part-DB/Part-DB-server/issues/273 - const submit_btn = document.createElement('button'); - submit_btn.type = 'submit'; - submit_btn.style.display = 'none'; + //Create a submit button in the form and click it to submit the form + //Before a submit event was dispatched, but this caused weird issues on Firefox causing the delete request being posted twice (and the second time was returning 404). See https://github.com/Part-DB/Part-DB-server/issues/273 + const submit_btn = document.createElement('button'); + submit_btn.type = 'submit'; + submit_btn.style.display = 'none'; - //If the clicked button has a value, set it on the submit button - if (submitter.value) { - submit_btn.value = submitter.value; - } - if (submitter.name) { - submit_btn.name = submitter.name; - } - form.appendChild(submit_btn); - submit_btn.click(); - } else { - that._confirmed = false; + //If the clicked button has a value, set it on the submit button + if (submitter.value) { + submit_btn.value = submitter.value; } + if (submitter.name) { + submit_btn.name = submitter.name; + } + form.appendChild(submit_btn); + submit_btn.click(); + } else { + that._confirmed = false; } }); } -} \ No newline at end of file +} diff --git a/assets/controllers/elements/link_confirm_controller.js b/assets/controllers/elements/link_confirm_controller.js index 3d59b492..be226517 100644 --- a/assets/controllers/elements/link_confirm_controller.js +++ b/assets/controllers/elements/link_confirm_controller.js @@ -19,8 +19,7 @@ import {Controller} from "@hotwired/stimulus"; -import * as bootbox from "bootbox"; -import "../../css/components/bootbox_extensions.css"; +import {ConfirmSwal} from "../../helpers/swal"; export default class extends Controller { @@ -53,20 +52,19 @@ export default class extends Controller const that = this; - bootbox.confirm({ - title: this.titleValue, - message: this.messageValue, - callback: (result) => { - if (result) { - //Set a flag to prevent the dialog from popping up again and allowing turbo to submit the form - that._confirmed = true; + ConfirmSwal.fire({ + titleText: this.titleValue, + text: this.messageValue, + }).then(({isConfirmed}) => { + if (isConfirmed) { + //Set a flag to prevent the dialog from popping up again and allowing turbo to submit the form + that._confirmed = true; - //Click the link - that.element.click(); - } else { - that._confirmed = false; - } + //Click the link + that.element.click(); + } else { + that._confirmed = false; } }); } -} \ No newline at end of file +} diff --git a/assets/controllers/elements/password_strength_estimate_controller.js b/assets/controllers/elements/password_strength_estimate_controller.js index d9cfbc87..9ad2da1c 100644 --- a/assets/controllers/elements/password_strength_estimate_controller.js +++ b/assets/controllers/elements/password_strength_estimate_controller.js @@ -19,12 +19,14 @@ import {Controller} from "@hotwired/stimulus"; -import { zxcvbn, zxcvbnOptions } from '@zxcvbn-ts/core'; +import { ZxcvbnFactory } from '@zxcvbn-ts/core'; import * as zxcvbnCommonPackage from '@zxcvbn-ts/language-common'; import * as zxcvbnEnPackage from '@zxcvbn-ts/language-en'; import * as zxcvbnDePackage from '@zxcvbn-ts/language-de'; import * as zxcvbnFrPackage from '@zxcvbn-ts/language-fr'; import * as zxcvbnJaPackage from '@zxcvbn-ts/language-ja'; +import * as zxcvbnItPackage from '@zxcvbn-ts/language-it'; +import * as zxcvbnPlPackage from '@zxcvbn-ts/language-pl'; import {trans} from '../../translator.js'; /* stimulusFetch: 'lazy' */ @@ -34,6 +36,8 @@ export default class extends Controller { static targets = ["badge", "warning"] + _zxcvbnFactory; + _getTranslations() { //Get the current locale const locale = document.documentElement.lang; @@ -43,6 +47,10 @@ export default class extends Controller { return zxcvbnFrPackage.translations; } else if (locale.includes('ja')) { return zxcvbnJaPackage.translations; + } else if (locale.includes('it')) { + return zxcvbnItPackage.translations; + } else if (locale.includes('pl')) { + return zxcvbnPlPackage.translations; } //Fallback to english @@ -56,34 +64,39 @@ export default class extends Controller { //Configure zxcvbn const options = { graphs: zxcvbnCommonPackage.adjacencyGraphs, + useLevenshtein: true, dictionary: { ...zxcvbnCommonPackage.dictionary, // We could use the english dictionary here too, but it is very big. So we just use the common words - //...zxcvbnEnPackage.dictionary, + ...zxcvbnEnPackage.dictionary, + ...zxcvbnDePackage.dictionary, + + "partdb": ['part-db', 'partdb', 'part_db', 'part-db-symfony', 'partdb-symfony', 'part_db_symfony'], }, translations: this._getTranslations(), }; - zxcvbnOptions.setOptions(options); + + this._zxcvbnFactory = new ZxcvbnFactory(options); //Add event listener to the password input field this._passwordInput.addEventListener('input', this._onPasswordInput.bind(this)); } - _onPasswordInput() { + async _onPasswordInput() { //Retrieve the password const password = this._passwordInput.value; //Estimate the password strength - const result = zxcvbn(password); + const result = await this._zxcvbnFactory.checkAsync(password); //Update the badge this.badgeTarget.parentElement.classList.remove("d-none"); - this._setBadgeToLevel(result.score); + this._setBadgeToLevel(result.score, result.crackTimes.onlineNoThrottlingXPerSecond.display); this.warningTarget.innerHTML = result.feedback.warning; } - _setBadgeToLevel(level) { + _setBadgeToLevel(level, time = null) { let text, classes; switch (level) { @@ -118,5 +131,11 @@ export default class extends Controller { //Re-add the classes this.badgeTarget.classList.add("badge"); this.badgeTarget.classList.add(...classes.split(" ")); + + if (time) { + this.badgeTarget.setAttribute("title", trans("user.password_strength.crack_time", {"%time%": time})); + } else { + this.badgeTarget.removeAttribute("title"); + } } } diff --git a/assets/controllers/pages/reelCalculator_controller.js b/assets/controllers/pages/reelCalculator_controller.js index a134bf9b..e0b2c4ba 100644 --- a/assets/controllers/pages/reelCalculator_controller.js +++ b/assets/controllers/pages/reelCalculator_controller.js @@ -18,7 +18,7 @@ */ import {Controller} from "@hotwired/stimulus"; -import * as bootbox from "bootbox"; +import {AlertSwal} from "../../helpers/swal"; export default class extends Controller { @@ -35,12 +35,12 @@ export default class extends Controller { const part_distance = document.getElementById('reel_part_distance').value; if (dia_inner == "" || dia_outer == "" || tape_thickness == "") { - bootbox.alert(this.errorMissingValuesValue); + AlertSwal.fire({title: this.errorMissingValuesValue}); return; } if (dia_outer**dia_outer < dia_inner**dia_inner) { - bootbox.alert(this.errorOuterGreaterInnerValue); + AlertSwal.fire({title: this.errorOuterGreaterInnerValue}); return; } @@ -61,12 +61,12 @@ export default class extends Controller { return; } - var parts_per_meter = 1 / (part_distance / 1000); + const parts_per_meter = 1 / (part_distance / 1000); document.getElementById('result_parts_per_meter').textContent = parts_per_meter.toFixed(2) + ' 1/m'; - var parts_amount = (length/1000) * parts_per_meter; + const parts_amount = (length / 1000) * parts_per_meter; - document.getElementById('result_amount').textContent = Math.floor(parts_amount); + document.getElementById('result_amount').textContent = Math.floor(parts_amount).toString(); } -} \ No newline at end of file +} diff --git a/assets/css/components/swal.css b/assets/css/components/swal.css new file mode 100644 index 00000000..4c2302a9 --- /dev/null +++ b/assets/css/components/swal.css @@ -0,0 +1,50 @@ +/* + * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony). + * + * Copyright (C) 2019 - 2026 Jan Böhmer (https://github.com/jbtronics) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see
`; - msg += 'Try to reload the page or contact the administrator if this error persists.'; + const title = `${statusText} (HTTP ${statusCode})`; + const friendlyMsg = userFriendlyMessages[String(statusCode)] + ?? 'An unexpected error occurred. Please try again or contact the administrator.'; - msg += '
' + 'View details' + ""; - msg += ""; + const short_location = location.length > 80 + ? location.substring(0, 80) + '…' + : location; - return msg; - }, - title: title, - callback: function () { - //Remove blur - $('#content').removeClass('loading-content'); - } + const msg = ` +
${friendlyMsg}
+If this error keeps happening, please contact your administrator.
+ +
+
+
`;
- });
+ const footer = `Error while loading: ${short_location}`;
- alert.init(function (){
- var dstFrame = document.getElementById('error-iframe');
- //@ts-ignore
- var dstDoc = dstFrame.contentDocument || dstFrame.contentWindow.document;
- dstDoc.write(responseHTML)
- dstDoc.close();
+ Swal.fire({
+ icon: 'error',
+ title: title,
+ html: msg,
+ footer: footer,
+ width: '90%',
+ confirmButtonText: 'Reload page',
+ showCancelButton: true,
+ cancelButtonText: 'Close',
+ showCloseButton: true,
+ reverseButtons: true,
+ didOpen: () => {
+ const dstFrame = document.getElementById('error-iframe');
+ //@ts-ignore
+ const dstDoc = dstFrame.contentDocument || dstFrame.contentWindow.document;
+ dstDoc.write(responseHTML);
+ dstDoc.close();
+ },
+ }).then((result) => {
+ document.getElementById('content').classList.remove('loading-content');
+ if (result.isConfirmed) {
+ window.location.reload();
+ }
});
}
@@ -171,4 +174,4 @@ class ErrorHandlerHelper {
}
}
-export default new ErrorHandlerHelper();
\ No newline at end of file
+export default new ErrorHandlerHelper();
diff --git a/assets/js/lib/dataTables.select.mjs b/assets/js/lib/dataTables.select.mjs
deleted file mode 100644
index bba97692..00000000
--- a/assets/js/lib/dataTables.select.mjs
+++ /dev/null
@@ -1,1538 +0,0 @@
-/*********************
- * This is the fixed version of the select extension for DataTables with the fix for the issue with the select extension
- * (https://github.com/DataTables/Select/issues/51)
- * We use this instead of the yarn version until the PR (https://github.com/DataTables/Select/pull/52) is merged and released
- * /*******************/
-
-
-/*! Select for DataTables 2.0.0
- * © SpryMedia Ltd - datatables.net/license/mit
- */
-
-import jQuery from 'jquery';
-import DataTable from 'datatables.net';
-
-// Allow reassignment of the $ variable
-let $ = jQuery;
-
-
-// Version information for debugger
-DataTable.select = {};
-
-DataTable.select.version = '2.0.0';
-
-DataTable.select.init = function (dt) {
- var ctx = dt.settings()[0];
-
- if (!DataTable.versionCheck('2')) {
- throw 'Warning: Select requires DataTables 2 or newer';
- }
-
- if (ctx._select) {
- return;
- }
-
- var savedSelected = dt.state.loaded();
-
- var selectAndSave = function (e, settings, data) {
- if (data === null || data.select === undefined) {
- return;
- }
-
- // Clear any currently selected rows, before restoring state
- // None will be selected on first initialisation
- if (dt.rows({ selected: true }).any()) {
- dt.rows().deselect();
- }
- if (data.select.rows !== undefined) {
- dt.rows(data.select.rows).select();
- }
-
- if (dt.columns({ selected: true }).any()) {
- dt.columns().deselect();
- }
- if (data.select.columns !== undefined) {
- dt.columns(data.select.columns).select();
- }
-
- if (dt.cells({ selected: true }).any()) {
- dt.cells().deselect();
- }
- if (data.select.cells !== undefined) {
- for (var i = 0; i < data.select.cells.length; i++) {
- dt.cell(data.select.cells[i].row, data.select.cells[i].column).select();
- }
- }
-
- dt.state.save();
- };
-
- dt.on('stateSaveParams', function (e, settings, data) {
- data.select = {};
- data.select.rows = dt.rows({ selected: true }).ids(true).toArray();
- data.select.columns = dt.columns({ selected: true })[0];
- data.select.cells = dt.cells({ selected: true })[0].map(function (coords) {
- return { row: dt.row(coords.row).id(true), column: coords.column };
- });
- })
- .on('stateLoadParams', selectAndSave)
- .one('init', function () {
- selectAndSave(undefined, undefined, savedSelected);
- });
-
- var init = ctx.oInit.select;
- var defaults = DataTable.defaults.select;
- var opts = init === undefined ? defaults : init;
-
- // Set defaults
- var items = 'row';
- var style = 'api';
- var blurable = false;
- var toggleable = true;
- var info = true;
- var selector = 'td, th';
- var className = 'selected';
- var headerCheckbox = true;
- var setStyle = false;
-
- ctx._select = {
- infoEls: []
- };
-
- // Initialisation customisations
- if (opts === true) {
- style = 'os';
- setStyle = true;
- }
- else if (typeof opts === 'string') {
- style = opts;
- setStyle = true;
- }
- else if ($.isPlainObject(opts)) {
- if (opts.blurable !== undefined) {
- blurable = opts.blurable;
- }
-
- if (opts.toggleable !== undefined) {
- toggleable = opts.toggleable;
- }
-
- if (opts.info !== undefined) {
- info = opts.info;
- }
-
- if (opts.items !== undefined) {
- items = opts.items;
- }
-
- if (opts.style !== undefined) {
- style = opts.style;
- setStyle = true;
- }
- else {
- style = 'os';
- setStyle = true;
- }
-
- if (opts.selector !== undefined) {
- selector = opts.selector;
- }
-
- if (opts.className !== undefined) {
- className = opts.className;
- }
-
- if (opts.headerCheckbox !== undefined) {
- headerCheckbox = opts.headerCheckbox;
- }
- }
-
- dt.select.selector(selector);
- dt.select.items(items);
- dt.select.style(style);
- dt.select.blurable(blurable);
- dt.select.toggleable(toggleable);
- dt.select.info(info);
- ctx._select.className = className;
-
- // If the init options haven't enabled select, but there is a selectable
- // class name, then enable
- if (!setStyle && $(dt.table().node()).hasClass('selectable')) {
- dt.select.style('os');
- }
-
- // Insert a checkbox into the header if needed - might need to wait
- // for init complete, or it might already be done
- if (headerCheckbox) {
- initCheckboxHeader(dt);
-
- dt.on('init', function () {
- initCheckboxHeader(dt);
- });
- }
-};
-
-/*
-
-Select is a collection of API methods, event handlers, event emitters and
-buttons (for the `Buttons` extension) for DataTables. It provides the following
-features, with an overview of how they are implemented:
-
-## Selection of rows, columns and cells. Whether an item is selected or not is
- stored in:
-
-* rows: a `_select_selected` property which contains a boolean value of the
- DataTables' `aoData` object for each row
-* columns: a `_select_selected` property which contains a boolean value of the
- DataTables' `aoColumns` object for each column
-* cells: a `_selected_cells` property which contains an array of boolean values
- of the `aoData` object for each row. The array is the same length as the
- columns array, with each element of it representing a cell.
-
-This method of using boolean flags allows Select to operate when nodes have not
-been created for rows / cells (DataTables' defer rendering feature).
-
-## API methods
-
-A range of API methods are available for triggering selection and de-selection
-of rows. Methods are also available to configure the selection events that can
-be triggered by an end user (such as which items are to be selected). To a large
-extent, these of API methods *is* Select. It is basically a collection of helper
-functions that can be used to select items in a DataTable.
-
-Configuration of select is held in the object `_select` which is attached to the
-DataTables settings object on initialisation. Select being available on a table
-is not optional when Select is loaded, but its default is for selection only to
-be available via the API - so the end user wouldn't be able to select rows
-without additional configuration.
-
-The `_select` object contains the following properties:
-
-```
-{
- items:string - Can be `rows`, `columns` or `cells`. Defines what item
- will be selected if the user is allowed to activate row
- selection using the mouse.
- style:string - Can be `none`, `single`, `multi` or `os`. Defines the
- interaction style when selecting items
- blurable:boolean - If row selection can be cleared by clicking outside of
- the table
- toggleable:boolean - If row selection can be cancelled by repeated clicking
- on the row
- info:boolean - If the selection summary should be shown in the table
- information elements
- infoEls:element[] - List of HTML elements with info elements for a table
-}
-```
-
-In addition to the API methods, Select also extends the DataTables selector
-options for rows, columns and cells adding a `selected` option to the selector
-options object, allowing the developer to select only selected items or
-unselected items.
-
-## Mouse selection of items
-
-Clicking on items can be used to select items. This is done by a simple event
-handler that will select the items using the API methods.
-
- */
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Local functions
- */
-
-/**
- * Add one or more cells to the selection when shift clicking in OS selection
- * style cell selection.
- *
- * Cell range is more complicated than row and column as we want to select
- * in the visible grid rather than by index in sequence. For example, if you
- * click first in cell 1-1 and then shift click in 2-2 - cells 1-2 and 2-1
- * should also be selected (and not 1-3, 1-4. etc)
- *
- * @param {DataTable.Api} dt DataTable
- * @param {object} idx Cell index to select to
- * @param {object} last Cell index to select from
- * @private
- */
-function cellRange(dt, idx, last) {
- var indexes;
- var columnIndexes;
- var rowIndexes;
- var selectColumns = function (start, end) {
- if (start > end) {
- var tmp = end;
- end = start;
- start = tmp;
- }
-
- var record = false;
- return dt
- .columns(':visible')
- .indexes()
- .filter(function (i) {
- if (i === start) {
- record = true;
- }
-
- if (i === end) {
- // not else if, as start might === end
- record = false;
- return true;
- }
-
- return record;
- });
- };
-
- var selectRows = function (start, end) {
- var indexes = dt.rows({ search: 'applied' }).indexes();
-
- // Which comes first - might need to swap
- if (indexes.indexOf(start) > indexes.indexOf(end)) {
- var tmp = end;
- end = start;
- start = tmp;
- }
-
- var record = false;
- return indexes.filter(function (i) {
- if (i === start) {
- record = true;
- }
-
- if (i === end) {
- record = false;
- return true;
- }
-
- return record;
- });
- };
-
- if (!dt.cells({ selected: true }).any() && !last) {
- // select from the top left cell to this one
- columnIndexes = selectColumns(0, idx.column);
- rowIndexes = selectRows(0, idx.row);
- }
- else {
- // Get column indexes between old and new
- columnIndexes = selectColumns(last.column, idx.column);
- rowIndexes = selectRows(last.row, idx.row);
- }
-
- indexes = dt.cells(rowIndexes, columnIndexes).flatten();
-
- if (!dt.cells(idx, { selected: true }).any()) {
- // Select range
- dt.cells(indexes).select();
- }
- else {
- // Deselect range
- dt.cells(indexes).deselect();
- }
-}
-
-/**
- * Disable mouse selection by removing the selectors
- *
- * @param {DataTable.Api} dt DataTable to remove events from
- * @private
- */
-function disableMouseSelection(dt) {
- var ctx = dt.settings()[0];
- var selector = ctx._select.selector;
-
- $(dt.table().container())
- .off('mousedown.dtSelect', selector)
- .off('mouseup.dtSelect', selector)
- .off('click.dtSelect', selector);
-
- $('body').off('click.dtSelect' + _safeId(dt.table().node()));
-}
-
-/**
- * Attach mouse listeners to the table to allow mouse selection of items
- *
- * @param {DataTable.Api} dt DataTable to remove events from
- * @private
- */
-function enableMouseSelection(dt) {
- var container = $(dt.table().container());
- var ctx = dt.settings()[0];
- var selector = ctx._select.selector;
- var matchSelection;
-
- container
- .on('mousedown.dtSelect', selector, function (e) {
- // Disallow text selection for shift clicking on the table so multi
- // element selection doesn't look terrible!
- if (e.shiftKey || e.metaKey || e.ctrlKey) {
- container
- .css('-moz-user-select', 'none')
- .one('selectstart.dtSelect', selector, function () {
- return false;
- });
- }
-
- if (window.getSelection) {
- matchSelection = window.getSelection();
- }
- })
- .on('mouseup.dtSelect', selector, function () {
- // Allow text selection to occur again, Mozilla style (tested in FF
- // 35.0.1 - still required)
- container.css('-moz-user-select', '');
- })
- .on('click.dtSelect', selector, function (e) {
- var items = dt.select.items();
- var idx;
-
- // If text was selected (click and drag), then we shouldn't change
- // the row's selected state
- if (matchSelection) {
- var selection = window.getSelection();
-
- // If the element that contains the selection is not in the table, we can ignore it
- // This can happen if the developer selects text from the click event
- if (
- !selection.anchorNode ||
- $(selection.anchorNode).closest('table')[0] === dt.table().node()
- ) {
- if (selection !== matchSelection) {
- return;
- }
- }
- }
-
- var ctx = dt.settings()[0];
- var container = dt.table().container();
-
- // Ignore clicks inside a sub-table
- if ($(e.target).closest('div.dt-container')[0] != container) {
- return;
- }
-
- var cell = dt.cell($(e.target).closest('td, th'));
-
- // Check the cell actually belongs to the host DataTable (so child
- // rows, etc, are ignored)
- if (!cell.any()) {
- return;
- }
-
- var event = $.Event('user-select.dt');
- eventTrigger(dt, event, [items, cell, e]);
-
- if (event.isDefaultPrevented()) {
- return;
- }
-
- var cellIndex = cell.index();
- if (items === 'row') {
- idx = cellIndex.row;
- typeSelect(e, dt, ctx, 'row', idx);
- }
- else if (items === 'column') {
- idx = cell.index().column;
- typeSelect(e, dt, ctx, 'column', idx);
- }
- else if (items === 'cell') {
- idx = cell.index();
- typeSelect(e, dt, ctx, 'cell', idx);
- }
-
- ctx._select_lastCell = cellIndex;
- });
-
- // Blurable
- $('body').on('click.dtSelect' + _safeId(dt.table().node()), function (e) {
- if (ctx._select.blurable) {
- // If the click was inside the DataTables container, don't blur
- if ($(e.target).parents().filter(dt.table().container()).length) {
- return;
- }
-
- // Ignore elements which have been removed from the DOM (i.e. paging
- // buttons)
- if ($(e.target).parents('html').length === 0) {
- return;
- }
-
- // Don't blur in Editor form
- if ($(e.target).parents('div.DTE').length) {
- return;
- }
-
- var event = $.Event('select-blur.dt');
- eventTrigger(dt, event, [e.target, e]);
-
- if (event.isDefaultPrevented()) {
- return;
- }
-
- clear(ctx, true);
- }
- });
-}
-
-/**
- * Trigger an event on a DataTable
- *
- * @param {DataTable.Api} api DataTable to trigger events on
- * @param {boolean} selected true if selected, false if deselected
- * @param {string} type Item type acting on
- * @param {boolean} any Require that there are values before
- * triggering
- * @private
- */
-function eventTrigger(api, type, args, any) {
- if (any && !api.flatten().length) {
- return;
- }
-
- if (typeof type === 'string') {
- type = type + '.dt';
- }
-
- args.unshift(api);
-
- $(api.table().node()).trigger(type, args);
-}
-
-/**
- * Update the information element of the DataTable showing information about the
- * items selected. This is done by adding tags to the existing text
- *
- * @param {DataTable.Api} api DataTable to update
- * @private
- */
-function info(api, node) {
- if (api.select.style() === 'api' || api.select.info() === false) {
- return;
- }
-
- var rows = api.rows({ selected: true }).flatten().length;
- var columns = api.columns({ selected: true }).flatten().length;
- var cells = api.cells({ selected: true }).flatten().length;
-
- var add = function (el, name, num) {
- el.append(
- $('').append(
- api.i18n(
- 'select.' + name + 's',
- { _: '%d ' + name + 's selected', 0: '', 1: '1 ' + name + ' selected' },
- num
- )
- )
- );
- };
-
- var el = $(node);
- var output = $('');
-
- add(output, 'row', rows);
- add(output, 'column', columns);
- add(output, 'cell', cells);
-
- var existing = el.children('span.select-info');
-
- if (existing.length) {
- existing.remove();
- }
-
- if (output.text() !== '') {
- el.append(output);
- }
-}
-
-/**
- * Add a checkbox to the header for checkbox columns, allowing all rows to
- * be selected, deselected or just to show the state.
- *
- * @param {*} dt API
- */
-function initCheckboxHeader( dt ) {
- // Find any checkbox column(s)
- dt.columns('.dt-select').every(function () {
- var header = this.header();
-
- if (! $('input', header).length) {
- // If no checkbox yet, insert one
- var input = $('')
- .attr({
- class: 'dt-select-checkbox',
- type: 'checkbox',
- 'aria-label': dt.i18n('select.aria.headerCheckbox') || 'Select all rows'
- })
- .appendTo(header)
- .on('change', function () {
- if (this.checked) {
- dt.rows({search: 'applied'}).select();
- }
- else {
- dt.rows({selected: true}).deselect();
- }
- })
- .on('click', function (e) {
- e.stopPropagation();
- });
-
- // Update the header checkbox's state when the selection in the
- // table changes
- dt.on('draw select deselect', function (e, pass, type) {
- if (type === 'row' || ! type) {
- var count = dt.rows({selected: true}).count();
- var search = dt.rows({search: 'applied', selected: true}).count();
- var available = dt.rows({search: 'applied'}).count();
-
- if (search && search <= count && search === available) {
- input
- .prop('checked', true)
- .prop('indeterminate', false);
- }
- else if (search === 0 && count === 0) {
- input
- .prop('checked', false)
- .prop('indeterminate', false);
- }
- else {
- input
- .prop('checked', false)
- .prop('indeterminate', true);
- }
- }
- });
- }
- });
-}
-
-/**
- * Initialisation of a new table. Attach event handlers and callbacks to allow
- * Select to operate correctly.
- *
- * This will occur _after_ the initial DataTables initialisation, although
- * before Ajax data is rendered, if there is ajax data
- *
- * @param {DataTable.settings} ctx Settings object to operate on
- * @private
- */
-function init(ctx) {
- var api = new DataTable.Api(ctx);
- ctx._select_init = true;
-
- // Row callback so that classes can be added to rows and cells if the item
- // was selected before the element was created. This will happen with the
- // `deferRender` option enabled.
- //
- // This method of attaching to `aoRowCreatedCallback` is a hack until
- // DataTables has proper events for row manipulation If you are reviewing
- // this code to create your own plug-ins, please do not do this!
- ctx.aoRowCreatedCallback.push(function (row, data, index) {
- var i, ien;
- var d = ctx.aoData[index];
-
- // Row
- if (d._select_selected) {
- $(row).addClass(ctx._select.className);
- }
-
- // Cells and columns - if separated out, we would need to do two
- // loops, so it makes sense to combine them into a single one
- for (i = 0, ien = ctx.aoColumns.length; i < ien; i++) {
- if (
- ctx.aoColumns[i]._select_selected ||
- (d._selected_cells && d._selected_cells[i])
- ) {
- $(d.anCells[i]).addClass(ctx._select.className);
- }
- }
- }
- );
-
- // On Ajax reload we want to reselect all rows which are currently selected,
- // if there is an rowId (i.e. a unique value to identify each row with)
- api.on('preXhr.dt.dtSelect', function (e, settings) {
- if (settings !== api.settings()[0]) {
- // Not triggered by our DataTable!
- return;
- }
-
- // note that column selection doesn't need to be cached and then
- // reselected, as they are already selected
- var rows = api
- .rows({ selected: true })
- .ids(true)
- .filter(function (d) {
- return d !== undefined;
- });
-
- var cells = api
- .cells({ selected: true })
- .eq(0)
- .map(function (cellIdx) {
- var id = api.row(cellIdx.row).id(true);
- return id ? { row: id, column: cellIdx.column } : undefined;
- })
- .filter(function (d) {
- return d !== undefined;
- });
-
- // On the next draw, reselect the currently selected items
- api.one('draw.dt.dtSelect', function () {
- api.rows(rows).select();
-
- // `cells` is not a cell index selector, so it needs a loop
- if (cells.any()) {
- cells.each(function (id) {
- api.cells(id.row, id.column).select();
- });
- }
- });
- });
-
- // Update the table information element with selected item summary
- api.on('info.dt', function (e, ctx, node) {
- // Store the info node for updating on select / deselect
- if (!ctx._select.infoEls.includes(node)) {
- ctx._select.infoEls.push(node);
- }
-
- info(api, node);
- });
-
- api.on('select.dtSelect.dt deselect.dtSelect.dt', function () {
- ctx._select.infoEls.forEach(function (el) {
- info(api, el);
- });
-
- api.state.save();
- });
-
- // Clean up and release
- api.on('destroy.dtSelect', function () {
- // Remove class directly rather than calling deselect - which would trigger events
- $(api.rows({ selected: true }).nodes()).removeClass(api.settings()[0]._select.className);
-
- disableMouseSelection(api);
- api.off('.dtSelect');
- $('body').off('.dtSelect' + _safeId(api.table().node()));
- });
-}
-
-/**
- * Add one or more items (rows or columns) to the selection when shift clicking
- * in OS selection style
- *
- * @param {DataTable.Api} dt DataTable
- * @param {string} type Row or column range selector
- * @param {object} idx Item index to select to
- * @param {object} last Item index to select from
- * @private
- */
-function rowColumnRange(dt, type, idx, last) {
- // Add a range of rows from the last selected row to this one
- var indexes = dt[type + 's']({ search: 'applied' }).indexes();
- var idx1 = indexes.indexOf(last);
- var idx2 = indexes.indexOf(idx);
-
- if (!dt[type + 's']({ selected: true }).any() && idx1 === -1) {
- // select from top to here - slightly odd, but both Windows and Mac OS
- // do this
- indexes.splice(indexes.indexOf(idx) + 1, indexes.length);
- }
- else {
- // reverse so we can shift click 'up' as well as down
- if (idx1 > idx2) {
- var tmp = idx2;
- idx2 = idx1;
- idx1 = tmp;
- }
-
- indexes.splice(idx2 + 1, indexes.length);
- indexes.splice(0, idx1);
- }
-
- if (!dt[type](idx, { selected: true }).any()) {
- // Select range
- dt[type + 's'](indexes).select();
- }
- else {
- // Deselect range - need to keep the clicked on row selected
- indexes.splice(indexes.indexOf(idx), 1);
- dt[type + 's'](indexes).deselect();
- }
-}
-
-/**
- * Clear all selected items
- *
- * @param {DataTable.settings} ctx Settings object of the host DataTable
- * @param {boolean} [force=false] Force the de-selection to happen, regardless
- * of selection style
- * @private
- */
-function clear(ctx, force) {
- if (force || ctx._select.style === 'single') {
- var api = new DataTable.Api(ctx);
-
- api.rows({ selected: true }).deselect();
- api.columns({ selected: true }).deselect();
- api.cells({ selected: true }).deselect();
- }
-}
-
-/**
- * Select items based on the current configuration for style and items.
- *
- * @param {object} e Mouse event object
- * @param {DataTables.Api} dt DataTable
- * @param {DataTable.settings} ctx Settings object of the host DataTable
- * @param {string} type Items to select
- * @param {int|object} idx Index of the item to select
- * @private
- */
-function typeSelect(e, dt, ctx, type, idx) {
- var style = dt.select.style();
- var toggleable = dt.select.toggleable();
- var isSelected = dt[type](idx, { selected: true }).any();
-
- if (isSelected && !toggleable) {
- return;
- }
-
- if (style === 'os') {
- if (e.ctrlKey || e.metaKey) {
- // Add or remove from the selection
- dt[type](idx).select(!isSelected);
- }
- else if (e.shiftKey) {
- if (type === 'cell') {
- cellRange(dt, idx, ctx._select_lastCell || null);
- }
- else {
- rowColumnRange(
- dt,
- type,
- idx,
- ctx._select_lastCell ? ctx._select_lastCell[type] : null
- );
- }
- }
- else {
- // No cmd or shift click - deselect if selected, or select
- // this row only
- var selected = dt[type + 's']({ selected: true });
-
- if (isSelected && selected.flatten().length === 1) {
- dt[type](idx).deselect();
- }
- else {
- selected.deselect();
- dt[type](idx).select();
- }
- }
- }
- else if (style == 'multi+shift') {
- if (e.shiftKey) {
- if (type === 'cell') {
- cellRange(dt, idx, ctx._select_lastCell || null);
- }
- else {
- rowColumnRange(
- dt,
- type,
- idx,
- ctx._select_lastCell ? ctx._select_lastCell[type] : null
- );
- }
- }
- else {
- dt[type](idx).select(!isSelected);
- }
- }
- else {
- dt[type](idx).select(!isSelected);
- }
-}
-
-function _safeId(node) {
- return node.id.replace(/[^a-zA-Z0-9\-\_]/g, '-');
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * DataTables selectors
- */
-
-// row and column are basically identical just assigned to different properties
-// and checking a different array, so we can dynamically create the functions to
-// reduce the code size
-$.each(
- [
- { type: 'row', prop: 'aoData' },
- { type: 'column', prop: 'aoColumns' }
- ],
- function (i, o) {
- DataTable.ext.selector[o.type].push(function (settings, opts, indexes) {
- var selected = opts.selected;
- var data;
- var out = [];
-
- if (selected !== true && selected !== false) {
- return indexes;
- }
-
- for (var i = 0, ien = indexes.length; i < ien; i++) {
- data = settings[o.prop][indexes[i]];
-
- if (
- data && (
- (selected === true && data._select_selected === true) ||
- (selected === false && !data._select_selected)
- )
- ) {
- out.push(indexes[i]);
- }
- }
-
- return out;
- });
- }
-);
-
-DataTable.ext.selector.cell.push(function (settings, opts, cells) {
- var selected = opts.selected;
- var rowData;
- var out = [];
-
- if (selected === undefined) {
- return cells;
- }
-
- for (var i = 0, ien = cells.length; i < ien; i++) {
- rowData = settings.aoData[cells[i].row];
-
- if (
- rowData && (
- (selected === true &&
- rowData._selected_cells &&
- rowData._selected_cells[cells[i].column] === true) ||
- (selected === false &&
- (!rowData._selected_cells || !rowData._selected_cells[cells[i].column]))
- )
- ) {
- out.push(cells[i]);
- }
- }
-
- return out;
-});
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * DataTables API
- *
- * For complete documentation, please refer to the docs/api directory or the
- * DataTables site
- */
-
-// Local variables to improve compression
-var apiRegister = DataTable.Api.register;
-var apiRegisterPlural = DataTable.Api.registerPlural;
-
-apiRegister('select()', function () {
- return this.iterator('table', function (ctx) {
- DataTable.select.init(new DataTable.Api(ctx));
- });
-});
-
-apiRegister('select.blurable()', function (flag) {
- if (flag === undefined) {
- return this.context[0]._select.blurable;
- }
-
- return this.iterator('table', function (ctx) {
- ctx._select.blurable = flag;
- });
-});
-
-apiRegister('select.toggleable()', function (flag) {
- if (flag === undefined) {
- return this.context[0]._select.toggleable;
- }
-
- return this.iterator('table', function (ctx) {
- ctx._select.toggleable = flag;
- });
-});
-
-apiRegister('select.info()', function (flag) {
- if (flag === undefined) {
- return this.context[0]._select.info;
- }
-
- return this.iterator('table', function (ctx) {
- ctx._select.info = flag;
- });
-});
-
-apiRegister('select.items()', function (items) {
- if (items === undefined) {
- return this.context[0]._select.items;
- }
-
- return this.iterator('table', function (ctx) {
- ctx._select.items = items;
-
- eventTrigger(new DataTable.Api(ctx), 'selectItems', [items]);
- });
-});
-
-// Takes effect from the _next_ selection. None disables future selection, but
-// does not clear the current selection. Use the `deselect` methods for that
-apiRegister('select.style()', function (style) {
- if (style === undefined) {
- return this.context[0]._select.style;
- }
-
- return this.iterator('table', function (ctx) {
- if (!ctx._select) {
- DataTable.select.init(new DataTable.Api(ctx));
- }
-
- if (!ctx._select_init) {
- init(ctx);
- }
-
- ctx._select.style = style;
-
- // Add / remove mouse event handlers. They aren't required when only
- // API selection is available
- var dt = new DataTable.Api(ctx);
- disableMouseSelection(dt);
-
- if (style !== 'api') {
- enableMouseSelection(dt);
- }
-
- eventTrigger(new DataTable.Api(ctx), 'selectStyle', [style]);
- });
-});
-
-apiRegister('select.selector()', function (selector) {
- if (selector === undefined) {
- return this.context[0]._select.selector;
- }
-
- return this.iterator('table', function (ctx) {
- disableMouseSelection(new DataTable.Api(ctx));
-
- ctx._select.selector = selector;
-
- if (ctx._select.style !== 'api') {
- enableMouseSelection(new DataTable.Api(ctx));
- }
- });
-});
-
-apiRegister('select.last()', function (set) {
- let ctx = this.context[0];
-
- if (set) {
- ctx._select_lastCell = set;
- return this;
- }
-
- return ctx._select_lastCell;
-});
-
-apiRegisterPlural('rows().select()', 'row().select()', function (select) {
- var api = this;
-
- if (select === false) {
- return this.deselect();
- }
-
- this.iterator('row', function (ctx, idx) {
- clear(ctx);
-
- // There is a good amount of knowledge of DataTables internals in
- // this function. It _could_ be done without that, but it would hurt
- // performance (or DT would need new APIs for this work)
- var dtData = ctx.aoData[idx];
- var dtColumns = ctx.aoColumns;
-
- $(dtData.nTr).addClass(ctx._select.className);
- dtData._select_selected = true;
-
- for (var i=0 ; iwith a line break - + + # To prevent HTTP Host header attacks, set this to a regex matching all host names Part-DB should be reachable under. + # By default (unset) Part-DB accepts requests for any host name, which is not recommended for production use. + # IMPORTANT: Unlike in .env files, the value here must NOT be wrapped in quotes. + # - TRUSTED_HOSTS=^(part-db\.example\.invalid)$ + # If you need to install additional composer packages (e.g., for specific mailer transports), you can specify them here: # - COMPOSER_EXTRA_PACKAGES=symfony/mailgun-mailer symfony/sendgrid-mailer diff --git a/docs/installation/installation_guide-debian.md b/docs/installation/installation_guide-debian.md index e9f500b8..77ea8020 100644 --- a/docs/installation/installation_guide-debian.md +++ b/docs/installation/installation_guide-debian.md @@ -1,13 +1,13 @@ --- -title: Direct Installation on Debian 12 +title: Direct Installation on Debian 13 layout: default parent: Installation nav_order: 4 --- -# Part-DB installation guide for Debian 12 (Bookworm) +# Part-DB installation guide for Debian 13 (Trixie) -This guide shows you how to install Part-DB directly on Debian 12 using apache2 and SQLite. This guide should work with +This guide shows you how to install Part-DB directly on Debian 13 using apache2 and SQLite. This guide should work with recent Ubuntu and other Debian-based distributions with little to no changes. Depending on what you want to do, using the prebuilt docker images may be a better choice, as you don't need to install this many dependencies. See [here]({% link installation/installation_docker.md %}) for more information on the docker @@ -45,10 +45,10 @@ compatibility. Install PHP with required extensions and apache2: ```bash -sudo apt install apache2 php8.2 libapache2-mod-php8.2 \ - php8.2-opcache php8.2-curl php8.2-gd php8.2-mbstring \ - php8.2-xml php8.2-bcmath php8.2-intl php8.2-zip php8.2-xsl \ - php8.2-sqlite3 php8.2-mysql +sudo apt install apache2 php8.4 libapache2-mod-php8.4 \ + php8.4-opcache php8.4-curl php8.4-gd php8.4-mbstring \ + php8.4-xml php8.4-bcmath php8.4-intl php8.4-zip php8.4-xsl \ + php8.4-sqlite3 php8.4-mysql ``` ### Install composer @@ -145,6 +145,16 @@ A full list of configuration options can be found [here](../configuration.md). > ``` > or edit the file with a text editor and add a new value for `APP_SECRET` (you can generate a random value with `openssl rand -hex 32`). +{: .important } +> **Set `TRUSTED_HOSTS` before going live.** By default Part-DB accepts requests for any host name, which makes it +> vulnerable to `HTTP Host header attacks`. Edit your `.env.local` with a text editor and set `TRUSTED_HOSTS` to a +> regex matching all host names Part-DB should be reachable under, e.g. if Part-DB should only be reachable via +> `part-db.example.invalid`: +> ``` +> TRUSTED_HOSTS='^(part-db\.example\.invalid)$' +> ``` +> See the [configuration options](../configuration.md) page for more information about `TRUSTED_HOSTS`. + Please check that the configured base currency matches your mainly used currency, as this can not be changed after creating price information. @@ -232,7 +242,7 @@ sudo ln -s /etc/apache2/sites-available/partdb.conf /etc/apache2/sites-enabled/p Configure apache to show pretty URL paths for Part-DB (`/label/dialog` instead of `/index.php/label/dialog`): ```bash -sudo a2enmod rewrite +sudo a2enmod rewrite headers ``` If you want to access Part-DB via the IP-Address of the server, instead of the domain name, you have to remove the @@ -291,7 +301,7 @@ sudo -u www-data php bin/console cache:clear ## MySQL/MariaDB database To use a MySQL database, follow the steps from above (except the creation of the database, we will do this later). -Debian 12 does not ship MySQL in its repositories anymore, so we use the compatible MariaDB instead: +Debian does not ship MySQL in its repositories anymore, so we use the compatible MariaDB instead: 1. Install maria-db with: diff --git a/docs/installation/nginx.md b/docs/installation/nginx.md index 981c18d5..1ae1d32c 100644 --- a/docs/installation/nginx.md +++ b/docs/installation/nginx.md @@ -36,6 +36,10 @@ server { root /var/www/partdb/public; location / { + # Headers are set here for static assets. PHP responses are served via the index.php location + # below and inherit neither of these headers, so Nelmio's PHP-side CSP is unaffected. + add_header Content-Security-Policy "default-src 'self'; script-src 'none'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; sandbox;" always; + add_header X-Content-Type-Options "nosniff" always; try_files $uri /index.php$is_args$args; } @@ -57,10 +61,12 @@ server { location ~* ^/media/.*\.(php[3-8]?|phar|phtml|pht|phps)$ { return 403; } - - # Set Content-Security-Policy for svg files, to block embedded javascript in there + + # SVG files get a slightly different CSP because they can embed resources and must not be framed. + # This regex location takes precedence over location /, so headers must be repeated here. location ~* \.svg$ { - add_header Content-Security-Policy "default-src 'self'; script-src 'none'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; frame-ancestors 'none';"; + add_header Content-Security-Policy "default-src 'self'; script-src 'none'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; frame-ancestors 'none'; sandbox;" always; + add_header X-Content-Type-Options "nosniff" always; } error_log /var/log/nginx/parts.error.log; diff --git a/docs/installation/reverse-proxy.md b/docs/installation/reverse-proxy.md index 605b93fa..30c74223 100644 --- a/docs/installation/reverse-proxy.md +++ b/docs/installation/reverse-proxy.md @@ -22,6 +22,22 @@ TRUSTED_PROXIES=192.168.2.10 Set the `DEFAULT_URI` environment variable to the URL of your Part-DB installation, available from the outside (so via the reverse proxy). +You should also set the `TRUSTED_HOSTS` environment variable to a regex matching the host name(s) Part-DB is reachable +under via the reverse proxy, to prevent `HTTP Host header attacks`. For example, if Part-DB is reachable via +`part-db.example.invalid`, set the following in your `.env.local` file (the value must be wrapped in single quotes here): + +``` +TRUSTED_HOSTS='^(part-db\.example\.invalid)$' +``` + +If you set `TRUSTED_HOSTS` in your `docker-compose.yaml` instead, the value must **not** be quoted: + +``` +TRUSTED_HOSTS=^(part-db\.example\.invalid)$ +``` + +See the [configuration options](../configuration.md) page for more information about `TRUSTED_HOSTS`. + ## Part-DB in a subpath via reverse proxy If you put Part-DB into a subpath via the reverse proxy, you have to configure your webserver to include `X-Forwarded-Prefix` in the request headers. diff --git a/docs/usage/ai.md b/docs/usage/ai.md index 3a1fb419..30f6c628 100644 --- a/docs/usage/ai.md +++ b/docs/usage/ai.md @@ -25,3 +25,10 @@ You need to supply an API key for OpenRouter to use it as an AI platform in Part [LMStudio](https://lmstudio.ai/) is a local LLM hosting solution that allows you to run LLMs on your own hardware. You can use LMStudio to host your own LLM and connect it to Part-DB for AI features. Currently only LMStudio without any authentication is supported. Supply your LMStudio instance URL (including the port) to use it as an AI platform in Part-DB. +You have to set a model by hand, as suggestions currently do not work yet. Ensure the context length is suitable for your application. + +### Ollama + +[Ollama](https://ollama.com/) is another local LLM hosting solution that allows you to run LLMs on your own hardware. You can use Ollama to host your own LLM and connect it to Part-DB for AI features. +Supply your Ollama instance URL (including the port) and an optional API key for authentication to use it as an AI platform in Part-DB. The model selector should give you suggestions about available models. +Ensure the context length is suitable for your application. diff --git a/docs/usage/eda_integration.md b/docs/usage/eda_integration.md index 92b1244d..653eb8a3 100644 --- a/docs/usage/eda_integration.md +++ b/docs/usage/eda_integration.md @@ -54,7 +54,7 @@ To connect KiCad with Part-DB do the following steps: ``` 4. Replace the `root_url` with the URL of your Part-DB instance plus `/en/kicad-api/`. You can find the right value for this in the Part-DB user settings page under "API endpoints" in the "API tokens" panel. 5. Replace the `token` field value with the token you have generated in step 1. -6. Open KiCad and add this created file as a library in the KiCad symbol table under (Preferences --> Manage Symbol Libraries) +6. Open KiCad and add this created file as a HTTP library in the KiCad symbol table under (Preferences --> Manage Symbol Libraries) If you then place a new part, the library dialog opens, and you should be able to see the categories and parts from Part-DB. diff --git a/docs/usage/import_export.md b/docs/usage/import_export.md index f4d8d91c..9f1525c2 100644 --- a/docs/usage/import_export.md +++ b/docs/usage/import_export.md @@ -109,6 +109,21 @@ supplier is not specified, the price and supplier product number fields will be * **`supplier_product_number`** or **`supplier_part_number`** or * **`spn`**: The supplier product number of the part. * **`price`**: The price of the part in the base currency of the database (by default euro). +The following fields set the EDA / KiCad metadata of the part (see [EDA / KiCad integration](eda_integration.md)). +These can be given either as the flat column names below, or in the nested `eda_info.*` form used by the +CSV/JSON export and the [example file](#example-data) (e.g. `eda_info.kicad_symbol`), so a file exported from +Part-DB can be re-imported without renaming its headers: + +* **`eda_kicad_symbol`** or **`kicad_symbol`**: The KiCad symbol of the part, e.g. `Device:R`. +* **`eda_kicad_footprint`** or **`kicad_footprint`**: The KiCad footprint, e.g. `Resistor_SMD:R_0805_2012Metric`. +* **`eda_reference_prefix`** or **`kicad_reference`**: The schematic reference prefix, e.g. `R`, `C`, `L`. +* **`eda_value`** or **`kicad_value`**: The value shown in the EDA tool, e.g. `10k`. +* **`eda_exclude_from_bom`** (or **`eda_exclude_bom`**), **`eda_exclude_from_board`** (or **`eda_exclude_board`**), + **`eda_exclude_from_sim`** (or **`eda_exclude_sim`**): Booleans (`1`/`0`) to exclude the part from the BOM, board + or simulation. +* **`eda_visibility`**: Boolean (`1`/`0`) controlling whether the part is exposed to the EDA tool. The inverse + convenience alias **`eda_invisible`** is also accepted (so `eda_invisible=1` hides the part). + #### Example data Here you can find some example data for the import of parts, you can use it as a template for your own import ( diff --git a/package.json b/package.json index f846f1d1..f906d814 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "bootstrap": "^5.1.3", "core-js": "^3.38.0", "intl-messageformat": "^10.5.11", - "jquery": "^3.5.1", + "jquery": "^4.0.0", "popper.js": "^1.14.7", "regenerator-runtime": "^0.14.1", "webpack": "^5.74.0", @@ -38,20 +38,21 @@ "@algolia/autocomplete-theme-classic": "^1.17.0", "@jbtronics/bs-treeview": "^1.0.1", "@part-db/html5-qrcode": "^4.0.0", - "@zxcvbn-ts/core": "^3.0.2", - "@zxcvbn-ts/language-common": "^3.0.3", - "@zxcvbn-ts/language-de": "^3.0.1", - "@zxcvbn-ts/language-en": "^3.0.1", - "@zxcvbn-ts/language-fr": "^3.0.1", - "@zxcvbn-ts/language-ja": "^3.0.1", + "@zxcvbn-ts/core": "^4.1.2", + "@zxcvbn-ts/language-common": "^4.1.2", + "@zxcvbn-ts/language-de": "^4.1.1", + "@zxcvbn-ts/language-en": "^4.1.1", + "@zxcvbn-ts/language-fr": "^4.1.1", + "@zxcvbn-ts/language-it": "^4.1.1", + "@zxcvbn-ts/language-ja": "^4.1.1", + "@zxcvbn-ts/language-pl": "^4.1.1", "attr-accept": "^2.2.5", "barcode-detector": "^3.0.5", - "bootbox": "^6.0.0", "bootswatch": "^5.1.3", "bs-custom-file-input": "^1.3.4", "ckeditor5": "^48.0.0", "clipboard": "^2.0.4", - "compression-webpack-plugin": "^11.1.0", + "compression-webpack-plugin": "^12.0.0", "datatables.net": "^2.0.0", "datatables.net-bs5": "^2.0.0", "datatables.net-buttons-bs5": "^3.0.0", @@ -69,11 +70,12 @@ "marked-mangle": "^1.0.1", "pdfmake": "^0.3.7", "stimulus-use": "^0.52.0", + "sweetalert2": "^11.26.25", "tom-select": "^2.1.0", "ts-loader": "^9.2.6", "typescript": "^6.0.2" }, "resolutions": { - "jquery": "^3.5.1" + "jquery": "^4.0.0" } } diff --git a/public/.htaccess b/public/.htaccess index a13baeee..4aaf1009 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -119,9 +119,25 @@ DirectoryIndex index.php -# Set Content-Security-Policy for svg files (and compressed variants), to block embedded javascript in there
+ {% if seen_host %} + The host name Part-DB saw was:
{{ seen_host }}
+ {% else %}
+ {{ exception.message }}
+ {% endif %}
+ {% else %}
+ Your browser sent a request that the server could not understand.
+ {% endif %}
+{% endblock %}
+
+{% block admin_info %}
+ {% if untrusted_host %}
+ Untrusted host name.+
For security reasons (to prevent HTTP Host header attacks), Part-DB only responds to requests using host names that were explicitly marked as trusted, once more than one host name is used to access it (e.g. behind a reverse proxy).
+Try following things:
+-
+
- Ensure that you are using the correct URL to access Part-DB. +
- Set the
TRUSTED_HOSTSenvironment variable to a regular expression matching all host names Part-DB should be reachable under. Note that the required quoting differs depending on where you set it: +-
+ {% if seen_host %}
+
- In your
.env.localfile, the value must be wrapped in single quotes:TRUSTED_HOSTS='^({{ seen_host|replace({'.': '\\.'}) }})$'(if{{ seen_host }}is a host name you trust)
+ - In
docker-compose.yaml, the value must NOT be quoted:TRUSTED_HOSTS=^({{ seen_host|replace({'.': '\\.'}) }})$(if{{ seen_host }}is a host name you trust)
+ {% else %}
+ - In your
.env.localfile, the value must be wrapped in single quotes:TRUSTED_HOSTS='^(localhost|example\.com)$'
+ - In
docker-compose.yaml, the value must NOT be quoted:TRUSTED_HOSTS=^(localhost|example\.com)$
+ {% endif %}
+
+ - In your
- If Part-DB is running behind a reverse proxy, also make sure that
TRUSTED_PROXIESis configured correctly, so the original host name is forwarded properly.
+ - Run php bin/console cache:clear after changing the configuration. +
+
+ {% endif %}
+
{% if is_granted('@system.show_updates') %}
{{ nv.new_version_alert(new_version_available, new_version, new_version_url) }}
{% endif %}
diff --git a/templates/info_providers/providers.macro.html.twig b/templates/info_providers/providers.macro.html.twig
index bec8f24b..ad03f20a 100644
--- a/templates/info_providers/providers.macro.html.twig
+++ b/templates/info_providers/providers.macro.html.twig
@@ -8,35 +8,41 @@
{% trans %}system.trusted_hosts.unconfigured.title{% endtrans %}
+{% trans %}system.trusted_hosts.unconfigured.message{% endtrans %} + {% trans %}system.trusted_hosts.unconfigured.suggestion{% endtrans %}
+{% trans %}system.trusted_hosts.unconfigured.env_example{% endtrans %}
+ TRUSTED_HOSTS='^({{ app.request.host|replace({'.': '\\.'}) }})$'
{% trans %}system.trusted_hosts.unconfigured.docker_example{% endtrans %}
+ TRUSTED_HOSTS=^({{ app.request.host|replace({'.': '\\.'}) }})$
- {% if provider.providerInfo.url is defined and provider.providerInfo.url is not empty %} + {% if provider.providerInfo.url is not empty %} {{ provider.providerInfo.name }} {% else %} - {{ provider.providerInfo.name | trans }} + {{ provider.providerInfo.name }} {% endif %}
- {% if provider.providerInfo.description is defined and provider.providerInfo.description is not null %}
- {{ provider.providerInfo.description | trans }}
+ {% if provider.providerInfo.description is not null %}
+ {{ provider.providerInfo.description }}
{% endif %}
- {% if provider.providerInfo.settings_class is defined %}
-
{% endif %}
- {% for capability in provider.capabilities|sort((a, b) => a.orderIndex <=> b.orderIndex) %}
+ {% if provider.providerInfo.expensive %}
+
+
+ {% trans %}info_providers.expensive{% endtrans %}
+
+ {% endif %}
+ {% for capability in provider.providerInfo.capabilities|sort((a, b) => a.orderIndex <=> b.orderIndex) %}
{# @var capability \App\Services\InfoProviderSystem\Providers\ProviderCapabilities #}
{{ capability.translationKey|trans }}
{% endfor %}
- {% if provider.providerInfo.oauth_app_name is defined and provider.providerInfo.oauth_app_name is not empty %}
+ {% if provider.providerInfo.oauthAppName is not empty %}
- {% trans %}oauth_client.connect.btn{% endtrans %} + {% trans %}oauth_client.connect.btn{% endtrans %} {% endif %}
- {% trans %}oauth_client.connect.btn{% endtrans %} + {% trans %}oauth_client.connect.btn{% endtrans %} {% endif %}
{% trans %}info_providers.providers_list.disabled{% endtrans %}
- {% if provider.providerInfo.disabled_help is defined and provider.providerInfo.disabled_help is not empty %}
+ {% if provider.providerInfo.disabledHelp is not empty %}
- {{ provider.providerInfo.disabled_help|trans }} + {{ provider.providerInfo.disabledHelp }} {% endif %}
- {{ provider.providerInfo.disabled_help|trans }} + {{ provider.providerInfo.disabledHelp }} {% endif %}
- {% if info_provider_info.url is defined %} + {% if info_provider_info.url is not empty %} {{ info_provider_info.name }} {% else %} {{ info_provider_info.name }} diff --git a/templates/log_system/details/_extra_collection_element_deleted.html.twig b/templates/log_system/details/_extra_collection_element_deleted.html.twig index 221fae95..1c2ce2f3 100644 --- a/templates/log_system/details/_extra_collection_element_deleted.html.twig +++ b/templates/log_system/details/_extra_collection_element_deleted.html.twig @@ -4,7 +4,7 @@
{% trans %}log.collection_deleted.deleted{% endtrans %}: - {{ entity_type_label(entry.deletedElementClass) }} #{{ entry.deletedElementID }} + {{ type_label(entry.deletedElementClass) }} #{{ entry.deletedElementID }} {% if entry.oldName is not empty %} ({{ entry.oldName }}) {% endif %} @@ -12,4 +12,4 @@
{% trans %}log.collection_deleted.on_collection{% endtrans %}: {{ log_helper.translate_field(entry.collectionName) }} -
\ No newline at end of file + diff --git a/templates/log_system/details/log_details.html.twig b/templates/log_system/details/log_details.html.twig index aff127f4..2255dd97 100644 --- a/templates/log_system/details/log_details.html.twig +++ b/templates/log_system/details/log_details.html.twig @@ -58,7 +58,7 @@{% trans with {'%name%': user.fullName|escape } %}email.hi %name%{% endtrans %},
{% trans %}email.pw_reset.message{% endtrans %}- +
- {% trans with {'%url%': url('pw_reset_new_pw') } %}email.pw_reset.fallback{% endtrans %}: + {% trans with {'%url%': reset_url_fallback } %}email.pw_reset.fallback{% endtrans %}:
+
diff --git a/templates/parts/info/_extended_infos.html.twig b/templates/parts/info/_extended_infos.html.twig
index 9cb4e4e5..acc197e3 100644
--- a/templates/parts/info/_extended_infos.html.twig
+++ b/templates/parts/info/_extended_infos.html.twig
@@ -76,7 +76,7 @@
{% endif %}
{{ info_provider_label(part.providerReference.providerKey)|default(part.providerReference.providerKey) }}: {{ part.providerReference.providerId }}
- ({{ part.providerReference.lastUpdated | format_datetime() }})
+ ({{ part.providerReference.lastUpdated ? (part.providerReference.lastUpdated | format_datetime()) : ("part.info_provider_reference.updated_never"|trans) }})
{% if part.providerReference.providerUrl %}
{% endif %}
diff --git a/templates/parts/info/_order_infos.html.twig b/templates/parts/info/_order_infos.html.twig
index 9aa9d888..ef62d6f3 100644
--- a/templates/parts/info/_order_infos.html.twig
+++ b/templates/parts/info/_order_infos.html.twig
@@ -46,8 +46,9 @@
{{ detail.MinDiscountQuantity | format_amount(part.partUnit) }}
+
+
+
+ + +
+
+
+
+
+
+ {% trans %}part.edit.provider_reference.warning{% endtrans %}
+
+
+ {{ form_widget(form.providerReference) }}
+ {{ pic.name }}
{% if pic.filename %}({{ pic.filename }}) {% endif %}
- {{ entity_type_label(pic.element) }}
+ {{ type_label(pic.element) }}
 }})
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/templates/parts/info/show_part_info.html.twig b/templates/parts/info/show_part_info.html.twig
index 96b5e209..b36ab047 100644
--- a/templates/parts/info/show_part_info.html.twig
+++ b/templates/parts/info/show_part_info.html.twig
@@ -22,7 +22,7 @@
({{ timeTravel | format_datetime('short') }})
{% endif %}
{% if part.projectBuildPart %}
- ({{ entity_type_label(part.builtProject) }}: {{ part.builtProject.name }})
+ ({{ type_label(part.builtProject) }}: {{ part.builtProject.name }})
{% endif %}
diff --git a/templates/projects/_bom_validation_results.html.twig b/templates/projects/_bom_validation_results.html.twig
index 68f1b827..cb92e7bc 100644
--- a/templates/projects/_bom_validation_results.html.twig
+++ b/templates/projects/_bom_validation_results.html.twig
@@ -68,7 +68,7 @@
{% trans %}project.bom_import.validation.errors.description{% endtrans %}
-
{% for error in validation_result.errors %}
-
- {{ error|raw }} +
- {{ error }} {% endfor %}
{% trans %}project.bom_import.validation.warnings.description{% endtrans %}
-
{% for warning in validation_result.warnings %}
-
- {{ warning|raw }} +
- {{ warning }} {% endfor %}
{% trans %}project.bom_import.validation.info.title{% endtrans %}
-
{% for info in validation_result.info %}
-
- {{ info|raw }} +
- {{ info }} {% endfor %}
{% for error in line_result.errors %}
-
{% endif %}
{% if line_result.warnings is not empty %}
{{ error|raw }}
+ {{ error }}
{% endfor %}
{% for warning in line_result.warnings %}
-
{% endif %}
{% if line_result.info is not empty %}
{{ warning|raw }}
+ {{ warning }}
{% endfor %}
{% for info in line_result.info %}
-
{% endif %}
diff --git a/templates/projects/import_bom_map_fields.html.twig b/templates/projects/import_bom_map_fields.html.twig
index ee1e23ef..b272be64 100644
--- a/templates/projects/import_bom_map_fields.html.twig
+++ b/templates/projects/import_bom_map_fields.html.twig
@@ -132,8 +132,8 @@
{{ info|raw }}
+ {{ info }}
{% endfor %}