@rh-support/utils 2.4.3-beta.5 → 2.5.0

package/lib/esm/dateUtils.d.ts

@@ -1,16 +1,15 @@
-import moment from 'moment-timezone';
+type Granularity = 'day' | 'week' | 'month' | 'year';
 export declare const formatDate: (date: any, locale?: string, format?: Intl.DateTimeFormatOptions) => string;
 export declare const formatDateTime: (date: any, locale?: string, format?: Intl.DateTimeFormatOptions) => string;
-export declare const isoDate: (date: string) => string;
+export declare const isCurrentDateAfterDate: (date: string, granularity?: Granularity) => boolean;
 export declare const getTimezoneOffsetFromTZName: (tzName: string) => string;
 export declare const getPastUTCDateFromNow: (pastDays: number) => string;
-export declare const isCurrentDateSameAsOrBeforeDate: (date: string, granularity?: moment.unitOfTime.StartOf) => boolean;
-export declare const isFutureDate: (date: string, granularity?: moment.unitOfTime.StartOf) => boolean;
-type AddToDate = {
+export declare const isFutureDate: (date: string, granularity?: Granularity) => boolean;
+export interface AddToDate {
     days: number;
-    date?: string;
-};
-export declare const addDaysToDate: (params: AddToDate) => moment.Moment;
+    date?: Date | string | number;
+}
+export declare const addDaysToDate: (params: AddToDate) => Date;
 export declare const isValidDate: (dateString: string) => boolean;
 export declare const generateUniqueIdBasedOnNowDate: () => string;
 export declare const ABTestSplitSplitBasedOnDate: (testVariationWeight: number, dateString: string) => "A" | "B";

package/lib/esm/dateUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dateUtils.d.ts","sourceRoot":"","sources":["../../src/dateUtils.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,eAAO,MAAM,UAAU,wCAGX,IAAI,CAAC,qBAAqB,WASrC,CAAC;AAEF,eAAO,MAAM,cAAc,wCAGf,IAAI,CAAC,qBAAqB,WAerC,CAAC;AAEF,eAAO,MAAM,OAAO,SAAU,MAAM,KAAG,MAAmC,CAAC;AAE3E,eAAO,MAAM,2BAA2B,WAAY,MAAM,WAEzD,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAc,MAAM,KAAG,MAExD,CAAC;AAEF,eAAO,MAAM,+BAA+B,SAClC,MAAM,gBACC,MAAM,CAAC,UAAU,CAAC,OAAO,KACvC,OAEF,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,MAAM,gBAAe,MAAM,CAAC,UAAU,CAAC,OAAO,YAEhF,CAAC;AAEF,KAAK,SAAS,GAAG;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,aAAa,WAAY,SAAS,kBAG9C,CAAC;AAEF,eAAO,MAAM,WAAW,eAAgB,MAAM,YAI7C,CAAC;AAEF,eAAO,MAAM,8BAA8B,cAE1C,CAAC;AAQF,eAAO,MAAM,2BAA2B,wBAAyB,MAAM,cAAc,MAAM,cAe1F,CAAC;AASF,eAAO,MAAM,+BAA+B,wBAAyB,MAAM,iBAAiB,MAAM,cAkBjG,CAAC"}
+{"version":3,"file":"dateUtils.d.ts","sourceRoot":"","sources":["../../src/dateUtils.ts"],"names":[],"mappings":"AAaA,KAAK,WAAW,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAErD,eAAO,MAAM,UAAU,wCAGX,IAAI,CAAC,qBAAqB,WASrC,CAAC;AAEF,eAAO,MAAM,cAAc,wCAGf,IAAI,CAAC,qBAAqB,WAerC,CAAC;AAEF,eAAO,MAAM,sBAAsB,SAAU,MAAM,gBAAe,WAAW,KAAW,OA4BvF,CAAC;AAEF,eAAO,MAAM,2BAA2B,WAAY,MAAM,KAAG,MAI5D,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAc,MAAM,KAAG,MAGxD,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,MAAM,gBAAe,WAAW,KAAW,OA6B7E,CAAC;AAEF,MAAM,WAAW,SAAS;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;CACjC;AAED,eAAO,MAAM,aAAa,WAAY,SAAS,KAAG,IAGjD,CAAC;AAEF,eAAO,MAAM,WAAW,eAAgB,MAAM,YAI7C,CAAC;AAEF,eAAO,MAAM,8BAA8B,cAE1C,CAAC;AAQF,eAAO,MAAM,2BAA2B,wBAAyB,MAAM,cAAc,MAAM,cAe1F,CAAC;AASF,eAAO,MAAM,+BAA+B,wBAAyB,MAAM,iBAAiB,MAAM,cAkBjG,CAAC"}

package/lib/esm/dateUtils.js

@@ -1,5 +1,5 @@
-import { isValid, parseISO } from 'date-fns';
-import moment from 'moment-timezone';
+import { addDays, isAfter, isValid, parseISO, startOfDay, startOfMonth, startOfWeek, startOfYear, subDays, } from 'date-fns';
+import { format, formatInTimeZone, fromZonedTime } from 'date-fns-tz';
 export const formatDate = (date, locale = 'en-us', format = { month: 'short', day: 'numeric', year: 'numeric' }) => {
     if (!date) {
         return '';
@@ -24,22 +24,72 @@ export const formatDateTime = (date, locale = 'en-us', format = {
     }
     return formatDate(date, locale, format);
 };
-export const isoDate = (date) => new Date(date).toString();
+export const isCurrentDateAfterDate = (date, granularity = 'day') => {
+    const parsedDate = parseISO(date);
+    const now = new Date();
+    let comparisonDate;
+    let comparisonNow;
+    switch (granularity) {
+        case 'day':
+            comparisonDate = startOfDay(parsedDate);
+            comparisonNow = startOfDay(now);
+            break;
+        case 'week':
+            comparisonDate = startOfWeek(parsedDate);
+            comparisonNow = startOfWeek(now);
+            break;
+        case 'month':
+            comparisonDate = startOfMonth(parsedDate);
+            comparisonNow = startOfMonth(now);
+            break;
+        case 'year':
+            comparisonDate = startOfYear(parsedDate);
+            comparisonNow = startOfYear(now);
+            break;
+        default:
+            throw new Error('Invalid granularity');
+    }
+    return isAfter(comparisonNow, comparisonDate);
+};
 export const getTimezoneOffsetFromTZName = (tzName) => {
-    return moment().tz(tzName).format('Z');
+    const date = new Date();
+    const zonedDate = fromZonedTime(date, tzName);
+    return format(zonedDate, 'xxx', { timeZone: tzName });
 };
 export const getPastUTCDateFromNow = (pastDays) => {
-    return moment().subtract(pastDays, 'days').utc().format();
-};
-export const isCurrentDateSameAsOrBeforeDate = (date, granularity = 'day') => {
-    return moment(moment.now()).isSameOrBefore(date, granularity);
+    const date = subDays(new Date(), pastDays);
+    return formatInTimeZone(date, 'UTC', "yyyy-MM-dd'T'HH:mm:ss'Z'");
 };
 export const isFutureDate = (date, granularity = 'day') => {
-    return moment(date).isAfter(moment(), granularity);
+    const parsedDate = parseISO(date);
+    const now = new Date();
+    let comparisonDate;
+    let comparisonNow;
+    switch (granularity) {
+        case 'day':
+            comparisonDate = startOfDay(parsedDate);
+            comparisonNow = startOfDay(now);
+            break;
+        case 'week':
+            comparisonDate = startOfWeek(parsedDate);
+            comparisonNow = startOfWeek(now);
+            break;
+        case 'month':
+            comparisonDate = startOfMonth(parsedDate);
+            comparisonNow = startOfMonth(now);
+            break;
+        case 'year':
+            comparisonDate = startOfYear(parsedDate);
+            comparisonNow = startOfYear(now);
+            break;
+        default:
+            throw new Error('Invalid granularity');
+    }
+    return isAfter(comparisonDate, comparisonNow);
 };
 export const addDaysToDate = (params) => {
     const { days, date = new Date() } = params;
-    return moment(date).add(days, 'days');
+    return addDays(new Date(date), days);
 };
 export const isValidDate = (dateString) => {
     const parsedDate = parseISO(dateString);

package/lib/esm/eventUtils.d.ts

@@ -5,7 +5,17 @@ export interface IPendoTrackEventProperty {
 declare function haltEvent(event: React.SyntheticEvent<{}>): void;
 declare function pendoTrackEvent(name: any, properties?: IPendoTrackEventProperty): void;
 declare function dtmTrackEvent(eventName: string, stepName: string, caseNumber?: string, product?: string): void;
-declare function dtmTrackEventCaseStartStopped(stepName: string, caseNumber?: string, product?: string): void;
-declare function dtmTrackEventCaseDetailsSolutionDocs(stepName: string, caseNumber?: string, product?: string): void;
-export { haltEvent, pendoTrackEvent, dtmTrackEvent, dtmTrackEventCaseStartStopped, dtmTrackEventCaseDetailsSolutionDocs, };
+/**
+ * Gets the page name used in track events based off the current pathname.
+ * @param pathname the current pathname
+ * @returns the track event page name
+ */
+export declare function getPageName(pathname: string): string;
+declare function dtmTrackEventCaseCreationStepEncountered(caseSection: boolean, stepName: string, caseNumber?: string, caseType?: string, caseTitle?: string, product?: string, version?: string): void;
+export declare function dtmTrackEventCaseStepEncountered(stepName: 'close' | 'comment' | 'follow' | 'review', caseNumber?: string, product?: string, version?: string): void;
+export declare function dtmTrackEventPageLoadStarted(pageName: string): void;
+declare function dtmTrackEventRecommendationListingItemClicked(url: string, activityName: string, contentListingRegion: string, contentID: string, contentPosition: number, contentTitle: string, contentUrl: string, displayFeature: string, displayFeatureTitle: string): void;
+declare function dtmTrackEventRecommendationListingDisplayed(contentListingRegion: any, activityName: any, listing: any, resultsCount: any): void;
+export declare function dtmTrackEventUploadFileToAnalyze(caseSection: boolean, stepName: string, caseType?: string, caseTitle?: string, product?: string, version?: string): void;
+export { haltEvent, pendoTrackEvent, dtmTrackEvent, dtmTrackEventCaseCreationStepEncountered, dtmTrackEventRecommendationListingItemClicked, dtmTrackEventRecommendationListingDisplayed, };
 //# sourceMappingURL=eventUtils.d.ts.map

package/lib/esm/eventUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eventUtils.d.ts","sourceRoot":"","sources":["../../src/eventUtils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,WAAW,wBAAwB;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,iBAAS,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,QAKjD;AAKD,iBAAS,eAAe,CAAC,IAAI,KAAA,EAAE,UAAU,GAAE,wBAA6B,QAMvE;AAED,iBAAS,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,QAUhG;AAED,iBAAS,6BAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,QAE7F;AAED,iBAAS,oCAAoC,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,QAEpG;AAED,OAAO,EACH,SAAS,EACT,eAAe,EACf,aAAa,EACb,6BAA6B,EAC7B,oCAAoC,GACvC,CAAC"}
+{"version":3,"file":"eventUtils.d.ts","sourceRoot":"","sources":["../../src/eventUtils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,WAAW,wBAAwB;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,iBAAS,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC,QAKjD;AAKD,iBAAS,eAAe,CAAC,IAAI,KAAA,EAAE,UAAU,GAAE,wBAA6B,QAMvE;AAED,iBAAS,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,QAUhG;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEpD;AAGD,iBAAS,wCAAwC,CAC7C,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,QAkBnB;AAGD,wBAAgB,gCAAgC,CAC5C,QAAQ,EAAE,OAAO,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,EACnD,UAAU,CAAC,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,QAcnB;AAGD,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,QAW5D;AAGD,iBAAS,6CAA6C,CAClD,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,MAAM,EACpB,oBAAoB,EAAE,MAAM,EAC5B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,mBAAmB,EAAE,MAAM,QA6B9B;AAGD,iBAAS,2CAA2C,CAAC,oBAAoB,KAAA,EAAE,YAAY,KAAA,EAAE,OAAO,KAAA,EAAE,YAAY,KAAA,QAW7G;AAGD,wBAAgB,gCAAgC,CAC5C,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,QAiBnB;AAED,OAAO,EACH,SAAS,EACT,eAAe,EACf,aAAa,EACb,wCAAwC,EACxC,6CAA6C,EAC7C,2CAA2C,GAC9C,CAAC"}

package/lib/esm/eventUtils.js

@@ -27,10 +27,94 @@ function dtmTrackEvent(eventName, stepName, caseNumber, product) {
         },
     });
 }
-function dtmTrackEventCaseStartStopped(stepName, caseNumber, product) {
-    dtmTrackEvent('Case Step Encountered', stepName, caseNumber, product);
+/**
+ * Gets the page name used in track events based off the current pathname.
+ * @param pathname the current pathname
+ * @returns the track event page name
+ */
+export function getPageName(pathname) {
+    return `cp|support|cases|${pathname.replace('#', '').split('/').filter(Boolean).join('|')}`;
 }
-function dtmTrackEventCaseDetailsSolutionDocs(stepName, caseNumber, product) {
-    dtmTrackEvent('Case details solution docs', stepName, caseNumber, product);
+// https://github.com/further-external/redhat-datalayer/blob/main/EDDL/global-datalayer.md#case-creation-step-encountered
+function dtmTrackEventCaseCreationStepEncountered(caseSection, stepName, caseNumber, caseType, caseTitle, product, version) {
+    const event = 'Case Creation Step Encountered';
+    const caseObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ type: 'cp-support', caseSection: caseSection ? 'case' : 'troubleshoot', stepName }, (caseNumber && { caseNumber })), (version && { caseProductVersion: version })), (caseType && { caseType })), (caseTitle && { caseTitle })), (product && { caseProduct: product }));
+    (window.appEventData || []).push({
+        event,
+        case: caseObject,
+    });
+}
+// https://github.com/further-external/redhat-datalayer/blob/main/EDDL/global-datalayer.md#Case-Step-Encountered
+export function dtmTrackEventCaseStepEncountered(stepName, caseNumber, product, version) {
+    const event = 'Case Step Encountered';
+    const caseObject = Object.assign(Object.assign({ type: 'cp-support', stepName }, (caseNumber && { caseNumber })), (product && { caseProduct: `${product}|${version}` }));
+    (window.appEventData || []).push({
+        event,
+        case: caseObject,
+    });
+}
+// https://github.com/further-external/redhat-datalayer/blob/main/EDDL/global-datalayer.md#Page-Load-Started
+export function dtmTrackEventPageLoadStarted(pageName) {
+    const event = 'Page Load Started';
+    const caseObject = {
+        type: 'cp-support',
+        pageName,
+    };
+    (window.appEventData || []).push({
+        event,
+        case: caseObject,
+    });
+}
+// https://github.com/further-external/redhat-datalayer/blob/main/EDDL/global-datalayer.md#recommendation-listing-item-clicked
+function dtmTrackEventRecommendationListingItemClicked(url, activityName, contentListingRegion, contentID, contentPosition, contentTitle, contentUrl, displayFeature, displayFeatureTitle) {
+    (window.appEventData || []).push({
+        event: 'Recommendation Listing Item Clicked',
+        linkInfo: {
+            href: url,
+            linkType: 'list',
+            linkTypeName: 'listing result click',
+            targetHost: 'access.redhat.com',
+            text: 'text',
+        },
+        listingItemClicked: {
+            activityName,
+            contentListingRegion,
+            listing: [
+                {
+                    content: {
+                        contentID,
+                        contentPosition,
+                        contentTitle,
+                        contentUrl,
+                        displayFeature,
+                        displayFeatureTitle,
+                    },
+                },
+            ],
+            listingType: 'Support Cases',
+        },
+    });
+}
+// https://github.com/further-external/redhat-datalayer/blob/main/EDDL/global-datalayer.md#recommendation-listing-displayed
+function dtmTrackEventRecommendationListingDisplayed(contentListingRegion, activityName, listing, resultsCount) {
+    (window.appEventData || []).push({
+        event: 'Recommendation Listing Displayed',
+        listingDisplayed: {
+            activityName,
+            contentListingRegion,
+            listing,
+            listingType: 'content',
+            resultsCount,
+        },
+    });
+}
+// https://github.com/further-external/redhat-datalayer/blob/main/EDDL/global-datalayer.md#Upload-File-to-Analyze
+export function dtmTrackEventUploadFileToAnalyze(caseSection, stepName, caseType, caseTitle, product, version) {
+    const eventName = 'Upload File to Analyze';
+    const caseObject = Object.assign(Object.assign(Object.assign(Object.assign({ type: 'cp-support', caseSection: caseSection ? 'case' : 'troubleshoot', stepName }, (product && { caseProduct: product })), (version && { caseProductVersion: version })), (caseType && { caseType })), (caseTitle && { caseTitle }));
+    (window.appEventData || []).push({
+        event: eventName,
+        case: caseObject,
+    });
 }
-export { haltEvent, pendoTrackEvent, dtmTrackEvent, dtmTrackEventCaseStartStopped, dtmTrackEventCaseDetailsSolutionDocs, };
+export { haltEvent, pendoTrackEvent, dtmTrackEvent, dtmTrackEventCaseCreationStepEncountered, dtmTrackEventRecommendationListingItemClicked, dtmTrackEventRecommendationListingDisplayed, };

package/lib/esm/validatorUtils.js

@@ -1,7 +1,7 @@
 const emojiPattern = /[\u{1f300}-\u{1f5ff}\u{1f900}-\u{1f9ff}\u{1f600}-\u{1f64f}\u{1f680}-\u{1f6ff}\u{2600}-\u{26ff}\u{2700}-\u{27bf}\u{1f1e6}-\u{1f1ff}\u{1f191}-\u{1f251}\u{1f004}\u{1f0cf}\u{1f170}-\u{1f171}\u{1f17e}-\u{1f17f}\u{1f18e}\u{3030}\u{2b50}\u{2b55}\u{2934}-\u{2935}\u{2b05}-\u{2b07}\u{2b1b}-\u{2b1c}\u{3297}\u{3299}\u{303d}\u{00a9}\u{00ae}\u{2122}\u{23f3}\u{24c2}\u{23e9}-\u{23ef}\u{25b6}\u{23f8}-\u{23fa}]/gu;
 const mailformat = new RegExp(
 // eslint-disable-next-line no-control-regex
-"([!#-'*+/-9=?A-Z^-~-]+(.[!#-'*+/-9=?A-Z^-~-]+)*|\"([]!#-[^-~ \t]|(\\[\t -~]))+\")@([!#-'*+/-9=?A-Z^-~-]+(.[!#-'*+/-9=?A-Z^-~-]+)*|[[\t -Z^-~]*])");
+"^([!#-'*+/-9=?A-Z^-~-]+(\\.[!#-'*+/-9=?A-Z^-~-]+)*|\"([]!#-[^-~ \\t]|(\\[\\t -~]))+\")@([!#-'*+/-9=?A-Z^-~-]+(\\.[!#-'*+/-9=?A-Z^-~-]+)*|\\[[\\t -Z^-~]*])$");
 const imageRegex = /^image\/(gif|png|jpeg)$/;
 // To check if email is valid
 function isEmailValid(object) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/utils",
-    "version": "2.4.3-beta.5",
+    "version": "2.5.0",
     "description": "> TODO: description",
     "author": "Vikas Rathee <vrathee@redhat.com>",
     "license": "ISC",
@@ -51,11 +51,11 @@
         "@cee-eng/hydrajs": "4.17.36",
         "@rh-support/types": "2.0.4",
         "date-fns": "3.6.0",
+        "date-fns-tz": "^3.1.3",
         "dompurify": "^2.2.6",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",
         "lucene": "^2.1.1",
-        "marked": "^1.2.4",
         "qs": "^6.7.0",
         "solr-query-builder": "1.0.1"
     },
@@ -68,12 +68,11 @@
         "@types/qs": "^6.9.1",
         "i18next": "^23.15.0",
         "jest": "^29.7.0",
-        "jest-environment-jsdom": "^29.7.0",
-        "moment-timezone": "^0.5.45"
+        "jest-environment-jsdom": "^29.7.0"
     },
     "browserslist": [
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "259d82237f1bce282e2d569e85b32233d3c4a4a6"
+    "gitHead": "908b440e3c6cd625c77178c3205f4e2908630446"
 }