gd-sprest-bs 10.5.6 → 10.5.8

package/build/webparts/base/wpSpfx.js

@@ -21,13 +21,17 @@ var _SPFxWebPart = /** @class */ (function () {
     /** The configuration modal. */
     // Constructor
     function _SPFxWebPart(props) {
-        this._cfg = null;
         this._props = null;
+        /** The webpart configuration */
+        this._cfg = null;
         /** The configuration form. */
         this._form = null;
         /** The configuration modal. */
         this._modal = null;
-        var isEdit = false;
+        /** Is in display mode */
+        this._isDisplay = null;
+        /** Is in edit mode */
+        this._isEdit = null;
         // Save the properties
         this._props = props;
         // Ensure the spfx object was set
@@ -38,41 +42,56 @@ var _SPFxWebPart = /** @class */ (function () {
         }
         // Set the page context
         gd_sprest_1.ContextInfo.setPageContext(this._props.spfx.context.pageContext);
-        // Try to parse the configuration
-        if (this._props.wpCfg) {
-            try {
-                this._cfg = JSON.parse(this._props.wpCfg);
-            }
-            catch (_a) { }
-        }
+        // Set the configuration
+        this.Configuration = this._props.wpCfg;
         // See if this is the workbench
         if (window.location.pathname.indexOf("workbench.aspx") > 0) {
-            // Render the configuration button
-            this.renderEdit();
-            // Render the solution
-            this.render();
+            // Set both flags to render edit/display
+            this._isDisplay = true;
+            this._isEdit = true;
         }
         else {
             // See if this is a classic page
             if (gd_sprest_1.Helper.SP.Ribbon.exists) {
                 // Set the flag
-                isEdit = gd_sprest_1.Helper.WebPart.isEditMode();
+                this._isEdit = gd_sprest_1.Helper.WebPart.isEditMode();
             }
             else {
                 // Set the flag
-                isEdit = this._props.spfx.displayMode == gd_sprest_1.SPTypes.FormDisplayMode.Edit;
-            }
-            // Ensure we are in edit mode
-            if (isEdit) {
-                // Render the configuration button
-                this.renderEdit();
-            }
-            else {
-                // Render the webpart
-                this.render();
+                this._isEdit = this._props.spfx.displayMode == gd_sprest_1.SPTypes.FormDisplayMode.Edit;
             }
+            // Set the flag
+            this._isDisplay = !this._isEdit;
+        }
+        // See if we are in edit mode
+        if (this._isEdit) {
+            // Render the configuration button
+            this.renderEdit();
+        }
+        // See if we are in display mode
+        if (this.IsDisplay) {
+            // Render the webpart
+            this.render();
         }
     }
+    Object.defineProperty(_SPFxWebPart.prototype, "Configuration", {
+        get: function () { return this._cfg; },
+        set: function (value) {
+            // Clear the value
+            this._cfg = {};
+            // Ensure a value exists
+            if (value) {
+                // Try to parse the value
+                try {
+                    this._cfg = JSON.parse(value);
+                }
+                catch (_a) { }
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    ;
     Object.defineProperty(_SPFxWebPart.prototype, "Form", {
         get: function () { return this._form; },
         enumerable: false,
@@ -83,6 +102,16 @@ var _SPFxWebPart = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(_SPFxWebPart.prototype, "IsDisplay", {
+        get: function () { return this._isDisplay; },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(_SPFxWebPart.prototype, "IsEdit", {
+        get: function () { return this._isEdit; },
+        enumerable: false,
+        configurable: true
+    });
     // Method to render the webpart
     _SPFxWebPart.prototype.render = function () {
         // Get the webpart element
@@ -139,6 +168,8 @@ var _SPFxWebPart = /** @class */ (function () {
                                     onClick: function () {
                                         // Show the modal
                                         _this.showEditModal();
+                                        // Close the properties window
+                                        _this._props.spfx.context.propertyPane.close();
                                     }
                                 }
                             }]
@@ -201,6 +232,14 @@ var _SPFxWebPart = /** @class */ (function () {
                                         _this._props.spfx.properties.configuration = wpCfg;
                                         // Call the saved event
                                         _this._props.onConfigSaved ? _this._props.onConfigSaved(cfg) : null;
+                                        // Close the modal
+                                        _this._modal.hide();
+                                        // See if we are in display mode
+                                        if (_this.IsDisplay) {
+                                            // Render the display webpart
+                                            // Do we need to do this?
+                                            //this.render();
+                                        }
                                     }
                                 }
                             }

package/build/webparts/list/wpSpfx.js

@@ -18,7 +18,7 @@ var base_1 = require("../base");
 /**
  * SPFx List WebPart
  */
-var SPFxListWebPart = function (props) {
+var SPFxListWebPart = function (wpProps) {
     var _ddl = null;
     var _loadFl = false;
     // Load the lists
@@ -41,7 +41,8 @@ var SPFxListWebPart = function (props) {
                 lists.push({
                     data: list,
                     text: list.Title,
-                    value: list.Id
+                    value: list.Id,
+                    isSelected: wp.Configuration ? wp.Configuration.ListId == list.Id : false
                 });
             }
             // Set the dropdown
@@ -60,13 +61,15 @@ var SPFxListWebPart = function (props) {
                     name: "WebUrl",
                     label: "Web Url",
                     type: gd_bs_1.Components.FormControlTypes.TextField,
-                    description: "The relative url to the site containing the target list."
+                    description: "The relative url to the site containing the target list.",
+                    value: wp.Configuration ? wp.Configuration.WebUrl : null
                 },
                 {
-                    name: "ListId",
+                    name: "List",
                     label: "List",
                     type: gd_bs_1.Components.FormControlTypes.Dropdown,
                     required: true,
+                    value: wp.Configuration ? wp.Configuration.ListId : null,
                     onControlRendered: function (ctrl) {
                         // Set the dropdown
                         _ddl = ctrl.dropdown;
@@ -97,10 +100,22 @@ var SPFxListWebPart = function (props) {
                 // Load the lists
                 loadLists();
             }
+        },
+        // The configuration saving event
+        onConfigSaving: function (cfg) {
+            // Get the form values
+            var values = wp.Form.getValues();
+            // Set the configuration
+            var listItem = values["List"];
+            cfg.ListId = listItem ? listItem.value : null;
+            cfg.ListName = listItem ? listItem.text : null;
+            cfg.WebUrl = values["WebUrl"];
+            // Return the configuration
+            return cfg;
         }
     };
     // Return the webpart
-    var wp = (0, base_1.SPFxWebPart)(__assign(__assign({}, props), baseProps));
+    var wp = (0, base_1.SPFxWebPart)(__assign(__assign({}, wpProps), baseProps));
     return wp;
 };
 exports.SPFxListWebPart = SPFxListWebPart;