refactored code

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
amsiglan · Apr 3, 2024 · c96de81 · c96de81
1 parent 8999916
commit c96de81
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/public/pages/CreateTrigger/containers/CreateTrigger/CreateTrigger/CreateTrigger.js b/public/pages/CreateTrigger/containers/CreateTrigger/CreateTrigger/CreateTrigger.js
@@ -36,6 +36,7 @@ import DefineBucketLevelTrigger from '../../DefineBucketLevelTrigger';
 import { getPathsPerDataType } from '../../../../CreateMonitor/containers/DefineMonitor/utils/mappings';
 import { MONITOR_TYPE } from '../../../../../utils/constants';
 import { buildClusterMetricsRequest } from '../../../../CreateMonitor/components/ClusterMetricsMonitor/utils/clusterMetricsMonitorHelpers';
+import { getTimeZone } from '../../../utils/helper';
 
 export const DEFAULT_CLOSED_STATES = {
   WHEN: false,
@@ -210,8 +211,8 @@ export default class CreateTrigger extends Component {
     const userTimeZone = getUISettings().get('dateFormat:tz', moment.tz.guess()) || moment().format('Z');
 
     return {
-      periodStart: moment.utc(_.get(executeResponse, 'period_start', Date.now())).tz(userTimeZone).format(),
-      periodEnd: moment.utc(_.get(executeResponse, 'period_end', Date.now())).tz(userTimeZone).format(),
+      periodStart: moment.utc(_.get(executeResponse, 'period_start', Date.now())).tz(getTimeZone()).format(),
+      periodEnd: moment.utc(_.get(executeResponse, 'period_end', Date.now())).tz(getTimeZone()).format(),
       results: [_.get(executeResponse, 'input_results.results[0]')].filter((result) => !!result),
       trigger: formikToTrigger(values, _.get(this.props.monitor, 'ui_metadata', {})),
       alert: null,

diff --git a/...ges/CreateTrigger/containers/DefineCompositeLevelTrigger/NotificationConfigDialog.test.js b/...ges/CreateTrigger/containers/DefineCompositeLevelTrigger/NotificationConfigDialog.test.js
@@ -15,6 +15,7 @@ import { setUISettings } from '../../../../services';
 describe('NotificationConfigDialog', () => {
   test('renders', () => {
     const uiSettingsMock = uiSettingsServiceMock.createStartContract();
+    uiSettingsMock.get.mockReturnValue('America/Toronto');
     setUISettings(uiSettingsMock);
     const component = (
       <Formik initialValues={FORMIK_INITIAL_VALUES} onSubmit={() => {}}>

diff --git a/public/pages/CreateTrigger/utils/helper.js b/public/pages/CreateTrigger/utils/helper.js
@@ -56,11 +56,10 @@ export const getDefaultScript = (monitorValues) => {
 export const getTriggerContext = (executeResponse, monitor, values, triggerIndex) => {
   let trigger = formikToTrigger(values, _.get(monitor, 'ui_metadata', {}));
   if (_.isArray(trigger) && triggerIndex >= 0) trigger = trigger[triggerIndex];
-  const userTimeZone = getUISettings().get('dateFormat:tz', moment.tz.guess()) || moment().format('Z');
 
   return {
-    periodStart: moment.utc(_.get(executeResponse, 'period_start', Date.now())).tz(userTimeZone).format(),
-    periodEnd: moment.utc(_.get(executeResponse, 'period_end', Date.now())).tz(userTimeZone).format(),
+    periodStart: moment.utc(_.get(executeResponse, 'period_start', Date.now())).tz(getTimeZone()).format(),
+    periodEnd: moment.utc(_.get(executeResponse, 'period_end', Date.now())).tz(getTimeZone()).format(),
     results: [_.get(executeResponse, 'input_results.results[0]')].filter((result) => !!result),
     trigger: trigger,
     alert: null,
@@ -105,3 +104,8 @@ export const conditionToExpressions = (condition = '', monitors) => {
 
   return expressions;
 };
+
+export function getTimeZone() {
+  const detectedTimeZone = getUISettings().get('dateFormat:tz', 'Browser');
+  return detectedTimeZone === 'Browser' ? (moment.tz.guess() || moment.format('Z')) : detectedTimeZone;
+}