From 8ad140e6bcc1187497da6d7ef97c0a3adeb3abee Mon Sep 17 00:00:00 2001 From: Dan Labrecque Date: Wed, 16 Aug 2023 20:37:49 -0400 Subject: [PATCH] Cleanup "handle" functions --- src/routes/components/costType/costType.tsx | 8 +- src/routes/components/currency/currency.tsx | 8 +- .../components/dataToolbar/basicToolbar.tsx | 24 +++--- .../components/dataToolbar/dataToolbar.tsx | 76 +++++++++---------- .../components/dataToolbar/utils/actions.tsx | 30 ++++---- .../dataToolbar/utils/bulkSelect.tsx | 24 +++--- .../components/dataToolbar/utils/category.tsx | 42 +++++----- .../dataToolbar/utils/costCategory.tsx | 42 +++++----- .../components/dataToolbar/utils/custom.tsx | 12 +-- .../components/dataToolbar/utils/exclude.tsx | 12 +-- .../dataToolbar/utils/orgUntits.tsx | 18 ++--- .../components/dataToolbar/utils/tags.tsx | 42 +++++----- src/routes/components/export/exportModal.tsx | 34 ++++----- src/routes/components/export/exportSubmit.tsx | 36 ++++----- src/routes/components/groupBy/groupBy.tsx | 12 +-- src/routes/components/groupBy/groupByOrg.tsx | 18 ++--- .../components/groupBy/groupBySelect.tsx | 18 ++--- .../resourceTypeahead/resourceInput.tsx | 50 ++++++------ .../costModel/updateMarkupDialog.tsx | 10 +-- src/routes/details/awsDetails/awsDetails.tsx | 28 +++---- .../details/azureDetails/azureDetails.tsx | 28 +++---- src/routes/details/gcpDetails/gcpDetails.tsx | 28 +++---- src/routes/details/ibmDetails/ibmDetails.tsx | 28 +++---- src/routes/details/ociDetails/ociDetails.tsx | 28 +++---- src/routes/details/ocpDetails/ocpDetails.tsx | 52 ++++++------- .../details/rhelDetails/rhelDetails.tsx | 46 +++++------ src/routes/explorer/explorer.tsx | 38 +++++----- src/routes/explorer/explorerDatePicker.tsx | 8 +- src/routes/explorer/explorerDateRange.tsx | 8 +- src/routes/explorer/explorerFilter.tsx | 10 +-- src/routes/explorer/explorerHeader.tsx | 4 +- src/routes/overview/overview.tsx | 8 +- 32 files changed, 415 insertions(+), 415 deletions(-) diff --git a/src/routes/components/costType/costType.tsx b/src/routes/components/costType/costType.tsx index a5d52da41..73341ef04 100644 --- a/src/routes/components/costType/costType.tsx +++ b/src/routes/components/costType/costType.tsx @@ -77,8 +77,8 @@ class CostTypeBase extends React.Component { id="costTypeSelect" isDisabled={isDisabled} isOpen={isSelectOpen} - onSelect={this.handleSelect} - onToggle={this.handleToggle} + onSelect={this.handleOnSelect} + onToggle={this.handleOnToggle} selections={selection} variant={SelectVariant.single} > @@ -104,7 +104,7 @@ class CostTypeBase extends React.Component { return options; }; - private handleSelect = (event, selection: CostTypeOption) => { + private handleOnSelect = (event, selection: CostTypeOption) => { const { isLocalStorage = true, onSelect } = this.props; // Set cost type in local storage @@ -123,7 +123,7 @@ class CostTypeBase extends React.Component { ); }; - private handleToggle = isSelectOpen => { + private handleOnToggle = isSelectOpen => { this.setState({ isSelectOpen }); }; diff --git a/src/routes/components/currency/currency.tsx b/src/routes/components/currency/currency.tsx index 8dc4c93c5..51a364d98 100644 --- a/src/routes/components/currency/currency.tsx +++ b/src/routes/components/currency/currency.tsx @@ -80,8 +80,8 @@ class CurrencyBase extends React.Component { id="currencySelect" isDisabled={isDisabled} isOpen={isSelectOpen} - onSelect={this.handleSelect} - onToggle={this.handleToggle} + onSelect={this.handleOnSelect} + onToggle={this.handleOnToggle} selections={selection} variant={SelectVariant.single} > @@ -106,7 +106,7 @@ class CurrencyBase extends React.Component { return options; }; - private handleSelect = (event, selection: CurrencyOption) => { + private handleOnSelect = (event, selection: CurrencyOption) => { const { isLocalStorage = true, onSelect } = this.props; // Set currency units via local storage @@ -125,7 +125,7 @@ class CurrencyBase extends React.Component { ); }; - private handleToggle = isSelectOpen => { + private handleOnToggle = isSelectOpen => { this.setState({ isSelectOpen }); }; diff --git a/src/routes/components/dataToolbar/basicToolbar.tsx b/src/routes/components/dataToolbar/basicToolbar.tsx index 11b2f50c7..c3c45cc7f 100644 --- a/src/routes/components/dataToolbar/basicToolbar.tsx +++ b/src/routes/components/dataToolbar/basicToolbar.tsx @@ -142,9 +142,6 @@ export class BasicToolbarBase extends React.Component { + private handleOnColumnManagementClicked = () => { const { onColumnManagementClicked } = this.props; if (onColumnManagementClicked) { onColumnManagementClicked(); @@ -722,13 +722,13 @@ export class DataToolbarBase extends React.Component { + private handleOnExportClicked = () => { const { onExportClicked } = this.props; if (onExportClicked) { onExportClicked(); @@ -742,13 +742,13 @@ export class DataToolbarBase extends React.Component { + private handleOnPlatformCostsChanged = (checked: boolean) => { const { onPlatformCostsChanged } = this.props; const { isPlatformCostsChecked } = this.state; this.setState({ isPlatformCostsChecked: !isPlatformCostsChecked }, () => { @@ -765,9 +765,9 @@ export class DataToolbarBase extends React.Component void; isDisabled?: boolean; + onColumnManagementClicked?: () => void; }) => { return ( - @@ -26,13 +26,13 @@ export const getColumnManagement = ({ // Export button export const getExportButton = ({ - handleExportClicked, isDisabled, isExportDisabled, + onExportClicked, }: { - handleExportClicked?: () => void; isDisabled?: boolean; isExportDisabled?: boolean; + onExportClicked?: () => void; }) => { return ( @@ -55,13 +55,13 @@ export const getExportButton = ({ // Platform costs export const getPlatformCosts = ({ - handlePlatformCostsChanged, isDisabled, isPlatformCostsChecked, + onPlatformCostsChanged, }: { - handlePlatformCostsChanged?: (checked: boolean) => void; isDisabled?: boolean; isPlatformCostsChecked?: boolean; + onPlatformCostsChanged?: (checked: boolean) => void; }) => { return ( @@ -70,7 +70,7 @@ export const getPlatformCosts = ({ label={intl.formatMessage(messages.sumPlatformCosts)} isChecked={isPlatformCostsChecked} isDisabled={isDisabled} - onChange={handlePlatformCostsChanged} + onChange={onPlatformCostsChanged} /> ); @@ -79,15 +79,15 @@ export const getPlatformCosts = ({ // Kebab export const getKebab = ({ - handleColumnManagementClicked, - handlePlatformCostsChanged, isPlatformCostsChecked, + onColumnManagementClicked, + onPlatformCostsChanged, showColumnManagement, showPlatformCosts, }: { - handleColumnManagementClicked?: () => void; - handlePlatformCostsChanged?: (checked: boolean) => void; isPlatformCostsChecked?: boolean; + onColumnManagementClicked?: () => void; + onPlatformCostsChanged?: (checked: boolean) => void; showColumnManagement?: boolean; showPlatformCosts?: boolean; }) => { @@ -95,13 +95,13 @@ export const getKebab = ({ if (showColumnManagement) { options.push({ label: messages.detailsColumnManagementTitle, - onClick: handleColumnManagementClicked, + onClick: onColumnManagementClicked, }); } if (showPlatformCosts) { options.push({ label: messages.sumPlatformCosts, - onClick: () => handlePlatformCostsChanged(!isPlatformCostsChecked), + onClick: () => onPlatformCostsChanged(!isPlatformCostsChecked), }); } return ( diff --git a/src/routes/components/dataToolbar/utils/bulkSelect.tsx b/src/routes/components/dataToolbar/utils/bulkSelect.tsx index fe2145161..ba77de447 100644 --- a/src/routes/components/dataToolbar/utils/bulkSelect.tsx +++ b/src/routes/components/dataToolbar/utils/bulkSelect.tsx @@ -13,9 +13,6 @@ import type { ComputedReportItem } from 'routes/utils/computedReport/getComputed // Bulk select export const getBulkSelect = ({ - handleOnBulkSelect, - handleOnBulkSelectClicked, - handleOnBulkSelectToggle, isAllSelected, isBulkSelectDisabled, isBulkSelectOpen, @@ -23,12 +20,12 @@ export const getBulkSelect = ({ isReadOnly, itemsPerPage, itemsTotal, + onBulkSelect, + onBulkSelectClicked, + onBulkSelectToggle, selectedItems, showSelectAll = true, }: { - handleOnBulkSelect?: () => void; - handleOnBulkSelectClicked?: (action: string) => void; - handleOnBulkSelectToggle?: (isOpen: boolean) => void; isAllSelected?: boolean; isBulkSelectDisabled?: boolean; isBulkSelectOpen?: boolean; @@ -36,6 +33,9 @@ export const getBulkSelect = ({ isReadOnly?: boolean; itemsPerPage?: number; itemsTotal?: number; + onBulkSelect?: () => void; + onBulkSelectClicked?: (action: string) => void; + onBulkSelectToggle?: (isOpen: boolean) => void; selectedItems?: ComputedReportItem[]; showSelectAll?: boolean; }) => { @@ -46,17 +46,17 @@ export const getBulkSelect = ({ const isChecked = allSelected ? true : someChecked; const dropdownItems = [ - handleOnBulkSelectClicked('none')}> + onBulkSelectClicked('none')}> {intl.formatMessage(messages.toolBarBulkSelectNone)} , - handleOnBulkSelectClicked('page')}> + onBulkSelectClicked('page')}> {intl.formatMessage(messages.toolBarBulkSelectPage, { value: itemsPerPage })} , ]; if (showSelectAll) { dropdownItems.push( - handleOnBulkSelectClicked('all')}> + onBulkSelectClicked('all')}> {intl.formatMessage(messages.toolBarBulkSelectAll, { value: itemsTotal })} ); @@ -64,7 +64,7 @@ export const getBulkSelect = ({ const bulkSelect = ( { - anySelected ? handleOnBulkSelectClicked('none') : handleOnBulkSelectClicked('all'); + anySelected ? onBulkSelectClicked('none') : onBulkSelectClicked('all'); }} />, ]} - onToggle={handleOnBulkSelectToggle} + onToggle={onBulkSelectToggle} > {numSelected !== 0 && ( {intl.formatMessage(messages.selected, { value: numSelected })} diff --git a/src/routes/components/dataToolbar/utils/category.tsx b/src/routes/components/dataToolbar/utils/category.tsx index bd21d5528..6380ceca4 100644 --- a/src/routes/components/dataToolbar/utils/category.tsx +++ b/src/routes/components/dataToolbar/utils/category.tsx @@ -39,22 +39,22 @@ export const getCategoryInput = ({ categoryOption, currentCategory, filters, - handleOnCategoryInput, - handleOnCategoryInputChange, - handleOnCategoryInputSelect, - handleOnDelete, isDisabled, + onCategoryInput, + onCategoryInputChange, + onCategoryInputSelect, + onDelete, resourcePathsType, }: { categoryInput?: string; categoryOption?: ToolbarChipGroupExt; currentCategory?: string; filters?: Filters; - handleOnCategoryInput?: (event, key: string) => void; - handleOnCategoryInputChange?: (value: string) => void; - handleOnCategoryInputSelect?: (value: string, key: string) => void; - handleOnDelete?: (type: any, chip: any) => void; isDisabled?: boolean; + onCategoryInput?: (event, key: string) => void; + onCategoryInputChange?: (value: string) => void; + onCategoryInputSelect?: (value: string, key: string) => void; + onDelete?: (type: any, chip: any) => void; resourcePathsType?: ResourcePathsType; }) => { const _hasFilters = hasFilters(filters); @@ -65,7 +65,7 @@ export const getCategoryInput = ({ @@ -74,7 +74,7 @@ export const getCategoryInput = ({ handleOnCategoryInputSelect(value, categoryOption.key)} + onSelect={value => onCategoryInputSelect(value, categoryOption.key)} placeholder={intl.formatMessage(messages.filterByPlaceholder, { value: placeholderKey })} resourcePathsType={resourcePathsType} resourceType={categoryOption.key as ResourceType} @@ -87,17 +87,17 @@ export const getCategoryInput = ({ id={`category-input-${categoryOption.key}`} type="search" aria-label={intl.formatMessage(messages.filterByInputAriaLabel, { value: ariaLabelKey })} - onChange={handleOnCategoryInputChange} + onChange={onCategoryInputChange} value={categoryInput} placeholder={intl.formatMessage(messages.filterByPlaceholder, { value: placeholderKey })} - onKeyDown={evt => handleOnCategoryInput(evt, categoryOption.key)} + onKeyDown={evt => onCategoryInput(evt, categoryOption.key)} size={intl.formatMessage(messages.filterByPlaceholder, { value: placeholderKey }).length} /> @@ -195,18 +195,18 @@ export const onCategoryInputSelect = ({ export const getCategorySelect = ({ categoryOptions, currentCategory, - handleOnCategorySelect, - handleOnCategoryToggle, - isDisabled, filters, + isDisabled, isCategorySelectOpen, + onCategorySelect, + onCategoryToggle, }: { categoryOptions?: ToolbarChipGroup[]; // Options for category menu currentCategory?: string; - isDisabled?: boolean; filters?: Filters; - handleOnCategorySelect?: (event, selection: CategoryOption) => void; - handleOnCategoryToggle?: (isOpen: boolean) => void; + isDisabled?: boolean; + onCategorySelect?: (event, selection: CategoryOption) => void; + onCategoryToggle?: (isOpen: boolean) => void; isCategorySelectOpen?: boolean; }) => { if (!categoryOptions) { @@ -222,8 +222,8 @@ export const getCategorySelect = ({ id="category-select" isDisabled={isDisabled && !hasFilters(filters)} isOpen={isCategorySelectOpen} - onSelect={handleOnCategorySelect} - onToggle={handleOnCategoryToggle} + onSelect={onCategorySelect} + onToggle={onCategoryToggle} selections={selection} toggleIcon={} variant={SelectVariant.single} diff --git a/src/routes/components/dataToolbar/utils/costCategory.tsx b/src/routes/components/dataToolbar/utils/costCategory.tsx index ba172175c..7bf27aea3 100644 --- a/src/routes/components/dataToolbar/utils/costCategory.tsx +++ b/src/routes/components/dataToolbar/utils/costCategory.tsx @@ -19,21 +19,21 @@ export const getCostCategoryKeySelect = ({ currentCategory, currentCostCategoryKey, filters, - handleOnCostCategoryKeyClear, - handleOnCostCategoryKeySelect, - handleOnCostCategoryKeyToggle, isCostCategoryKeySelectExpanded, isDisabled, + onCostCategoryKeyClear, + onCostCategoryKeySelect, + onCostCategoryKeyToggle, resourceReport, }: { currentCategory?: string; currentCostCategoryKey?: string; filters?: Filters; - handleOnCostCategoryKeyClear?: () => void; - handleOnCostCategoryKeySelect?: (event, selection) => void; - handleOnCostCategoryKeyToggle?: (isOpen: boolean) => void; isCostCategoryKeySelectExpanded?: boolean; isDisabled?: boolean; + onCostCategoryKeyClear?: () => void; + onCostCategoryKeySelect?: (event, selection) => void; + onCostCategoryKeyToggle?: (isOpen: boolean) => void; resourceReport?: Resource; }) => { if (currentCategory !== awsCategoryKey) { @@ -50,9 +50,9 @@ export const getCostCategoryKeySelect = ({ isDisabled={isDisabled && !hasFilters(filters)} variant={SelectVariant.typeahead} typeAheadAriaLabel={intl.formatMessage(messages.filterByCostCategoryKeyAriaLabel)} - onClear={handleOnCostCategoryKeyClear} - onToggle={handleOnCostCategoryKeyToggle} - onSelect={handleOnCostCategoryKeySelect} + onClear={onCostCategoryKeyClear} + onToggle={onCostCategoryKeyToggle} + onSelect={onCostCategoryKeySelect} isOpen={isCostCategoryKeySelectExpanded} placeholderText={intl.formatMessage(messages.chooseKeyPlaceholder)} selections={currentCostCategoryKey} @@ -111,11 +111,11 @@ export const getCostCategoryValueSelect = ({ costCategoryKeyOption, costCategoryKeyValueInput, filters, - handleOnDelete, - handleOnCostCategoryValueSelect, - handleOnCostCategoryValueInput, - handleOnCostCategoryValueInputChange, isDisabled, + onDelete, + onCostCategoryValueSelect, + onCostCategoryValueInput, + onCostCategoryValueInputChange, resourcePathsType, }: { currentCategory?: string; @@ -123,11 +123,11 @@ export const getCostCategoryValueSelect = ({ costCategoryKeyOption: ToolbarChipGroup; costCategoryKeyValueInput?: string; filters?: Filters; - handleOnDelete?: (type: any, chip: any) => void; - handleOnCostCategoryValueSelect?: (event, selection: string) => void; - handleOnCostCategoryValueInput?: (event) => void; - handleOnCostCategoryValueInputChange?: (value: string) => void; isDisabled?: boolean; + onDelete?: (type: any, chip: any) => void; + onCostCategoryValueSelect?: (event, selection: string) => void; + onCostCategoryValueInput?: (event) => void; + onCostCategoryValueInputChange?: (value: string) => void; resourcePathsType?: ResourcePathsType; }) => { // Todo: categoryName workaround for https://issues.redhat.com/browse/COST-2094 @@ -140,7 +140,7 @@ export const getCostCategoryValueSelect = ({ @@ -148,9 +148,9 @@ export const getCostCategoryValueSelect = ({ costCategoryKey={currentCostCategoryKey} costCategoryKeyValue={costCategoryKeyValueInput} isDisabled={isDisabled && !hasFilters(filters)} - onCostCategoryValueSelect={handleOnCostCategoryValueSelect} - onCostCategoryValueInput={handleOnCostCategoryValueInput} - onCostCategoryValueInputChange={handleOnCostCategoryValueInputChange} + onCostCategoryValueSelect={onCostCategoryValueSelect} + onCostCategoryValueInput={onCostCategoryValueInput} + onCostCategoryValueInputChange={onCostCategoryValueInputChange} resourcePathsType={resourcePathsType} selections={ filters[awsCategoryKey][costCategoryKeyOption.key] diff --git a/src/routes/components/dataToolbar/utils/custom.tsx b/src/routes/components/dataToolbar/utils/custom.tsx index d0005fdc4..07fd45a6f 100644 --- a/src/routes/components/dataToolbar/utils/custom.tsx +++ b/src/routes/components/dataToolbar/utils/custom.tsx @@ -15,18 +15,18 @@ export const getCustomSelect = ({ categoryOption, currentCategory, filters, - handleOnDelete, - handleOnSelect, isDisabled, + onDelete, + onSelect, selectClassName, selectOptions, }: { categoryOption?: ToolbarChipGroupExt; currentCategory?: string; filters?: Filters; - handleOnDelete?: (type: any, chip: any) => void; - handleOnSelect?: (event: any, selection) => void; isDisabled?: boolean; + onDelete?: (type: any, chip: any) => void; + onSelect?: (event: any, selection) => void; selectOptions?: ToolbarChipGroupExt[]; selectClassName?: string; }) => { @@ -40,7 +40,7 @@ export const getCustomSelect = ({ @@ -48,7 +48,7 @@ export const getCustomSelect = ({ className={selectClassName} filters={filters[categoryOption.key]} isDisabled={isDisabled && !hasFilters(filters)} - onSelect={handleOnSelect} + onSelect={onSelect} options={selectOptions} /> diff --git a/src/routes/components/dataToolbar/utils/exclude.tsx b/src/routes/components/dataToolbar/utils/exclude.tsx index eb08cf161..2af24681b 100644 --- a/src/routes/components/dataToolbar/utils/exclude.tsx +++ b/src/routes/components/dataToolbar/utils/exclude.tsx @@ -23,17 +23,17 @@ export const enum ExcludeType { export const getExcludeSelect = ({ currentExclude, filters, - handleOnExcludeSelect, - handleOnExcludeToggle, isDisabled, isExcludeSelectOpen, + onExcludeSelect, + onExcludeToggle, }: { currentExclude?: string; filters?: Filters; - handleOnExcludeSelect: (event: any, selection: ExcludeOption) => void; - handleOnExcludeToggle: (isOpen: boolean) => void; isDisabled?: boolean; isExcludeSelectOpen?: boolean; + onExcludeSelect: (event: any, selection: ExcludeOption) => void; + onExcludeToggle: (isOpen: boolean) => void; }) => { const selectOptions = getExcludeSelectOptions(); const selection = selectOptions.find((option: ExcludeOption) => option.value === currentExclude); @@ -44,8 +44,8 @@ export const getExcludeSelect = ({ id="exclude-select" isDisabled={isDisabled && !hasFilters(filters)} isOpen={isExcludeSelectOpen} - onSelect={handleOnExcludeSelect} - onToggle={handleOnExcludeToggle} + onSelect={onExcludeSelect} + onToggle={onExcludeToggle} selections={selection} variant={SelectVariant.single} > diff --git a/src/routes/components/dataToolbar/utils/orgUntits.tsx b/src/routes/components/dataToolbar/utils/orgUntits.tsx index f4d3e739c..04f412393 100644 --- a/src/routes/components/dataToolbar/utils/orgUntits.tsx +++ b/src/routes/components/dataToolbar/utils/orgUntits.tsx @@ -20,20 +20,20 @@ interface GroupByOrgOption extends SelectOptionObject { export const getOrgUnitSelect = ({ currentCategory, filters, - handleOnDelete, - handleOnOrgUnitSelect, - handleOnOrgUnitToggle, isDisabled, isOrgUnitSelectExpanded, + onDelete, + onOrgUnitSelect, + onOrgUnitToggle, orgReport, }: { currentCategory?: string; filters?: Filters; - handleOnDelete?: (type: any, chip: any) => void; - handleOnOrgUnitSelect?: (event, selection: string) => void; - handleOnOrgUnitToggle?: (isOpen: boolean) => void; isDisabled?: boolean; isOrgUnitSelectExpanded?: boolean; + onDelete?: (type: any, chip: any) => void; + onOrgUnitSelect?: (event, selection: string) => void; + onOrgUnitToggle?: (isOpen: boolean) => void; orgReport: Org; }) => { const options: GroupByOrgOption[] = getOrgUnitOptions(orgReport).map(option => ({ @@ -69,7 +69,7 @@ export const getOrgUnitSelect = ({ name: intl.formatMessage(messages.filterByValues, { value: 'org_unit_id' }), }} chips={chips} - deleteChip={handleOnDelete} + deleteChip={onDelete} key={orgUnitIdKey} showToolbarItem={currentCategory === orgUnitIdKey} > @@ -78,8 +78,8 @@ export const getOrgUnitSelect = ({ className="selectOverride" variant={SelectVariant.checkbox} aria-label={intl.formatMessage(messages.filterByOrgUnitAriaLabel)} - onToggle={handleOnOrgUnitToggle} - onSelect={handleOnOrgUnitSelect} + onToggle={onOrgUnitToggle} + onSelect={onOrgUnitSelect} selections={selections} isOpen={isOrgUnitSelectExpanded} placeholderText={intl.formatMessage(messages.filterByOrgUnitPlaceholder)} diff --git a/src/routes/components/dataToolbar/utils/tags.tsx b/src/routes/components/dataToolbar/utils/tags.tsx index 40eb3ece4..a49a1f070 100644 --- a/src/routes/components/dataToolbar/utils/tags.tsx +++ b/src/routes/components/dataToolbar/utils/tags.tsx @@ -17,21 +17,21 @@ export const getTagKeySelect = ({ currentCategory, currentTagKey, filters, - handleOnTagKeyClear, - handleOnTagKeySelect, - handleOnTagKeyToggle, isDisabled, isTagKeySelectExpanded, + onTagKeyClear, + onTagKeySelect, + onTagKeyToggle, tagReport, }: { currentCategory?: string; currentTagKey?: string; filters?: Filters; - handleOnTagKeyClear?: () => void; - handleOnTagKeySelect?: (event, selection) => void; - handleOnTagKeyToggle?: (isOpen: boolean) => void; isDisabled?: boolean; isTagKeySelectExpanded?: boolean; + onTagKeyClear?: () => void; + onTagKeySelect?: (event, selection) => void; + onTagKeyToggle?: (isOpen: boolean) => void; tagReport?: Tag; }) => { if (currentCategory !== tagKey) { @@ -48,9 +48,9 @@ export const getTagKeySelect = ({ isDisabled={isDisabled && !hasFilters(filters)} variant={SelectVariant.typeahead} typeAheadAriaLabel={intl.formatMessage(messages.filterByTagKeyAriaLabel)} - onClear={handleOnTagKeyClear} - onToggle={handleOnTagKeyToggle} - onSelect={handleOnTagKeySelect} + onClear={onTagKeyClear} + onToggle={onTagKeyToggle} + onSelect={onTagKeySelect} isOpen={isTagKeySelectExpanded} placeholderText={intl.formatMessage(messages.chooseKeyPlaceholder)} selections={currentTagKey} @@ -107,11 +107,11 @@ export const getTagValueSelect = ({ currentCategory, currentTagKey, filters, - handleOnDelete, - handleOnTagValueSelect, - handleOnTagValueInput, - handleOnTagValueInputChange, isDisabled, + onDelete, + onTagValueSelect, + onTagValueInput, + onTagValueInputChange, tagKeyOption, tagPathsType, tagKeyValueInput, @@ -119,11 +119,11 @@ export const getTagValueSelect = ({ currentCategory?: string; currentTagKey?: string; filters?: Filters; - handleOnDelete?: (type: any, chip: any) => void; - handleOnTagValueSelect?: (event: any, selection) => void; - handleOnTagValueInput?: (event: any) => void; - handleOnTagValueInputChange?: (value: string) => void; isDisabled?: boolean; + onDelete?: (type: any, chip: any) => void; + onTagValueSelect?: (event: any, selection) => void; + onTagValueInput?: (event: any) => void; + onTagValueInputChange?: (value: string) => void; tagKeyOption?: ToolbarChipGroup; tagPathsType?: TagPathsType; tagKeyValueInput?: string; @@ -138,15 +138,15 @@ export const getTagValueSelect = ({ filter.value) : []} tagKey={currentTagKey} tagKeyValue={tagKeyValueInput} diff --git a/src/routes/components/export/exportModal.tsx b/src/routes/components/export/exportModal.tsx index 831a5c027..96c644e81 100644 --- a/src/routes/components/export/exportModal.tsx +++ b/src/routes/components/export/exportModal.tsx @@ -92,35 +92,35 @@ export class ExportModalBase extends React.Component { + private handleOnClose = () => { this.setState({ ...this.defaultState }, () => { this.props.onClose(false); }); }; - private handleError = (error: AxiosError) => { + private handleOnError = (error: AxiosError) => { this.setState({ error }); }; - private handleMonthChange = (_, event) => { + private handleOnMonthChange = (_, event) => { this.setState({ timeScope: event.currentTarget.value }); }; - private handleNameChange = (_, event) => { + private handleOnNameChange = (_, event) => { this.setState({ name: event.currentTarget.value }); }; - private handleResolutionChange = (_, event) => { + private handleOnResolutionChange = (_, event) => { this.setState({ resolution: event.currentTarget.value }); }; - private handleTypeChange = (_, event) => { + private handleOnTypeChange = (_, event) => { this.setState({ formatType: event.currentTarget.value }); }; @@ -189,7 +189,7 @@ export class ExportModalBase extends React.Component, - , ]} @@ -240,7 +240,7 @@ export class ExportModalBase extends React.Component @@ -257,7 +257,7 @@ export class ExportModalBase extends React.Component ))} @@ -279,7 +279,7 @@ export class ExportModalBase extends React.Component ))} diff --git a/src/routes/components/export/exportSubmit.tsx b/src/routes/components/export/exportSubmit.tsx index d9807f9e5..81ecab6a4 100644 --- a/src/routes/components/export/exportSubmit.tsx +++ b/src/routes/components/export/exportSubmit.tsx @@ -82,12 +82,27 @@ export class ExportSubmitBase extends React.Component { + const { exportQueryString, fetchExport, isExportsFeatureEnabled, reportPathsType } = this.props; + + fetchExport(reportPathsType, reportType, exportQueryString, isExportsFeatureEnabled); + + this.setState( + { + fetchExportClicked: true, + }, + () => { + this.getExport(); + } + ); + }; + private getExport = () => { const { exportFetchStatus, exportReport } = this.props; if (exportReport && exportFetchStatus === FetchStatus.complete) { fileDownload(exportReport.data, this.getFileName(), 'text/csv'); - this.handleClose(); + this.handleOnClose(); } }; @@ -106,7 +121,7 @@ export class ExportSubmitBase extends React.Component { + private handleOnClose = () => { const { exportError } = this.props; this.setState({ ...this.defaultState }, () => { @@ -116,21 +131,6 @@ export class ExportSubmitBase extends React.Component { - const { exportQueryString, fetchExport, isExportsFeatureEnabled, reportPathsType } = this.props; - - fetchExport(reportPathsType, reportType, exportQueryString, isExportsFeatureEnabled); - - this.setState( - { - fetchExportClicked: true, - }, - () => { - this.getExport(); - } - ); - }; - public render() { const { disabled, exportFetchStatus, intl } = this.props; @@ -139,7 +139,7 @@ export class ExportSubmitBase extends React.Component {intl.formatMessage(messages.exportGenerate)} diff --git a/src/routes/components/groupBy/groupBy.tsx b/src/routes/components/groupBy/groupBy.tsx index 77f61d5fd..60a85d8be 100644 --- a/src/routes/components/groupBy/groupBy.tsx +++ b/src/routes/components/groupBy/groupBy.tsx @@ -113,8 +113,8 @@ class GroupByBase extends React.Component { constructor(stateProps, dispatchProps) { super(stateProps, dispatchProps); - this.handleGroupBySelected = this.handleGroupBySelected.bind(this); - this.handleGroupByToggle = this.handleGroupByToggle.bind(this); + this.handleOnSelect = this.handleOnSelect.bind(this); + this.handleOnToggle = this.handleOnToggle.bind(this); } public componentDidMount() { @@ -198,8 +198,8 @@ class GroupByBase extends React.Component { id="groupBySelect" isDisabled={isDisabled} isOpen={isGroupByOpen} - onSelect={this.handleGroupBySelected} - onToggle={this.handleGroupByToggle} + onSelect={this.handleOnSelect} + onToggle={this.handleOnToggle} selections={selection} variant={SelectVariant.single} > @@ -239,7 +239,7 @@ class GroupByBase extends React.Component { }); }; - private handleGroupBySelected = (event, selection: GroupByOption) => { + private handleOnSelect = (event, selection: GroupByOption) => { const { onSelected } = this.props; if (selection.value === orgUnitIdKey || selection.value === awsCategoryKey || selection.value === tagKey) { @@ -268,7 +268,7 @@ class GroupByBase extends React.Component { } }; - private handleGroupByToggle = isGroupByOpen => { + private handleOnToggle = isGroupByOpen => { this.setState({ isGroupByOpen, }); diff --git a/src/routes/components/groupBy/groupByOrg.tsx b/src/routes/components/groupBy/groupByOrg.tsx index 5906293a5..65bc37431 100644 --- a/src/routes/components/groupBy/groupByOrg.tsx +++ b/src/routes/components/groupBy/groupByOrg.tsx @@ -46,9 +46,9 @@ class GroupByOrgBase extends React.Component { constructor(props: GroupByOrgProps) { super(props); - this.handleGroupByClear = this.handleGroupByClear.bind(this); - this.handleGroupBySelected = this.handleGroupBySelected.bind(this); - this.handleGroupByToggle = this.handleGroupByToggle.bind(this); + this.handleOnClear = this.handleOnClear.bind(this); + this.handleOnSelect = this.handleOnSelect.bind(this); + this.handleOnToggle = this.handleOnToggle.bind(this); } public componentDidMount() { @@ -114,13 +114,13 @@ class GroupByOrgBase extends React.Component { })); }; - private handleGroupByClear = () => { + private handleOnClear = () => { this.setState({ currentItem: undefined, }); }; - private handleGroupBySelected = (event, selection: GroupByOrgOption) => { + private handleOnSelect = (event, selection: GroupByOrgOption) => { const { onSelected } = this.props; this.setState({ @@ -132,7 +132,7 @@ class GroupByOrgBase extends React.Component { } }; - private handleGroupByToggle = isGroupByOpen => { + private handleOnToggle = isGroupByOpen => { this.setState({ isGroupByOpen }); }; @@ -148,9 +148,9 @@ class GroupByOrgBase extends React.Component {