diff --git a/backend/i18n/frontend_en.json b/backend/i18n/frontend_en.json index 0898103a9..743ebd43d 100644 --- a/backend/i18n/frontend_en.json +++ b/backend/i18n/frontend_en.json @@ -204,6 +204,7 @@ "common.backups": "Backups", "common.bytes": "bytes", "common.cancel": "Cancel", + "common.category": "Category", "common.clear": "Clear", "common.clientId": "Client Id", "common.clients": "Clients", diff --git a/backend/i18n/frontend_it.json b/backend/i18n/frontend_it.json index a10b1c580..efb9ce2c8 100644 --- a/backend/i18n/frontend_it.json +++ b/backend/i18n/frontend_it.json @@ -204,6 +204,7 @@ "common.backups": "Backup", "common.bytes": "byte", "common.cancel": "Annulla", + "common.category": "Category", "common.clear": "Pulisci", "common.clientId": "Id Client", "common.clients": "Client", diff --git a/backend/i18n/frontend_nl.json b/backend/i18n/frontend_nl.json index b659aab99..a12ec2bcc 100644 --- a/backend/i18n/frontend_nl.json +++ b/backend/i18n/frontend_nl.json @@ -204,6 +204,7 @@ "common.backups": "Back-ups", "common.bytes": "bytes", "common.cancel": "Annuleren", + "common.category": "Category", "common.clear": "Wissen", "common.clientId": "Client-ID", "common.clients": "Clients", diff --git a/backend/i18n/source/frontend_en.json b/backend/i18n/source/frontend_en.json index 0898103a9..743ebd43d 100644 --- a/backend/i18n/source/frontend_en.json +++ b/backend/i18n/source/frontend_en.json @@ -204,6 +204,7 @@ "common.backups": "Backups", "common.bytes": "bytes", "common.cancel": "Cancel", + "common.category": "Category", "common.clear": "Clear", "common.clientId": "Client Id", "common.clients": "Clients", diff --git a/backend/src/Squidex.Shared/Texts.it.resx b/backend/src/Squidex.Shared/Texts.it.resx index e9783eebf..e93b41b0e 100644 --- a/backend/src/Squidex.Shared/Texts.it.resx +++ b/backend/src/Squidex.Shared/Texts.it.resx @@ -176,7 +176,7 @@ Hai raggiunto la dimensione massima consentito per le risorse. - Assets is referenced by a content and cannot be deleted. + La risorsa è collegata ad un contenuto pertanto non può essere cancellata. E' in esecuzione una altro processo di backup. @@ -476,7 +476,7 @@ {count} Collegamenti(s) - Content is referenced by another content and cannot be deleted. + Il contenuto è collegato ad un altro contenuto e pertanto non può essere cancellato. Il contenuto singleton non può essere aggiornato @@ -512,7 +512,7 @@ Non può avere valori duplicati. - Validation failed with internal error. + Non è stato possibile validare a causa di un errore interno. Deve essere esattamente {value}. @@ -677,7 +677,7 @@ La query Json non è valida: {message} - Entity ({id}) already exists. + L'entità ({id}) esiste già. L'entità ({id}) è stata cancellata. diff --git a/frontend/app/features/schemas/pages/schemas/schema-form.component.html b/frontend/app/features/schemas/pages/schemas/schema-form.component.html index 2fe8b4e35..49e66aced 100644 --- a/frontend/app/features/schemas/pages/schemas/schema-form.component.html +++ b/frontend/app/features/schemas/pages/schemas/schema-form.component.html @@ -14,17 +14,17 @@
- + - + {{ 'schemas.schemaNameHint' | sqxTranslate }}
- +
@@ -65,6 +65,21 @@
+ + {{ 'schemas.nameWarning' | sqxTranslate }} + + + +
+ + + +
+ +
- - - {{ 'schemas.nameWarning' | sqxTranslate }} - diff --git a/frontend/app/features/schemas/pages/schemas/schema-form.component.ts b/frontend/app/features/schemas/pages/schemas/schema-form.component.ts index 70edb0fed..4dfdd3cec 100644 --- a/frontend/app/features/schemas/pages/schemas/schema-form.component.ts +++ b/frontend/app/features/schemas/pages/schemas/schema-form.component.ts @@ -31,8 +31,8 @@ export class SchemaFormComponent implements OnInit { constructor( public readonly apiUrl: ApiUrlConfig, public readonly appsState: AppsState, - private readonly formBuilder: FormBuilder, - private readonly schemasState: SchemasState + public readonly schemasState: SchemasState, + private readonly formBuilder: FormBuilder ) { } diff --git a/frontend/app/shared/components/schema-category.component.html b/frontend/app/shared/components/schema-category.component.html index bb9dc6217..626587e59 100644 --- a/frontend/app/shared/components/schema-category.component.html +++ b/frontend/app/shared/components/schema-category.component.html @@ -12,7 +12,14 @@
-

{{schemaCategory.name}}

+

+ + {{schemaCategory.name}} + + + {{ 'i18n:common.schemas' | sqxTranslate }} + +

@@ -31,7 +38,6 @@
diff --git a/frontend/app/shared/components/schema-category.component.scss b/frontend/app/shared/components/schema-category.component.scss index 45155b172..69db35af9 100644 --- a/frontend/app/shared/components/schema-category.component.scss +++ b/frontend/app/shared/components/schema-category.component.scss @@ -94,10 +94,6 @@ $drag-margin: -8px; } } -.cdk-drag-placeholder { - display: none; -} - .cdk-drag-animating { transition: none; } diff --git a/frontend/app/shared/services/schemas.service.ts b/frontend/app/shared/services/schemas.service.ts index 35402bc56..decb75d47 100644 --- a/frontend/app/shared/services/schemas.service.ts +++ b/frontend/app/shared/services/schemas.service.ts @@ -345,8 +345,10 @@ export interface UpdateUIFields { export interface CreateSchemaDto { readonly name: string; readonly fields?: ReadonlyArray; - readonly properties?: SchemaPropertiesDto; + readonly category?: string; readonly isSingleton?: boolean; + readonly isPublished?: boolean; + readonly properties?: SchemaPropertiesDto; } export interface UpdateSchemaCategoryDto { diff --git a/frontend/app/shared/state/schemas.forms.ts b/frontend/app/shared/state/schemas.forms.ts index 6f83b106c..8b6a81582 100644 --- a/frontend/app/shared/state/schemas.forms.ts +++ b/frontend/app/shared/state/schemas.forms.ts @@ -31,21 +31,22 @@ export class CreateSchemaForm extends Form { ValidatorsEx.pattern('[a-z0-9]+(\-[a-z0-9]+)*', 'i18n:schemas.schemaNameValidationMessage') ] ], + initialCategory: undefined, isSingleton: false, importing: {} })); } public transformLoad(value: CreateSchemaDto) { - const { name, isSingleton, ...importing } = value; + const { name, isSingleton, category, ...importing } = value; - return { name, isSingleton, importing }; + return { name, isSingleton, importing, initialCategory: category }; } public transformSubmit(value: any): CreateSchemaDto { - const { name, isSingleton, importing } = value; + const { name, isSingleton, importing, initialCategory } = value; - return { name, isSingleton, ...importing }; + return { name, isSingleton, category: initialCategory, ...importing }; } } diff --git a/frontend/app/shared/state/schemas.state.ts b/frontend/app/shared/state/schemas.state.ts index a5da0ba4b..7d82d06bc 100644 --- a/frontend/app/shared/state/schemas.state.ts +++ b/frontend/app/shared/state/schemas.state.ts @@ -43,7 +43,7 @@ function sameSchema(lhs: SchemaDetailsDto | null, rhs?: SchemaDetailsDto | null) @Injectable() export class SchemasState extends State { - public categoriesPlain = + public categoryNames = this.project(x => x.categories); public selectedSchemaOrNull = @@ -68,7 +68,7 @@ export class SchemasState extends State { this.projectFrom(this.schemas, x => x.filter(s => s.isPublished)); public categories = - this.projectFrom2(this.schemas, this.categoriesPlain, (s, c) => buildCategories(c, s)); + this.projectFrom2(this.schemas, this.categoryNames, (s, c) => buildCategories(c, s)); public get schemaId() { return this.snapshot.selectedSchema?.id || ''; @@ -383,8 +383,10 @@ function getField(x: SchemaDetailsDto, request: AddFieldDto, parent?: RootFieldD } } +const NO_NAME = ''; + function buildCategories(categories: ReadonlyArray, schemas: SchemasList): ReadonlyArray { - const uniqueCategories: { [name: string]: true } = {}; + const uniqueCategories: { [name: string]: true } = { [NO_NAME]: true }; for (const category of categories) { uniqueCategories[category] = true; @@ -408,7 +410,7 @@ function buildCategories(categories: ReadonlyArray, schemas: SchemasList } function getCategory(schema: SchemaDto) { - return schema.category || 'Schemas'; + return schema.category || NO_NAME; } export function isSameCategory(name: string, schema: SchemaDto): boolean {