diff --git a/src/Squidex/app-config/webpack.config.js b/src/Squidex/app-config/webpack.config.js index edaeaa5a8..6b9fcb4d0 100644 --- a/src/Squidex/app-config/webpack.config.js +++ b/src/Squidex/app-config/webpack.config.js @@ -31,7 +31,7 @@ const plugins = { module.exports = function(env) { const isDevServer = path.basename(require.main.filename) === 'webpack-dev-server.js'; const isProduction = env && env.production; - const isTesting = env && env.target === 'tests'; + const isTests = env && env.target === 'tests'; const isCoverage = env && env.coverage; const isJit = env && env.jit; @@ -43,7 +43,7 @@ module.exports = function(env) { * * See: https://webpack.js.org/configuration/devtool/ */ - devtool: isProduction ? undefined : (isTesting ? 'inline-source-map' : 'source-map'), + devtool: isProduction ? false : (isTests ? 'inline-source-map' : 'source-map'), /** * Options affecting the resolving of modules. @@ -181,7 +181,9 @@ module.exports = function(env) { } }; - if (!isTesting) { + console.log(JSON.stringify(config, null, 2)); + + if (!isTests) { /** * The entry point for the bundle. Our Angular app. * @@ -286,9 +288,8 @@ module.exports = function(env) { config.module.rules.push({ test: /\.ts$/, use: [{ - loader: 'awesome-typescript-loader' - }], - exclude: [/node_modules/] + loader: 'awesome-typescript-loader', options: { useCache: true, useBabel: true } + }] }) } else { config.module.rules.push({ diff --git a/src/Squidex/app/features/settings/declarations.ts b/src/Squidex/app/features/settings/declarations.ts index fdb82e6b5..17e095257 100644 --- a/src/Squidex/app/features/settings/declarations.ts +++ b/src/Squidex/app/features/settings/declarations.ts @@ -18,5 +18,7 @@ export * from './pages/patterns/patterns-page.component'; export * from './pages/plans/plans-page.component'; export * from './pages/roles/role.component'; export * from './pages/roles/roles-page.component'; +export * from './pages/workflows/workflow-step.component'; +export * from './pages/workflows/workflows-page.component'; export * from './settings-area.component'; \ No newline at end of file diff --git a/src/Squidex/app/features/settings/module.ts b/src/Squidex/app/features/settings/module.ts index 121e03d8b..29802f591 100644 --- a/src/Squidex/app/features/settings/module.ts +++ b/src/Squidex/app/features/settings/module.ts @@ -30,7 +30,9 @@ import { PlansPageComponent, RoleComponent, RolesPageComponent, - SettingsAreaComponent + SettingsAreaComponent, + WorkflowsPageComponent, + WorkflowStepComponent } from './declarations'; const routes: Routes = [ @@ -59,117 +61,121 @@ const routes: Routes = [ ] }, { - path: 'plans', - component: PlansPageComponent, + path: 'clients', + component: ClientsPageComponent, children: [ { path: 'history', component: HistoryComponent, data: { - channel: 'settings.plan' + channel: 'settings.clients' + } + }, + { + path: 'help', + component: HelpComponent, + data: { + helpPage: '05-integrated/clients' } } ] }, { - path: 'patterns', - component: PatternsPageComponent, + path: 'contributors', + component: ContributorsPageComponent, children: [ { path: 'history', component: HistoryComponent, data: { - channel: 'settings.patterns' + channel: 'settings.contributors' } }, { path: 'help', component: HelpComponent, data: { - helpPage: '05-integrated/patterns' + helpPage: '05-integrated/contributors' } } ] }, { - path: 'clients', - component: ClientsPageComponent, + path: 'languages', + component: LanguagesPageComponent, children: [ { path: 'history', component: HistoryComponent, data: { - channel: 'settings.clients' + channel: 'settings.languages' } }, { path: 'help', component: HelpComponent, data: { - helpPage: '05-integrated/clients' + helpPage: '05-integrated/languages' } } ] }, { - path: 'contributors', - component: ContributorsPageComponent, + path: 'patterns', + component: PatternsPageComponent, children: [ { path: 'history', component: HistoryComponent, data: { - channel: 'settings.contributors' + channel: 'settings.patterns' } }, { path: 'help', component: HelpComponent, data: { - helpPage: '05-integrated/contributors' + helpPage: '05-integrated/patterns' } } ] }, { - path: 'roles', - component: RolesPageComponent, + path: 'plans', + component: PlansPageComponent, children: [ { path: 'history', component: HistoryComponent, data: { - channel: 'settings.roles' - } - }, - { - path: 'help', - component: HelpComponent, - data: { - helpPage: '05-integrated/roles' + channel: 'settings.plan' } } ] }, { - path: 'languages', - component: LanguagesPageComponent, + path: 'roles', + component: RolesPageComponent, children: [ { path: 'history', component: HistoryComponent, data: { - channel: 'settings.languages' + channel: 'settings.roles' } }, { path: 'help', component: HelpComponent, data: { - helpPage: '05-integrated/languages' + helpPage: '05-integrated/roles' } } ] + }, + { + path: 'workflows', + component: WorkflowsPageComponent } ] } @@ -196,7 +202,9 @@ const routes: Routes = [ PlansPageComponent, RoleComponent, RolesPageComponent, - SettingsAreaComponent + SettingsAreaComponent, + WorkflowsPageComponent, + WorkflowStepComponent ] }) export class SqxFeatureSettingsModule { } \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.html b/src/Squidex/app/features/settings/pages/clients/client.component.html index 9b40afd96..d0d749f8e 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.html +++ b/src/Squidex/app/features/settings/pages/clients/client.component.html @@ -2,27 +2,13 @@