From 3516c728a78a1e5c1967ea532abbd6e58011b2f3 Mon Sep 17 00:00:00 2001 From: David Upton Date: Tue, 2 Jan 2024 17:39:17 -0500 Subject: [PATCH 1/5] DIG-3313 Update Assessing Online database for January 2024 --- .../src/Controller/Assessing.php | 12 +++++------ .../bos_assessing/src/Controller/Pdf.php | 13 ++++++------ .../src/Controller/PdfManager.php | 5 +++++ .../modules/bos_sql/src/Controller/SQL.php | 20 +++++++++++-------- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/docroot/modules/custom/bos_components/modules/bos_assessing/src/Controller/Assessing.php b/docroot/modules/custom/bos_components/modules/bos_assessing/src/Controller/Assessing.php index eee7d6e1e8..0ba01a82be 100644 --- a/docroot/modules/custom/bos_components/modules/bos_assessing/src/Controller/Assessing.php +++ b/docroot/modules/custom/bos_components/modules/bos_assessing/src/Controller/Assessing.php @@ -67,8 +67,8 @@ public function assessingDetails($parcel_id) { $statement6 = "SELECT owner_name FROM current_owners WHERE parcel_id = '$parcel_id'"; $sql = new SQL(); - $bearer_token = $sql->getToken("assessing")[0]; - $connection_token = $sql->getToken("assessing")[1]; + $bearer_token = $sql->getToken("assessing")["bearer_token"]; + $connection_token = $sql->getToken("assessing")["connection_token"]; $sqlQuery_main = $sql->runQuery($bearer_token,$connection_token,$statement1); $sqlQuery_res = $sql->runQuery($bearer_token,$connection_token,$statement2); @@ -79,7 +79,7 @@ public function assessingDetails($parcel_id) { $coords = $this->getPolyCoords($parcel_id); $fiscal_year = ( date('m') > 6) ? intval(date('Y')) + 1 : date('Y'); - + return [ '#theme' => 'bos_assessing', '#data_full' => $sqlQuery_main, @@ -103,8 +103,8 @@ public function assessingLookup() { $sql = new SQL(); //required - $bearer_token = $sql->getToken("assessing")[0]; - $connection_token = $sql->getToken("assessing")[1]; + $bearer_token = $sql->getToken("assessing")["bearer_token"]; + $connection_token = $sql->getToken("assessing")["connection_token"]; $table = "taxbill"; $filter = []; @@ -136,7 +136,7 @@ public function assessingLookup() { $page = ($data->get("page")) ? $data->get("page") : null; $fields = ($data->get("fields")) ? $data->get("fields") : null; - return $sql->runSelect($bearer_token,$connection_token,$table,$filter,$sort,$limit,$page,$fields); + return $sql->runSelect($bearer_token, $connection_token, $table, $fields, $filter, $sort, $limit, $page); } diff --git a/docroot/modules/custom/bos_components/modules/bos_assessing/src/Controller/Pdf.php b/docroot/modules/custom/bos_components/modules/bos_assessing/src/Controller/Pdf.php index e372ef18c0..b8e3775f0e 100644 --- a/docroot/modules/custom/bos_components/modules/bos_assessing/src/Controller/Pdf.php +++ b/docroot/modules/custom/bos_components/modules/bos_assessing/src/Controller/Pdf.php @@ -194,19 +194,20 @@ protected function fetchDBData($type):array { $count = 0; while (!$tokens = $sql->getToken("assessing")) { $count++; - if ($count >= 10) { + if ($count <= 10) { sleep(10); } } - $statement = "SELECT * FROM dbo.taxbill WHERE parcel_id = '{$this->id}'"; $count = 0; - while (!$map = $sql->runQuery($tokens[0], $tokens[1], $statement)) { +// $statement = "SELECT * FROM dbo.taxbill WHERE parcel_id = '{$this->id}'"; +// while (!$map = $sql->runQuery($tokens["bearer_token"], $tokens["connection_token"], $statement)) { + while (!$map = $sql->runSelect($tokens["bearer_token"], $tokens["connection_token"], "taxbill", NULL, [["parcel_id" => $this->id]])) { $count++; - if ($count >= 10) { + if ($count <= 10) { sleep(10); } } - $map = (array) $map[0]; + $map = (array) json_decode($map->getContent())[0]; // Make sure the parcel_id is the expected parcel id if ($map["parcel_id"] != $this->id) { throw new \Exception("Data error - unexpected pacel_id"); @@ -223,7 +224,7 @@ protected function fetchDBData($type):array { $map["ward"] = preg_replace("~(.)(.)~", "$1 $2 $3 $4 $5", substr($map["parcel_id"], 0, 2)); $map["parcel-0"] = preg_replace("~(.)(.)(.)(.)(.)~", "$1 $2 $3 $4 $5", substr($map["parcel_id"], 2, 5)); $map["parcel-1"] = preg_replace("~(.)(.)(.)~", "$1 $2 $3 $4 $5", substr($map["parcel_id"], 7, 3)); - $seqnum = $sql->runSP($tokens[0], $tokens[1], "dbo.sp_get_pdf_data", [ + $seqnum = $sql->runSP($tokens["bearer_token"], $tokens["connection_token"], "dbo.sp_get_pdf_data", [ "parcel_id" => $this->id, "form_type" => "overval" ]); diff --git a/docroot/modules/custom/bos_components/modules/bos_pdfmanager/src/Controller/PdfManager.php b/docroot/modules/custom/bos_components/modules/bos_pdfmanager/src/Controller/PdfManager.php index 820e9796d9..04754db863 100644 --- a/docroot/modules/custom/bos_components/modules/bos_pdfmanager/src/Controller/PdfManager.php +++ b/docroot/modules/custom/bos_components/modules/bos_pdfmanager/src/Controller/PdfManager.php @@ -356,6 +356,11 @@ public function generate_fillable() { return FALSE; } + /** + * Returns the template file location, creates folder if it does not exist. + * + * @return string + */ /** * Returns the template file location, creates folder if it does not exist. * diff --git a/docroot/modules/custom/bos_components/modules/bos_sql/src/Controller/SQL.php b/docroot/modules/custom/bos_components/modules/bos_sql/src/Controller/SQL.php index 0e19d9cf6f..a6506ff462 100644 --- a/docroot/modules/custom/bos_components/modules/bos_sql/src/Controller/SQL.php +++ b/docroot/modules/custom/bos_components/modules/bos_sql/src/Controller/SQL.php @@ -101,25 +101,25 @@ public function runSP($bearer_token, $connection_token, string $sp_name, array $ return $data; } - public function runSelect($bearer_token,$connection_token,$table,$filter,$sort,$limit,$page,$fields) { + public function runSelect($bearer_token, $connection_token, $table, $fields, $filter = NULL, $sort = NULL, $limit = NULL, $page = NULL) { $post_fields = [ "token" => $connection_token, "table" => $table, ]; - if($filter){ + if ($filter !== NULL){ $post_fields["filter"] = $filter; } - if($sort !== null){ + if ($sort !== NULL){ $post_fields["sort"] = $sort; } - if($limit !== null){ + if ($limit !== NULL){ $post_fields["limit"] = $limit; } - if($page !== null){ + if ($page !== NULL){ $post_fields["page"] = $page; } - if($fields !== null){ + if ($fields !== NULL){ $post_fields["fields"] = $fields; } @@ -198,8 +198,12 @@ public function getToken($app_name) { if (isset($info)) { $data = json_decode($info,true); - $data = [$data["authToken"],$dbconnector_env["conntoken_" . $app_name],]; - } else { + $data = [ + "bearer_token" => $data["authToken"], + "connection_token" => $dbconnector_env["conntoken_" . $app_name] + ]; + } + else { $data = null; } From 64af4ff398c50d31d904a7a5ab774b9f189ba733 Mon Sep 17 00:00:00 2001 From: "stella.ubaha@boston.gov" Date: Tue, 9 Jan 2024 18:25:45 -0500 Subject: [PATCH 2/5] DIG-3309 Moderation sidebar textarea required, --- .../custom/bos_core/bos_core.libraries.yml | 5 +++++ .../moderation_sidebar.extensions.inc | 3 +++ .../bos_core/js/bos_core_mod_sidebar.js | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 docroot/modules/custom/bos_core/bos_core.libraries.yml create mode 100644 docroot/modules/custom/bos_core/js/bos_core_mod_sidebar.js diff --git a/docroot/modules/custom/bos_core/bos_core.libraries.yml b/docroot/modules/custom/bos_core/bos_core.libraries.yml new file mode 100644 index 0000000000..7b403dc1da --- /dev/null +++ b/docroot/modules/custom/bos_core/bos_core.libraries.yml @@ -0,0 +1,5 @@ +moderation_sidebar: + js: + js/bos_core_mod_sidebar.js: {attributes: {id: "mod_sidebar_code"}} + dependencies: + - core/jquery diff --git a/docroot/modules/custom/bos_core/includes/moderation_sidebar.extensions.inc b/docroot/modules/custom/bos_core/includes/moderation_sidebar.extensions.inc index 4d5b9587d4..37f2e40ec7 100644 --- a/docroot/modules/custom/bos_core/includes/moderation_sidebar.extensions.inc +++ b/docroot/modules/custom/bos_core/includes/moderation_sidebar.extensions.inc @@ -174,4 +174,7 @@ function bos_core_moderation_sidebar_alter(array &$build, EntityInterface $entit $build["actions"]["quick_draft_form"]["submit_for_review"]["#attributes"]["class"][] = "button--review clearfix"; } + $build["actions"]["primary"]["quick_draft_form"]["revision_log_toggle"]["#value"] = TRUE; + $build["actions"]["primary"]["quick_draft_form"]["revision_log_toggle"]["#checked"] = TRUE; + $build["actions"]["primary"]["quick_draft_form"]["#attached"]["library"] = ['bos_core/moderation_sidebar']; } diff --git a/docroot/modules/custom/bos_core/js/bos_core_mod_sidebar.js b/docroot/modules/custom/bos_core/js/bos_core_mod_sidebar.js new file mode 100644 index 0000000000..42d25d7061 --- /dev/null +++ b/docroot/modules/custom/bos_core/js/bos_core_mod_sidebar.js @@ -0,0 +1,19 @@ +/** + * @file + * A JavaScript file for moderation sidebar textarea. + */ +(function ($, Drupal, window, document) { + $(document).on('click', '.moderation-sidebar-quick-transition-form input.button', chkSubmit); + + function chkSubmit() { + var msg = $('.moderation-sidebar-revision-log'); + if (msg.val() != null && msg.val() != '') { + $('.moderation-sidebar-revision-log').css('border', 'transparent'); + } + else { + $('.moderation-sidebar-revision-log').css('border', '3px solid red'); + $('.moderation-sidebar-revision-log').attr('placeholder','Please provide a revision log message.') + return false; + } + } +})(jQuery, Drupal, this, this.document); From 599ca68ef9c1d0091fbdb9963133008e752feb6c Mon Sep 17 00:00:00 2001 From: David Upton Date: Wed, 10 Jan 2024 14:12:47 -0500 Subject: [PATCH 3/5] DIG-3820 Revert My Neighborhood Lookup to reflect updated City Council information --- .../apps/my_neighborhood/dist/index.js | 2 +- .../my_neighborhood/src/js/app/mnl_config.js | 4 +- .../src/js/components/Representation.js | 57 ++++++----- .../modules/bos_web_app/apps/package.json | 98 ++++++++++++++++++- .../bos_web_app/bos_web_app.libraries.yml | 2 +- ...lt.package => webapp.default.package.json} | 0 6 files changed, 134 insertions(+), 29 deletions(-) mode change 120000 => 100644 docroot/modules/custom/bos_components/modules/bos_web_app/apps/package.json rename scripts/{webapp.default.package => webapp.default.package.json} (100%) diff --git a/docroot/modules/custom/bos_components/modules/bos_web_app/apps/my_neighborhood/dist/index.js b/docroot/modules/custom/bos_components/modules/bos_web_app/apps/my_neighborhood/dist/index.js index 24bbd37f99..ee60458108 100644 --- a/docroot/modules/custom/bos_components/modules/bos_web_app/apps/my_neighborhood/dist/index.js +++ b/docroot/modules/custom/bos_components/modules/bos_web_app/apps/my_neighborhood/dist/index.js @@ -1 +1 @@ -"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}!function(e){"object"===("undefined"==typeof exports?"undefined":_typeof(exports))&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(self.React={})}(function(e){function c(e){for(var t="https://reactjs.org/docs/error-decoder.html?invariant="+e,n=1;n>>1,o=e[r];if(!(void 0!==o&&0t)||e&&!ae());){var r,o=ve.callback;null!==o?(ve.callback=null,_e=ve.priorityLevel,r=o(ve.expirationTime<=t),t=ee(),"function"==typeof r?ve.callback=r:ve===h(he)&&g(he),v(t)):g(he),ve=h(he)}var i,a=null!==ve||(null!==(i=h(ge))&&$(_,i.startTime-t),!1);return a}finally{ve=null,_e=n,we=!1}}function k(e){switch(e){case 1:return-1;case 2:return 250;case 5:return 1073741823;case 4:return 1e4;default:return 5e3}}var E="function"==typeof Symbol&&Symbol.for,S=E?Symbol.for("react.element"):60103,P=E?Symbol.for("react.portal"):60106,T=E?Symbol.for("react.fragment"):60107,C=E?Symbol.for("react.strict_mode"):60108,x=E?Symbol.for("react.profiler"):60114,R=E?Symbol.for("react.provider"):60109,O=E?Symbol.for("react.context"):60110,N=E?Symbol.for("react.forward_ref"):60112,I=E?Symbol.for("react.suspense"):60113,j=E?Symbol.for("react.memo"):60115,D=E?Symbol.for("react.lazy"):60116,z="function"==typeof Symbol&&Symbol.iterator,M=Object.getOwnPropertySymbols,L=Object.prototype.hasOwnProperty,A=Object.prototype.propertyIsEnumerable,F=function(){try{if(!Object.assign)return;if((e=new String("abc"))[5]="de","5"===Object.getOwnPropertyNames(e)[0])return;for(var t={},e=0;e<10;e++)t["_"+String.fromCharCode(e)]=e;if("0123456789"!==Object.getOwnPropertyNames(t).map(function(e){return t[e]}).join(""))return;var n={};return"abcdefghijklmnopqrst".split("").forEach(function(e){n[e]=e}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},n)).join("")}catch(e){return}}()?Object.assign:function(e,t){if(null==e)throw new TypeError("Object.assign cannot be called with null or undefined");for(var n=Object(e),r=1;r=ie},E=function(){},le=function(e){e<0||125=t&&(Jl=!0),e.firstContext=null)}function Ot(e,t){if(wl!==e&&!1!==t&&0!==t)if("number"==typeof t&&1073741823!==t||(wl=e,t=1073741823),t={context:e,observedBits:t,next:null},null===_l){if(null===vl)throw Error(P(308));_l=t,vl.dependencies={expirationTime:0,firstContext:t,responders:null}}else _l=_l.next=t;return e._currentValue}function Nt(e){e.updateQueue={baseState:e.memoizedState,baseQueue:null,shared:{pending:null},effects:null}}function It(e,t){e=e.updateQueue,t.updateQueue===e&&(t.updateQueue={baseState:e.baseState,baseQueue:e.baseQueue,shared:e.shared,effects:e.effects})}function jt(e,t){return(e={expirationTime:e,suspenseConfig:t,tag:kl,payload:null,callback:null,next:null}).next=e}function Dt(e,t){var n;null!==(e=e.updateQueue)&&(null===(n=(e=e.shared).pending)?t.next=t:(t.next=n.next,n.next=t),e.pending=t)}function zt(e,t){var n=e.alternate;null!==n&&It(n,e),null===(n=(e=e.updateQueue).baseQueue)?(e.baseQueue=t.next=t).next=t:(t.next=n.next,n.next=t)}function Mt(e,t,n,r){var o=e.updateQueue;Sl=!1;var i=o.baseQueue;if(null!==(h=o.shared.pending)&&(null!==i&&(a=i.next,i.next=h.next,h.next=a),i=h,(o.shared.pending=null)===(a=e.alternate)||null!==(a=a.updateQueue)&&(a.baseQueue=h)),null!==i){var a=i.next,l=o.baseState,u=0,s=null,c=null,f=null;if(null!==a)for(var p=a;;){if((h=p.expirationTime)l?(u=a,a=null):u=a.sibling;var s=g(t,a,n[l],r);if(null===s){null===a&&(a=u);break}f&&a&&null===s.alternate&&p(t,a),e=y(s,e,l),null===i?o=s:i.sibling=s,i=s,a=u}if(l===n.length)return d(t,a),o;if(null===a){for(;ll?(u=a,a=null):u=a.sibling;var c=g(t,a,s.value,r);if(null===c){null===a&&(a=u);break}f&&a&&null===c.alternate&&p(t,a),e=y(c,e,l),null===i?o=c:i.sibling=c,i=c,a=u}if(s.done)return d(t,a),o;if(null===a){for(;!s.done;l++,s=n.next())null!==(s=h(t,s.value,r))&&(e=y(s,e,l),null===i?o=s:i.sibling=s,i=s);return o}for(a=m(t,a);!s.done;l++,s=n.next())null!==(s=b(a,t,l,s.value,r))&&(f&&null!==s.alternate&&a.delete(null===s.key?l:s.key),e=y(s,e,l),null===i?o=s:i.sibling=s,i=s);return f&&a.forEach(function(e){return p(t,e)}),o}(e,t,n,r);if(i&&Qt(e,n),void 0===n&&!o)switch(e.tag){case 1:case 0:throw e=e.type,Error(P(152,e.displayName||e.name||"Component"))}return d(e,t)}}function Ht(e){if(e===Nl)throw Error(P(174));return e}function $t(e,t){switch(ct(Dl,t),ct(jl,e),ct(Il,Nl),e=t.nodeType){case 9:case 11:t=(t=t.documentElement)?t.namespaceURI:M(null,"");break;default:t=M(t=(e=8===e?t.parentNode:t).namespaceURI||null,e=e.tagName)}st(Il),ct(Il,t)}function Yt(){st(Il),st(jl),st(Dl)}function qt(e){Ht(Dl.current);var t=Ht(Il.current),n=M(t,e.type);t!==n&&(ct(jl,e),ct(Il,n))}function Xt(e){jl.current===e&&(st(Il),st(jl))}function Jt(e){for(var t=e;null!==t;){if(13===t.tag){var n=t.memoizedState;if(null!==n&&(null===(n=n.dehydrated)||n.data===Vi||n.data===Qi))return t}else if(19===t.tag&&void 0!==t.memoizedProps.revealOrder){if(0!=(64&t.effectTag))return t}else if(null!==t.child){t=(t.child.return=t).child;continue}if(t===e)break;for(;null===t.sibling;){if(null===t.return||t.return===e)return null;t=t.return}t.sibling.return=t.return,t=t.sibling}return null}function Gt(e,t){return{responder:e,props:t}}function Zt(){throw Error(P(321))}function en(e,t){if(null!==t){for(var n=0;nFl.expirationTime&&br(Fl.expirationTime=c)):(null!==l&&(l=l.next={expirationTime:1073741823,suspenseConfig:u.suspenseConfig,action:u.action,eagerReducer:u.eagerReducer,eagerState:u.eagerState,next:null}),gr(c,u.suspenseConfig),a=u.eagerReducer===e?u.eagerState:e(a,u.action)),null!==(u=u.next)&&u!==o);null===l?i=a:l.next=r,xa(a,t.memoizedState)||(Jl=!0),t.memoizedState=a,t.baseState=i,t.baseQueue=l,n.lastRenderedState=a}return[t.memoizedState,n.dispatch]}function ln(e,t,n){if(null===(n=(t=rn()).queue))throw Error(P(311));n.lastRenderedReducer=e;var r=n.dispatch,o=n.pending,i=t.memoizedState;if(null!==o){n.pending=null;for(var a=o=o.next;i=e(i,a.action),(a=a.next)!==o;);xa(i,t.memoizedState)||(Jl=!0),t.memoizedState=i,null===t.baseQueue&&(t.baseState=i),n.lastRenderedState=i}return[i,r]}function un(e){var t=nn();return"function"==typeof e&&(e=e()),t.memoizedState=t.baseState=e,e=(e=t.queue={pending:null,dispatch:null,lastRenderedReducer:on,lastRenderedState:e}).dispatch=En.bind(null,Fl,e),[t.memoizedState,e]}function sn(e,t,n,r){return e={tag:e,create:t,destroy:n,deps:r,next:null},null===(t=Fl.updateQueue)?(Fl.updateQueue=t={lastEffect:null}).lastEffect=e.next=e:null===(n=t.lastEffect)?t.lastEffect=e.next=e:(r=n.next,(n.next=e).next=r,t.lastEffect=e),e}function cn(e){return rn().memoizedState}function fn(e,t,n,r){var o=nn();Fl.effectTag|=e,o.memoizedState=sn(1|t,n,void 0,void 0===r?null:r)}function pn(e,t,n,r){var o=rn();r=void 0===r?null:r;var i=void 0;if(null!==Ul){var a=Ul.memoizedState,i=a.destroy;if(null!==r&&en(r,a.deps))return void sn(t,n,i,r)}Fl.effectTag|=e,o.memoizedState=sn(1|t,n,i,r)}function dn(e,t){return fn(516,4,e,t)}function mn(e,t){return pn(516,4,e,t)}function yn(e,t){return pn(4,2,e,t)}function hn(e,t){return"function"==typeof t?(e=e(),t(e),function(){t(null)}):null!=t?(e=e(),t.current=e,function(){t.current=null}):void 0}function gn(e,t,n){return n=null!=n?n.concat([e]):null,pn(4,2,hn.bind(null,t,e),n)}function bn(e,t){}function vn(e,t){return nn().memoizedState=[e,void 0===t?null:t],e}function _n(e,t){var n=rn();t=void 0===t?null:t;var r=n.memoizedState;return null!==r&&null!==t&&en(t,r[1])?r[0]:(n.memoizedState=[e,t],e)}function wn(e,t){var n=rn();t=void 0===t?null:t;var r=n.memoizedState;return null!==r&&null!==t&&en(t,r[1])?r[0]:(e=e(),n.memoizedState=[e,t],e)}function kn(t,n,r){var e=gt();vt(e<98?98:e,function(){t(!0)}),vt(97 component higher in the tree to provide a loading indicator or placeholder to display."+E(b))}bu!==du&&(bu=cu),a=Kn(a,b),d=i;do{switch(d.tag){case 3:u=a;d.effectTag|=4096,d.expirationTime=t,zt(d,nr(d,u,t));break e;case 1:u=a;var _=d.type,w=d.stateNode;if(0==(64&d.effectTag)&&("function"==typeof _.getDerivedStateFromError||null!==w&&"function"==typeof w.componentDidCatch&&(null===Ou||!Ou.has(w)))){d.effectTag|=4096,d.expirationTime=t,zt(d,rr(d,u,t));break e}}}while(null!==(d=d.return))}hu=_r(hu)}catch(e){t=e;continue}break}while(1)}function hr(e){return e=nu.current,nu.current=Vl,null===e?Vl:e}function gr(e,t){e<_u&&2<\/script>",e=e.removeChild(e.firstChild)):"string"==typeof r.is?e=i.createElement(o,{is:r.is}):(e=i.createElement(o),"select"===o&&(i=e,r.multiple?i.multiple=!0:r.size&&(i.size=r.size))):e=i.createElementNS(e,o),e[Xi]=t,e[Ji]=r,Ha(e,t,!1),t.stateNode=e,i=ye(o,r),o){case"iframe":case"object":case"embed":ue("load",e),a=r;break;case"video":case"audio":for(a=0;ar.tailExpiration&&1e.firstPendingTime&&(e.firstPendingTime=t);var n=e.firstSuspendedTime;0!==n&&(n<=t?e.firstSuspendedTime=e.lastSuspendedTime=e.nextKnownPendingLevel=0:t>=e.lastSuspendedTime&&(e.lastSuspendedTime=t+1),t>e.nextKnownPendingLevel&&(e.nextKnownPendingLevel=t))}function Fr(e,t){var n=e.lastExpiredTime;(0===n||t