From b812783a0bcc08c1479d91a96fdd031bc9dc904d Mon Sep 17 00:00:00 2001
From: Johnson Cherian <johnsonc.dev@gmail.com>
Date: Wed, 13 Mar 2024 11:16:43 +0530
Subject: [PATCH] refactor: moved constants to util files

---
 server/src/helpers/components.helper.ts          | 10 ++++++++++
 server/src/helpers/utils.helper.ts               |  6 ------
 server/src/services/app_import_export.service.ts | 10 +++++-----
 server/src/services/components.service.ts        | 11 ++++-------
 4 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 server/src/helpers/components.helper.ts

diff --git a/server/src/helpers/components.helper.ts b/server/src/helpers/components.helper.ts
new file mode 100644
index 0000000000..e562659c1a
--- /dev/null
+++ b/server/src/helpers/components.helper.ts
@@ -0,0 +1,10 @@
+export enum LayoutDimensionUnits {
+  COUNT = 'count',
+  PERCENT = 'percent',
+}
+
+export const resolveGridPositionForComponent = (dimension: number, type: string) => {
+  // const numberOfGrids = type === 'desktop' ? 43 : 12;
+  const numberOfGrids = 43;
+  return Math.round((dimension * numberOfGrids) / 100);
+};
diff --git a/server/src/helpers/utils.helper.ts b/server/src/helpers/utils.helper.ts
index 50e5b436bd..fe0307de84 100644
--- a/server/src/helpers/utils.helper.ts
+++ b/server/src/helpers/utils.helper.ts
@@ -274,9 +274,3 @@ export const getMaxCopyNumber = (existNameList) => {
   const maxNumber = Math.max(...numbers, 0);
   return maxNumber + 1;
 };
-
-export const resolveGridPositionForComponent = (dimension: number, type: string) => {
-  // const numberOfGrids = type === 'desktop' ? 43 : 12;
-  const numberOfGrids = 43;
-  return Math.round((dimension * numberOfGrids) / 100);
-};
diff --git a/server/src/services/app_import_export.service.ts b/server/src/services/app_import_export.service.ts
index 3922e5f42d..96685a0752 100644
--- a/server/src/services/app_import_export.service.ts
+++ b/server/src/services/app_import_export.service.ts
@@ -18,8 +18,8 @@ import {
   extractMajorVersion,
   isTooljetVersionWithNormalizedAppDefinitionSchem,
   isVersionGreaterThanOrEqual,
-  resolveGridPositionForComponent,
 } from 'src/helpers/utils.helper';
+import { LayoutDimensionUnits, resolveGridPositionForComponent } from 'src/helpers/components.helper';
 import { AppEnvironmentService } from './app_environments.service';
 import { convertAppDefinitionFromSinglePageToMultiPage } from '../../lib/single-page-to-and-from-multipage-definition-conversion';
 import { DataSourceScopes, DataSourceTypes } from 'src/helpers/data_source.constants';
@@ -457,10 +457,10 @@ export class AppImportExportService {
                     newLayout.type = type;
                     newLayout.top = layout.top;
                     newLayout.left =
-                      layout.dimensionUnit !== 'count'
+                      layout.dimensionUnit !== LayoutDimensionUnits.COUNT
                         ? resolveGridPositionForComponent(layout.left, type)
                         : layout.left;
-                    newLayout.dimensionUnit = 'count';
+                    newLayout.dimensionUnit = LayoutDimensionUnits.COUNT;
                     // newLayout.left = layout.left;
                     newLayout.width = layout.width;
                     newLayout.height = layout.height;
@@ -779,10 +779,10 @@ export class AppImportExportService {
               newLayout.type = layout.type;
               newLayout.top = layout.top;
               newLayout.left =
-                layout.dimensionUnit !== 'count'
+                layout.dimensionUnit !== LayoutDimensionUnits.COUNT
                   ? resolveGridPositionForComponent(layout.left, layout.type)
                   : layout.left;
-              newLayout.dimensionUnit = 'count';
+              newLayout.dimensionUnit = LayoutDimensionUnits.COUNT;
               newLayout.width = layout.width;
               newLayout.height = layout.height;
               newLayout.component = savedComponent;
diff --git a/server/src/services/components.service.ts b/server/src/services/components.service.ts
index d2bbcaa448..8bf453fb72 100644
--- a/server/src/services/components.service.ts
+++ b/server/src/services/components.service.ts
@@ -4,11 +4,8 @@ import { EntityManager, Repository } from 'typeorm';
 import { Component } from 'src/entities/component.entity';
 import { Layout } from 'src/entities/layout.entity';
 import { Page } from 'src/entities/page.entity';
-import {
-  dbTransactionForAppVersionAssociationsUpdate,
-  dbTransactionWrap,
-  resolveGridPositionForComponent,
-} from 'src/helpers/utils.helper';
+import { dbTransactionForAppVersionAssociationsUpdate, dbTransactionWrap } from 'src/helpers/utils.helper';
+import { LayoutDimensionUnits, resolveGridPositionForComponent } from 'src/helpers/components.helper';
 
 import { EventsService } from './events_handler.service';
 import { LayoutData } from '@dto/component.dto';
@@ -239,7 +236,7 @@ export class ComponentsService {
       const { type, top, left, width, height, dimensionUnit, id } = layout;
 
       let adjustedLeftValue = left;
-      if (dimensionUnit === 'percent') {
+      if (dimensionUnit === LayoutDimensionUnits.PERCENT) {
         adjustedLeftValue = resolveGridPositionForComponent(left, type);
         manager.update(
           Layout,
@@ -247,7 +244,7 @@ export class ComponentsService {
             id,
           },
           {
-            dimensionUnit: 'count',
+            dimensionUnit: LayoutDimensionUnits.COUNT,
             left: adjustedLeftValue,
           }
         );