@bigbinary/neeto-commons-frontend 2.0.47 → 2.0.48

package/initializers.cjs.js

@@ -516,6 +516,8 @@ var neetoCommons = {
 			last24Hours: "Last 24 hours",
 			thisMonth: "This month",
 			lastMonth: "Last month",
+			thisYear: "This year",
+			lastYear: "Last year",
 			thisQuarter: "This quarter",
 			lastQuarter: "Last quarter",
 			thisWeek: "This week",

package/initializers.js

@@ -506,6 +506,8 @@ var neetoCommons = {
 			last24Hours: "Last 24 hours",
 			thisMonth: "This month",
 			lastMonth: "Last month",
+			thisYear: "This year",
+			lastYear: "Last year",
 			thisQuarter: "This quarter",
 			lastQuarter: "Last quarter",
 			thisWeek: "This week",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigbinary/neeto-commons-frontend",
-  "version": "2.0.47",
+  "version": "2.0.48",
   "description": "A package encapsulating common code across neeto projects including initializers, utility functions, common components and hooks and so on.",
   "repository": "git@github.com:bigbinary/neeto-commons-frontend.git",
   "author": "Amaljith K <amaljith.k@bigbinary.com>",

package/react-utils.cjs.js

@@ -4354,6 +4354,10 @@ var defaultTimePeriodOptions = function defaultTimePeriodOptions() {
   var thisQuarterEnd = dayjs__default["default"]().endOf("quarter");
   var lastQuarterStart = dayjs__default["default"]().subtract(1, "quarter").startOf("quarter");
   var lastQuarterEnd = dayjs__default["default"]().subtract(1, "quarter").endOf("quarter");
+  var startOfLastYear = dayjs__default["default"]().subtract(1, "year").startOf("year");
+  var endOfLastYear = dayjs__default["default"]().subtract(1, "year").endOf("year");
+  var startOfYear = dayjs__default["default"]().startOf("year");
+  var endOfYear = dayjs__default["default"]().endOf("year");
   var startOf24Hours = dayjs__default["default"]().subtract(24, "hour");
   var now = dayjs__default["default"]();
   var startOfLast7Days = dayjs__default["default"]().subtract(7, "day");
@@ -4416,6 +4420,20 @@ var defaultTimePeriodOptions = function defaultTimePeriodOptions() {
       endDate: lastMonthEnd,
       rangeType: "month"
     }
+  }, {
+    label: i18next.t("neetoCommons.dateRangeFilter.timePeriodOptions.thisYear"),
+    value: {
+      startDate: startOfYear,
+      endDate: endOfYear,
+      rangeType: "year"
+    }
+  }, {
+    label: i18next.t("neetoCommons.dateRangeFilter.timePeriodOptions.lastYear"),
+    value: {
+      startDate: startOfLastYear,
+      endDate: endOfLastYear,
+      rangeType: "year"
+    }
   }, {
     label: i18next.t("neetoCommons.dateRangeFilter.timePeriodOptions.thisQuarter"),
     value: {
@@ -4437,7 +4455,7 @@ var defaultTimePeriodOptions = function defaultTimePeriodOptions() {
 };
 
 var DateRangeFilter = function DateRangeFilter(_ref) {
-  var _globalProps$user;
+  var _timePeriod$value, _timePeriod$value2, _globalProps$user;
   var timePeriodOptions = _ref.timePeriodOptions,
     timePeriod = _ref.timePeriod,
     setTimePeriod = _ref.setTimePeriod;
@@ -4445,6 +4463,8 @@ var DateRangeFilter = function DateRangeFilter(_ref) {
     t = _useTranslation.t;
   var customDurationLabel = t("neetoCommons.dateRangeFilter.timePeriodOptions.customDuration");
   var isCustom = timePeriod.label === customDurationLabel;
+  var startDate = (_timePeriod$value = timePeriod.value) === null || _timePeriod$value === void 0 ? void 0 : _timePeriod$value.startDate;
+  var endDate = (_timePeriod$value2 = timePeriod.value) === null || _timePeriod$value2 === void 0 ? void 0 : _timePeriod$value2.endDate;
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "flex pr-2",
     "data-testid": "date-range-filter"
@@ -4452,10 +4472,7 @@ var DateRangeFilter = function DateRangeFilter(_ref) {
     className: "w-40"
   }, /*#__PURE__*/React__default["default"].createElement(neetoui.Select, {
     required: true,
-    getOptionValue: function getOptionValue(_ref2) {
-      var label = _ref2.label;
-      return label;
-    },
+    getOptionValue: ramda.prop("label"),
     options: timePeriodOptions || defaultTimePeriodOptions(),
     value: timePeriod,
     onChange: function onChange(option) {
@@ -4468,12 +4485,13 @@ var DateRangeFilter = function DateRangeFilter(_ref) {
     autoFocus: true,
     className: "ml-3 w-full",
     dateFormat: initializers.globalProps === null || initializers.globalProps === void 0 ? void 0 : (_globalProps$user = initializers.globalProps.user) === null || _globalProps$user === void 0 ? void 0 : _globalProps$user.dateFormat,
+    defaultValue: [dayjs__default["default"](startDate), dayjs__default["default"](endDate)],
     picker: "date",
     type: "range",
-    onChange: function onChange(_, _ref3) {
-      var _ref4 = _slicedToArray(_ref3, 2),
-        startDate = _ref4[0],
-        endDate = _ref4[1];
+    onChange: function onChange(_, _ref2) {
+      var _ref3 = _slicedToArray(_ref2, 2),
+        startDate = _ref3[0],
+        endDate = _ref3[1];
       setTimePeriod({
         label: customDurationLabel,
         value: {

package/react-utils.js

@@ -4316,6 +4316,10 @@ var defaultTimePeriodOptions = function defaultTimePeriodOptions() {
   var thisQuarterEnd = dayjs().endOf("quarter");
   var lastQuarterStart = dayjs().subtract(1, "quarter").startOf("quarter");
   var lastQuarterEnd = dayjs().subtract(1, "quarter").endOf("quarter");
+  var startOfLastYear = dayjs().subtract(1, "year").startOf("year");
+  var endOfLastYear = dayjs().subtract(1, "year").endOf("year");
+  var startOfYear = dayjs().startOf("year");
+  var endOfYear = dayjs().endOf("year");
   var startOf24Hours = dayjs().subtract(24, "hour");
   var now = dayjs();
   var startOfLast7Days = dayjs().subtract(7, "day");
@@ -4378,6 +4382,20 @@ var defaultTimePeriodOptions = function defaultTimePeriodOptions() {
       endDate: lastMonthEnd,
       rangeType: "month"
     }
+  }, {
+    label: t$1("neetoCommons.dateRangeFilter.timePeriodOptions.thisYear"),
+    value: {
+      startDate: startOfYear,
+      endDate: endOfYear,
+      rangeType: "year"
+    }
+  }, {
+    label: t$1("neetoCommons.dateRangeFilter.timePeriodOptions.lastYear"),
+    value: {
+      startDate: startOfLastYear,
+      endDate: endOfLastYear,
+      rangeType: "year"
+    }
   }, {
     label: t$1("neetoCommons.dateRangeFilter.timePeriodOptions.thisQuarter"),
     value: {
@@ -4399,7 +4417,7 @@ var defaultTimePeriodOptions = function defaultTimePeriodOptions() {
 };
 
 var DateRangeFilter = function DateRangeFilter(_ref) {
-  var _globalProps$user;
+  var _timePeriod$value, _timePeriod$value2, _globalProps$user;
   var timePeriodOptions = _ref.timePeriodOptions,
     timePeriod = _ref.timePeriod,
     setTimePeriod = _ref.setTimePeriod;
@@ -4407,6 +4425,8 @@ var DateRangeFilter = function DateRangeFilter(_ref) {
     t = _useTranslation.t;
   var customDurationLabel = t("neetoCommons.dateRangeFilter.timePeriodOptions.customDuration");
   var isCustom = timePeriod.label === customDurationLabel;
+  var startDate = (_timePeriod$value = timePeriod.value) === null || _timePeriod$value === void 0 ? void 0 : _timePeriod$value.startDate;
+  var endDate = (_timePeriod$value2 = timePeriod.value) === null || _timePeriod$value2 === void 0 ? void 0 : _timePeriod$value2.endDate;
   return /*#__PURE__*/React__default.createElement("div", {
     className: "flex pr-2",
     "data-testid": "date-range-filter"
@@ -4414,10 +4434,7 @@ var DateRangeFilter = function DateRangeFilter(_ref) {
     className: "w-40"
   }, /*#__PURE__*/React__default.createElement(Select, {
     required: true,
-    getOptionValue: function getOptionValue(_ref2) {
-      var label = _ref2.label;
-      return label;
-    },
+    getOptionValue: prop$1("label"),
     options: timePeriodOptions || defaultTimePeriodOptions(),
     value: timePeriod,
     onChange: function onChange(option) {
@@ -4430,12 +4447,13 @@ var DateRangeFilter = function DateRangeFilter(_ref) {
     autoFocus: true,
     className: "ml-3 w-full",
     dateFormat: globalProps$1 === null || globalProps$1 === void 0 ? void 0 : (_globalProps$user = globalProps$1.user) === null || _globalProps$user === void 0 ? void 0 : _globalProps$user.dateFormat,
+    defaultValue: [dayjs(startDate), dayjs(endDate)],
     picker: "date",
     type: "range",
-    onChange: function onChange(_, _ref3) {
-      var _ref4 = _slicedToArray(_ref3, 2),
-        startDate = _ref4[0],
-        endDate = _ref4[1];
+    onChange: function onChange(_, _ref2) {
+      var _ref3 = _slicedToArray(_ref2, 2),
+        startDate = _ref3[0],
+        endDate = _ref3[1];
       setTimePeriod({
         label: customDurationLabel,
         value: {