robbyson-frontend-library 1.0.164 → 1.0.165

package/dist/repositories/base.repository.js

@@ -35,7 +35,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import axios from "axios";
-import moment from "moment";
+import { isAfter, isEqual } from "date-fns";
 import { CacheControl } from "../utils";
 import sha1 from "crypto-js/sha1";
 import { GlobalStore } from "redux-micro-frontend";
@@ -74,7 +74,7 @@ var BaseRepository = /** @class */ (function () {
                     case 0:
                         if (config && config.cache) {
                             return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                                    var key, hasCache, _a, expire, value_1, isExpired, response_1, _b, _c, error_1;
+                                    var key, hasCache, _a, expire, value_1, now, expireDate, isExpired, response_1, _b, _c, error_1;
                                     var _d, _e;
                                     return __generator(this, function (_f) {
                                         switch (_f.label) {
@@ -88,7 +88,9 @@ var BaseRepository = /** @class */ (function () {
                                                 return [4 /*yield*/, CacheControl.getCache(key)];
                                             case 2:
                                                 _a = (_f.sent()) || {}, expire = _a.expire, value_1 = _a.value;
-                                                isExpired = moment().isSameOrAfter(moment(expire));
+                                                now = new Date();
+                                                expireDate = new Date(expire);
+                                                isExpired = isAfter(now, expireDate) || isEqual(now, expireDate);
                                                 if (value_1 && !isExpired) {
                                                     console.log("RECOVERED FROM CACHE", url);
                                                     return [2 /*return*/, setTimeout(function () { return resolve(value_1); }, (_d = config.delayOnCache) !== null && _d !== void 0 ? _d : 0)];

package/dist/utils/cache-control.js

@@ -35,7 +35,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import localforage from 'localforage';
-import moment from 'moment';
+import { add, isAfter, isEqual } from "date-fns";
 ;
 var CacheControl = /** @class */ (function () {
     function CacheControl() {
@@ -64,22 +64,20 @@ var CacheControl = /** @class */ (function () {
         if (type === void 0) { type = ''; }
         return __awaiter(this, void 0, void 0, function () {
             var now, data;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        now = moment();
+                        now = new Date();
                         data = {
                             value: value,
                             type: type,
-                            cratedAt: now.toDate().toISOString(),
-                            expire: now
-                                .add(maxAge[0], maxAge[1])
-                                .toDate()
-                                .toISOString(),
+                            cratedAt: now.toISOString(),
+                            expire: add(now, (_a = {}, _a[maxAge[1]] = maxAge[0], _a)).toISOString(),
                         };
                         return [4 /*yield*/, this.getDbInstance().setItem(key, data)];
                     case 1:
-                        _a.sent();
+                        _b.sent();
                         return [2 /*return*/];
                 }
             });
@@ -115,11 +113,14 @@ var CacheControl = /** @class */ (function () {
         var _this = this;
         this.getDbInstance()
             .iterate(function (value, key, _) {
-            if (value &&
-                moment(value.expire).isSameOrBefore(moment.now())) {
-                _this.getDbInstance().removeItem(key, function () {
-                    return console.log("Key ".concat(key, " is cleared!"));
-                });
+            if (value) {
+                var expireDate = new Date(value.expire);
+                var now = new Date();
+                if (isAfter(now, expireDate) || isEqual(now, expireDate)) {
+                    _this.getDbInstance().removeItem(key, function () {
+                        return console.log("Key ".concat(key, " is cleared!"));
+                    });
+                }
             }
         })
             .then(function () {

package/dist/utils/chat.utils.js

@@ -1,5 +1,5 @@
 import { ChatConstants } from "../constants";
-import _ from "lodash";
+import startCase from "lodash/startCase";
 function getCanSendToSuperiors(chat, chatPermissions, quitedGroup, identification, userHierarchy) {
     if (quitedGroup ||
         !chatPermissions.canSendToSuperiors ||
@@ -66,7 +66,7 @@ export function getChatName(chat) {
     if (!(chat === null || chat === void 0 ? void 0 : chat.name))
         return "";
     return (chat === null || chat === void 0 ? void 0 : chat.type) !== ChatConstants.TYPE_CHAT.GROUP
-        ? _.startCase((_a = chat.name) === null || _a === void 0 ? void 0 : _a.toLowerCase())
+        ? startCase((_a = chat.name) === null || _a === void 0 ? void 0 : _a.toLowerCase())
         : chat.name;
 }
 export function getPlaceholderMessage(canSendMessages, isActive) {

package/dist/utils/date.utils.js

@@ -1,17 +1,17 @@
-import _ from "lodash";
-import moment from "moment";
+import cloneDeep from "lodash/cloneDeep";
+import { isSameDay, isBefore, differenceInSeconds } from "date-fns";
 import { GlobalStore } from "redux-micro-frontend";
 var DateUtils = /** @class */ (function () {
     function DateUtils() {
     }
     DateUtils.isSameDateAsNow = function (date) {
-        return moment(date).isSame(moment(new Date()), "day");
+        return isSameDay(new Date(date), new Date());
     };
     DateUtils.isPastDateAsNow = function (date) {
-        return moment(date).isBefore(moment(new Date()));
+        return isBefore(new Date(date), new Date());
     };
     DateUtils.getDateBetweenDates = function (start, end) {
-        var clonedStart = _.cloneDeep(start);
+        var clonedStart = cloneDeep(start);
         if (!start ||
             !end ||
             !(start instanceof Date) ||
@@ -78,7 +78,7 @@ var DateUtils = /** @class */ (function () {
             if (length === void 0) { length = 2; }
             return time.toString().padStart(length, "0");
         }
-        var diff = moment(compareDate).diff(moment(), "seconds");
+        var diff = differenceInSeconds(new Date(compareDate), new Date());
         var days = formatTime(Math.floor(diff / (60 * 60 * 24)), 3);
         var hours = formatTime(Math.floor((diff % (60 * 60 * 24)) / (60 * 60)));
         var minutes = formatTime(Math.floor((diff % (60 * 60)) / 60));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "robbyson-frontend-library",
-    "version": "1.0.164",
+    "version": "1.0.165",
     "description": "Robbyson frontend Library",
     "main": "./dist/index.js",
     "license": "MIT",
@@ -34,12 +34,12 @@
         "@types/lovefield": "^2.1.6",
         "axios": "^1.3.5",
         "crypto-js": "^4.1.1",
+        "date-fns": "^4.1.0",
         "history": "^5.3.0",
         "js-sha256": "^0.9.0",
         "localforage": "^1.10.0",
-        "lodash": "^4.17.21",
+        "lodash": "^4.17.23",
         "lovefield": "^2.1.12",
-        "moment": "^2.29.4",
         "query-string": "^8.1.0",
         "react": "^18.2.0",
         "react-inlinesvg": "^3.0.2",

package/src/repositories/base.repository.ts

@@ -1,5 +1,5 @@
 import axios, { AxiosInstance, AxiosRequestConfig } from "axios";
-import moment from "moment";
+import { isAfter, isEqual } from "date-fns";
 import { CacheConfig, CacheControl, Cache } from "../utils";
 import sha1 from "crypto-js/sha1";
 import { GlobalStore, IGlobalStore } from "redux-micro-frontend";
@@ -52,9 +52,9 @@ export class BaseRepository {
                         const { expire, value }: Cache =
                             (await CacheControl.getCache(key)) || {};
 
-                        const isExpired: boolean = moment().isSameOrAfter(
-                            moment(expire)
-                        );
+                        const now = new Date();
+                        const expireDate = new Date(expire);
+                        const isExpired: boolean = isAfter(now, expireDate) || isEqual(now, expireDate);
 
                         if (value && !isExpired) {
                             console.log("RECOVERED FROM CACHE", url);

package/src/utils/cache-control.ts

@@ -1,8 +1,10 @@
 import { AxiosRequestConfig } from 'axios';
 import localforage from 'localforage';
-import moment, { DurationInputArg1, DurationInputArg2 } from 'moment';
+import { add, isAfter, isEqual } from "date-fns";
 
-export type MaxAge = [DurationInputArg1, DurationInputArg2];
+export type DurationUnit = "seconds" | "minutes" | "hours" | "days" | "weeks" | "months" | "years";
+
+export type MaxAge = [number, DurationUnit];
 export interface CacheConfig extends AxiosRequestConfig {
     cache?: boolean;
     maxAge?: MaxAge;
@@ -12,7 +14,7 @@ export interface CacheConfig extends AxiosRequestConfig {
 export type Cache = {
     expire: string;
     value: any
-};          
+};
 
 export class CacheControl {
 
@@ -41,15 +43,12 @@ export class CacheControl {
     }
 
     static async setCache(key: string, value: any, maxAge: MaxAge, type = ''): Promise<void> {
-        const now = moment();
+        const now = new Date();
         const data: any = {
             value,
             type,
-            cratedAt: now.toDate().toISOString(),
-            expire: now
-                .add(maxAge[0], maxAge[1])
-                .toDate()
-                .toISOString(),
+            cratedAt: now.toISOString(),
+            expire: add(now, { [maxAge[1]]: maxAge[0] }).toISOString(),
         };
         await this.getDbInstance().setItem(key, data);
     }
@@ -74,13 +73,14 @@ export class CacheControl {
     static clearExpiredCache(): void {
         this.getDbInstance()
             .iterate((value: any, key: string, _) => {
-                if (
-                    value &&
-                    moment(value.expire).isSameOrBefore(moment.now())
-                ) {
-                    this.getDbInstance().removeItem(key, () =>
-                        console.log(`Key ${key} is cleared!`),
-                    );
+                if (value) {
+                    const expireDate = new Date(value.expire);
+                    const now = new Date();
+                    if (isAfter(now, expireDate) || isEqual(now, expireDate)) {
+                        this.getDbInstance().removeItem(key, () =>
+                            console.log(`Key ${key} is cleared!`),
+                        );
+                    }
                 }
             })
             .then(() =>

package/src/utils/chat.utils.ts

@@ -1,7 +1,7 @@
 import { ChatDTO } from "../services";
 import { ChatModel } from "../models";
 import { ChatConstants } from "../constants";
-import _ from "lodash";
+import startCase from "lodash/startCase";
 
 function getCanSendToSuperiors(
     chat: ChatModel,
@@ -102,7 +102,7 @@ export function getChatName(chat: ChatModel): string {
     if (!chat?.name) return "";
 
     return chat?.type !== ChatConstants.TYPE_CHAT.GROUP
-        ? _.startCase(chat.name?.toLowerCase())
+        ? startCase(chat.name?.toLowerCase())
         : chat.name;
 }
 

package/src/utils/date.utils.ts

@@ -1,5 +1,5 @@
-import _ from "lodash";
-import moment from "moment";
+import cloneDeep from "lodash/cloneDeep";
+import { isSameDay, isBefore, differenceInSeconds } from "date-fns";
 import { GlobalStore } from "redux-micro-frontend";
 import { IPlatformState } from "../states";
 
@@ -10,15 +10,15 @@ type RemainingTime = {
 
 export class DateUtils {
     static isSameDateAsNow(date: Date): boolean {
-        return moment(date).isSame(moment(new Date()), "day");
+        return isSameDay(new Date(date), new Date());
     }
 
     static isPastDateAsNow(date: Date): boolean {
-        return moment(date).isBefore(moment(new Date()));
+        return isBefore(new Date(date), new Date());
     }
 
     static getDateBetweenDates(start: Date, end: Date): Date[] {
-        const clonedStart = _.cloneDeep(start);
+        const clonedStart = cloneDeep(start);
 
         if (
             !start ||
@@ -106,7 +106,7 @@ export class DateUtils {
             return time.toString().padStart(length, "0");
         }
 
-        const diff = moment(compareDate).diff(moment(), "seconds");
+        const diff = differenceInSeconds(new Date(compareDate), new Date());
 
         const days = formatTime(Math.floor(diff / (60 * 60 * 24)), 3);
         const hours = formatTime(
@@ -149,14 +149,14 @@ export class DateUtils {
             minutes === 0
                 ? "00"
                 : minutes < 10
-                ? "0" + minutes
-                : minutes.toString();
+                    ? "0" + minutes
+                    : minutes.toString();
         let formattedSeconds =
             seconds === 0
                 ? "00"
                 : seconds < 10
-                ? "0" + seconds
-                : seconds.toString();
+                    ? "0" + seconds
+                    : seconds.toString();
 
         let result = `${formattedHours}:${formattedMinutes}:${formattedSeconds}`;