Merge branch '8.2' of https://github.com/elastic/kibana into backport…

…/8.2/pr-128925
elastic · Apr 3, 2022 · 4894663 · 4894663
2 parents 0d18685 + 8374636
commit 4894663
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 19 deletions.
diff --git a/...ctions_ui/public/application/sections/rules_list/components/rule_status_dropdown.test.tsx b/...ctions_ui/public/application/sections/rules_list/components/rule_status_dropdown.test.tsx
@@ -22,6 +22,7 @@ describe('RuleStatusDropdown', () => {
     enableRule,
     snoozeRule,
     unsnoozeRule,
+    isEditable: true,
     item: {
       id: '1',
       name: 'test rule',
@@ -114,4 +115,19 @@ describe('RuleStatusDropdown', () => {
       'Disabled'
     );
   });
+
+  test('renders read-only status control when isEditable is false', () => {
+    const wrapper = mountWithIntl(
+      <RuleStatusDropdown
+        {...{
+          ...props,
+          item: { ...props.item, snoozeEndTime: SNOOZE_END_TIME },
+        }}
+        isEditable={false}
+      />
+    );
+    expect(wrapper.find('[data-test-subj="statusDropdownReadonly"]').first().props().children).toBe(
+      'Enabled'
+    );
+  });
 });
diff --git a/...ers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.tsx b/...ers_actions_ui/public/application/sections/rules_list/components/rule_status_dropdown.tsx
@@ -115,11 +115,17 @@ export const RuleStatusDropdown: React.FunctionComponent<ComponentOpts> = ({
       </EuiToolTip>
     ) : null;
 
-  const badge = (
+  const nonEditableBadge = (
+    <EuiBadge color={badgeColor} data-test-subj="statusDropdownReadonly">
+      {badgeMessage}
+    </EuiBadge>
+  );
+
+  const editableBadge = (
     <EuiBadge
       color={badgeColor}
       iconSide="right"
-      iconType={!isUpdating ? 'arrowDown' : undefined}
+      iconType={!isUpdating && isEditable ? 'arrowDown' : undefined}
       onClick={onClickBadge}
       iconOnClick={onClickBadge}
       onClickAriaLabel={OPEN_MENU_ARIA_LABEL}
@@ -142,23 +148,27 @@ export const RuleStatusDropdown: React.FunctionComponent<ComponentOpts> = ({
       responsive={false}
     >
       <EuiFlexItem grow={false}>
-        <EuiPopover
-          button={badge}
-          isOpen={isPopoverOpen}
-          closePopover={onClosePopover}
-          panelPaddingSize="s"
-          data-test-subj="statusDropdown"
-          title={badgeMessage}
-        >
-          <RuleStatusMenu
-            onClosePopover={onClosePopover}
-            onChangeEnabledStatus={onChangeEnabledStatus}
-            onChangeSnooze={onChangeSnooze}
-            isEnabled={isEnabled}
-            isSnoozed={isSnoozed}
-            snoozeEndTime={item.snoozeEndTime}
-          />
-        </EuiPopover>
+        {isEditable ? (
+          <EuiPopover
+            button={editableBadge}
+            isOpen={isPopoverOpen && isEditable}
+            closePopover={onClosePopover}
+            panelPaddingSize="s"
+            data-test-subj="statusDropdown"
+            title={badgeMessage}
+          >
+            <RuleStatusMenu
+              onClosePopover={onClosePopover}
+              onChangeEnabledStatus={onChangeEnabledStatus}
+              onChangeSnooze={onChangeSnooze}
+              isEnabled={isEnabled}
+              isSnoozed={isSnoozed}
+              snoozeEndTime={item.snoozeEndTime}
+            />
+          </EuiPopover>
+        ) : (
+          nonEditableBadge
+        )}
       </EuiFlexItem>
       <EuiFlexItem data-test-subj="remainingSnoozeTime" grow={false}>
         {remainingSnoozeTime}

diff --git a/...gins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx b/...gins/triggers_actions_ui/public/application/sections/rules_list/components/rules_list.tsx
@@ -358,6 +358,7 @@ export const RulesList: React.FunctionComponent = () => {
         unsnoozeRule={async () => await unsnoozeRule({ http, id: item.id })}
         item={item}
         onRuleChanged={() => loadRulesData()}
+        isEditable={item.isEditable && isRuleTypeEditableInContext(item.ruleTypeId)}
       />
     );
   };