Require Hoist-Core v18 and associated cleanup

xh · Jan 12, 2024 · a0c687f · a0c687f
1 parent a51c4bc
commit a0c687f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 37 deletions.
diff --git a/admin/tabs/general/alertBanner/AlertBannerModel.ts b/admin/tabs/general/alertBanner/AlertBannerModel.ts
@@ -67,10 +67,6 @@ export class AlertBannerModel extends HoistModel {
         ];
     }
 
-    get supportPresets() {
-        return XH.environmentService.isMinHoistCoreVersion('16.3.0');
-    }
-
     constructor() {
         super();
         makeObservable(this);
@@ -155,7 +151,6 @@ export class AlertBannerModel extends HoistModel {
     }
 
     async loadPresetsAsync() {
-        if (!this.supportPresets) return;
         try {
             this.savedPresets = await XH.fetchJson({url: 'alertBannerAdmin/alertPresets'});
         } catch (e) {

diff --git a/admin/tabs/general/alertBanner/AlertBannerPanel.ts b/admin/tabs/general/alertBanner/AlertBannerPanel.ts
@@ -169,8 +169,7 @@ const formPanel = hoistCmp.factory<AlertBannerModel>(({model}) => {
                         text: 'Presets',
                         outlined: true
                     }),
-                    content: presetMenu(),
-                    omit: !model.supportPresets
+                    content: presetMenu()
                 }),
                 filler(),
                 button({

diff --git a/admin/tabs/server/connectionpool/ConnPoolMonitorModel.ts b/admin/tabs/server/connectionpool/ConnPoolMonitorModel.ts
@@ -14,25 +14,15 @@ import {forOwn, sortBy} from 'lodash';
 import * as MCol from '../../monitor/MonitorColumns';
 
 export class ConnPoolMonitorModel extends HoistModel {
-    readonly minHoistCoreVersion = '17.2.0';
-    get supported(): boolean {
-        return XH.environmentService.isMinHoistCoreVersion(this.minHoistCoreVersion);
-    }
-
     @bindable enabled: boolean = true;
-    @bindable poolConfiguration: PlainObject = {};
+    @bindable.ref poolConfiguration: PlainObject = {};
 
     @managed gridModel: GridModel;
     @managed chartModel: ChartModel;
 
     constructor() {
         super();
 
-        if (!this.supported) {
-            this.enabled = false;
-            return;
-        }
-
         this.gridModel = new GridModel({
             enableExport: true,
             exportOptions: {filename: exportFilenameWithDate('conn-pool-monitor')},
@@ -91,8 +81,7 @@ export class ConnPoolMonitorModel extends HoistModel {
     }
 
     override async doLoadAsync(loadSpec: LoadSpec) {
-        const {supported, gridModel, chartModel} = this;
-        if (!supported) return;
+        const {gridModel, chartModel} = this;
 
         try {
             const resp = await XH.fetchJson({

diff --git a/admin/tabs/server/connectionpool/ConnPoolMonitorPanel.ts b/admin/tabs/server/connectionpool/ConnPoolMonitorPanel.ts
@@ -20,12 +20,6 @@ export const connPoolMonitorPanel = hoistCmp.factory({
     model: creates(ConnPoolMonitorModel),
 
     render({model}) {
-        if (!model.supported) {
-            return errorMessage({
-                error: `Connection pool monitoring requires Hoist Core >= ${model.minHoistCoreVersion}.`
-            });
-        }
-
         if (!model.enabled) {
             return errorMessage({
                 error: 'Connection pool monitoring disabled via xhConnPoolMonitoringConfig, or no suitable DataSource detected.'

diff --git a/admin/tabs/server/logViewer/LogDisplay.ts b/admin/tabs/server/logViewer/LogDisplay.ts
@@ -66,8 +66,7 @@ const tbar = hoistCmp.factory<LogDisplayModel>(({model}) => {
                     className: model.caseSensitive
                         ? 'xh-log-display__filter-button xh-log-display__filter-button--active'
                         : 'xh-log-display__filter-button xh-log-display__filter-button--inactive',
-                    tooltip: 'Case-sensitive filter option',
-                    omit: !XH.environmentService.isMinHoistCoreVersion('16.2.0')
+                    tooltip: 'Case-sensitive filter option'
                 }),
                 button({
                     text: '.*',

diff --git a/core/XH.ts b/core/XH.ts
@@ -63,7 +63,7 @@ import {instanceManager} from './impl/InstanceManager';
 import {HoistModel, ModelSelector, RefreshContextModel} from './model';
 import {apiDeprecated} from '@xh/hoist/utils/js';
 
-export const MIN_HOIST_CORE_VERSION = '16.0';
+export const MIN_HOIST_CORE_VERSION = '18.0';
 
 declare const xhAppCode: string;
 declare const xhAppName: string;

diff --git a/svc/EnvironmentService.ts b/svc/EnvironmentService.ts
@@ -110,17 +110,15 @@ export class EnvironmentService extends HoistService {
 
     private checkServerVersionAsync = async () => {
         const data = await XH.fetchJson({url: 'xh/version'}),
-            {appVersion, appBuild, mode, shouldUpdate} = data;
+            {appVersion, appBuild, mode} = data;
 
         // Compare latest version/build info from server against the same info (also supplied by
         // server) when the app initialized. A change indicates an update to the app and will
         // force the user to refresh or prompt the user to refresh via the banner according to the
         // `mode` set in `xhAppVersionCheck`. Builds are checked here to trigger refresh prompts
         // across SNAPSHOT updates for projects with active dev/QA users.
         if (appVersion !== this.get('appVersion') || appBuild !== this.get('appBuild')) {
-            if (mode === 'promptReload' || shouldUpdate) {
-                // Todo: `shouldUpdate` checked for backwards compatibility with hoist-core v16.3.0
-                // and earlier - remove in future.
+            if (mode === 'promptReload') {
                 XH.appContainerModel.showUpdateBanner(appVersion, appBuild);
             } else if (mode === 'forceReload') {
                 XH.suspendApp({

diff --git a/svc/IdentityService.ts b/svc/IdentityService.ts
@@ -162,9 +162,6 @@ export class IdentityService extends HoistService {
     }
 
     private canUserImpersonate(user: HoistUser): boolean {
-        const hasPerm = XH.environmentService.isMinHoistCoreVersion('16.3.0')
-            ? user.hasRole(`HOIST_IMPERSONATOR`)
-            : user.isHoistAdmin;
-        return hasPerm && XH.getConf('xhEnableImpersonation');
+        return user.hasRole(`HOIST_IMPERSONATOR`) && XH.getConf('xhEnableImpersonation');
     }
 }