Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.rocketadmin-agent
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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 cd rocketadmin-agent && yarn run nest build
RUN cd rocketadmin-agent && yarn run build

RUN chown -R appuser:appuser /app

Expand Down
2 changes: 1 addition & 1 deletion backend/src/shared/config/config.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class ConfigService {
migrationsRun: false,
logging: false,
extra: {
max: 2,
max: 10,
},
logger: 'advanced-console',
driver: pgLiteDriver ? pgLiteDriver : undefined,
Expand Down
3 changes: 3 additions & 0 deletions backend/test/ava-tests/saas-tests/connection-e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,8 @@ test(`${currentTest} should return a found connection`, async (t) => {
.set('Cookie', token)
.set('Accept', 'application/json');

const foundOneRo = JSON.parse(findOneResponce.text);
console.log('🚀 ~ foundOneRo:', foundOneRo);
Copy link

Copilot AI Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debug console.log statements should not be committed to the codebase. This appears to be a debugging statement that was left in accidentally. Consider removing it or replacing it with proper test diagnostics if needed.

Suggested change
console.log('🚀 ~ foundOneRo:', foundOneRo);

Copilot uses AI. Check for mistakes.
t.is(findOneResponce.status, 200);
const result = findOneResponce.body.connection;

Expand Down Expand Up @@ -1271,6 +1273,7 @@ test(`${currentTest} throw an exception when group name is not unique`, async (t
.set('Accept', 'application/json');

const createConnectionRO = JSON.parse(createConnectionResponse.text);
t.is(createConnectionResponse.status, 201);
newGroup1.title = 'Admin';
const createGroupResponse = await request(app.getHttpServer())
.post(`/connection/group/${createConnectionRO.id}`)
Expand Down
3 changes: 3 additions & 0 deletions backend/test/utils/register-user-and-return-user-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ export async function registerUserAndReturnUserInfo(app: INestApplication): Prom
email: string;
password: string;
}> {
if (isSaaS()) {
return await registerUserOnSaasAndReturnUserInfo();
}
const dataSource = app.get<DataSource>(BaseType.DATA_SOURCE);
const userRepository = dataSource.getRepository(UserEntity);
const companyRepository = dataSource.getRepository(CompanyInfoEntity);
Expand Down
4 changes: 2 additions & 2 deletions rocketadmin-agent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ COPY ./rocketadmin-agent/.clickhouse_test_agent_config.txt /app/rocketadmin-agen
COPY shared-code /app/shared-code
COPY ./rocketadmin-agent/ssl-cert.txt /app/rocketadmin-agent/
RUN cd shared-code && ../node_modules/.bin/tsc
RUN cd rocketadmin-agent && yarn run nest build
RUN cd rocketadmin-agent && yarn run build
COPY ./rocketadmin-agent/wait-for-db2.js /app/
CMD [ "./node_modules/.bin/nest", "start"]
CMD [ "node", "rocketadmin-agent/dist/main.js"]
37 changes: 16 additions & 21 deletions rocketadmin-agent/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "rocketadmin-agent",
"version": "0.0.1",
"description": "",
"author": "",
"description": "RocketAdmin Agent - Connect your database to RocketAdmin through a secure agent",
"author": "RocketAdmin",
"private": true,
"license": "UNLICENSED",
"type": "module",
"bin": "./dist/main.js",
"packageExtensions": {
"ibm_db": {
"dependencies": {
Expand All @@ -15,12 +16,12 @@
},
"scripts": {
"prebuild": "rimraf dist",
"build": "nest build",
"build": "tsc -p tsconfig.build.json",
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
"start": "nest start",
"start:dev": "nest start --watch",
"start:debug": "nest start --debug --watch",
"start:prod": "node dist/main",
"start": "node dist/main.js",
"start:dev": "tsc -p tsconfig.build.json && node dist/main.js",
"start:debug": "node --inspect dist/main.js",
"start:prod": "node dist/main.js",
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
"test": "jest --runInBand",
"test:watch": "jest --watch",
Expand All @@ -30,44 +31,38 @@
},
"dependencies": {
"@azure/core-tracing": "^1.3.1",
"@nestjs/common": "^11.1.8",
"@nestjs/config": "^4.0.2",
"@nestjs/core": "^11.1.8",
"@nestjs/platform-express": "^11.1.8",
"@nestjs/platform-ws": "^11.1.8",
"@nestjs/testing": "^11.1.8",
"@rocketadmin/shared-code": "workspace:*",
"@types/pg": "^8.15.6",
"argon2": "^0.44.0",
"chalk": "^5.6.2",
"commander": "^14.0.2",
"crypto-js": "^4.2.0",
"dotenv": "^17.2.3",
"get-port": "^7.1.0",
"inquirer": "^13.0.2",
"knex": "3.1.0",
"mongodb": "^6.20.0",
"mysql2": "^3.15.3",
"ora": "^9.0.0",
"oracledb": "^6.10.0",
"pg": "^8.16.3",
"readline-sync": "^1.4.10",
"reflect-metadata": "^0.2.2",
"rimraf": "^6.0.1",
"rxjs": "^7.8.2",
"ssh2": "^1.17.0",
"tedious": "^18.6.1",
"wait-on": "^9.0.1",
"winston": "^3.18.3",
"ws": "^8.18.3",
"yarn": "^1.22.22"
},
"optionalDependencies": {
"ibm_db": "3.3.0"
},
"devDependencies": {
"@nestjs/cli": "^11.0.10",
"@nestjs/schematics": "^11.0.9",
"@nestjs/testing": "^11.1.8",
"@types/express": "^5.0.5",
"@types/inquirer": "^9.0.9",
"@types/jest": "^30.0.0",
"@types/node": "^24.9.1",
"@types/readline-sync": "^1.4.8",
"@types/supertest": "^6.0.3",
"@types/ws": "^8.18.1",
"@typescript-eslint/eslint-plugin": "^8.46.2",
"@typescript-eslint/parser": "^8.46.2",
"eslint": "^9.38.0",
Expand Down
22 changes: 0 additions & 22 deletions rocketadmin-agent/src/app.controller.spec.ts

This file was deleted.

12 changes: 0 additions & 12 deletions rocketadmin-agent/src/app.controller.ts

This file was deleted.

15 changes: 0 additions & 15 deletions rocketadmin-agent/src/app.module.ts

This file was deleted.

8 changes: 0 additions & 8 deletions rocketadmin-agent/src/app.service.ts

This file was deleted.

Loading
Loading