Revert "fix(UI): Remove checkbox for default options sent for ack (#1…

…1008)" (#11018) This reverts commit 7805085.
centreon · Apr 25, 2022 · 1391348 · 1391348
1 parent 6f868b0
commit 1391348
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/www/front_src/src/Resources/Actions/Resource/Acknowledge/Dialog.tsx b/www/front_src/src/Resources/Actions/Resource/Acknowledge/Dialog.tsx
@@ -20,6 +20,8 @@ import {
   labelNotify,
   labelNotifyHelpCaption,
   labelAcknowledgeServices,
+  labelPersistent,
+  labelSticky,
 } from '../../../translatedLabels';
 import { Resource } from '../../../models';
 import useAclQuery from '../aclQuery';
@@ -121,6 +123,34 @@ const DialogAcknowledge = ({
             />
           </Grid>
         )}
+        <Grid item>
+          <FormControlLabel
+            control={
+              <Checkbox
+                checked={values.persistent}
+                color="primary"
+                inputProps={{ 'aria-label': t(labelPersistent) }}
+                size="small"
+                onChange={handleChange('persistent')}
+              />
+            }
+            label={t(labelPersistent) as string}
+          />
+        </Grid>
+        <Grid item>
+          <FormControlLabel
+            control={
+              <Checkbox
+                checked={values.isSticky}
+                color="primary"
+                inputProps={{ 'aria-label': t(labelSticky) }}
+                size="small"
+                onChange={handleChange('isSticky')}
+              />
+            }
+            label={t(labelSticky) as string}
+          />
+        </Grid>
       </Grid>
     </Dialog>
   );

diff --git a/www/front_src/src/Resources/Actions/index.test.tsx b/www/front_src/src/Resources/Actions/index.test.tsx
@@ -46,6 +46,7 @@ import {
   labelCritical,
   labelUnknown,
   labelAddComment,
+  labelPersistent,
 } from '../translatedLabels';
 import useLoadResources from '../Listing/useLoadResources';
 import useListing from '../Listing/useListing';
@@ -76,7 +77,6 @@ jest.mock('react-redux', () => ({
 
 const mockUserContext = {
   acknowledgement: {
-    force_active_checks: true,
     persistent: true,
     sticky: false,
   },
@@ -285,8 +285,10 @@ describe(Actions, () => {
     fireEvent.click(getByText(labelAcknowledge));
 
     const notifyCheckbox = await findByLabelText(labelNotify);
+    const persistentCheckbox = await findByLabelText(labelPersistent);
 
     fireEvent.click(notifyCheckbox);
+    fireEvent.click(persistentCheckbox);
     fireEvent.click(getByLabelText(labelAcknowledgeServices));
 
     mockedAxios.get.mockResolvedValueOnce({ data: {} });
@@ -300,9 +302,8 @@ describe(Actions, () => {
         {
           acknowledgement: {
             comment: labelAcknowledgedByAdmin,
-            force_active_checks: true,
             is_notify_contacts: true,
-            is_persistent_comment: true,
+            is_persistent_comment: false,
             is_sticky: false,
             with_services: true,
           },