@ssa-ui-kit/templates 1.0.10 → 1.0.12

package/dist/projects/peopleops/hooks/dashboard/__mocks__/dashboardEvents.d.ts

@@ -27,12 +27,7 @@ export declare const DashboardEventsMock: {
             avatarUrl: string;
         }[];
         newComers: never[];
-        assessments: {
-            personId: number;
-            personName: string;
-            eventDate: string;
-            avatarUrl: string;
-        }[];
+        assessments: never[];
         terminations: never[];
     };
     nextWeek: {
@@ -50,12 +45,7 @@ export declare const DashboardEventsMock: {
     };
     thisMonth: {
         trials: never[];
-        birthdays: {
-            personId: number;
-            personName: string;
-            eventDate: string;
-            avatarUrl: string;
-        }[];
+        birthdays: never[];
         anniversaries: {
             personId: number;
             personName: string;
@@ -63,12 +53,7 @@ export declare const DashboardEventsMock: {
             avatarUrl: string;
         }[];
         newComers: never[];
-        assessments: {
-            personId: number;
-            personName: string;
-            eventDate: string;
-            avatarUrl: string;
-        }[];
+        assessments: never[];
         terminations: never[];
     };
     nextMonth: {
@@ -86,7 +71,12 @@ export declare const DashboardEventsMock: {
             avatarUrl: string;
         }[];
         newComers: never[];
-        assessments: never[];
+        assessments: {
+            personId: number;
+            personName: string;
+            eventDate: string;
+            avatarUrl: string;
+        }[];
         terminations: never[];
     };
 };

package/dist/projects/peopleops/types/api.d.ts

@@ -95,12 +95,8 @@ export type EventItemInfo = {
     personName: string;
     avatarUrl: string;
 };
-export type EventInfo = {
-    anniversaries: Array<EventItemInfo>;
-    birthdays: Array<EventItemInfo>;
-    trials: Array<EventItemInfo>;
-    terminations: Array<EventItemInfo>;
-};
+export type EventInfoType = 'anniversaries' | 'birthdays' | 'trials' | 'newComers' | 'terminations' | 'assessments';
+export type EventInfo = Record<EventInfoType, Array<EventItemInfo>>;
 export type DashboardCharts = {
     [K in DashboardChartsTypes]: Array<{
         caption: string;

package/dist/projects/peopleops/utils/eventsGenerator.d.ts

@@ -1,4 +1,5 @@
 import * as API from '../types';
+import { Period } from '../components/Events/types';
 export declare const getTodayBounds: () => {
     start: Date;
     end: Date;
@@ -19,120 +20,4 @@ export declare const getNextMonthBounds: () => {
     start: Date;
     end: Date;
 };
-export declare const getFilledTemplate: () => {
-    today: {
-        birthdays: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        anniversaries: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        assessments: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        newComers: API.EventItemInfo[];
-        terminations: API.EventItemInfo[];
-        trials: API.EventItemInfo[];
-    };
-    thisWeek: {
-        birthdays: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        anniversaries: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        assessments: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        newComers: API.EventItemInfo[];
-        terminations: API.EventItemInfo[];
-        trials: API.EventItemInfo[];
-    };
-    nextWeek: {
-        birthdays: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        anniversaries: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        assessments: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        newComers: API.EventItemInfo[];
-        terminations: API.EventItemInfo[];
-        trials: API.EventItemInfo[];
-    };
-    thisMonth: {
-        birthdays: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        anniversaries: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        assessments: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        newComers: API.EventItemInfo[];
-        terminations: API.EventItemInfo[];
-        trials: API.EventItemInfo[];
-    };
-    nextMonth: {
-        birthdays: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        anniversaries: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        assessments: {
-            eventDate: string;
-            personId: number;
-            personName: string;
-            avatarUrl: string;
-        }[];
-        newComers: API.EventItemInfo[];
-        terminations: API.EventItemInfo[];
-        trials: API.EventItemInfo[];
-    };
-};
+export declare const getFilledTemplate: () => Record<Period, API.EventInfo>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ssa-ui-kit/templates",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "private": false,
@@ -37,10 +37,10 @@
     "scheduler": "^0.23.0",
     "usehooks-ts": "^3.1.0",
     "uuid": "^9.0.0",
-    "@ssa-ui-kit/core": "^1.1.39",
     "@ssa-ui-kit/utils": "^1.0.0",
-    "@ssa-ui-kit/widgets": "^1.0.12",
-    "@ssa-ui-kit/hooks": "^1.0.2"
+    "@ssa-ui-kit/core": "^1.1.39",
+    "@ssa-ui-kit/hooks": "^1.0.2",
+    "@ssa-ui-kit/widgets": "^1.0.12"
   },
   "devDependencies": {
     "@emotion/jest": "^11.11.0",

package/src/projects/peopleops/components/Events/types.ts

@@ -4,6 +4,7 @@ export type Period =
   | 'nextWeek'
   | 'thisMonth'
   | 'nextMonth';
+
 export type EventInfoRowProps = {
   itemLabel: string;
   rowCircleColor: string;

package/src/projects/peopleops/hooks/dashboard/__mocks__/dashboardEvents.ts

@@ -57,29 +57,7 @@ export const DashboardEventsMock = {
       },
     ],
     newComers: [],
-    assessments: [
-      {
-        personId: 1,
-        personName: 'John Smith',
-        eventDate: '01-01-2025',
-        avatarUrl:
-          'https://eu.ui-avatars.com/api/?name=John+Smith&size=24&font-size=0.5',
-      },
-      {
-        personId: 2,
-        personName: 'Jack Brown',
-        eventDate: '01-01-2025',
-        avatarUrl:
-          'https://eu.ui-avatars.com/api/?name=Jack+Brown&size=24&font-size=0.5',
-      },
-      {
-        personId: 3,
-        personName: 'Adam Turner',
-        eventDate: '01-01-2025',
-        avatarUrl:
-          'https://eu.ui-avatars.com/api/?name=Adam+Turner&size=24&font-size=0.5',
-      },
-    ],
+    assessments: [],
     terminations: [],
   },
   nextWeek: {
@@ -114,30 +92,8 @@ export const DashboardEventsMock = {
   },
   thisMonth: {
     trials: [],
-    birthdays: [
-      {
-        personId: 4,
-        personName: 'Colin York',
-        eventDate: '10-01-1978',
-        avatarUrl:
-          'https://eu.ui-avatars.com/api/?name=Colin+York&size=24&font-size=0.5',
-      },
-      {
-        personId: 5,
-        personName: 'Stephen McCarthy',
-        eventDate: '11-01-1978',
-        avatarUrl:
-          'https://eu.ui-avatars.com/api/?name=Stephen+McCarthy&size=24&font-size=0.5',
-      },
-    ],
+    birthdays: [],
     anniversaries: [
-      {
-        personId: 6,
-        personName: 'Sarah Webb',
-        eventDate: '09-01-2018',
-        avatarUrl:
-          'https://eu.ui-avatars.com/api/?name=Sarah+Webb&size=24&font-size=0.5',
-      },
       {
         personId: 7,
         personName: 'Jane Stone',
@@ -147,29 +103,7 @@ export const DashboardEventsMock = {
       },
     ],
     newComers: [],
-    assessments: [
-      {
-        personId: 1,
-        personName: 'John Smith',
-        eventDate: '01-01-2025',
-        avatarUrl:
-          'https://eu.ui-avatars.com/api/?name=John+Smith&size=24&font-size=0.5',
-      },
-      {
-        personId: 2,
-        personName: 'Jack Brown',
-        eventDate: '01-01-2025',
-        avatarUrl:
-          'https://eu.ui-avatars.com/api/?name=Jack+Brown&size=24&font-size=0.5',
-      },
-      {
-        personId: 3,
-        personName: 'Adam Turner',
-        eventDate: '01-01-2025',
-        avatarUrl:
-          'https://eu.ui-avatars.com/api/?name=Adam+Turner&size=24&font-size=0.5',
-      },
-    ],
+    assessments: [],
     terminations: [],
   },
   nextMonth: {
@@ -226,6 +160,9 @@ export const DashboardEventsMock = {
         avatarUrl:
           'https://eu.ui-avatars.com/api/?name=Colin+York&size=24&font-size=0.5',
       },
+    ],
+    newComers: [],
+    assessments: [
       {
         personId: 13,
         personName: 'David Foster',
@@ -241,8 +178,6 @@ export const DashboardEventsMock = {
           'https://eu.ui-avatars.com/api/?name=Emily+Clark&size=24&font-size=0.5',
       },
     ],
-    newComers: [],
-    assessments: [],
     terminations: [],
   },
 };

package/src/projects/peopleops/translation.ts

@@ -9,7 +9,7 @@ export const translationConfig: JSONObject = {
       dashboard: {
         indicators: {
           employees: 'Employees',
-          fte: 'FTE',
+          fte: 'Full Time Employees',
           utilization: 'Utilization',
           onBench: 'On Bench',
           seniorityLevel: 'Seniority Level',
@@ -74,7 +74,7 @@ export const translationConfig: JSONObject = {
         nextTrialTerminationDates: 'next termination dates',
       },
       fte: {
-        title: 'FTE',
+        title: 'Full Time Employees',
       },
       headCountByFullCompany: {
         title: 'Headcount',

package/src/projects/peopleops/types/api.ts

@@ -132,12 +132,15 @@ export type EventItemInfo = {
   avatarUrl: string;
 };
 
-export type EventInfo = {
-  anniversaries: Array<EventItemInfo>;
-  birthdays: Array<EventItemInfo>;
-  trials: Array<EventItemInfo>;
-  terminations: Array<EventItemInfo>;
-};
+export type EventInfoType =
+  | 'anniversaries'
+  | 'birthdays'
+  | 'trials'
+  | 'newComers'
+  | 'terminations'
+  | 'assessments';
+
+export type EventInfo = Record<EventInfoType, Array<EventItemInfo>>;
 
 export type DashboardCharts = {
   [K in DashboardChartsTypes]: Array<{

package/src/projects/peopleops/utils/eventsGenerator.ts

@@ -1,9 +1,12 @@
-import { DateTime } from 'luxon';
+import { DateTime, Interval } from 'luxon';
 import * as API from '@/peopleops/types';
 import { DashboardEventsMock as template } from '@peopleops/hooks/dashboard/__mocks__/dashboardEvents';
+import { Period } from '../components/Events/types';
+
+const DATE_FORMAT = 'dd-MM-yyyy';
 
 const formatDate = (date: Date) =>
-  DateTime.fromJSDate(date).toFormat('dd-MM-yyyy');
+  DateTime.fromJSDate(date).toFormat(DATE_FORMAT);
 
 const getRandomDateInRange = (start: Date, end: Date) => {
   const randomTime =
@@ -12,13 +15,13 @@ const getRandomDateInRange = (start: Date, end: Date) => {
 };
 
 export const getTodayBounds = () => {
-  const startOfDay = new Date();
-  startOfDay.setHours(0, 0, 0, 0);
+  const startOfToday = new Date();
+  startOfToday.setHours(0, 0, 0, 0);
 
   const endOfDay = new Date();
   endOfDay.setHours(23, 59, 59, 999);
 
-  return { start: startOfDay, end: endOfDay };
+  return { start: startOfToday, end: endOfDay };
 };
 
 export const getCurrentWeekBounds = () => {
@@ -76,11 +79,7 @@ const updateEventDates = (
   dateRange: { start: Date; end: Date },
 ) => {
   const { start, end } = dateRange;
-
-  const dates = events
-    .map(() => getRandomDateInRange(start, end))
-    .sort((date1, date2) => date1.getTime() - date2.getTime());
-
+  const dates = events.map(() => getRandomDateInRange(start, end));
   const updatedEvents = events.map((event, index) => {
     return {
       ...event,
@@ -91,14 +90,28 @@ const updateEventDates = (
   return updatedEvents;
 };
 
-// type EventPeriods = keyof typeof template;
-// type EventTypes = keyof (typeof template)['today'];
+const sortEvent = (item1: API.EventItemInfo, item2: API.EventItemInfo) => {
+  const date1splitted = item1.eventDate.split('-');
+  const date2splitted = item2.eventDate.split('-');
+  const ms1 = new Date(
+    Number(date1splitted[2]),
+    Number(date1splitted[1]) - 1,
+    Number(date1splitted[0]),
+  ).getTime();
+  const ms2 = new Date(
+    Number(date2splitted[2]),
+    Number(date2splitted[1]) - 1,
+    Number(date2splitted[0]),
+  ).getTime();
+  return ms1 - ms2 > 0 ? 1 : ms2 === ms1 ? 0 : -1;
+};
 
 export const getFilledTemplate = () => {
-  // const cache: Record<
-  //   EventPeriods,
-  //   Record<EventTypes, API.EventItemInfo[]>
-  // > = {} as Record<EventPeriods, Record<EventTypes, API.EventItemInfo[]>>;
+  const cache: Array<
+    API.EventItemInfo & {
+      eventInfoType: API.EventInfoType;
+    }
+  > = [];
   const dateRanges: API.DateRanges = {
     today: getTodayBounds(),
     thisWeek: getCurrentWeekBounds(),
@@ -107,26 +120,85 @@ export const getFilledTemplate = () => {
     nextMonth: getNextMonthBounds(),
   };
 
+  const processCache = (
+    items: API.EventItemInfo[],
+    eventInfoType: API.EventInfoType,
+  ) =>
+    items.map((item) => {
+      const foundItem = cache.find(
+        (cacheItem) =>
+          cacheItem.eventInfoType === eventInfoType &&
+          cacheItem.personId === item.personId,
+      );
+      if (foundItem) {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { eventInfoType, ...rest } = foundItem;
+        return rest;
+      } else {
+        cache.push({
+          eventInfoType,
+          ...item,
+        });
+        return item;
+      }
+    });
+
   const updateSection = (
     section: API.DashboardEvent,
     dateRangeKey: API.DateRangesKeys,
   ) => {
     const dateRange = dateRanges[dateRangeKey];
-    return {
+    const newData = {
       ...section,
       birthdays: updateEventDates(section.birthdays, dateRange),
       anniversaries: updateEventDates(section.anniversaries, dateRange),
       assessments: updateEventDates(section.assessments, dateRange),
     };
+    (Object.keys(newData) as Array<API.EventInfoType>).forEach(
+      (eventInfoType) => {
+        newData[eventInfoType] = processCache(
+          newData[eventInfoType],
+          eventInfoType,
+        );
+      },
+    );
+    return newData;
   };
 
-  const result = {
-    today: updateSection(template.today, 'today'),
-    thisWeek: updateSection(template.thisWeek, 'thisWeek'),
-    nextWeek: updateSection(template.nextWeek, 'nextWeek'),
-    thisMonth: updateSection(template.thisMonth, 'thisMonth'),
-    nextMonth: updateSection(template.nextMonth, 'nextMonth'),
-  };
+  const result: Record<Period, API.EventInfo> = {} as Record<
+    Period,
+    API.EventInfo
+  >;
+
+  (Object.keys(template) as Array<Period>).forEach((periodType) => {
+    result[periodType] = updateSection(template[periodType], periodType);
+
+    const currentDateRange = dateRanges[periodType];
+    const currentInterval = Interval.fromDateTimes(
+      DateTime.fromJSDate(currentDateRange.start),
+      DateTime.fromJSDate(currentDateRange.end),
+    );
+    cache
+      .filter((item) =>
+        currentInterval.contains(
+          DateTime.fromFormat(item.eventDate, DATE_FORMAT),
+        ),
+      )
+      .forEach(({ eventInfoType, ...rest }) => {
+        if (
+          !result[periodType][eventInfoType].find(
+            (item) => item.personId === rest.personId,
+          )
+        ) {
+          result[periodType][eventInfoType].push(rest);
+        }
+      });
+    (Object.keys(template[periodType]) as API.EventInfoType[]).map(
+      (eventInfoType) => {
+        result[periodType][eventInfoType].sort(sortEvent);
+      },
+    );
+  });
 
   return result;
 };