From 36ba7a38855257a8903de8f61347643a26db9600 Mon Sep 17 00:00:00 2001 From: Dave Roberts Date: Wed, 16 Jul 2025 14:35:48 +0100 Subject: [PATCH 01/25] Formatted test and config code and updated test files --- .github/workflows/tests.yml | 2 +- eslint.config.mjs | 2 +- package.json | 8 +- .../button/lib/remove-curval-button.test.js | 2 +- .../button/lib/show-blank-button.test.ts | 2 +- .../components/card/lib/component.test.ts | 7 +- .../collapsible/lib/component.test.ts | 2 +- .../components/data-table/lib/helper.test.ts | 3 +- .../form-group/autosave/lib/autosave.test.ts | 1 + .../form-group/filter/lib/component.js | 8 +- .../form-group/select-widget/lib/component.js | 4 +- .../help-view/lib/component.test.ts | 1 + .../components/markdown/lib/component.js | 1 + .../components/modal/lib/component.js | 1 + .../components/timeline/lib/component.js | 2 +- src/frontend/js/lib/set-field-value.test.ts | 2 + .../lib/encryptedStorage.test.ts | 6 + .../js/lib/util/filedrag/lib/filedrag.test.ts | 1 + .../storageProvider/lib/storageProvider.ts | 8 +- .../typeahead/lib/TypeaheadBuilder.test.ts | 1 + .../js/lib/util/upload/UploadControl.ts | 2 +- src/frontend/testing/globals.definitions.ts | 4 +- yarn.lock | 460 +++++++++--------- 23 files changed, 282 insertions(+), 248 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3617186fd..30891144e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -187,7 +187,7 @@ jobs: strategy: matrix: - node-version: [20.x, 22.x] + node-version: [22.x, 24.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: diff --git a/eslint.config.mjs b/eslint.config.mjs index 12c843cd7..bf77196cb 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -8,7 +8,7 @@ import stylistic from "@stylistic/eslint-plugin"; import jsdoc from "eslint-plugin-jsdoc"; export default defineConfig([ - { settings: { react: { version: "detect" } } }, + { settings: { react: { version: "19" } } }, { ignores: ["*.cjs", "eslint.config.mjs", "**/public/**", "**/node_modules/**", "**/cypress/**", "cypress.config.ts", ".stylelintrc.js", "src/frontend/testing/**", "src/frontend/css/stylesheets/external/**", "src/frontend/components/dashboard/lib/react/polyfills/**", "babel.config.js", "webpack.config.js", "jest.config.js", "tsconfig.json", "src/frontend/js/lib/jqplot/**", "src/frontend/js/lib/jquery/**", "src/frontend/js/lib/plotly/**", "src/frontend/components/timeline/**", "fengari-web.js"] }, { files: ["**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"], plugins: { js }, extends: ["js/recommended"] }, { files: ["**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"], languageOptions: { globals: { ...globals.browser, ...globals.jquery, ...globals.jest } } }, diff --git a/package.json b/package.json index ed011cbd2..c8ce8dbe7 100644 --- a/package.json +++ b/package.json @@ -65,15 +65,17 @@ "@types/react-dom": "^19.2.3", "@types/react-grid-layout": "^1.0.0", "@types/typeahead.js": "^0.11.6", + "@webpack-cli/serve": "^2.0.1", "autoprefixer": "^10.5.0", "babel-loader": "^10.1.1", + "buffer": "^6.0.3", "clean-webpack-plugin": "^4.0.0", "copy-webpack-plugin": "^14.0.0", "core-js": "^3.49.0", "css-loader": "^7.1.4", "cypress": "^15.16.0", - "eslint": "^9.0.0", - "eslint-plugin-jsdoc": "^63.0.2", + "eslint": "^10.5.0", + "eslint-plugin-jsdoc": "^63.0.5", "eslint-plugin-react": "^7.37.5", "globals": "^17.6.0", "jest": "^30.4.2", @@ -86,7 +88,7 @@ "terser-webpack-plugin": "^5.6.1", "ts-loader": "~9.5.2", "typescript": "~5.8.0", - "typescript-eslint": "^8.61.0", + "typescript-eslint": "^8.61.1", "webpack": "^5.107.2", "webpack-cli": "^7.0.3" }, diff --git a/src/frontend/components/button/lib/remove-curval-button.test.js b/src/frontend/components/button/lib/remove-curval-button.test.js index a22dd35f8..5d854852c 100644 --- a/src/frontend/components/button/lib/remove-curval-button.test.js +++ b/src/frontend/components/button/lib/remove-curval-button.test.js @@ -61,4 +61,4 @@ describe('RemoveCurvalButton', () => { button.click(); expect(current.children.length).toBe(0); }); -}); \ No newline at end of file +}); diff --git a/src/frontend/components/button/lib/show-blank-button.test.ts b/src/frontend/components/button/lib/show-blank-button.test.ts index 3d13895ca..ee0237e2a 100644 --- a/src/frontend/components/button/lib/show-blank-button.test.ts +++ b/src/frontend/components/button/lib/show-blank-button.test.ts @@ -29,4 +29,4 @@ describe('ShowBlankButton', () => { button.trigger('click'); expect(item.css('display')).toBe('none'); }); -}); \ No newline at end of file +}); diff --git a/src/frontend/components/card/lib/component.test.ts b/src/frontend/components/card/lib/component.test.ts index ae8c0225e..c932cfe1b 100644 --- a/src/frontend/components/card/lib/component.test.ts +++ b/src/frontend/components/card/lib/component.test.ts @@ -169,10 +169,9 @@ describe('ExpandableCardComponent', () => { if (!target) throw new Error('Target not found'); // Set the items in the card to be invisible, as if there was nothing to show const $target = $(target); - $target.find('.list--fields').find('ul li') - .each((_i, el) => { - $(el).css('display', 'none'); - }); + $target.find('.list--fields').find('ul li').each((_i, el) => { + $(el).css('display', 'none'); + }); $target.find('.linkspace-field').each((_i, el) => { $(el).css('display', 'none'); }); diff --git a/src/frontend/components/collapsible/lib/component.test.ts b/src/frontend/components/collapsible/lib/component.test.ts index 84786d424..f4e7a7673 100644 --- a/src/frontend/components/collapsible/lib/component.test.ts +++ b/src/frontend/components/collapsible/lib/component.test.ts @@ -37,7 +37,7 @@ describe('Collapsible', () => { it('should toggle the collapsible content', () => { const target = document.getElementById('target'); - if(target === null) throw new Error('Target element not found'); + if (target === null) throw new Error('Target element not found'); new Collapsible(target as HTMLElement); const button = target.querySelector('.btn-collapsible') as HTMLButtonElement; const titleCollapsed = target.querySelector('.btn__title--collapsed') as HTMLSpanElement; diff --git a/src/frontend/components/data-table/lib/helper.test.ts b/src/frontend/components/data-table/lib/helper.test.ts index a355e773f..d19ed794c 100644 --- a/src/frontend/components/data-table/lib/helper.test.ts +++ b/src/frontend/components/data-table/lib/helper.test.ts @@ -4,6 +4,7 @@ import { addRow, clearTable, updateRow } from './helper'; describe.skip('helper - Jest really doesn\'t like JQuery right now!', () => { beforeEach(() => { + // create the DOM structure for the tests document.body.innerHTML = ` @@ -71,4 +72,4 @@ describe.skip('helper - Jest really doesn\'t like JQuery right now!', () => { clearTable($(target)); expect(target.querySelectorAll('tbody tr').length).toBe(1); }); -}); \ No newline at end of file +}); diff --git a/src/frontend/components/form-group/autosave/lib/autosave.test.ts b/src/frontend/components/form-group/autosave/lib/autosave.test.ts index e88811f25..113cc014e 100644 --- a/src/frontend/components/form-group/autosave/lib/autosave.test.ts +++ b/src/frontend/components/form-group/autosave/lib/autosave.test.ts @@ -2,6 +2,7 @@ import AutosaveBase from './autosaveBase'; import { describe, it, expect, beforeAll, afterAll } from '@jest/globals'; +// Mocking the AutosaveBase class for testing class TestAutosave extends AutosaveBase { initAutosave(): void { console.log('initAutosave'); diff --git a/src/frontend/components/form-group/filter/lib/component.js b/src/frontend/components/form-group/filter/lib/component.js index 242c54236..107dbda0a 100644 --- a/src/frontend/components/form-group/filter/lib/component.js +++ b/src/frontend/components/form-group/filter/lib/component.js @@ -172,13 +172,7 @@ class FilterComponent extends Component { }; // This is required to ensure that the correct query is sent each time - const buildQuery = () => { - return { - q: $ruleInputText.val(), - oi: filterConfig.instanceId, - csrf_token: $('body').data('csrf') - }; - }; + const buildQuery = () => { return { q: $ruleInputText.val(), oi: filterConfig.instanceId }; }; const builder = new TypeaheadBuilder(); builder diff --git a/src/frontend/components/form-group/select-widget/lib/component.js b/src/frontend/components/form-group/select-widget/lib/component.js index 6cb5da7c2..498856a56 100644 --- a/src/frontend/components/form-group/select-widget/lib/component.js +++ b/src/frontend/components/form-group/select-widget/lib/component.js @@ -510,7 +510,6 @@ class SelectWidgetComponent extends Component { return $li; } - //Some odd scoping issues here - but it works /** * Updates the JSON data for the select widget. * @param {string} url - The URL to fetch the JSON data from. @@ -600,7 +599,8 @@ class SelectWidgetComponent extends Component { }); } else { - const errorMessage = data.message; + const errorMessage = + data.error === 1 ? data.message : 'Oops! Something went wrong.'; const errorLi = $( '
    • @@ -72,4 +71,4 @@ describe.skip('helper - Jest really doesn\'t like JQuery right now!', () => { clearTable($(target)); expect(target.querySelectorAll('tbody tr').length).toBe(1); }); -}); +}); \ No newline at end of file diff --git a/src/frontend/components/form-group/autosave/lib/autosave.test.ts b/src/frontend/components/form-group/autosave/lib/autosave.test.ts index 113cc014e..e88811f25 100644 --- a/src/frontend/components/form-group/autosave/lib/autosave.test.ts +++ b/src/frontend/components/form-group/autosave/lib/autosave.test.ts @@ -2,7 +2,6 @@ import AutosaveBase from './autosaveBase'; import { describe, it, expect, beforeAll, afterAll } from '@jest/globals'; -// Mocking the AutosaveBase class for testing class TestAutosave extends AutosaveBase { initAutosave(): void { console.log('initAutosave'); diff --git a/src/frontend/components/form-group/select-widget/lib/component.js b/src/frontend/components/form-group/select-widget/lib/component.js index 498856a56..66b380e7f 100644 --- a/src/frontend/components/form-group/select-widget/lib/component.js +++ b/src/frontend/components/form-group/select-widget/lib/component.js @@ -11,6 +11,7 @@ import { initValidationOnField } from 'validation'; * SelectWidgets can depend on each other; * for instance if Value "1" is selected in Widget "A", * Widget "B" might not be displayed. + * @todo This uses deprecated code - update to newer "$.on" and "$.off" functionality */ class SelectWidgetComponent extends Component { /** @@ -608,29 +609,27 @@ class SelectWidgetComponent extends Component { ); this.$available.append(errorLi); } - }) - .fail(function (jqXHR, textStatus, textError) { - const errorMessage = jqXHR.responseJSON.message; - logging.error( - 'Failed to make request to ' + - url + - ': ' + - textStatus + - ': ' + - textError - ); - const errorLi = $( - '
    • ' - ); - self.$available.append(errorLi); - }) - .always(function () { - if (hideSpinner) { - self.$available.find('.spinner').attr('hidden', ''); - } - }); + }).fail(function (jqXHR, textStatus, textError) { + const errorMessage = jqXHR.responseJSON?.message ?? 'Oops! Something went wrong'; + logging.error( + 'Failed to make request to ' + + url + + ': ' + + textStatus + + ': ' + + textError + ); + const errorLi = $( + '
    • ' + ); + self.$available.append(errorLi); + }).always(function () { + if (hideSpinner) { + self.$available.find('.spinner').attr('hidden', ''); + } + }); } /** diff --git a/src/frontend/components/form-group/textarea/lib/component.js b/src/frontend/components/form-group/textarea/lib/component.js index af75d807b..f54529aad 100644 --- a/src/frontend/components/form-group/textarea/lib/component.js +++ b/src/frontend/components/form-group/textarea/lib/component.js @@ -67,5 +67,4 @@ class TextareaComponent extends Component { $textarea.css('height', `${adjustedHeight}rem`); } } - export default TextareaComponent; diff --git a/src/frontend/components/form-group/tree/lib/component.js b/src/frontend/components/form-group/tree/lib/component.js index ea010da60..a421aa317 100644 --- a/src/frontend/components/form-group/tree/lib/component.js +++ b/src/frontend/components/form-group/tree/lib/component.js @@ -212,8 +212,6 @@ class TreeComponent extends Component { /** * Handle the deletion of a node from the jstree. - * @returns {boolean} Returns true if a node was deleted, false otherwise. - * @todo Why does this have a return value? */ handleDelete() { const ref = this.$treeContainer.jstree(true); @@ -224,25 +222,21 @@ class TreeComponent extends Component { } ref.delete_node(sel); - return true; } /** * Handle the renaming of a node in the jstree. - * @returns {boolean} Returns true if a node was renamed, false otherwise. - * @todo Why does this have a return value? */ handleRename() { const ref = this.$treeContainer.jstree(true); let sel = ref.get_selected(); if (!sel.length) { - return false; + return; } sel = sel[0]; ref.edit(sel); - return true; } } diff --git a/src/frontend/components/help-view/lib/component.test.ts b/src/frontend/components/help-view/lib/component.test.ts index b5e4fa94c..d5720a849 100644 --- a/src/frontend/components/help-view/lib/component.test.ts +++ b/src/frontend/components/help-view/lib/component.test.ts @@ -2,7 +2,6 @@ import HelpView from './component'; import { describe, it, expect } from '@jest/globals'; -// Mock class to test the HelpView component exposing private members class TestHelpView extends HelpView { public get button() { return this.$button; diff --git a/src/frontend/components/modal/modals/curval/lib/component.js b/src/frontend/components/modal/modals/curval/lib/component.js index 56ff993d6..81be90c55 100644 --- a/src/frontend/components/modal/modals/curval/lib/component.js +++ b/src/frontend/components/modal/modals/curval/lib/component.js @@ -71,9 +71,9 @@ class CurvalModalComponent extends ModalComponent { } const instance_name = $target.data('curval-instance-name'); // Load the modal and load each value into its fields - $m.find('.modal-body').load(self.getURL(current_id, instance_name, layout_id), function(){ + $m.find('.modal-body').load(self.getURL(current_id, instance_name, layout_id), function () { initializeRegisteredComponents($m.get(0)); - $m.find('.linkspace-field').each(function(){ + $m.find('.linkspace-field').each(function () { const $field = $(this); const key = `linkspace-column-${$field.data('column-id')}-${$('body').data('layout-identifier')}-${record_id}`; const vals = values[key]; @@ -102,12 +102,12 @@ class CurvalModalComponent extends ModalComponent { let guid = form.data('guid'); const $formGroup = $('div[data-column-id=' + col_id + ']'); const valueSelector = $formGroup.data('value-selector'); - const self=this; + const self = this; const $field = $(`#curval_list_${col_id}`).closest('.linkspace-field'); const current_id = form.data('current-id'); const textValue = jQuery - .map(modal_field_ids, function(element) { + .map(modal_field_ids, function (element) { const value = values['field' + element]; return $('
    ') .text(value) @@ -120,7 +120,7 @@ class CurvalModalComponent extends ModalComponent { // No strict requirement for alias here, but it is needed below, so for the sake of consistency const row_cells = $('
    ', self.context); - jQuery.map($field.data('modal-field-ids'), function(element) { + jQuery.map($field.data('modal-field-ids'), function (element) { let value = values['field' + element]; value = $('
    ').text(value) .html(); @@ -134,7 +134,7 @@ class CurvalModalComponent extends ModalComponent { const editButton = $( `
    `, @@ -213,9 +213,9 @@ class CurvalModalComponent extends ModalComponent { $answersList.append(`
  • -
    - -
    '; strHTML += ( `
    • ', self.context); - jQuery.map($field.data('modal-field-ids'), function (element) { + jQuery.map($field.data('modal-field-ids'), function(element) { let value = values['field' + element]; value = $('
    ').text(value) .html(); @@ -134,7 +134,7 @@ class CurvalModalComponent extends ModalComponent { const editButton = $( `
    `, @@ -213,9 +213,9 @@ class CurvalModalComponent extends ModalComponent { $answersList.append(`
  • -
    - -
    • `, @@ -222,7 +222,7 @@ class CurvalModalComponent extends ModalComponent {
    -
    diff --git a/src/frontend/components/more-less/lib/component.js b/src/frontend/components/more-less/lib/component.js index 6c32e3297..edc616a6c 100644 --- a/src/frontend/components/more-less/lib/component.js +++ b/src/frontend/components/more-less/lib/component.js @@ -166,7 +166,7 @@ class MoreLessComponent extends Component { const toggleLabel = 'Show ' + column + ' ⇒'; const $expandToggle = $(' diff --git a/views/admin/default_welcome_email.tt b/views/admin/default_welcome_email.tt index 1f6a4b70e..cd05a5413 100644 --- a/views/admin/default_welcome_email.tt +++ b/views/admin/default_welcome_email.tt @@ -10,15 +10,15 @@
    [% INCLUDE fields/hidden.tt name="csrf_token" value=csrf_token; %] - +
    Default welcome email - +
    - +
    [% @@ -33,7 +33,7 @@ %]
    - +
    [% @@ -48,7 +48,7 @@ %]
    - +
    [% @@ -79,7 +79,7 @@ type = "button", name = "update", value = "update", - class = "btn btn-default", + class = "btn btn-primary", label = "Save" }] }]; diff --git a/views/admin/user_editable_personal_details.tt b/views/admin/user_editable_personal_details.tt index cf10b2bc7..320495d72 100644 --- a/views/admin/user_editable_personal_details.tt +++ b/views/admin/user_editable_personal_details.tt @@ -18,8 +18,8 @@ Allow users to edit the following details of their account
    - -
    + +
      [% FOREACH field in instance.user_fields %] @@ -58,7 +58,7 @@ type = "button", name = "update", value = "update", - class = "btn btn-default", + class = "btn btn-primary", label = "Save" }] }]; diff --git a/views/approval.tt b/views/approval.tt index 5a6be6034..93e66883e 100644 --- a/views/approval.tt +++ b/views/approval.tt @@ -2,7 +2,7 @@

      [% IF records.size %]
    - @@ -144,7 +144,7 @@ class CurvalModalComponent extends ModalComponent { const removeButton = $( ` -
    - + diff --git a/views/chronology.tt b/views/chronology.tt index 74d1abac5..06d3d5caf 100644 --- a/views/chronology.tt +++ b/views/chronology.tt @@ -14,14 +14,16 @@ action_datetime = version.datetime.as_string; action_type = initial ? 'created' : 'updated'; action_by = version.editor.id ? " by " _ version.editor.as_string : ''; - + %] -
    -

    - [% action_datetime _ " - " _ " record " _ action_type _ action_by | html %] -

    - -
    +
    +
    +

    + [% action_datetime _ " - " _ " record " _ action_type _ action_by | html %] +

    +
    + +
    Table for [% layout.record_name_plural | html %] requiring approval
    ID Submitted by
    - + @@ -53,15 +53,15 @@
    -
    - +
    +

    Are you sure you want to delete this [% site.department_name | html %]?

    - +
    diff --git a/views/edit.tt b/views/edit.tt index 19aa994af..2ebb4d461 100755 --- a/views/edit.tt +++ b/views/edit.tt @@ -55,12 +55,14 @@ [% IF NOT record.new_entry AND NOT edit_modal AND NOT view_modal %]
    [% IF record.child_record_ids.size %] -
    +
    +

    Child records

    +
    -
    +
      @@ -78,12 +80,14 @@
    [% END %] -
    +
    +

    Meta data

    +
    -
    +
      @@ -132,12 +136,14 @@
    -
    +
    +

    Version history

    +
    -
    +
    @@ -156,7 +162,7 @@ END; END; %] - [% IF record.has_rag_column %] -
    +
    +

    Legend

    +
    -
    +
    [% INCLUDE snippets/rag_legend.tt %]
    @@ -235,7 +243,7 @@ right_buttons.push({ type = "button", - class = "btn btn-default btn-js-submit-record", + class = "btn btn-primary btn-js-submit-record", id = "", name = "submit", value = "1", @@ -266,7 +274,7 @@ IF record.new_entry AND page != "bulk"; right_buttons.push({ type = "button", - class = "btn btn-inverted btn-js-remove-unload btn-js-submit-draft-record", + class = "btn btn-primary btn-inverted btn-js-remove-unload btn-js-submit-draft-record", id = "save-draft", name = "draft", value = "save-draft", @@ -276,14 +284,14 @@ right_buttons.push({ type = "button", - class = "btn btn-inverted btn-js-remove-unload btn-js-submit-record", + class = "btn btn-primary btn-inverted btn-js-remove-unload btn-js-submit-record", id = "submit-and-remain", name = "submit", value = "submit-and-remain", label = "Save and continue" }, { type = "button", - class = "btn btn-default btn-js-remove-unload btn-js-submit-record", + class = "btn btn-primary btn-js-remove-unload btn-js-submit-record", id = "submit", name = "submit", value = "submit", @@ -309,10 +317,10 @@
    [% IF view_modal %] -
    +
    - Open full record + Open full record
    [% END %] @@ -366,13 +374,13 @@ widget_id_modifier = view_modal OR edit_modal ? '-modal' : ''; %]
    -
    -
    - +
    [% IF editable AND NOT record.new_entry AND NOT edit_modal AND topic.has_editable %] - +
    -
    +
    [% IF block_topic.description %] [% block_topic.description_html %] @@ -516,7 +517,7 @@ [% BLOCK print_field; %]
    '; + '
    '; render_datum(col); '
    '; # Send values back, otherwise controller will think blank values submitted @@ -876,11 +877,9 @@ '
      '; FOREACH file IN editvalue.files; '
    • '; - '
      '; - '
      '; ''; INCLUDE fields/sub/checkbox.tt - id = "file-" _ file.id + id = "file_checkbox_" _ col.id _ "_" _ file.id name = field label = "Include file." value = file.id @@ -894,13 +893,11 @@ ''; ''; 'Current file name: '; - ''; + ''; file.name | html; ''; ''; ''; - '
      '; - '
      '; '
      • '; END; ''; @@ -1105,7 +1102,7 @@ [% IF col.lookup_endpoint %]
      - +
      @@ -1117,8 +1114,8 @@ @@ -1139,7 +1136,7 @@ table_buttons = [{ type = "modal_button" - button_class = "btn btn-small btn-link btn-js-curval-modal" + button_class = "btn btn-sm btn-link btn-js-curval-modal" modalId = "curvalModal" label = "Edit" filter = "" @@ -1151,7 +1148,7 @@ table_buttons.push({ type = "button" button_type = "button" - button_class = "btn btn-small btn-delete btn-js-curval-remove" + button_class = "btn btn-sm btn-delete btn-js-curval-remove" label = "Remove" }); END; diff --git a/views/fields/ajax_autocomplete.tt b/views/fields/ajax_autocomplete.tt index 30dbe9cc4..9e0b0f596 100644 --- a/views/fields/ajax_autocomplete.tt +++ b/views/fields/ajax_autocomplete.tt @@ -21,13 +21,13 @@ input_class = is_required AND ! input_class.match('input--required') ? input_class _ ' input--required' : input_class; -%] [% IF ! hide_group %] -
      +
      [% END %]
      [% INCLUDE fields/sub/label_input.tt; %]
      - + - +
      - + [% INCLUDE snippets/subfield.tt %] [% IF ! hide_group %]
      diff --git a/views/fields/checkbox_list.tt b/views/fields/checkbox_list.tt index c986a4a43..3148c6094 100644 --- a/views/fields/checkbox_list.tt +++ b/views/fields/checkbox_list.tt @@ -10,10 +10,10 @@ %] [% IF ! hide_group %] -
      +
      [% END %]
      - [% + [% INCLUDE fields/sub/label_fieldset.tt; %]
      diff --git a/views/fields/daterange.tt b/views/fields/daterange.tt index ec53f65f7..f5296d796 100644 --- a/views/fields/daterange.tt +++ b/views/fields/daterange.tt @@ -4,7 +4,7 @@ %] [% IF ! hide_group %] -
      +
      [% END %]
      [% INCLUDE fields/sub/label_fieldset.tt; %] @@ -19,8 +19,8 @@ label_checkbox_name = "" help_text = from.help_text popover_body = from.popover_body - placeholder = from.placeholder || config.dateformat_datepicker - dateformat = from.placeholder || config.dateformat_datepicker + placeholder = from.placeholder || config.dateformat + dateformat = from.placeholder || config.dateformat value = from.value filter = from.filter || "html" is_required = from.is_required ? 1 : 0 @@ -43,8 +43,8 @@ label_checkbox_name = "" help_text = from.help_text popover_body = from.popover_body - placeholder = to.placeholder || config.dateformat_datepicker - dateformat = to.placeholder || config.dateformat_datepicker + placeholder = to.placeholder || config.dateformat + dateformat = to.placeholder || config.dateformat value = to.value filter = to.filter || "html" is_required = to.is_required ? 1 : 0 diff --git a/views/fields/file.tt b/views/fields/file.tt index 1be409f5f..d1099b326 100644 --- a/views/fields/file.tt +++ b/views/fields/file.tt @@ -22,19 +22,22 @@ # checked => username # tabindex => 2 # }; - + input_class = is_required AND ! input_class.match('input--required') ? input_class _ ' input--required' : input_class; -%]
      [% IF show_progress %] -
      +
      +
      +

      0%

      +
      [% END %]
      [% INCLUDE fields/sub/label_file.tt; %] - +
      +
      [% END %]
      [% INCLUDE fields/sub/label_input.tt; %] @@ -44,7 +44,7 @@ required aria-required="true"[% END %] > - + diff --git a/views/fields/radio.tt b/views/fields/radio.tt index 617887e37..e371fade4 100644 --- a/views/fields/radio.tt +++ b/views/fields/radio.tt @@ -6,12 +6,12 @@ [% END %]
      [% INCLUDE fields/sub/label_fieldset.tt; %] -
      +
      [% FOREACH item IN items %]
      -
      diff --git a/views/fields/select.tt b/views/fields/select.tt index 2f9d364f6..168b3ea70 100644 --- a/views/fields/select.tt +++ b/views/fields/select.tt @@ -31,7 +31,7 @@ %] [% IF ! hide_group %] -
      +
      [% END %]
      [% INCLUDE fields/sub/label_input.tt label_type="select"; %] @@ -41,7 +41,7 @@ class="select__toggle dropdown-toggle form-control" [% IF is_disabled %]disabled[% END %] [% IF is_readonly %]readonly[% END %] - data-toggle="dropdown" + data-bs-toggle="dropdown" aria-haspopup="listbox" aria-expanded="false" [% IF is_disabled %]aria-disabled="true"[% END %] @@ -59,7 +59,7 @@ placeholder="[% INCLUDE fields/sub/filter.tt value=placeholder; %]" [% IF reveal_id %]data-reveal_id="[% reveal_id %]"[% END %] > - +
        +
        [% END %]
        [% INCLUDE fields/sub/label_fieldset.tt; %] @@ -15,7 +15,7 @@ [% FOREACH item IN items; value_hidden = " hidden"; - + IF values AND values.size; FOREACH value IN values; IF item.value == value; @@ -55,7 +55,7 @@ [% END %]
      - +
    Table for departments
    Name
    - + @@ -72,8 +73,8 @@ [% FOREACH metric IN metricgroup.metrics %] - + [% END %] [% INCLUDE tables/basic_row.tt row=header_row %] diff --git a/views/team.tt b/views/team.tt index 992a98d43..eddbc2620 100644 --- a/views/team.tt +++ b/views/team.tt @@ -8,7 +8,7 @@ [% IF team.id %] [% END %] -
    +
    @@ -17,7 +17,7 @@

    [% IF team.id %] - Delete + Delete [% END %]

    @@ -28,10 +28,10 @@

    [% site.team_name | html %]s

    - Add [% site.team_name | html %] + Add [% site.team_name | html %]

    Table for metric groups
    X-axis value
    - - - + + +
    -
    -

    - Metrics help -

    - -
    +
    +
    +

    + Metrics help +

    +
    + +

    Use this page to define a set of metrics to plot graphs against. @@ -137,7 +140,7 @@

    - +
    @@ -153,7 +156,7 @@
    -
    +
    @@ -161,7 +164,7 @@

    Are you sure you want to delete this group of metrics? All items will be deleted.

    - +
    @@ -174,8 +177,8 @@
    -
    - +
    +
    @@ -184,18 +187,18 @@
    -
    - +
    +
    -
    - +
    +
    - +
    diff --git a/views/metrics.tt b/views/metrics.tt index f702c9430..d1d72c3fc 100644 --- a/views/metrics.tt +++ b/views/metrics.tt @@ -9,7 +9,7 @@ calculated by comparing the absolute value with the relevant metric." aside_buttons = [{ type = "link" target = url.page _ "/" _ layout.identifier _ "/metric/0" - class = "btn btn-add" + class = "btn btn-primary btn-add" label = "Add a metrics set" }]; %] @@ -17,7 +17,7 @@ calculated by comparing the absolute value with the relevant metric."
    - + diff --git a/views/modal_dialog.tt b/views/modal_dialog.tt index 040029e4e..06b79e9f4 100644 --- a/views/modal_dialog.tt +++ b/views/modal_dialog.tt @@ -21,7 +21,7 @@ [% END %] [% END %] -
    +
    [% IF modal_heading %]
    [% IF modal_close_only %] - + [% ELSE %] [% IF modal_with_cancel_button %] - + [% END %] [% IF modal_extra_action %] diff --git a/views/navigation/active_pages.tt b/views/navigation/active_pages.tt index a7fce5de4..2860a3f26 100644 --- a/views/navigation/active_pages.tt +++ b/views/navigation/active_pages.tt @@ -27,7 +27,7 @@ "imports", "import", "import/row", - "chronology", + # "chronology", # Removed as this can be confusing when viewing the chronology of a record ]; edit_table_active_pages = manage_table_active_pages.merge(manage_topics_active_pages, manage_fields_active_pages, manage_permissions_active_pages); table_dashboard_active_pages = ["table_index"]; diff --git a/views/navigation/breadcrumbs.tt b/views/navigation/breadcrumbs.tt index ee56dbbb8..612dc998e 100644 --- a/views/navigation/breadcrumbs.tt +++ b/views/navigation/breadcrumbs.tt @@ -1,18 +1,15 @@ [% IF breadcrumbs.size %] -
    -
    +
    -
    +
  • [% crumb.text %]
    • + [% ELSE; %] +
  • [% crumb.text %]
    • + [% END %] + [% END %] + + [% END %] diff --git a/views/navigation/main_menu.tt b/views/navigation/main_menu.tt index 14ee4be06..998f7e7ea 100644 --- a/views/navigation/main_menu.tt +++ b/views/navigation/main_menu.tt @@ -8,7 +8,7 @@ -
    diff --git a/views/navigation/table_header_tab_menu.tt b/views/navigation/table_header_tab_menu.tt index 88f97cccf..d6427786f 100644 --- a/views/navigation/table_header_tab_menu.tt +++ b/views/navigation/table_header_tab_menu.tt @@ -1,20 +1,26 @@ -
    - -
    + diff --git a/views/purge.tt b/views/purge.tt index 0041e6f95..a41b2f493 100644 --- a/views/purge.tt +++ b/views/purge.tt @@ -1,4 +1,4 @@ -
    +
    [% INCLUDE navigation/breadcrumbs.tt %]

    Purge Records

    @@ -104,7 +104,7 @@ }, { type = "modal_button", modalId = "restore", - class = "btn btn-default", + class = "btn btn-primary", label = "Undelete" }] }]; diff --git a/views/register.tt b/views/register.tt index bc4a51632..3b5e1daf5 100644 --- a/views/register.tt +++ b/views/register.tt @@ -1,11 +1,11 @@ [% PROCESS snippets/message_center.tt %] - + - + - + diff --git a/views/reports/edit.tt b/views/reports/edit.tt index b1d51f82b..bdc2a2436 100644 --- a/views/reports/edit.tt +++ b/views/reports/edit.tt @@ -2,14 +2,12 @@ [% INCLUDE fields/hidden.tt name="submit" value="submit"; INCLUDE fields/hidden.tt name="csrf_token" value=csrf_token; %]
    -
    -
    -

    - Edit Report -

    +
    +
    +

    Edit Report

    -
    +
    [% @@ -104,7 +102,7 @@ class = "col-md-8 d-md-flex justify-content-md-end align-items-center", buttons = [{ type = "button", - class = "btn btn-inverted btn-js-report", + class = "btn btn-primary btn-inverted btn-js-report", label = "Save Report", button_type = "submit" }] @@ -112,4 +110,4 @@ %]
    - \ No newline at end of file + diff --git a/views/reports/view.tt b/views/reports/view.tt index a6fd8e7ad..b900ced34 100644 --- a/views/reports/view.tt +++ b/views/reports/view.tt @@ -49,20 +49,14 @@
    -
    -
    -
    -
    -

    - Reports -

    -
    -
    - Create Report -
    -
    +
    +
    +

    + Reports +

    + Create Report
    -
    +
    @@ -76,13 +70,13 @@
    -
    -
    +
    +

    Settings

    -
    +
    [% INCLUDE 'fields/input.tt' @@ -103,7 +97,9 @@
    -
    +
    + +
    diff --git a/views/reset_password_mail_generate.tt b/views/reset_password_mail_generate.tt index b70742adb..5f7a7ed85 100644 --- a/views/reset_password_mail_generate.tt +++ b/views/reset_password_mail_generate.tt @@ -3,39 +3,41 @@ - +
    - +
    Table to show list of metrics
    Metric set name
    - + [% IF is_group %] diff --git a/views/snippets/datum.tt b/views/snippets/datum.tt index ee6252871..a35286a1c 100644 --- a/views/snippets/datum.tt +++ b/views/snippets/datum.tt @@ -13,7 +13,7 @@ [% curcommon_row_counter = 0 %] [% IF curval.links.first.presentation.columns.size %]
    Table for [% layout.record_name_plural | html %]
    - + [% FOR link IN curval.links %] @@ -25,7 +25,7 @@ [% render_datum(col_inner) %] [% END %] - + [% curcommon_row_counter = curcommon_row_counter + 1%] [% END %]
    Table to show values in [% curval.column_name %]
    @@ -33,9 +33,9 @@ [% IF (curval.has_more) OR col.show_view_all %]

    (showing [% IF col.limit_rows AND curval.links.size >= col.limit_rows %] - maximum [% col.limit_rows %] + maximum [% col.limit_rows %] [% ELSE %] - [% curval.links.size %] + [% curval.links.size %] [% END %] row[%IF curval.links.size != 1%]s[%END%].| view all)

    @@ -88,7 +88,7 @@ INCLUDE fields/sub/popover.tt popover_id = 'popover_' _ POPOVER_COUNTER popover_class = 'popover-container--text' - popover_button_class = 'btn btn-small btn-inverted btn-info' + popover_button_class = 'btn btn-sm btn-inverted btn-info' popover_button_text = person.text popover_button_title = person.text popover_no_bottom = 1 diff --git a/views/snippets/dropdown.tt b/views/snippets/dropdown.tt index 798c9a192..562976ab9 100644 --- a/views/snippets/dropdown.tt +++ b/views/snippets/dropdown.tt @@ -3,14 +3,14 @@ class="dropdown-toggle dropdown__toggle" type="button" id="[% id %]" - data-toggle="dropdown" + data-bs-toggle="dropdown" aria-haspopup="listbox" aria-expanded="false" aria-labelledby="=[% id %]" > [% INCLUDE fields/sub/filter.tt value=label; %] - +
    [% FOREACH group IN groups %]
    @@ -27,8 +27,8 @@ id="[% item.id %]" class="link link--plain [% item.class %]" tabindex="-1" - data-toggle="modal" - data-target="#[% item.target %]" + data-bs-toggle="modal" + data-bs-target="#[% item.target %]" > [% INCLUDE fields/sub/filter.tt value=item.label; %] diff --git a/views/snippets/globe_options.tt b/views/snippets/globe_options.tt index 9bfb0d81a..e4e655f10 100644 --- a/views/snippets/globe_options.tt +++ b/views/snippets/globe_options.tt @@ -1,5 +1,5 @@ -
    - +
    +
    -
    - +
    +
    - + -
    - +
    +
    @@ -136,7 +136,7 @@

    Deleting this field will also delete all its associated data.

    - +
    @@ -144,4 +144,3 @@
    [% END %] - diff --git a/views/snippets/layout_permissions.tt b/views/snippets/layout_permissions.tt index 310f43185..5664430b3 100644 --- a/views/snippets/layout_permissions.tt +++ b/views/snippets/layout_permissions.tt @@ -1,10 +1,10 @@ [% BLOCK _permissions_for_group %] [% MACRO permission_input(name, label, group, nested) BLOCK %] -
    - + - + [% nested %]
    [% END %] @@ -55,8 +55,8 @@ [% IF groups.all.size %]
    -
    -
    		[% IF button_type == "button" %] - [% ELSE %] diff --git a/views/tables/basic_cell_modal_button.tt b/views/tables/basic_cell_modal_button.tt index d55f3306f..dc15a89f9 100644 --- a/views/tables/basic_cell_modal_button.tt +++ b/views/tables/basic_cell_modal_button.tt @@ -6,9 +6,9 @@
    [% table_caption | html %]
    - + @@ -53,7 +53,7 @@
    -
    +
    @@ -61,7 +61,7 @@

    Are you sure you want to delete this [% site.team_name | html %]?

    - +
    diff --git a/views/title.tt b/views/title.tt index ecfd7988f..d99c2bf71 100644 --- a/views/title.tt +++ b/views/title.tt @@ -8,8 +8,8 @@ [% IF title.id %] [% END %] -
    - +
    +
    @@ -17,7 +17,7 @@

    [% IF title.id %] - Delete + Delete [% END %]

    @@ -28,10 +28,10 @@

    Titles

    - Add Title + Add Title

    Table for teams
    Name
    - + @@ -53,7 +53,7 @@
    -
    +
    @@ -61,7 +61,7 @@

    Are you sure you want to delete this title?

    - +
    diff --git a/views/topic.tt b/views/topic.tt index 2320e3e9a..7a852fc3e 100644 --- a/views/topic.tt +++ b/views/topic.tt @@ -3,7 +3,7 @@ [% INCLUDE fields/hidden.tt name="csrf_token" value=csrf_token; INCLUDE fields/hidden.tt name="click_to_edit" value=0; - + IF topic.id; INCLUDE fields/hidden.tt name="id" value=topic.id; END; @@ -18,8 +18,13 @@
    -
    -
    +
    +
    +

    + Topic Details +

    +
    +
    [% INCLUDE fields/input.tt id = "name" @@ -72,7 +77,7 @@
    [% right_buttons = []; - + IF topic.id; right_buttons.push({ type = "modal_button", @@ -83,16 +88,16 @@ label = "Delete topic" }); END; - + right_buttons.push({ type = "button", - class = "btn btn-default" + class = "btn btn-primary" id = "submit" name = "submit" value = "submit" label = "Save" }); - + INCLUDE navigation/button_bar.tt row_class = "row" columns = [{ diff --git a/views/topics.tt b/views/topics.tt index 7a96ff115..6f4712a00 100644 --- a/views/topics.tt +++ b/views/topics.tt @@ -42,12 +42,14 @@
    -
    -

    - Edit your topics -

    +
    +
    +

    + Edit your topics +

    +
    -
    +
    [% INCLUDE tables/basic_table.tt; %]
    @@ -68,7 +70,7 @@ buttons = [{ type = "link", target = url.page _ "/" _ layout_obj.identifier _ "/topic/0", - class = "btn btn-inverted btn-add", + class = "btn btn-inverted btn-primary btn-add", label = "Add a topic" }] }]; diff --git a/views/user/my_account.tt b/views/user/my_account.tt index a44df1d79..742c58d11 100644 --- a/views/user/my_account.tt +++ b/views/user/my_account.tt @@ -13,9 +13,9 @@ INCLUDE fields/hidden.tt name="page" value=page; INCLUDE fields/hidden.tt name="username" value=user.username filter="html_entity"; INCLUDE fields/hidden.tt name="id" value=user.id; - + field_counter = 0; - + IF site.user_fields.size > 0; -%]
    @@ -41,7 +41,7 @@ sub_field = ""; sub_params = {}; END; - + IF field.type == "freetext"; INCLUDE fields/input.tt id = field.name @@ -54,7 +54,7 @@ filter = "html" sub_field = sub_field sub_params = sub_params; - + ELSIF field.type == "dropdown"; INCLUDE fields/select_single.tt id = field.name @@ -86,12 +86,12 @@ [% IF site.user_fields.size > 0 %]
    [% END %] - + diff --git a/views/user/user_edit.tt b/views/user/user_edit.tt index 5695a10b7..e6a3753d4 100644 --- a/views/user/user_edit.tt +++ b/views/user/user_edit.tt @@ -114,7 +114,7 @@ type = "button", name = "submit", value = "submit", - class = "btn btn-default", + class = "btn btn-primary", label = "Save changes" }] }]; diff --git a/views/user/user_export.tt b/views/user/user_export.tt index c1980d340..39baacd4c 100644 --- a/views/user/user_export.tt +++ b/views/user/user_export.tt @@ -65,7 +65,7 @@ back_button = { url = url.page _ "/user_overview/" } aside_buttons = [{ type = "form" - class = "btn btn-default" + class = "btn btn-primary" name = "submit" value = "submit" label = "Start export" @@ -79,7 +79,7 @@ [% INCLUDE fields/hidden.tt name="csrf_token" value=csrf_token; %]
    - +
    [% INCLUDE snippets/user_column_view_limits.tt user={} column_class="col-lg-6"; %]
    - + [%- IF user.permission.superadmin -%]
    [% INCLUDE snippets/user_column_permissions.tt user={} column_class="col-lg-5" list_class="list--vertical list--checkboxes"; %]
    [%- END -%] - +
    [% INCLUDE snippets/user_column_groups.tt column_class="col-lg-5" list_class="list--vertical list--checkboxes"; %]
    @@ -59,7 +59,7 @@ type = "button", name = "submit", value = "submit", - class = "btn btn-default", + class = "btn btn-primary", label = "Import" }] }]; diff --git a/views/view.tt b/views/view.tt index afa9c25d1..e089f1db6 100644 --- a/views/view.tt +++ b/views/view.tt @@ -9,8 +9,8 @@
    -
    -
    +
    +
    @@ -107,22 +107,23 @@ [% END %] -
    +
    -
    -
    - +
    -
    +
    @@ -168,28 +169,28 @@
    +
    -
    -
    - +
    +
    +
    -
    +
    -
    @@ -378,6 +379,7 @@
    +
    @@ -389,20 +391,21 @@
    -
    -
    - +
    -
    +
    @@ -492,7 +495,7 @@ %] -
    +
    [% INCLUDE tables/basic_table.tt @@ -521,7 +524,7 @@ %]
    - +
    @@ -586,11 +589,14 @@
    -
    -

    - View help -

    +
    +
    +

    + View help +

    +
    +
    @@ -618,6 +624,7 @@
    +
    @@ -638,7 +645,7 @@ right_buttons.push({ type = "button", - class = "btn btn-default btn-js-save-view" + class = "btn btn-primary btn-js-save-view" id = "saveview" name = "update" value = "update" diff --git a/views/widget.tt b/views/widget.tt index 43dd3ba20..5d30c87a5 100644 --- a/views/widget.tt +++ b/views/widget.tt @@ -1,8 +1,8 @@
    -
    - +
    +
    [% IF widget.type == "notice" %] @@ -32,8 +32,8 @@
    [% BLOCK select_views %] -
    - +
    +
    Table for titles
    Name
    - +
    Table for topics
    @@ -430,7 +426,7 @@ label = "Back" }] right_buttons = [{ - class = "btn-js-next btn-default" + class = "btn-js-next btn-primary" label = "Next" }]; %] @@ -467,7 +463,7 @@ class = "btn-inverted btn-js-skip" label = "Skip creating fields" }, { - class = "btn-js-next btn-default" + class = "btn-js-next btn-primary" label = "Next" }]; %] @@ -616,7 +612,7 @@ -
    +
    [% INCLUDE fields/sub/checkbox.tt id = "show_calculator" @@ -641,7 +637,7 @@
    -
    +
    [% INCLUDE fields/sub/checkbox.tt id = "show_datepicker_date" @@ -662,7 +658,7 @@
    -
    +
    [% INCLUDE fields/sub/checkbox.tt id = "default_today" @@ -687,7 +683,7 @@
    -
    +
    [% INCLUDE fields/sub/checkbox.tt id = "show_datepicker_date-range" @@ -719,7 +715,7 @@
    -
    @@ -751,7 +747,7 @@ @@ -764,7 +760,7 @@

    Each value in the tree is referred to as a node.

    -
    +
    [% INCLUDE fields/sub/checkbox.tt id = "end_node_only" @@ -805,7 +801,7 @@
    -
    +
    [% INCLUDE fields/sub/checkbox.tt id = "default_to_login" @@ -880,7 +876,7 @@
    -
    +
    [% INCLUDE fields/sub/checkbox.tt id = "no_alerts_calc_rag" @@ -969,7 +965,7 @@
    -
    +
    [% INCLUDE fields/sub/checkbox.tt id = "no_alerts_calc" @@ -1036,7 +1032,7 @@
    -
    +
    [% INCLUDE fields/sub/checkbox.tt id = "show_add" @@ -1058,7 +1054,7 @@
    -
    +
    [% INCLUDE fields/sub/checkbox.tt id = "delete_not_used" @@ -1080,7 +1076,7 @@
    -
    +
    [% INCLUDE fields/sub/checkbox.tt id = "override_permissions" @@ -1161,7 +1157,7 @@
    -
    +
    [% PROCESS builder.tt builder_id = instance_layout.instance_id @@ -1193,7 +1189,7 @@ label = "Back" }] right_buttons = [{ - class = "btn-js-next btn-default" + class = "btn-js-next btn-primary" label = "Next" }]; %] @@ -1219,12 +1215,6 @@ # prepare table config table_id = 'custom_field_permissions_table'; table_class = 'table-lines table-no-margin'; - table_layout = { - topStart => "search", - topEnd => "pageLength", - bottomStart => "paging", - bottomEnd => "info" - } table_language = { emptyTable => "There are no groups available", lengthMenu => "Rows per page _MENU_", @@ -1232,7 +1222,7 @@ next => "Next", previous => "Previous" }, - search => "Search in groups:", + search => "Search in groups:", searchPlaceholder => "Search group" } table_page_length = 5; @@ -1419,7 +1409,7 @@ label = "Back" }] right_buttons = [{ - class = "btn-js-next btn-default" + class = "btn-js-next btn-primary" label = "Next" }]; %] @@ -1450,19 +1440,13 @@ [% table_id = 'fields'; table_class = 'table-lines'; - table_layout = { - topStart => "search", - topEnd => "pageLength", - bottomStart => "paging", - bottomEnd => "info" - } table_language = { lengthMenu => "Rows per page _MENU_", paginate => { next => "Next", previous => "Previous" }, - search => "Search in fields:", + search => "Search in fields:", searchPlaceholder => "Search field" } table_page_length = 5; @@ -1501,7 +1485,7 @@ label = "Back" }] right_buttons = [{ - class = "btn-js-save btn-default" + class = "btn-js-save btn-primary" label = "Save" }]; %] diff --git a/views/wizard/timeline_options.tt b/views/wizard/timeline_options.tt index 9e330ebf4..0824a6fe0 100644 --- a/views/wizard/timeline_options.tt +++ b/views/wizard/timeline_options.tt @@ -6,7 +6,7 @@
    [% INCLUDE wizard/sub/modal_header.tt label="Timeline view options"; %] - + [% INCLUDE fields/hidden.tt name="csrf_token" value=csrf_token; %]
    @@ -37,7 +37,7 @@ value = tl_options.group filter = "html"; %] - +
    [% INCLUDE fields/sub/checkbox.tt @@ -69,12 +69,12 @@
    [% overlay_items = [{id="", name=""}]; - + FOREACH overlay_ins IN instances; NEXT IF overlay_ins.instance_id == layout.instance_id; overlay_items.push({id=overlay_ins.instance_id, name=overlay_ins.name}); END; - + INCLUDE fields/select.tt id = "tl_overlay" name = "tl_overlay" @@ -95,7 +95,7 @@ }] right_buttons = [{ type = "submit" - class = "btn-default" + class = "btn-primary" name = "modal_timeline" value = "submit" label = "Update options" diff --git a/views/wizard/user_add.tt b/views/wizard/user_add.tt index f45da34fb..4429f9a4d 100644 --- a/views/wizard/user_add.tt +++ b/views/wizard/user_add.tt @@ -20,7 +20,7 @@ >
    -
    +
    -
    @@ -146,7 +146,7 @@ value = user.id label = "Reject request" }, { - class = "btn-default btn-disabled btn-js-next" + class = "btn-primary btn-disabled btn-js-next" label = "Next" }]; -%] @@ -204,7 +204,7 @@ items = values.${field.name} sub_field = sub_field sub_params = sub_params; - + ELSIF field.type == "textarea"; INCLUDE fields/textarea.tt id=field.name @@ -236,7 +236,7 @@ value = user.id label = "Reject request" }, { - class = "btn-default btn-js-next" + class = "btn-primary btn-js-next" label = "Next" }]; -%] @@ -287,7 +287,7 @@ value = user.id label = "Reject request" }, { - class = "btn-default btn-js-save" + class = "btn-primary btn-js-save" label = "Create account" }]; -%] diff --git a/views/wizard/user_email.tt b/views/wizard/user_email.tt index 679f9f7b8..e5c4d16bc 100644 --- a/views/wizard/user_email.tt +++ b/views/wizard/user_email.tt @@ -2,33 +2,33 @@
    [% INCLUDE wizard/sub/modal_header.tt label="Send an email"; %] - +
    [%- INCLUDE fields/hidden.tt name="csrf_token" value=csrf_token; - + select_items = []; - + FOREACH group IN groups; select_items.push({label_plain=group.name, label_html=group.name, value=group.id}); END; - + INCLUDE fields/select_multiple.tt id = "group" name = "group_ids" items = select_items filter = "html" placeholder = "All users"; - + INCLUDE fields/input.tt id = "email_subject" name = "email_subject" label = "Subject" placeholder = "Subject" type = "text"; - + INCLUDE fields/textarea.tt id = "email_text" name = "email_text" @@ -36,7 +36,7 @@ rows = 10; -%]
    - + [%- INCLUDE wizard/sub/modal_footer.tt left_buttons = [{ @@ -46,7 +46,7 @@ }] right_buttons = [{ type = "submit" - class = "btn-default" + class = "btn-primary" name = "sendemail" value = "submit" label = "Send e-mail" diff --git a/yarn.lock b/yarn.lock index 77777e2e8..15eeb8854 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2306,7 +2306,7 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.1.tgz#ca88080e0cf191d49516d7f300b67aa090d2254f" integrity sha512-UN/H4di+OO7EWx2ovME+8t31YO+KVnK0RRKEHR3kOt21/Ay8BOq3M1OMvWs5vNiqcFCYGYoxK3MXPZzmMUE+yg== -"@typescript-eslint/type-utils@^8.61.1": +"@typescript-eslint/type-utils@8.61.1", "@typescript-eslint/type-utils@^8.61.1": version "8.61.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz#8fa18f453ee140893b47d339d1a6b64cac9b08a1" integrity sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw== @@ -3035,17 +3035,12 @@ bootstrap-icons@^1.11.3: resolved "https://registry.yarnpkg.com/bootstrap-icons/-/bootstrap-icons-1.13.1.tgz#0aad3f5b55b67402990e729ce3883416f9cef6c5" integrity sha512-ijombt4v6bv5CLeXvRWKy7CuM3TRTuPEuGaGKvTV5cz65rQSY8RQ2JcHt6b90cBBAC7s8fsf2EkQDldzCoXUjw== -bootstrap-select@^1.13.18: - version "1.13.18" - resolved "https://registry.npmjs.org/bootstrap-select/-/bootstrap-select-1.13.18.tgz" - integrity sha512-V1IzK4rxBq5FrJtkzSH6RmFLFBsjx50byFbfAf8jYyXROWs7ZpprGjdHeoyq2HSsHyjJhMMwjsQhRoYAfxCGow== +bootstrap-select@^1.14.0-beta3: + version "1.14.0-beta3" + resolved "https://registry.yarnpkg.com/bootstrap-select/-/bootstrap-select-1.14.0-beta3.tgz#dc15083fe51d0ac7b38a3b99dfd492dcc0a783b0" + integrity sha512-wYUDY4NAYBcNydXybE7wh3+ucyf+AcUOhZ+e0TFIoZ38A+k/3BVT1RPl5f0CiPxAexP1IQuqALKMqI8wtZS71A== -bootstrap@^4.6.0: - version "4.6.2" - resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz" - integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ== - -bootstrap@^5.3.0: +bootstrap@^5.3.0, bootstrap@^5.3.8: version "5.3.8" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.8.tgz#6401a10057a22752d21f4e19055508980656aeed" integrity sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg== @@ -3185,12 +3180,7 @@ camelcase@^6.3.0: resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001726: - version "1.0.30001764" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001764.tgz" - integrity sha512-9JGuzl2M+vPL+pz70gtMF9sHdMFbY9FJaQBi186cHKH3pSzDvzoUJUPV6fqiKIMyXbud9ZLg4F3Yza1vJ1+93g== - -caniuse-lite@^1.0.30001782, caniuse-lite@^1.0.30001787: +caniuse-lite@^1.0.30001726, caniuse-lite@^1.0.30001782, caniuse-lite@^1.0.30001787: version "1.0.30001799" resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz" integrity sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw== @@ -3579,45 +3569,20 @@ data-view-byte-offset@^1.0.1: es-errors "^1.3.0" is-data-view "^1.0.1" -datatables.net-bs4@>=1.11.0, datatables.net-bs4@^2: - version "2.3.2" - resolved "https://registry.npmjs.org/datatables.net-bs4/-/datatables.net-bs4-2.3.2.tgz" - integrity sha512-I2a2AeRO+iiMLUI/yCYo8UevscpYxray7AJGUnMep4HmqrQ+NQgseYr38N/kNdY7vxU5XKqq1c+uSGAPkk9Q9A== - dependencies: - datatables.net "2.3.2" - jquery ">=1.7" - -datatables.net-bs4@^2.3.8: +datatables.net-bs5@>=1.11.0, datatables.net-bs5@^2, datatables.net-bs5@^2.3.8: version "2.3.8" - resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-2.3.8.tgz#da3660b5981ba062aa59dda1c81c524201111742" - integrity sha512-i65jbIw6DPG6KyUXRacCFzbawRYA2UjPg68tPkOns/r9YXQngSMQ/+izdmJk1xnPDRXh3cuTqV8cqOIy1NXH1A== + resolved "https://registry.yarnpkg.com/datatables.net-bs5/-/datatables.net-bs5-2.3.8.tgz#7266636ff488429988ca664bc8cb0b7c5e48c563" + integrity sha512-TbFH99QSWm93Kn3teHLFKeyOqYbaiddlHvRFdXUwAvh/fjTMhACWmHG+I43ss8d23OEFHV0WIbN4lpPusZm5zw== dependencies: datatables.net "2.3.8" jquery ">=1.7" -datatables.net-buttons-bs4@^3.2.6: - version "3.2.6" - resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs4/-/datatables.net-buttons-bs4-3.2.6.tgz#a2b11cf21c685b1389ac4d7d9fa362f156732952" - integrity sha512-2veqe+wxSzl9g94KQbzIjLSO+l+xQoDRZ1Un2NHxJRfXeo2JDla8puliCnqn1EGTr+LU24X67r3EI4oL9dhoQA== - dependencies: - datatables.net-bs4 "^2" - datatables.net-buttons "3.2.6" - jquery ">=1.7" - -datatables.net-buttons@3.2.6: - version "3.2.6" - resolved "https://registry.yarnpkg.com/datatables.net-buttons/-/datatables.net-buttons-3.2.6.tgz#dad80c8f28eb18741cec49fb33397073217ca63e" - integrity sha512-rLqkB3xLIAYwVLt+lUSxybo/1WqveTAxhQm6wj6yvXlJiWq+oJ8MKW6H1q90QrXbNp0fGngnfD0cmpMZnNnnNw== - dependencies: - datatables.net "^2" - jquery ">=1.7" - -datatables.net-responsive-bs4@^3.0.8: +datatables.net-responsive-bs5@^3.0.8: version "3.0.8" - resolved "https://registry.yarnpkg.com/datatables.net-responsive-bs4/-/datatables.net-responsive-bs4-3.0.8.tgz#a1bbdb4029b8618981a0e0d6bf85f4f243a9fdb3" - integrity sha512-OvaJdidQhSGbpTb+BMyUSzeRvPrQUHn8h87Z0Sbt9fnPFF7QsqowWo7a9/gxqwP+ZnXhdHLdOM7+DTxir2YRFA== + resolved "https://registry.yarnpkg.com/datatables.net-responsive-bs5/-/datatables.net-responsive-bs5-3.0.8.tgz#666e9dfbd14f330630660374edca5d645c3697d5" + integrity sha512-f0YTxv/HKWKXkOdutwDe3MmRM3AWf4Lxw7FjrgVc3H5+62emUnHep6cA9VwUcAAMywNqMYVndaKPyhAoeKUCyQ== dependencies: - datatables.net-bs4 "^2" + datatables.net-bs5 "^2" datatables.net-responsive "3.0.8" jquery ">=1.7" @@ -3629,12 +3594,12 @@ datatables.net-responsive@3.0.8: datatables.net "^2" jquery ">=1.7" -datatables.net-rowreorder-bs4@^1.5.1: +datatables.net-rowreorder-bs5@^1.5.1: version "1.5.1" - resolved "https://registry.yarnpkg.com/datatables.net-rowreorder-bs4/-/datatables.net-rowreorder-bs4-1.5.1.tgz#85fd5a4c2741f678da27a6798869b1d8ff1f600d" - integrity sha512-26Xx4JbrKhHQDh+GgvVK/XXeFIW6RLQnU5mLtMpy2S+K/9Yffyc71aZ8lyEmm5q7rNnw3LE+hY/FZN5sPTldTQ== + resolved "https://registry.yarnpkg.com/datatables.net-rowreorder-bs5/-/datatables.net-rowreorder-bs5-1.5.1.tgz#95723707127d2b3a6cdf72cbfead2adca8ff676b" + integrity sha512-oA+3zoWNmUFyG8sqpRD4fQ0GJDRSZN0kLywZ+WyQknTDuk9wNwA9h940Y+a2a/79KwZWivQKr7G+3xq7Q0zidg== dependencies: - datatables.net-bs4 ">=1.11.0" + datatables.net-bs5 ">=1.11.0" datatables.net-rowreorder "1.5.1" jquery ">=1.7" @@ -3646,27 +3611,13 @@ datatables.net-rowreorder@1.5.1: datatables.net ">=1.11.0" jquery ">=1.7" -datatables.net@2.3.2: - version "2.3.2" - resolved "https://registry.npmjs.org/datatables.net/-/datatables.net-2.3.2.tgz" - integrity sha512-31TzwIQM0+pr2ZOEOEH6dsHd/WSAl5GDDGPezOHPI3mM2NK4lcDyOoG8xXeWmSbVfbi852LNK5C84fpp4Q+qxg== - dependencies: - jquery ">=1.7" - -datatables.net@2.3.8: +datatables.net@2.3.8, datatables.net@>=1.11.0, datatables.net@^2: version "2.3.8" resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.3.8.tgz#55a8dbe3bd2196951c498ab79bf44602a2bf3229" integrity sha512-uhViowhlDlheAuo5a8TrkQqADsjrtGeOyvrigvr4t0+K3MyAWqClORXWAYIcN9VLX6iIX0C8O9gwJNd01hITRg== dependencies: jquery ">=1.7" -datatables.net@>=1.11.0, datatables.net@^2: - version "2.0.8" - resolved "https://registry.npmjs.org/datatables.net/-/datatables.net-2.0.8.tgz" - integrity sha512-4/2dYx4vl975zQqZbyoVEm0huPe61qffjBRby7K7V+y9E+ORq4R8KavkgrNMmIgO6cl85Pg4AvCbVjvPCIT1Yg== - dependencies: - jquery ">=1.7" - dayjs@^1.10.4: version "1.11.11" resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz" @@ -4825,6 +4776,11 @@ ignore@^5.2.0: resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz" integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== +ignore@^7.0.5: + version "7.0.5" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.5.tgz#4cb5f6cd7d4c7ab0365738c7aea888baa6d7efd9" + integrity sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg== + immutable@^5.1.5: version "5.1.6" resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.1.6.tgz#21639bc80f9a0713e141a5f5a154ef9fdabf36dd" @@ -5738,7 +5694,7 @@ jiti@^2.5.1: jquery-extendext@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/jquery-extendext/-/jquery-extendext-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/jquery-extendext/-/jquery-extendext-1.0.0.tgz#00d6615e2ef7da630fbced293910002a1b281ee1" integrity sha512-gDJjpQ8ISd4ZMwSn0yXSuyufsPMCeWtWJ8kmqE85VromJqyVT2sdkHzS5yL0w1GK81UpOzmr2f9JgFln2sbJSg== dependencies: jquery ">=1.9.1" @@ -5819,6 +5775,11 @@ jsesc@^3.0.2, jsesc@~3.1.0: resolved "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz" integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA== +jsesc@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" + integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g== + json-buffer@3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz" @@ -6510,7 +6471,7 @@ pkg-dir@^4.2.0: popper.js@^1.16.1: version "1.16.1" - resolved "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== possible-typed-array-names@^1.0.0: @@ -6815,7 +6776,7 @@ reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9: get-proto "^1.0.1" which-builtin-type "^1.2.1" -regenerate-unicode-properties@^10.2.2: +regenerate-unicode-properties@^10.2.0, regenerate-unicode-properties@^10.2.2: version "10.2.2" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.2.tgz#aa113812ba899b630658c7623466be71e1f86f66" integrity sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g== @@ -6873,6 +6834,13 @@ regjsgen@^0.8.0: resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz" integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q== +regjsparser@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.12.0.tgz#0e846df6c6530586429377de56e0475583b088dc" + integrity sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ== + dependencies: + jsesc "~3.0.2" + regjsparser@^0.13.0: version "0.13.2" resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.13.2.tgz#f654734b5c588b22ba3e21693b30523417180808" @@ -7244,7 +7212,7 @@ source-map@^0.6.0, source-map@^0.6.1: source-map@^0.7.4: version "0.7.6" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.6.tgz#a3658ab87e5b6429c8a1f3ba0083d4c61ca3ef02" integrity sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ== spdx-exceptions@^2.1.0: @@ -7272,7 +7240,7 @@ sprintf-js@~1.0.2: sql-parser-mistic@^1.2.3: version "1.2.3" - resolved "https://registry.npmjs.org/sql-parser-mistic/-/sql-parser-mistic-1.2.3.tgz" + resolved "https://registry.yarnpkg.com/sql-parser-mistic/-/sql-parser-mistic-1.2.3.tgz#338b8685bd9fe7844df0dccc01afc2ebca0950ea" integrity sha512-2jyVSr7jIgbeFnPW8JO4hTMkDP5mTxbbWX+P7GcCbCwHp+ffiJeQGBK4dDLoPZvexK2Wgy0aUBfsWgc2DPhYRg== sshpk@^1.18.0: @@ -7815,7 +7783,7 @@ unicode-match-property-ecmascript@^2.0.0: unicode-canonical-property-names-ecmascript "^2.0.0" unicode-property-aliases-ecmascript "^2.0.0" -unicode-match-property-value-ecmascript@^2.2.1: +unicode-match-property-value-ecmascript@^2.1.0, unicode-match-property-value-ecmascript@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.1.tgz#65a7adfad8574c219890e219285ce4c64ed67eaa" integrity sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg== From 4a925c42ed58b2ad1a65b95d920d13038ea12045 Mon Sep 17 00:00:00 2001 From: Dave Roberts Date: Thu, 25 Sep 2025 11:50:18 +0100 Subject: [PATCH 18/25] Added searchable select component Removed bootstrap select Bootstrap select is no longer compatible with Bootstrap v5 - the version that is compatible is still in beta and contains bugs that make it unsuitable for our use-case Updated code to fix WCAG issue Updated changes as per ticket Updated datatables for more consistent colours Fix for fullscreen switch not working as expected Modified header for correct placement of pills in dashboard Fixes for issues found on last run Updated datatables Fixes for minor bugs Updated with fixes for BS5 --- lib/GADS.pm | 16 +- package.json | 1 - src/frontend/components/alert/_alert.scss | 4 + .../bootstrap-popover/_bootstrap-popover.scss | 30 ++++ .../components/breadcrumbs/_breadcrumbs.scss | 17 ++ src/frontend/components/button/_button.scss | 17 +- .../components/button/lib/more-info-button.ts | 3 +- src/frontend/components/card/_card.scss | 7 +- .../content-block/_content-block.scss | 10 +- .../components/dashboard/lib/react/Header.tsx | 2 +- .../data-table/_data-table-toggle.scss | 20 ++- .../components/data-table/_data-table.scss | 42 +++-- .../components/data-table/_table-modal.scss | 4 +- .../data-table/lib/DataTablesPlugins.ts | 12 +- .../components/data-table/lib/component.js | 82 +++++---- .../components/form-group/_form-group.scss | 10 +- .../form-group/autosave/lib/autosave.test.ts | 2 +- .../display-conditions/lib/component.js | 4 - .../form-group/filter/lib/component.js | 3 +- .../query-builder/_query-builder.scss | 18 ++ .../FilterSelectHelper.ts} | 32 ++-- .../JQuerySearchableSelect.test.ts | 23 +++ .../JQuerySearchableSelect.ts | 46 +++++ .../searchable-select/_searchable-select.scss | 41 +++++ .../lib/SearchableSelect.test.ts | 57 ++++++ .../searchable-select/lib/SearchableSelect.ts | 169 ++++++++++++++++++ .../searchable-select/lib/options.ts | 6 + .../components/modal/_modal-frame.scss | 1 + .../components/more-less/_more-less.scss | 88 +++++---- .../components/more-less/lib/component.js | 4 +- .../more-less/lib/disclosure-widgets.js | 2 +- src/frontend/components/nav/_tabs.scss | 22 ++- .../components/select-all/lib/component.ts | 1 - .../components/summernote/_summernote.scss | 45 ++--- .../table-header/_table-header.scss | 75 +++++--- .../definitions/_bootstrap_base.scss | 6 +- src/frontend/css/stylesheets/external.scss | 1 - src/frontend/css/stylesheets/general.scss | 4 +- .../lib/util/errorHandler/lib/errorHandler.ts | 1 - src/frontend/js/lib/util/filedrag/index.ts | 2 +- views/admin/audit.tt | 7 + views/data_table.tt | 2 +- views/fields/select_single.tt | 2 +- views/historic_purge/initial.tt | 2 +- views/layouts/page_reporting_overview.tt | 6 +- views/user/user_overview.tt | 6 +- views/view.tt | 4 +- views/wizard/table_add.tt | 10 +- yarn.lock | 5 - 49 files changed, 743 insertions(+), 231 deletions(-) create mode 100644 src/frontend/components/breadcrumbs/_breadcrumbs.scss rename src/frontend/components/form-group/{common/bootstrap-select.js => searchable-select/FilterSelectHelper.ts} (56%) create mode 100644 src/frontend/components/form-group/searchable-select/JQuerySearchableSelect.test.ts create mode 100644 src/frontend/components/form-group/searchable-select/JQuerySearchableSelect.ts create mode 100644 src/frontend/components/form-group/searchable-select/_searchable-select.scss create mode 100644 src/frontend/components/form-group/searchable-select/lib/SearchableSelect.test.ts create mode 100644 src/frontend/components/form-group/searchable-select/lib/SearchableSelect.ts create mode 100644 src/frontend/components/form-group/searchable-select/lib/options.ts diff --git a/lib/GADS.pm b/lib/GADS.pm index 9592bb03b..22807af00 100644 --- a/lib/GADS.pm +++ b/lib/GADS.pm @@ -418,7 +418,7 @@ get '/' => require_login sub { dashboards_json => schema->resultset('Dashboard')->dashboards_json(%params), page => 'index', 'content_block_main_custom_classes' => 'pt-0', - 'content_block_custom_classes' => 'pl-0' + 'content_block_custom_classes' => 'ps-0' }; if (my $download = param('download')) @@ -1760,7 +1760,7 @@ put '/api/file/:id' => require_login sub { } else { - my $file = schema->resultset('Fileval')->find_with_permission($id, logged_in_user, + my $file = schema->resultset('Fileval')->find_with_permission($id, logged_in_user, rename_existing => 1) or error __x"File ID {id} cannot be found", id => $id; @@ -2145,7 +2145,7 @@ prefix '/:layout_name' => sub { dashboards_json => schema->resultset('Dashboard')->dashboards_json(%params), page => 'table_index', header_type => "table_tabs", - content_block_custom_classes => "pl-0", + content_block_custom_classes => "ps-0", content_block_main_custom_classes => "pt-0", header_back_url => "${base_url}table", layout_obj => $layout, @@ -2317,7 +2317,7 @@ prefix '/:layout_name' => sub { any ['get', 'post'] => '/data' => require_login sub { my $layout = var('layout') or pass; - + my $user = logged_in_user; my @additional_filters; @@ -3121,10 +3121,10 @@ prefix '/:layout_name' => sub { } } - return template "historic_purge/initial" => { - columns_view => \@columns, - count => $records->count, - columns_selected => $columns_selected + return template "historic_purge/initial" => { + columns_view => \@columns, + count => $records->count, + columns_selected => $columns_selected }; }; diff --git a/package.json b/package.json index 20ef8b3ea..886683a5d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "@egjs/hammerjs": "^2.0.17", "bootstrap": "^5.3.8", "bootstrap-datepicker": "^1.9.0", - "bootstrap-select": "^1.14.0-beta3", "component-emitter": "^1.3.0", "datatables.net-bs5": "^2.3.8", "datatables.net-responsive-bs5": "^3.0.8", diff --git a/src/frontend/components/alert/_alert.scss b/src/frontend/components/alert/_alert.scss index eb62fad14..f99b5f0ad 100644 --- a/src/frontend/components/alert/_alert.scss +++ b/src/frontend/components/alert/_alert.scss @@ -59,3 +59,7 @@ content: "\E822"; color: $black; } + +.alert-warning { + --bs-alert-bg: #{$brand-warning}; +} diff --git a/src/frontend/components/bootstrap-popover/_bootstrap-popover.scss b/src/frontend/components/bootstrap-popover/_bootstrap-popover.scss index a03f87815..092f711c3 100644 --- a/src/frontend/components/bootstrap-popover/_bootstrap-popover.scss +++ b/src/frontend/components/bootstrap-popover/_bootstrap-popover.scss @@ -1,5 +1,6 @@ .btn-popover { @include button-variant($transparent, $transparent, $primary, $hover-color: darken($primary, 10%)); + padding: 0; margin: 0 $padding-small-vertical; align-content: center; @@ -39,4 +40,33 @@ .popover { max-width: 50%; + z-index: 2000; +} + +.list__value { + .btn-popover { + background: $transparent; + color: $primary; + border: solid 1px $primary; + padding: 7px 20px; + + &::before { + content: none; + } + + &::after { + content: "\E810"; + transition: all 0.2s ease-in-out; + } + + &:hover { + border-color: $secondary; + color: $secondary; + + &::after { + color: $secondary; + transform: scale(1.2); + } + } + } } diff --git a/src/frontend/components/breadcrumbs/_breadcrumbs.scss b/src/frontend/components/breadcrumbs/_breadcrumbs.scss new file mode 100644 index 000000000..2d591bd2a --- /dev/null +++ b/src/frontend/components/breadcrumbs/_breadcrumbs.scss @@ -0,0 +1,17 @@ +.breadcrumb-item { + a { + color: $secondary; + text-decoration: underline; + transition: $transition-default; + + &:hover { + color: $primary; + text-decoration: none; + } + } + + &.active { + color: $secondary; + text-decoration: none; + } +} diff --git a/src/frontend/components/button/_button.scss b/src/frontend/components/button/_button.scss index 6b9df6e80..2b6ef10dd 100644 --- a/src/frontend/components/button/_button.scss +++ b/src/frontend/components/button/_button.scss @@ -28,6 +28,10 @@ color: $white; } + &:focus { + box-shadow: 0 0 0 0.2rem rgba($primary, 0.5); + } + &.btn-inverted::after { color: $primary; } @@ -134,7 +138,7 @@ } .btn-disabled { - @include button-variant($white, $gray, $gray, $hover-color: $white); + @include button-variant($gray, $gray, $white, $hover-color: $white); &:hover { cursor: not-allowed; @@ -363,7 +367,7 @@ .btn-filter { &::before { - content: "\E80c"; + content: "\E80C"; } } @@ -530,3 +534,12 @@ @extend %icon-font; content: "\E80b"; } + +button.close { + background: $transparent; + border: none; + + &:hover { + color: lighten($brand-primary, 0.1); + } +} diff --git a/src/frontend/components/button/lib/more-info-button.ts b/src/frontend/components/button/lib/more-info-button.ts index f9f640769..8709b3963 100644 --- a/src/frontend/components/button/lib/more-info-button.ts +++ b/src/frontend/components/button/lib/more-info-button.ts @@ -6,8 +6,9 @@ export default function createMoreInfoButton(element: HTMLElement | JQuery { const $button = $(ev.target).closest('.btn'); const record_id = $button.data('record-id'); - const modal_id = $button.data('target'); + const modal_id = $button.data('bs-target'); const $modal = $(document).find(modal_id); + if(!$modal || !$modal.length) throw new Error('Modal not found: ' + modal_id); $modal.find('.modal-title').text(`Record ID: ${record_id}`); $modal.find('.modal-body').text('Loading...'); diff --git a/src/frontend/components/card/_card.scss b/src/frontend/components/card/_card.scss index d9741810c..23b911003 100644 --- a/src/frontend/components/card/_card.scss +++ b/src/frontend/components/card/_card.scss @@ -16,6 +16,7 @@ h1, h2, h3, h4, h5, h6, p, span, div { padding: 0; margin: 0; + font-weight: 600; } h4 { @@ -33,7 +34,7 @@ light, dark) { .card-#{$color} { - border-color: var(--bs-#{$color}); + border: none; .card-header { background-color: var(--bs-#{$color}); @@ -68,7 +69,7 @@ background-color: var(--bs-white); h1, h2, h3, h4, h5, h6, p, span, div { - color: var(--bs-black); + color: var(--bs-secondary); } h4 { @@ -195,7 +196,7 @@ a.card--settings { margin-right: 0; margin-bottom: 0; - span { + span:not(.btn__title) { @extend .visually-hidden; } } diff --git a/src/frontend/components/content-block/_content-block.scss b/src/frontend/components/content-block/_content-block.scss index 1c564a374..9209fbb01 100644 --- a/src/frontend/components/content-block/_content-block.scss +++ b/src/frontend/components/content-block/_content-block.scss @@ -4,15 +4,23 @@ } .content-block__navigation { + --bs-nav-link-font-size: $font-size-base; display: flex; position: relative; flex-wrap: wrap; gap: $padding-base-horizontal; align-items: center; - justify-content: space-between; margin-bottom: 1px; // To reserve room for the bottom border of 2px padding: $padding-base-vertical 0 $padding-base-vertical; + &:not(.nav-pills) { + justify-content: space-between; + } + + &.nav-pills { + justify-content: start; + } + &::after { content: ''; position: absolute; diff --git a/src/frontend/components/dashboard/lib/react/Header.tsx b/src/frontend/components/dashboard/lib/react/Header.tsx index 12383c28e..a3d2a8bc7 100644 --- a/src/frontend/components/dashboard/lib/react/Header.tsx +++ b/src/frontend/components/dashboard/lib/react/Header.tsx @@ -12,7 +12,7 @@ import { Nav } from 'react-bootstrap'; export default function Header ({ hMargin, dashboards, currentDashboard, includeH1 }: HeaderProps): React.JSX.Element { return (
    -
    diff --git a/views/user/user_overview.tt b/views/user/user_overview.tt index 5fca46b80..aab10ed67 100644 --- a/views/user/user_overview.tt +++ b/views/user/user_overview.tt @@ -93,17 +93,17 @@ aside_buttons = ! user.permission.useradmin ? [] : [{ type = "modal_button" modalId = "emailUsersModal" - class = "btn btn-email" + class = "btn btn-email py-0 me-2" label = "Email users" }, { type = "link" target = url.page _ "/user_upload/" - class = "btn btn-import" + class = "btn btn-import py-0" label = "Import users" }, { type = "link" target = url.page _ "/user_export/" - class = "btn btn-export" + class = "btn btn-export py-0" label = "Export users" }, { type = "modal_button" diff --git a/views/view.tt b/views/view.tt index e089f1db6..7e9af9d7f 100644 --- a/views/view.tt +++ b/views/view.tt @@ -524,7 +524,7 @@ %]