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.

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

WIP: Updated page titles #1333

Open
wants to merge 5 commits into
base: feature/ongoing-accessibility
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/app/store/reducers/app.reducer.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@ describe('AppReducer', () => {
action = new fromAppActions.SetPageTitle('invite-user');
state = fromApp.reducer(initialState, action);

expect(state.pageTitle).toEqual('Invite user - Manage organisation');
expect(state.pageTitle).toEqual('Manage organisation - Invite user - GOV.UK');

action = new fromAppActions.SetPageTitle('organisation');
state = fromApp.reducer(initialState, action);

expect(state.pageTitle).toEqual('Organisation details - Manage organisation');
expect(state.pageTitle).toEqual('Manage organisation - Organisation details - GOV.UK');

action = new fromAppActions.SetPageTitle('profile');
state = fromApp.reducer(initialState, action);

expect(state.pageTitle).toEqual('Profile - Manage organisation');
expect(state.pageTitle).toEqual('Manage organisation - Profile - GOV.UK');

action = new fromAppActions.SetPageTitle('users');
state = fromApp.reducer(initialState, action);

expect(state.pageTitle).toEqual('Users - Manage organisation');
expect(state.pageTitle).toEqual('Manage organisation - Users - GOV.UK');

action = new fromAppActions.SetPageTitle('dummy');
state = fromApp.reducer(initialState, action);

expect(state.pageTitle).toEqual('Manage organisation');
expect(state.pageTitle).toEqual('Manage organisation - GOV.UK');
});

it('setTitleError action should return correct state', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/app/store/selectors/app.selectors.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('App Selectors', () => {

store.dispatch(new fromActions.SetPageTitle('/organisation'));

expect(result).toEqual('Organisation details - Manage organisation');
expect(result).toEqual('Manage organisation - Organisation details - GOV.UK');
});
});

Expand Down
50 changes: 25 additions & 25 deletions src/app/utils/app-utils.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,127 +93,127 @@ describe('AppUtils', () => {
describe('Page title', () => {
it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org-new/register');
expect(array).toEqual('Register - Register organisation');
expect(array).toEqual('Register organisation - Register - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org-new/organisation-type');
expect(array).toEqual('Organisation type - Register organisation');
expect(array).toEqual('Register organisation - Organisation type - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org-new/company-house-details');
expect(array).toEqual('Company house details - Register organisation');
expect(array).toEqual('Register organisation - Company house details - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org-new/document-exchange-reference');
expect(array).toEqual('Document exchange reference - Register organisation');
expect(array).toEqual('Register organisation - Document exchange reference - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org-new/regulatory-organisation-type');
expect(array).toEqual('Organisation regulators - Register organisation');
expect(array).toEqual('Register organisation - Organisation regulators - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org-new/organisation-services-access');
expect(array).toEqual('Services to access - Register organisation');
expect(array).toEqual('Register organisation - Services to access - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org-new/payment-by-account');
expect(array).toEqual('Payment by account - Register organisation');
expect(array).toEqual('Register organisation - Payment by account - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org-new/individual-registered-with-regulator');
expect(array).toEqual('Individual regulators - Register organisation');
expect(array).toEqual('Register organisation - Individual regulators - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org-new/check-your-answers');
expect(array).toEqual('Check your answers - Register organisation');
expect(array).toEqual('Register organisation - Check your answers - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org/register/organisation-name');
expect(array).toEqual('Organisation name - Register organisation');
expect(array).toEqual('Register organisation - Organisation name - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org/register/organisation-address');
expect(array).toEqual('Organisation address - Register organisation');
expect(array).toEqual('Register organisation - Organisation address - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org/register/organisation-pba');
expect(array).toEqual('PBA - Register organisation');
expect(array).toEqual('Register organisation - PBA - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org/register/organisation-have-dx');
expect(array).toEqual('DX - Register organisation');
expect(array).toEqual('Register organisation - DX - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org/register/organisation-dx');
expect(array).toEqual('DX reference - Register organisation');
expect(array).toEqual('Register organisation - DX reference - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org/register/haveSra');
expect(array).toEqual('SRA - Register organisation');
expect(array).toEqual('Register organisation - SRA - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org/register/sraNumber');
expect(array).toEqual('SRA number - Register organisation');
expect(array).toEqual('Register organisation - SRA number - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org/register/name');
expect(array).toEqual('Name - Register organisation');
expect(array).toEqual('Register organisation - Name - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org/register/email-address');
expect(array).toEqual('Email - Register organisation');
expect(array).toEqual('Register organisation - Email - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org/register/check');
expect(array).toEqual('Check answers - Register organisation');
expect(array).toEqual('Register organisation - Check answers - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('register-org/register');
expect(array).toEqual('Register - Register organisation');
expect(array).toEqual('Register organisation - Register - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('invite-users');
expect(array).toEqual('Invite user - Manage organisation');
expect(array).toEqual('Manage organisation - Invite user - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('organisation');
expect(array).toEqual('Organisation details - Manage organisation');
expect(array).toEqual('Manage organisation - Organisation details - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('users');
expect(array).toEqual('Users - Manage organisation');
expect(array).toEqual('Manage organisation - Users - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('unassigned-cases');
expect(array).toEqual('Unassigned cases - Manage organisation');
expect(array).toEqual('Manage organisation - Unassigned cases - GOV.UK');
});

it('should set correct page title', () => {
const array = AppUtils.setPageTitle('assigned-cases');
expect(array).toEqual('Assigned cases - Manage organisation');
expect(array).toEqual('Manage organisation - Assigned cases - GOV.UK');
});
});

Expand Down
60 changes: 30 additions & 30 deletions src/app/utils/app-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,94 +85,94 @@ export class AppUtils {
return AppUtils.getPageTitleForRegisterOrganisation(url);
}
if (url.indexOf('invite-user') !== -1) {
return 'Invite user - Manage organisation';
return 'Manage organisation - Invite user - GOV.UK';
}
if (url.indexOf('profile') !== -1) {
return 'Profile - Manage organisation';
return 'Manage organisation - Profile - GOV.UK';
}
if (url.indexOf('organisation') !== -1) {
return 'Organisation details - Manage organisation';
return 'Manage organisation - Organisation details - GOV.UK';
}
if (url.indexOf('users') !== -1) {
return 'Users - Manage organisation';
return 'Manage organisation - Users - GOV.UK';
}
if (url.indexOf('unassigned-cases') !== -1) {
return 'Unassigned cases - Manage organisation';
return 'Manage organisation - Unassigned cases - GOV.UK';
}
if (url.indexOf('assigned-cases') !== -1) {
return 'Assigned cases - Manage organisation';
return 'Manage organisation - Assigned cases - GOV.UK';
}
return 'Manage organisation';
return 'Manage organisation - GOV.UK';
}

public static getPageTitleForRegisterOrganisation(url: string): string {
if (url.indexOf('register-org-new/register') !== -1) {
return 'Register - Register organisation';
return 'Register organisation - Register - GOV.UK';
}
if (url.indexOf('register-org-new/organisation-type') !== -1) {
return 'Organisation type - Register organisation';
return 'Register organisation - Organisation type - GOV.UK';
}
if (url.indexOf('register-org-new/company-house-details') !== -1) {
return 'Company house details - Register organisation';
return 'Register organisation - Company house details - GOV.UK';
}
if (url.indexOf('register-org-new/registered-address') !== -1) {
return 'Registered address - Register organisation';
return 'Register organisation - Registered address - GOV.UK';
}
if (url.indexOf('register-org-new/document-exchange-reference') !== -1) {
return 'Document exchange reference - Register organisation';
return 'Register organisation - Document exchange reference - GOV.UK';
}
if (url.indexOf('register-org-new/regulatory-organisation-type') !== -1) {
return 'Organisation regulators - Register organisation';
return 'Register organisation - Organisation regulators - GOV.UK';
}
if (url.indexOf('register-org-new/organisation-services-access') !== -1) {
return 'Services to access - Register organisation';
return 'Register organisation - Services to access - GOV.UK';
}
if (url.indexOf('register-org-new/payment-by-account') !== -1) {
return 'Payment by account - Register organisation';
return 'Register organisation - Payment by account - GOV.UK';
}
if (url.indexOf('register-org-new/contact-details') !== -1) {
return 'Contact details - Register organisation';
return 'Register organisation - Contact details - GOV.UK';
}
if (url.indexOf('register-org-new/individual-registered-with-regulator') !== -1) {
return 'Individual regulators - Register organisation';
return 'Register organisation - Individual regulators - GOV.UK';
}
if (url.indexOf('register-org-new/check-your-answers') !== -1) {
return 'Check your answers - Register organisation';
return 'Register organisation - Check your answers - GOV.UK';
}
if (url.indexOf('register-org/register/organisation-name') !== -1) {
return 'Organisation name - Register organisation';
return 'Register organisation - Organisation name - GOV.UK';
}
if (url.indexOf('register-org/register/organisation-address') !== -1) {
return 'Organisation address - Register organisation';
return 'Register organisation - Organisation address - GOV.UK';
}
if (url.indexOf('register-org/register/organisation-pba') !== -1) {
return 'PBA - Register organisation';
return 'Register organisation - PBA - GOV.UK';
}
if (url.indexOf('register-org/register/organisation-have-dx') !== -1) {
return 'DX - Register organisation';
return 'Register organisation - DX - GOV.UK';
}
if (url.indexOf('register-org/register/organisation-dx') !== -1) {
return 'DX reference - Register organisation';
return 'Register organisation - DX reference - GOV.UK';
}
if (url.indexOf('register-org/register/haveSra') !== -1) {
return 'SRA - Register organisation';
return 'Register organisation - SRA - GOV.UK';
}
if (url.indexOf('register-org/register/sraNumber') !== -1) {
return 'SRA number - Register organisation';
return 'Register organisation - SRA number - GOV.UK';
}
if (url.indexOf('register-org/register/name') !== -1) {
return 'Name - Register organisation';
return 'Register organisation - Name - GOV.UK';
}
if (url.indexOf('register-org/register/email-address') !== -1) {
return 'Email - Register organisation';
return 'Register organisation - Email - GOV.UK';
}
if (url.indexOf('register-org/register/check') !== -1) {
return 'Check answers - Register organisation';
return 'Register organisation - Check answers - GOV.UK';
}
if (url.indexOf('register-org/register/confirmation') !== -1) {
return 'Confirmation - Register organisation';
return 'Register organisation - Confirmation - GOV.UK';
}
return 'Register - Register organisation';
return 'Register organisation - Register - GOV.UK';
}

// 04-Sep-2019 - Author U Denduluri
Expand Down