fix(cms): fix cms migration when running dev server

Previously implemented the .migrate() method to the tensei instance. This was a move preparing us for serverless. Right now it will be postponed until we have a stable release.
tenseijs · Feb 1, 2021 · 2738c01 · 2738c01
1 parent f465a68
commit 2738c01
Show file tree

Hide file tree

Showing 18 changed files with 100 additions and 37 deletions.
diff --git a/examples/blog/app.js b/examples/blog/app.js
@@ -17,7 +17,6 @@ module.exports = tensei()
     .root(__dirname)
     .resources([Tag, Post, User, Comment, Editor, Reaction])
     .clientUrl('https://google.com')
-    .serverUrl('http://localhost:5000')
     .graphQlQueries([])
     .routes([
         route('Get products')

diff --git a/packages/cli/_templates/default/new/package.json.ejs.t b/packages/cli/_templates/default/new/package.json.ejs.t
@@ -21,8 +21,8 @@ to: <%= h.changeCase.param(name) %>/package.json
         "build": "yarn build:server && yarn build:client"
     },
     "devDependencies": {
-        "@tensei/common": "^0.5.8",
-        "@tensei/components": "^0.5.8",
+        "@tensei/common": "^0.5.10",
+        "@tensei/components": "^0.5.10",
         "laravel-mix": "^6.0.5",
         "postcss": "^8.1",
         "tailwindcss": "^2.0.2",

diff --git a/packages/cms/pages/Resource/Resource.tsx b/packages/cms/pages/Resource/Resource.tsx
@@ -12,11 +12,10 @@ import {
     Heading,
     ResourceContract,
     PaginatedData,
-    AbstractData
+    AbstractData,
+    DeleteModal
 } from '@tensei/components'
 
-import DeleteModal from '../../components/DeleteModal'
-
 export interface ResourceProps {
     detailId?: string
     baseResource: ResourceContract

diff --git a/packages/cms/pages/ResourceDetail/ResourceDetail.tsx b/packages/cms/pages/ResourceDetail/ResourceDetail.tsx
@@ -6,10 +6,9 @@ import {
     useHistory,
     Link
 } from 'react-router-dom'
-import { Heading, StackedList, Button, Pulse } from '@tensei/components'
+import { Heading, StackedList, Button, Pulse, DeleteModal } from '@tensei/components'
 
 import PageWrapper from '../../components/PageWrapper'
-import DeleteModal from '../../components/DeleteModal'
 
 export interface ResourceDetailProps {}
 

diff --git a/packages/cms/pages/Settings/ManageUser.tsx b/packages/cms/pages/Settings/ManageUser.tsx
@@ -8,11 +8,10 @@ import {
     AbstractData,
     Modal,
     TextInput,
-    Checkbox
+    Checkbox,
+    DeleteModal
 } from '@tensei/components'
 
-import DeleteModal from '../../components/DeleteModal'
-
 export interface ResourceProps {
     onDelete?: () => void
     onCreate?: () => void

diff --git a/packages/cms/plugin/index.ts b/packages/cms/plugin/index.ts
@@ -533,12 +533,10 @@ class CmsPlugin {
                     this.sessionMikroOrmOptions
                 )
 
-                if (config.migrating) {
-                    await setupCms(config, [
-                        this.resources.role,
-                        this.resources.permission
-                    ])
-                }
+                await setupCms(config, [
+                    this.resources.role,
+                    this.resources.permission
+                ])
 
                 this.router.use(
                     ExpressSession({

diff --git a/packages/cms/plugin/routes.ts b/packages/cms/plugin/routes.ts
@@ -393,7 +393,14 @@ export default (config: Config, cmsConfig: any) => {
                             )
                         }
 
-                        await modelRepository.removeAndFlush(entity)
+                        try {
+                            await manager.removeAndFlush(entity)
+                        } catch (e) {
+                            console.log(e.name)
+
+                            return response.formatter.badRequest(`Failed deleting ${modelName} with ID ${params.id}. ${e.name === 'ForeignKeyConstraintViolationException' ? 'Foreign key constraint violated.' : ''}`)
+                        }
+
 
                         config.emitter.emit(`${singular}::deleted`, entity)
 

diff --git a/packages/components/src/Modal/DeleteModal.tsx b/packages/components/src/Modal/DeleteModal.tsx
@@ -58,10 +58,12 @@ const DeleteModal: React.FC<DeleteModalProps> = ({
                     onDelete()
                 }
             })
-            .catch(() => {
+            .catch((error) => {
                 Tensei.error(
-                    `An error occured deleting ${resource.name} with ID ${selected[0].id}.`
+                    error?.response?.data?.error || `An error occured deleting ${resource.name} with ID ${selected[0].id}.`
                 )
+
+                setDeleting(false)
             })
             .finally(() => {
                 if (!leavesPage) {

diff --git a/packages/core/database/index.ts b/packages/core/database/index.ts
@@ -30,9 +30,7 @@ class Database {
 
         this.orm = await MikroORM.init(this.getMikroORMOptions() as any)
 
-        if (this.config.migrating) {
-            await new Migrator(this.orm!, this.schemas).init()
-        }
+        await new Migrator(this.orm!, this.schemas).init()
 
         return [this.orm!, this.schemas]
     }

diff --git a/packages/create-tensei-app/templates/default/package.json b/packages/create-tensei-app/templates/default/package.json
@@ -5,11 +5,11 @@
     "license": "MIT",
     "dependencies": {
         "@mikro-orm/sqlite": "^4.4.0",
-        "@tensei/auth": "^0.5.8",
-        "@tensei/cms": "^0.5.8",
-        "@tensei/core": "^0.5.8",
-        "@tensei/media": "^0.5.8",
-        "@tensei/graphql": "^0.5.8"
+        "@tensei/auth": "^0.5.10",
+        "@tensei/cms": "^0.5.10",
+        "@tensei/core": "^0.5.10",
+        "@tensei/media": "^0.5.10",
+        "@tensei/graphql": "^0.5.10"
     },
     "scripts": {
         "dev": "nodemon src/index"

diff --git a/packages/create-tensei-app/templates/rest/package.json b/packages/create-tensei-app/templates/rest/package.json
@@ -5,11 +5,11 @@
     "license": "MIT",
     "dependencies": {
         "@mikro-orm/sqlite": "^4.4.0",
-        "@tensei/auth": "^0.5.8",
-        "@tensei/cms": "^0.5.8",
-        "@tensei/core": "^0.5.8",
-        "@tensei/media": "^0.5.8",
-        "@tensei/rest": "^0.5.8"
+        "@tensei/auth": "^0.5.10",
+        "@tensei/cms": "^0.5.10",
+        "@tensei/core": "^0.5.10",
+        "@tensei/media": "^0.5.10",
+        "@tensei/rest": "^0.5.10"
     },
     "scripts": {
         "dev": "nodemon src/index"

diff --git a/packages/mde/package.json b/packages/mde/package.json
@@ -25,8 +25,8 @@
         "prettier": "prettier --write './**/*.{js,json,ts,tsx,css}'",
         "dev:client": "cross-env NODE_ENV=development webpack --config=node_modules/laravel-mix/setup/webpack.config.js --watch",
         "build:client": "cross-env NODE_ENV=production webpack --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "build": "yarn build:server",
-        "build:server": "tsc",
+        "build": "yarn build:server && yarn build:client",
+        "build:server": "tsc --p tsconfig.server.json",
         "dev:server": "tsc --watch"
     },
     "publishConfig": {

diff --git a/packages/mde/src/index.ts b/packages/mde/src/index.ts
@@ -16,8 +16,8 @@ export class MdePlugin {
 
     plugin() {
         return plugin('Markdown Editor').register(({ script, style }) => {
-            style('mde.css', Path.resolve(__dirname, '..', 'public/app.css'))
-            script('mde.js', Path.resolve(__dirname, '..', 'public/app.js'))
+            style('mde.css', Path.resolve(__dirname, '..', 'build/client/app.css'))
+            script('mde.js', Path.resolve(__dirname, '..', 'build/client/app.js'))
         })
     }
 }

diff --git a/packages/mde/tsconfig.server.json b/packages/mde/tsconfig.server.json
@@ -0,0 +1,15 @@
+{
+    "compilerOptions": {
+        "target": "ES2017",
+        "module": "commonjs",
+        "declaration": true,
+        "outDir": "./build/",
+        "strict": true,
+        "baseUrl": "./server",
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "forceConsistentCasingInFileNames": true,
+        "types": ["@types/jest"]
+    },
+    "exclude": ["__tests__", "build", "src/components"]
+}
diff --git a/packages/media/client/app.css b/packages/media/client/app.css
@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
diff --git a/packages/media/server/index.ts b/packages/media/server/index.ts
@@ -98,6 +98,7 @@ class MediaLibrary {
         return plugin('Media Library').register(
             ({
                 app,
+                style,
                 script,
                 currentCtx,
                 extendRoutes,
@@ -106,6 +107,7 @@ class MediaLibrary {
                 extendGraphQlTypeDefs,
                 extendGraphQlQueries
             }) => {
+                style('media.css', Path.resolve(__dirname, 'public/app.css'))
                 script('media.js', Path.resolve(__dirname, 'public/app.js'))
 
                 if (!this.config.disk) {

diff --git a/packages/media/tailwind.config.js b/packages/media/tailwind.config.js
@@ -0,0 +1,41 @@
+const defaultTheme = require('tailwindcss/defaultTheme')
+
+module.exports = {
+    purge: {
+        enabled: process.env.NODE_ENV === 'production',
+        content: ['./**/*.tsx']
+    },
+    theme: {
+        extend: {
+            fontFamily: {
+                sans: ['Nunito', ...defaultTheme.fontFamily.sans]
+            },
+            colors: {
+                'tensei-primary': '#2346F8',
+
+                'tensei-primary-200': '#D3D8FA',
+
+                'tensei-primary-lighter': '#3f70fa',
+
+                'tensei-primary-darker': '#243de1',
+                'tensei-secondary': '#33C5FF',
+                'tensei-darkest': '#21185A',
+
+                'tensei-gray-900': '#2C3E50',
+                'tensei-gray-800': '#61677C',
+                'tensei-gray-700': '#949BAF',
+                'tensei-gray-600': '#EEEFF1',
+                'tensei-gray-500': '#C3C8D2',
+                'tensei-gray-400': '#F0F1F4',
+                'tensei-gray-300': '#EAEBEF',
+                'tensei-gray-100': '#F7F9FA',
+
+                'tensei-warning': '#F0B103',
+                'tensei-success': '#00976E',
+                'tensei-success-lighter': '#00CA93',
+                'tensei-success-darker': '#006449',
+                'tensei-error': '#D41B44'
+            }
+        }
+    }
+}
diff --git a/packages/media/webpack.mix.js b/packages/media/webpack.mix.js
@@ -7,4 +7,5 @@ mix.webpackConfig({
     }
 })
     .js('./client/index.js', 'build/public/app.js')
+    .postCss('./client/app.css', 'build/public/app.css', [require('tailwindcss')])
     .react()