Skip to content

Add link to documentation in use enrollment process #760

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

Merged
cpprian merged 5 commits into from
Aug 30, 2024
Merged

Add link to documentation in use enrollment process #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a92b51
add link to documentation
cpprian Aug 29, 2024
f395ad9
separate label and link
cpprian Aug 29, 2024
8d482fa
clicking link opens a new page
cpprian Aug 30, 2024
292b410
Merge branch 'dev' into add-link-to-documentation-in-use-enrollment-p…
cpprian Aug 30, 2024
5ad93c6
fix lint errors
cpprian Aug 30, 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
2 changes: 1 addition & 1 deletion web/src/i18n/en/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ const en: BaseTranslation = {
},
enableEnrollment: {
label: 'Use user self-enrollment process',
link: '[more information here](https://defguard.gitbook.io/defguard/help/enrollment)',
link: '<a href="https://defguard.gitbook.io/defguard/help/enrollment" target="_blank">more information here</a>',
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions web/src/i18n/i18n-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ type RootTranslation = {
*/
label: string
/**
* [​m​o​r​e​ ​i​n​f​o​r​m​a​t​i​o​n​ ​h​e​r​e​]​(​h​t​t​p​s​:​/​/​d​e​f​g​u​a​r​d​.​g​i​t​b​o​o​k​.​i​o​/​d​e​f​g​u​a​r​d​/​h​e​l​p​/​e​n​r​o​l​l​m​e​n​t​)
* <​a​ ​h​r​e​f​=​"​h​t​t​p​s​:​/​/​d​e​f​g​u​a​r​d​.​g​i​t​b​o​o​k​.​i​o​/​d​e​f​g​u​a​r​d​/​h​e​l​p​/​e​n​r​o​l​l​m​e​n​t​"​ ​t​a​r​g​e​t​=​"​_​b​l​a​n​k​"​>​m​o​r​e​ ​i​n​f​o​r​m​a​t​i​o​n​ ​h​e​r​e​<​/​a​>
*/
link: string
}
Expand Down Expand Up @@ -5064,7 +5064,7 @@ export type TranslationFunctions = {
*/
label: () => LocalizedString
/**
* [more information here](https://defguard.gitbook.io/defguard/help/enrollment)
* <a href="https://defguard.gitbook.io/defguard/help/enrollment" target="_blank">more information here</a>
*/
link: () => LocalizedString
}
Expand Down
2 changes: 1 addition & 1 deletion web/src/i18n/pl/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ const pl: Translation = {
},
enableEnrollment: {
label: 'Użyj zdalnej rejestracji',
link: '[więcej informacji tutaj](https://defguard.gitbook.io/defguard/help/enrollment)',
link: '<a href="https://defguard.gitbook.io/defguard/help/enrollment" target="_blank">więcej informacji tutaj</a>',
},
},
},
Expand Down
6 changes: 2 additions & 4 deletions web/src/pages/users/UsersOverview/modals/AddUserModal/components/AddUserForm/AddUserForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import './style.scss';

import { zodResolver } from '@hookform/resolvers/zod';
import { useMutation, useQueryClient } from '@tanstack/react-query';
import parse from 'html-react-parser';
import { omit } from 'lodash-es';
import { useMemo, useRef, useState } from 'react';
import { SubmitHandler, useController, useForm } from 'react-hook-form';
import ReactMarkdown from 'react-markdown';
import { z } from 'zod';
import { shallow } from 'zustand/shallow';

Expand Down Expand Up @@ -195,9 +195,7 @@ export const AddUserForm = () => {
label={LL.modals.addUser.form.fields.enableEnrollment.label()}
controller={{ control, name: 'enable_enrollment' }}
/>
<ReactMarkdown>
{LL.modals.addUser.form.fields.enableEnrollment.link()}
</ReactMarkdown>
<>{parse(LL.modals.addUser.form.fields.enableEnrollment.link())}</>
</div>
<div className="row">
<div className="item">
Expand Down