Merge remote-tracking branch 'upstream/main'

Author: actions-user

app/(static_misc)/faq/page.tsx renamed to app/(static_misc)/faqs/page.tsx

@@ -8,6 +8,7 @@ import {
 } from "@/components/ui/select";
 import { MultiSelect } from "../ui/multi-select";
 import { JobFilters } from "./types";
+import { toast } from "sonner";
 
 interface JobsFilterProps {
   filters: JobFilters;
@@ -22,6 +23,13 @@ export default function JobsFilter({
   onFilterChange,
   isChanged,
 }: JobsFilterProps) {
+  const handleFilterChange = () => {
+    if (filters.month !== "" && filters.year === "") {
+      toast.warning("Please select a year for correct filtering");
+      return;
+    }
+    onFilterChange();
+  };
   const updateFilter = <K extends keyof JobFilters>(
     key: K,
     value: JobFilters[K],
@@ -122,7 +130,7 @@ export default function JobsFilter({
         />
       </div>
 
-      <Button onClick={onFilterChange} disabled={!isChanged}>
+      <Button onClick={handleFilterChange} disabled={!isChanged}>
         Apply Filters
       </Button>
     </div>

components/JobsPage/JobsFilter.tsx

@@ -7,6 +7,7 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { ReferralFilters } from "./types";
+import { toast } from "sonner";
 
 interface ReferralFilterProps {
   filters: ReferralFilters;
@@ -21,6 +22,13 @@ export default function ReferralFilter({
   onFilterChange,
   isChanged,
 }: ReferralFilterProps) {
+  const handleFilterChange = () => {
+    if (filters.month !== "" && filters.year === "") {
+      toast.warning("Please select a year for correct filtering");
+      return;
+    }
+    onFilterChange();
+  };
   const updateFilter = <K extends keyof ReferralFilters>(
     key: K,
     value: ReferralFilters[K],
@@ -71,7 +79,7 @@ export default function ReferralFilter({
         </SelectContent>
       </Select>
 
-      <Button onClick={onFilterChange} disabled={!isChanged}>
+      <Button onClick={handleFilterChange} disabled={!isChanged}>
         Apply Filters
       </Button>
     </div>