From 46530c6c644bec65c2219fd9b5830bc5bb8e9baf Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 22 Apr 2022 15:50:35 +0200 Subject: [PATCH] fix(frontend): various fe incompatabilities with updated tooling --- frontend/src/lib/movement-observer/movement-observer.js | 2 +- frontend/src/lib/storage-manager/storage-manager.js | 2 +- frontend/src/services/util-registry/util-registry.js | 2 +- frontend/src/utils/async-table/async-table.js | 4 ++-- frontend/src/utils/form/datepicker.js | 2 +- frontend/src/utils/form/form-error-reporter.js | 2 +- frontend/src/utils/form/navigate-away-prompt.js | 2 +- frontend/src/utils/hide-columns/hide-columns.js | 6 +++--- frontend/src/utils/navbar/navbar.js | 2 +- frontend/src/utils/pageactions/pageactions.js | 2 +- src/Application.hs | 2 -- 11 files changed, 13 insertions(+), 15 deletions(-) diff --git a/frontend/src/lib/movement-observer/movement-observer.js b/frontend/src/lib/movement-observer/movement-observer.js index b6846c10e..b322346c3 100644 --- a/frontend/src/lib/movement-observer/movement-observer.js +++ b/frontend/src/lib/movement-observer/movement-observer.js @@ -1,4 +1,4 @@ -import * as debounce from 'lodash.debounce'; +import debounce from 'lodash.debounce'; export const MOVEMENT_INDICATOR_ELEMENT_CLASS = 'movement-indicator'; const MOVEMENT_DEBOUNCE = 250; diff --git a/frontend/src/lib/storage-manager/storage-manager.js b/frontend/src/lib/storage-manager/storage-manager.js index 75cb54fe9..f42b4d464 100644 --- a/frontend/src/lib/storage-manager/storage-manager.js +++ b/frontend/src/lib/storage-manager/storage-manager.js @@ -1,6 +1,6 @@ /* global global:writable */ -import * as semver from 'semver'; +import semver from 'semver'; import sodium from 'sodium-javascript'; import { HttpClient } from '../../services/http-client/http-client'; diff --git a/frontend/src/services/util-registry/util-registry.js b/frontend/src/services/util-registry/util-registry.js index 2b0005a35..5644d8719 100644 --- a/frontend/src/services/util-registry/util-registry.js +++ b/frontend/src/services/util-registry/util-registry.js @@ -1,4 +1,4 @@ -import * as toposort from 'toposort'; +import toposort from 'toposort'; const DEBUG_MODE = /localhost/.test(window.location.href) ? 1 : 0; diff --git a/frontend/src/utils/async-table/async-table.js b/frontend/src/utils/async-table/async-table.js index a8b85e19f..1cc6212f3 100644 --- a/frontend/src/utils/async-table/async-table.js +++ b/frontend/src/utils/async-table/async-table.js @@ -3,8 +3,8 @@ import { StorageManager, LOCATION } from '../../lib/storage-manager/storage-mana import { Datepicker } from '../form/datepicker'; import { HttpClient } from '../../services/http-client/http-client'; import { EventManager, EventWrapper, EVENT_TYPE } from '../../lib/event-manager/event-manager'; -import * as debounce from 'lodash.debounce'; -import * as throttle from 'lodash.throttle'; +import debounce from 'lodash.debounce'; +import throttle from 'lodash.throttle'; import './async-table-filter.sass'; import './async-table.sass'; diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js index b2906dd4e..a32294162 100644 --- a/frontend/src/utils/form/datepicker.js +++ b/frontend/src/utils/form/datepicker.js @@ -2,7 +2,7 @@ import { Utility } from '../../core/utility'; import moment from 'moment'; import { EventManager, EventWrapper, EVENT_TYPE } from '../../lib/event-manager/event-manager'; -import * as defer from 'lodash.defer'; +import defer from 'lodash.defer'; // INTERNAL (Uni2work specific) formats for formatting dates and/or times diff --git a/frontend/src/utils/form/form-error-reporter.js b/frontend/src/utils/form/form-error-reporter.js index ed3012b26..3f453b5e6 100644 --- a/frontend/src/utils/form/form-error-reporter.js +++ b/frontend/src/utils/form/form-error-reporter.js @@ -1,5 +1,5 @@ import { Utility } from '../../core/utility'; -import * as defer from 'lodash.defer'; +import defer from 'lodash.defer'; import { EventManager, EventWrapper, EVENT_TYPE } from '../../lib/event-manager/event-manager'; const FORM_ERROR_REPORTER_INITIALIZED_CLASS = 'form-error-remover--initialized'; diff --git a/frontend/src/utils/form/navigate-away-prompt.js b/frontend/src/utils/form/navigate-away-prompt.js index 69c430853..077279e13 100644 --- a/frontend/src/utils/form/navigate-away-prompt.js +++ b/frontend/src/utils/form/navigate-away-prompt.js @@ -6,7 +6,7 @@ import { AUTO_SUBMIT_INPUT_UTIL_SELECTOR } from './auto-submit-input'; import { InteractiveFieldset } from './interactive-fieldset'; import { Datepicker } from './datepicker'; -import * as defer from 'lodash.defer'; +import defer from 'lodash.defer'; /** * Key generator from an arbitrary number of FormData objects. diff --git a/frontend/src/utils/hide-columns/hide-columns.js b/frontend/src/utils/hide-columns/hide-columns.js index 79390402a..3d6286b2e 100644 --- a/frontend/src/utils/hide-columns/hide-columns.js +++ b/frontend/src/utils/hide-columns/hide-columns.js @@ -158,12 +158,12 @@ export class HideColumns { switchColumnDisplay(th, hidden) { hidden = typeof(hidden) === 'undefined' ? !this.isHiddenTH(th) : !!hidden; - this.cellColumns(th).forEach(columnIndex => this.updateColumnDisplay(columnIndex, hidden)); + Array.from(this.cellColumns(th)).forEach(columnIndex => this.updateColumnDisplay(columnIndex, hidden)); } updateColumnDisplay(columnIndex, hidden) { // console.debug('updateColumnDisplay', { columnIndex, hidden }); - this._element.rows.forEach(row => { + Array.from(this._element.rows).forEach(row => { const cell = this.getCol(row, columnIndex); if (cell) { @@ -235,7 +235,7 @@ export class HideColumns { } updateHiderIcon(hider, hidden) { - hider.getElementsByClassName('fas').forEach(hiderIcon => { + Array.from(hider.getElementsByClassName('fas')).forEach(hiderIcon => { hiderIcon.classList.remove(hidden ? 'fa-eye' : 'fa-eye-slash'); hiderIcon.classList.add(hidden ? 'fa-eye-slash' : 'fa-eye'); }); diff --git a/frontend/src/utils/navbar/navbar.js b/frontend/src/utils/navbar/navbar.js index 08c11428c..5eb09831d 100644 --- a/frontend/src/utils/navbar/navbar.js +++ b/frontend/src/utils/navbar/navbar.js @@ -1,7 +1,7 @@ import { Utility } from '../../core/utility'; import { EventManager, EventWrapper, EVENT_TYPE } from '../../lib/event-manager/event-manager'; import './navbar.sass'; -import * as throttle from 'lodash.throttle'; +import throttle from 'lodash.throttle'; export const HEADER_CONTAINER_UTIL_SELECTOR = '.navbar__list-item--container-selector .navbar__link-wrapper'; const HEADER_CONTAINER_INITIALIZED_CLASS = 'navbar-header-container--initialized'; diff --git a/frontend/src/utils/pageactions/pageactions.js b/frontend/src/utils/pageactions/pageactions.js index 88084636b..9ac157ca0 100644 --- a/frontend/src/utils/pageactions/pageactions.js +++ b/frontend/src/utils/pageactions/pageactions.js @@ -1,7 +1,7 @@ import { Utility } from '../../core/utility'; import { EventManager, EventWrapper, EVENT_TYPE } from '../../lib/event-manager/event-manager'; import './pageactions.sass'; -import * as throttle from 'lodash.throttle'; +import throttle from 'lodash.throttle'; export const PAGEACTION_SECONDARY_UTIL_SELECTOR = '.pagenav__list-item'; const PAGEACTION_SECONDARY_INITIALIZED_CLASS = '.pagenav-list-item--initialized'; diff --git a/src/Application.hs b/src/Application.hs index 5f86cd20d..7d02e6009 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -719,5 +719,3 @@ addPWEntry User{ userAuthentication = _, ..} (Text.encodeUtf8 -> pw) = db' $ do PWHashConf{..} <- getsYesod $ view _appAuthPWHash (AuthPWHash . Text.decodeUtf8 -> userAuthentication) <- liftIO $ makePasswordWith pwHashAlgorithm pw pwHashStrength void $ insert User{..} - -