Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
uses: pnpm/action-setup@v6
with:
cache: true
version: 11
version: 11.11
run_install: false

- name: Install Rust stable
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@v6
with:
version: 11
version: 11.11
run_install: false

- name: Install e2e dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- uses: pnpm/action-setup@v6
with:
cache: true
version: 11
version: 11.11
run_install: false

- name: Get pnpm store directory
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
with:
cache: true
run_install: false
version: 11
version: 11.11

- name: Install Node dependencies for New UI
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
uses: pnpm/action-setup@v6
with:
cache: true
version: 11
version: 11.11
run_install: false

- name: Get pnpm store directory
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
- uses: pnpm/action-setup@v6
with:
cache: true
version: 11
version: 11.11
run_install: false

- name: Get pnpm store directory
Expand Down
1 change: 1 addition & 0 deletions new-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"react-markdown": "^10.1.0",
"rehype-raw": "^7.0.0",
"rehype-sanitize": "^6.0.0",
"remark-gfm": "^4.0.1",
"rxjs": "^7.8.2",
"sass": "^1.101.0",
"zod": "^4.4.3",
Expand Down
201 changes: 201 additions & 0 deletions new-ui/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,10 @@ export const useEnrollmentStore = create<Store>()(
default:
return;
}
set({ activeStep: nextStep });
set({
activeStep: nextStep,
deadline: nextStep === EnrollmentStep.Finish ? null : get().deadline,
});
},
}),
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,28 @@ import { useNavigate } from '@tanstack/react-router';
import { Button } from '../../../../../shared/components/Button/Button';
import { ButtonVariant } from '../../../../../shared/components/Button/types';
import { Controls } from '../../../../../shared/components/Controls/Controls';
import { RenderMarkdown } from '../../../../../shared/components/RenderMarkdown/RenderMarkdown';
import { isPresent } from '../../../../../shared/utils/isPresent';
import { useEnrollmentStore } from '../../hooks/useEnrollmentStore';
import bannerSrc from './assets/banner.png';

export const FinishStep = () => {
const navigate = useNavigate();
const response = useEnrollmentStore((s) => s.startResponse);
const markdownContent = response?.final_page_content;
const showMarkdown = isPresent(markdownContent) && markdownContent.length > 0;

return (
<div id="finish-step" className="step-content">
<div className="content-pad">
<img src={bannerSrc} loading="eager" width={504} height={150} />
<div className="top">
<p>{`New Defguard instance added successfully`}</p>
<p>{`You can now connect this device, check its status and view statistics.`}</p>
</div>
<div className="markdown-content"></div>
{!showMarkdown && (
<div className="top">
<p>{`New Defguard instance added successfully`}</p>
<p>{`You can now connect this device, check its status and view statistics.`}</p>
</div>
)}
{showMarkdown && <RenderMarkdown content={markdownContent} />}
</div>
<Controls>
<div className="right">
Expand Down
Loading
Loading