analytica-frontend-lib 1.2.75 → 1.2.77

package/dist/ActivityFilters/index.js

@@ -34,12 +34,26 @@ __export(ActivityFilters_exports, {
   ActivityFiltersPopover: () => ActivityFiltersPopover
 });
 module.exports = __toCommonJS(ActivityFilters_exports);
-var import_react14 = require("react");
+var import_react16 = require("react");
 
 // src/utils/utils.ts
 var import_clsx = require("clsx");
 var import_tailwind_merge = require("tailwind-merge");
 
+// src/utils/arraysEqual.ts
+function arraysEqual(a, b, comparator) {
+  if (a.length !== b.length) return false;
+  if (a.length === 0 && b.length === 0) return true;
+  if (comparator) {
+    const sortedA2 = [...a].sort(comparator);
+    const sortedB2 = [...b].sort(comparator);
+    return sortedA2.every((val, index) => val === sortedB2[index]);
+  }
+  const sortedA = [...a].sort((x, y) => String(x).localeCompare(String(y)));
+  const sortedB = [...b].sort((x, y) => String(x).localeCompare(String(y)));
+  return sortedA.every((val, index) => val === sortedB[index]);
+}
+
 // src/utils/activityFilters.ts
 function getSelectedIdsFromCategories(categories, keys) {
   const result = {};
@@ -55,17 +69,6 @@ function toggleArrayItem(array, item) {
 function toggleSingleValue(currentValue, newValue) {
   return currentValue === newValue ? null : newValue;
 }
-function arraysEqual(a, b, comparator) {
-  if (a.length !== b.length) return false;
-  if (comparator) {
-    const sortedA2 = [...a].sort(comparator);
-    const sortedB2 = [...b].sort(comparator);
-    return sortedA2.every((val, index) => val === sortedB2[index]);
-  }
-  const sortedA = [...a].sort((x, y) => String(x).localeCompare(String(y)));
-  const sortedB = [...b].sort((x, y) => String(x).localeCompare(String(y)));
-  return sortedA.every((val, index) => val === sortedB[index]);
-}
 function areFiltersEqual(filters1, filters2) {
   if (filters1 === filters2) return true;
   if (!filters1 || !filters2) return false;
@@ -5216,8 +5219,269 @@ var createUseActivityFiltersData = (apiClient) => {
   return (options) => useActivityFiltersDataImpl(apiClient, options);
 };
 
-// src/components/ActivityFilters/ActivityFilters.tsx
+// src/store/questionFiltersStore.ts
+var import_zustand5 = require("zustand");
+var useQuestionFiltersStore = (0, import_zustand5.create)((set) => ({
+  // Filter states
+  draftFilters: null,
+  appliedFilters: null,
+  setDraftFilters: (filters) => {
+    set({ draftFilters: filters });
+  },
+  applyFilters: () => {
+    set((state) => ({
+      appliedFilters: state.draftFilters
+    }));
+  },
+  clearFilters: () => {
+    set({
+      draftFilters: null,
+      appliedFilters: null,
+      // Clear cached questions when filters are cleared
+      cachedQuestions: [],
+      cachedPagination: null,
+      cachedFilters: null
+    });
+  },
+  // Questions cache state
+  cachedQuestions: [],
+  cachedPagination: null,
+  cachedFilters: null,
+  setCachedQuestions: (questions, pagination, filters) => {
+    set({
+      cachedQuestions: questions,
+      cachedPagination: pagination,
+      cachedFilters: filters
+    });
+  },
+  clearCachedQuestions: () => {
+    set({
+      cachedQuestions: [],
+      cachedPagination: null,
+      cachedFilters: null
+    });
+  }
+}));
+
+// src/components/ActivityFilters/components/SubjectsFilter.tsx
 var import_jsx_runtime21 = require("react/jsx-runtime");
+var SubjectsFilter = ({
+  knowledgeAreas,
+  selectedSubject,
+  onSubjectChange,
+  loading = false,
+  error = null
+}) => {
+  const { isDark } = useTheme();
+  if (loading) {
+    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", className: "text-text-600", children: "Carregando mat\xE9rias..." });
+  }
+  if (error) {
+    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", className: "text-text-600", children: error });
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: "grid grid-cols-3 gap-3", children: knowledgeAreas.map((area) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+    Radio_default,
+    {
+      value: area.id,
+      checked: selectedSubject === area.id,
+      onChange: () => onSubjectChange(area.id),
+      label: /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { className: "flex items-center gap-2 w-full min-w-0", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+          "span",
+          {
+            className: "size-4 rounded-sm flex items-center justify-center shrink-0 text-text-950",
+            style: {
+              backgroundColor: getSubjectColorWithOpacity(
+                area.color,
+                isDark
+              )
+            },
+            children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+              IconRender_default,
+              {
+                iconName: area.icon || "BookOpen",
+                size: 14,
+                color: "currentColor"
+              }
+            )
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { className: "truncate flex-1", children: area.name })
+      ] })
+    },
+    area.id
+  )) });
+};
+
+// src/components/ActivityFilters/components/KnowledgeStructureFilter.tsx
+var import_jsx_runtime22 = require("react/jsx-runtime");
+var KnowledgeStructureFilter = ({
+  knowledgeStructure,
+  knowledgeCategories,
+  handleCategoriesChange
+}) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { className: "mt-4", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text_default, { size: "sm", weight: "bold", className: "mb-3 block", children: "Tema, Subtema e Assunto" }),
+    knowledgeStructure.loading && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text_default, { size: "sm", className: "text-text-600 mb-3", children: "Carregando estrutura de conhecimento..." }),
+    knowledgeStructure.error && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text_default, { size: "sm", className: "mb-3 text-error-500", children: knowledgeStructure.error }),
+    knowledgeCategories.length > 0 && handleCategoriesChange && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+      CheckboxGroup,
+      {
+        categories: knowledgeCategories,
+        onCategoriesChange: handleCategoriesChange,
+        compactSingleItem: false,
+        showSingleItem: true
+      }
+    ),
+    !knowledgeStructure.loading && knowledgeCategories.length === 0 && knowledgeStructure.topics.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text_default, { size: "sm", className: "text-text-600", children: "Nenhum tema dispon\xEDvel para as mat\xE9rias selecionadas" })
+  ] });
+};
+
+// src/components/ActivityFilters/components/FilterActions.tsx
+var import_jsx_runtime23 = require("react/jsx-runtime");
+var FilterActions = ({
+  onClearFilters,
+  onApplyFilters
+}) => {
+  if (!onClearFilters && !onApplyFilters) {
+    return null;
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)("div", { className: "grid grid-cols-2 gap-2 justify-end mt-4 px-4 pt-4 border-t border-border-200", children: [
+    onClearFilters && /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Button_default, { variant: "link", onClick: onClearFilters, size: "small", children: "Limpar filtros" }),
+    onApplyFilters && /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Button_default, { variant: "outline", onClick: onApplyFilters, size: "small", children: "Filtrar" })
+  ] });
+};
+
+// src/components/ActivityFilters/utils/useInitialFiltersLoader.ts
+var import_react14 = require("react");
+var useInitialFiltersLoader = ({
+  initialFilters,
+  loadTopics,
+  loadSubtopics,
+  loadContents
+}) => {
+  const hasRequestedTopicsRef = (0, import_react14.useRef)(false);
+  const hasRequestedSubtopicsRef = (0, import_react14.useRef)(false);
+  const hasRequestedContentsRef = (0, import_react14.useRef)(false);
+  (0, import_react14.useEffect)(() => {
+    hasRequestedTopicsRef.current = false;
+    hasRequestedSubtopicsRef.current = false;
+    hasRequestedContentsRef.current = false;
+    if (!initialFilters) {
+      return;
+    }
+    const subjectIds = initialFilters.subjectIds || [];
+    const topicIds = initialFilters.topicIds || [];
+    const subtopicIds = initialFilters.subtopicIds || [];
+    if (subjectIds.length > 0 && !hasRequestedTopicsRef.current) {
+      if (loadTopics) {
+        loadTopics(subjectIds);
+      }
+      hasRequestedTopicsRef.current = true;
+    }
+    if (topicIds.length > 0 && !hasRequestedSubtopicsRef.current) {
+      if (loadSubtopics) {
+        loadSubtopics(topicIds);
+      }
+      hasRequestedSubtopicsRef.current = true;
+    }
+    if (subtopicIds.length > 0 && !hasRequestedContentsRef.current) {
+      if (loadContents) {
+        loadContents(subtopicIds);
+      }
+      hasRequestedContentsRef.current = true;
+    }
+  }, [initialFilters, loadTopics, loadSubtopics, loadContents]);
+  return {
+    hasRequestedTopicsRef,
+    hasRequestedSubtopicsRef,
+    hasRequestedContentsRef
+  };
+};
+
+// src/components/ActivityFilters/utils/useKnowledgeStructureInitialFilters.ts
+var import_react15 = require("react");
+var useKnowledgeStructureInitialFilters = ({
+  initialFilters,
+  knowledgeCategories,
+  handleCategoriesChange
+}) => {
+  const hasAppliedKnowledgeInitialFiltersRef = (0, import_react15.useRef)(false);
+  const hasAppliedTopicsRef = (0, import_react15.useRef)(false);
+  const hasAppliedSubtopicsRef = (0, import_react15.useRef)(false);
+  const hasAppliedContentsRef = (0, import_react15.useRef)(false);
+  const knowledgeCategoriesRef = (0, import_react15.useRef)([]);
+  (0, import_react15.useEffect)(() => {
+    knowledgeCategoriesRef.current = knowledgeCategories;
+  }, [knowledgeCategories]);
+  (0, import_react15.useEffect)(() => {
+    hasAppliedKnowledgeInitialFiltersRef.current = false;
+    hasAppliedTopicsRef.current = false;
+    hasAppliedSubtopicsRef.current = false;
+    hasAppliedContentsRef.current = false;
+  }, [initialFilters]);
+  (0, import_react15.useEffect)(() => {
+    if (!initialFilters || hasAppliedKnowledgeInitialFiltersRef.current || knowledgeCategoriesRef.current.length === 0 || !handleCategoriesChange) {
+      return;
+    }
+    const topicIds = initialFilters.topicIds || [];
+    const subtopicIds = initialFilters.subtopicIds || [];
+    const contentIds = initialFilters.contentIds || [];
+    const hasKnowledgeSelections = topicIds.length > 0 || subtopicIds.length > 0 || contentIds.length > 0;
+    if (!hasKnowledgeSelections) {
+      hasAppliedKnowledgeInitialFiltersRef.current = true;
+      return;
+    }
+    const currentKnowledgeCategories = knowledgeCategoriesRef.current;
+    let changed = false;
+    const updatedCategories = currentKnowledgeCategories.map((category) => {
+      if (category.key === "tema" && topicIds.length > 0 && !hasAppliedTopicsRef.current) {
+        const selectedIds = (category.itens || []).filter((item) => topicIds.includes(item.id)).map((item) => item.id);
+        if (selectedIds.length > 0) {
+          hasAppliedTopicsRef.current = true;
+          changed = true;
+          return { ...category, selectedIds };
+        }
+        return category;
+      }
+      if (category.key === "subtema" && subtopicIds.length > 0 && !hasAppliedSubtopicsRef.current) {
+        const selectedIds = (category.itens || []).filter((item) => subtopicIds.includes(item.id)).map((item) => item.id);
+        if (selectedIds.length > 0) {
+          hasAppliedSubtopicsRef.current = true;
+          changed = true;
+          return { ...category, selectedIds };
+        }
+        return category;
+      }
+      if (category.key === "assunto" && contentIds.length > 0 && !hasAppliedContentsRef.current) {
+        const selectedIds = (category.itens || []).filter((item) => contentIds.includes(item.id)).map((item) => item.id);
+        if (selectedIds.length > 0) {
+          hasAppliedContentsRef.current = true;
+          changed = true;
+          return { ...category, selectedIds };
+        }
+        return category;
+      }
+      return category;
+    });
+    if (changed) {
+      handleCategoriesChange(updatedCategories);
+    }
+    if ((topicIds.length === 0 || hasAppliedTopicsRef.current) && (subtopicIds.length === 0 || hasAppliedSubtopicsRef.current) && (contentIds.length === 0 || hasAppliedContentsRef.current)) {
+      hasAppliedKnowledgeInitialFiltersRef.current = true;
+    }
+  }, [initialFilters, knowledgeCategories, handleCategoriesChange]);
+  return {
+    hasAppliedKnowledgeInitialFiltersRef,
+    hasAppliedTopicsRef,
+    hasAppliedSubtopicsRef,
+    hasAppliedContentsRef,
+    knowledgeCategoriesRef
+  };
+};
+
+// src/components/ActivityFilters/ActivityFilters.tsx
+var import_jsx_runtime24 = require("react/jsx-runtime");
 var questionTypesFallback = [
   "ALTERNATIVA" /* ALTERNATIVA */,
   "VERDADEIRO_FALSO" /* VERDADEIRO_FALSO */,
@@ -5273,42 +5537,15 @@ var updateBankCategoriesWithInitialFilters = (prevCategories, bankIds, derivedYe
     return category;
   });
 };
-var getSelectedIdsForKnowledgeCategory = (category, filterIds) => {
-  return (category.itens || []).filter((item) => filterIds.includes(item.id)).map((item) => item.id);
-};
-var updateTopicCategory = (category, topicIds, hasAppliedTopicsRef) => {
-  const selectedIds = getSelectedIdsForKnowledgeCategory(category, topicIds);
-  if (selectedIds.length > 0) {
-    hasAppliedTopicsRef.current = true;
-    return { category: { ...category, selectedIds }, changed: true };
-  }
-  return { category, changed: false };
-};
-var updateSubtopicCategory = (category, subtopicIds, hasAppliedSubtopicsRef) => {
-  const selectedIds = getSelectedIdsForKnowledgeCategory(category, subtopicIds);
-  if (selectedIds.length > 0) {
-    hasAppliedSubtopicsRef.current = true;
-    return { category: { ...category, selectedIds }, changed: true };
-  }
-  return { category, changed: false };
-};
-var updateContentCategory = (category, contentIds, hasAppliedContentsRef) => {
-  const selectedIds = getSelectedIdsForKnowledgeCategory(category, contentIds);
-  if (selectedIds.length > 0) {
-    hasAppliedContentsRef.current = true;
-    return { category: { ...category, selectedIds }, changed: true };
-  }
-  return { category, changed: false };
-};
 var QuestionTypeFilter = ({
   selectedTypes,
   onToggleType,
   allowedQuestionTypes
 }) => {
   const availableQuestionTypes = allowedQuestionTypes || questionTypesFallback;
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", weight: "bold", className: "mb-3 block", children: "Tipo de quest\xE3o" }),
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: "grid grid-cols-2 gap-2", children: availableQuestionTypes.map((questionType) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text_default, { size: "sm", weight: "bold", className: "mb-3 block", children: "Tipo de quest\xE3o" }),
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: "grid grid-cols-2 gap-2", children: availableQuestionTypes.map((questionType) => /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
       Chips_default,
       {
         selected: selectedTypes.includes(questionType),
@@ -5328,16 +5565,16 @@ var BanksAndYearsFilter = ({
   error = null
 }) => {
   if (loading) {
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", className: "text-text-600", children: "Carregando bancas..." });
+    return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text_default, { size: "sm", className: "text-text-600", children: "Carregando bancas..." });
   }
   if (error) {
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", className: "text-text-600", children: error });
+    return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text_default, { size: "sm", className: "text-text-600", children: error });
   }
   if (banks.length === 0 && bankYears.length === 0) {
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", className: "text-text-600", children: "Nenhuma banca encontrada" });
+    return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text_default, { size: "sm", className: "text-text-600", children: "Nenhuma banca encontrada" });
   }
   if (bankCategories.length > 0) {
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
       CheckboxGroup,
       {
         categories: bankCategories,
@@ -5349,86 +5586,6 @@ var BanksAndYearsFilter = ({
   }
   return null;
 };
-var SubjectsFilter = ({
-  knowledgeAreas,
-  selectedSubject,
-  onSubjectChange,
-  loading = false,
-  error = null
-}) => {
-  const { isDark } = useTheme();
-  if (loading) {
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", className: "text-text-600", children: "Carregando mat\xE9rias..." });
-  }
-  if (error) {
-    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", className: "text-text-600", children: error });
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: "grid grid-cols-3 gap-3", children: knowledgeAreas.map((area) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-    Radio_default,
-    {
-      value: area.id,
-      checked: selectedSubject === area.id,
-      onChange: () => onSubjectChange(area.id),
-      label: /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { className: "flex items-center gap-2 w-full min-w-0", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-          "span",
-          {
-            className: "size-4 rounded-sm flex items-center justify-center shrink-0 text-text-950",
-            style: {
-              backgroundColor: getSubjectColorWithOpacity(
-                area.color,
-                isDark
-              )
-            },
-            children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-              IconRender_default,
-              {
-                iconName: area.icon || "BookOpen",
-                size: 14,
-                color: "currentColor"
-              }
-            )
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("span", { className: "truncate flex-1", children: area.name })
-      ] })
-    },
-    area.id
-  )) });
-};
-var KnowledgeStructureFilter = ({
-  knowledgeStructure,
-  knowledgeCategories,
-  handleCategoriesChange
-}) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { className: "mt-4", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", weight: "bold", className: "mb-3 block", children: "Tema, Subtema e Assunto" }),
-    knowledgeStructure.loading && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", className: "text-text-600 mb-3", children: "Carregando estrutura de conhecimento..." }),
-    knowledgeStructure.error && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", className: "mb-3 text-error-500", children: knowledgeStructure.error }),
-    knowledgeCategories.length > 0 && handleCategoriesChange && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-      CheckboxGroup,
-      {
-        categories: knowledgeCategories,
-        onCategoriesChange: handleCategoriesChange,
-        compactSingleItem: false,
-        showSingleItem: true
-      }
-    ),
-    !knowledgeStructure.loading && knowledgeCategories.length === 0 && knowledgeStructure.topics.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", className: "text-text-600", children: "Nenhum tema dispon\xEDvel para as mat\xE9rias selecionadas" })
-  ] });
-};
-var FilterActions = ({
-  onClearFilters,
-  onApplyFilters
-}) => {
-  if (!onClearFilters && !onApplyFilters) {
-    return null;
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { className: "grid grid-cols-2 gap-2 justify-end mt-4 px-4 pt-4 border-t border-border-200", children: [
-    onClearFilters && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Button_default, { variant: "link", onClick: onClearFilters, size: "small", children: "Limpar filtros" }),
-    onApplyFilters && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Button_default, { variant: "outline", onClick: onApplyFilters, size: "small", children: "Filtrar" })
-  ] });
-};
 var ActivityFilters = ({
   apiClient,
   onFiltersChange,
@@ -5440,8 +5597,8 @@ var ActivityFilters = ({
   onApplyFilters
 }) => {
   const useActivityFiltersData = createUseActivityFiltersData(apiClient);
-  const [selectedQuestionTypes, setSelectedQuestionTypes] = (0, import_react14.useState)([]);
-  const [selectedSubject, setSelectedSubject] = (0, import_react14.useState)(null);
+  const [selectedQuestionTypes, setSelectedQuestionTypes] = (0, import_react16.useState)([]);
+  const [selectedSubject, setSelectedSubject] = (0, import_react16.useState)(null);
   const {
     banks,
     bankYears,
@@ -5466,19 +5623,22 @@ var ActivityFilters = ({
     selectedSubjects: selectedSubject ? [selectedSubject] : [],
     institutionId
   });
-  const prevAllowedQuestionTypesRef = (0, import_react14.useRef)(null);
-  const hasAppliedBasicInitialFiltersRef = (0, import_react14.useRef)(false);
-  const hasAppliedBankInitialFiltersRef = (0, import_react14.useRef)(false);
-  const hasAppliedKnowledgeInitialFiltersRef = (0, import_react14.useRef)(false);
-  const hasRequestedTopicsRef = (0, import_react14.useRef)(false);
-  const hasRequestedSubtopicsRef = (0, import_react14.useRef)(false);
-  const hasRequestedContentsRef = (0, import_react14.useRef)(false);
-  const hasAppliedTopicsRef = (0, import_react14.useRef)(false);
-  const hasAppliedSubtopicsRef = (0, import_react14.useRef)(false);
-  const hasAppliedContentsRef = (0, import_react14.useRef)(false);
-  const bankCategoriesRef = (0, import_react14.useRef)([]);
-  const knowledgeCategoriesRef = (0, import_react14.useRef)([]);
-  (0, import_react14.useEffect)(() => {
+  const prevAllowedQuestionTypesRef = (0, import_react16.useRef)(null);
+  const hasAppliedBasicInitialFiltersRef = (0, import_react16.useRef)(false);
+  const hasAppliedBankInitialFiltersRef = (0, import_react16.useRef)(false);
+  const bankCategoriesRef = (0, import_react16.useRef)([]);
+  useInitialFiltersLoader({
+    initialFilters,
+    loadTopics,
+    loadSubtopics,
+    loadContents
+  });
+  useKnowledgeStructureInitialFilters({
+    initialFilters,
+    knowledgeCategories,
+    handleCategoriesChange
+  });
+  (0, import_react16.useEffect)(() => {
     if (!allowedQuestionTypes || allowedQuestionTypes.length === 0) {
       prevAllowedQuestionTypesRef.current = null;
       return;
@@ -5511,11 +5671,11 @@ var ActivityFilters = ({
       return prev;
     });
   }, [allowedQuestionTypes]);
-  const [bankCategories, setBankCategories] = (0, import_react14.useState)([]);
-  (0, import_react14.useEffect)(() => {
+  const [bankCategories, setBankCategories] = (0, import_react16.useState)([]);
+  (0, import_react16.useEffect)(() => {
     bankCategoriesRef.current = bankCategories;
   }, [bankCategories]);
-  const selectedSubjects = (0, import_react14.useMemo)(
+  const selectedSubjects = (0, import_react16.useMemo)(
     () => selectedSubject ? [selectedSubject] : [],
     [selectedSubject]
   );
@@ -5528,7 +5688,7 @@ var ActivityFilters = ({
   const handleBankCategoriesChange = (updatedCategories) => {
     setBankCategories(updatedCategories);
   };
-  (0, import_react14.useEffect)(() => {
+  (0, import_react16.useEffect)(() => {
     setBankCategories((prevCategories) => {
       const bankCategory = {
         key: "banca",
@@ -5554,21 +5714,11 @@ var ActivityFilters = ({
       return [bankCategory, yearCategory];
     });
   }, [banks, bankYears]);
-  (0, import_react14.useEffect)(() => {
-    knowledgeCategoriesRef.current = knowledgeCategories;
-  }, [knowledgeCategories]);
-  (0, import_react14.useEffect)(() => {
+  (0, import_react16.useEffect)(() => {
     hasAppliedBasicInitialFiltersRef.current = false;
     hasAppliedBankInitialFiltersRef.current = false;
-    hasAppliedKnowledgeInitialFiltersRef.current = false;
-    hasRequestedTopicsRef.current = false;
-    hasRequestedSubtopicsRef.current = false;
-    hasRequestedContentsRef.current = false;
-    hasAppliedTopicsRef.current = false;
-    hasAppliedSubtopicsRef.current = false;
-    hasAppliedContentsRef.current = false;
   }, [initialFilters]);
-  (0, import_react14.useEffect)(() => {
+  (0, import_react16.useEffect)(() => {
     if (!initialFilters || hasAppliedBasicInitialFiltersRef.current) {
       return;
     }
@@ -5580,7 +5730,7 @@ var ActivityFilters = ({
     }
     hasAppliedBasicInitialFiltersRef.current = true;
   }, [initialFilters]);
-  (0, import_react14.useEffect)(() => {
+  (0, import_react16.useEffect)(() => {
     if (!initialFilters || hasAppliedBankInitialFiltersRef.current || bankCategoriesRef.current.length === 0) {
       return;
     }
@@ -5612,90 +5762,7 @@ var ActivityFilters = ({
     );
     hasAppliedBankInitialFiltersRef.current = true;
   }, [initialFilters, bankCategories]);
-  (0, import_react14.useEffect)(() => {
-    if (!initialFilters) {
-      return;
-    }
-    const subjectIds = initialFilters.subjectIds || [];
-    const topicIds = initialFilters.topicIds || [];
-    const subtopicIds = initialFilters.subtopicIds || [];
-    if (subjectIds.length > 0 && !hasRequestedTopicsRef.current) {
-      if (loadTopics) {
-        loadTopics(subjectIds);
-      }
-      hasRequestedTopicsRef.current = true;
-    }
-    if (topicIds.length > 0 && !hasRequestedSubtopicsRef.current) {
-      if (loadSubtopics) {
-        loadSubtopics(topicIds);
-      }
-      hasRequestedSubtopicsRef.current = true;
-    }
-    if (subtopicIds.length > 0 && !hasRequestedContentsRef.current) {
-      if (loadContents) {
-        loadContents(subtopicIds);
-      }
-      hasRequestedContentsRef.current = true;
-    }
-  }, [initialFilters, loadTopics, loadSubtopics, loadContents]);
-  (0, import_react14.useEffect)(() => {
-    if (!initialFilters || hasAppliedKnowledgeInitialFiltersRef.current || knowledgeCategoriesRef.current.length === 0 || !handleCategoriesChange) {
-      return;
-    }
-    const topicIds = initialFilters.topicIds || [];
-    const subtopicIds = initialFilters.subtopicIds || [];
-    const contentIds = initialFilters.contentIds || [];
-    const hasKnowledgeSelections = topicIds.length > 0 || subtopicIds.length > 0 || contentIds.length > 0;
-    if (!hasKnowledgeSelections) {
-      hasAppliedKnowledgeInitialFiltersRef.current = true;
-      return;
-    }
-    const currentKnowledgeCategories = knowledgeCategoriesRef.current;
-    let changed = false;
-    const updatedCategories = currentKnowledgeCategories.map((category) => {
-      if (category.key === "tema" && topicIds.length > 0 && !hasAppliedTopicsRef.current) {
-        const result = updateTopicCategory(
-          category,
-          topicIds,
-          hasAppliedTopicsRef
-        );
-        if (result.changed) {
-          changed = true;
-        }
-        return result.category;
-      }
-      if (category.key === "subtema" && subtopicIds.length > 0 && !hasAppliedSubtopicsRef.current) {
-        const result = updateSubtopicCategory(
-          category,
-          subtopicIds,
-          hasAppliedSubtopicsRef
-        );
-        if (result.changed) {
-          changed = true;
-        }
-        return result.category;
-      }
-      if (category.key === "assunto" && contentIds.length > 0 && !hasAppliedContentsRef.current) {
-        const result = updateContentCategory(
-          category,
-          contentIds,
-          hasAppliedContentsRef
-        );
-        if (result.changed) {
-          changed = true;
-        }
-        return result.category;
-      }
-      return category;
-    });
-    if (changed) {
-      handleCategoriesChange(updatedCategories);
-    }
-    if ((topicIds.length === 0 || hasAppliedTopicsRef.current) && (subtopicIds.length === 0 || hasAppliedSubtopicsRef.current) && (contentIds.length === 0 || hasAppliedContentsRef.current)) {
-      hasAppliedKnowledgeInitialFiltersRef.current = true;
-    }
-  }, [initialFilters, knowledgeCategories, handleCategoriesChange]);
-  (0, import_react14.useEffect)(() => {
+  (0, import_react16.useEffect)(() => {
     if (loadBanks) {
       loadBanks();
     }
@@ -5706,32 +5773,32 @@ var ActivityFilters = ({
       loadQuestionTypes();
     }
   }, [loadBanks, loadKnowledgeAreas, loadQuestionTypes, institutionId]);
-  const availableQuestionTypes = (0, import_react14.useMemo)(() => {
+  const availableQuestionTypes = (0, import_react16.useMemo)(() => {
     const source = questionTypes && questionTypes.length > 0 ? questionTypes : questionTypesFallback;
     if (!allowedQuestionTypes || allowedQuestionTypes.length === 0) {
       return source;
     }
     return source.filter((type) => allowedQuestionTypes.includes(type));
   }, [questionTypes, allowedQuestionTypes]);
-  const getSelectedKnowledgeIds = (0, import_react14.useCallback)(() => {
+  const getSelectedKnowledgeIds = (0, import_react16.useCallback)(() => {
     return getSelectedIdsFromCategories(knowledgeCategories, {
       topicIds: "tema",
       subtopicIds: "subtema",
       contentIds: "assunto"
     });
   }, [knowledgeCategories]);
-  const getSelectedBankIds = (0, import_react14.useCallback)(() => {
+  const getSelectedBankIds = (0, import_react16.useCallback)(() => {
     return getSelectedIdsFromCategories(bankCategories, {
       bankIds: "banca",
       yearIds: "ano"
     });
   }, [bankCategories]);
-  const onFiltersChangeRef = (0, import_react14.useRef)(onFiltersChange);
-  (0, import_react14.useEffect)(() => {
+  const onFiltersChangeRef = (0, import_react16.useRef)(onFiltersChange);
+  (0, import_react16.useEffect)(() => {
     onFiltersChangeRef.current = onFiltersChange;
   }, [onFiltersChange]);
-  const prevFiltersRef = (0, import_react14.useRef)(null);
-  (0, import_react14.useEffect)(() => {
+  const prevFiltersRef = (0, import_react16.useRef)(null);
+  (0, import_react16.useEffect)(() => {
     const knowledgeIds = getSelectedKnowledgeIds();
     const bankIds = getSelectedBankIds();
     const filters = {
@@ -5757,10 +5824,10 @@ var ActivityFilters = ({
   ]);
   const containerClassName = variant === "popover" ? "w-full bg-background" : "w-[400px] flex-shrink-0 p-4 bg-background";
   const contentClassName = variant === "popover" ? "p-4" : "";
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { className: containerClassName, children: [
-    variant === "default" && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("section", { className: "flex flex-row items-center gap-2 text-text-950 mb-4", children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "lg", weight: "bold", children: "Filtro de quest\xF5es" }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: contentClassName, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("section", { className: "flex flex-col gap-4", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { className: containerClassName, children: [
+    variant === "default" && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("section", { className: "flex flex-row items-center gap-2 text-text-950 mb-4", children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text_default, { size: "lg", weight: "bold", children: "Filtro de quest\xF5es" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: contentClassName, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("section", { className: "flex flex-col gap-4", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
         QuestionTypeFilter,
         {
           selectedTypes: selectedQuestionTypes,
@@ -5768,7 +5835,7 @@ var ActivityFilters = ({
           allowedQuestionTypes: availableQuestionTypes
         }
       ),
-      loadingQuestionTypes && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+      loadingQuestionTypes && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
         Text_default,
         {
           size: "sm",
@@ -5777,7 +5844,7 @@ var ActivityFilters = ({
           children: "Carregando tipos de quest\xE3o..."
         }
       ),
-      questionTypesError && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+      questionTypesError && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
         Text_default,
         {
           size: "sm",
@@ -5786,9 +5853,9 @@ var ActivityFilters = ({
           children: questionTypesError
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", weight: "bold", className: "mb-3 block", children: "Banca de vestibular" }),
-        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text_default, { size: "sm", weight: "bold", className: "mb-3 block", children: "Banca de vestibular" }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
           BanksAndYearsFilter,
           {
             banks,
@@ -5800,9 +5867,9 @@ var ActivityFilters = ({
           }
         )
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)("div", { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)("div", { className: "flex flex-row justify-between items-center mb-3", children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text_default, { size: "sm", weight: "bold", children: "Mat\xE9ria" }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)("div", { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)("div", { className: "flex flex-row justify-between items-center mb-3", children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text_default, { size: "sm", weight: "bold", children: "Mat\xE9ria" }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
           SubjectsFilter,
           {
             knowledgeAreas,
@@ -5813,7 +5880,7 @@ var ActivityFilters = ({
           }
         )
       ] }),
-      selectedSubject && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+      selectedSubject && /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
         KnowledgeStructureFilter,
         {
           knowledgeStructure,
@@ -5821,7 +5888,7 @@ var ActivityFilters = ({
           handleCategoriesChange
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
         FilterActions,
         {
           onClearFilters,
@@ -5834,22 +5901,28 @@ var ActivityFilters = ({
 var ActivityFiltersPopover = ({
   onFiltersChange,
   triggerLabel = "Filtro de quest\xF5es",
+  initialFilters,
   ...activityFiltersProps
 }) => {
-  const [open, setOpen] = (0, import_react14.useState)(false);
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(DropdownMenu_default, { open, onOpenChange: setOpen, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(DropdownMenuTrigger, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Button_default, { variant: "outline", children: triggerLabel }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+  const [open, setOpen] = (0, import_react16.useState)(false);
+  const appliedFilters = useQuestionFiltersStore(
+    (state) => state.appliedFilters
+  );
+  const effectiveInitialFilters = appliedFilters ?? initialFilters;
+  return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(DropdownMenu_default, { open, onOpenChange: setOpen, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(DropdownMenuTrigger, { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Button_default, { variant: "outline", children: triggerLabel }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
       DropdownMenuContent,
       {
         className: "w-[90vw] max-w-[400px] max-h-[calc(100vh-8rem)] overflow-y-auto p-0",
         align: "start",
-        children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
+        children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
           ActivityFilters,
           {
             onFiltersChange,
             variant: "popover",
-            ...activityFiltersProps
+            ...activityFiltersProps,
+            initialFilters: effectiveInitialFilters
           }
         )
       }