@hedhog/admin 0.0.43 → 0.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedhog/admin",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "private": false,
   "main": "dist/index.js",
   "scripts": {
@@ -12,7 +12,8 @@
   "files": [
     "dist/**/*",
     "src/migrations/**/*.ts",
-    "src/**/*.ejs"
+    "src/**/*.ejs",
+    "hedhog.yaml"
   ],
   "keywords": [],
   "author": "",

package/src/migrations/migrate-01.ts

@@ -1,5 +1,5 @@
 import { MigrationInterface, QueryRunner, Table } from 'typeorm';
-import { idColumn, timestampColumn } from '@hedhog/utils';
+import { idColumn, timestampColumn, foreignColumn } from '@hedhog/utils';
 
 export class Migrate implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
@@ -226,6 +226,7 @@ export class Migrate implements MigrationInterface {
         name: 'locales',
         columns: [
           idColumn(),
+          foreignColumn('country_id'),
           {
             name: 'code',
             type: 'char',
@@ -238,11 +239,6 @@ export class Migrate implements MigrationInterface {
             length: '2',
             isNullable: false,
           },
-          {
-            name: 'country_id',
-            type: 'int',
-            isNullable: false,
-          },
           {
             name: 'enabled',
             type: 'boolean',

package/src/migrations/migrate-02.ts

@@ -4,7 +4,7 @@ import {
   Table,
   TableForeignKey,
 } from 'typeorm';
-import { idColumn, timestampColumn } from '@hedhog/utils';
+import { foreignColumn, idColumn, timestampColumn } from '@hedhog/utils';
 
 export class Migrate implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
@@ -37,18 +37,8 @@ export class Migrate implements MigrationInterface {
         name: 'translations',
         columns: [
           idColumn(),
-          {
-            name: 'locale_id',
-            type: 'int',
-            isNullable: false,
-            unsigned: true,
-          },
-          {
-            name: 'namespace_id',
-            type: 'int',
-            isNullable: false,
-            unsigned: true,
-          },
+          foreignColumn('locale_id'),
+          foreignColumn('namespace_id'),
           {
             name: 'name',
             type: 'varchar',

package/src/migrations/migrate-03.ts

@@ -4,7 +4,7 @@ import {
   Table,
   TableForeignKey,
 } from 'typeorm';
-import { idColumn, timestampColumn } from '@hedhog/utils';
+import { foreignColumn, idColumn, timestampColumn } from '@hedhog/utils';
 import * as bcrypt from 'bcrypt';
 
 export class Migrate implements MigrationInterface {
@@ -21,18 +21,8 @@ export class Migrate implements MigrationInterface {
       new Table({
         name: 'multifactor_translations',
         columns: [
-          {
-            name: 'multifactor_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
-          {
-            name: 'locale_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
+          foreignColumn('multifactor_id', true),
+          foreignColumn('locale_id', true),
           {
             name: 'name',
             type: 'varchar',
@@ -105,6 +95,7 @@ export class Migrate implements MigrationInterface {
         name: 'users',
         columns: [
           idColumn(),
+          foreignColumn('multifactor_id'),
           {
             name: 'name',
             type: 'varchar',
@@ -117,12 +108,6 @@ export class Migrate implements MigrationInterface {
             name: 'password',
             type: 'varchar',
           },
-          {
-            name: 'multifactor_id',
-            type: 'int',
-            isNullable: true,
-            unsigned: true,
-          },
           {
             name: 'code',
             type: 'varchar',

package/src/migrations/migrate-04.ts

@@ -1,4 +1,4 @@
-import { idColumn, timestampColumn } from '@hedhog/utils';
+import { foreignColumn, idColumn, timestampColumn } from '@hedhog/utils';
 
 import {
   MigrationInterface,
@@ -34,18 +34,8 @@ export class Migrate implements MigrationInterface {
       new Table({
         name: 'screen_translations',
         columns: [
-          {
-            name: 'screen_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
-          {
-            name: 'locale_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
+          foreignColumn('screen_id', true),
+          foreignColumn('locale_id', true),
           {
             name: 'name',
             type: 'varchar',

package/src/migrations/migrate-05.ts

@@ -4,7 +4,7 @@ import {
   Table,
   TableForeignKey,
 } from 'typeorm';
-import { idColumn, timestampColumn } from '@hedhog/utils';
+import { foreignColumn, idColumn, timestampColumn } from '@hedhog/utils';
 
 export class Migrate implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
@@ -13,6 +13,7 @@ export class Migrate implements MigrationInterface {
         name: 'menus',
         columns: [
           idColumn(),
+          foreignColumn('menu_id'),
           {
             name: 'url',
             type: 'varchar',
@@ -24,12 +25,6 @@ export class Migrate implements MigrationInterface {
             default: 0,
             unsigned: true,
           },
-          {
-            name: 'menu_id',
-            type: 'int',
-            isNullable: true,
-            unsigned: true,
-          },
           {
             name: 'icon',
             type: 'varchar',
@@ -85,18 +80,8 @@ export class Migrate implements MigrationInterface {
       new Table({
         name: 'menu_screens',
         columns: [
-          {
-            name: 'menu_id',
-            type: 'int',
-            isPrimary: true,
-            unsigned: true,
-          },
-          {
-            name: 'screen_id',
-            type: 'int',
-            isPrimary: true,
-            unsigned: true,
-          },
+          foreignColumn('menu_id', true),
+          foreignColumn('screen_id', true),
         ],
       }),
     );

package/src/migrations/migrate-07.ts

@@ -1,4 +1,4 @@
-import { idColumn, timestampColumn } from '@hedhog/utils';
+import { foreignColumn, idColumn, timestampColumn } from '@hedhog/utils';
 import {
   MigrationInterface,
   QueryRunner,
@@ -19,18 +19,8 @@ export class Migrate implements MigrationInterface {
       new Table({
         name: 'role_translations',
         columns: [
-          {
-            name: 'role_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
-          {
-            name: 'locale_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
+          foreignColumn('role_id', true),
+          foreignColumn('locale_id', true),
           {
             name: 'name',
             type: 'varchar',

package/src/migrations/migrate-08.ts

@@ -1,4 +1,4 @@
-import { timestampColumn } from '@hedhog/utils';
+import { foreignColumn, timestampColumn } from '@hedhog/utils';
 import {
   MigrationInterface,
   QueryRunner,
@@ -12,18 +12,8 @@ export class Migrate implements MigrationInterface {
       new Table({
         name: 'role_menus',
         columns: [
-          {
-            name: 'role_id',
-            type: 'int',
-            isPrimary: true,
-            unsigned: true,
-          },
-          {
-            name: 'menu_id',
-            type: 'int',
-            isPrimary: true,
-            unsigned: true,
-          },
+          foreignColumn('role_id', true),
+          foreignColumn('menu_id', true),
           timestampColumn(),
           timestampColumn('updated_at'),
         ],

package/src/migrations/migrate-09.ts

@@ -1,4 +1,4 @@
-import { timestampColumn } from '@hedhog/utils';
+import { foreignColumn, timestampColumn } from '@hedhog/utils';
 import {
   MigrationInterface,
   QueryRunner,
@@ -12,18 +12,8 @@ export class Migrate implements MigrationInterface {
       new Table({
         name: 'route_screens',
         columns: [
-          {
-            name: 'route_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
-          {
-            name: 'screen_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
+          foreignColumn('route_id', true),
+          foreignColumn('screen_id', true),
           timestampColumn(),
           timestampColumn('updated_at'),
         ],

package/src/migrations/migrate-10.ts

@@ -1,4 +1,4 @@
-import { timestampColumn } from '@hedhog/utils';
+import { foreignColumn, timestampColumn } from '@hedhog/utils';
 import {
   MigrationInterface,
   QueryRunner,
@@ -12,18 +12,8 @@ export class Migrate implements MigrationInterface {
       new Table({
         name: 'role_screens',
         columns: [
-          {
-            name: 'role_id',
-            type: 'int',
-            isPrimary: true,
-            unsigned: true,
-          },
-          {
-            name: 'screen_id',
-            type: 'int',
-            isPrimary: true,
-            unsigned: true,
-          },
+          foreignColumn('role_id', true),
+          foreignColumn('screen_id', true),
           timestampColumn(),
           timestampColumn('updated_at'),
         ],

package/src/migrations/migrate-11.ts

@@ -1,4 +1,4 @@
-import { timestampColumn } from '@hedhog/utils';
+import { foreignColumn, timestampColumn } from '@hedhog/utils';
 import {
   MigrationInterface,
   QueryRunner,
@@ -12,18 +12,8 @@ export class Migrate implements MigrationInterface {
       new Table({
         name: 'role_users',
         columns: [
-          {
-            name: 'role_id',
-            type: 'int',
-            isPrimary: true,
-            unsigned: true,
-          },
-          {
-            name: 'user_id',
-            type: 'int',
-            isPrimary: true,
-            unsigned: true,
-          },
+          foreignColumn('role_id', true),
+          foreignColumn('user_id', true),
           timestampColumn(),
           timestampColumn('updated_at'),
         ],

package/src/migrations/migrate-12.ts

@@ -1,4 +1,4 @@
-import { timestampColumn } from '@hedhog/utils';
+import { foreignColumn, timestampColumn } from '@hedhog/utils';
 import {
   MigrationInterface,
   QueryRunner,
@@ -12,18 +12,8 @@ export class Migrate implements MigrationInterface {
       new Table({
         name: 'role_routes',
         columns: [
-          {
-            name: 'role_id',
-            type: 'int',
-            isPrimary: true,
-            unsigned: true,
-          },
-          {
-            name: 'route_id',
-            type: 'int',
-            isPrimary: true,
-            unsigned: true,
-          },
+          foreignColumn('role_id', true),
+          foreignColumn('route_id', true),
           timestampColumn(),
           timestampColumn('updated_at'),
         ],

package/src/migrations/migrate-19.ts

@@ -1,10 +1,5 @@
-import {
-  MigrationInterface,
-  QueryRunner,
-  Table,
-  TableForeignKey,
-} from 'typeorm';
-import { idColumn, timestampColumn } from '@hedhog/utils';
+import { MigrationInterface, QueryRunner, Table } from 'typeorm';
+import { foreignColumn, idColumn, timestampColumn } from '@hedhog/utils';
 
 export class Migrate implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
@@ -33,18 +28,8 @@ export class Migrate implements MigrationInterface {
       new Table({
         name: 'setting_group_translations',
         columns: [
-          {
-            name: 'locale_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
-          {
-            name: 'group_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
+          foreignColumn('locale_id', true),
+          foreignColumn('group_id', true),
           {
             name: 'name',
             type: 'varchar',
@@ -81,17 +66,13 @@ export class Migrate implements MigrationInterface {
         name: 'settings',
         columns: [
           idColumn(),
+          foreignColumn('group_id'),
           {
             name: 'slug',
             type: 'varchar',
             isUnique: true,
             length: '63',
           },
-          {
-            name: 'group_id',
-            type: 'int',
-            unsigned: true,
-          },
           {
             name: 'type',
             type: 'enum',
@@ -104,6 +85,11 @@ export class Migrate implements MigrationInterface {
             length: '1023',
             isNullable: true,
           },
+          {
+            name: 'userOverride',
+            type: 'boolean',
+            default: false,
+          },
           timestampColumn(),
           timestampColumn('updated_at'),
         ],
@@ -122,18 +108,8 @@ export class Migrate implements MigrationInterface {
       new Table({
         name: 'setting_translations',
         columns: [
-          {
-            name: 'locale_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
-          {
-            name: 'setting_id',
-            type: 'int',
-            unsigned: true,
-            isPrimary: true,
-          },
+          foreignColumn('locale_id', true),
+          foreignColumn('setting_id', true),
           {
             name: 'description',
             type: 'varchar',
@@ -165,9 +141,42 @@ export class Migrate implements MigrationInterface {
         ],
       }),
     );
+
+    await queryRunner.createTable(
+      new Table({
+        name: 'setting_users',
+        columns: [
+          foreignColumn('user_id', true),
+          foreignColumn('setting_id', true),
+          {
+            name: 'value',
+            type: 'varchar',
+            length: '1023',
+            isNullable: true,
+          },
+          timestampColumn(),
+          timestampColumn('updated_at'),
+        ],
+        foreignKeys: [
+          {
+            columnNames: ['user_id'],
+            referencedColumnNames: ['id'],
+            referencedTableName: 'users',
+            onDelete: 'CASCADE',
+          },
+          {
+            columnNames: ['setting_id'],
+            referencedColumnNames: ['id'],
+            referencedTableName: 'settings',
+            onDelete: 'CASCADE',
+          },
+        ],
+      }),
+    );
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.dropTable('setting_users');
     await queryRunner.dropTable('setting_translations');
     await queryRunner.dropTable('settings');
     await queryRunner.dropTable('setting_group_translations');