Merge pull request #161 from cabcookie:improve-person-mention

fix: small issues with CRM projects

components/crm/import-project-data.tsx

@@ -99,19 +99,23 @@ const ImportProjectData = () => {
 
   return (
     <div className="space-y-6">
-      {loadingImports && (
-        <div className="text-muted-foreground text-sm font-semibold flex gap-2">
-          Loading status of imported data…
-          <Loader2 className="w-4 h-4 animate-spin" />
-        </div>
-      )}
-
       <ApiLoadingError title="Loading imports failed" error={errorImports} />
 
       {!crmProjectsImport && (
         <div className="space-y-2">
-          <Label className="font-semibold">Import data from CRM</Label>
-          <Input type="file" onChange={uploadImportFile} />
+          {loadingImports ? (
+            <div className="text-muted-foreground text-sm font-semibold flex gap-2">
+              Loading status of imported data…
+              <Loader2 className="w-6 h-6 animate-spin" />
+            </div>
+          ) : (
+            <Label className="font-semibold">Import data from CRM</Label>
+          )}
+          <Input
+            type="file"
+            onChange={uploadImportFile}
+            disabled={loadingImports}
+          />
         </div>
       )}
 
@@ -131,7 +135,7 @@ const ImportProjectData = () => {
         </div>
       )}
 
-      {projectsCount > 0 && changeSet && (
+      {crmProjectsImport && projectsCount > 0 && changeSet && (
         <div className="space-y-8">
           <div className="space-y-2">
             <h2 className="font-bold text-lg">Imported Data</h2>

components/crm/list-filters.tsx

@@ -1,5 +1,5 @@
 import ButtonGroup from "../ui-elements/btn-group/btn-group";
-import { useCrmProjectsFilter } from "./list-filter-context";
+import { useCrmProjectsFilter } from "./useCrmProjectsFilter";
 
 const CrmProjectsListFilter = () => {
   const { availableFilters, onSelectFilter, selectedFilter } =

components/crm/pipeline-hygiene.tsx

@@ -17,9 +17,10 @@ export type THygieneIssue = {
   filterFn: FilterFunction;
 };
 
-const isNonCompliantStage = (crm: CrmProject, days: number) =>
+const isNonCompliantStage = (crm: CrmProject, fromDay: number, toDay: number) =>
   !(["Business Validation", "Committed"] as TCrmStages[]).includes(crm.stage) &&
-  differenceInCalendarDays(crm.closeDate, new Date()) <= days;
+  differenceInCalendarDays(crm.closeDate, new Date()) >= fromDay &&
+  differenceInCalendarDays(crm.closeDate, new Date()) <= toDay;
 
 const checkRange = (check: number, min: number, max: number) =>
   check >= min && check <= max;
@@ -69,14 +70,14 @@ const hygieneIssues: THygieneIssue[] = [
     label: "Non-compliant stage",
     description:
       "When close date within 30 days stage must be BusVal/Committed",
-    filterFn: (crm) => isNonCompliantStage(crm, 30),
+    filterFn: (crm) => isNonCompliantStage(crm, 0, 30),
   },
   {
     value: "almostNonCompliantStage",
     label: "Almost non-compliant stage",
     description:
-      "When close date within 30 days stage must be BusVal/Committed",
-    filterFn: (crm) => isNonCompliantStage(crm, 45),
+      "When close date within 45 days stage must be BusVal/Committed",
+    filterFn: (crm) => isNonCompliantStage(crm, 31, 45),
   },
   {
     value: "stalledOps",

docs/releases/next.md

@@ -1 +1 @@
-# Nächsten Schritt aktualisieren und für CRM kopieren (Version :VERSION)
+# Kleinere Fehlerbehebungen in CRM Projekten (Version :VERSION)

pages/crm-projects/index.tsx

@@ -1,12 +1,12 @@
 import GroupCrmProjects from "@/components/crm/group-projects";
 import ImportProjectData from "@/components/crm/import-project-data";
+import CrmProjectsListFilter from "@/components/crm/list-filters";
+import CrmProjectsPipelineHygiene from "@/components/crm/pipeline-hygiene";
 import {
   TProjectFilters,
   useCrmProjectsFilter,
   withCrmProjectsFilter,
-} from "@/components/crm/list-filter-context";
-import CrmProjectsListFilter from "@/components/crm/list-filters";
-import CrmProjectsPipelineHygiene from "@/components/crm/pipeline-hygiene";
+} from "@/components/crm/useCrmProjectsFilter";
 import ApiLoadingError from "@/components/layouts/ApiLoadingError";
 import MainLayout from "@/components/layouts/MainLayout";
 import LoadingAccordionItem from "@/components/ui-elements/accordion/LoadingAccordionItem";