Merge pull request #44 from umbraco/bugfix/dynamics-property-editor

Use cases updates

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.Dynamics/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics/js/formpicker.controller.js

@@ -3,13 +3,9 @@
     var vm = this;
 
     vm.loading = false;
-    vm.dynamicsFormsList = [];
-
     vm.searchTerm = "";
-
     vm.selectedForm = {};
     vm.iframeEmbedded = false;
-
     vm.isConnected = false;
 
     umbracoCmsIntegrationsCrmDynamicsResource.checkOAuthConfiguration().then(function (response) {
@@ -26,6 +22,10 @@
 
         umbracoCmsIntegrationsCrmDynamicsResource.getEmbedCode(form.id).then(function (response) {
 
+            if (response.length == 0) {
+                notificationsService.warning("Dynamics API", "Unable to embed selected form. Please check if it is live.");
+            }
+
             form.embedCode = response;
 
             $scope.model.value = form;
@@ -49,9 +49,11 @@
             size: "medium",
             selectForm: function (form, iframeEmbedded) {
 
-                form.iframeEmbedded = iframeEmbedded;
+                if (form.id !== undefined) {
+                    form.iframeEmbedded = iframeEmbedded;
 
-                vm.saveForm(form);
+                    vm.saveForm(form);
+                }
 
                 editorService.close();
             },
@@ -64,8 +66,9 @@
     };
 
     function loadForms() {
-        vm.dynamicsFormsList = [];
+        vm.loading = true;
         umbracoCmsIntegrationsCrmDynamicsResource.getForms().then(function (response) {
+            vm.dynamicsFormsList = [];
             if (response) {
                 response.value.forEach(item => {
                     vm.dynamicsFormsList.push({
@@ -76,6 +79,7 @@
                     });
                 });
             }
+            vm.loading = false;
         });
     }
 

src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs

@@ -89,7 +89,7 @@ public async Task<string> GetEmbedCode(string formId)
 
             var embedCode = JsonConvert.DeserializeObject<ResponseDto<FormDto>>(result);
 
-            return embedCode.Value.First().EmbedCode;
+            return embedCode.Value.FirstOrDefault() != null ? embedCode.Value.First().EmbedCode : string.Empty;
         }
 
         private async Task<string> GetUserId(string accessToken)