bug fixing and targets file

Author: acoumb

src/Umbraco.Cms.Integrations.PIM.Inriver/App_Plugins/UmbracoCms.Integrations/PIM/Inriver/js/configuration.controller.js

@@ -13,20 +13,14 @@
 
     vm.showToast = showToast;
 
-    //vm.showToast({
-    //    color: 'danger',
-    //    headline: 'Algolia',
-    //    message: 'Index name and content schema are required.'
-    //});
-
     if ($scope.model.value == null) {
         $scope.model.value = {
             entityType: '',
             displayFieldTypeIds: []
         };
     }
     $scope.$on('formSubmitting', function (ev) {
-        if (vm.selectedEntityType != undefined
+        if (vm.selectedEntityType == undefined
             || vm.selectedEntityType.value.length == 0
             || vm.selectedFieldTypes.length == 0) {
             notificationsService.error("Inriver", "Entity type and display fields are required. Configuration was not saved.");
@@ -97,71 +91,6 @@
             });
         }
     }
-
-    /* Toast Config properties:
-     *  color
-     *  headline
-     *  message
-     */
-    function showToast(config) {
-        const con = document.querySelector('uui-toast-notification-container');
-
-        const toast = document.createElement('uui-toast-notification');
-        toast.color = config.color;
-
-        const toastLayout = document.createElement('uui-toast-notification-layout');
-        toastLayout.headline = config.headline;
-        toast.appendChild(toastLayout);
-
-        const messageEl = document.createElement('span');
-        messageEl.innerHTML = config.message;
-        toastLayout.appendChild(messageEl);
-
-        if (con) {
-            con.appendChild(toast);
-        }
-    }
-
-    /**
-     * toggle rows selection with uui-checkbox - prototype
-     * */
-    vm._selectFieldType = function (fieldTypeId) {
-        var fieldTypeIndex = vm.selectedFieldTypes.indexOf(fieldTypeId);
-        if (fieldTypeIndex == -1) {
-            vm.selectedFieldTypes.push(fieldTypeId);
-            document.getElementById('chk' + fieldTypeId).setAttribute('checked', '');
-        }
-        else {
-            document.getElementById('chk' + fieldTypeId).removeAttribute('checked');
-            vm.selectedFieldTypes = vm.selectedFieldTypes.splice(fieldTypeIndex, 1);
-        }
-    }
-
-    vm._selectFieldTypes = function () {
-        const selectAll = vm.selectedFieldTypes.length == 0;
-
-        vm.selectedFieldTypes = [];
-
-        console.log('select all', selectAll);
-        if (selectAll == true) {
-            vm.selectedFieldTypes = vm.fieldTypes.map(obj => obj.fieldTypeId);
-            var elements = document.querySelectorAll("uui-checkbox");
-            for (var i = 0; i < elements.length; i++) {
-                elements[i].setAttribute("checked", "");
-            }
-        }
-        else {
-            var elements = document.querySelectorAll("uui-checkbox");
-            for (var i = 0; i < elements.length; i++) {
-                elements[i].removeAttribute("checked");
-            }
-        }
-
-        vm.fieldTypes = vm.fieldTypes.map(obj => {
-            obj.selected = selectAll;
-            return obj;
-        });
-    }
 }
 
 angular.module("umbraco")

src/Umbraco.Cms.Integrations.PIM.Inriver/App_Plugins/UmbracoCms.Integrations/PIM/Inriver/views/configuration.html

@@ -21,10 +21,6 @@
                         <uui-table class="uui-text">
                             <uui-table-column style="width: 60px;"></uui-table-column>
                             <uui-table-head>
-                                <!--<uui-table-head-cell style="--uui-table-cell-padding: 0">
-                                    <uui-checkbox style="padding: var(--uui-size-4) var(--uui-size-5);"
-                                                  ng-click="vm.selectFieldTypes()"></uui-checkbox>
-                                </uui-table-head-cell>-->
                                 <uui-table-head-cell>Id</uui-table-head-cell>
                                 <uui-table-head-cell>Name</uui-table-head-cell>
                             </uui-table-head>
@@ -33,10 +29,6 @@
                                            ng-repeat="fieldType in vm.fieldTypes" selectable
                                            ng-on-selected="vm.selectFieldType(fieldType.fieldTypeId)"
                                            ng-on-unselected="vm.unselectFieldType(fieldType.fieldTypeId)">
-                                <!--<uui-table-cell>
-                                    <uui-checkbox id="chk{{fieldType.fieldTypeId}}" ng-on-click="vm.selectFieldType(fieldType.fieldTypeId)">
-                                    </uui-checkbox>
-                                </uui-table-cell>-->
                                 <uui-table-cell>{{fieldType.fieldTypeId}}</uui-table-cell>
                                 <uui-table-cell>{{fieldType.fieldTypeDisplayName}}</uui-table-cell>
                             </uui-table-row>

src/Umbraco.Cms.Integrations.PIM.Inriver/build/Umbraco.Cms.Integrations.PIM.Inriver.targets

@@ -0,0 +1,29 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<InriverPropertyEditorFilesPath>
+			$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoCms.Integrations\PIM\Inriver\**\*.*
+		</InriverPropertyEditorFilesPath>
+	</PropertyGroup>
+	<Target Name="CopyInriverPropertyEditorAssets" BeforeTargets="Build">
+		<ItemGroup>
+			<InriverPropertyEditorFiles Include="$(InriverPropertyEditorFilesPath)" />
+		</ItemGroup>
+		<Message
+			Text="Copying Inriver Property Editor files: $(InriverPropertyEditorFilesPath) - #@(InriverPropertyEditorFiles->Count()) files"
+			Importance="high" />
+		<Copy SourceFiles="@(InriverPropertyEditorFiles)"
+		      DestinationFiles="@(InriverPropertyEditorFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms.Integrations\PIM\Inriver\%(RecursiveDir)%(Filename)%(Extension)')"
+		      SkipUnchangedFiles="true" />
+
+	</Target>
+
+	<Target Name="ClearInriverPropertyEditorAssets" BeforeTargets="Clean">
+		<ItemGroup>
+			<InriverPropertyEditorDir
+				Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoCms\PIM\Inriver\" />
+		</ItemGroup>
+		<Message Text="Clear old Inriver Property Editor data"  Importance="high" />
+		<RemoveDir Directories="@(InriverPropertyEditorDir)"  />
+	</Target>
+
+</Project>