Merge pull request #1682 from NapiformGoose/2.1/bug/removeTypeCollection

[#1005593] Remove attribute type Collection
comindware · Dec 8, 2021 · b770362 · b770362
2 parents 699214d + 45851e7
commit b770362
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 16 deletions.
diff --git a/demo/app/cases/editors/ContextEditor.js b/demo/app/cases/editors/ContextEditor.js
@@ -46,7 +46,7 @@ export default function() {
                     },
                     {
                         instanceTypeId: 'oa.1',
-                        type: 'Collection',
+                        type: 'Instance',
                         format: 'Undefined',
                         name: 'coll',
                         displayAttribute: false,
@@ -133,7 +133,7 @@ export default function() {
                     },
                     {
                         instanceTypeId: 'oa.1',
-                        type: 'Collection',
+                        type: 'Instance',
                         format: 'Undefined',
                         name: 'coll',
                         displayAttribute: false,

diff --git a/demo/app/cases/editors/MultiEditorEditor.js b/demo/app/cases/editors/MultiEditorEditor.js
@@ -54,7 +54,7 @@ export default function() {
                     },
                     {
                         instanceTypeId: 'oa.1',
-                        type: 'Collection',
+                        type: 'Instance',
                         format: 'Undefined',
                         name: 'coll',
                         displayAttribute: false,
@@ -134,7 +134,7 @@ export default function() {
                     },
                     {
                         instanceTypeId: 'oa.1',
-                        type: 'Collection',
+                        type: 'Instance',
                         format: 'Undefined',
                         name: 'coll',
                         displayAttribute: false,

diff --git a/demo/app/cases/list/compactGrid.js b/demo/app/cases/list/compactGrid.js
@@ -143,7 +143,7 @@ export default function() {
                     },
                     {
                         instanceTypeId: 'oa.1',
-                        type: 'Collection',
+                        type: 'Instance',
                         format: 'Undefined',
                         name: 'coll',
                         displayAttribute: false,
@@ -223,7 +223,7 @@ export default function() {
                     },
                     {
                         instanceTypeId: 'oa.1',
-                        type: 'Collection',
+                        type: 'Instance',
                         format: 'Undefined',
                         name: 'coll',
                         displayAttribute: false,

diff --git a/demo/app/cases/list/complexGrid.js b/demo/app/cases/list/complexGrid.js
@@ -288,7 +288,7 @@ export default function() {
                     },
                     {
                         instanceTypeId: 'oa.1',
-                        type: 'Collection',
+                        type: 'Instance',
                         format: 'Undefined',
                         name: 'coll',
                         displayAttribute: false,
@@ -368,7 +368,7 @@ export default function() {
                     },
                     {
                         instanceTypeId: 'oa.1',
-                        type: 'Collection',
+                        type: 'Instance',
                         format: 'Undefined',
                         name: 'coll',
                         displayAttribute: false,

diff --git a/src/Meta.ts b/src/Meta.ts
@@ -38,7 +38,6 @@ const meta = {
     string: 'font',
     boolean: 'check-square',
     table: 'newspaper',
-    collection: 'newspaper',
     subform: 'list-alt',
     undefined: 'dot-circle',
     task: 'tasks',
@@ -73,7 +72,6 @@ export const objectPropertyTypes = {
     DOCUMENT: 'Document',
     IMAGE: 'Image',
     INSTANCE: 'Instance',
-    COLLECTION: 'Collection',
     ENUM: 'Enum',
     ROLE: 'Role',    
     ORGANIZATION_UNIT: 'OrganizationalUnit',

diff --git a/src/list/meta.ts b/src/list/meta.ts
@@ -36,7 +36,6 @@ export const columnTypes = {
     reference: 'InstanceProperty',
     enumerable: 'EnumProperty',
     document: 'DocumentProperty',
-    collection: 'Collection',
     id: 'id'
 };
 
@@ -45,7 +44,6 @@ export const columnType = columnTypes;
 export const columnWidthByType = {
     [objectPropertyTypes.ACCOUNT]: 120,
     [objectPropertyTypes.BOOLEAN]: 120,
-    [objectPropertyTypes.COLLECTION]: 120,
     [objectPropertyTypes.DATETIME]: 120,
     [objectPropertyTypes.DECIMAL]: 120,
     [objectPropertyTypes.DOCUMENT]: 120,

diff --git a/tests/specs/form/ComplexEditor.spec.js b/tests/specs/form/ComplexEditor.spec.js
@@ -42,7 +42,7 @@ const context = {
         },
         {
             instanceTypeId: 'oa.1',
-            type: 'Collection',
+            type: 'Instance',
             format: 'Undefined',
             name: 'coll',
             displayAttribute: false,
@@ -122,7 +122,7 @@ const context = {
         },
         {
             instanceTypeId: 'oa.1',
-            type: 'Collection',
+            type: 'Instance',
             format: 'Undefined',
             name: 'coll',
             displayAttribute: false,

diff --git a/tests/specs/form/ContextEditor.spec.js b/tests/specs/form/ContextEditor.spec.js
@@ -42,7 +42,7 @@ const context = {
         },
         {
             instanceTypeId: 'oa.1',
-            type: 'Collection',
+            type: 'Instance',
             format: 'Undefined',
             name: 'coll',
             displayAttribute: false,
@@ -122,7 +122,7 @@ const context = {
         },
         {
             instanceTypeId: 'oa.1',
-            type: 'Collection',
+            type: 'Instance',
             format: 'Undefined',
             name: 'coll',
             displayAttribute: false,