Skip to content

Commit

Permalink
frontend: Align code formatting in frontend projects (#1863)
Browse files Browse the repository at this point in the history
Aligned formatting in shared and data-pipelines frontend using same
configuration for prettier and .editorconfig Executed auto format on
project data-pipelines.
No regression are expected, because only formatting is committed.
Tested local builds, linking built lib to UI and manual validatino on
every screen, and seems there is no problems. ESLint executed
successfully and there no issues.
Addressing issue #1801

---------

Signed-off-by: gorankokin <[email protected]>

---------

Signed-off-by: gorankokin <[email protected]>
Co-authored-by: Goran Kokinovski <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored and mivanov1988 committed Apr 11, 2023
1 parent 78c3217 commit 1542dfc
Show file tree
Hide file tree
Showing 141 changed files with 1,978 additions and 3,954 deletions.
2 changes: 1 addition & 1 deletion projects/frontend/data-pipelines/gui/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ insert_final_newline = true
trim_trailing_whitespace = true

[*.{ts, html}]
max_line_length = 80
max_line_length = 140

[*.{ts, js}]
quote_type = single
Expand Down
11 changes: 10 additions & 1 deletion projects/frontend/data-pipelines/gui/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,16 @@
]
},
"import/resolver": {
"typescript": {}
"typescript": {
"project": [
"tsconfig.json"
]
},
"node": {
"project": [
"tsconfig.json"
]
}
}
},
"overrides": [
Expand Down
2 changes: 1 addition & 1 deletion projects/frontend/data-pipelines/gui/.prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"semi": true,
"singleQuote": true,
"quoteProps": "as-needed",
"trailingComma": "all",
"trailingComma": "none",
"bracketSpacing": true,
"jsxBracketSameLine": true,
"arrowParens": "always",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('Getting Started Page', { tags: ['@dataPipelines'] }, () => {

return cy.wrap({
context: 'getting-started.spec::before()',
action: 'continue',
action: 'continue'
});
});
});
Expand All @@ -47,8 +47,8 @@ describe('Getting Started Page', { tags: ['@dataPipelines'] }, () => {
.getMainTitle()
.should(($el) =>
expect($el.text().trim()).to.equal(
'Get Started with Data Pipelines',
),
'Get Started with Data Pipelines'
)
);
});

Expand Down Expand Up @@ -113,7 +113,7 @@ describe('Getting Started Page', { tags: ['@dataPipelines'] }, () => {

// navigate to most recent failing job executions
dataJobsHealthPanel.navigateToMostRecentFailingJobExecutions(
testJob.job_name,
testJob.job_name
);

const dataJobManageExecutionsPage =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe(
before(() => {
return DataJobExploreDetailsPage.recordHarIfSupported()
.then(() =>
cy.clearLocalStorageSnapshot('data-job-explore-details'),
cy.clearLocalStorageSnapshot('data-job-explore-details')
)
.then(() => DataJobExploreDetailsPage.login())
.then(() => cy.saveLocalStorage('data-job-explore-details'))
Expand All @@ -30,7 +30,7 @@ describe(

return cy.wrap({
context: 'explore::data-job-details.spec::before()',
action: 'continue',
action: 'continue'
});
});
});
Expand All @@ -54,7 +54,7 @@ describe(

dataJobsExplorePage.openJobDetails(
testJobs[0].team,
testJobs[0].job_name,
testJobs[0].job_name
);

dataJobExploreDetailsPage = DataJobExploreDetailsPage.getPage();
Expand Down Expand Up @@ -86,7 +86,7 @@ describe(
.should('be.visible')
.should(
'contains.text',
'At 12:00 AM, on day 01 of the month, and on Friday',
'At 12:00 AM, on day 01 of the month, and on Friday'
);

// DISABLED Because there is no Source at the moment.
Expand All @@ -101,7 +101,7 @@ describe(
.should('be.visible')
.should(
'contains.text',
testJobs[0].config.contacts.notified_on_job_deploy,
testJobs[0].config.contacts.notified_on_job_deploy
);

dataJobExploreDetailsPage
Expand All @@ -110,7 +110,7 @@ describe(
.should(
'contains.text',
testJobs[0].config.contacts
.notified_on_job_failure_platform_error,
.notified_on_job_failure_platform_error
);

dataJobExploreDetailsPage
Expand All @@ -119,15 +119,15 @@ describe(
.should(
'contains.text',
testJobs[0].config.contacts
.notified_on_job_failure_user_error,
.notified_on_job_failure_user_error
);

dataJobExploreDetailsPage
.getOnSuccessField()
.should('be.visible')
.should(
'contains.text',
testJobs[0].config.contacts.notified_on_job_success,
testJobs[0].config.contacts.notified_on_job_success
);
});

Expand All @@ -138,7 +138,7 @@ describe(

dataJobsExplorePage.openJobDetails(
testJobs[0].team,
testJobs[0].job_name,
testJobs[0].job_name
);

const dataJobExploreDetailsPage =
Expand All @@ -162,7 +162,7 @@ describe(

dataJobsExplorePage.openJobDetails(
testJobs[0].team,
testJobs[0].job_name,
testJobs[0].job_name
);

const dataJobExploreDetailsPage =
Expand All @@ -179,5 +179,5 @@ describe(
.getActionDropdownBtn()
.should('not.exist');
});
},
}
);
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe(
before(() => {
return DataJobBasePO.recordHarIfSupported()
.then(() =>
cy.clearLocalStorageSnapshot('data-job-explore-executions'),
cy.clearLocalStorageSnapshot('data-job-explore-executions')
)
.then(() => DataJobBasePO.login())
.then(() => cy.saveLocalStorage('data-job-explore-executions'))
Expand All @@ -30,7 +30,7 @@ describe(

return cy.wrap({
context: 'explore::data-job-executions.spec::before()',
action: 'continue',
action: 'continue'
});
});
});
Expand All @@ -54,7 +54,7 @@ describe(

dataJobsExplorePage.openJobDetails(
testJobs[0].team,
testJobs[0].job_name,
testJobs[0].job_name
);

const dataJobBasePage = DataJobBasePO.getPage();
Expand All @@ -71,7 +71,7 @@ describe(

it('Data Job Explore Executions Page - should verify on URL navigate to Executions will redirect to Details', () => {
const dataJobBasePage = DataJobBasePO.navigateToUrl(
`/explore/data-jobs/${testJobs[0].team}/${testJobs[0].job_name}/executions`,
`/explore/data-jobs/${testJobs[0].team}/${testJobs[0].job_name}/executions`
);

dataJobBasePage
Expand All @@ -84,11 +84,11 @@ describe(
.should(
'match',
new RegExp(
`\\/explore\\/data-jobs\\/${testJobs[0].team}\\/${testJobs[0].job_name}\\/details$`,
),
`\\/explore\\/data-jobs\\/${testJobs[0].team}\\/${testJobs[0].job_name}\\/details$`
)
);

dataJobBasePage.getDetailsTab().should('have.class', 'active');
});
},
}
);
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe(

return cy.wrap({
context: 'explore::data-jobs.spec::before()',
action: 'continue',
action: 'continue'
});
});
});
Expand All @@ -52,7 +52,7 @@ describe(
.getMainTitle()
.should('be.visible')
.should(($el) =>
expect($el.text().trim()).to.equal('Explore Data Jobs'),
expect($el.text().trim()).to.equal('Explore Data Jobs')
);
});

Expand Down Expand Up @@ -114,13 +114,13 @@ describe(
dataJobsExplorePage.refreshDataGrid();

dataJobsExplorePage.filterByJobName(
normalizedTestJob.job_name,
normalizedTestJob.job_name
);

dataJobsExplorePage
.getDataGridCell(normalizedTestJob.job_name)
.should('have.text', normalizedTestJob.job_name);
},
}
);
});

Expand Down Expand Up @@ -251,7 +251,7 @@ describe(
.invoke('join', ',')
.should(
'eq',
'Description,Deployment Status,Last Execution Duration,Success rate,Next run (UTC),Last Deployed (UTC),Last Deployed By,Source,Logs',
'Description,Deployment Status,Last Execution Duration,Success rate,Next run (UTC),Last Deployed (UTC),Last Deployed By,Source,Logs'
);

// verify column is not checked in toggling menu
Expand All @@ -267,7 +267,7 @@ describe(

// toggle column to render
dataJobsExplorePage.checkColumnShowHideOption(
'Last Execution Duration',
'Last Execution Duration'
);

// verify column is checked in toggling menu
Expand All @@ -283,7 +283,7 @@ describe(

// toggle column to hide
dataJobsExplorePage.uncheckColumnShowHideOption(
'Last Execution Duration',
'Last Execution Duration'
);

// verify column is not checked in toggling menu
Expand All @@ -308,7 +308,7 @@ describe(

dataJobsExplorePage.openJobDetails(
testJobs[0].team,
testJobs[0].job_name,
testJobs[0].job_name
);

const dataJobExploreDetailsPage =
Expand All @@ -324,5 +324,5 @@ describe(
.should('be.visible')
.should('contain.text', testJobs[0].description);
});
},
}
);
Loading

0 comments on commit 1542dfc

Please sign in to comment.