Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EPMRPP-91235 || button topaz variant fix #3887

Merged
merged 2 commits into from
Jun 25, 2024
Merged

EPMRPP-91235 || button topaz variant fix #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d876bc6
EPMRPP-91235 || button topaz variant fix
Vadim73i Jun 25, 2024
b64dd50
EPMRPP-91235 || button data-automation-id fix
Vadim73i Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@formatjs/intl-pluralrules": "1.3.9",
"@formatjs/intl-relativetimeformat": "4.5.1",
"@formatjs/intl-utils": "1.6.0",
"@reportportal/ui-kit": "^0.0.1-alpha.8",
"@reportportal/ui-kit": "^0.0.1-alpha.10",
"axios": "1.6.4",
"c3": "0.7.20",
"chart.js": "2.9.4",
Expand Down
2 changes: 1 addition & 1 deletion app/src/componentLibrary/attributeList/attributeList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ export const AttributeList = ({
icon={Parser(PlusIcon)}
onClick={onAddNew}
variant={'text'}
dataAutomationId={'addAttributeButton'}
data-automation-id={'addAttributeButton'}
>
{newAttrMessage || (
<FormattedMessage id="AttributeList.addNew" defaultMessage="Add new" />
Expand Down
6 changes: 3 additions & 3 deletions app/src/componentLibrary/modal/modalLayout/modalFooter/modalFooter.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const ModalFooter = ({ okButton, cancelButton, closeHandler, footerNode }
variant="ghost"
onClick={closeHandler}
disabled={cancelButton.disabled}
dataAutomationId={'cancelButton'}
data-automation-id={'cancelButton'}
>
{cancelButton.text}
</Button>
Expand All @@ -42,12 +42,12 @@ export const ModalFooter = ({ okButton, cancelButton, closeHandler, footerNode }
{okButton && (
<div className={cx('button-container')}>
<Button
variant={okButton.danger ? 'danger' : 'topaz'}
variant={okButton.danger ? 'danger' : undefined}
onClick={okButton.onClick}
disabled={okButton.disabled}
type={okButton.attributes?.type}
form={okButton.attributes?.form}
dataAutomationId={'submitButton'}
data-automation-id={'submitButton'}
>
{okButton.text}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion app/src/components/containers/AttributeListFormField/attributeListFormField.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const AttributeListFormField = ({
<Checkbox
value={shown}
onChange={attributeControlHandler}
dataAutomationId={'showAttributesCheckbox'}
data-automation-id={'showAttributesCheckbox'}
>
{formatMessage(messages.attributes)}
</Checkbox>
Expand Down
6 changes: 3 additions & 3 deletions .../components/integrations/elements/integrationSettings/integrationForm/integrationForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export class IntegrationForm extends Component {
<Button
onClick={this.toggleDisabled}
disabled={shouldFieldsBeHidden}
dataAutomationId="editConfigurationButton"
data-automation-id="editConfigurationButton"
>
{formatMessage(COMMON_LOCALE_KEYS.EDIT)}
</Button>
Expand All @@ -180,7 +180,7 @@ export class IntegrationForm extends Component {
<Button
onClick={handleSubmit(this.submitIntegration)}
disabled={shouldFieldsBeHidden}
dataAutomationId="submitConfigurationButton"
data-automation-id="submitConfigurationButton"
>
{formatMessage(COMMON_LOCALE_KEYS.SUBMIT)}
</Button>
Expand All @@ -192,7 +192,7 @@ export class IntegrationForm extends Component {
variant="ghost"
onClick={this.toggleDisabled}
disabled={shouldFieldsBeHidden}
dataAutomationId="cancelConfigurationButton"
data-automation-id="cancelConfigurationButton"
>
{formatMessage(COMMON_LOCALE_KEYS.CANCEL)}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion ...side/projectSettingsPageContainer/content/analyzerContainer/autoAnalysis/autoAnalysis.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ const AutoAnalysis = ({
>
<Checkbox>{formatMessage(messages.allMessagesShouldMatch)}</Checkbox>
</FieldElement>
<Button type="submit" disabled={isFieldDisabled} dataAutomationId="submitButton">
<Button type="submit" disabled={isFieldDisabled} data-automation-id="submitButton">
{formatMessage(COMMON_LOCALE_KEYS.SUBMIT)}
</Button>
{isPending && <LabeledPreloader text={formatMessage(COMMON_LOCALE_KEYS.processData)} />}
Expand Down
4 changes: 2 additions & 2 deletions ...de/projectSettingsPageContainer/content/analyzerContainer/indexSettings/indexSettings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const IndexSettings = ({ indexingRunning, analyzerUnavailableTitle, hasPermissio
onClick={generateIndex}
title={analyzerUnavailableTitle}
variant="ghost"
dataAutomationId="generateIndexButton"
data-automation-id="generateIndexButton"
>
{formatMessage(messages.generateIndexButtonCaption)}
</Button>
Expand All @@ -97,7 +97,7 @@ const IndexSettings = ({ indexingRunning, analyzerUnavailableTitle, hasPermissio
onClick={removeIndex}
title={analyzerUnavailableTitle}
variant="ghost"
dataAutomationId="removeIndexButton"
data-automation-id="removeIndexButton"
>
{formatMessage(messages.removeIndexButtonCaption)}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion ...side/projectSettingsPageContainer/content/analyzerContainer/similarItems/similarItems.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const SimilarItems = ({
<FieldNumber postfix="%" max={100} />
</FieldErrorHint>
</FieldElement>
<Button type="submit" disabled={isFieldDisabled} dataAutomationId="submitButton">
<Button type="submit" disabled={isFieldDisabled} data-automation-id="submitButton">
{formatMessage(COMMON_LOCALE_KEYS.SUBMIT)}
</Button>
{isPending && <LabeledPreloader text={formatMessage(COMMON_LOCALE_KEYS.processData)} />}
Expand Down
2 changes: 1 addition & 1 deletion ...side/projectSettingsPageContainer/content/analyzerContainer/uniqueErrors/uniqueErrors.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const UniqueErrors = ({
>
<Dropdown options={dropdownOptions} mobileDisabled />
</FieldElement>
<Button type="submit" disabled={isFieldDisabled} dataAutomationId="submitButton">
<Button type="submit" disabled={isFieldDisabled} data-automation-id="submitButton">
{formatMessage(COMMON_LOCALE_KEYS.SUBMIT)}
</Button>
{isPending && <LabeledPreloader text={formatMessage(COMMON_LOCALE_KEYS.processData)} />}
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/inside/projectSettingsPageContainer/content/defectTypes/defectTypes.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export const DefectTypes = ({ setHeaderTitleNode }) => {
trackEvent(PROJECT_SETTINGS_DEFECT_TYPES_EVENTS.CLICK_CREATE_BUTTON),
)
}
dataAutomationId={'createDefectTypeButton'}
data-automation-id={'createDefectTypeButton'}
>
{formatMessage(messages.createDefectHeader)}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/inside/projectSettingsPageContainer/content/emptyStatePage/emptyStatePage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const EmptyStatePage = ({
disabled={disableButton}
adjustWidthOn={'wide-content'}
onClick={disableButton ? null : handleButton}
dataAutomationId={buttonDataAutomationId}
data-automation-id={buttonDataAutomationId}
>
{buttonName}
</Button>
Expand Down
4 changes: 2 additions & 2 deletions ...ent/integrations/integrationsList/integrationInfo/integrationHeader/integrationHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@ export const IntegrationHeader = (props) => {
<Button
disabled={!isAbleToClick}
onClick={onAddProjectIntegration}
dataAutomationId="addProjectIntegrationButton"
data-automation-id="addProjectIntegrationButton"
>
{formatMessage(messages.noGlobalIntegrationsButtonAdd)}
</Button>
{availableProjectIntegrations.length > 0 && isAbleToClick && (
<Button
onClick={onResetProjectIntegration}
variant="ghost"
dataAutomationId="resetToGlobalIntegrationsButton"
data-automation-id="resetToGlobalIntegrationsButton"
>
{formatMessage(messages.projectIntegrationReset)}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion ...side/projectSettingsPageContainer/content/notifications/emptyRuleState/emptyRuleState.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const EmptyRuleState = ({ ruleName, onCreateClick }) => {
variant={'text'}
className={cx('button')}
icon={Parser(plusIcon)}
dataAutomationId="createRuleFromEmptyStateButton"
data-automation-id="createRuleFromEmptyStateButton"
>
{formatMessage(messages.create)}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion ...c/pages/inside/projectSettingsPageContainer/content/notifications/ruleGroup/ruleGroup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ export const RuleGroup = ({ pluginName, ruleDescription, rules, isPluginEnabled,
onClick={onAdd}
variant={'text'}
icon={Parser(addIcon)}
dataAutomationId="addRuleButton"
data-automation-id="addRuleButton"
>
{formatMessage(messages.addRule)}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion ...gsPageContainer/content/patternAnalysis/patternAnalysisContent/patternAnalysisContent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const PatternAnalysisContent = ({
useEffect(() => {
setHeaderTitleNode(
<span className={cx('button')} onClick={onAddPattern}>
<Button disabled={disabled} dataAutomationId="createPatternButton">
<Button disabled={disabled} data-automation-id="createPatternButton">
{formatMessage(messages.create)}
</Button>
</span>,
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/inside/projectSettingsPageContainer/generalTab/generalTab.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ export class GeneralTab extends Component {
/>
</FormField>
<div className={cx('submit-block')}>
<Button variant={'topaz'} type="submit" disabled={isDisabled}>
<Button type="submit" disabled={isDisabled}>
{this.props.intl.formatMessage(COMMON_LOCALE_KEYS.SUBMIT)}
</Button>
{processingData && (
Expand Down
Loading