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
1 change: 1 addition & 0 deletions .adminjs/.entry.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
AdminJS.UserComponents = {}
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
shamefully-hoist=true
public-hoist-pattern[]=*@tiptap*
public-hoist-pattern[]=*adminjs*
6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
"prepare": "husky"
},
"dependencies": {
"@adminjs/express": "5.1.0",
"@adminjs/typeorm": "4.0.0",
"@aws-sdk/client-lambda": "^3.606.0",
"@nestjs/common": "^10.0.0",
"@nestjs/config": "^3.2.2",
Expand All @@ -47,6 +49,7 @@
"@sentry/node": "^8.9.2",
"@sentry/profiling-node": "^8.9.2",
"@types/dotenv": "^8.2.3",
"adminjs": "6.8.7",
"aws-lambda": "^1.0.7",
"aws-serverless-express": "^3.4.0",
"cheerio": "1.0.0-rc.12",
Expand All @@ -55,6 +58,7 @@
"cross-env": "^7.0.3",
"dotenv": "^16.4.7",
"express": "^4.19.2",
"express-session": "^1.18.2",
"iconv-lite": "^0.6.3",
"js-tiktoken": "^1.0.14",
"lodash": "^4.17.21",
Expand All @@ -65,6 +69,7 @@
"pg": "^8.13.1",
"reflect-metadata": "^0.1.13",
"rxjs": "^7.8.1",
"tslib": "^2.8.1",
"typeorm": "^0.3.20",
"uuid": "^10.0.0"
},
Expand All @@ -77,6 +82,7 @@
"@swc/core": "^1.6.5",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/express": "^4.17.17",
"@types/express-session": "^1.18.2",
"@types/jest": "^29.5.2",
"@types/lodash": "^4.17.6",
"@types/node": "^20.3.1",
Expand Down
13,342 changes: 8,480 additions & 4,862 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { DatabaseModule } from '@src/infrastructure';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { LoggerMiddleware } from './common/middlewares';
import { AdminJSModule } from './infrastructure/admin/admin.module';
import { AiModule } from './infrastructure/ai/ai.module';
import { AwsLambdaModule } from './infrastructure/aws-lambda/aws-lambda.module';
import { DiscordModule } from './infrastructure/discord/discord.module';
Expand All @@ -30,6 +31,7 @@ import { UsersModule } from './modules/users/users.module';
DatabaseModule,
DiscordModule,
AiModule,
AdminJSModule,
UsersModule,
ClassificationModule,
AuthModule,
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export async function bootstrap() {
const app = await NestFactory.create(
AppModule,
new ExpressAdapter(expressInstance),
{ cors: true },
{ cors: true, bodyParser: false },
);

// Config Nest.js Application
Expand Down
175 changes: 175 additions & 0 deletions src/infrastructure/admin/admin.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
import {
Inject,
MiddlewareConsumer,
Module,
NestModule,
OnModuleInit,
} from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { HttpAdapterHost } from '@nestjs/core';
import { getDataSourceToken } from '@nestjs/typeorm';
import AdminJSExpress from '@adminjs/express';
import * as AdminJSTypeorm from '@adminjs/typeorm';
import AdminJS, { ResourceWithOptions } from 'adminjs';
import express, { Express } from 'express';
import { DataSource, BaseEntity as TypeOrmBaseEntity } from 'typeorm';
import { AIClassification } from '@src/infrastructure/database/entities/ai-classification.entity';
import { Folder } from '@src/infrastructure/database/entities/folder.entity';
import { Keyword } from '@src/infrastructure/database/entities/keyword.entity';
import { Metrics } from '@src/infrastructure/database/entities/metrics.entity';
import { OnboardCategory } from '@src/infrastructure/database/entities/onboard-category.entity';
import { PostKeyword } from '@src/infrastructure/database/entities/post-keyword.entity';
import { Post } from '@src/infrastructure/database/entities/post.entity';
import { User } from '@src/infrastructure/database/entities/user.entity';

type AdminEntityConfig = {
entity: typeof TypeOrmBaseEntity;
navigation: {
name: string;
icon: string;
};
};

const adminEntityConfigs: AdminEntityConfig[] = [
{
entity: User,
navigation: { name: 'Users', icon: 'User' },
},
{
entity: Post,
navigation: { name: 'Content', icon: 'DocumentText' },
},
{
entity: Folder,
navigation: { name: 'Content', icon: 'DocumentText' },
},
{
entity: AIClassification,
navigation: { name: 'AI', icon: 'Bot' },
},
{
entity: Keyword,
navigation: { name: 'Content', icon: 'DocumentText' },
},
{
entity: PostKeyword,
navigation: { name: 'Content', icon: 'DocumentText' },
},
{
entity: Metrics,
navigation: { name: 'Analytics', icon: 'Activity' },
},
{
entity: OnboardCategory,
navigation: { name: 'Onboarding', icon: 'Idea' },
},
];

@Module({})
export class AdminJSModule implements OnModuleInit, NestModule {
constructor(
@Inject(HttpAdapterHost) private readonly httpAdapterHost: HttpAdapterHost,
@Inject(ConfigService) private readonly configService: ConfigService,
@Inject(getDataSourceToken()) private readonly dataSource: DataSource,
) {}

configure(consumer: MiddlewareConsumer) {
// AdminJS middleware will be configured in onModuleInit
}

async onModuleInit() {
const httpAdapter = this.httpAdapterHost.httpAdapter;
const app = httpAdapter.getInstance() as Express;

try {
// Register TypeORM adapter (AdminJS v6 is CommonJS compatible)
AdminJS.registerAdapter({
Resource: AdminJSTypeorm.Resource,
Database: AdminJSTypeorm.Database,
});

const DEFAULT_ADMIN = {
email:
this.configService.get<string>('ADMIN_EMAIL') || 'admin@linkit.com',
password:
this.configService.get<string>('ADMIN_PASSWORD') || 'admin123',
};

const authenticate = async (email: string, password: string) => {
if (
email === DEFAULT_ADMIN.email &&
password === DEFAULT_ADMIN.password
) {
return Promise.resolve(DEFAULT_ADMIN);
}
return null;
};

// Ensure AdminJS resources use the Nest-managed TypeORM DataSource
adminEntityConfigs.forEach(({ entity }) =>
entity.useDataSource?.(this.dataSource),
);

const resources: ResourceWithOptions[] = adminEntityConfigs.map(
({ entity, navigation }) => ({
resource: entity,
options: { navigation },
}),
);

// Create AdminJS instance
const adminJs = new AdminJS({
rootPath: '/admin',
resources,
branding: {
companyName: 'LinkIt Admin',
logo: false,
},
});

// Router Config
const adminRouter = AdminJSExpress.buildAuthenticatedRouter(
adminJs,
{
authenticate,
cookieName: 'adminjs',
cookiePassword:
this.configService.get<string>('ADMIN_COOKIE_SECRET') ||
'secret-session-cookie',
},
null,
{
resave: true,
saveUninitialized: true,
secret:
this.configService.get<string>('ADMIN_SESSION_SECRET') ||
'secret-session-key',
},
);

// Use the router in Express app
app.use(adminJs.options.rootPath, adminRouter);

console.log(
`[AdminJS] Admin panel is running at ${adminJs.options.rootPath}`,
);
} catch (error: any) {
console.error(
'[AdminJS] Failed to initialize AdminJS:',
error?.message || error,
);
console.log('[AdminJS] Server will continue without admin panel');
} finally {
this.registerBodyParsers(app);
}
}

private registerBodyParsers(app: Express) {
if ((app as any)._adminBodyParserConfigured) {
return;
}
(app as any)._adminBodyParserConfigured = true;
app.use(express.json());
app.use(express.urlencoded({ extended: true }));
}
}
3 changes: 2 additions & 1 deletion src/infrastructure/database/entities/base.entity.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import {
CreateDateColumn,
PrimaryGeneratedColumn,
BaseEntity as TypeOrmBaseEntity,
UpdateDateColumn,
} from 'typeorm';

export abstract class BaseEntity {
export abstract class BaseEntity extends TypeOrmBaseEntity {
@PrimaryGeneratedColumn('uuid')
id: string;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
import { BaseEntity } from './base.entity';

@Entity('onboard_categories')
export class OnboardCategory {
export class OnboardCategory extends BaseEntity {
@PrimaryGeneratedColumn('uuid')
id: string;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import {
PrimaryColumn,
Relation,
} from 'typeorm';
import { BaseEntity } from './base.entity';
import { Keyword } from './keyword.entity';
import { Post } from './post.entity';

@Entity('post_keywords')
export class PostKeyword {
export class PostKeyword extends BaseEntity {
@PrimaryColumn({ name: 'post_id' })
postId: string;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class Migration1764589728508 implements MigrationInterface {
name = 'Migration1764589728508';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "post_keywords" ADD "id" uuid NOT NULL DEFAULT uuid_generate_v4()`,
);
await queryRunner.query(
`ALTER TABLE "post_keywords" DROP CONSTRAINT "PK_69a48d837cede997cb0d949fc84"`,
);
await queryRunner.query(
`ALTER TABLE "post_keywords" ADD CONSTRAINT "PK_14416d735343e53c4bb3052beb4" PRIMARY KEY ("post_id", "keyword_id", "id")`,
);
await queryRunner.query(
`ALTER TABLE "post_keywords" ADD "created_at" TIMESTAMP NOT NULL DEFAULT now()`,
);
await queryRunner.query(
`ALTER TABLE "post_keywords" ADD "updated_at" TIMESTAMP NOT NULL DEFAULT now()`,
);
await queryRunner.query(
`ALTER TABLE "onboard_categories" ADD "created_at" TIMESTAMP NOT NULL DEFAULT now()`,
);
await queryRunner.query(
`ALTER TABLE "onboard_categories" ADD "updated_at" TIMESTAMP NOT NULL DEFAULT now()`,
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "onboard_categories" DROP COLUMN "updated_at"`,
);
await queryRunner.query(
`ALTER TABLE "onboard_categories" DROP COLUMN "created_at"`,
);
await queryRunner.query(
`ALTER TABLE "post_keywords" DROP COLUMN "updated_at"`,
);
await queryRunner.query(
`ALTER TABLE "post_keywords" DROP COLUMN "created_at"`,
);
await queryRunner.query(
`ALTER TABLE "post_keywords" DROP CONSTRAINT "PK_14416d735343e53c4bb3052beb4"`,
);
await queryRunner.query(
`ALTER TABLE "post_keywords" ADD CONSTRAINT "PK_69a48d837cede997cb0d949fc84" PRIMARY KEY ("post_id", "keyword_id")`,
);
await queryRunner.query(`ALTER TABLE "post_keywords" DROP COLUMN "id"`);
}
}
11 changes: 5 additions & 6 deletions src/modules/posts/posts.pg.repository.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Injectable, NotFoundException } from '@nestjs/common';
import { FilterQuery } from 'mongoose';
import { DataSource, FindOptionsWhere, IsNull, Not, Repository } from 'typeorm';
import { OrderType } from '@src/common';
import { Post } from '@src/infrastructure/database/entities/post.entity';
Expand All @@ -19,17 +18,17 @@ export class PostsPGRepository extends Repository<Post> {
isFavorite?: boolean,
isRead?: boolean,
) {
const queryFilter: FilterQuery<Post> = {
userId: userId,
const queryFilter: FindOptionsWhere<Post> = {
userId,
};
if (isFavorite) {
queryFilter['isFavorite'] = true;
queryFilter.isFavorite = true;
}

if (isRead) {
queryFilter['readAt'] = { $ne: null };
queryFilter.readAt = Not(IsNull());
} else if (isRead === false) {
queryFilter['readAt'] = null;
queryFilter.readAt = IsNull();
}

const userPostCount = await this.count({ where: queryFilter });
Expand Down
14 changes: 10 additions & 4 deletions webpack.config.ts → webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import CopyPlugin from 'copy-webpack-plugin';
import * as path from 'path';
import * as webpack from 'webpack';
import { sentryWebpackPlugin } from '@sentry/webpack-plugin';
const CopyPlugin = require('copy-webpack-plugin');
const path = require('path');
const webpack = require('webpack');
const { sentryWebpackPlugin } = require('@sentry/webpack-plugin');

const swaggerUiModulePath = path.dirname(require.resolve('swagger-ui-dist'));

Expand Down Expand Up @@ -81,6 +81,12 @@ module.exports = {
],
externals: {
'@aws-sdk': '@aws-sdk',
'adminjs': 'commonjs adminjs',
'@adminjs/express': 'commonjs @adminjs/express',
'@adminjs/typeorm': 'commonjs @adminjs/typeorm',
'@adminjs/design-system': 'commonjs @adminjs/design-system',
'express-session': 'commonjs express-session',
'tslib': 'commonjs tslib',
},
resolve: {
extensions: ['.ts', '.js'],
Expand Down