+
);
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationBox/styles.scss b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationBox/styles.scss
index e1179fcf51..e6691c362e 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/RelationBox/styles.scss
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/RelationBox/styles.scss
@@ -41,7 +41,7 @@
.input {
> div {
> label {
- font-weight: 600;
+ font-weight: 500;
}
}
}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/sagas.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/sagas.js
index dd84b2ba98..8a6a4c117d 100755
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/App/sagas.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/App/sagas.js
@@ -6,7 +6,7 @@ import { modelsFetchSucceeded } from './actions';
export function* deleteContentType(action) {
try {
if (action.sendRequest) {
- const requestUrl = `content-type-builder/models/${action.itemToDelete}`;
+ const requestUrl = `/content-type-builder/models/${action.itemToDelete}`;
yield call(request, requestUrl, { method: 'DELETE' });
}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js
index 6ea2bc3100..b1bbd0b600 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/actions.js
@@ -151,6 +151,7 @@ export function setAttributeForm(hash) {
nature: 'oneToOne',
required: false,
unique: false,
+ dominant: false,
}),
});
const attribute = includes(hash, 'attributerelation') ? attributeRelation : data.attribute;
@@ -248,6 +249,7 @@ function setAttributeFormData(hash) {
params: Map({
type,
required: false,
+ unique: false,
maxLength: false,
minLength: false,
min: false,
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json
index 6df80166df..cabeaa73ee 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/forms.json
@@ -498,7 +498,7 @@
"type": "checkbox",
"value": false,
"validations": {},
- "inputDescription": "content-type-builder.orm.attribute.item.uniqueField.description"
+ "inputDescription": "content-type-builder.form.attribute.item.uniqueField.description"
},
{
"label": "content-type-builder.form.attribute.item.customColumnName",
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js
index fe05895a4f..706d4a7980 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/index.js
@@ -381,6 +381,11 @@ export class Form extends React.Component { // eslint-disable-line react/prefer-
if (includes(this.props.hash.split('::')[1], 'attribute')) {
this.props.changeInputAttribute(target.name, value);
+
+ if (target.name === 'params.nature' && target.value === "manyToMany") {
+ this.props.changeInputAttribute('params.dominant', true);
+ }
+
} else {
this.props.changeInput(target.name, value, includes(this.props.hash, 'edit'));
}
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/utils/setAttribute.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/utils/setAttribute.js
index 5a173a886b..c32ebc438d 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/utils/setAttribute.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/Form/utils/setAttribute.js
@@ -9,6 +9,7 @@ export default function setParallelAttribute(newAttribute) {
parallelAttribute.params.key = newAttribute.name;
parallelAttribute.params.columnName = newAttribute.params.targetColumnName;
parallelAttribute.params.targetColumnName = newAttribute.params.columnName;
+ parallelAttribute.params.dominant = false;
return parallelAttribute;
}
return;
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/actions.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/actions.js
index 399125b0c6..492727e193 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/actions.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/ModelPage/actions.js
@@ -174,6 +174,7 @@ function setParallelAttribute(data) {
parallelAttribute.name = data.params.key;
parallelAttribute.params.columnName = data.params.targetColumnName;
parallelAttribute.params.targetColumnName = data.params.columnName;
+ parallelAttribute.params.dominant = false;
return parallelAttribute;
}