Merge pull request #199 from bitovi/minor-fixes

fixing minor bugs in the team config
bitovi · Oct 24, 2024 · 1fc24c3 · 1fc24c3
2 parents fbbd0f4 + e2154d5
commit 1fc24c3
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/public/react/Configure/components/TeamSelector/TeamSelector.tsx b/public/react/Configure/components/TeamSelector/TeamSelector.tsx
@@ -57,7 +57,7 @@ const TeamSelector: FC<TeamSelectorProps> = ({
           >
             <PeopleGroupIcon label={`${team} settings`} />
             <div className="flex-1 flex justify-between items-center">
-              Team {team.name}
+              {team.name}
               {team.status !== "in-both" && (
                 <Tooltip position="top" content={getStatusText(team.status)}>
                   <EditorUnlinkIcon label="unlinked team data" />

diff --git a/...nfigure/components/Teams/services/team-configuration/team-configuration/allTeamDefault.ts b/...nfigure/components/Teams/services/team-configuration/team-configuration/allTeamDefault.ts
@@ -17,12 +17,19 @@ const createDefaultJiraFieldGetter = <TFormField extends keyof Configuration>(
     }
 
     for (const possibleName of possibleNames) {
-      const field = jiraFields.find(
-        (field) => field.name === possibleName || field.name.toLowerCase() === possibleName.toLowerCase()
+      const strictField = jiraFields.find(
+        (field) => field.name === possibleName 
       );
 
-      if (field) {
-        return field.name;
+      if (strictField) {
+        return strictField.name;
+      }
+      const caseInsensitiveField = jiraFields.find(
+        (field) => field.name.toLowerCase() === possibleName.toLowerCase()
+      );
+
+      if (caseInsensitiveField) {
+        return caseInsensitiveField.name;
       }
     }
 
@@ -50,9 +57,9 @@ const getConfidenceField = createDefaultJiraFieldGetter(
   ["confidence"]
 );
 
-const getStartDateField = createDefaultJiraFieldGetter("startDateField", ["start date", "starting date"]);
+const getStartDateField = createDefaultJiraFieldGetter("startDateField", ["Start date", "starting date"]);
 
-const getDueDateField = createDefaultJiraFieldGetter("dueDateField", ["due date", "end date", "target date"]);
+const getDueDateField = createDefaultJiraFieldGetter("dueDateField", ["Due date", "end date", "target date"]);
 
 const nonFieldDefaults: Omit<Configuration, "estimateField" | "confidenceField" | "startDateField" | "dueDateField"> = {
   sprintLength: 10,

diff --git a/public/stateful-data/jira-data-requests.js b/public/stateful-data/jira-data-requests.js
@@ -84,19 +84,19 @@ const CORE_FIELDS = [
 ];
 
 export function getRawIssues({ isLoggedIn, loadChildren, jiraHelpers, jql, fields, childJQL }, { progressUpdate }) {
-  debugger;
-  if (!fields) {
-    return undefined;
-  }
-
-  let fieldsToLoad = [...new Set([...fields, ...CORE_FIELDS])];
 
   // progressData.value = null; THIS NEEDS TO HAPPEN OUTSIDE
   if (isLoggedIn === false) {
     // mock data is already field-translated
     return bitoviTrainingData(new Date());
   }
 
+  if (!fields) {
+    return undefined;
+  }
+
+  let fieldsToLoad = [...new Set([...fields, ...CORE_FIELDS])];
+
   if (!jql) {
     return undefined;
   }

diff --git a/public/timeline-report.js b/public/timeline-report.js
@@ -333,7 +333,6 @@ export class TimelineReport extends StacheElement {
     if (!this.groupedParentDownHierarchy.length) {
       return [];
     }
-
     const unfilteredPrimaryIssuesOrReleases = this.groupedParentDownHierarchy[0];
 
     const hideUnknownInitiatives = this.hideUnknownInitiatives;