MAGETWO-44228: Unable to set gift options in the shopping cart

Author: irenelagno

app/code/Magento/GiftMessage/view/frontend/web/js/model/gift-options.js

@@ -3,18 +3,30 @@
  * See COPYING.txt for license details.
  */
 /*global define*/
-define(['underscore'],
-    function (_) {
-        "use strict";
+define(['underscore', 'ko'],
+    function (_, ko) {
+
+        'use strict';
+
         return {
-            options: [],
-            addOption: function(option) {
-                if(!this.options.hasOwnProperty(option.itemId)) {
-                    this.options[option.itemId] = option;
+            options: ko.observableArray([]),
+            addOption: function (option) {
+                if (!this.options().hasOwnProperty(option.itemId)) {
+                    this.options.push({
+                            id: option.itemId, value: option
+                        }
+                    );
                 }
             },
-            getOptionByItemId: function(itemId) {
-                return this.options.hasOwnProperty(itemId) ? this.options[itemId] : null;
+            getOptionByItemId: function (itemId) {
+                var option = null;
+                _.each(this.options(), function (data) {
+                    if (data.id === itemId) {
+                        option = data.value;
+                    }
+                });
+
+                return option;
             }
         }
     }

app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js

@@ -3,7 +3,12 @@
  * See COPYING.txt for license details.
  */
 /*global define*/
-define(['uiComponent', '../model/gift-message', '../model/gift-options', '../action/gift-options'],
+define([
+        'uiComponent',
+        'Magento_GiftMessage/js/model/gift-message',
+        'Magento_GiftMessage/js/model/gift-options',
+        'Magento_GiftMessage/js/action/gift-options'
+    ],
     function (Component, giftMessage, giftOptions, giftOptionsService) {
         "use strict";
         return Component.extend({