From e6b623eaff28d40ec803bc35992b1f77f5b08c28 Mon Sep 17 00:00:00 2001 From: Andrii Kostenko Date: Fri, 7 Nov 2025 16:08:09 +0000 Subject: [PATCH 1/2] tsconfig workspaces --- tsconfig.json | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tsconfig.json diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 000000000..a6d174e2c --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,34 @@ +{ + "compilerOptions": { + "target": "ES2020", + "lib": ["ES2020"], + "allowJs": true, + "skipLibCheck": true, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "declaration": true, + "declarationMap": true, + "sourceMap": true, + "composite": true, + "incremental": true, + "outDir": "./dist" + }, + "references": [ + { + "path": "./backend" + }, + { + "path": "./rocketadmin-agent" + }, + { + "path": "./shared-code" + } + ], + "files": [] +} From 526f64b8be44a9e738a85b851c8e995cb700c3f5 Mon Sep 17 00:00:00 2001 From: Andrii Kostenko Date: Fri, 7 Nov 2025 16:08:28 +0000 Subject: [PATCH 2/2] tsconfig workspaces --- Dockerfile | 4 +- Dockerfile.rocketadmin-agent | 6 +-- ...est-info-from-table-with-ai-v4.use.case.ts | 8 +-- .../ai/utils/prompt-generating.util.ts | 2 +- .../ai/utils/wrap-query-with-limit.util.ts | 2 +- ...alidate-create-connection-properties-ds.ts | 2 +- .../data-structures/create-connection.ds.ts | 2 +- .../data-structures/found-connections.ds.ts | 2 +- .../data-structures/update-connection.ds.ts | 2 +- .../application/dto/create-connection.dto.ts | 2 +- .../application/dto/created-connection.dto.ts | 2 +- .../connection/connection.controller.ts | 4 +- .../use-cases/create-connection.use.case.ts | 2 +- ...ssions-for-group-in-connection.use.case.ts | 2 +- ...ssions-for-group-in-connection.use.case.ts | 2 +- .../use-cases/test-connection.use.case.ts | 4 +- .../utils/validate-create-connection-data.ts | 2 +- .../utils/validate-create-custom-field-dto.ts | 2 +- .../entities/demo-data/demo-data.service.ts | 2 +- .../shared-jobs/shared-jobs.service.ts | 54 +++++++++++++++++-- .../use-cases/create-action-rule.use.case.ts | 2 +- ...n-rule-with-actions-and-events.use.case.ts | 2 +- .../table-action-activation.service.ts | 2 +- .../utils/validate-table-categories.util.ts | 2 +- .../utils/validate-table-filters-data.util.ts | 2 +- .../create-table-settings.use.case.ts | 6 +-- .../use-cases/find-table-settings.use.case.ts | 2 +- .../update-table-settings.use.case.ts | 6 +-- .../data-structures/found-table-rows.ds.ts | 6 +-- .../src/entities/table/table.controller.ts | 2 +- .../use-cases/add-row-in-table.use.case.ts | 10 ++-- .../bulk-update-rows-in-table.use.case.ts | 2 +- .../delete-row-from-table.use.case.ts | 2 +- .../delete-rows-from-table.use.case.ts | 2 +- .../export-csv-from-table.use.case.ts | 2 +- .../find-tables-in-connection-v2.use.case.ts | 6 +-- .../find-tables-in-connection.use.case.ts | 6 +-- .../get-row-by-primary-key.use.case.ts | 12 ++--- .../use-cases/get-table-rows.use.case.ts | 14 ++--- .../use-cases/get-table-structure.use.case.ts | 10 ++-- .../import-csv-in-table-user.case.ts | 2 +- .../use-cases/update-row-in-table.use.case.ts | 12 ++--- .../utils/convert-binary-data-in-row.util.ts | 2 +- .../convert-hex-data-in-primary-key.util.ts | 2 +- .../utils/convert-hex-data-in-row.util.ts | 2 +- .../utils/find-autocomplete-fields.util.ts | 2 +- .../utils/find-available-fields.utils.ts | 4 +- .../table/utils/find-filtering-fields.util.ts | 2 +- .../table/utils/find-ordering-field.util.ts | 2 +- .../table/utils/find-table-fields.util.ts | 2 +- .../utils/find-tables-in-connection.util.ts | 2 +- .../table/utils/form-full-table-structure.ts | 2 +- .../table/utils/process-found-rows-util.ts | 2 +- .../save-tables-info-in-database.util.ts | 2 +- .../table/utils/validate-table-row.util.ts | 2 +- backend/src/exceptions/text/messages.ts | 2 +- backend/src/helpers/cache/cacher.ts | 6 +-- backend/src/helpers/constants/constants.ts | 2 +- .../src/helpers/is-connection-entity-agent.ts | 2 +- .../string-connection-to-database-parsers.ts | 2 +- .../table-settings-field-validator.ts | 6 +-- .../saas-tests/action-rules-e2e.test.ts | 2 +- .../saas-tests/connection-e2e.test.ts | 2 +- .../saas-tests/table-mssql-agent-e2e.test.ts | 2 +- .../saas-tests/table-mysql-agent-e2e.test.ts | 2 +- .../saas-tests/table-oracle-agent-e2e.test.ts | 2 +- .../table-postgres-agent-e2e.test.ts | 2 +- backend/test/mock.factory.ts | 2 +- backend/test/utils/create-test-table.ts | 2 +- backend/test/utils/drop-test-tables.ts | 2 +- backend/test/utils/get-test-knex.ts | 2 +- backend/tsconfig.json | 11 ++-- frontend/nginx/default.conf | 6 ++- .../src/dal/shared/create-dao.ts | 4 +- .../src/helpers/cli/cli-questions.ts | 2 +- .../src/helpers/validate-connection-data.ts | 2 +- .../src/interfaces/interfaces.ts | 10 ++-- rocketadmin-agent/src/main.ts | 2 +- rocketadmin-agent/src/text/messages.ts | 6 +-- .../command/command-executor-mssql.spec.ts | 2 + .../command/command-executor-postgres.spec.ts | 4 +- 81 files changed, 196 insertions(+), 141 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1eb4e8775..e92ce020b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,13 +35,13 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* WORKDIR /app -COPY package.json .yarnrc.yml yarn.lock /app/ +COPY package.json .yarnrc.yml yarn.lock tsconfig.json /app/ COPY backend /app/backend COPY shared-code /app/shared-code COPY rocketadmin-agent /app/rocketadmin-agent COPY .yarn /app/.yarn RUN yarn install --network-timeout 1000000 --immutable --silent -RUN cd shared-code && ../node_modules/.bin/tsc +RUN ./node_modules/.bin/tsc --build RUN cd backend && yarn run nest build COPY --from=front_builder /app/frontend/dist/dissendium-v0 /var/www/html COPY frontend/nginx/default.conf /etc/nginx/sites-enabled/default diff --git a/Dockerfile.rocketadmin-agent b/Dockerfile.rocketadmin-agent index 583e6c2d0..d7e219246 100644 --- a/Dockerfile.rocketadmin-agent +++ b/Dockerfile.rocketadmin-agent @@ -5,12 +5,12 @@ RUN groupadd -r appuser && useradd -r -g appuser -d /app -s /sbin/nologin appuse WORKDIR /app RUN apt-get update && apt-get install -y netcat-openbsd make gcc g++ python3 libxml2 -COPY package.json .yarnrc.yml yarn.lock /app/ +COPY package.json .yarnrc.yml yarn.lock tsconfig.json /app/ COPY shared-code /app/shared-code COPY rocketadmin-agent /app/rocketadmin-agent COPY .yarn /app/.yarn RUN yarn install --network-timeout 1000000 -RUN cd shared-code && ../node_modules/.bin/tsc +RUN ./node_modules/.bin/tsc --build RUN cd rocketadmin-agent && yarn run nest build RUN chown -R appuser:appuser /app @@ -18,4 +18,4 @@ RUN chown -R appuser:appuser /app USER appuser WORKDIR /app/rocketadmin-agent -CMD ["node", "dist/main.js"] \ No newline at end of file +CMD ["node", "dist/main.js"] diff --git a/backend/src/entities/ai/use-cases/request-info-from-table-with-ai-v4.use.case.ts b/backend/src/entities/ai/use-cases/request-info-from-table-with-ai-v4.use.case.ts index 7431e0818..b3675026f 100644 --- a/backend/src/entities/ai/use-cases/request-info-from-table-with-ai-v4.use.case.ts +++ b/backend/src/entities/ai/use-cases/request-info-from-table-with-ai-v4.use.case.ts @@ -1,6 +1,6 @@ import { BadRequestException, Inject, Injectable, NotFoundException, Scope } from '@nestjs/common'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import OpenAI from 'openai'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; @@ -17,8 +17,8 @@ import { ResponsesModel } from 'openai/resources/index.js'; import { Stream } from 'openai/core/streaming.js'; import { Response } from 'express'; import { ConnectionEntity } from '../../connection/connection.entity.js'; -import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; -import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; +import { IDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; +import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; import { AiResponsesToUserEntity } from '../ai-data-entities/ai-reponses-to-user/ai-responses-to-user.entity.js'; @Injectable({ scope: Scope.REQUEST }) export class RequestInfoFromTableWithAIUseCaseV4 diff --git a/backend/src/entities/ai/utils/prompt-generating.util.ts b/backend/src/entities/ai/utils/prompt-generating.util.ts index 7f14a33f2..2ecd5f422 100644 --- a/backend/src/entities/ai/utils/prompt-generating.util.ts +++ b/backend/src/entities/ai/utils/prompt-generating.util.ts @@ -1,4 +1,4 @@ -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; export function convertDdTypeEnumToReadableString(dataType: ConnectionTypesEnum): string { switch (dataType) { diff --git a/backend/src/entities/ai/utils/wrap-query-with-limit.util.ts b/backend/src/entities/ai/utils/wrap-query-with-limit.util.ts index b7e52d677..167705498 100644 --- a/backend/src/entities/ai/utils/wrap-query-with-limit.util.ts +++ b/backend/src/entities/ai/utils/wrap-query-with-limit.util.ts @@ -1,4 +1,4 @@ -import { ConnectionTypesEnum } from "@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js"; +import { ConnectionTypesEnum } from "@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js"; export function wrapQueryWithLimit(query: string, databaseType: ConnectionTypesEnum): string { const queryWithoutSemicolon = query.replace(/;$/, ''); diff --git a/backend/src/entities/connection-properties/utils/validate-create-connection-properties-ds.ts b/backend/src/entities/connection-properties/utils/validate-create-connection-properties-ds.ts index 59c3f6248..e4d584518 100644 --- a/backend/src/entities/connection-properties/utils/validate-create-connection-properties-ds.ts +++ b/backend/src/entities/connection-properties/utils/validate-create-connection-properties-ds.ts @@ -4,7 +4,7 @@ import { HttpException } from '@nestjs/common/exceptions/http.exception.js'; import { Messages } from '../../../exceptions/text/messages.js'; import { HttpStatus } from '@nestjs/common'; import { ConnectionEntity } from '../../connection/connection.entity.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { validateTableCategories } from '../../table-categories/utils/validate-table-categories.util.js'; export async function validateCreateConnectionPropertiesDs( diff --git a/backend/src/entities/connection/application/data-structures/create-connection.ds.ts b/backend/src/entities/connection/application/data-structures/create-connection.ds.ts index 5f3e65c4d..6443c0c27 100644 --- a/backend/src/entities/connection/application/data-structures/create-connection.ds.ts +++ b/backend/src/entities/connection/application/data-structures/create-connection.ds.ts @@ -1,4 +1,4 @@ -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; export class CreateConnectionDs { connection_parameters: { diff --git a/backend/src/entities/connection/application/data-structures/found-connections.ds.ts b/backend/src/entities/connection/application/data-structures/found-connections.ds.ts index 6bd95ee96..c2a075398 100644 --- a/backend/src/entities/connection/application/data-structures/found-connections.ds.ts +++ b/backend/src/entities/connection/application/data-structures/found-connections.ds.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; import { AccessLevelEnum } from '../../../../enums/index.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { UserEntity } from '../../../user/user.entity.js'; import { FoundGroupDataWithUsersDs } from '../../../group/application/data-sctructures/found-user-groups.ds.js'; import { SimpleFoundUserInfoDs } from '../../../user/dto/found-user.dto.js'; diff --git a/backend/src/entities/connection/application/data-structures/update-connection.ds.ts b/backend/src/entities/connection/application/data-structures/update-connection.ds.ts index 1c11182ab..b6d449f14 100644 --- a/backend/src/entities/connection/application/data-structures/update-connection.ds.ts +++ b/backend/src/entities/connection/application/data-structures/update-connection.ds.ts @@ -1,4 +1,4 @@ -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; export class UpdateConnectionDs { connection_parameters: { diff --git a/backend/src/entities/connection/application/dto/create-connection.dto.ts b/backend/src/entities/connection/application/dto/create-connection.dto.ts index dcda5a68d..39d7b5e7d 100644 --- a/backend/src/entities/connection/application/dto/create-connection.dto.ts +++ b/backend/src/entities/connection/application/dto/create-connection.dto.ts @@ -1,6 +1,6 @@ import { ApiProperty } from '@nestjs/swagger'; import { IsBoolean, IsEnum, IsNumber, IsOptional, IsString, Max, Min } from 'class-validator'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { isTest } from '../../../../helpers/app/is-test.js'; import { ConnectionTypeTestEnum } from '../../../../enums/connection-type.enum.js'; diff --git a/backend/src/entities/connection/application/dto/created-connection.dto.ts b/backend/src/entities/connection/application/dto/created-connection.dto.ts index c0dda9e51..325de4615 100644 --- a/backend/src/entities/connection/application/dto/created-connection.dto.ts +++ b/backend/src/entities/connection/application/dto/created-connection.dto.ts @@ -1,5 +1,5 @@ import { ApiProperty } from '@nestjs/swagger'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { FoundUserDto } from '../../../user/dto/found-user.dto.js'; export class CreatedGroupInConnectionDTO { diff --git a/backend/src/entities/connection/connection.controller.ts b/backend/src/entities/connection/connection.controller.ts index 9e91d312e..d0d76e765 100644 --- a/backend/src/entities/connection/connection.controller.ts +++ b/backend/src/entities/connection/connection.controller.ts @@ -44,8 +44,8 @@ import { UpdateMasterPasswordDs } from './application/data-structures/update-mas import { CreatedConnectionDTO } from './application/dto/created-connection.dto.js'; import { ApiBearerAuth, ApiBody, ApiOperation, ApiQuery, ApiResponse, ApiTags } from '@nestjs/swagger'; -import { TestConnectionResultDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/test-result-connection.ds.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { TestConnectionResultDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/test-result-connection.ds.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { SuccessResponse } from '../../microservices/saas-microservice/data-structures/common-responce.ds.js'; import { FoundGroupResponseDto } from '../group/dto/found-group-response.dto.js'; import { FoundOneConnectionDs } from './application/data-structures/found-one-connection.ds.js'; diff --git a/backend/src/entities/connection/use-cases/create-connection.use.case.ts b/backend/src/entities/connection/use-cases/create-connection.use.case.ts index 0f7e7e34e..5faff9e0a 100644 --- a/backend/src/entities/connection/use-cases/create-connection.use.case.ts +++ b/backend/src/entities/connection/use-cases/create-connection.use.case.ts @@ -1,5 +1,5 @@ import { BadRequestException, Inject, Injectable, InternalServerErrorException, Scope } from '@nestjs/common'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../common/data-injection.tokens.js'; diff --git a/backend/src/entities/connection/use-cases/get-permissions-for-group-in-connection.use.case.ts b/backend/src/entities/connection/use-cases/get-permissions-for-group-in-connection.use.case.ts index 23b753051..f4bf6f84e 100644 --- a/backend/src/entities/connection/use-cases/get-permissions-for-group-in-connection.use.case.ts +++ b/backend/src/entities/connection/use-cases/get-permissions-for-group-in-connection.use.case.ts @@ -2,7 +2,7 @@ import { Inject, Injectable } from '@nestjs/common'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../common/data-injection.tokens.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { TablePermissionDs } from '../../permission/application/data-structures/create-permissions.ds.js'; import { FoundPermissionsInConnectionDs } from '../application/data-structures/found-permissions-in-connection.ds.js'; import { GetPermissionsInConnectionDs } from '../application/data-structures/get-permissions-in-connection.ds.js'; diff --git a/backend/src/entities/connection/use-cases/get-user-permissions-for-group-in-connection.use.case.ts b/backend/src/entities/connection/use-cases/get-user-permissions-for-group-in-connection.use.case.ts index 24d4fd695..294bc30eb 100644 --- a/backend/src/entities/connection/use-cases/get-user-permissions-for-group-in-connection.use.case.ts +++ b/backend/src/entities/connection/use-cases/get-user-permissions-for-group-in-connection.use.case.ts @@ -2,7 +2,7 @@ import { Inject, Injectable } from '@nestjs/common'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../common/data-injection.tokens.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { TablePermissionDs } from '../../permission/application/data-structures/create-permissions.ds.js'; import { FoundPermissionsInConnectionDs } from '../application/data-structures/found-permissions-in-connection.ds.js'; import { GetPermissionsInConnectionDs } from '../application/data-structures/get-permissions-in-connection.ds.js'; diff --git a/backend/src/entities/connection/use-cases/test-connection.use.case.ts b/backend/src/entities/connection/use-cases/test-connection.use.case.ts index 3d085ab69..d26f5dade 100644 --- a/backend/src/entities/connection/use-cases/test-connection.use.case.ts +++ b/backend/src/entities/connection/use-cases/test-connection.use.case.ts @@ -3,7 +3,7 @@ import { getRepository } from 'typeorm'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../common/data-injection.tokens.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { Messages } from '../../../exceptions/text/messages.js'; import { processExceptionMessage } from '../../../exceptions/utils/process-exception-message.js'; import { isConnectionTypeAgent, slackPostMessage } from '../../../helpers/index.js'; @@ -15,7 +15,7 @@ import { isHostAllowed } from '../utils/is-host-allowed.js'; import { ITestConnection } from './use-cases.interfaces.js'; import { processAWSConnection } from '../utils/process-aws-connection.util.js'; import { CreateConnectionDs } from '../application/data-structures/create-connection.ds.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; @Injectable() export class TestConnectionUseCase diff --git a/backend/src/entities/connection/utils/validate-create-connection-data.ts b/backend/src/entities/connection/utils/validate-create-connection-data.ts index 5c3fcba38..e6cf8cdfa 100644 --- a/backend/src/entities/connection/utils/validate-create-connection-data.ts +++ b/backend/src/entities/connection/utils/validate-create-connection-data.ts @@ -1,6 +1,6 @@ import { HttpStatus } from '@nestjs/common'; import { HttpException } from '@nestjs/common/exceptions/http.exception.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import dns from 'dns'; import ipRangeCheck from 'ip-range-check'; import { ConnectionTypeTestEnum } from '../../../enums/connection-type.enum.js'; diff --git a/backend/src/entities/custom-field/utils/validate-create-custom-field-dto.ts b/backend/src/entities/custom-field/utils/validate-create-custom-field-dto.ts index 25364fa3a..ac4a333d7 100644 --- a/backend/src/entities/custom-field/utils/validate-create-custom-field-dto.ts +++ b/backend/src/entities/custom-field/utils/validate-create-custom-field-dto.ts @@ -4,7 +4,7 @@ import { Messages } from '../../../exceptions/text/messages.js'; import { getValuesBetweenCurlies, toPrettyErrorsMsg } from '../../../helpers/index.js'; import { HttpException } from '@nestjs/common/exceptions/http.exception.js'; import { HttpStatus } from '@nestjs/common'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; export async function validateCreateCustomFieldDto( createFieldDto: CreateFieldDto, diff --git a/backend/src/entities/demo-data/demo-data.service.ts b/backend/src/entities/demo-data/demo-data.service.ts index 21c72f120..40176d90a 100644 --- a/backend/src/entities/demo-data/demo-data.service.ts +++ b/backend/src/entities/demo-data/demo-data.service.ts @@ -1,5 +1,5 @@ import { Inject, Injectable } from '@nestjs/common'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { IGlobalDatabaseContext } from '../../common/application/global-database-context.interface.js'; import { BaseType } from '../../common/data-injection.tokens.js'; import { QueryOrderingEnum } from '../../enums/query-ordering.enum.js'; diff --git a/backend/src/entities/shared-jobs/shared-jobs.service.ts b/backend/src/entities/shared-jobs/shared-jobs.service.ts index 7b07ec5c6..dffaa2535 100644 --- a/backend/src/entities/shared-jobs/shared-jobs.service.ts +++ b/backend/src/entities/shared-jobs/shared-jobs.service.ts @@ -1,7 +1,7 @@ import { Inject, Injectable } from '@nestjs/common'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; -import { TableDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table.ds.js'; -import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; +import { TableDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table.ds.js'; +import { IDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; import PQueue from 'p-queue'; import { IGlobalDatabaseContext } from '../../common/application/global-database-context.interface.js'; import { BaseType } from '../../common/data-injection.tokens.js'; @@ -11,7 +11,7 @@ import { buildNewTableSettingsEntity } from '../table-settings/utils/build-new-t import { ConnectionEntity } from '../connection/connection.entity.js'; import { TableWidgetEntity } from '../widget/table-widget.entity.js'; import { WidgetTypeEnum } from '../../enums/widget-type.enum.js'; -import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; +import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; import * as Sentry from '@sentry/node'; @Injectable() export class SharedJobsService { @@ -69,6 +69,7 @@ export class SharedJobsService { rgbColor: new Set(), hexColor: new Set(), hslColor: new Set(), + password: new Map(), }; for (const column of columnsArray) { @@ -107,6 +108,9 @@ export class SharedJobsService { case sampleValues.every((value) => this.isHslColor(value)): widgetColumnNames.hslColor.add(column); break; + case sampleValues.every((value) => this.isValueModularCryptedPassword(value)): + widgetColumnNames.password.set(column, this.getPasswordEncryptionAlgorithm(String(sampleValues[0]))); + break; default: break; } @@ -120,6 +124,7 @@ export class SharedJobsService { const rgbColorColumns = Array.from(widgetColumnNames.rgbColor); const hexColorColumns = Array.from(widgetColumnNames.hexColor); const hslColorColumns = Array.from(widgetColumnNames.hslColor); + const passwordColumns = Array.from(widgetColumnNames.password.keys()); const allColumns = [ telephoneColumns, @@ -130,6 +135,7 @@ export class SharedJobsService { rgbColorColumns, hexColorColumns, hslColorColumns, + passwordColumns, ]; if (allColumns.every((columns) => columns.length === 0)) { return; @@ -228,6 +234,19 @@ export class SharedJobsService { await this._dbContext.tableWidgetsRepository.save(newWidget); } } + if (passwordColumns.length) { + for (const column of passwordColumns) { + const newWidget = new TableWidgetEntity(); + newWidget.field_name = column; + newWidget.widget_type = WidgetTypeEnum.Password; + newWidget.widget_options = JSON.stringify({ + encrypt: true, + algorithm: this.getPasswordEncryptionAlgorithm(passwordColumns[0]), + }); + newWidget.settings = savedTableSettings; + await this._dbContext.tableWidgetsRepository.save(newWidget); + } + } } } @@ -239,6 +258,33 @@ export class SharedJobsService { return phoneRegex.test(value) && ValidationHelper.isValidPhoneNumber(value); } + private isValueModularCryptedPassword(value: unknown): boolean { + if (typeof value !== 'string') { + return false; + } + const modularCryptRegex = /^\$[a-zA-Z0-9]+\$[a-zA-Z0-9./]{0,16}\$[a-zA-Z0-9./]+$/; + return modularCryptRegex.test(value); + } + + private getPasswordEncryptionAlgorithm(sampleValue: string): string { + const match = sampleValue.match(/^\$([a-zA-Z0-9]+)\$/); + switch (match ? match[1] : '') { + case '2a': + case '2b': + case '2y': + return 'bcrypt'; + case 'argon2i': + case 'argon2id': + return 'argon2'; + case '5': + return 'sha256_crypt'; + case '6': + return 'sha512_crypt'; + default: + return 'unknown'; + } + } + private isValueRgbColor(value: unknown): boolean { if (typeof value !== 'string') { return false; diff --git a/backend/src/entities/table-actions/table-action-rules-module/use-cases/create-action-rule.use.case.ts b/backend/src/entities/table-actions/table-action-rules-module/use-cases/create-action-rule.use.case.ts index 268358ef3..8894a2902 100644 --- a/backend/src/entities/table-actions/table-action-rules-module/use-cases/create-action-rule.use.case.ts +++ b/backend/src/entities/table-actions/table-action-rules-module/use-cases/create-action-rule.use.case.ts @@ -7,7 +7,7 @@ import { CreateActionRuleDS, CreateTableActionData } from '../application/data-s import { FoundActionRulesWithActionsAndEventsDTO } from '../application/dto/found-action-rules-with-actions-and-events.dto.js'; import { TableActionMethodEnum } from '../../../../enums/table-action-method-enum.js'; import { Messages } from '../../../../exceptions/text/messages.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { buildEmptyActionRule } from '../utils/build-empty-action-rule.util.js'; import { ValidationHelper } from '../../../../helpers/validators/validation-helper.js'; import { buildTableActionWithRule } from '../../table-actions-module/utils/build-table-action-with-rule.util.js'; diff --git a/backend/src/entities/table-actions/table-action-rules-module/use-cases/update-action-rule-with-actions-and-events.use.case.ts b/backend/src/entities/table-actions/table-action-rules-module/use-cases/update-action-rule-with-actions-and-events.use.case.ts index 844ba0354..8c5f5812b 100644 --- a/backend/src/entities/table-actions/table-action-rules-module/use-cases/update-action-rule-with-actions-and-events.use.case.ts +++ b/backend/src/entities/table-actions/table-action-rules-module/use-cases/update-action-rule-with-actions-and-events.use.case.ts @@ -6,7 +6,7 @@ import { FoundActionRulesWithActionsAndEventsDTO } from '../application/dto/foun import { IGlobalDatabaseContext } from '../../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../../common/data-injection.tokens.js'; import { Messages } from '../../../../exceptions/text/messages.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { TableActionMethodEnum } from '../../../../enums/table-action-method-enum.js'; import { ValidationHelper } from '../../../../helpers/validators/validation-helper.js'; import { CreateTableActionData } from '../application/data-structures/create-action-rules.ds.js'; diff --git a/backend/src/entities/table-actions/table-actions-module/table-action-activation.service.ts b/backend/src/entities/table-actions/table-actions-module/table-action-activation.service.ts index ff2ad6ab3..1e0a68c7f 100644 --- a/backend/src/entities/table-actions/table-actions-module/table-action-activation.service.ts +++ b/backend/src/entities/table-actions/table-actions-module/table-action-activation.service.ts @@ -7,7 +7,7 @@ import { ConnectionEntity } from '../../connection/connection.entity.js'; import { TableActionEventEnum } from '../../../enums/table-action-event-enum.js'; import { TableActionMethodEnum } from '../../../enums/table-action-method-enum.js'; import { OperationResultStatusEnum } from '../../../enums/operation-result-status.enum.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { actionSlackPostMessage } from '../../../helpers/slack/action-slack-post-message.js'; import { Encryptor } from '../../../helpers/encryption/encryptor.js'; import axios, { AxiosResponse } from 'axios'; diff --git a/backend/src/entities/table-categories/utils/validate-table-categories.util.ts b/backend/src/entities/table-categories/utils/validate-table-categories.util.ts index 7201ae2db..f2493fcd4 100644 --- a/backend/src/entities/table-categories/utils/validate-table-categories.util.ts +++ b/backend/src/entities/table-categories/utils/validate-table-categories.util.ts @@ -1,4 +1,4 @@ -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { ConnectionEntity } from '../../connection/connection.entity.js'; import { TableCategoryDS } from '../data-sctructures/create-or-update-table-categories.ds.js'; import { BadRequestException } from '@nestjs/common'; diff --git a/backend/src/entities/table-filters/utils/validate-table-filters-data.util.ts b/backend/src/entities/table-filters/utils/validate-table-filters-data.util.ts index b4a7dcbac..7a5b4a097 100644 --- a/backend/src/entities/table-filters/utils/validate-table-filters-data.util.ts +++ b/backend/src/entities/table-filters/utils/validate-table-filters-data.util.ts @@ -1,4 +1,4 @@ -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { FilterCriteriaEnum } from '../../../enums/filter-criteria.enum.js'; import { Messages } from '../../../exceptions/text/messages.js'; import { validateStringWithEnum } from '../../../helpers/validators/validate-string-with-enum.js'; diff --git a/backend/src/entities/table-settings/use-cases/create-table-settings.use.case.ts b/backend/src/entities/table-settings/use-cases/create-table-settings.use.case.ts index 4a0c5199e..92cd512de 100644 --- a/backend/src/entities/table-settings/use-cases/create-table-settings.use.case.ts +++ b/backend/src/entities/table-settings/use-cases/create-table-settings.use.case.ts @@ -3,15 +3,15 @@ import { HttpException } from '@nestjs/common/exceptions/http.exception.js'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../common/data-injection.tokens.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { toPrettyErrorsMsg } from '../../../helpers/index.js'; import { CreateTableSettingsDs } from '../application/data-structures/create-table-settings.ds.js'; import { FoundTableSettingsDs } from '../application/data-structures/found-table-settings.ds.js'; import { buildFoundTableSettingsDs } from '../utils/build-found-table-settings-ds.js'; import { buildNewTableSettingsEntity } from '../utils/build-new-table-settings-entity.js'; import { ICreateTableSettings } from './use-cases.interface.js'; -import { ValidateTableSettingsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/validate-table-settings.ds.js'; -import { buildValidateTableSettingsDS } from '@rocketadmin/shared-code/dist/src/helpers/data-structures-builders/validate-table-settings-ds.builder.js'; +import { ValidateTableSettingsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/validate-table-settings.ds.js'; +import { buildValidateTableSettingsDS } from '@rocketadmin/shared-code/src/helpers/data-structures-builders/validate-table-settings-ds.builder.js'; @Injectable({ scope: Scope.REQUEST }) export class CreateTableSettingsUseCase diff --git a/backend/src/entities/table-settings/use-cases/find-table-settings.use.case.ts b/backend/src/entities/table-settings/use-cases/find-table-settings.use.case.ts index 0ac916dec..fa2aa23dc 100644 --- a/backend/src/entities/table-settings/use-cases/find-table-settings.use.case.ts +++ b/backend/src/entities/table-settings/use-cases/find-table-settings.use.case.ts @@ -7,7 +7,7 @@ import { FoundTableSettingsDs } from '../application/data-structures/found-table import { buildFoundTableSettingsDs } from '../utils/build-found-table-settings-ds.js'; import { IFindTableSettings } from './use-cases.interface.js'; import { Messages } from '../../../exceptions/text/messages.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { findAvailableFields } from '../../table/utils/find-available-fields.utils.js'; @Injectable() diff --git a/backend/src/entities/table-settings/use-cases/update-table-settings.use.case.ts b/backend/src/entities/table-settings/use-cases/update-table-settings.use.case.ts index debf189c1..1165ec30b 100644 --- a/backend/src/entities/table-settings/use-cases/update-table-settings.use.case.ts +++ b/backend/src/entities/table-settings/use-cases/update-table-settings.use.case.ts @@ -3,7 +3,7 @@ import { HttpException } from '@nestjs/common/exceptions/http.exception.js'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../common/data-injection.tokens.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { Messages } from '../../../exceptions/text/messages.js'; import { toPrettyErrorsMsg } from '../../../helpers/index.js'; import { CreateTableSettingsDs } from '../application/data-structures/create-table-settings.ds.js'; @@ -11,8 +11,8 @@ import { FoundTableSettingsDs } from '../application/data-structures/found-table import { buildFoundTableSettingsDs } from '../utils/build-found-table-settings-ds.js'; import { buildNewTableSettingsEntity } from '../utils/build-new-table-settings-entity.js'; import { IUpdateTableSettings } from './use-cases.interface.js'; -import { ValidateTableSettingsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/validate-table-settings.ds.js'; -import { buildValidateTableSettingsDS } from '@rocketadmin/shared-code/dist/src/helpers/data-structures-builders/validate-table-settings-ds.builder.js'; +import { ValidateTableSettingsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/validate-table-settings.ds.js'; +import { buildValidateTableSettingsDS } from '@rocketadmin/shared-code/src/helpers/data-structures-builders/validate-table-settings-ds.builder.js'; @Injectable({ scope: Scope.REQUEST }) export class UpdateTableSettingsUseCase diff --git a/backend/src/entities/table/application/data-structures/found-table-rows.ds.ts b/backend/src/entities/table/application/data-structures/found-table-rows.ds.ts index 317f7ba4b..04993e4b8 100644 --- a/backend/src/entities/table/application/data-structures/found-table-rows.ds.ts +++ b/backend/src/entities/table/application/data-structures/found-table-rows.ds.ts @@ -1,9 +1,9 @@ import { FilterCriteriaEnum, QueryOrderingEnum } from '../../../../enums/index.js'; import { FullTableStructureDs } from './found-table-structure.ds.js'; import { TableWidgetEntity } from '../../../widget/table-widget.entity.js'; -import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; -import { PrimaryKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/primary-key.ds.js'; -import { RowsPaginationDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/rows-pagination.ds.js'; +import { ForeignKeyDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; +import { PrimaryKeyDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/primary-key.ds.js'; +import { RowsPaginationDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/rows-pagination.ds.js'; import { ApiProperty } from '@nestjs/swagger'; import { TablePermissionDs } from '../../../permission/application/data-structures/create-permissions.ds.js'; import { FoundActionEventDTO } from '../../../table-actions/table-action-rules-module/application/dto/found-action-rules-with-actions-and-events.dto.js'; diff --git a/backend/src/entities/table/table.controller.ts b/backend/src/entities/table/table.controller.ts index 09c1e1b98..f55b424b3 100644 --- a/backend/src/entities/table/table.controller.ts +++ b/backend/src/entities/table/table.controller.ts @@ -18,7 +18,7 @@ import { } from '@nestjs/common'; import { FileInterceptor } from '@nestjs/platform-express'; import { ApiBearerAuth, ApiBody, ApiOperation, ApiProperty, ApiQuery, ApiResponse, ApiTags } from '@nestjs/swagger'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { IGlobalDatabaseContext } from '../../common/application/global-database-context.interface.js'; import { BaseType, UseCaseType } from '../../common/data-injection.tokens.js'; import { MasterPassword, QueryTableName, SlugUuid, UserId } from '../../decorators/index.js'; diff --git a/backend/src/entities/table/use-cases/add-row-in-table.use.case.ts b/backend/src/entities/table/use-cases/add-row-in-table.use.case.ts index 37d9d30cf..84a48cc07 100644 --- a/backend/src/entities/table/use-cases/add-row-in-table.use.case.ts +++ b/backend/src/entities/table/use-cases/add-row-in-table.use.case.ts @@ -1,9 +1,9 @@ import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; -import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js'; -import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; -import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; -import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; +import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js'; +import { ForeignKeyDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; +import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; +import { IDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../common/data-injection.tokens.js'; diff --git a/backend/src/entities/table/use-cases/bulk-update-rows-in-table.use.case.ts b/backend/src/entities/table/use-cases/bulk-update-rows-in-table.use.case.ts index 3a54783f9..5c48aee09 100644 --- a/backend/src/entities/table/use-cases/bulk-update-rows-in-table.use.case.ts +++ b/backend/src/entities/table/use-cases/bulk-update-rows-in-table.use.case.ts @@ -7,7 +7,7 @@ import { IGlobalDatabaseContext } from '../../../common/application/global-datab import { BaseType } from '../../../common/data-injection.tokens.js'; import { TableLogsService } from '../../table-logs/table-logs.service.js'; import { Messages } from '../../../exceptions/text/messages.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { isConnectionTypeAgent } from '../../../helpers/is-connection-entity-agent.js'; import { convertHexDataInPrimaryKeyUtil } from '../utils/convert-hex-data-in-primary-key.util.js'; import { UnknownSQLException } from '../../../exceptions/custom-exceptions/unknown-sql-exception.js'; diff --git a/backend/src/entities/table/use-cases/delete-row-from-table.use.case.ts b/backend/src/entities/table/use-cases/delete-row-from-table.use.case.ts index ce0af758f..ee2370ec9 100644 --- a/backend/src/entities/table/use-cases/delete-row-from-table.use.case.ts +++ b/backend/src/entities/table/use-cases/delete-row-from-table.use.case.ts @@ -2,7 +2,7 @@ import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../common/data-injection.tokens.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { AmplitudeEventTypeEnum, LogOperationTypeEnum, OperationResultStatusEnum } from '../../../enums/index.js'; import { Messages } from '../../../exceptions/text/messages.js'; import { compareArrayElements, isConnectionTypeAgent } from '../../../helpers/index.js'; diff --git a/backend/src/entities/table/use-cases/delete-rows-from-table.use.case.ts b/backend/src/entities/table/use-cases/delete-rows-from-table.use.case.ts index abe8d45d0..cec3993a7 100644 --- a/backend/src/entities/table/use-cases/delete-rows-from-table.use.case.ts +++ b/backend/src/entities/table/use-cases/delete-rows-from-table.use.case.ts @@ -1,5 +1,5 @@ import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../common/data-injection.tokens.js'; diff --git a/backend/src/entities/table/use-cases/export-csv-from-table.use.case.ts b/backend/src/entities/table/use-cases/export-csv-from-table.use.case.ts index cc702d063..fce47e794 100644 --- a/backend/src/entities/table/use-cases/export-csv-from-table.use.case.ts +++ b/backend/src/entities/table/use-cases/export-csv-from-table.use.case.ts @@ -7,7 +7,7 @@ import { IExportCSVFromTable } from './table-use-cases.interface.js'; import { Messages } from '../../../exceptions/text/messages.js'; import { findFilteringFieldsUtil, parseFilteringFieldsFromBodyData } from '../utils/find-filtering-fields.util.js'; import { findOrderingFieldUtil } from '../utils/find-ordering-field.util.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { isConnectionTypeAgent } from '../../../helpers/is-connection-entity-agent.js'; import { hexToBinary, isBinary } from '../../../helpers/binary-to-hex.js'; import { isHexString } from '../utils/is-hex-string.js'; diff --git a/backend/src/entities/table/use-cases/find-tables-in-connection-v2.use.case.ts b/backend/src/entities/table/use-cases/find-tables-in-connection-v2.use.case.ts index 3184bc34e..68e656dd7 100644 --- a/backend/src/entities/table/use-cases/find-tables-in-connection-v2.use.case.ts +++ b/backend/src/entities/table/use-cases/find-tables-in-connection-v2.use.case.ts @@ -1,7 +1,7 @@ import { HttpException, HttpStatus, Inject, Injectable, Scope } from '@nestjs/common'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; -import { TableDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table.ds.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table.ds.js'; import * as Sentry from '@sentry/node'; import PQueue from 'p-queue'; import AbstractUseCase from '../../../common/abstract-use.case.js'; diff --git a/backend/src/entities/table/use-cases/find-tables-in-connection.use.case.ts b/backend/src/entities/table/use-cases/find-tables-in-connection.use.case.ts index d603434cf..c827ee3a1 100644 --- a/backend/src/entities/table/use-cases/find-tables-in-connection.use.case.ts +++ b/backend/src/entities/table/use-cases/find-tables-in-connection.use.case.ts @@ -1,7 +1,7 @@ import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; -import { TableDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table.ds.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table.ds.js'; import * as Sentry from '@sentry/node'; import PQueue from 'p-queue'; import AbstractUseCase from '../../../common/abstract-use.case.js'; diff --git a/backend/src/entities/table/use-cases/get-row-by-primary-key.use.case.ts b/backend/src/entities/table/use-cases/get-row-by-primary-key.use.case.ts index e349e3aeb..5ca12fce4 100644 --- a/backend/src/entities/table/use-cases/get-row-by-primary-key.use.case.ts +++ b/backend/src/entities/table/use-cases/get-row-by-primary-key.use.case.ts @@ -3,7 +3,7 @@ import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../common/data-injection.tokens.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { WidgetTypeEnum } from '../../../enums/index.js'; import { Messages } from '../../../exceptions/text/messages.js'; import { compareArrayElements, isConnectionTypeAgent } from '../../../helpers/index.js'; @@ -14,13 +14,13 @@ import { convertHexDataInPrimaryKeyUtil } from '../utils/convert-hex-data-in-pri import { formFullTableStructure } from '../utils/form-full-table-structure.js'; import { removePasswordsFromRowsUtil } from '../utils/remove-password-from-row.util.js'; import { IGetRowByPrimaryKey } from './table-use-cases.interface.js'; -import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; -import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; -import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js'; -import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; +import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; +import { IDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; +import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js'; +import { ForeignKeyDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; import { UnknownSQLException } from '../../../exceptions/custom-exceptions/unknown-sql-exception.js'; import { ExceptionOperations } from '../../../exceptions/custom-exceptions/exception-operation.js'; -import { ReferencedTableNamesAndColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/referenced-table-names-columns.ds.js'; +import { ReferencedTableNamesAndColumnsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/referenced-table-names-columns.ds.js'; import JSON5 from 'json5'; import { buildActionEventDto } from '../../table-actions/table-action-rules-module/utils/build-found-action-event-dto.util.js'; import { NonAvailableInFreePlanException } from '../../../exceptions/custom-exceptions/non-available-in-free-plan-exception.js'; diff --git a/backend/src/entities/table/use-cases/get-table-rows.use.case.ts b/backend/src/entities/table/use-cases/get-table-rows.use.case.ts index 07bcf6675..9ecfe9874 100644 --- a/backend/src/entities/table/use-cases/get-table-rows.use.case.ts +++ b/backend/src/entities/table/use-cases/get-table-rows.use.case.ts @@ -1,10 +1,10 @@ import { BadRequestException, HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; -import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js'; -import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; -import { TableSettingsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-settings.ds.js'; -import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; -import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; +import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js'; +import { ForeignKeyDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; +import { TableSettingsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-settings.ds.js'; +import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; +import { IDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; import { FoundRowsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/found-rows.ds.js'; import Sentry from '@sentry/minimal'; import JSON5 from 'json5'; @@ -39,7 +39,7 @@ import { formFullTableStructure } from '../utils/form-full-table-structure.js'; import { isHexString } from '../utils/is-hex-string.js'; import { processRowsUtil } from '../utils/process-found-rows-util.js'; import { IGetTableRows } from './table-use-cases.interface.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { findAvailableFields } from '../utils/find-available-fields.utils.js'; @Injectable() diff --git a/backend/src/entities/table/use-cases/get-table-structure.use.case.ts b/backend/src/entities/table/use-cases/get-table-structure.use.case.ts index 784173c68..47409af07 100644 --- a/backend/src/entities/table/use-cases/get-table-structure.use.case.ts +++ b/backend/src/entities/table/use-cases/get-table-structure.use.case.ts @@ -2,7 +2,7 @@ import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; import { BaseType } from '../../../common/data-injection.tokens.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { WidgetTypeEnum } from '../../../enums/index.js'; import { Messages } from '../../../exceptions/text/messages.js'; import { isConnectionTypeAgent } from '../../../helpers/index.js'; @@ -11,10 +11,10 @@ import { GetTableStructureDs } from '../application/data-structures/get-table-st import { ForeignKeyDSInfo, TableStructureDs } from '../table-datastructures.js'; import { formFullTableStructure } from '../utils/form-full-table-structure.js'; import { IGetTableStructure } from './table-use-cases.interface.js'; -import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; -import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; -import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js'; -import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; +import { IDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; +import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; +import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js'; +import { ForeignKeyDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; import { UnknownSQLException } from '../../../exceptions/custom-exceptions/unknown-sql-exception.js'; import { ExceptionOperations } from '../../../exceptions/custom-exceptions/exception-operation.js'; import JSON5 from 'json5'; diff --git a/backend/src/entities/table/use-cases/import-csv-in-table-user.case.ts b/backend/src/entities/table/use-cases/import-csv-in-table-user.case.ts index 538f0c770..21d5ae550 100644 --- a/backend/src/entities/table/use-cases/import-csv-in-table-user.case.ts +++ b/backend/src/entities/table/use-cases/import-csv-in-table-user.case.ts @@ -5,7 +5,7 @@ import { IGlobalDatabaseContext } from '../../../common/application/global-datab import { BaseType } from '../../../common/data-injection.tokens.js'; import { ImportCSVInTableDs } from '../application/data-structures/import-scv-in-table.ds.js'; import { Messages } from '../../../exceptions/text/messages.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { isConnectionTypeAgent } from '../../../helpers/is-connection-entity-agent.js'; import { NonAvailableInFreePlanException } from '../../../exceptions/custom-exceptions/non-available-in-free-plan-exception.js'; diff --git a/backend/src/entities/table/use-cases/update-row-in-table.use.case.ts b/backend/src/entities/table/use-cases/update-row-in-table.use.case.ts index e5a45e362..6bac26cbd 100644 --- a/backend/src/entities/table/use-cases/update-row-in-table.use.case.ts +++ b/backend/src/entities/table/use-cases/update-row-in-table.use.case.ts @@ -1,11 +1,11 @@ /* eslint-disable prefer-const */ import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; -import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js'; -import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; -import { ReferencedTableNamesAndColumnsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/referenced-table-names-columns.ds.js'; -import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; -import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; +import { ForeignKeyWithAutocompleteColumnsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key-with-autocomplete-columns.ds.js'; +import { ForeignKeyDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; +import { ReferencedTableNamesAndColumnsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/referenced-table-names-columns.ds.js'; +import { IDataAccessObjectAgent } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object-agent.interface.js'; +import { IDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; import JSON5 from 'json5'; import AbstractUseCase from '../../../common/abstract-use.case.js'; import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js'; diff --git a/backend/src/entities/table/utils/convert-binary-data-in-row.util.ts b/backend/src/entities/table/utils/convert-binary-data-in-row.util.ts index 31ed990d1..4e38748e8 100644 --- a/backend/src/entities/table/utils/convert-binary-data-in-row.util.ts +++ b/backend/src/entities/table/utils/convert-binary-data-in-row.util.ts @@ -1,4 +1,4 @@ -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; import { binaryToHex, isBinary } from '../../../helpers/index.js'; export function convertBinaryDataInRowUtil( diff --git a/backend/src/entities/table/utils/convert-hex-data-in-primary-key.util.ts b/backend/src/entities/table/utils/convert-hex-data-in-primary-key.util.ts index bdbdc90b4..a9a563d6e 100644 --- a/backend/src/entities/table/utils/convert-hex-data-in-primary-key.util.ts +++ b/backend/src/entities/table/utils/convert-hex-data-in-primary-key.util.ts @@ -1,6 +1,6 @@ import { isBinary } from '../../../helpers/index.js'; import { hexToBinary } from '../../../helpers/binary-to-hex.js'; -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; export function convertHexDataInPrimaryKeyUtil( primaryKey: Record, diff --git a/backend/src/entities/table/utils/convert-hex-data-in-row.util.ts b/backend/src/entities/table/utils/convert-hex-data-in-row.util.ts index 3176ff971..7c8f1b0d5 100644 --- a/backend/src/entities/table/utils/convert-hex-data-in-row.util.ts +++ b/backend/src/entities/table/utils/convert-hex-data-in-row.util.ts @@ -1,6 +1,6 @@ import { isBinary } from '../../../helpers/index.js'; import { hexToBinary } from '../../../helpers/binary-to-hex.js'; -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; export function convertHexDataInRowUtil( row: Record, diff --git a/backend/src/entities/table/utils/find-autocomplete-fields.util.ts b/backend/src/entities/table/utils/find-autocomplete-fields.util.ts index 69bf36a39..f333c9d50 100644 --- a/backend/src/entities/table/utils/find-autocomplete-fields.util.ts +++ b/backend/src/entities/table/utils/find-autocomplete-fields.util.ts @@ -2,7 +2,7 @@ import { TableSettingsEntity } from '../../table-settings/table-settings.entity. import { AutocompleteFieldsDs } from '../application/data-structures/found-table-rows.ds.js'; import { HttpException, HttpStatus } from '@nestjs/common'; import { Messages } from '../../../exceptions/text/messages.js'; -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; export function findAutocompleteFieldsUtil( query: Record, diff --git a/backend/src/entities/table/utils/find-available-fields.utils.ts b/backend/src/entities/table/utils/find-available-fields.utils.ts index 525e7cba6..7cbe6a489 100644 --- a/backend/src/entities/table/utils/find-available-fields.utils.ts +++ b/backend/src/entities/table/utils/find-available-fields.utils.ts @@ -1,5 +1,5 @@ -import { TableSettingsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-settings.ds.js'; -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableSettingsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-settings.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; import { isObjectEmpty } from '../../../helpers/is-object-empty.js'; export function findAvailableFields(settings: TableSettingsDS, tableStructure: Array): Array { diff --git a/backend/src/entities/table/utils/find-filtering-fields.util.ts b/backend/src/entities/table/utils/find-filtering-fields.util.ts index 428934651..4653e9632 100644 --- a/backend/src/entities/table/utils/find-filtering-fields.util.ts +++ b/backend/src/entities/table/utils/find-filtering-fields.util.ts @@ -1,7 +1,7 @@ /* eslint-disable security/detect-object-injection */ import { FilteringFieldsDs } from '../application/data-structures/found-table-rows.ds.js'; import { FilterCriteriaEnum } from '../../../enums/index.js'; -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; import { validateStringWithEnum } from '../../../helpers/validators/validate-string-with-enum.js'; import { isObjectPropertyExists } from '../../../helpers/validators/is-object-property-exists-validator.js'; diff --git a/backend/src/entities/table/utils/find-ordering-field.util.ts b/backend/src/entities/table/utils/find-ordering-field.util.ts index bb8c012ea..319be26c9 100644 --- a/backend/src/entities/table/utils/find-ordering-field.util.ts +++ b/backend/src/entities/table/utils/find-ordering-field.util.ts @@ -3,7 +3,7 @@ import { OrderingFiledDs } from '../application/data-structures/found-table-rows import { HttpException, HttpStatus } from '@nestjs/common'; import { Messages } from '../../../exceptions/text/messages.js'; import { QueryOrderingEnum } from '../../../enums/index.js'; -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; import { isObjectPropertyExists } from '../../../helpers/validators/is-object-property-exists-validator.js'; export function findOrderingFieldUtil( diff --git a/backend/src/entities/table/utils/find-table-fields.util.ts b/backend/src/entities/table/utils/find-table-fields.util.ts index ce71de419..2ca7661bd 100644 --- a/backend/src/entities/table/utils/find-table-fields.util.ts +++ b/backend/src/entities/table/utils/find-table-fields.util.ts @@ -1,5 +1,5 @@ import { ConnectionEntity } from '../../connection/connection.entity.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; export async function findTableFieldsUtil( connection: ConnectionEntity, diff --git a/backend/src/entities/table/utils/find-tables-in-connection.util.ts b/backend/src/entities/table/utils/find-tables-in-connection.util.ts index 354ab4a95..4314a4173 100644 --- a/backend/src/entities/table/utils/find-tables-in-connection.util.ts +++ b/backend/src/entities/table/utils/find-tables-in-connection.util.ts @@ -1,5 +1,5 @@ import { ConnectionEntity } from '../../connection/connection.entity.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; export async function findTablesInConnectionUtil( connection: ConnectionEntity, diff --git a/backend/src/entities/table/utils/form-full-table-structure.ts b/backend/src/entities/table/utils/form-full-table-structure.ts index bad9da8c8..701512862 100644 --- a/backend/src/entities/table/utils/form-full-table-structure.ts +++ b/backend/src/entities/table/utils/form-full-table-structure.ts @@ -1,7 +1,7 @@ import { TableSettingsEntity } from '../../table-settings/table-settings.entity.js'; import { FullTableStructureDs } from '../application/data-structures/found-table-structure.ds.js'; import { checkFieldAutoincrement } from '../../../helpers/index.js'; -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; export function formFullTableStructure( structure: Array, diff --git a/backend/src/entities/table/utils/process-found-rows-util.ts b/backend/src/entities/table/utils/process-found-rows-util.ts index f29f6688f..bcb375bd7 100644 --- a/backend/src/entities/table/utils/process-found-rows-util.ts +++ b/backend/src/entities/table/utils/process-found-rows-util.ts @@ -1,4 +1,4 @@ -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; import { FoundRowsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/found-rows.ds.js'; import { WidgetTypeEnum } from '../../../enums/widget-type.enum.js'; import { isBinary, binaryToHex } from '../../../helpers/binary-to-hex.js'; diff --git a/backend/src/entities/table/utils/save-tables-info-in-database.util.ts b/backend/src/entities/table/utils/save-tables-info-in-database.util.ts index 226ab1545..9c47aa71e 100644 --- a/backend/src/entities/table/utils/save-tables-info-in-database.util.ts +++ b/backend/src/entities/table/utils/save-tables-info-in-database.util.ts @@ -1,4 +1,4 @@ -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; import { ConnectionEntity } from '../../connection/connection.entity.js'; import { TableFieldInfoEntity } from '../../table-field-info/table-field-info.entity.js'; import { TableInfoEntity } from '../../table-info/table-info.entity.js'; diff --git a/backend/src/entities/table/utils/validate-table-row.util.ts b/backend/src/entities/table/utils/validate-table-row.util.ts index ff5c96333..55bc7f98b 100644 --- a/backend/src/entities/table/utils/validate-table-row.util.ts +++ b/backend/src/entities/table/utils/validate-table-row.util.ts @@ -1,4 +1,4 @@ -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; import { Messages } from '../../../exceptions/text/messages.js'; export function validateTableRowUtil(row: Record, structure: Array): Array { diff --git a/backend/src/exceptions/text/messages.ts b/backend/src/exceptions/text/messages.ts index d6cb4b471..c8475e20c 100644 --- a/backend/src/exceptions/text/messages.ts +++ b/backend/src/exceptions/text/messages.ts @@ -7,7 +7,7 @@ import { WidgetTypeEnum, } from '../../enums/index.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { TableActionEventEnum } from '../../enums/table-action-event-enum.js'; import { TableActionMethodEnum } from '../../enums/table-action-method-enum.js'; import { UserRoleEnum } from '../../entities/user/enums/user-role.enum.js'; diff --git a/backend/src/helpers/cache/cacher.ts b/backend/src/helpers/cache/cacher.ts index 9392340da..0b08ec908 100644 --- a/backend/src/helpers/cache/cacher.ts +++ b/backend/src/helpers/cache/cacher.ts @@ -1,6 +1,6 @@ -import { ForeignKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; -import { PrimaryKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/primary-key.ds.js'; -import { TableStructureDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-structure.ds.js'; +import { ForeignKeyDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/foreign-key.ds.js'; +import { PrimaryKeyDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/primary-key.ds.js'; +import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; import { Knex } from 'knex'; import { LRUCache } from 'lru-cache'; import { ConnectionEntity } from '../../entities/connection/connection.entity.js'; diff --git a/backend/src/helpers/constants/constants.ts b/backend/src/helpers/constants/constants.ts index 8e2ed02b8..038d0d0f0 100644 --- a/backend/src/helpers/constants/constants.ts +++ b/backend/src/helpers/constants/constants.ts @@ -1,4 +1,4 @@ -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { CreateConnectionDto } from '../../entities/connection/application/dto/create-connection.dto.js'; import { Knex } from 'knex'; import { getProcessVariable } from '../get-process-variable.js'; diff --git a/backend/src/helpers/is-connection-entity-agent.ts b/backend/src/helpers/is-connection-entity-agent.ts index d629102d4..2f97ab6ea 100644 --- a/backend/src/helpers/is-connection-entity-agent.ts +++ b/backend/src/helpers/is-connection-entity-agent.ts @@ -1,5 +1,5 @@ import { ConnectionEntity } from '../entities/connection/connection.entity.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { ConnectionTypeTestEnum } from '../enums/connection-type.enum.js'; import { CreateConnectionDto } from '../entities/connection/application/dto/create-connection.dto.js'; diff --git a/backend/src/helpers/parsers/string-connection-to-database-parsers.ts b/backend/src/helpers/parsers/string-connection-to-database-parsers.ts index 8e5bf8d87..2f6a55a28 100644 --- a/backend/src/helpers/parsers/string-connection-to-database-parsers.ts +++ b/backend/src/helpers/parsers/string-connection-to-database-parsers.ts @@ -1,4 +1,4 @@ -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { CreateConnectionDto } from '../../entities/connection/application/dto/create-connection.dto.js'; // postgresql://user:password@localhost:5432/mydatabase?ssh=true&privateSSHKey=key&sshHost=sshHost&sshPort=22&sshUsername=sshUser&ssl=true&cert=cert diff --git a/backend/src/helpers/validators/table-settings-field-validator.ts b/backend/src/helpers/validators/table-settings-field-validator.ts index f030fb6b4..30e856e28 100644 --- a/backend/src/helpers/validators/table-settings-field-validator.ts +++ b/backend/src/helpers/validators/table-settings-field-validator.ts @@ -1,4 +1,4 @@ -import { PrimaryKeyDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/primary-key.ds.js'; +import { PrimaryKeyDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/primary-key.ds.js'; import { CreateTableSettingsDto } from '../../entities/table-settings/dto/index.js'; import { QueryOrderingEnum } from '../../enums/index.js'; import { Messages } from '../../exceptions/text/messages.js'; @@ -9,7 +9,7 @@ export function tableSettingsFieldValidator( primaryColumns: Array, settings: CreateTableSettingsDto, ): Array { - + const errorMessages = []; if (isObjectEmpty(settings)) { return errorMessages; @@ -149,5 +149,5 @@ export function tableSettingsFieldValidator( } return errorMessages; - + } diff --git a/backend/test/ava-tests/saas-tests/action-rules-e2e.test.ts b/backend/test/ava-tests/saas-tests/action-rules-e2e.test.ts index 73b99b503..ffd1c241a 100644 --- a/backend/test/ava-tests/saas-tests/action-rules-e2e.test.ts +++ b/backend/test/ava-tests/saas-tests/action-rules-e2e.test.ts @@ -28,7 +28,7 @@ import { UpdateTableActionRuleBodyDTO } from '../../../src/entities/table-action import { ActivatedTableActionsDTO } from '../../../src/entities/table-actions/table-action-rules-module/application/dto/activated-table-actions.dto.js'; import nock from 'nock'; import { CreateConnectionDto } from '../../../src/entities/connection/application/dto/create-connection.dto.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { FoundTableActionRulesRoDTO } from '../../../src/entities/table-actions/table-action-rules-module/application/dto/found-table-action-rules.ro.dto.js'; import { WinstonLogger } from '../../../src/entities/logging/winston-logger.js'; diff --git a/backend/test/ava-tests/saas-tests/connection-e2e.test.ts b/backend/test/ava-tests/saas-tests/connection-e2e.test.ts index 0e8afe3c4..65c0161ba 100644 --- a/backend/test/ava-tests/saas-tests/connection-e2e.test.ts +++ b/backend/test/ava-tests/saas-tests/connection-e2e.test.ts @@ -2,7 +2,7 @@ import { faker } from '@faker-js/faker'; import { INestApplication, ValidationPipe } from '@nestjs/common'; import { Test } from '@nestjs/testing'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import test from 'ava'; import { ValidationError } from 'class-validator'; import cookieParser from 'cookie-parser'; diff --git a/backend/test/ava-tests/saas-tests/table-mssql-agent-e2e.test.ts b/backend/test/ava-tests/saas-tests/table-mssql-agent-e2e.test.ts index 93cc854df..8357f8902 100644 --- a/backend/test/ava-tests/saas-tests/table-mssql-agent-e2e.test.ts +++ b/backend/test/ava-tests/saas-tests/table-mssql-agent-e2e.test.ts @@ -20,7 +20,7 @@ import { registerUserAndReturnUserInfo } from '../../utils/register-user-and-ret import { TestUtils } from '../../utils/test.utils.js'; import knex from 'knex'; import { getRandomConstraintName, getRandomTestTableName } from '../../utils/get-random-test-table-name.js'; -import { ERROR_MESSAGES } from '@rocketadmin/shared-code/dist/src/helpers/errors/error-messages.js'; +import { ERROR_MESSAGES } from '@rocketadmin/shared-code/src/helpers/errors/error-messages.js'; import { ErrorsMessages } from '../../../src/exceptions/custom-exceptions/messages/custom-errors-messages.js'; import { ValidationException } from '../../../src/exceptions/custom-exceptions/validation-exception.js'; import { ValidationError } from 'class-validator'; diff --git a/backend/test/ava-tests/saas-tests/table-mysql-agent-e2e.test.ts b/backend/test/ava-tests/saas-tests/table-mysql-agent-e2e.test.ts index 6399dcdaf..3e71e2247 100644 --- a/backend/test/ava-tests/saas-tests/table-mysql-agent-e2e.test.ts +++ b/backend/test/ava-tests/saas-tests/table-mysql-agent-e2e.test.ts @@ -20,7 +20,7 @@ import { registerUserAndReturnUserInfo } from '../../utils/register-user-and-ret import { TestUtils } from '../../utils/test.utils.js'; import knex from 'knex'; import { getRandomConstraintName, getRandomTestTableName } from '../../utils/get-random-test-table-name.js'; -import { ERROR_MESSAGES } from '@rocketadmin/shared-code/dist/src/helpers/errors/error-messages.js'; +import { ERROR_MESSAGES } from '@rocketadmin/shared-code/src/helpers/errors/error-messages.js'; import { ErrorsMessages } from '../../../src/exceptions/custom-exceptions/messages/custom-errors-messages.js'; import { ValidationException } from '../../../src/exceptions/custom-exceptions/validation-exception.js'; import { ValidationError } from 'class-validator'; diff --git a/backend/test/ava-tests/saas-tests/table-oracle-agent-e2e.test.ts b/backend/test/ava-tests/saas-tests/table-oracle-agent-e2e.test.ts index c1cca7aa0..4116e4875 100644 --- a/backend/test/ava-tests/saas-tests/table-oracle-agent-e2e.test.ts +++ b/backend/test/ava-tests/saas-tests/table-oracle-agent-e2e.test.ts @@ -20,7 +20,7 @@ import { registerUserAndReturnUserInfo } from '../../utils/register-user-and-ret import { TestUtils } from '../../utils/test.utils.js'; import knex from 'knex'; import { getRandomConstraintName, getRandomTestTableName } from '../../utils/get-random-test-table-name.js'; -import { ERROR_MESSAGES } from '@rocketadmin/shared-code/dist/src/helpers/errors/error-messages.js'; +import { ERROR_MESSAGES } from '@rocketadmin/shared-code/src/helpers/errors/error-messages.js'; import { ErrorsMessages } from '../../../src/exceptions/custom-exceptions/messages/custom-errors-messages.js'; import { ValidationException } from '../../../src/exceptions/custom-exceptions/validation-exception.js'; import { ValidationError } from 'class-validator'; diff --git a/backend/test/ava-tests/saas-tests/table-postgres-agent-e2e.test.ts b/backend/test/ava-tests/saas-tests/table-postgres-agent-e2e.test.ts index c3d867504..e43921c85 100644 --- a/backend/test/ava-tests/saas-tests/table-postgres-agent-e2e.test.ts +++ b/backend/test/ava-tests/saas-tests/table-postgres-agent-e2e.test.ts @@ -20,7 +20,7 @@ import { registerUserAndReturnUserInfo } from '../../utils/register-user-and-ret import { TestUtils } from '../../utils/test.utils.js'; import knex from 'knex'; import { getRandomConstraintName, getRandomTestTableName } from '../../utils/get-random-test-table-name.js'; -import { ERROR_MESSAGES } from '@rocketadmin/shared-code/dist/src/helpers/errors/error-messages.js'; +import { ERROR_MESSAGES } from '@rocketadmin/shared-code/src/helpers/errors/error-messages.js'; import { ErrorsMessages } from '../../../src/exceptions/custom-exceptions/messages/custom-errors-messages.js'; import { ValidationException } from '../../../src/exceptions/custom-exceptions/validation-exception.js'; import { ValidationError } from 'class-validator'; diff --git a/backend/test/mock.factory.ts b/backend/test/mock.factory.ts index 76de3d559..f63bb8d2c 100644 --- a/backend/test/mock.factory.ts +++ b/backend/test/mock.factory.ts @@ -10,7 +10,7 @@ import { TestConstants } from './mocks/test-constants.js'; import json5 from 'json5'; import { ConnectionTypeTestEnum } from '../src/enums/connection-type.enum.js'; import { CreateConnectionDto } from '../src/entities/connection/application/dto/create-connection.dto.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { CreateTableActionDTO } from '../src/entities/table-actions/table-actions-module/dto/create-table-action.dto.js'; export class MockFactory { generateCognitoUserName() { diff --git a/backend/test/utils/create-test-table.ts b/backend/test/utils/create-test-table.ts index 6e3873fd3..750df9372 100644 --- a/backend/test/utils/create-test-table.ts +++ b/backend/test/utils/create-test-table.ts @@ -2,7 +2,7 @@ import { fa, faker, th } from '@faker-js/faker'; import { getRandomConstraintName, getRandomTestTableName } from './get-random-test-table-name.js'; import { getTestKnex } from './get-test-knex.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import ibmdb, { Database } from 'ibm_db'; import { MongoClient, Db, ObjectId } from 'mongodb'; import { DynamoDB, PutItemCommand, PutItemCommandInput } from '@aws-sdk/client-dynamodb'; diff --git a/backend/test/utils/drop-test-tables.ts b/backend/test/utils/drop-test-tables.ts index fbce5767c..bfaf2d656 100644 --- a/backend/test/utils/drop-test-tables.ts +++ b/backend/test/utils/drop-test-tables.ts @@ -1,4 +1,4 @@ -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; import { getTestKnex } from './get-test-knex.js'; export async function dropTestTables(tableNames: Array, connectionParams): Promise { diff --git a/backend/test/utils/get-test-knex.ts b/backend/test/utils/get-test-knex.ts index cb84b72ea..3d2d0de6c 100644 --- a/backend/test/utils/get-test-knex.ts +++ b/backend/test/utils/get-test-knex.ts @@ -1,7 +1,7 @@ import knex from 'knex'; import { Knex } from 'knex'; import { LRUCache } from 'lru-cache'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { Constants } from '../../src/helpers/constants/constants.js'; const knexCache = new LRUCache(Constants.DEFAULT_CONNECTION_CACHE_OPTIONS); diff --git a/backend/tsconfig.json b/backend/tsconfig.json index c2a556828..2e4ae975d 100644 --- a/backend/tsconfig.json +++ b/backend/tsconfig.json @@ -13,11 +13,14 @@ "baseUrl": "./", "incremental": true, "moduleResolution": "node", - "skipLibCheck": true + "skipLibCheck": true, + "paths": { + "@rocketadmin/shared-code/*": ["../shared-code/dist/*"] + } }, - // "references": [ - // { "path": "../shared-code" }, - // ], + "references": [ + { "path": "../shared-code" }, + ], "include": ["src", "test"], "exclude": ["node_modules", "dist", "../node_modules"] } diff --git a/frontend/nginx/default.conf b/frontend/nginx/default.conf index c734b2ad6..2825ccf96 100644 --- a/frontend/nginx/default.conf +++ b/frontend/nginx/default.conf @@ -1,4 +1,4 @@ -server { +server { listen 8080; server_name frontend; gzip on; @@ -8,6 +8,10 @@ server { root /var/www/html; index index.html index.htm; try_files $uri /index.html; + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Content-Type-Options "nosniff" always; + add_header X-XSS-Protection "1; mode=block" always; + add_header Referrer-Policy "strict-origin-when-cross-origin" always; } location ~* /[^/]*\.(?:ico|css|js|gif|jpe?g|png|woff2)$ { root /var/www/html; diff --git a/rocketadmin-agent/src/dal/shared/create-dao.ts b/rocketadmin-agent/src/dal/shared/create-dao.ts index b8382f239..a057e59dd 100644 --- a/rocketadmin-agent/src/dal/shared/create-dao.ts +++ b/rocketadmin-agent/src/dal/shared/create-dao.ts @@ -1,6 +1,6 @@ import { ICLIConnectionCredentials } from '../../interfaces/interfaces.js'; -import { getDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/create-data-access-object.js'; -import { IDataAccessObject } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; +import { getDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/create-data-access-object.js'; +import { IDataAccessObject } from '@rocketadmin/shared-code/src/data-access-layer/shared/interfaces/data-access-object.interface.js'; export function createDao(connection: ICLIConnectionCredentials): IDataAccessObject { return getDataAccessObject(connection) as unknown as IDataAccessObject; diff --git a/rocketadmin-agent/src/helpers/cli/cli-questions.ts b/rocketadmin-agent/src/helpers/cli/cli-questions.ts index 38c79c317..6cadfe98e 100644 --- a/rocketadmin-agent/src/helpers/cli/cli-questions.ts +++ b/rocketadmin-agent/src/helpers/cli/cli-questions.ts @@ -1,7 +1,7 @@ import readlineSync from 'readline-sync'; import { Messages } from '../../text/messages.js'; import { Constants } from '../constants/constants.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; export class CLIQuestionUtility { public static askConnectionToken(): string { diff --git a/rocketadmin-agent/src/helpers/validate-connection-data.ts b/rocketadmin-agent/src/helpers/validate-connection-data.ts index 56d2f056a..6145c5ed6 100644 --- a/rocketadmin-agent/src/helpers/validate-connection-data.ts +++ b/rocketadmin-agent/src/helpers/validate-connection-data.ts @@ -1,6 +1,6 @@ import { Messages } from '../text/messages.js'; import { ICLIConnectionCredentials } from '../interfaces/interfaces.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; export function validateConnectionData(connectionData: ICLIConnectionCredentials): Array { const errors = []; diff --git a/rocketadmin-agent/src/interfaces/interfaces.ts b/rocketadmin-agent/src/interfaces/interfaces.ts index 5a1489bd4..410d306d2 100644 --- a/rocketadmin-agent/src/interfaces/interfaces.ts +++ b/rocketadmin-agent/src/interfaces/interfaces.ts @@ -2,9 +2,9 @@ import { FilterCriteriaEnum } from '../enums/filter-criteria.enum.js'; import { QueryOrderingEnum } from '../enums/query-ordering.enum.js'; import { WidgetTypeEnum } from '../enums/widget-type.enum.js'; import { OperationTypeEnum } from '../enums/operation-type.enum.js'; -import { TableSettingsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/table-settings.ds.js'; -import { FilteringFieldsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/filtering-fields.ds.js'; -import { AutocompleteFieldsDS } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/data-structures/autocomplete-fields.ds.js'; +import { TableSettingsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-settings.ds.js'; +import { FilteringFieldsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/filtering-fields.ds.js'; +import { AutocompleteFieldsDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/autocomplete-fields.ds.js'; import { TableStructureDS } from '@rocketadmin/shared-code/src/data-access-layer/shared/data-structures/table-structure.ds.js'; export interface IAutocompleteFields { @@ -30,8 +30,8 @@ export interface ICLIConnectionCredentials { config_encryption_option: boolean; encryption_password: string; saving_logs_option: boolean; - dataCenter: string; - authSource: string; + dataCenter?: string; + authSource?: string; } export interface ISavedCLIConnectionCredentials { diff --git a/rocketadmin-agent/src/main.ts b/rocketadmin-agent/src/main.ts index 06c4742f5..af465520c 100644 --- a/rocketadmin-agent/src/main.ts +++ b/rocketadmin-agent/src/main.ts @@ -9,7 +9,7 @@ import { checkConnection } from './helpers/check-connection.js'; import { ICLIConnectionCredentials } from './interfaces/interfaces.js'; import { Config } from './shared/config/config.js'; import { CLIQuestionUtility } from './helpers/cli/cli-questions.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { mkDirIfNotExistsUtil } from './helpers/write-file-util.js'; import { Constants } from './helpers/constants/constants.js'; diff --git a/rocketadmin-agent/src/text/messages.ts b/rocketadmin-agent/src/text/messages.ts index bd0b8168b..fd5845574 100644 --- a/rocketadmin-agent/src/text/messages.ts +++ b/rocketadmin-agent/src/text/messages.ts @@ -1,5 +1,5 @@ import { enumToString } from '../helpers/enum-to-string.js'; -import { ConnectionTypesEnum } from '@rocketadmin/shared-code/dist/src/data-access-layer/shared/enums/connection-types-enum.js'; +import { ConnectionTypesEnum } from '@rocketadmin/shared-code/src/data-access-layer/shared/enums/connection-types-enum.js'; import { QueryOrderingEnum } from '../enums/query-ordering.enum.js'; import { Constants } from '../helpers/constants/constants.js'; @@ -64,7 +64,7 @@ export const Messages = { 'Welcome! First of all, we need to configure the connection to your database. \n' + 'Please, enter you unique connection token ' + 'what you received when you created an agent-connection on the autoadmin website: \n ->', - CONNECTION_TYPE_MESSAGE: `Please choose the type of connection. + CONNECTION_TYPE_MESSAGE: `Please choose the type of connection. We support the following types: `, CONNECTION_HOST_MESSAGE: `Please enter the host, where your database is located: \n ->`, CONNECTION_PORT_MESSAGE: `Please enter the port, what your database is listening on your host: \n ->`, @@ -81,7 +81,7 @@ export const Messages = { CONNECTION_AZURE_ENCRYPTION_MESSAGE: `Azure encryption option. If your database located in Microsoft Azure cloud, and requires encryption choose "Yes" or "No" - if it doesn't: \n ->`, CONNECTION_SSL_OPTION_MESSAGE: `SSL option. Choose "Yes" if your database support ssl connections and - if you want to use ssl connection to your database + if you want to use ssl connection to your database (before answering "YES", please put the ssl certificate in the application directory and name it "cert.pem"), "No" - in another cases. \n ->`, APPLICATION_PORT_MESSAGE: `Enter port number, when this application will launch. Default is 3000. (You can left this value empty): \n ->`, diff --git a/rocketadmin-agent/test/command/command-executor-mssql.spec.ts b/rocketadmin-agent/test/command/command-executor-mssql.spec.ts index 935a9ed05..ce0f3902e 100644 --- a/rocketadmin-agent/test/command/command-executor-mssql.spec.ts +++ b/rocketadmin-agent/test/command/command-executor-mssql.spec.ts @@ -34,6 +34,8 @@ describe('Command executor tests', () => { config_encryption_option: false, encryption_password: undefined, saving_logs_option: false, + dataCenter: "test", + authSource: "test" }; async function resetMsSqlTestDB() { diff --git a/rocketadmin-agent/test/command/command-executor-postgres.spec.ts b/rocketadmin-agent/test/command/command-executor-postgres.spec.ts index 335ec85a4..43a956d9d 100644 --- a/rocketadmin-agent/test/command/command-executor-postgres.spec.ts +++ b/rocketadmin-agent/test/command/command-executor-postgres.spec.ts @@ -627,7 +627,7 @@ describe('Command executor tests', () => { const commandExecutor = new CommandExecutor(connectionConfig); const settings = { - connection_id: faker.string.uuid();, + connection_id: faker.string.uuid(), table_name: testTableName, display_name: '', search_fields: [testTableColumnName], @@ -671,7 +671,7 @@ describe('Command executor tests', () => { const commandExecutor = new CommandExecutor(connectionConfig); const settings = { - connection_id: faker.string.uuid();, + connection_id: faker.string.uuid(), table_name: testTableName, display_name: '', search_fields: [faker.lorem.words(1)],