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

feat: deactivate cronjobs & internal help form #169

Merged
merged 3 commits into from
Dec 16, 2024
+41 −22
Merged

feat: deactivate cronjobs & internal help form #169

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
46652e8
feat: suspend cronjobs
ClementNumericite Dec 16, 2024
a7f32ee
fix: deactivate
ClementNumericite Dec 16, 2024
3d1cd4a
merge
ClementNumericite Dec 16, 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
1 change: 1 addition & 0 deletions .kontinuous/env/preprod/templates/notification.cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CronJob
metadata:
name: cron-notification
spec:
suspend: true
concurrencyPolicy: Forbid
successfulJobsHistoryLimit: 3
failedJobsHistoryLimit: 3
Expand Down
1 change: 1 addition & 0 deletions .kontinuous/env/preprod/templates/reminder.cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CronJob
metadata:
name: cron-reminder
spec:
suspend: true
concurrencyPolicy: Forbid
successfulJobsHistoryLimit: 3
failedJobsHistoryLimit: 3
Expand Down
1 change: 1 addition & 0 deletions .kontinuous/env/prod/templates/notification.cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CronJob
metadata:
name: cron-notification
spec:
suspend: true
concurrencyPolicy: Forbid
successfulJobsHistoryLimit: 3
failedJobsHistoryLimit: 3
Expand Down
1 change: 1 addition & 0 deletions .kontinuous/env/prod/templates/reminder.cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: CronJob
metadata:
name: cron-reminder
spec:
suspend: true
concurrencyPolicy: Forbid
successfulJobsHistoryLimit: 3
failedJobsHistoryLimit: 3
Expand Down
7 changes: 5 additions & 2 deletions webapp/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
## [0.73.22](https://github.com/SocialGouv/carte-jeune-engage/compare/v0.73.21...v0.73.22) (2024-12-13)


### Bug Fixes

* log octopush error code ([4bbf0a3](https://github.com/SocialGouv/carte-jeune-engage/commit/4bbf0a38a4e151645056b3665e30a43f4bbf7731))
- log octopush error code ([4bbf0a3](https://github.com/SocialGouv/carte-jeune-engage/commit/4bbf0a38a4e151645056b3665e30a43f4bbf7731))

## [0.73.21](https://github.com/SocialGouv/carte-jeune-engage/compare/v0.73.20...v0.73.21) (2024-12-13)

Expand Down Expand Up @@ -59,6 +58,10 @@

### Bug Fixes

## [0.73.13](https://github.com/SocialGouv/carte-jeune-engage/compare/v0.73.12...v0.73.13) (2024-12-03)

### Bug Fixes

- migrations for obiz_id error in offer_articles ([65c8dc9](https://github.com/SocialGouv/carte-jeune-engage/commit/65c8dc9573bbb4fb7cf47c4e1ad469f610028863))

## [0.73.12](https://github.com/SocialGouv/carte-jeune-engage/compare/v0.73.11...v0.73.12) (2024-12-03)
Expand Down
52 changes: 32 additions & 20 deletions webapp/src/components/modals/IssueModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ const IssueModal = (props: IssueModalProps) => {
>
<ModalCloseButton size="lg" top={4} right={4} />
<ModalBody display="flex" flexDir="column" px={9} pb={16} pt={4}>
<OrderIssueContent kind={kind} id={id} issues={issues} />
<Divider my={6} />
<Flex direction="column" gap={4}>
{/* <OrderIssueContent kind={kind} id={id} issues={issues} /> */}
{/* <Divider my={6} /> */}
<Flex direction="column" gap={4} mt={16}>
{/* <ItemLink
onClick={() => setIsOpenCrisp(true)}
icon={HiMiniChatBubbleOvalLeftEllipsis}
Expand All @@ -220,23 +220,35 @@ const IssueModal = (props: IssueModalProps) => {
>
ou
</Text> */}
<ItemLink
href="telto:0472402828"
icon={HiPhone}
text="04 72 40 28 28"
/>
<ItemLink
href="mailto:[email protected]"
icon={HiEnvelope}
text="[email protected]"
/>
<Flex direction="column" gap={4} fontSize={"sm"}>
<Text fontWeight={500} textAlign="center" color="disabled">
Disponible du lundi au vendredi de
<br />
09h à 12h30 puis de 14h à 17h30
</Text>
</Flex>
{kind === "order" ? (
<>
<ItemLink
href="telto:0472402828"
icon={HiPhone}
text="04 72 40 28 28"
/>
<ItemLink
href="mailto:[email protected]"
icon={HiEnvelope}
text="[email protected]"
/>
<Flex direction="column" gap={4} fontSize={"sm"}>
<Text fontWeight={500} textAlign="center" color="disabled">
Disponible du lundi au vendredi de
<br />
09h à 12h30 puis de 14h à 17h30
</Text>
</Flex>
</>
) : (
<>
<ItemLink
href="mailto:[email protected]"
icon={HiEnvelope}
text="[email protected]"
/>
</>
)}
</Flex>
</ModalBody>
</ModalContent>
Expand Down
Loading