From cdd8f967888dd9d52596ee60ec4606c596a99d5a Mon Sep 17 00:00:00 2001
From: bertrand <bpinel@ippon.fr>
Date: Fri, 21 Dec 2018 18:20:44 +0100
Subject: [PATCH] Complete refactoring of the templating in entity-factory
---
addon/components/multiple-entity-selector.js | 41 --
.../components/multiple-entity-selector.hbs | 5 -
app/components/multiple-entity-selector.js | 1 -
app/router.js | 3 -
.../__root__/__mirage__/factories/__name__.js | 9 +-
.../__root__/__mirage__/models/__name__.js | 8 +-
.../controllers/entity-factory/__name__.js | 22 +-
.../files/__root__/models/__name__.js | 6 +-
.../templates/entity-factory/__name__.hbs | 2 +-
.../files/__root__/validations/__name__.js | 1 +
blueprints/entity-factory/index.js | 602 ++++++++++++------
mirage/config.js | 16 +-
mirage/scenarios/default.js | 5 -
package.json | 16 +-
tests/dummy/mirage/scenarios/default.js | 1 +
15 files changed, 439 insertions(+), 299 deletions(-)
delete mode 100644 addon/components/multiple-entity-selector.js
delete mode 100644 addon/templates/components/multiple-entity-selector.hbs
delete mode 100644 app/components/multiple-entity-selector.js
create mode 100644 blueprints/entity-factory/files/__root__/validations/__name__.js
diff --git a/addon/components/multiple-entity-selector.js b/addon/components/multiple-entity-selector.js
deleted file mode 100644
index bb7379b..0000000
--- a/addon/components/multiple-entity-selector.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import Component from '@ember/component';
-import injectService from 'ember-service/inject';
-import { computed } from '@ember/object';
-import { A } from '@ember/array';
-import EmberObject from '@ember/object';
-
-export default Component.extend({
- store: injectService(),
- entityType: '',
- entityKey: '',
- selectedEntities: [],
- entities: [],
- tableColumns: computed(function() {
- var col = A([
- EmberObject.create({
- propertyName: "id",
- title: "id"
- }),
- EmberObject.create({
- propertyName: this.get('entityKey'),
- title: this.get('entityKey')
- })
- ]);
- return col;
- }),
- init(){
- this._super(...arguments);
- this._getEntities();
- },
-
- _getEntities() {
- this.get('store').findAll(this.get('entityType')).then((entities) => {
- // because this is async you need to guard against the component
- // being destroyed before the api call has finished because
- // because `this.set` will throw an error.
- if (this.isDestroyed) { return; }
-
- this.set('entities', entities);
- }
- )}
-})
diff --git a/addon/templates/components/multiple-entity-selector.hbs b/addon/templates/components/multiple-entity-selector.hbs
deleted file mode 100644
index 3939616..0000000
--- a/addon/templates/components/multiple-entity-selector.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{models-table
- data=entities
- columns=tableColumns
- multipleSelect=true
- selectedItems=selectedEntities}}
\ No newline at end of file
diff --git a/app/components/multiple-entity-selector.js b/app/components/multiple-entity-selector.js
deleted file mode 100644
index 2b27f75..0000000
--- a/app/components/multiple-entity-selector.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ember-aws-ehipster/components/multiple-entity-selector';
\ No newline at end of file
diff --git a/app/router.js b/app/router.js
index f033602..d0bb009 100644
--- a/app/router.js
+++ b/app/router.js
@@ -7,9 +7,6 @@ const Router = EmberRouter.extend({
});
Router.map(function() {
- this.route('entity-factory/tag');
- this.route('entity-factory/entry');
- this.route('entity-factory/blog');
});
export default Router;
diff --git a/blueprints/entity-factory/files/__root__/__mirage__/factories/__name__.js b/blueprints/entity-factory/files/__root__/__mirage__/factories/__name__.js
index 68ead11..43e7568 100644
--- a/blueprints/entity-factory/files/__root__/__mirage__/factories/__name__.js
+++ b/blueprints/entity-factory/files/__root__/__mirage__/factories/__name__.js
@@ -1,9 +1,2 @@
-import {
- Factory,
- faker
- } from 'ember-cli-mirage';
-
- export default Factory.extend({
- <%= factories.length ? '//default generated factory\n\t' + factories + '\n' : '' %>
- })
+<%= mirageFactory %>
\ No newline at end of file
diff --git a/blueprints/entity-factory/files/__root__/__mirage__/models/__name__.js b/blueprints/entity-factory/files/__root__/__mirage__/models/__name__.js
index 1b2066f..4528b56 100644
--- a/blueprints/entity-factory/files/__root__/__mirage__/models/__name__.js
+++ b/blueprints/entity-factory/files/__root__/__mirage__/models/__name__.js
@@ -1,7 +1 @@
-import {
- Model<%= imports.length ? ', '+imports : '' %>
- } from 'ember-cli-mirage';
-
- export default Model.extend({<%= rel.length ? rel : '' %>
- });
-
\ No newline at end of file
+<%= mirageModel %>
\ No newline at end of file
diff --git a/blueprints/entity-factory/files/__root__/controllers/entity-factory/__name__.js b/blueprints/entity-factory/files/__root__/controllers/entity-factory/__name__.js
index 8a065d9..df53291 100644
--- a/blueprints/entity-factory/files/__root__/controllers/entity-factory/__name__.js
+++ b/blueprints/entity-factory/files/__root__/controllers/entity-factory/__name__.js
@@ -4,27 +4,15 @@ import { A } from '@ember/array';
import EmberObject from '@ember/object';
export default Controller.extend({
-isAddingEntry: false,
-<%=ctrlVars%>
-<%=singularEntityName%>TableColumns: computed(function() {
-var col = A([
- <%=tableCols%>
-]);
-col.pushObject({
- title: 'Delete',
- component: 'delete-row'
-});
-return col;
-}),
+ isAddingEntry: false,
+ newEntry: EmberObject.create({<%=controllerInitEntity%>}),
-<%=singularEntityName%>TableContent: computed(function() {
- return this.get("model");
-}),
+<%=controllerModelTable%>
-actions: {
+ actions: {
submit() {
event.preventDefault();
- let newEntity = this.store.createRecord('<%=singularEntityName%>',<%=toCreateEntity%>);
+ let newEntity = this.store.createRecord('<%=singularEntityName%>',{<%=controllerCreateEntity%>});
newEntity.save();
this.set('addEntryModal', false).then((entry) => {
console.log("new entry of id "+entry.get('id')+" created");
diff --git a/blueprints/entity-factory/files/__root__/models/__name__.js b/blueprints/entity-factory/files/__root__/models/__name__.js
index 2dd4f1d..cd68dac 100644
--- a/blueprints/entity-factory/files/__root__/models/__name__.js
+++ b/blueprints/entity-factory/files/__root__/models/__name__.js
@@ -1,5 +1 @@
-import DS from 'ember-data';
-
-export default DS.Model.extend({
-<%= attrs.length ? ' ' + attrs : '' %>
-});
\ No newline at end of file
+<%= entityModel %>
diff --git a/blueprints/entity-factory/files/__root__/templates/entity-factory/__name__.hbs b/blueprints/entity-factory/files/__root__/templates/entity-factory/__name__.hbs
index 7f48650..ff9537e 100644
--- a/blueprints/entity-factory/files/__root__/templates/entity-factory/__name__.hbs
+++ b/blueprints/entity-factory/files/__root__/templates/entity-factory/__name__.hbs
@@ -20,7 +20,7 @@
</h4>
{{/modal.header}}
{{#modal.body}}
- <%=form%>
+ <%=templateEntityForm%>
{{/modal.body}}
{{#modal.footer}}
{{#bs-button onClick=(action modal.close)}}Cancel{{/bs-button}}
diff --git a/blueprints/entity-factory/files/__root__/validations/__name__.js b/blueprints/entity-factory/files/__root__/validations/__name__.js
new file mode 100644
index 0000000..71d97ea
--- /dev/null
+++ b/blueprints/entity-factory/files/__root__/validations/__name__.js
@@ -0,0 +1 @@
+<%= entityValidation %>
\ No newline at end of file
diff --git a/blueprints/entity-factory/index.js b/blueprints/entity-factory/index.js
index 33ad98a..6fae706 100644
--- a/blueprints/entity-factory/index.js
+++ b/blueprints/entity-factory/index.js
@@ -3,7 +3,7 @@ const stringUtils = require('ember-cli-string-utils');
const EOL = require('os').EOL;
const path = require('path');
const fs = require('fs');
-const nbFakeData = 8;
+const nbFakeData = 6;
module.exports = {
description: 'Generates an ember-data model and the associated Mirage couterpart and screens.',
@@ -14,11 +14,21 @@ module.exports = {
if (options.pod) {
return {
// Never tested. Not used to use pod structure !
- __root__() { return 'app'; },
- __path__() { return options.blueprintName;},
- __name__() { return options.dasherizedModuleName;},
- __mirage__() { return '../mirage'},
- __cloud__() { return '../cloud'}
+ __root__() {
+ return 'app';
+ },
+ __path__() {
+ return options.blueprintName;
+ },
+ __name__() {
+ return options.dasherizedModuleName;
+ },
+ __mirage__() {
+ return '../mirage'
+ },
+ __cloud__() {
+ return '../cloud'
+ }
}
} else {
return {
@@ -27,124 +37,53 @@ module.exports = {
return 'tests/dummy/app';
} else {
return 'app';
- }
+ }
},
- __path__() { return 'models';},
- __name__() { return options.dasherizedModuleName;},
- __mirage__() { return '../mirage'},
- __cloud__() { return '../cloud'}
+ __path__() {
+ return 'models';
+ },
+ __name__() {
+ return options.dasherizedModuleName;
+ },
+ __mirage__() {
+ return '../mirage'
+ },
+ __cloud__() {
+ return '../cloud'
+ }
}
}
},
locals(options) {
- // Used in app/models/__name__.js
- let attrs = []; // list the entity attributes with their types
- // Used in app/controllers/entity-factories/__name__.js
- let tableCols = []; // list the colums to be display in the table
- let ctrlVars= []; // list the attributes to be mapped to the form for creating new entity
- let toCreateEntity = []; // Map attribute to value collected in the form
- // Used in app/controllers/entity-factories/__name__.js and app/routes/__name__.js
- let singularEntityName = options.entity.name;
- // Used in app/templates/__name__hbs
- let form = ['{{#bs-form formLayout="vertical" model=this onSubmit=(action "submit") as |form|}}'];
- //let form = [];
-
- // Used in mirage/factories/__name__.js
- let factories = [];
-
- // Used in mirage/models/__name__.js
- let imports = {};
- let entityOptions = options.entity.options;
- const rel = Object.keys(entityOptions).filter(key =>
- (/has-many/.test(entityOptions[key]) || /belongs-to/.test(entityOptions[key])))
- .map(key => '\n\t\t' + stringUtils.camelize(key) + relFunction(entityOptions[key]))
-
-
- let needs = []; //
- Object.values(entityOptions).forEach(value => {
- if (/has-many/.test(value)) {
- imports.hasMany = true
- }
- if (/belongs-to/.test(value)) {
- imports.belongsTo = true
- }
- })
-
- for (let name in entityOptions) {
- let type = entityOptions[name] || '';
- let foreignModel = name;
- let foreignKey = 'id';
- if (type.indexOf(':') > -1) {
- foreignModel = type.split(':')[1];
- foreignKey = type.split(':')[2];
- type = type.split(':')[0];
- }
- let dasherizedName = stringUtils.dasherize(name);
- let camelizedName = stringUtils.camelize(name);
- let dasherizedType = stringUtils.dasherize(type);
- let dasherizedForeignModel = stringUtils.dasherize(foreignModel);
- let dasherizedForeignModelSingular = inflection.singularize(dasherizedForeignModel);
-
- let attr;
- if (/has-many/.test(dasherizedType)) {
- let camelizedNamePlural = inflection.pluralize(camelizedName);
- attr = dsAttr(dasherizedForeignModelSingular, dasherizedType);
- attrs.push(camelizedNamePlural + ': ' + attr);
- } else if (/belongs-to/.test(dasherizedType)) {
- attr = dsAttr(dasherizedForeignModel, dasherizedType);
- attrs.push(camelizedName + ': ' + attr);
- } else {
- attr = dsAttr(dasherizedName, dasherizedType);
- attrs.push(camelizedName + ': ' + attr);
- tableCols.push("EmberObject.create({\n\tpropertyName: \""+camelizedName+"\",\n\ttitle: \""+name+"\"\n}),");
- }
-
- if (/has-many/.test(dasherizedType)) {
- needs.push("'model:" + dasherizedForeignModelSingular + "'");
- // Populate form with hasMany relationship --> single choice selector
- } else if (/belongs-to/.test(dasherizedType)) {
- needs.push("'model:" + dasherizedForeignModelSingular + "'");
- // Populate form with belongs-to relationship --> multi selector
-
- }
- if (!/has-many/.test(dasherizedType) && !/belongs-to/.test(dasherizedType)) {
- factories.push('\n\t' + camelizedName + fakerize(dasherizedType));
- // Populate form with simple attribute
- let buttonType = "text";
- if (type === 'boolean') {
- buttonType = "checkbox";
- }
- if (type === 'date') {
- form.push('<div class="row form-group"><label class="col-form-label col-md-4">'+camelizedName+
- '</label>{{pikaday-input useUTC=true format="DD/MM/YYYY" onSelection=(action (mut '+camelizedName+'))}}</div>');
- } else {
- form.push('{{form.element controlType="'+buttonType+'" label="'+camelizedName+'" value='+camelizedName+' onChange=(action (mut '+camelizedName+')) placeholder="'+camelizedName+'"}}');
- }
- ctrlVars.push(camelizedName+': null,');
- toCreateEntity.push(camelizedName+": this."+camelizedName);
- }
- }
- form.push('{{/bs-form}}');
- let needsDeduplicated = needs.filter(function(need, i) {
- return needs.indexOf(need) === i;
- });
-
- attrs = attrs.join(',' + EOL + ' ');
- needs = ' needs: [' + needsDeduplicated.join(', ') + ']';
- tableCols = tableCols.join(EOL);
- toCreateEntity = '{'+toCreateEntity.join(',')+'}';
+ let camelizedName = stringUtils.camelize(options.entity.name);
+ /*
+ for (let name in entityOptions) {
+ let type = entityOptions[name] || '';
+ let foreignModel = name;
+ let foreignKey = 'id';
+ if (type.indexOf(':') > -1) {
+ foreignModel = type.split(':')[1];
+ foreignKey = type.split(':')[2];
+ type = type.split(':')[0];
+ }
+ let dasherizedName = stringUtils.dasherize(name);
+ let camelizedName = stringUtils.camelize(name);
+ let dasherizedType = stringUtils.dasherize(type);
+ let dasherizedForeignModel = stringUtils.dasherize(foreignModel);
+ let dasherizedForeignModelSingular = inflection.singularize(dasherizedForeignModel);
+ */
return {
- singularEntityName: singularEntityName,
- attrs: attrs,
- tableCols: tableCols,
- toCreateEntity: toCreateEntity,
- factories: factories,
- rel: rel,
- ctrlVars: ctrlVars.join(EOL),
- form: form.join(EOL),
- imports: Object.keys(imports).map(relation => '\n\t' + relation)
+ singularEntityName: camelizedName,
+ entityValidation: entityValidation(camelizedName, options.entity.options),
+ entityModel: entityModel(camelizedName, options.entity.options),
+ mirageFactory: mirageFactory(camelizedName, options.entity.options),
+ mirageModel: mirageModel(camelizedName, options.entity.options),
+ controllerInitEntity: controllerInitEntity(camelizedName, options.entity.options),
+ controllerCreateEntity: controllerCreateEntity(camelizedName, options.entity.options),
+ controllerModelTable: controllerModelTable(camelizedName, options.entity.options),
+ templateEntityForm: templateEntityForm(camelizedName, options.entity.options)
};
},
@@ -155,17 +94,17 @@ module.exports = {
// Check that /mirage/serializers/applications.js is existing
let mirageSerializerPath = (options.dummy) ? "tests/dummy/mirage/serializers/application.js" : "mirage/serializers/application.js";
if (!fs.existsSync(mirageSerializerPath)) {
- this.ui.writeLine("Creating file "+mirageSerializerPath);
+ this.ui.writeLine("Creating file " + mirageSerializerPath);
let serializerContent = "import { JSONAPISerializer } from 'ember-cli-mirage';\n\n\texport default JSONAPISerializer.extend({\n});\n";
fs.writeFileSync(mirageSerializerPath, serializerContent, 'utf-8', 'w+');
}
// Complete /mirage/scenarios/default.js
let mirageScenarioPath = (options.dummy) ? "tests/dummy/mirage/scenarios/default.js" : "mirage/scenarios/default.js";
- let scenarioLine = '\tserver.createList\(\''+entityName+'\', '+nbFakeData+'\);\n';
+ let scenarioLine = '\tserver.createList\(\'' + entityName + '\', ' + nbFakeData + '\);\n';
if (!fs.existsSync(mirageScenarioPath)) {
- this.ui.writeLine("Creating file "+mirageScenarioPath);
- let scenarioContent = "export default function(server) {\n"+scenarioLine+"}\n";
+ this.ui.writeLine("Creating file " + mirageScenarioPath);
+ let scenarioContent = "export default function(server) {\n" + scenarioLine + "}\n";
fs.writeFileSync(mirageScenarioPath, scenarioContent, 'utf-8', 'w+');
} else {
addLineToFile(this, mirageScenarioPath, /export default function\(server\) {/, scenarioLine);
@@ -173,31 +112,31 @@ module.exports = {
// Complete /mirage/config.js
let mirageConfigPath = (options.dummy) ? "tests/dummy/mirage/config.js" : "mirage/config.js";
- let configLine = "\t\tthis.get('/"+inflection.pluralize(entityName)+"');\n"+
- "\t\tthis.get('/"+inflection.pluralize(entityName)+"/:id');\n"+
- "\t\tthis.delete('/"+inflection.pluralize(entityName)+"/:id');\n"+
- "\t\tthis.patch('/"+inflection.pluralize(entityName)+"/:id');\n"+
- "\t\tthis.post('/"+inflection.pluralize(entityName)+"');";
+ let configLine = "\t\tthis.get('/" + inflection.pluralize(entityName) + "');\n" +
+ "\t\tthis.get('/" + inflection.pluralize(entityName) + "/:id');\n" +
+ "\t\tthis.delete('/" + inflection.pluralize(entityName) + "/:id');\n" +
+ "\t\tthis.patch('/" + inflection.pluralize(entityName) + "/:id');\n" +
+ "\t\tthis.post('/" + inflection.pluralize(entityName) + "');";
if (!fs.existsSync(mirageConfigPath)) {
- this.ui.writeLine("Creating file "+mirageConfigPath);
- let configContent = "import ENV from './../config/environment';\n"+
- "export default function() {\n"+
- "\tthis.namespace = '';\n"+
- "\tif (!ENV.APP.proxy) {\n"+configLine+"\n\t} else {\n"+
- "\t\tthis.passthrough();\n\t}\n}\n";
- fs.writeFileSync(mirageConfigPath, configContent, 'utf-8','w+');
+ this.ui.writeLine("Creating file " + mirageConfigPath);
+ let configContent = "import ENV from './../config/environment';\n" +
+ "export default function() {\n" +
+ "\tthis.namespace = '';\n" +
+ "\tif (!ENV.APP.proxy) {\n" + configLine + "\n\t} else {\n" +
+ "\t\tthis.passthrough();\n\t}\n}\n";
+ fs.writeFileSync(mirageConfigPath, configContent, 'utf-8', 'w+');
} else {
addLineToFile(this, mirageConfigPath, /if \(!ENV\.APP\.proxy\) {/, configLine);
}
// Add route in router.js for the entity page
let routerPath = (options.dummy) ? "tests/dummy/app/router.js" : "app/router.js";
- let routeName = '\tthis.route\(\''+entityName+'\'\);';
+ let routeName = '\tthis.route\(\'' + entityName + '\'\);';
addLineToFile(this, routerPath, /this\.route\('entity-factory', function\(\) {/, routeName);
// Add Entity select entry in the entity controller file
let entityIndexPath = (options.dummy) ? "tests/dummy/app/controllers/entity-factory.js" : "app/controllers/entity-factory.js";
- let entityIndexEntry= "'"+entityName+"',";
+ let entityIndexEntry = "'" + entityName + "',";
addLineToFile(this, entityIndexPath, /entities: \[/, entityIndexEntry);
}
};
@@ -206,61 +145,348 @@ function addLineToFile(ctx, filePath, markerString, addedLine) {
let fileContents = fs.readFileSync(filePath, 'utf-8');
if (fileContents.indexOf(addedLine) === -1) {
- ctx.ui.writeLine("\tAdd line "+addedLine+" to file "+filePath);
- fileContents = fileContents.replace(markerString, [
- '$&',
- addedLine,
- ].join('\n'));
- }
- if (fileContents.indexOf(addedLine) === -1) {
- ctx.ui.writeWarnLine(
- 'Unable to update '+filePath+'. You should update this file manually.');
- } else {
- fs.writeFileSync(filePath, fileContents, 'utf-8');
- }
-}
-
-function dsAttr(name, type) {
- switch (type) {
- case 'belongs-to':
- return "DS.belongsTo('" + name + "')";
- case 'has-many':
- return "DS.hasMany('" + name + "')";
- case '':
- //"If you don't specify the type of the attribute, it will be whatever was provided by the server"
- //https://emberjs.com/guides/models/defining-models/
- return 'DS.attr()';
- default:
- return "DS.attr('" + type + "')";
+ ctx.ui.writeLine("\tAdd line " + addedLine + " to file " + filePath);
+ fileContents = fileContents.replace(markerString, [
+ '$&',
+ addedLine,
+ ].join('\n'));
}
-}
-
-const fakerize = (type) => {
- let typeFake
- switch (type) {
- case 'boolean':
- typeFake = 'faker.random.boolean()'
- break
- case 'date':
- typeFake = 'faker.date.past()'
- break
- case 'number':
- typeFake = 'faker.random.number({min: 0,max: 10000})'
- break
- case 'string':
- typeFake = 'faker.name.findName()'
- break
- default:
- return null
+ if (fileContents.indexOf(addedLine) === -1) {
+ ctx.ui.writeWarnLine(
+ 'Unable to update ' + filePath + '. You should update this file manually.');
+ } else {
+ fs.writeFileSync(filePath, fileContents, 'utf-8');
}
- return ' () {\n\t\treturn ' + typeFake + '\n\t}'
-}
+};
-const relFunction = (str) => {
- if (/has-many/.test(str)) {
- return ': hasMany()'
- }
- if (/belongs-to/.test(str)) {
- return ': belongsTo()'
+function templateEntityForm(name, options) {
+ let form = ['{{#bs-form formLayout="vertical" model=newEntry onSubmit=(action "submit") as |form|}}'];
+ let attributes = [];
+ for (var prop in options) {
+ let type = options[prop].split(':')[0];
+ let targetEntity = options[prop].split(':')[1];
+ switch (type) {
+ case "string":
+ case "number":
+ form.push('{{form.element controlType="text" label=\"' + prop + '\" property=\"'+ prop + '\" value=' +
+ prop + ' onChange=(action (mut ' + prop + ')) placeholder=\"' + prop + '\"}}');
+ break;
+
+ case "boolean":
+ form.push('{{form.element controlType="checkbox" label=\"' + prop + '\" property=\"'+ prop + '\" value=' +
+ prop + ' onChange=(action (mut ' + prop + ')) placeholder=\"' + prop + '\"}}');
+ break;
+
+ case "date":
+ form.push('<div class="row form-group"><label class="col-form-label col-md-4">' + prop +
+ '</label>{{pikaday-input useUTC=true format="DD/MM/YYYY" onSelection=(action (mut ' + prop + '))}}</div>');
+ break;
+
+ case 'belongs-to':
+ // todo How to deal with relationships
+ break;
+
+ case 'has-many':
+ // todo How to deal with relationships
+ break;
+
+ default:
+ // do nothing
+ break;
+ }
+ }
+ form.push("{{/bs-form}}");
+ return form.join('\n');
+ };
+
+function templateEntityForm2(name, options) {
+ let form = ['{{#bs-form formLayout="vertical" model=this onSubmit=(action "submit") as |form|}}'];
+ let attributes = [];
+ for (var prop in options) {
+ let type = options[prop].split(':')[0];
+ let targetEntity = options[prop].split(':')[1];
+ switch (type) {
+ case "string":
+ case "number":
+ form.push('{{form.element controlType="text" label=\"' + prop + '\" value=' + prop + ' onChange=(action (mut ' + prop + ')) placeholder=\"' + prop + '\"}}');
+ break;
+
+ case "boolean":
+ form.push('{{form.element controlType="checkbox" label=\"' + prop + '\" value=' + prop + ' onChange=(action (mut ' + prop + ')) placeholder=\"' + prop + '\"}}');
+ break;
+
+ case "date":
+ form.push('<div class="row form-group"><label class="col-form-label col-md-4">' + prop +
+ '</label>{{pikaday-input useUTC=true format="DD/MM/YYYY" onSelection=(action (mut ' + prop + '))}}</div>');
+ break;
+
+ case 'belongs-to':
+ // todo How to deal with relationships
+ break;
+
+ case 'has-many':
+ // todo How to deal with relationships
+ break;
+
+ default:
+ // do nothing
+ break;
+ }
+ }
+ form.push("{{/bs-form}}");
+ return form.join('\n');
+ };
+
+ function mirageFactory(name, options) {
+ let content = "import {\n\tFactory,\n\tfaker\n\t} from 'ember-cli-mirage';\n\nexport default Factory.extend({\n";
+ let attributes = [];
+ for (var prop in options) {
+ let type = options[prop].split(':')[0];
+ let constraintsString = options[prop].split(':')[1];
+ switch (type) {
+ case "string":
+ attributes.push("\t" + prop + "() {\n\t\treturn faker.name.findName();\n\t}");
+ break;
+
+ case "date":
+ attributes.push("\t" + prop + "() {\n\t\treturn faker.date.past();\n\t}");
+ break;
+
+ case "number":
+ let constraints = [];
+ let min = 0,
+ max = 10000;
+ if (constraintsString) {
+ constraints = constraintsString.split(',');
+ for (var i = 0; i < constraints.length; i++) {
+ let constraint = constraints[i];
+ if (constraint.startsWith("min")) {
+ min = constraint.substring(constraint.indexOf('(') + 1, constraint.indexOf(')'));
+ } else if (constraint.startsWith("max")) {
+ max = constraint.substring(constraint.indexOf('(') + 1, constraint.indexOf(')'));
+ }
+ }
+ }
+ attributes.push("\t" + prop + "() {\n\t\treturn faker.random.number({min: " + min + ",max: " + max + "});\n\t}");
+ break;
+
+ case "boolean":
+ attributes.push("\t" + prop + "() {\n\t\treturn faker.random.boolean();\n\t}");
+ break;
+
+ default:
+ // do nothing
+ break;
+ }
+ }
+ content += attributes.join(',\n') + "\n});";
+
+ return content;
+ };
+
+ function mirageModel(name, options) {
+ let content = "import { Model, belongsTo, hasMany} from 'ember-cli-mirage';\n\nexport default Model.extend({\n";
+ let attributes = [];
+ for (var prop in options) {
+ let type = options[prop].split(':')[0];
+ switch (type) {
+ case 'belongs-to':
+ attributes.push("\t" + prop + ": belongsTo()");
+ break;
+
+ case 'has-many':
+ attributes.push("\t" + prop + ": hasMany()");
+ break;
+
+ default:
+ // do nothing
+ break;
+ }
+ }
+ content += attributes.join(',\n') + "\n});";
+
+ return content;
+ };
+
+ function controllerInitEntity(name, options) {
+ let attributes = [];
+ for (var prop in options) {
+ let type = options[prop].split(':')[0];
+ switch (type) {
+ case "string":
+ attributes.push(prop + ": ''");
+ break;
+
+ case "number":
+ attributes.push(prop + ": 0");
+ break;
+
+ case "boolean":
+ attributes.push(prop + ": 'false'");
+ break;
+
+ case "date":
+ attributes.push(prop + ": new Date()");
+ break;
+
+ case 'belongs-to':
+ attributes.push(prop + ": ''");
+ break;
+
+ case 'has-many':
+ attributes.push(prop + ": []");
+ break;
+
+ default:
+ // do nothing
+ break;
+ }
+ }
+ return attributes.join(',');
+ };
+
+ function controllerCreateEntity(name, options) {
+ let attributes = [];
+ for (var prop in options) {
+ if (prop)
+ attributes.push(prop + ": this.newEntry." + prop);
+ }
+ return attributes.join(',');
+ };
+
+ function controllerModelTable(name, options) {
+ let content = "";
+ let tablecols = [];
+ let attributes = [];
+ for (var prop in options) {
+ let type = options[prop].split(':')[0];
+ let targetEntity = options[prop].split(':')[1];
+ switch (type) {
+ case "string":
+ case "date":
+ case "number":
+ case "boolean":
+ tablecols.push('\t\tEmberObject.create({\n\t\t\tpropertyName: \"' + prop + '\",\n\t\t\ttitle: \"' + prop + '\"\n\t\t})');
+ attributes.push("\t" + prop + ": null,");
+ break;
+
+ case 'belongs-to':
+ // todo How to deal with relationships
+ attributes.push("\t" + prop + ": null,");
+ break;
+
+ case 'has-many':
+ // todo How to deal with relationships
+ attributes.push("\t" + prop + ": null,");
+ break;
+
+ default:
+ // do nothing
+ break;
+ }
+ }
+ content += attributes.join('\n') + name + "TableColumns: computed(function() {\n\tvar col = A([\n";
+ content += tablecols.join(',\n') + "]);\n\tcol.pushObject({\n\t\ttitle: 'Delete',\n\t\tcomponent: 'delete-row'\n\t});\n\treturn col;\t}),\n";
+ content += name + "TableContent: computed(function() {\n\treturn this.get('model');\n}),";
+
+ return content;
+ };
+
+ function entityModel(name, options) {
+ let content = "import DS from 'ember-data';\n\nexport default DS.Model.extend({\n";
+ let attributes = [];
+ for (var prop in options) {
+ let type = options[prop].split(':')[0];
+ let targetEntity = options[prop].split(':')[1];
+ switch (type) {
+ case "string":
+ case "date":
+ case "number":
+ case "boolean":
+ attributes.push("\t" + prop + ": DS.attr('" + type + "')");
+ break;
+
+ case 'belongs-to':
+ attributes.push("\t" + prop + ": DS.belongsTo('" + targetEntity + "')");
+ break;
+
+ case 'has-many':
+ attributes.push("\t" + prop + ": DS.hasMany('" + targetEntity + "')");
+ break;
+
+ default:
+ // do nothing
+ break;
+ }
+ }
+ content += attributes.join(',\n') + "\n});";
+
+ return content;
+ };
+
+ function entityValidation(name, options) {
+ let content = "import {validatePresence, validateLength} from 'ember-changeset-validations/validators';\n\n" +
+ "export default {\n";
+ for (var prop in options) {
+ let attr = options[prop].split(':')[1];
+ if (attr) { // there is at least one constraint
+ let constraints = [];
+ let blocks = attr.split(',');
+ for (var i = 0; i < blocks.length; i++) {
+ let constraint = blocks[i];
+ if (constraint.startsWith('required')) {
+ constraints.push('validatePresence(true)');
+ }
+ }
+ if (constraints.length>0)
+ content += "\t" + prop + ": [" + constraints.join(',') + "],\n"
+ }
+ }
+ content += "}\n"
+ return content;
}
-}
\ No newline at end of file
+
+ function dsAttr(name, type) {
+ switch (type) {
+ case 'belongs-to':
+ return "DS.belongsTo('" + name + "')";
+ case 'has-many':
+ return "DS.hasMany('" + name + "')";
+ case '':
+ //"If you don't specify the type of the attribute, it will be whatever was provided by the server"
+ //https://emberjs.com/guides/models/defining-models/
+ return 'DS.attr()';
+ default:
+ return "DS.attr('" + type + "')";
+ }
+ };
+
+ const fakerize = (type) => {
+ let typeFake
+ switch (type) {
+ case 'boolean':
+ typeFake = 'faker.random.boolean()'
+ break
+ case 'date':
+ typeFake = 'faker.date.past()'
+ break
+ case 'number':
+ typeFake = 'faker.random.number({min: 0,max: 10000})'
+ break
+ case 'string':
+ typeFake = 'faker.name.findName()'
+ break
+ default:
+ return null
+ }
+ return ' () {\n\t\treturn ' + typeFake + '\n\t}'
+ };
+
+ const relFunction = (str) => {
+ if (/has-many/.test(str)) {
+ return ': hasMany()'
+ }
+ if (/belongs-to/.test(str)) {
+ return ': belongsTo()'
+ }
+ }
\ No newline at end of file
diff --git a/mirage/config.js b/mirage/config.js
index e916128..24e1e3f 100644
--- a/mirage/config.js
+++ b/mirage/config.js
@@ -2,21 +2,7 @@ import ENV from './../config/environment';
export default function() {
this.namespace = '';
if (!ENV.APP.proxy) {
- this.get('/tags');
- this.get('/tags/:id');
- this.delete('/tags/:id');
- this.patch('/tags/:id');
- this.post('/tags');
- this.get('/entries');
- this.get('/entries/:id');
- this.delete('/entries/:id');
- this.patch('/entries/:id');
- this.post('/entries');
- this.get('/blogs');
- this.get('/blogs/:id');
- this.delete('/blogs/:id');
- this.patch('/blogs/:id');
- this.post('/blogs');
+
} else {
this.passthrough();
}
diff --git a/mirage/scenarios/default.js b/mirage/scenarios/default.js
index a55e391..1b5dd13 100644
--- a/mirage/scenarios/default.js
+++ b/mirage/scenarios/default.js
@@ -1,7 +1,2 @@
export default function(server) {
- server.createList('tag', 8);
-
- server.createList('entry', 8);
-
- server.createList('blog', 8);
}
diff --git a/package.json b/package.json
index 6a83c49..4fe9cc8 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,13 @@
{
"name": "ember-aws-ehipster",
- "version": "0.2.21",
+ "version": "0.3.9",
"description": "Attempt to build a complete web application using serverless architecture on AWS",
"keywords": [
- "ember-addon", "aws", "jhipster", "generator", "serverless"
+ "ember-addon",
+ "aws",
+ "jhipster",
+ "generator",
+ "serverless"
],
"repository": "",
"license": "MIT",
@@ -31,12 +35,18 @@
"ember-truth-helpers": "^2.1.0",
"ember-pikaday": "^2.3.0",
"jhipster-core": "^3.4.0",
- "shelljs": "^0.8.2"
+ "shelljs": "^0.8.2",
+ "ember-validated-form": "^2.0.0-alpha.3",
+ "ember-concurrency": "^0.8.26",
+ "ember-changeset": "^1.6.0",
+ "ember-changeset-validations": "^1.3.3"
},
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^3.0.0",
"ember-auto-import": "^1.2.15",
+ "ember-changeset": "^1.6.0",
+ "ember-changeset-validations": "^1.3.3",
"ember-cli": "~3.1.4",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.2.1",
diff --git a/tests/dummy/mirage/scenarios/default.js b/tests/dummy/mirage/scenarios/default.js
index 1b5dd13..c0ed642 100644
--- a/tests/dummy/mirage/scenarios/default.js
+++ b/tests/dummy/mirage/scenarios/default.js
@@ -1,2 +1,3 @@
export default function(server) {
+
}
--
GitLab