Merge pull request #4196 from mzedel/men-6832

MEN-6832 - fix: limited dynamic group filter adjustments
mendersoftware · Nov 13, 2023 · 991c95b · 991c95b
2 parents a011acd + b5f62ab
commit 991c95b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/src/js/components/devices/widgets/filters.js b/src/js/components/devices/widgets/filters.js
@@ -26,7 +26,6 @@ import { deepCompare, toggle } from '../../../helpers';
 import { getDeviceFilters, getFilterAttributes, getGlobalSettings, getIsEnterprise, getSelectedGroupInfo, getTenantCapabilities } from '../../../selectors';
 import EnterpriseNotification from '../../common/enterpriseNotification';
 import { InfoHintContainer } from '../../common/info-hint';
-import MenderTooltip from '../../common/mendertooltip';
 import FilterItem from './filteritem';
 
 export const getFilterLabelByKey = (key, attributes) => {
@@ -125,14 +124,15 @@ export const Filters = ({ className = '', onGroupClick, open }) => {
                 <Chip
                   className="margin-right-small"
                   key={`filter-${item.key}-${item.operator}-${item.value}`}
+                  title={item.isGroupFilter ? 'Group definition filter' : ''}
                   label={`${getFilterLabelByKey(item.key, attributes)} ${DEVICE_FILTERING_OPTIONS[item.operator].shortform} ${
                     item.operator !== DEVICE_FILTERING_OPTIONS.$exists.key && item.operator !== DEVICE_FILTERING_OPTIONS.$nexists.key
                       ? item.operator === DEVICE_FILTERING_OPTIONS.$regex.key
                         ? `${item.value}.*`
                         : item.value
                       : ''
                   }`}
-                  onDelete={() => removeFilter(item)}
+                  onDelete={item.isGroupFilter ? undefined : () => removeFilter(item)}
                 />
               ))}
             </div>
@@ -154,18 +154,7 @@ export const Filters = ({ className = '', onGroupClick, open }) => {
         )}
         {isEnterprise && !!filters.length && (
           <div>
-            {selectedGroup ? (
-              !!groupFilters.length && (
-                <MenderTooltip
-                  title="Saved changes will not change the target devices of any ongoing deployments to this group, but will take effect for new deployments"
-                  arrow
-                >
-                  <Button variant="contained" color="secondary" onClick={onGroupClick}>
-                    Save group
-                  </Button>
-                </MenderTooltip>
-              )
-            ) : (
+            {!selectedGroup && (
               <Button variant="contained" color="secondary" onClick={onGroupClick}>
                 Create group with this filter
               </Button>

diff --git a/src/js/selectors/index.js b/src/js/selectors/index.js
@@ -175,7 +175,7 @@ export const getSelectedGroupInfo = createSelector(
     let groupFilters = [];
     if (selectedGroup && groupsById[selectedGroup]) {
       groupCount = groupsById[selectedGroup].total;
-      groupFilters = groupsById[selectedGroup].filters || [];
+      groupFilters = groupsById[selectedGroup].filters.map(filter => ({ ...filter, isGroupFilter: true })) || [];
     }
     return { groupCount, selectedGroup, groupFilters };
   }