From 0d971980d2846ac71ca574f710a1889c607445cd Mon Sep 17 00:00:00 2001 From: Graham Goh Date: Wed, 28 Aug 2024 13:59:39 +1000 Subject: [PATCH 1/2] UI: Rename Feeds Manager -> Job Distributor Feeds Manager is an outdated term, now that we are rolling out (Job Distributor)[https://github.com/smartcontractkit/job-distributor], we want to start adopting the new name. We are only performing the rename on a superficial level which is on the UI, the rest including the backend remains untouched to keep things simple. JIRA: https://smartcontract-it.atlassian.net/browse/OPCORE-891 --- .changeset/modern-balloons-sneeze.md | 5 +++++ src/components/Form/FeedsManagerForm.tsx | 4 ++-- src/pages/Header.tsx | 4 ++-- src/screens/EditFeedsManager/EditFeedsManagerScreen.test.tsx | 4 ++-- src/screens/EditFeedsManager/EditFeedsManagerScreen.tsx | 2 +- src/screens/EditFeedsManager/EditFeedsManagerView.test.tsx | 2 +- src/screens/EditFeedsManager/EditFeedsManagerView.tsx | 2 +- src/screens/FeedsManager/FeedsManagerScreen.test.tsx | 2 +- src/screens/FeedsManager/FeedsManagerView.test.tsx | 2 +- src/screens/FeedsManager/FeedsManagerView.tsx | 2 +- src/screens/NewFeedsManager/NewFeedsManagerScreen.test.tsx | 4 ++-- src/screens/NewFeedsManager/NewFeedsManagerScreen.tsx | 2 +- src/screens/NewFeedsManager/NewFeedsManagerView.test.tsx | 2 +- src/screens/NewFeedsManager/NewFeedsManagerView.tsx | 2 +- 14 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 .changeset/modern-balloons-sneeze.md diff --git a/.changeset/modern-balloons-sneeze.md b/.changeset/modern-balloons-sneeze.md new file mode 100644 index 00000000..f81b7493 --- /dev/null +++ b/.changeset/modern-balloons-sneeze.md @@ -0,0 +1,5 @@ +--- +'@smartcontractkit/operator-ui': minor +--- + +Rename Feeds Manager to Job Distributor diff --git a/src/components/Form/FeedsManagerForm.tsx b/src/components/Form/FeedsManagerForm.tsx index ce423699..1b05e04d 100644 --- a/src/components/Form/FeedsManagerForm.tsx +++ b/src/components/Form/FeedsManagerForm.tsx @@ -61,7 +61,7 @@ export const FeedsManagerForm: React.FC = ({ label="URI" required fullWidth - helperText="Provided by the Feeds Manager operator" + helperText="Provided by the Job Distributor operator" FormHelperTextProps={{ 'data-testid': 'uri-helper-text' }} /> @@ -74,7 +74,7 @@ export const FeedsManagerForm: React.FC = ({ label="Public Key" required fullWidth - helperText="Provided by the Feeds Manager operator" + helperText="Provided by the Job Distributor operator" FormHelperTextProps={{ 'data-testid': 'publicKey-helper-text' }} /> diff --git a/src/pages/Header.tsx b/src/pages/Header.tsx index 483b6068..88894f74 100644 --- a/src/pages/Header.tsx +++ b/src/pages/Header.tsx @@ -109,7 +109,7 @@ const Drawer = withStyles(drawerStyles)( button component={() => ( - + )} className={classes.menuitem} @@ -196,7 +196,7 @@ const Nav = withStyles(navStyles)( pathname.includes('/feeds_manager') && classes.activeNavLink, )} > - Feeds Manager + Job Distributors )} diff --git a/src/screens/EditFeedsManager/EditFeedsManagerScreen.test.tsx b/src/screens/EditFeedsManager/EditFeedsManagerScreen.test.tsx index 448cb6c7..2d8df536 100644 --- a/src/screens/EditFeedsManager/EditFeedsManagerScreen.test.tsx +++ b/src/screens/EditFeedsManager/EditFeedsManagerScreen.test.tsx @@ -61,7 +61,7 @@ describe('EditFeedsManagerScreen', () => { await waitForElementToBeRemoved(() => queryByRole('progressbar')) - expect(await findByText('Edit Feeds Manager')).toBeInTheDocument() + expect(await findByText('Edit Job Distributor')).toBeInTheDocument() expect(await findByTestId('feeds-manager-form')).toBeInTheDocument() }) @@ -167,7 +167,7 @@ describe('EditFeedsManagerScreen', () => { userEvent.click(getByRole('button', { name: /submit/i })) - expect(await findByText('Feeds Manager Updated')).toBeInTheDocument() + expect(await findByText('Job Distributor Updated')).toBeInTheDocument() expect(await findByText('Root Redirect Success')).toBeInTheDocument() }) diff --git a/src/screens/EditFeedsManager/EditFeedsManagerScreen.tsx b/src/screens/EditFeedsManager/EditFeedsManagerScreen.tsx index acac27f8..8dbc0494 100644 --- a/src/screens/EditFeedsManager/EditFeedsManagerScreen.tsx +++ b/src/screens/EditFeedsManager/EditFeedsManagerScreen.tsx @@ -98,7 +98,7 @@ export const EditFeedsManagerScreen: React.FC = () => { case 'UpdateFeedsManagerSuccess': history.push('/feeds_manager') - dispatch(notifySuccessMsg('Feeds Manager Updated')) + dispatch(notifySuccessMsg('Job Distributor Updated')) break case 'NotFoundError': diff --git a/src/screens/EditFeedsManager/EditFeedsManagerView.test.tsx b/src/screens/EditFeedsManager/EditFeedsManagerView.test.tsx index f526031d..08b5b623 100644 --- a/src/screens/EditFeedsManager/EditFeedsManagerView.test.tsx +++ b/src/screens/EditFeedsManager/EditFeedsManagerView.test.tsx @@ -13,7 +13,7 @@ describe('EditFeedsManagerView', () => { render() - expect(getByText('Edit Feeds Manager')).toBeInTheDocument() + expect(getByText('Edit Job Distributor')).toBeInTheDocument() expect(getByTestId('feeds-manager-form')).toHaveFormValues({ name: 'Chainlink Feeds Manager', uri: manager.uri, diff --git a/src/screens/EditFeedsManager/EditFeedsManagerView.tsx b/src/screens/EditFeedsManager/EditFeedsManagerView.tsx index 04d086d2..30007980 100644 --- a/src/screens/EditFeedsManager/EditFeedsManagerView.tsx +++ b/src/screens/EditFeedsManager/EditFeedsManagerView.tsx @@ -25,7 +25,7 @@ export const EditFeedsManagerView: React.FC = ({ data, onSubmit }) => { - + { renderComponent(mocks) - expect(await findByText('Feeds Manager')).toBeInTheDocument() + expect(await findByText('Job Distributors')).toBeInTheDocument() expect(await findByText('Job Proposals')).toBeInTheDocument() }) diff --git a/src/screens/FeedsManager/FeedsManagerView.test.tsx b/src/screens/FeedsManager/FeedsManagerView.test.tsx index 72c6e355..102cf2b9 100644 --- a/src/screens/FeedsManager/FeedsManagerView.test.tsx +++ b/src/screens/FeedsManager/FeedsManagerView.test.tsx @@ -18,7 +18,7 @@ describe('FeedsManagerView', () => { , ) - expect(await findByText('Feeds Manager')).toBeInTheDocument() + expect(await findByText('Job Distributors')).toBeInTheDocument() expect(await findByText('Job Proposals')).toBeInTheDocument() }) }) diff --git a/src/screens/FeedsManager/FeedsManagerView.tsx b/src/screens/FeedsManager/FeedsManagerView.tsx index c6d35976..4df36531 100644 --- a/src/screens/FeedsManager/FeedsManagerView.tsx +++ b/src/screens/FeedsManager/FeedsManagerView.tsx @@ -16,7 +16,7 @@ export const FeedsManagerView: React.FC = ({ manager }) => { return ( - Feeds Manager + Job Distributors diff --git a/src/screens/NewFeedsManager/NewFeedsManagerScreen.test.tsx b/src/screens/NewFeedsManager/NewFeedsManagerScreen.test.tsx index 2063cd5d..6487477e 100644 --- a/src/screens/NewFeedsManager/NewFeedsManagerScreen.test.tsx +++ b/src/screens/NewFeedsManager/NewFeedsManagerScreen.test.tsx @@ -56,7 +56,7 @@ describe('NewFeedsManagerScreen', () => { await waitForElementToBeRemoved(() => screen.queryByRole('progressbar')) - expect(await findByText('Register Feeds Manager')).toBeInTheDocument() + expect(await findByText('Register Job Distributor')).toBeInTheDocument() expect(await findByTestId('feeds-manager-form')).toBeInTheDocument() }) @@ -141,7 +141,7 @@ describe('NewFeedsManagerScreen', () => { userEvent.click(getByRole('button', { name: /submit/i })) - expect(await findByText('Feeds Manager Created')).toBeInTheDocument() + expect(await findByText('Job Distributor Created')).toBeInTheDocument() expect(await findByText('Redirect Success')).toBeInTheDocument() }) diff --git a/src/screens/NewFeedsManager/NewFeedsManagerScreen.tsx b/src/screens/NewFeedsManager/NewFeedsManagerScreen.tsx index c8c72d14..71af17e2 100644 --- a/src/screens/NewFeedsManager/NewFeedsManagerScreen.tsx +++ b/src/screens/NewFeedsManager/NewFeedsManagerScreen.tsx @@ -91,7 +91,7 @@ export const NewFeedsManagerScreen: React.FC = () => { case 'CreateFeedsManagerSuccess': history.push('/feeds_manager') - dispatch(notifySuccessMsg('Feeds Manager Created')) + dispatch(notifySuccessMsg('Job Distributor Created')) break case 'SingleFeedsManagerError': diff --git a/src/screens/NewFeedsManager/NewFeedsManagerView.test.tsx b/src/screens/NewFeedsManager/NewFeedsManagerView.test.tsx index ee2592e5..25820949 100644 --- a/src/screens/NewFeedsManager/NewFeedsManagerView.test.tsx +++ b/src/screens/NewFeedsManager/NewFeedsManagerView.test.tsx @@ -12,7 +12,7 @@ describe('NewFeedsManagerView', () => { render() - expect(getByText('Register Feeds Manager')).toBeInTheDocument() + expect(getByText('Register Job Distributor')).toBeInTheDocument() expect(getByTestId('feeds-manager-form')).toHaveFormValues({ name: 'Chainlink Feeds Manager', uri: '', diff --git a/src/screens/NewFeedsManager/NewFeedsManagerView.tsx b/src/screens/NewFeedsManager/NewFeedsManagerView.tsx index d3fe45b5..2b62e048 100644 --- a/src/screens/NewFeedsManager/NewFeedsManagerView.tsx +++ b/src/screens/NewFeedsManager/NewFeedsManagerView.tsx @@ -23,7 +23,7 @@ export const NewFeedsManagerView: React.FC = ({ onSubmit }) => { - + Date: Wed, 28 Aug 2024 14:24:12 +1000 Subject: [PATCH 2/2] fix: update url /feeds_manager -> /job_distributor Following the rename, we want to rename the url from /feeds_manager -> /job_distributor --- src/Private.tsx | 2 +- src/pages/Header.tsx | 9 +++++---- src/screens/Bridges/BridgesScreen.test.tsx | 2 +- .../EditFeedsManager/EditFeedsManagerScreen.test.tsx | 4 ++-- src/screens/EditFeedsManager/EditFeedsManagerScreen.tsx | 4 ++-- src/screens/FeedsManager/FeedsManagerCard.test.tsx | 2 +- src/screens/FeedsManager/FeedsManagerCard.tsx | 2 +- src/screens/FeedsManager/FeedsManagerScreen.test.tsx | 2 +- src/screens/FeedsManager/FeedsManagerScreen.tsx | 2 +- src/screens/JobProposal/JobProposalScreen.test.tsx | 2 +- src/screens/JobProposal/JobProposalScreen.tsx | 2 +- .../NewFeedsManager/NewFeedsManagerScreen.test.tsx | 2 +- src/screens/NewFeedsManager/NewFeedsManagerScreen.tsx | 4 ++-- 13 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/Private.tsx b/src/Private.tsx index 55a8ea3b..8f89756a 100644 --- a/src/Private.tsx +++ b/src/Private.tsx @@ -74,7 +74,7 @@ const Private = ({ classes }: { classes: { content: string } }) => { - + diff --git a/src/pages/Header.tsx b/src/pages/Header.tsx index 88894f74..a48632b7 100644 --- a/src/pages/Header.tsx +++ b/src/pages/Header.tsx @@ -108,8 +108,8 @@ const Drawer = withStyles(drawerStyles)( ( - - + + )} className={classes.menuitem} @@ -190,10 +190,11 @@ const Nav = withStyles(navStyles)( {isFeedsManagerFeatureEnabled && ( Job Distributors diff --git a/src/screens/Bridges/BridgesScreen.test.tsx b/src/screens/Bridges/BridgesScreen.test.tsx index 6d24b132..b9c2d1db 100644 --- a/src/screens/Bridges/BridgesScreen.test.tsx +++ b/src/screens/Bridges/BridgesScreen.test.tsx @@ -21,7 +21,7 @@ function renderComponent(mocks: MockedResponse[]) { - Redirect Success + Redirect Success , { initialEntries: ['/bridges?per=2'] }, ) diff --git a/src/screens/EditFeedsManager/EditFeedsManagerScreen.test.tsx b/src/screens/EditFeedsManager/EditFeedsManagerScreen.test.tsx index 2d8df536..52956f81 100644 --- a/src/screens/EditFeedsManager/EditFeedsManagerScreen.test.tsx +++ b/src/screens/EditFeedsManager/EditFeedsManagerScreen.test.tsx @@ -30,10 +30,10 @@ function renderComponent(mocks: MockedResponse[]) { - + New Redirect Success - + Root Redirect Success , diff --git a/src/screens/EditFeedsManager/EditFeedsManagerScreen.tsx b/src/screens/EditFeedsManager/EditFeedsManagerScreen.tsx index 8dbc0494..2fcb1f01 100644 --- a/src/screens/EditFeedsManager/EditFeedsManagerScreen.tsx +++ b/src/screens/EditFeedsManager/EditFeedsManagerScreen.tsx @@ -77,7 +77,7 @@ export const EditFeedsManagerScreen: React.FC = () => { return ( @@ -96,7 +96,7 @@ export const EditFeedsManagerScreen: React.FC = () => { const payload = result.data?.updateFeedsManager switch (payload?.__typename) { case 'UpdateFeedsManagerSuccess': - history.push('/feeds_manager') + history.push('/job_distributors') dispatch(notifySuccessMsg('Job Distributor Updated')) diff --git a/src/screens/FeedsManager/FeedsManagerCard.test.tsx b/src/screens/FeedsManager/FeedsManagerCard.test.tsx index 9d13c857..7b3915f2 100644 --- a/src/screens/FeedsManager/FeedsManagerCard.test.tsx +++ b/src/screens/FeedsManager/FeedsManagerCard.test.tsx @@ -16,7 +16,7 @@ function renderComponent(manager: FeedsManagerFields) { - Redirect Success + Redirect Success , ) } diff --git a/src/screens/FeedsManager/FeedsManagerCard.tsx b/src/screens/FeedsManager/FeedsManagerCard.tsx index 1a6376a4..9317e2cd 100644 --- a/src/screens/FeedsManager/FeedsManagerCard.tsx +++ b/src/screens/FeedsManager/FeedsManagerCard.tsx @@ -90,7 +90,7 @@ export const FeedsManagerCard = ({ manager }: Props) => { open={Boolean(anchorEl)} onClose={handleClose} > - + diff --git a/src/screens/FeedsManager/FeedsManagerScreen.test.tsx b/src/screens/FeedsManager/FeedsManagerScreen.test.tsx index e0cacf31..5554b4b6 100644 --- a/src/screens/FeedsManager/FeedsManagerScreen.test.tsx +++ b/src/screens/FeedsManager/FeedsManagerScreen.test.tsx @@ -20,7 +20,7 @@ function renderComponent(mocks: MockedResponse[]) { - Redirect Success + Redirect Success , ) } diff --git a/src/screens/FeedsManager/FeedsManagerScreen.tsx b/src/screens/FeedsManager/FeedsManagerScreen.tsx index 517a8ff9..1a259682 100644 --- a/src/screens/FeedsManager/FeedsManagerScreen.tsx +++ b/src/screens/FeedsManager/FeedsManagerScreen.tsx @@ -36,7 +36,7 @@ export const FeedsManagerScreen: React.FC = () => { return ( diff --git a/src/screens/JobProposal/JobProposalScreen.test.tsx b/src/screens/JobProposal/JobProposalScreen.test.tsx index d2aadc05..f4139855 100644 --- a/src/screens/JobProposal/JobProposalScreen.test.tsx +++ b/src/screens/JobProposal/JobProposalScreen.test.tsx @@ -36,7 +36,7 @@ function renderComponent(mocks: MockedResponse[]) { - + Root Redirect Success , diff --git a/src/screens/JobProposal/JobProposalScreen.tsx b/src/screens/JobProposal/JobProposalScreen.tsx index 7f8c3d0c..4ea0ef75 100644 --- a/src/screens/JobProposal/JobProposalScreen.tsx +++ b/src/screens/JobProposal/JobProposalScreen.tsx @@ -210,7 +210,7 @@ export const JobProposalScreen: React.FC = () => { const payload = result.data?.approveJobProposalSpec switch (payload?.__typename) { case 'ApproveJobProposalSpecSuccess': - history.push('/feeds_manager') + history.push('/job_distributors') setTimeout(() => dispatch(notifySuccessMsg('Spec approved')), 200) diff --git a/src/screens/NewFeedsManager/NewFeedsManagerScreen.test.tsx b/src/screens/NewFeedsManager/NewFeedsManagerScreen.test.tsx index 6487477e..c1baf9a8 100644 --- a/src/screens/NewFeedsManager/NewFeedsManagerScreen.test.tsx +++ b/src/screens/NewFeedsManager/NewFeedsManagerScreen.test.tsx @@ -30,7 +30,7 @@ function renderComponent(mocks: MockedResponse[]) { - Redirect Success + Redirect Success , ) } diff --git a/src/screens/NewFeedsManager/NewFeedsManagerScreen.tsx b/src/screens/NewFeedsManager/NewFeedsManagerScreen.tsx index 71af17e2..7a986636 100644 --- a/src/screens/NewFeedsManager/NewFeedsManagerScreen.tsx +++ b/src/screens/NewFeedsManager/NewFeedsManagerScreen.tsx @@ -89,7 +89,7 @@ export const NewFeedsManagerScreen: React.FC = () => { const payload = result.data?.createFeedsManager switch (payload?.__typename) { case 'CreateFeedsManagerSuccess': - history.push('/feeds_manager') + history.push('/job_distributors') dispatch(notifySuccessMsg('Job Distributor Created')) @@ -115,7 +115,7 @@ export const NewFeedsManagerScreen: React.FC = () => { return (