Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 00:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

refactor: moved constants to util files

Browse source
This commit is contained in:
Johnson Cherian 2024-03-13 11:16:43 +05:30
parent 10f3d46174
commit b812783a0b
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/src/helpers/components.helper.ts Normal file
View file

@ -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);
};

6
server/src/helpers/utils.helper.ts
View file

@ -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);
};

10
server/src/services/app_import_export.service.ts
View file

@ -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;

11
server/src/services/components.service.ts
View file

@ -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,
}
);