Updates

Author: Lantzify

AutoBlockList/Controllers/AutoBlockListApiController.cs

@@ -2,6 +2,7 @@
 using Umbraco.Extensions;
 using AutoBlockList.Dtos;
 using AutoBlockList.Services;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using AutoBlockList.Constants;
 using Microsoft.AspNetCore.Mvc;
@@ -23,22 +24,24 @@ namespace AutoBlockList.Controllers
  public class AutoBlockListApiController : UmbracoApiController
  {
  private const string _checkLogs = "Check logs for futher details";
- private readonly IContentService _contentService;
+private readonly IAppPolicyCache _runtimeCache;
+private readonly IContentService _contentService;
  private readonly IDataTypeService _dataTypeService;
  private readonly ILogger<AutoBlockListApiController> _logger;
  private readonly IContentTypeService _contentTypeService;
  private readonly ILocalizationService _localizationService;
  private readonly IAutoBlockListService _autoBlockListService;
 
- public AutoBlockListApiController(
- IContentService contentService,
+ public AutoBlockListApiController(AppCaches appCaches,
+IContentService contentService,
  IDataTypeService dataTypeService,
  ILogger<AutoBlockListApiController> logger,
  IContentTypeService contentTypeService,
  ILocalizationService localizationService,
  IAutoBlockListService autoBlockListService)
  {
  _logger = logger;
+ _runtimeCache = appCaches.RuntimeCache;
  _contentService = contentService;
  _dataTypeService = dataTypeService;
  _contentTypeService = contentTypeService;
@@ -79,17 +82,24 @@ public IEnumerable<CustomContentTypeReferences> GetAllNCContentTypes()
  [HttpGet]
  public PagedResult<AutoBlockListContent> GetAllContentWithNC(int page)
  {
- 
- var contentTypeIds = GetAllNCContentTypes().Select(x => x.Id).ToArray();
- var items = _contentService.GetPagedOfTypes(contentTypeIds, page, 10, out long totalRecords, null, null);
 
- var result = new PagedResult<AutoBlockListContent>(totalRecords, page, 10);
+ var contentTypeIds = _runtimeCache.GetCacheItem("AutoBlockListContentTypes", () =>
+ {
+ return GetAllNCContentTypes();
+})?.Select(x => x.Id).ToArray();
+
+ var items = _contentService.GetPagedOfTypes(contentTypeIds, page, 50, out long totalRecords, null, null);
+
+ var result = new PagedResult<AutoBlockListContent>(totalRecords, page, 50);
  result.Items = items.Select(x => new AutoBlockListContent()
  {
  ContentType = x.ContentType,
  Name = x.Name,
+ Id = x.Id
  });
 
+ items.FirstOrDefault().GetPropertiesByEditor(PropertyEditors.Aliases.NestedContent).FirstOrDefault();
+
  return result;
  }
 
@@ -98,9 +108,9 @@ public PagedResult<AutoBlockListContent> GetAllContentWithNC(int page)
 
  public IEnumerable<CustomDisplayDataType> GetDataTypesInContentType(Guid key)
  {
- var contentType = _contentTypeService.Get(key);
+var contentType = _contentTypeService.Get(key);
  if (contentType == null)
- return null;
+return new List<CustomDisplayDataType>();
 
  return _autoBlockListService.GetDataTypesInContentType(contentType);
  }

AutoBlockList/Dtos/AutoBlockListContent.cs

@@ -5,7 +5,10 @@ namespace AutoBlockList.Dtos
 {
  public class AutoBlockListContent
  {
- [DataMember]
+[DataMember]
+public int Id { get; set; }
+
+[DataMember]
  public string? Name { get; set; }
 
  [DataMember]

AutoBlockList/Services/AutoBlockListService.cs

@@ -2,7 +2,6 @@
 using Umbraco.Cms.Core;
 using Umbraco.Extensions;
 using AutoBlockList.Dtos;
-using AutoBlockList.Dtos;
 using Umbraco.Cms.Core.Models;
 using AutoBlockList.Constants;
 using Umbraco.Cms.Core.Strings;
@@ -12,8 +11,6 @@
 using Umbraco.Cms.Core.PropertyEditors;
 using static Umbraco.Cms.Core.Constants;
 using DataType = Umbraco.Cms.Core.Models.DataType;
-using ObjectTypes = Umbraco.Cms.Core.Models.ObjectTypes;
-using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
 using static Umbraco.Cms.Core.PropertyEditors.BlockListConfiguration;
 
 namespace AutoBlockList.Services
@@ -62,8 +59,8 @@ public AutoBlockListService(IDataTypeService dataTypeService,
  {
  ValidationLimit = new NumberRange()
  {
- Max = ncConfig.MaxItems,
- Min = ncConfig.MinItems
+ Max = ncConfig?.MaxItems,
+ Min = ncConfig?.MinItems
  },
  },
  };
@@ -94,7 +91,7 @@ public IEnumerable<CustomDisplayDataType> GetAllNCDataTypes()
  {
  Id = dataType.Id,
  Name = dataType.Name,
- Icon = dataType.Editor.Icon,
+ Icon = dataType.Editor?.Icon,
  MatchingBLId = _dataTypeService.GetDataType(string.Format(GetNameFormatting(), dataType.Name))?.Id
  });
 
@@ -225,7 +222,7 @@ public IEnumerable<CustomDisplayDataType> GetDataTypesInContentType(IContentType
  dataTypes.Add(new CustomDisplayDataType()
  {
  Id = dataType.Id,
- Icon = dataType.Editor.Icon,
+ Icon = dataType.Editor?.Icon,
  Name = dataType.Name,
  });
  }

AutoBlockList/wwwroot/backoffice/autoBlockList/overview.controller.js

@@ -1,9 +1,7 @@
 angular.module("umbraco").controller("autoBlockList.overview.controller", function (
- $q,
  $http,
  editorService,
- overlayService,
- notificationsService) {
+ overlayService) {
 
  var vm = this;
  vm.loading = true;
@@ -27,40 +25,49 @@ angular.module("umbraco").controller("autoBlockList.overview.controller", functi
  }
  };
 
+ vm.toggleSelectAll = function () {
+ vm.pagedContent.items.forEach(function (e) {
+ if (vm.selectedContent.indexOf(e.id) === -1) {
+ vm.selectedContent.push(e.id);
+ }
+ });
+ };
+
  vm.clearSelection = function () {
  vm.selectedContent = [];
  };
 
  $http.get("/umbraco/backoffice/api/AutoBlockListApi/GetAllContentWithNC?page=0").then(function (response) {
  vm.loading = false;
-
  vm.pagedContent = response.data;
-
+ vm.pagedContent.pageNumber += 1;
+ console.log(response)
  });
 
  vm.paginator = function (page) {
+ vm.loadingTable = true;
  $http.get("/umbraco/backoffice/api/AutoBlockListApi/GetAllContentWithNC?page=" + page).then(function (response) {
  vm.pagedContent = response.data;
-
+ vm.loadingTable = false;
  });
- }
+ };
 
  vm.nextPage = function () {
  vm.paginator(vm.pagedContent.pageNumber += 1);
- }
+ };
 
  vm.prevPage = function () {
- vm.paginator(vm.pagedContent.pageNumber);
- }
+ vm.paginator(vm.pagedContent.pageNumber -= 1);
+ };
 
  vm.goToPage = function (pageNumber) {
  vm.paginator(pageNumber);
- }
+ };
 
  vm.convertContent = function (content) {
 
  var confirmOptions = {
- title: "Confirm '" + content.name + "' convert",
+ title: "Confirm '" + vm.selectedContent.length + "' convert",
  view: "/App_Plugins/AutoBlockList/components/overlays/confirm.html",
  submit: function () {
  var options = {

AutoBlockList/wwwroot/backoffice/autoBlockList/overview.html

@@ -17,11 +17,17 @@
  <umb-box-header title="Content" description="Converts all nested content data types to block lists and adds them to the contents document type. It also converts the content to make it work with block list."></umb-box-header>
 
  <umb-box-content>
- <div>
- <div class="umb-table">
+ <div class="relative">
+ <umb-load-indicator ng-if="vm.loadingTable"></umb-load-indicator>
+
+ <div class="umb-table" ng-if="!vm.loadingTable">
  <div class="umb-table-head">
  <div class="umb-table-row">
- <div class="umb-table-cell"></div>
+ <div class="umb-table-cell">
+ <button type="button" class="umb-table__action" ng-click="vm.toggleSelectAll()">
+ <i class="icon-check umb-checkmark umb-checkmark--xs umb-outline" checked="checked" size="xs"></i>
+ </button>
+ </div>
  <div class="umb-table-cell umb-table__name not-fixed"><localize key="general_name">Name</localize></div>
  <div class="umb-table-cell umb-table-cell--nano"><localize key="general_open" style="visibility:hidden;">Open</localize></div>
  <div class="umb-table-cell"><localize key="general_open" style="visibility:hidden;">Open</localize></div>
@@ -57,7 +63,7 @@
  label="Clear selection">
  </umb-button>
 
- {{vm.selectedContent.length}} of {{vm.content.length}} selected
+ {{vm.selectedContent.length}} of {{vm.pagedContent.totalItems}} selected
  </div>
 
  <div>
@@ -70,14 +76,14 @@
  </umb-button>
  </div>
  </div>
-
+ </div>
  <umb-pagination page-number="vm.pagedContent.pageNumber"
- total-pages="vm.pagedContent.totalPages"
+ total-pages="vm.pagedContent.totalPages - 1"
  on-next="vm.nextPage"
  on-prev="vm.prevPage"
  on-go-to-page="vm.goToPage">
  </umb-pagination>
-  </div>
+ 
  </umb-box-content>
  </umb-box>
  </div>