EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Fix TS
Yurii96f7db18102d
diff --git a/client/src/views/record/detail.ts b/client/src/views/record/detail.tsindex c333fd1908..59da98407b 100644--- a/client/src/views/record/detail.ts+++ b/client/src/views/record/detail.ts@@ -3829,11 +3829,11 @@ class DetailRecordView<S extends DetailRecordViewSchema = DetailRecordViewSchema}}- private getButtonsView(): DetailRecordButtonsView {+ private getButtonsView(): DetailRecordButtonsView | null {return this.getView<DetailRecordButtonsView>('buttons');}- private getEditButtonsView(): DetailRecordButtonsView {+ private getEditButtonsView(): DetailRecordButtonsView | null {return this.getView<DetailRecordButtonsView>('editButtons');}}diff --git a/client/src/views/record/detail/buttons.ts b/client/src/views/record/detail/buttons.tsindex df093125e2..095450c000 100644--- a/client/src/views/record/detail/buttons.ts+++ b/client/src/views/record/detail/buttons.ts@@ -30,7 +30,7 @@ import View from 'view';import type {Button, DropdownItem} from 'views/record/detail';import Language from 'language';import {inject} from 'di';-import {h, fragment} from 'bullbone';+import {h, fragment, VNode} from 'bullbone';export default class DetailRecordButtonsView extends View<{options: {@@ -40,7 +40,7 @@ export default class DetailRecordButtonsView extends View<{allDisabled: boolean,},actionClassName: string,- entityType: string,+ entityType: string | null,},}> {@@ -49,7 +49,7 @@ export default class DetailRecordButtonsView extends View<{content(): any {const data = this.data();- const buttons = [];+ const buttons: any[] = [];data.buttonList.forEach(it => {buttons.push(@@ -68,7 +68,7 @@ export default class DetailRecordButtonsView extends View<{);});- const elements = [...buttons];+ const elements: any[] = [...buttons];if (data.dropdownItemList.length) {const icon = h('span', {class: {'fas': true, 'fa-ellipsis-h': true}});@@ -87,7 +87,7 @@ export default class DetailRecordButtonsView extends View<{}, icon));- const dropdownItems = [];+ const dropdownItems: VNode[] = [];data.dropdownItemList.forEach((it, i) => {if (it === false) {@@ -285,7 +285,7 @@ class ButtonComponent {) {}node(): any {- const classes = {+ const classes: any = {'btn': true,'disabled': this.options.disabled === true,'hidden': this.options.hidden === true,@@ -368,7 +368,7 @@ class DropdownItemComponent {) {}node(): any {- const classes = {+ const classes: any = {'disabled': this.options.disabled === true,'hidden': this.options.hidden === true,'action': true,diff --git a/package-lock.json b/package-lock.jsonindex 9052af1a93..5dc8d5fda7 100644--- a/package-lock.json+++ b/package-lock.json@@ -22,7 +22,7 @@"bootstrap": "github:yurikuzn/espo-bootstrap#0.1.2","bootstrap-colorpicker": "^2.5.2","bootstrap-datepicker": "^1.9.0",- "bullbone": "github:espocrm/bullbone#1.4.5",+ "bullbone": "github:espocrm/bullbone#1.4.6","cronstrue": "^1.114.0","cropper": "^0.7.9","devbridge-autocomplete": "^1.4.11",@@ -3453,8 +3453,8 @@}},"node_modules/bullbone": {- "version": "1.4.5",- "resolved": "git+ssh://[email protected]/espocrm/bullbone.git#9d2ef8f8a3c36a018446b158df6dd3ffe85ed3e4",+ "version": "1.4.6",+ "resolved": "git+ssh://[email protected]/espocrm/bullbone.git#08f7895ef28f3832af289b7d9ada0a0f11d92126","license": "AGPL","dependencies": {"snabbdom": "^3.6.3"@@ -11019,8 +11019,8 @@"dev": true},"bullbone": {- "version": "git+ssh://[email protected]/espocrm/bullbone.git#9d2ef8f8a3c36a018446b158df6dd3ffe85ed3e4",- "from": "bullbone@github:espocrm/bullbone#1.4.5",+ "version": "git+ssh://[email protected]/espocrm/bullbone.git#08f7895ef28f3832af289b7d9ada0a0f11d92126",+ "from": "bullbone@github:espocrm/bullbone#1.4.6","requires": {"snabbdom": "^3.6.3"}