changes after review

superdesk · Feb 11, 2025 · 8ad36ce · 8ad36ce
1 parent 6f9c884
commit 8ad36ce
Show file tree

Hide file tree

Showing 35 changed files with 96 additions and 98 deletions.
diff --git a/assets/agenda/components/AgendaCoverageRequest.tsx b/assets/agenda/components/AgendaCoverageRequest.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 import {gettext} from 'utils';
-import {Button} from '../../components/Buttons';
+import {Button} from '../../components/Button';
 
 
 class AgendaCoverageRequest extends React.Component<any, any> {
@@ -53,12 +53,12 @@ class AgendaCoverageRequest extends React.Component<any, any> {
                 </div>
                 <div className='nh-button__group'>
                     <Button
-                        value={gettext('Cancel')}
+                        text={gettext('Cancel')}
                         variant='secondary'
                         onClick={this.reset}
                     />
                     <Button
-                        value={gettext('Submit inquiry')}
+                        text={gettext('Submit inquiry')}
                         variant='primary'
                         disabled={!this.state.message}
                         onClick={this.requestCoverage}

diff --git a/assets/agenda/components/AgendaListGroupHeader.tsx b/assets/agenda/components/AgendaListGroupHeader.tsx
@@ -6,7 +6,7 @@ import {formatDate, gettext} from 'utils';
 import {getCoverageIcon} from '../utils';
 
 import {Skeleton} from 'primereact/skeleton';
-import {Button} from '../../components/Buttons';
+import {Button} from '../../components/Button';
 
 interface IProps {
     group: string;
@@ -81,7 +81,7 @@ export function AgendaListGroupHeader({group, itemIds, itemsById, itemsShown, to
             )}
             <div className="list-group-header__actions">
                 <Button
-                    value={itemsShown ? gettext('Hide') : gettext('Show all')}
+                    text={itemsShown ? gettext('Hide') : gettext('Show all')}
                     variant='tertiary'
                     size='small'
                     onClick={() => {

diff --git a/assets/cards/components/EditCard.tsx b/assets/cards/components/EditCard.tsx
@@ -11,7 +11,7 @@ import {
     CARD_TYPES,
     getCardEditComponent,
 } from 'components/cards/utils';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 import CloseButton from 'components/CloseButton';
 
 
@@ -79,12 +79,12 @@ class EditCard extends React.Component<any, any> {
                     </div>
                     <div className='list-item__preview-footer'>
                         <Button
-                            value={gettext('Delete')}
+                            text={gettext('Delete')}
                             variant='secondary'
                             onClick={this.props.onDelete}
                         />
                         <Button
-                            value={gettext('Save')}
+                            text={gettext('Save')}
                             variant='primary'
                             onClick={this.props.onSave}
                         />

diff --git a/assets/companies/components/CompanyPermissions.tsx b/assets/companies/components/CompanyPermissions.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {gettext} from 'utils';
 
 import CheckboxInput from 'components/CheckboxInput';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 
 function CompanyPermissions({
     company,
@@ -163,7 +163,7 @@ function CompanyPermissions({
                 <div className='list-item__preview-footer'>
                     <Button
                         data-test-id="save-btn"
-                        value={gettext('Save')}
+                        text={gettext('Save')}
                         type='submit'
                         variant='primary'
                     />

diff --git a/assets/companies/components/EditCompany.tsx b/assets/companies/components/EditCompany.tsx
@@ -24,7 +24,7 @@ import CompanyPermissions from './CompanyPermissions';
 import EditCompanyAPI from './EditCompanyAPI';
 import AuditInformation from 'components/AuditInformation';
 import {EditCompanyDetails} from './EditCompanyDetails';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 import CloseButton from 'components/CloseButton';
 
 interface IStateProps {
@@ -178,7 +178,7 @@ class EditCompany extends React.Component<IProps, IState> {
                         </div>
                         <div className="list-item__preview-toolbar-right">
                             <Button
-                                value={gettext('Approve Company & Users')}
+                                text={gettext('Approve Company & Users')}
                                 type='submit'
                                 variant='tertiary'
                                 size='small'

diff --git a/assets/companies/components/EditCompanyDetails.tsx b/assets/companies/components/EditCompanyDetails.tsx
@@ -8,7 +8,7 @@ import TextInput from 'components/TextInput';
 import SelectInput from 'components/SelectInput';
 import DateInput from 'components/DateInput';
 import CheckboxInput from 'components/CheckboxInput';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 import TextListInput from 'components/TextListInput';
 
 interface IProps {
@@ -194,13 +194,13 @@ export function EditCompanyDetails({
             <div className='list-item__preview-footer'>
                 {company._id && (
                     <Button
-                        value={gettext('Delete')}
+                        text={gettext('Delete')}
                         variant='secondary'
                         onClick={deleteCompany}
                     />
                 )}
                 <Button
-                    value={gettext('Save')}
+                    text={gettext('Save')}
                     variant='primary'
                     data-test-id="save-btn"
                     onClick={save}

diff --git a/assets/company-admin/components/CompanyDetailsProductRow.tsx b/assets/company-admin/components/CompanyDetailsProductRow.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import {gettext, getConfig} from 'utils';
 import classNames from 'classnames';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 
 export function CompanyDetailsProductRow({product, onNameClicked, showSeatRequestModal}: any) {
     const unlimited = product.max_seats == null || product.max_seats < 1;
@@ -30,7 +30,7 @@ export function CompanyDetailsProductRow({product, onNameClicked, showSeatReques
             {getConfig('allow_companies_to_manage_products') && !unlimited && (
                 <td>
                     <Button
-                        value={gettext('Request more seats')}
+                        text={gettext('Request more seats')}
                         variant='tertiary'
                         size='small'
                         onClick={() => showSeatRequestModal([product._id])}

diff --git a/assets/company-reports/components/ContentActivity.tsx b/assets/company-reports/components/ContentActivity.tsx
@@ -5,10 +5,9 @@ import {gettext, formatTime} from '../../utils';
 import {fetchReport, REPORTS} from '../actions';
 
 import ReportsTable from './ReportsTable';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 import {ContentActivityFilters} from './ContentActivityFilters';
 
-
 interface IReportAction {
     download?: number;
     copy?: number;
@@ -158,7 +157,7 @@ class ContentActivity extends React.Component<IProps, any> {
                     <ContentActivityFilters />
 
                     <Button
-                        value={gettext('Export to CSV')}
+                        text={gettext('Export to CSV')}
                         variant='secondary'
                         className='ms-auto me-3'
                         onClick={this.exportToCSV}

diff --git a/assets/components/Buttons.tsx → assets/components/Button.tsx b/assets/components/Buttons.tsx → assets/components/Button.tsx
@@ -5,7 +5,7 @@ export type IPropsVariant = 'primary' | 'secondary' | 'tertiary';
 export type IPropsSize = 'small' | 'medium' | 'large';
 
 export interface IPropsButtonBase {
-    value: string;
+    text: string;
     variant?: IPropsVariant;
     size?: IPropsSize;
     id?: string;
@@ -20,12 +20,12 @@ interface IPropsButton extends IPropsButtonBase {
 }
 
 interface IPropsSubmit extends IPropsButtonBase {
-    type?: 'submit',
+    type: 'submit',
     onClick?(event: React.MouseEvent<HTMLButtonElement, MouseEvent>): void;
 }
 
 interface IPropsReset extends IPropsButtonBase {
-    type?: 'reset',
+    type: 'reset',
     onClick?(event: React.MouseEvent<HTMLButtonElement, MouseEvent>): void;
 }
 
@@ -45,13 +45,13 @@ export class Button extends React.PureComponent<IProps> {
                 type={this.props.type ?? 'button'}
                 id={this.props.id}
                 className={classes}
-                aria-label={this.props.value}
+                aria-label={this.props.text}
                 data-test-id={this.props['data-test-id']}
                 tabIndex={0}
                 disabled={this.props.disabled}
                 onClick={(event) => this.props.onClick && this.props.onClick(event)}
             >
-                {this.props.value}
+                {this.props.text}
             </button>
         );
     }

diff --git a/assets/components/CardEditor.tsx b/assets/components/CardEditor.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import {gettext} from 'utils';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 import {IconButton} from './IconButton';
 
 export default class CardEditor extends React.Component<any, any> {
@@ -61,7 +61,7 @@ export default class CardEditor extends React.Component<any, any> {
                             <div className="card-body">{editorCardBody}</div>
                             <div className="card-footer d-flex">
                                 <Button   
-                                    value={saveText}
+                                    text={saveText}
                                     variant='primary'
                                     className='ms-auto'
                                     disabled={Object.keys(errors || {}).length > 0}
@@ -70,7 +70,7 @@ export default class CardEditor extends React.Component<any, any> {
 
                                 {!hideCancel && (
                                     <Button   
-                                        value={gettext('Cancel')}
+                                        text={gettext('Cancel')}
                                         variant='secondary'
                                         className='ms-3'
                                         onClick={this.onCancelClick}

diff --git a/assets/components/EditPanel.tsx b/assets/components/EditPanel.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {gettext} from '../utils';
 import {isEmpty, get, pickBy, isEqual, every} from 'lodash';
 import CheckboxInput from 'components/CheckboxInput';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 
 class EditPanel extends React.Component<any, any> {
     static propTypes: any;
@@ -129,14 +129,14 @@ class EditPanel extends React.Component<any, any> {
                     <div className='list-item__preview-footer'>
                         {this.props.onCancel && (
                             <Button
-                                value={gettext('Cancel')}
+                                text={gettext('Cancel')}
                                 variant='secondary'
                                 disabled={this.props.cancelDisabled}
                                 onClick={this.props.onCancel}
                             />
                         )}
                         <Button
-                            value={gettext('Save')}
+                            text={gettext('Save')}
                             type='submit'
                             variant='primary'
                             disabled={this.props.saveDisabled}

diff --git a/assets/components/ListBar.tsx b/assets/components/ListBar.tsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 import SearchBar from 'search/components/SearchBar';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 
 class ListBar extends React.Component<any, any> {
     static propTypes: any;
@@ -29,7 +29,7 @@ class ListBar extends React.Component<any, any> {
                     <div className="content-bar__right">
                         {this.props.onNewItem && (
                             <Button
-                                value={this.props.buttonText}
+                                text={this.props.buttonText}
                                 variant='primary'
                                 data-test-id="new-item-btn"
                                 disabled={this.props.disabled}

diff --git a/assets/components/Modal.tsx b/assets/components/Modal.tsx
@@ -6,7 +6,7 @@ import {gettext} from 'utils';
 import {closeModal} from 'actions';
 import CloseModalButton from './CloseModalButton';
 import classNames from 'classnames';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 
 interface IProps {
     title: string;
@@ -96,13 +96,13 @@ class Modal extends React.Component<IProps, IState> {
                                 <Button
                                     type='reset'
                                     variant='secondary'
-                                    value={this.props.onCancelLabel || gettext('Cancel')}
+                                    text={this.props.onCancelLabel || gettext('Cancel')}
                                     onClick={this.props.closeModal}
                                 />
                                 <Button
                                     type='submit'
                                     variant='primary'
-                                    value={this.props.onSubmitLabel || gettext('Save')}
+                                    text={this.props.onSubmitLabel || gettext('Save')}
                                     disabled={this.state.submitting || !this.props.formValid}
                                     onClick={this.onSubmit}
                                 />     

diff --git a/assets/general-settings/components/GeneralSettingsApp.tsx b/assets/general-settings/components/GeneralSettingsApp.tsx
@@ -9,7 +9,7 @@ import {save} from '../actions';
 import TextInput from 'components/TextInput';
 import CheckboxInput from 'components/CheckboxInput';
 import AuditInformation from 'components/AuditInformation';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 
 function isInput(field: any) {
     return ['text', 'number', 'boolean'].includes(field.type);
@@ -110,7 +110,7 @@ class GeneralSettingsApp extends React.Component<any, any> {
                             <form onSubmit={this.onSubmit}>
                                 {fields}
                                 <Button
-                                    value={gettext('Save')}
+                                    text={gettext('Save')}
                                     type='submit'
                                     variant='primary'
                                 />

diff --git a/assets/home/components/HomeApp.tsx b/assets/home/components/HomeApp.tsx
@@ -19,7 +19,7 @@ import {personalizeHome} from 'agenda/actions';
 import {RadioButtonGroup} from 'features/sections/SectionSwitch';
 import {getCurrentUser} from 'company-admin/selectors';
 import {IPersonalizedDashboardsWithData} from 'home/reducers';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 import {IconButton} from 'components/IconButton';
 import {IHomeState} from 'home/reducers';
 
@@ -144,7 +144,7 @@ class HomeApp extends React.Component<IProps, {
                                         !this.hasPersonalDashboard ? (
                                             <div className="home-tools">
                                                 <Button
-                                                    value={gettext('Personalize Home')}
+                                                    text={gettext('Personalize Home')}
                                                     variant='secondary'
                                                     size='small'
                                                     onClick={() => {

diff --git a/assets/monitoring/components/EditMonitoringProfile.tsx b/assets/monitoring/components/EditMonitoringProfile.tsx
@@ -13,7 +13,7 @@ import AuditInformation from 'components/AuditInformation';
 import MonitoringSchedule from './MonitoringSchedule';
 
 import {gettext} from 'utils';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 import CloseButton from 'components/CloseButton';
 
 const getCompanyOptions = (companies: any) => companies.map((company: any) => ({value: company._id, text: company.name}));
@@ -197,13 +197,13 @@ class EditMonitoringProfile extends React.Component<any, any> {
                                 <div className='list-item__preview-footer'>
                                     {item._id && (
                                         <Button
-                                            value={gettext('Delete')}
+                                            text={gettext('Delete')}
                                             variant='secondary'
                                             onClick={onDelete}
                                         />
                                     )}
                                     <Button
-                                        value={gettext('Save')}
+                                        text={gettext('Save')}
                                         variant='primary'
                                         onClick={onSave}
                                     />

diff --git a/assets/monitoring/components/MonitoringSchedule.tsx b/assets/monitoring/components/MonitoringSchedule.tsx
@@ -7,7 +7,7 @@ import {gettext} from 'utils';
 import DatePicker from 'react-datepicker';
 
 import SelectInput from 'components/SelectInput';
-import {Button} from 'components/Buttons';
+import {Button} from 'components/Button';
 
 class MonitoringSchedule extends React.Component<any, any> {
     static propTypes: any;
@@ -195,7 +195,7 @@ class MonitoringSchedule extends React.Component<any, any> {
                     </div>
                     <div className='list-item__preview-footer'>
                         <Button
-                            value={gettext('Save')}
+                            text={gettext('Save')}
                             variant='primary'
                             onClick={onsaveMonitoringProfileSchedule}
                         />