diff --git a/meteor_packages/mats-common/.npm/package/npm-shrinkwrap.json b/meteor_packages/mats-common/.npm/package/npm-shrinkwrap.json index f52478a7f..38f8b0e1c 100644 --- a/meteor_packages/mats-common/.npm/package/npm-shrinkwrap.json +++ b/meteor_packages/mats-common/.npm/package/npm-shrinkwrap.json @@ -6,6 +6,26 @@ "resolved": "https://registry.npmjs.org/@couchbase/couchbase-darwin-arm64-napi/-/couchbase-darwin-arm64-napi-4.6.0.tgz", "integrity": "sha512-zSL/I4tipdgszW8Yz3P5KxVKoZruHsUdeE01CrkEPOZh23xpbFRj0RQSM3eIuxy5AsBkg1aFq5icY0Yqmt1g9g==" }, + "@lit-labs/ssr-dom-shim": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.5.1.tgz", + "integrity": "sha512-Aou5UdlSpr5whQe8AA/bZG0jMj96CoJIWbGfZ91qieWu5AWUMKw8VR/pAkQkJYvBNhmCcWnZlyyk5oze8JIqYA==" + }, + "@lit/reactive-element": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.1.2.tgz", + "integrity": "sha512-pbCDiVMnne1lYUIaYNN5wrwQXDtHaYtg7YEFPeW+hws6U47WeFvISGUWekPGKWOP1ygrs0ef0o1VJMk1exos5A==" + }, + "@types/trusted-types": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==" + }, + "@uswds/uswds": { + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.13.0.tgz", + "integrity": "sha512-8P494gmXv/0sm09ExSdj8wAMjGLnM7UMRY/XgsMIRKnWfDXG+TyuCOKIuD4lqs+gLvSmi1nTQKyd0c0/A7VWJQ==" + }, "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -176,6 +196,11 @@ "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==" }, + "element-closest": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/element-closest/-/element-closest-2.0.2.tgz", + "integrity": "sha512-QCqAWP3kwj8Gz9UXncVXQGdrhnWxD8SQBSeZp5pOsyCcQ6RpL738L1/tfuwBiMi6F1fYkxqPnBrFBR4L+f49Cg==" + }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -304,9 +329,9 @@ "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==" }, "iconv-lite": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", - "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==" + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", + "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==" }, "ieee754": { "version": "1.2.1", @@ -349,9 +374,9 @@ "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==" }, "jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-4.0.0.tgz", + "integrity": "sha512-TXCHVR3Lb6TZdtw1l3RTLf8RBWVGexdxL6AC8/e0xZKEpBflBsjh9/8LXw+dkNFuOyW9B7iB3O1sP7hS0Kiacg==" }, "json-parse-helpfulerror": { "version": "1.0.3", @@ -363,15 +388,35 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==" }, + "keyboardevent-key-polyfill": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/keyboardevent-key-polyfill/-/keyboardevent-key-polyfill-1.1.0.tgz", + "integrity": "sha512-NTDqo7XhzL1fqmUzYroiyK2qGua7sOMzLav35BfNA/mPUSCtw8pZghHFMTYR9JdnJ23IQz695FcaM6EE6bpbFQ==" + }, "lighten-darken-color": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lighten-darken-color/-/lighten-darken-color-1.0.0.tgz", "integrity": "sha512-rKToRUNvcIJGuT+Zd/ljNb83wwJPc4V4HNxYuqIdizQHt3avilV6H1rq2feaxruJBpAIbE1ZJ8wX7BKjTylIsA==" }, + "lit": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/lit/-/lit-3.3.2.tgz", + "integrity": "sha512-NF9zbsP79l4ao2SNrH3NkfmFgN/hBYSQo90saIVI1o5GpjAdCPVstVzO1MrLOakHoEhYkrtRjPK6Ob521aoYWQ==" + }, + "lit-element": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.2.2.tgz", + "integrity": "sha512-aFKhNToWxoyhkNDmWZwEva2SlQia+jfG0fjIWV//YeTaWrVnOxD89dPKfigCUspXFmjzOEUQpOkejH5Ly6sG0w==" + }, + "lit-html": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.3.2.tgz", + "integrity": "sha512-Qy9hU88zcmaxBXcc10ZpdK7cOLXvXpRoBxERdtqV9QOrfpMZZ6pSYP91LhpPtap3sFMUiL7Tw2RImbe0Al2/kw==" + }, "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "version": "4.17.23", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", + "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==" }, "long": { "version": "5.3.2", @@ -388,6 +433,11 @@ "resolved": "https://registry.npmjs.org/lru.min/-/lru.min-1.1.3.tgz", "integrity": "sha512-Lkk/vx6ak3rYkRR0Nhu4lFUT2VDnQSxBe8Hbl7f36358p6ow8Bnvr8lrLt98H8J1aGxfhbX4Fs5tYg2+FTwr5Q==" }, + "matches-selector": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/matches-selector/-/matches-selector-1.2.0.tgz", + "integrity": "sha512-c4vLwYWyl+Ji+U43eU/G5FwxWd4ZH0ePUsFs5y0uwD9HUEFBXUQ1zUUan+78IpRD+y4pUfG0nAzNM292K7ItvA==" + }, "math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -451,9 +501,9 @@ "integrity": "sha512-FBrGau0IXmuqg4haEZRBfHNWB5mUARw6hNwPDXXGg0XzVJ50mr/9hb267lvpVMnhZ1FON3qNd4Xfcez1rbFwSg==" }, "named-placeholders": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.4.tgz", - "integrity": "sha512-/qfG0Kk/bLJIvej4FcPQ2KYUJP8iQdU1CTxysNb/U2wUNb+/4K485yeio8iNoiwfqJnsTInXoRPTza0dZWHVJQ==" + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.6.tgz", + "integrity": "sha512-Tz09sEL2EEuv5fFowm419c1+a/jSMiBjI9gHxVLrVdbUkkNUUfjsVYs9pVZu5oCon/kmRh9TfLEObFtkVxmY0w==" }, "node-addon-api": { "version": "8.5.0", @@ -475,6 +525,11 @@ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==" }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + }, "object-hash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", @@ -506,9 +561,9 @@ "integrity": "sha512-RUOOOjHLhgR1MIQrCtnEqz/HJ1RMZBIN+REnpSUrfft2bXqXy69fwJASVziWExfFXsR1bCY0TznnHooNsCo0/w==" }, "qs": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz", - "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==" + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", + "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==" }, "rc": { "version": "1.2.8", @@ -520,6 +575,11 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==" }, + "receptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/receptor/-/receptor-1.0.0.tgz", + "integrity": "sha512-yvVEqVQDNzEmGkluCkEdbKSXqZb3WGxotI/VukXIQ+4/BXEeXVjWtmC6jWaR1BIsmEAGYQy3OTaNgDj2Svr01w==" + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -635,11 +695,6 @@ "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz", "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==" }, - "use-bootstrap-select": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/use-bootstrap-select/-/use-bootstrap-select-2.2.1.tgz", - "integrity": "sha512-yOa+YrCzBon1qP7QUX6dutHPV74YJsMr01RqaDLmel0ztZqQQ/EGeGjq4HiGwN6KQB/3t3E5fHjRhJZHtSR+sQ==" - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/meteor_packages/mats-common/client/main.js b/meteor_packages/mats-common/client/main.js index f4e521ef4..db74dcc6c 100644 --- a/meteor_packages/mats-common/client/main.js +++ b/meteor_packages/mats-common/client/main.js @@ -13,6 +13,6 @@ import "../imports/startup/both"; import "@fortawesome/fontawesome-free"; import "@fortawesome/fontawesome-free/css/all.css"; import "@fortawesome/fontawesome-free/js/all.js"; -import "use-bootstrap-select/dist/use-bootstrap-select.css"; -import "use-bootstrap-select/dist/use-bootstrap-select.js"; +import "@uswds/uswds/dist/css/uswds.min.css"; +import "@uswds/uswds/dist/js/uswds.min.js"; import "daterangepicker/daterangepicker.css"; diff --git a/meteor_packages/mats-common/imports/startup/client/select_util.js b/meteor_packages/mats-common/imports/startup/client/select_util.js index 50cd91aae..c66949c79 100644 --- a/meteor_packages/mats-common/imports/startup/client/select_util.js +++ b/meteor_packages/mats-common/imports/startup/client/select_util.js @@ -23,7 +23,6 @@ const refreshDependents = function (event, param) { const name = dependentNames[i]; const targetParam = matsParamUtils.getParameterForName(name); const targetElem = matsParamUtils.getInputElementForParamName(targetParam.name); - const targetID = matsParamUtils.getInputIdForParam(targetParam); try { if ( !( @@ -55,9 +54,6 @@ const refreshDependents = function (event, param) { targetOptions[i2].selected = select; } } - if (global.selectorHandlers[targetID]) { - global.selectorHandlers[targetID].update(); - } } } } @@ -533,13 +529,6 @@ const refresh = function (event, paramName) { optionsAsString += ""; } $(`select[name="${name}"]`).empty().append(optionsAsString); - const selectorID = matsParamUtils.getInputIdForParam( - matsParamUtils.getParameterForName(name) - ); - if (global.selectorHandlers[selectorID]) { - global.selectorHandlers[selectorID].update(); - } - // reset the selected index if it had been set prior (the list may have changed so the index may have changed) let selectedOptionIndex; let selectedOptionOverlap = []; @@ -638,10 +627,6 @@ const refresh = function (event, paramName) { ); } } - const targetID = matsParamUtils.getInputIdForParam(param); - if (global.selectorHandlers[targetID]) { - global.selectorHandlers[targetID].update(); - } } catch (e) { e.message = `INFO: Error in select.js refresh: resetting selected options: ${e.message}`; setInfo(e.message); diff --git a/meteor_packages/mats-common/lib/param_util.js b/meteor_packages/mats-common/lib/param_util.js index eed790c1e..93c0e0d17 100644 --- a/meteor_packages/mats-common/lib/param_util.js +++ b/meteor_packages/mats-common/lib/param_util.js @@ -96,6 +96,14 @@ const getInputIdForParam = function (param) { // get the document element that corresponds to the param name const getInputElementForParamName = function (paramName) { const param = getParameterForName(paramName); + if (param.type === matsTypes.InputTypes.select && !param.multiple) { + const classElem = document.getElementsByClassName( + `data-input usa-select ${param.name} usa-sr-only usa-combo-box__select` + )[0]; + if (classElem) { + return classElem; + } + } const id = getInputIdForParam(param); if (id === undefined) { return undefined; @@ -169,13 +177,6 @@ const setInputForParamName = function (paramName, value) { // SHOULD DEAL WITH CHECKBOXES HERE if (param.type === matsTypes.InputTypes.radioGroup) { $(`#${id}-${value}`).prop("checked", true); - } else if ( - elem && - global.selectorHandlers[id] && - global.selectorHandlers[id].getValue() !== value - ) { - global.selectorHandlers[id].setValue(value); - setValueTextForParamName(paramName, value); } else if (elem && elem.type === "select-multiple") { $(`#${id}`).val(value); setValueTextForParamName(paramName, value); diff --git a/meteor_packages/mats-common/package.js b/meteor_packages/mats-common/package.js index c90c4aa3c..ee6979ea4 100644 --- a/meteor_packages/mats-common/package.js +++ b/meteor_packages/mats-common/package.js @@ -50,7 +50,7 @@ Package.onUse(function (api) { "vanillajs-datepicker": "1.3.4", // make things pretty - "use-bootstrap-select": "2.2.1", + "@uswds/uswds": "3.13.0", "lighten-darken-color": "1.0.0", "rgb-hex": "4.1.0", "hex-rgb": "5.0.0", diff --git a/meteor_packages/mats-common/public/MATSReleaseNotes.html b/meteor_packages/mats-common/public/MATSReleaseNotes.html index 338b2fbe3..b4fcf10e1 100755 --- a/meteor_packages/mats-common/public/MATSReleaseNotes.html +++ b/meteor_packages/mats-common/public/MATSReleaseNotes.html @@ -6,12 +6,10 @@

All apps v6.2.3

Changes:

* Added new MATS logo.

-

* Replaced USWDS selectors with Bootstrap 5 selectors.

* Improved metadata for 1 Hour Precipitation app.

* Fixed bug where date selector would open on page load.

* Fixed bug where METAR app would not let you filter by negative numbers.

* Fixed plotly bug casuing contour plot min and max to be ignored.

-

* Edited curves don't go out of edit mode until you click save.

* Removed unnecessary and irritating reset to defaults calls.

* Fixed bug where threshold plots had the wrong axis label in most apps (Upper Air diff --git a/meteor_packages/mats-common/templates/selectorItems/item.js b/meteor_packages/mats-common/templates/selectorItems/item.js index 394c998cd..4c04f896f 100644 --- a/meteor_packages/mats-common/templates/selectorItems/item.js +++ b/meteor_packages/mats-common/templates/selectorItems/item.js @@ -243,12 +243,7 @@ Template.item.events({ if (elem !== null) { elem.style.display = "block"; if (this.type === matsTypes.InputTypes.select) { - // need to foricibly open the selector for the select - if (global.selectorHandlers[`${this.name}-${this.type}`]) { - global.selectorHandlers[`${this.name}-${this.type}`].show(); - } else { - $(`#${this.name}-${this.type}`).trigger("click"); - } + $(`#${this.name}-${this.type}`).trigger("click"); // need to foricibly open the selector for the select } if (this.type === matsTypes.InputTypes.selectMap) { $("#mapModal").modal("show"); diff --git a/meteor_packages/mats-common/templates/selectorItems/select.html b/meteor_packages/mats-common/templates/selectorItems/select.html index 4ca8ea0ab..fc471467d 100644 --- a/meteor_packages/mats-common/templates/selectorItems/select.html +++ b/meteor_packages/mats-common/templates/selectorItems/select.html @@ -1,6 +1,6 @@ diff --git a/meteor_packages/mats-common/templates/selectorItems/select.js b/meteor_packages/mats-common/templates/selectorItems/select.js index 4b1180b90..16859f5b0 100644 --- a/meteor_packages/mats-common/templates/selectorItems/select.js +++ b/meteor_packages/mats-common/templates/selectorItems/select.js @@ -9,85 +9,22 @@ import { matsSelectUtils, } from "meteor/randyp:mats-common"; import { Template } from "meteor/templating"; -// eslint-disable-next-line import/no-unresolved -import UseBootstrapSelect from "use-bootstrap-select"; /* global Session, $, setError */ -global.selectorHandlers = {}; /* Much of the work for select widgets happens in mats-common->imports->client->select_util.js. Especially the refresh routine which sets all the options. Don't forget to look there for much of the handling. */ -const setValue = function (pName) { - const elem = matsParamUtils.getInputElementForParamName(pName); - const { selectedOptions } = elem; - if ( - selectedOptions === undefined || - selectedOptions.length === 0 || - elem.selectedIndex === -1 - ) { - // nothing is selected so set the selector to unused - matsParamUtils.setValueTextForParamName(pName, matsTypes.InputTypes.unused); - } else if (selectedOptions.length === 1) { - // set the selector to the single item - matsParamUtils.setValueTextForParamName(pName, selectedOptions[0].text); - } else { - // multiselect with more than one selected item, so shorten the display text - const firstOption = selectedOptions[0]; - const lastOption = selectedOptions[selectedOptions.length - 1]; - const text = `${firstOption.text} .. ${lastOption.text}`; - matsParamUtils.setValueTextForParamName(pName, text); - } -}; - Template.select.onRendered(function () { const elem = matsParamUtils.getInputElementForParamName(this.data.name); try { elem.options = []; if (elem) { elem.addEventListener("refresh", function (event) { - // event that responds when custom "refresh" events are issued for individual selectors + // if the sellector changes we need to update both it and any dependents matsSelectUtils.refresh(event, this.name); }); - elem.addEventListener("click", function () { - // event that responds when the item is clicked - matsSelectUtils.generalDataInputClickEvent(); - }); - elem.addEventListener("change", function (event) { - // event that responds when the