Merge pull request #83 from bitovi/child-query

Removes
bitovi · Sep 27, 2024 · 3b7b022 · 3b7b022
2 parents f3c1437 + 2e7845a
commit 3b7b022
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 107 deletions.
diff --git a/public/dist/main-PIvIBOjY.js → public/dist/main-WcgFLO3m.js b/public/dist/main-PIvIBOjY.js → public/dist/main-WcgFLO3m.js
diff --git a/public/dist/main-PIvIBOjY.js.map → public/dist/main-WcgFLO3m.js.map b/public/dist/main-PIvIBOjY.js.map → public/dist/main-WcgFLO3m.js.map
diff --git a/public/dist/main.js b/public/dist/main.js
diff --git a/public/dist/production.css b/public/dist/production.css
diff --git a/public/dist/update-epics-1cxBf0M7.js → public/dist/update-epics-IPC3n2Z4.js b/public/dist/update-epics-1cxBf0M7.js → public/dist/update-epics-IPC3n2Z4.js
diff --git a/public/dist/update-epics-1cxBf0M7.js.map → public/dist/update-epics-IPC3n2Z4.js.map b/public/dist/update-epics-1cxBf0M7.js.map → public/dist/update-epics-IPC3n2Z4.js.map
diff --git a/public/jira-auto-scheduler.js b/public/jira-auto-scheduler.js
@@ -59,6 +59,8 @@ class JiraAutoScheduler extends StacheElement {
           issueJQL:bind="this.issueJQL"
           loadChildren:bind="this.loadChildren"
           limitIssues:bind="this.limitIssues"
+          childJQL:bind="this.childJQL"
+
           />
 
       </details>
@@ -184,10 +186,11 @@ class JiraAutoScheduler extends StacheElement {
       }
     },
     issueJQL: saveJSONToUrlAndToLocalStorage("issueJQL", "issueType = Epic and statusCategory != Done"),
+    childJQL: saveJSONToUrl("childJQL", "", String, {parse: x => ""+x, stringify: x => ""+x}),
     loadChildren: saveJSONToUrl("loadChildren", false, Boolean, booleanParsing),
     dateThresholds: saveJSONToUrl("weight",55,type.maybeConvert(Number)),
 		startDate: saveJSONToUrl("startDate",nowUTC(),type.maybeConvert(Date)),
-    limitIssues: saveJSONToUrl("loadChildren", true, Boolean, booleanParsing),
+    limitIssues: saveJSONToUrl("limitIssues", true, Boolean, booleanParsing),
     //rawIssues: type.Any,
     workItems: type.Any,
     tooltip: HTMLElement,
@@ -234,6 +237,7 @@ class JiraAutoScheduler extends StacheElement {
 
         const issuesPromise = loadIssues({
             jql: this.issueJQL,//this.jql,
+            childJQL: this.childJQL ? " and "+this.childJQL : "",
             fields: this.config.issueFields, // LABELS_KEY, STATUS_KEY ]
             limit: this.limitIssues ? 100 : Infinity
         });
@@ -242,6 +246,7 @@ class JiraAutoScheduler extends StacheElement {
             issuesPromise, serverInfoPromise
         ]).then(([issues, serverInfo]) => {
             const csv = toCVSFormatAndAddWorkingBusinessDays(issues, serverInfo);
+            //console.log(csv);
             return csv;
         })
       }

diff --git a/public/jira-configure-csv.js b/public/jira-configure-csv.js
@@ -40,8 +40,15 @@ class JiraConfigureCSV extends StacheElement {
         {{/ if }}
         <div class="flex justify-between mt-1">
       
-          <p class="text-xs"><input type='checkbox' 
-            class='self-start align-middle' checked:bind='this.loadChildren'/> <span class="align-middle">Load all children of JQL specified issues</span>
+          <p class="text-xs">
+            <input type='checkbox' 
+              class='self-start align-middle' checked:bind='this.loadChildren'/> 
+              <span class="align-middle">
+                Load children.
+                {{# if(this.loadChildren) }}
+                        Optional children JQL filters: <input type='text' class="form-border p-1 h-5" value:bind="this.childJQL"/>
+                {{/ if }}
+              </span>
           </p>
           
           {{# if(this.rawIssuesPromise.isResolved) }}

diff --git a/public/jira-oidc-helpers.js b/public/jira-oidc-helpers.js
@@ -81,7 +81,7 @@ export default function JiraOIDCHelpers({
 
 			const batchedResponses = issuesToQuery.map( issues => {
 				const keys = issues.map( issue => issue.key);
-				const jql = `parent in (${keys.join(", ")})`;
+				const jql = `parent in (${keys.join(", ")}) ${params.childJQL || ""}`;
 				return rootMethod({
 					...params,
 					jql

diff --git a/public/schedule-prepare-issues.js b/public/schedule-prepare-issues.js
@@ -123,9 +123,15 @@ export function prepareIssues(issuesSource, {
     return {preparedIssues: interestingEpics, issuesByKey: issueByKey, workByTeams};
 }
 
-const removeDone = makeFilterByPropertyNotEqualToOneOfValues("Status", ["Done"]);
+//makeFilterByPropertyNotEqualToOneOfValues("Status", ["Done"])
+
+const removeDoneStatusCategory = function({issue}){
+  return issue?.fields?.Status?.statusCategory?.name !== "Done"
+}
+
+;
 function issueFilterDefault(issue){
-    return removeDone(issue);
+    return removeDoneStatusCategory(issue);
 }
 
 function getDaysOfWork(usedEstimate, extraPoints, pointsPerDay){

diff --git a/public/shared/issue-cleanup.js b/public/shared/issue-cleanup.js
@@ -29,7 +29,8 @@ function toCVSFormat(issues, serverInfo){
 			[PRODUCT_TARGET_RELEASE_KEY]: issue.fields[PRODUCT_TARGET_RELEASE_KEY]?.[0],
 			[PARENT_LINK_KEY]: issue.fields[PARENT_LINK_KEY]?.data?.key,
 			[STATUS_KEY]: issue.fields[STATUS_KEY]?.name,
-			linkedIssues: {blocks}
+			linkedIssues: {blocks},
+			issue
 		}
 	})
 }