Skip to content
This repository was archived by the owner on Oct 20, 2022. It is now read-only.

refactor: make title input multiline, truncate longer titles and fix/… #1003

Open
voduguwa wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

refactor: make title input multiline, truncate longer titles and fix/… #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c08225
refactor: make title input multiline, truncate longer titles and fix/…
voduguwa Sep 8, 2022
f017b9a
test: Remove 'only' from GenericTemplate test
voduguwa Sep 12, 2022
3c852c1
refactor: change variable name
voduguwa Sep 13, 2022
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
19 changes: 14 additions & 5 deletions cypress/integration/generic_templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,18 +338,26 @@ context('GenericTemplates tests', () => {

cy.contains(genericTemplateQuestions[0]);

cy.get('[data-cy=title-input] input').clear();
cy.get('[data-cy=title-input] textarea').first().clear();

cy.get(
'[data-cy=genericTemplate-declaration-modal] [data-cy=save-and-continue-button]'
).click();

cy.contains('This is a required field');

cy.get('[data-cy=title-input] input')
const longText = faker.lorem.paragraph(5);

cy.get('[data-cy=title-input] textarea')
.first()
.clear()
.type(genericTemplateTitle)
.should('have.value', genericTemplateTitle);
.type(longText)
.should('have.value', longText)
.blur();

cy.get(
'[data-cy=genericTemplate-declaration-modal] [data-cy=questionary-title]'
).contains(longText.substring(0, 30) + '...');

cy.get(
'[data-cy=genericTemplate-declaration-modal] [data-cy=save-and-continue-button]'
Expand Down Expand Up @@ -474,7 +482,8 @@ context('GenericTemplates tests', () => {

cy.contains(addButtonLabel[0]).click();

cy.get('[data-cy=title-input] input')
cy.get('[data-cy=title-input] textarea')
.first()
.clear()
.type(genericTemplateTitle)
.should('have.value', genericTemplateTitle)
Expand Down
5 changes: 4 additions & 1 deletion ...components/questionary/questionaryComponents/GenericTemplate/GenericTemplateContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
QuestionarySubmissionModel,
} from 'models/questionary/QuestionarySubmissionState';
import useEventHandlers from 'models/questionary/useEventHandlers';
import { truncateString } from 'utils/truncateString';

export interface GenericTemplateContextType extends QuestionaryContextType {
state: GenericTemplateSubmissionState | null;
Expand Down Expand Up @@ -63,7 +64,9 @@ export function GenericTemplateContainer(props: {

return (
<QuestionaryContext.Provider value={{ state, dispatch }}>
<Questionary title={state.genericTemplate.title || props.title} />
<Questionary
title={truncateString(state.genericTemplate.title || props.title, 30)}
/>
</QuestionaryContext.Provider>
);
}
1 change: 1 addition & 0 deletions ...y/questionaryComponents/GenericTemplateBasis/QuestionaryComponentGenericTemplateBasis.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ function QuestionaryComponentGenericTemplateBasis(props: BasicComponentProps) {
},
}}
required
multiline
fullWidth
component={TextFieldNoSubmit}
data-cy="title-input"
Expand Down