rendering refactor

Author: legomushroom

TODO.md

@@ -34,13 +34,16 @@
     - 🔮 Sorecer - knew how the sprint will end
     - 🖊️ Writer - most of docs written
 
+    - 🧨 Flooded sprint
+
 <!--
 🧊 🏋️ 💤 🏓 ✈️ 🛸 🪐 ⛱️ 🔔 📢 📣 🍾 🌊 💨 🍄 🌝 🌪️ ❄️ ☂️
 💧 🐽 🐷 🐾 👣 🐙 🌎 ☁️ ☄️ 🤗 🧠 🦴 👃 👂 🧚 🧞 🧟 🧘 🧳
 🎃 👑 💼 ⛑️ 🧴 😎 🚿 💆 🛀 🦠 ✨ 🏖️ 🗑️ 🎰 🎱 🎲 🔮 🗄️ 🖇️
 🛢️ 🧹 🛀 🧲 🔋 🧭 🔦 ⚙️ ⚡ 🤖 🔧 💳 🔌 🔎 📷 🔬 🕵️ 🔭 👽
 🧑‍🚀 🛰️ 📡 🥛 🎂 🧀 🍕 🧰 👷 🚧 🎥 🎬 💩 🎉 📚 ⛄ 🧸 👋 🏆
-⚽ 🥅 🤓 🧐 🍭 🍭 🎪 🗡️ 🐉 🧝 🃏 🎲 🧩 🙈 🖊️ 🏛️ 🗝️ 🗺️ 🙉
+⚽ 🥅 🤓 🧐 🍭 🎪 🗡️ 🐉 🧝 🃏 🎲 🧩 🙈 🖊️ 🏛️ 🗝️ 🗺️ 🙉 🤯
+💬 📰 🚨 ☕ 🌋
 -->
 
 - Web Experience team ["legomushroom", "plisy", "GideonCheruiyot", "VincentDondain", "wachaudh", "klvnraju"]

package.json

@@ -31,10 +31,12 @@
     "@actions/core": "^1.2.6",
     "@actions/github": "^4.0.0",
     "dotenv": "^8.2.0",
+    "moment": "^2.29.1",
     "shortid": "^2.2.16"
   },
   "devDependencies": {
     "@types/jest": "^26.0.10",
+    "@types/moment": "^2.13.0",
     "@types/node": "^14.10.0",
     "@types/shortid": "^0.0.29",
     "@typescript-eslint/parser": "^3.10.1",

sprint178Config.json

@@ -1,9 +1,9 @@
 [
   {
     "$schema": "https://gist.githubusercontent.com/legomushroom/e997b3c9f15e647a2c62e5414c68deba/raw/1032960ca348ea3aa1399f17d304570720f27a49/botspaces-config-schema.json",
+    "sprintStartDate": "2020-10-19",
     "sprintDuration": 21,
     "sprintNumberHolidays": 0,
-    "sprintStartDate": "2020-10-19",
     "boardIssue": "https://github.com/microsoft/vssaas-planning/issues/1109",
     "repos": [
       {
@@ -18,6 +18,7 @@
               "serverless",
               "performance"
             ],
+            "priorityLabels": ["p0", "p1"],
             "isCheckListItems": true
           }
         ]

src/interfaces/ICardWithIssue.ts

@@ -6,4 +6,5 @@ export interface ICardWithIssue {
     column: TColumnTypes;
     issue?: TRepoIssue;
     card: TColumnCard;
+    isNew: boolean;
 }

src/main.ts

@@ -89,7 +89,7 @@ const processConfigRecord = async (
   for (let { repo, projects } of repoProjects) {
     const projectsWithData = await Promise.all(
       projects.map(async (project) => {
-        const data = await getProjectData(projectKit, repo, project);
+        const data = await getProjectData(projectKit, config, project);
         return {
           project,
           data,

src/octokit/ProjectsOctoKit.ts

@@ -15,6 +15,8 @@ import { TProjectColumn } from '../interfaces/TProjectColumn';
 import { flattenArray } from '../utils/flatternArray';
 import { IParsedRepo } from '../interfaces/IParsedRepo';
 import { ICardWithIssue } from '../interfaces/ICardWithIssue';
+import { IConfig } from '../interfaces/IConfig';
+import { isNewCard } from '../utils/isNewCard';
 
 interface IColumnWithCards {
   column: TProjectColumn;
@@ -244,6 +246,7 @@ export class ProjectsOctoKit extends OctoKitBase {
     issues: TRepoIssue[],
     columns: TColumnsWithCardsMap,
     columnType: TColumnTypes,
+    config: IConfig,
   ): ICardWithIssue[] => {
     // get the column
     const column = columns[columnType];
@@ -263,6 +266,7 @@ export class ProjectsOctoKit extends OctoKitBase {
           card,
           issue: cardIssue,
           column: columnType,
+          isNew: isNewCard(card, config),
         }
       });
 

src/utils/filterPlannedProjectData.ts

@@ -0,0 +1,28 @@
+import { IProjectData } from '../interfaces/IProjectData';
+import { ICardWithIssue } from '../interfaces/ICardWithIssue';
+
+const filterNewCards = (cardsWithIssue: ICardWithIssue[]): ICardWithIssue[] => {
+  return cardsWithIssue.filter((card) => {
+    return !card.isNew;
+  });
+};
+
+export const filterPlannedProjectData = (data: IProjectData): IProjectData => {
+
+  return {
+    ...data,
+    // combined
+    inWorkIssues: filterNewCards(data.inWorkIssues),
+    doneOrDeployIssues: filterNewCards(data.doneOrDeployIssues),
+    allPlannedIssues: filterNewCards(data.allPlannedIssues),
+    issuesToSolve: filterNewCards(data.issuesToSolve),
+    // plain
+    backlogIssues: filterNewCards(data.backlogIssues),
+    committedIssues: filterNewCards(data.committedIssues),
+    progressIssues: filterNewCards(data.progressIssues),
+    inReviewIssues: filterNewCards(data.inReviewIssues),
+    blockedIssues: filterNewCards(data.blockedIssues),
+    waitingToDeployIssues: filterNewCards(data.waitingToDeployIssues),
+    doneIssues: filterNewCards(data.doneIssues),
+  };
+};

src/utils/functional/curry.ts

@@ -0,0 +1,19 @@
+type TFunction<K extends any[]> = (...args: K) => any;
+
+
+// type VariadicCurry<T, R> =
+//     T extends [any, any, any, any] ? Curry4<T[0], T[1], T[2], T[3], R> :
+//     T extends [any, any, any] ? Curry3<T[0], T[1], T[2], R> :
+//     T extends [any, any] ? Curry2<T[0], T[1], R> :
+//     T extends [any] ? Curry1<T[0], R> :
+//     unknown
+// ;
+
+// declare function curry<T extends any[], R>
+//     (fn: (...args: T) => R): VariadicCurry<T, R>;
+
+// export const curry = <T extends any[], R>(fun: TFunction<T>, ...args: R) => {
+//     return <P extends any[]>(...args2: P): ReturnType<TFunction<T>> => {
+//         return fun(...args, ...args2);
+//     }
+// };

src/utils/functional/not.ts

@@ -0,0 +1,9 @@
+
+type TFunction<K extends any[]> = (...args: K) => any;
+type TWrappedFunction<K extends any[]> = (...args: K) => boolean;
+
+export const not = <T extends any[]>(fun: TFunction<T>): TWrappedFunction<T> => {
+    return (...args: T): boolean => {
+        return !fun(...args);
+    }
+};

src/utils/getProjectData.ts

@@ -2,13 +2,13 @@ import { ProjectsOctoKit } from '../octokit/ProjectsOctoKit';
 import { measure } from './measure';
 
 import { TColumnTypes } from '../interfaces/TColumnTypes';
-import { IRepoSourceConfig } from '../interfaces/IRepoSourceConfig';
 import { IProjectData } from '../interfaces/IProjectData';
 import { IProjectWithConfig } from '../interfaces/IProjectWithConfig';
+import { IConfig } from '../interfaces/IConfig';
 
 export const getProjectData = async (
   projectKit: ProjectsOctoKit,
-  repo: IRepoSourceConfig,
+  config: IConfig,
   project: IProjectWithConfig,
 ): Promise<IProjectData> => {
   return await measure(`Get data for the "${project.project.name}" project`, async () => {
@@ -33,48 +33,55 @@ export const getProjectData = async (
       issues,
       cards,
       TColumnTypes.Backlog,
+      config,
     );
     console.log(`BacklogIssues: ${backlogIssues.length} items`);
 
     const committedIssues = await projectKit.mergeCardsWithIssuesForColumn(
       issues,
       cards,
       TColumnTypes.Committed,
+      config,
     );
     console.log(`CommittedIssues: ${committedIssues.length} items`);
 
     const blockedIssues = await projectKit.mergeCardsWithIssuesForColumn(
       issues,
       cards,
-      TColumnTypes.Blocked
+      TColumnTypes.Blocked,
+      config,
     );
     console.log(`BlockedIssues: ${blockedIssues.length} items`);
 
     const progressIssues = await projectKit.mergeCardsWithIssuesForColumn(
       issues,
       cards,
-      TColumnTypes.InProgress
+      TColumnTypes.InProgress,
+      config,
     );
     console.log(`ProgressIssues: ${progressIssues.length} items`);
 
     const inReviewIssues = await projectKit.mergeCardsWithIssuesForColumn(
       issues,
       cards,
-      TColumnTypes.InReview
+      TColumnTypes.InReview,
+      config,
     );
     console.log(`InReviewIssues: ${inReviewIssues.length} items`);
 
     const waitingToDeployIssues = await projectKit.mergeCardsWithIssuesForColumn(
       issues,
       cards,
-      TColumnTypes.WaitingToDeploy
+      TColumnTypes.WaitingToDeploy,
+      config,
     );
     console.log(`WaitingToDeployIssues: ${waitingToDeployIssues.length} items`);
 
     const doneIssues = await projectKit.mergeCardsWithIssuesForColumn(
       issues,
       cards,
-      TColumnTypes.Done
+      TColumnTypes.Done,
+      config,
     );
     console.log(`doneIssues: ${doneIssues.length} items`);
 
@@ -101,3 +108,4 @@ export const getProjectData = async (
     };
   });
 };
+