Adding changes to also delete entityItems which are no longer in the list.

renemadsen · renemadsen · commit f77baea47291 · 2018-09-19T08:12:42.000+02:00
Fixing the broken typescript files with the new SDK.
diff --git a/eFormAPI/eFormAPI/Controllers/EntitySearchController.cs b/eFormAPI/eFormAPI/Controllers/EntitySearchController.cs
@@ -51,7 +51,7 @@ public OperationResult CreateEntityGroup(AdvEntitySearchableGroupEditModel editM
                     var nextItemUid = entityGroup.EntityGroupItemLst.Count;
                     foreach (var entityItem in editModel.AdvEntitySearchableItemModels)
                     {
-                        core.EntitySearchItemCreate(entityGroup.Id.ToString(), entityItem.Name, entityItem.Description, nextItemUid.ToString());
+                        core.EntitySearchItemCreate(entityGroup.Id, entityItem.Name, entityItem.Description, nextItemUid.ToString());
 
                         //entityGroup.EntityGroupItemLst.Add(new EntityItem(entityItem.Name,
                         //    entityItem.Description, nextItemUid.ToString(), Constants.WorkflowStates.Created));
@@ -82,20 +82,31 @@ public OperationResult UpdateEntityGroup(AdvEntitySearchableGroupEditModel editM
                 {
                     //var entityGroup = core.EntityGroupRead(groupCreate.MicrotingUUID);
                     var nextItemUid = entityGroup.EntityGroupItemLst.Count;
+                    List<int> currentIds = new List<int>();
+
                     foreach (var entityItem in editModel.AdvEntitySearchableItemModels)
                     {
-                        if (entityItem.MicrotingUUID != null)
+                        if (string.IsNullOrEmpty(entityItem.MicrotingUUID))
                         {
-                            core.EntityItemUpdate(entityItem.Id, entityItem.Name, entityItem.Description, entityItem.EntityItemUId, entityItem.DisplayIndex);
+                            EntityItem et = core.EntitySearchItemCreate(entityGroup.Id, entityItem.Name, entityItem.Description, nextItemUid.ToString());
+                            currentIds.Add(et.Id);
                         }
                         else
                         {
-                            core.EntitySearchItemCreate(entityGroup.Id.ToString(), entityItem.Name, entityItem.Description, nextItemUid.ToString());
+                            core.EntityItemUpdate(entityItem.Id, entityItem.Name, entityItem.Description, entityItem.EntityItemUId, entityItem.DisplayIndex);
+                            currentIds.Add(entityItem.Id);
                         }
                         //entityGroup.EntityGroupItemLst.Add(new EntityItem(entityItem.Name,
                         //    entityItem.Description, nextItemUid.ToString(), Constants.WorkflowStates.Created));
                         nextItemUid++;
                     }
+                    foreach (EntityItem entityItem in entityGroup.EntityGroupItemLst)
+                    {
+                        if (!currentIds.Contains(entityItem.Id))
+                        {
+                            core.EntityItemDelete(entityItem.Id);
+                        }
+                    }
                     //core.EntityGroupUpdate(entityGroup);
                 }
                 return new OperationResult(true, LocaleHelper.GetString("ParamUpdatedSuccessfully", editModel.GroupUid));
diff --git a/eFormAPI/eFormAPI/Controllers/EntitySelectController.cs b/eFormAPI/eFormAPI/Controllers/EntitySelectController.cs
@@ -51,7 +51,7 @@ public OperationResult CreateEntityGroup(AdvEntitySelectableGroupEditModel editM
                     var nextItemUid = entityGroup.EntityGroupItemLst.Count;
                     foreach (var entityItem in editModel.AdvEntitySelectableItemModels)
                     {
-                        core.EntitySelectItemCreate(entityGroup.Id.ToString(), entityItem.Name, entityItem.DisplayIndex, nextItemUid.ToString());
+                        core.EntitySelectItemCreate(entityGroup.Id, entityItem.Name, entityItem.DisplayIndex, nextItemUid.ToString());
                         //entityGroup.EntityGroupItemLst.Add(new EntityItem(entityItem.Name,
                         //    entityItem.Description, nextItemUid.ToString(), Constants.WorkflowStates.Created));
                         nextItemUid++;
@@ -75,28 +75,31 @@ public OperationResult UpdateEntityGroup(AdvEntitySelectableGroupEditModel editM
                 var core = _coreHelper.GetCore();
                 var entityGroup = core.EntityGroupRead(editModel.GroupUid);
 
-                //entityGroup.EntityGroupItemLst = editModel.AdvEntitySelectableItemModels;
-                //entityGroup.Name = editModel.Name;
-                //core.EntityGroupUpdate(entityGroup);
                 if (editModel.AdvEntitySelectableItemModels.Any())
                 {
-                    //var entityGroup = core.EntityGroupRead(groupCreate.MicrotingUUID);
                     var nextItemUid = entityGroup.EntityGroupItemLst.Count;
-                    foreach (var entityItem in editModel.AdvEntitySelectableItemModels)
+                    List<int> currentIds = new List<int>();
+                    foreach (EntityItem entityItem in editModel.AdvEntitySelectableItemModels)
                     {
-                        if (entityItem.MicrotingUUID != null)
+                        if (string.IsNullOrEmpty(entityItem.MicrotingUUID))
                         {
-                            core.EntityItemUpdate(entityItem.Id, entityItem.Name, entityItem.Description, entityItem.EntityItemUId, entityItem.DisplayIndex);
+                            EntityItem et = core.EntitySelectItemCreate(entityGroup.Id, entityItem.Name, entityItem.DisplayIndex, nextItemUid.ToString());
+                            currentIds.Add(et.Id);
                         }
                         else
                         {
-                            core.EntitySelectItemCreate(entityGroup.Id.ToString(), entityItem.Name, entityItem.DisplayIndex, nextItemUid.ToString());
+                            core.EntityItemUpdate(entityItem.Id, entityItem.Name, entityItem.Description, entityItem.EntityItemUId, entityItem.DisplayIndex);
+                            currentIds.Add(entityItem.Id);
                         }
-                        //entityGroup.EntityGroupItemLst.Add(new EntityItem(entityItem.Name,
-                        //    entityItem.Description, nextItemUid.ToString(), Constants.WorkflowStates.Created));
                         nextItemUid++;
                     }
-                    //core.EntityGroupUpdate(entityGroup);
+                    foreach (EntityItem entityItem in entityGroup.EntityGroupItemLst)
+                    {
+                        if (!currentIds.Contains(entityItem.Id))
+                        {
+                            core.EntityItemDelete(entityItem.Id);
+                        }
+                    }
                 }
                 return new OperationResult(true, LocaleHelper.GetString("ParamUpdatedSuccessfully", editModel.GroupUid));
             }
diff --git a/eform-client/src/app/common/models/advanced/adv-entity-searchable-group.model.ts b/eform-client/src/app/common/models/advanced/adv-entity-searchable-group.model.ts
@@ -2,7 +2,7 @@ import {AdvEntitySearchableItemModel} from './adv-entity-searchable-item.model';
 export class AdvEntitySearchableGroupModel {
   name: string;
   type: string;
-  entityGroupMUId: string;
+  microtingUUID: string;
   workflowState: string;
   status = true;
   createdAt: Date;
diff --git a/eform-client/src/app/common/models/advanced/adv-entity-selectable-group.model.ts b/eform-client/src/app/common/models/advanced/adv-entity-selectable-group.model.ts
@@ -2,7 +2,7 @@ import {AdvEntitySelectableItemModel} from './adv-entity-selectable-item.model';
 export class AdvEntitySelectableGroupModel {
   name: string;
   type: string;
-  entityGroupMUId: string;
+  microtingUUID: string;
   workflowState: string;
   status = true;
   createdAt: Date;
diff --git a/eform-client/src/app/modules/advanced/components/entity-search/entity-search-remove/entity-search-remove.component.ts b/eform-client/src/app/modules/advanced/components/entity-search/entity-search-remove/entity-search-remove.component.ts
@@ -24,7 +24,7 @@ export class EntitySearchRemoveComponent implements OnInit {
 
   deleteSelectedAdvEntitySearchableGroup() {
     this.spinnerStatus = true;
-    this.entitySearchService.deleteEntitySearchableGroup(this.selectedGroupModel.entityGroupMUId).subscribe((data) => {
+    this.entitySearchService.deleteEntitySearchableGroup(this.selectedGroupModel.microtingUUID).subscribe((data) => {
       if (data && data.success) {
         this.frame.hide();
         this.onEntityRemoved.emit();
diff --git a/eform-client/src/app/modules/advanced/components/entity-search/entity-search/entity-search.component.html b/eform-client/src/app/modules/advanced/components/entity-search/entity-search/entity-search.component.html
@@ -52,7 +52,7 @@
       </thead>
       <tbody>
       <tr *ngFor="let advEntitySearchableGroup of advEntitySearchableGroupListModel.entityGroups">
-        <td scope="row">{{advEntitySearchableGroup.entityGroupMUId}}</td>
+        <td scope="row">{{advEntitySearchableGroup.microtingUUID}}</td>
         <td> {{advEntitySearchableGroup.name}}</td>
         <td>
           <div class="d-flex flex-row justify-content-center">
diff --git a/eform-client/src/app/modules/advanced/components/entity-search/entity-search/entity-search.component.ts b/eform-client/src/app/modules/advanced/components/entity-search/entity-search/entity-search.component.ts
@@ -42,7 +42,7 @@ export class EntitySearchComponent implements OnInit {
 
   openModalSearchEdit(selectedSearchModel: AdvEntitySelectableGroupModel) {
     this.selectedAdvGroup = selectedSearchModel;
-    this.modalSearchEdit.show(this.selectedAdvGroup.entityGroupMUId);
+    this.modalSearchEdit.show(this.selectedAdvGroup.microtingUUID);
   }
 
 
diff --git a/eform-client/src/app/modules/advanced/components/entity-select/entity-select-remove/entity-select-remove.component.ts b/eform-client/src/app/modules/advanced/components/entity-select/entity-select-remove/entity-select-remove.component.ts
@@ -24,7 +24,7 @@ export class EntitySelectRemoveComponent implements OnInit {
 
   deleteSelectedAdvEntitySelectableGroup() {
     this.spinnerStatus = true;
-    this.entitySelectService.deleteEntitySelectableGroup(this.selectedGroupModel.entityGroupMUId).subscribe((data) => {
+    this.entitySelectService.deleteEntitySelectableGroup(this.selectedGroupModel.microtingUUID).subscribe((data) => {
       if (data && data.success) {
         this.frame.hide();
         this.onEntityRemoved.emit();
diff --git a/eform-client/src/app/modules/advanced/components/entity-select/entity-select/entity-select.component.html b/eform-client/src/app/modules/advanced/components/entity-select/entity-select/entity-select.component.html
@@ -52,7 +52,7 @@
       </thead>
       <tbody>
       <tr *ngFor="let advEntitySelectableGroup of advEntitySelectableGroupListModel.entityGroups">
-        <td scope="row">{{advEntitySelectableGroup.entityGroupMUId}}</td>
+        <td scope="row">{{advEntitySelectableGroup.microtingUUID}}</td>
         <td> {{advEntitySelectableGroup.name}}</td>
         <td>
           <div class="d-flex flex-row justify-content-center">
diff --git a/eform-client/src/app/modules/advanced/components/entity-select/entity-select/entity-select.component.ts b/eform-client/src/app/modules/advanced/components/entity-select/entity-select/entity-select.component.ts
@@ -42,7 +42,7 @@ export class EntitySelectComponent implements OnInit {
 
   openModalSelectEdit(selectedSelectModel: AdvEntitySelectableGroupModel) {
     this.selectedAdvGroup = selectedSelectModel;
-    this.modalSelectEdit.show(this.selectedAdvGroup.entityGroupMUId);
+    this.modalSelectEdit.show(this.selectedAdvGroup.microtingUUID);
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public OperationResult CreateEntityGroup(AdvEntitySearchableGroupEditModel editM`
`51`	`51`	`var nextItemUid = entityGroup.EntityGroupItemLst.Count;`
`52`	`52`	`foreach (var entityItem in editModel.AdvEntitySearchableItemModels)`
`53`	`53`	`{`
`54`		`- core.EntitySearchItemCreate(entityGroup.Id.ToString(), entityItem.Name, entityItem.Description, nextItemUid.ToString());`
	`54`	`+ core.EntitySearchItemCreate(entityGroup.Id, entityItem.Name, entityItem.Description, nextItemUid.ToString());`
`55`	`55`
`56`	`56`	`//entityGroup.EntityGroupItemLst.Add(new EntityItem(entityItem.Name,`
`57`	`57`	`// entityItem.Description, nextItemUid.ToString(), Constants.WorkflowStates.Created));`
`@@ -82,20 +82,31 @@ public OperationResult UpdateEntityGroup(AdvEntitySearchableGroupEditModel editM`
`82`	`82`	`{`
`83`	`83`	`//var entityGroup = core.EntityGroupRead(groupCreate.MicrotingUUID);`
`84`	`84`	`var nextItemUid = entityGroup.EntityGroupItemLst.Count;`
	`85`	`+ List<int> currentIds = new List<int>();`
	`86`	`+`
`85`	`87`	`foreach (var entityItem in editModel.AdvEntitySearchableItemModels)`
`86`	`88`	`{`
`87`		`- if (entityItem.MicrotingUUID != null)`
	`89`	`+ if (string.IsNullOrEmpty(entityItem.MicrotingUUID))`
`88`	`90`	`{`
`89`		`- core.EntityItemUpdate(entityItem.Id, entityItem.Name, entityItem.Description, entityItem.EntityItemUId, entityItem.DisplayIndex);`
	`91`	`+ EntityItem et = core.EntitySearchItemCreate(entityGroup.Id, entityItem.Name, entityItem.Description, nextItemUid.ToString());`
	`92`	`+ currentIds.Add(et.Id);`
`90`	`93`	`}`
`91`	`94`	`else`
`92`	`95`	`{`
`93`		`- core.EntitySearchItemCreate(entityGroup.Id.ToString(), entityItem.Name, entityItem.Description, nextItemUid.ToString());`
	`96`	`+ core.EntityItemUpdate(entityItem.Id, entityItem.Name, entityItem.Description, entityItem.EntityItemUId, entityItem.DisplayIndex);`
	`97`	`+ currentIds.Add(entityItem.Id);`
`94`	`98`	`}`
`95`	`99`	`//entityGroup.EntityGroupItemLst.Add(new EntityItem(entityItem.Name,`
`96`	`100`	`// entityItem.Description, nextItemUid.ToString(), Constants.WorkflowStates.Created));`
`97`	`101`	`nextItemUid++;`
`98`	`102`	`}`
	`103`	`+ foreach (EntityItem entityItem in entityGroup.EntityGroupItemLst)`
	`104`	`+ {`
	`105`	`+ if (!currentIds.Contains(entityItem.Id))`
	`106`	`+ {`
	`107`	`+ core.EntityItemDelete(entityItem.Id);`
	`108`	`+ }`
	`109`	`+ }`
`99`	`110`	`//core.EntityGroupUpdate(entityGroup);`
`100`	`111`	`}`
`101`	`112`	`return new OperationResult(true, LocaleHelper.GetString("ParamUpdatedSuccessfully", editModel.GroupUid));`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export class EntitySearchComponent implements OnInit {`
`42`	`42`
`43`	`43`	`openModalSearchEdit(selectedSearchModel: AdvEntitySelectableGroupModel) {`
`44`	`44`	`this.selectedAdvGroup = selectedSearchModel;`
`45`		`- this.modalSearchEdit.show(this.selectedAdvGroup.entityGroupMUId);`
	`45`	`+ this.modalSearchEdit.show(this.selectedAdvGroup.microtingUUID);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`