@zohodesk/i18n 1.0.0-beta.3 → 1.0.0-beta.30

package/src/components/UserTimeDiffFormat.js

@@ -9,6 +9,8 @@ export default class UserTimeDiffFormat extends Component {
     let currentTimeUTCString = currentTime.toISOString();
     let {
       type,
+      page,
+      isNeedTime,
       to,
       today,
       yesterday,
@@ -21,32 +23,31 @@ export default class UserTimeDiffFormat extends Component {
       className,
       displayType,
       dataId,
-      isOverdue
+      isOverdue,
+      isDateField
     } = this.props;
-    let { tzData, timeFormat, datePattern, dateTimeFormat, timeZone } =
+    let { tzData, timeFormat, datePattern, isEnabledCurrentYear } =
       this.context || {};
 
     if (!format && !others) {
-      let pattern =
-        displayType === 'date'
-          ? datePattern
-          : displayType === 'time'
-          ? timeFormat
-          : displayType === 'dateTime'
+      format = ({ dateTimeFormat, dateFormat, timeFormat }) => {
+        displayType === 'dateTime'
           ? dateTimeFormat
-          : '';
-      format = () => pattern;
+          : displayType === 'date'
+          ? dateFormat
+          : timeFormat;
+      };
     }
 
-    let tz = tzData || timeZone;
-
     return (
       <DateTimeDiffFormat
         type={type}
+        page={page}
+        isNeedTime={isNeedTime}
         from={currentTimeUTCString}
-        fromTzData={tz}
+        fromTzData={tzData}
         to={to}
-        toTzData={tz}
+        toTzData={tzData}
         today={today}
         yesterday={yesterday}
         tomorrow={tomorrow}
@@ -58,6 +59,10 @@ export default class UserTimeDiffFormat extends Component {
         className={className}
         dataId={dataId}
         isOverdue={isOverdue}
+        timeFormat={timeFormat}
+        datePattern={datePattern}
+        isEnabledCurrentYear={isEnabledCurrentYear}
+        isDateField={isDateField}
       />
     );
   }
@@ -68,6 +73,7 @@ UserTimeDiffFormat.propTypes = {
   dataId: PropTypes.string,
   displayType: PropTypes.oneOf(['date', 'time', 'dateTime']),
   format: PropTypes.func,
+  isDateField: PropTypes.bool,
   later: PropTypes.string,
   others: PropTypes.func,
   title: PropTypes.string,
@@ -75,17 +81,17 @@ UserTimeDiffFormat.propTypes = {
   today: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.object,
-    PropTypes.func
+    PropTypes.func,
   ]),
   tomorrow: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.object,
-    PropTypes.func
+    PropTypes.func,
   ]),
   yesterday: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.object,
-    PropTypes.func
-  ])
+    PropTypes.func,
+  ]),
 };
 UserTimeDiffFormat.contextType = I18NContext;

package/src/index.js

@@ -1,5 +1,4 @@
 export {
-  browserOffset,
   formatDate,
   pad,
   replaceI18NValuesWithRegex,
@@ -11,22 +10,22 @@ export {
   isTomorrow,
   isWithinAWeek,
   isTwoWeeksOrMore,
-  convertTimezone,
-  getUtcTimeStamp,
-  convertUtcToUserTz,
-  convertUserTzToUtc,
   userDateFormat,
   getDiffObj,
   getLyears,
   getSuffix,
-  getFormatedDate
+  getDatePatternWithoutYear,
+  setLocalizedData,
+  setI18NKeyMapping,
+  dayi18n,
+  monthi18n,
+  timei18n
 } from './utils';
 import { getI18NValue as getI18NValue1 } from './utils';
-export { unpack, getTimezoneOffset } from './timezones';
 export { I18NContext } from './I18NContext';
 export {
   default as I18NProvider,
-  i18NProviderUtils
+  i18NProviderUtils,
 } from './components/I18NProvider';
 export { default as I18N } from './components/I18N';
 export { default as HOCI18N } from './components/HOCI18N';
@@ -36,4 +35,3 @@ export { default as DateTimeDiffFormat } from './components/DateTimeDiffFormat';
 export { default as UserTimeDiffFormat } from './components/UserTimeDiffFormat';
 export const getI18NValue = (i18n, key, values) =>
   getI18NValue1(i18n)(key, values);
-export { default as NewDateFormat } from './components/NewDateFormat';

package/src/utils/__tests__/jsxTranslations.spec.js

@@ -0,0 +1,213 @@
+import React from 'react';
+import {
+    splitMatchedExp,
+    generateChildren,
+    replaceWithComponentPlaceHolder,
+    createElement,
+    prepareI18NFunc,
+    getI18NComponent
+} from '../jsxTranslations';
+
+function Bold({children}) {
+    return <b>{children}</b>
+}
+
+function Simple(props) {
+    return <span>{props.children}</span>
+}
+
+describe('Verifying splitMatchedExp method', () => {
+    it('A string with no match test', () => {
+        const response = splitMatchedExp({
+            expression: '{[0-9]+?}',
+            charLenToOmit: 1,
+            string: "Hello"
+        });
+        const expected = {
+            splitString: ['Hello'],
+            matchedExpKeys: []
+        };
+        expect(response).toEqual(expected);
+    });
+    it('A string with JSX Tag placeholder test', () => {
+        const response = splitMatchedExp({
+            expression: '<[A-Za-z0-9]+?>',
+            charLenToOmit: 1,
+            string: "Hi <00Good> occurs <01Strong>"
+        });
+        const expected = {
+            splitString: ["Hi ", " occurs ", ""],
+            matchedExpKeys: ['00Good', '01Strong']
+        };
+        expect(response).toEqual(expected);
+    });
+    it('A string with String placeholder test', () => {
+        const response = splitMatchedExp({
+            expression: '{[0-9]+?}',
+            charLenToOmit: 1,
+            string: "Hi {0} occurs {1}"
+        });
+        const expected = {
+            splitString: ["Hi ", " occurs ", ""],
+            matchedExpKeys: ['0', '1']
+        };
+        expect(response).toEqual(expected);
+    });
+});
+
+describe('Verifying generateChildren Method', () => {
+    it('A string with Tag Placeholder and String placeholders', () => {
+        const children = {
+            '00Good': () => {},
+            '01Strong': () => {}
+        }
+        const response = generateChildren({
+            children,
+            child: 'Hi <00Good>{0}<01Strong>'
+        });
+        const expected = {
+            newChildren : [
+                ['Hi '],
+                children['00Good'],
+                ['', ''],
+                children['01Strong']
+            ],
+            stringPlaceHolders: {
+                0: [],
+                2: ['0']
+            }
+        };
+        expect(response).toEqual(expected);
+    });
+});
+
+describe('Verifying the replaceWithComponentPlaceHolder method', () => {
+    it('A JSX Tag with string', () => {
+        const response = replaceWithComponentPlaceHolder({
+            componentId: 'Simple',
+            i18nKey: '<Simple>Hi everyone</Simple>',
+            childrenLength: 1
+        });
+        const expected = '<01Simple>';
+        expect(response).toBe(expected);
+    });
+    it('A string with multiple JSX Tags', () => {
+        const response = replaceWithComponentPlaceHolder({
+            componentId: 'Simple',
+            i18nKey: 'Greetings <Simple>Hi everyone</Simple> for the <Simple>Day</Simple>',
+            childrenLength: 1
+        });
+        const expected = 'Greetings <01Simple> for the <Simple>Day</Simple>';
+        expect(response).toBe(expected);
+    });
+});
+
+describe('Verifying the createElement method', () => {
+    it('A component Id with JSX children and Dynamic String placeholders', () => {
+        const jsxChild = createElement({
+            componentId: 'Simple',
+            children: [
+                ['Greetings']
+            ],
+            stringPlaceHolders: {
+                0: []
+            }
+        });
+        const response = createElement({
+            componentId: -1,
+            children: [
+                ['Hi ', ','],
+                jsxChild,
+                [' for the day']
+            ],
+            stringPlaceHolders: {
+                0: ['0'],
+                2: []
+            }
+        })({
+            components: {
+                Simple: {
+                    type: Simple
+                }
+            },
+            values: ['Zoho Desk']
+        });
+        const expected = (<React.Fragment>
+            Hi Zoho Desk,<Simple>Greetings</Simple> for the day
+        </React.Fragment>);
+        expect(JSON.stringify(response)).toEqual(JSON.stringify(expected));
+    });
+});
+
+describe('Verifying the prepareI18NFunc method', () => {
+    //Hi <Bo01ld>Gigiee</Bo01ld>,<Simple> How are you</Simple><Simple>Make it simple</Simple>
+    it('A text with sibling JSX tags and alphanumeric JSX Tags', () => {
+        const response = prepareI18NFunc({
+            i18nKey: 'Hi <Bo01ld>Gigiee</Bo01ld>,<Simple>How are you</Simple><Simple>Make it simple</Simple>'
+        })({
+            components: {
+                'Bo01ld': {
+                    type: Bold
+                },
+                Simple: {
+                    type: Simple
+                }
+            }
+        });
+        const expected = (<React.Fragment>
+            Hi <Bold>
+                Gigiee
+            </Bold>,<Simple>
+                 How are you
+            </Simple><Simple>
+                Make it simple
+            </Simple>
+        </React.Fragment>);
+        expect(JSON.stringify(response)).toEqual(JSON.stringify(expected));
+    });
+});
+
+describe('Verifying getI18NComponent method', () => {
+    it('An i18n key with JSX tag in its value', () => {
+        const i18n = {
+            'support.demo': 'Hi <Bo01ld>Gigiee</Bo01ld>,<Simple>How are you</Simple><Simple>Make it simple</Simple>'
+        }
+        const I18N = getI18NComponent(i18n);
+        const response = I18N('support.demo')({
+            components: {
+                'Bo01ld': {
+                    type: Bold
+                },
+                Simple: {
+                    type: Simple
+                }
+            }
+        });
+        const expected = (<React.Fragment>
+            Hi <Bold>
+                Gigiee
+            </Bold>,<Simple>
+                 How are you
+            </Simple><Simple>
+                Make it simple
+            </Simple>
+        </React.Fragment>);
+        expect(JSON.stringify(response)).toEqual(JSON.stringify(expected));
+    });
+
+    it('Testing absence of i18n object', () => {
+        const I18N = getI18NComponent();
+        const response = I18N('support.demo');
+        const expected = 'support.demo';
+        expect(expected).toBe(response);
+    });
+    it('Testing of missing i18n key', () => {
+        const i18n = {
+            'support.demo': 'Demo'
+        };
+        const I18N = getI18NComponent(i18n);
+        const response = I18N('support.need');
+        const expected = 'support.need';
+        expect(expected).toBe(response);
+    });
+});