[frontend] fix widget clear filters (#5497)

OpenCTI-Platform · Jan 15, 2024 · b21037f · b21037f
1 parent 84cff00
commit b21037f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/opencti-platform/opencti-front/src/private/components/workspaces/dashboards/WidgetConfig.jsx b/opencti-platform/opencti-front/src/private/components/workspaces/dashboards/WidgetConfig.jsx
@@ -383,6 +383,7 @@ const WidgetConfig = ({ workspace, widget, onComplete, closeMenu }) => {
       setStepIndex(2);
     }
     setOpen(false);
+    setDataSelection(widget?.dataSelection ?? [initialSelection]);
   };
   const completeSetup = () => {
     onComplete({
@@ -817,8 +818,7 @@ const WidgetConfig = ({ workspace, widget, onComplete, closeMenu }) => {
                 remarkGfmPlugin={true}
                 commonmark={true}
               />,
-            )
-                            }
+            )}
             l18n={{
               write: t('Write'),
               preview: t('Preview'),

diff --git a/...cti-platform/opencti-front/src/private/components/workspaces/dashboards/WidgetFilters.tsx b/...cti-platform/opencti-front/src/private/components/workspaces/dashboards/WidgetFilters.tsx
@@ -167,12 +167,17 @@ const WidgetFilters: FunctionComponent<WidgetFiltersProps> = ({ perspective, typ
           />
         </>
       )}
-      <div style={{ marginTop: 8 }}>{t('Result: the relationships with source respecting the source pre-query, target respecting the target pre-query, and matching:')}</div>
+
       { isFilterGroupNotEmpty(filters) && (
-        <FilterIconButton
-          filters={filters}
-          helpers={helpers}
-        />
+        <>
+          { perspective === 'relationships'
+            && <div style={{ marginTop: 8 }}>{t('Result: the relationships with source respecting the source pre-query, target respecting the target pre-query, and matching:')}</div>
+          }
+          <FilterIconButton
+            filters={filters}
+            helpers={helpers}
+          />
+        </>
       ) }
     </Box>
   </>;

diff --git a/opencti-platform/opencti-front/src/utils/filters/useFiltersState.tsx b/opencti-platform/opencti-front/src/utils/filters/useFiltersState.tsx
@@ -16,7 +16,7 @@ interface useFiltersStateProps {
   filters: FilterGroup,
   latestAddFilterId?: string
 }
-const useFiltersState = (initFilters: FilterGroup = emptyFilterGroup): [FilterGroup, handleFilterHelpers] => {
+const useFiltersState = (initFilters: FilterGroup = emptyFilterGroup, defaultClearFilters: FilterGroup = emptyFilterGroup): [FilterGroup, handleFilterHelpers] => {
   const [filtersState, setFiltersState] = useState<useFiltersStateProps>({
     filters: initFilters,
     latestAddFilterId: undefined,
@@ -73,7 +73,7 @@ const useFiltersState = (initFilters: FilterGroup = emptyFilterGroup): [FilterGr
     },
     handleClearAllFilters: () => {
       setFiltersState({
-        filters: initFilters,
+        filters: { ...defaultClearFilters },
         latestAddFilterId: undefined });
     },
     handleRemoveFilterById: (id: string) => {