From cb671cf40f91f6f96f198da0c71d2c67d6603b86 Mon Sep 17 00:00:00 2001
From: Dhia Eddine Saidi <dhiasaidi.ensit@gmail.com>
Date: Fri, 27 Apr 2018 10:40:58 +0100
Subject: [PATCH 1/2] fix #274 Button close does not exist in the NoFramework
 Component.

This is bug fixing commit.
---
 .../no-framework/no-framework.component.ts    | 53 +++++++++++++++++--
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/lib/src/framework-library/no-framework/no-framework.component.ts b/src/lib/src/framework-library/no-framework/no-framework.component.ts
index 28a4a963..b825df4e 100755
--- a/src/lib/src/framework-library/no-framework/no-framework.component.ts
+++ b/src/lib/src/framework-library/no-framework/no-framework.component.ts
@@ -1,15 +1,62 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
+import * as _ from 'lodash';
+import { JsonSchemaFormService } from '../../json-schema-form.service';
 
 @Component({
   selector: 'no-framework',
   template: `
+  <button style='float:right;clear: right;' *ngIf="showRemoveButton"
+  type="button"
+  (click)="removeItem()">
+  <span aria-hidden="true">&times;</span>
+</button>
     <select-widget-widget
       [dataIndex]="dataIndex"
       [layoutIndex]="layoutIndex"
-      [layoutNode]="layoutNode"></select-widget-widget>`,
+      [layoutNode]="layoutNode"></select-widget-widget>
+      `,
 })
-export class NoFrameworkComponent {
+export class NoFrameworkComponent implements OnInit {
+
+  options: any; // Options used in this framework
+  parentArray: any = null;
+  isOrderable = false;
+
   @Input() layoutNode: any;
   @Input() layoutIndex: number[];
   @Input() dataIndex: number[];
+
+  constructor(
+    public jsf: JsonSchemaFormService
+  ) { }
+
+  ngOnInit() {
+    this.options = _.cloneDeep(this.layoutNode.options);
+    if (this.layoutNode.arrayItem && this.layoutNode.type !== '$ref') {
+      this.parentArray = this.jsf.getParentNode(this);
+      if (this.parentArray) {
+        this.isOrderable = this.layoutNode.arrayItemType === 'list' &&
+          !this.options.readonly && this.parentArray.options.orderable;
+      }
+    }
+  }
+
+
+  get showRemoveButton(): boolean {
+    if (!this.options.removable || this.options.readonly ||
+      this.layoutNode.type === '$ref'
+    ) { return false; }
+    if (this.layoutNode.recursiveReference) { return true; }
+    if (!this.layoutNode.arrayItem || !this.parentArray) { return false; }
+    // If array length <= minItems, don't allow removing any items
+    return this.parentArray.items.length - 1 <= this.parentArray.options.minItems ? false :
+      // For removable list items, allow removing any item
+      this.layoutNode.arrayItemType === 'list' ? true :
+        // For removable tuple items, only allow removing last item in list
+        this.layoutIndex[this.layoutIndex.length - 1] === this.parentArray.items.length - 2;
+  }
+
+  removeItem() {
+    this.jsf.removeItem(this);
+  }
 }

From ad821ae815398e74482b9380037b689352ad9d6f Mon Sep 17 00:00:00 2001
From: Dhia Eddine Saidi <dhiasaidi.ensit@gmail.com>
Date: Wed, 11 Jul 2018 14:27:40 +0100
Subject: [PATCH 2/2] fix for set error: Invalid JSON on returnEmptyFields:
 true #282

---
 src/lib/src/shared/jsonpointer.functions.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/src/shared/jsonpointer.functions.ts b/src/lib/src/shared/jsonpointer.functions.ts
index e6075228..cbe1336b 100755
--- a/src/lib/src/shared/jsonpointer.functions.ts
+++ b/src/lib/src/shared/jsonpointer.functions.ts
@@ -392,7 +392,10 @@ export class JsonPointer {
       console.error(`forEachDeep error: Iterator is not a function:`, fn);
       return;
     }
+    const firstPointerPart = pointer.split('/')[1];
+    if (firstPointerPart && rootObject.hasOwnProperty(firstPointerPart)) {
     if (!bottomUp) { fn(object, pointer, rootObject); }
+    }
     if (isObject(object) || isArray(object)) {
       for (let key of Object.keys(object)) {
         const newPointer = pointer + '/' + this.escape(key);