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

Added correct description for field with URL transliteration #1436

Merged
merged 8 commits into from
Oct 20, 2024
Merged

Added correct description for field with URL transliteration #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7c01b47
feat: the description of the line for entering transliteration for th…
Michael-Kolpakov Sep 23, 2024
bf783d7
Merge branch 'release/1.1.0' into feature/issue-1773
Michael-Kolpakov Oct 9, 2024
e2c47b6
Merge branch 'release/1.1.0' into feature/issue-1773
Michael-Kolpakov Oct 10, 2024
cff1969
Merge branch 'release/1.1.0' into feature/issue-1773
Michael-Kolpakov Oct 10, 2024
c5eebd5
Merge branch 'release/1.1.0' into feature/issue-1773
sashapanasiuk5 Oct 17, 2024
b9c2f45
Merge branch 'release/1.1.0' into feature/issue-1773
Michael-Kolpakov Oct 20, 2024
0e1f4b9
feat: fixed tests
Michael-Kolpakov Oct 20, 2024
de162e4
Merge branch 'release/1.1.0' into feature/issue-1773
Michael-Kolpakov Oct 20, 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
6 changes: 3 additions & 3 deletions src/features/AdminPage/NewStreetcode/MainBlock/MainBlockAdmin.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,14 @@ const MainBlockAdmin = React.memo(({
/>
</Form.Item>
<Form.Item
label="URL"
label="Транслітерація для URL: "
name="streetcodeUrlName"
className="maincard-item"
rules={[
{ required: true, message: 'Введіть Посилання', max: 100 },
{ required: true, message: 'Введіть транслітерацію', max: 100 },
{
pattern: /^[a-z0-9-]+$/,
message: 'Посилання має містити лише малі латинські літери, цифри та дефіс',
message: 'Транслітерація має містити лише малі латинські літери, цифри та дефіс',
},
{
validator: async (_, value) => {
Expand Down
8 changes: 4 additions & 4 deletions src/features/AdminPage/NewsPage/NewsModal/NewsModal.component.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ describe('NewsModal', () => {
);

const titleInput = screen.getByLabelText('Заголовок:') as HTMLInputElement;
const urlInput = screen.getByLabelText('Посилання:') as HTMLInputElement;
const urlInput = screen.getByLabelText('Транслітерація для URL:') as HTMLInputElement;
const textInput = screen.getByTestId('mockEditor') as HTMLTextAreaElement;
const fileUpload = screen.getByTestId('fileuploader') as HTMLInputElement;
const button = screen.getByRole('button', { name: 'Зберегти' });
Expand Down Expand Up @@ -192,7 +192,7 @@ describe('NewsModal', () => {
render(<NewsModal open setIsModalOpen={() => { }} />);

const titleInput = screen.getByLabelText('Заголовок:') as HTMLInputElement;
const urlInput = screen.getByLabelText('Посилання:') as HTMLInputElement;
const urlInput = screen.getByLabelText('Транслітерація для URL:') as HTMLInputElement;
const textInput = screen.getByTestId('mockEditor') as HTMLTextAreaElement;
const fileUpload = screen.getByTestId('fileuploader') as HTMLInputElement;

Expand Down Expand Up @@ -242,7 +242,7 @@ describe('NewsModal', () => {
);

const titleInput = screen.getByLabelText('Заголовок:') as HTMLInputElement;
const urlInput = screen.getByLabelText('Посилання:') as HTMLInputElement;
const urlInput = screen.getByLabelText('Транслітерація для URL:') as HTMLInputElement;
const dateInput = screen.getByRole('textbox', { name: "date" }) as HTMLInputElement;
const button = screen.getByRole('button', { name: 'Зберегти' });

Expand Down Expand Up @@ -299,7 +299,7 @@ describe('NewsModal', () => {
);

const titleInput = screen.getByLabelText('Заголовок:') as HTMLInputElement;
const urlInput = screen.getByLabelText('Посилання:') as HTMLInputElement;
const urlInput = screen.getByLabelText('Транслітерація для URL:') as HTMLInputElement;
const textInput = screen.getByTestId('mockEditor') as HTMLTextAreaElement;
const dateInput = screen.getByRole('textbox', { name: "date" }) as HTMLInputElement;
const fileUpload = screen.getByTestId('fileuploader') as HTMLInputElement;
Expand Down
6 changes: 3 additions & 3 deletions src/features/AdminPage/NewsPage/NewsModal/NewsModal.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,13 @@ const NewsModal: React.FC<{

<Form.Item
name="url"
label="Посилання: "
label="Транслітерація для URL: "
rules={[
{ required: true, message: 'Введіть Посилання' },
{ required: true, message: 'Введіть транслітерацію' },
{
pattern: /^[0-9a-z-]+$/,
message:
'Посилання має містити лише малі латинські літери, цифри та дефіс',
'Транслітерація має містити лише малі латинські літери, цифри та дефіс',
},
{
validator: async (_, value) => {
Expand Down