Skip to content

Commit

Permalink
feat: upgrade (#47)
Browse files Browse the repository at this point in the history
* usync export

* upgrade cms to v13 lts
  • Loading branch information
rolorogan authored Jun 19, 2024
1 parent 7a0910d commit 974e913
Show file tree
Hide file tree
Showing 402 changed files with 15,460 additions and 484 deletions.
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
10 changes: 5 additions & 5 deletions Wmca.Core/Wmca.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.9" />
<PackageReference Include="Umbraco.Cms.Core" Version="12.0.1" />
<PackageReference Include="Umbraco.Cms.Web.Common" Version="12.0.1" />
<PackageReference Include="Umbraco.Cms.Web.Website" Version="12.0.1" />
<PackageReference Include="Limbo.Umbraco.BlockList" Version="3.0.4" />
<PackageReference Include="Umbraco.Cms.Core" Version="13.3.2" />
<PackageReference Include="Umbraco.Cms.Web.Common" Version="13.3.2" />
<PackageReference Include="Umbraco.Cms.Web.Website" Version="13.3.2" />
<PackageReference Include="Limbo.Umbraco.BlockList" Version="13.0.0" />
</ItemGroup>
<ItemGroup>
<None Remove="Controllers\" />
Expand Down
8 changes: 4 additions & 4 deletions Wmca.Models/Wmca.Models.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand All @@ -13,9 +13,9 @@
<Folder Include="Content\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Umbraco.Cms.Core" Version="12.0.1" />
<PackageReference Include="Umbraco.Cms.Infrastructure" Version="12.0.1" />
<PackageReference Include="Dawoe.OEmbedPickerPropertyEditor" Version="12.0.0" />
<PackageReference Include="Umbraco.Cms.Core" Version="13.3.2" />
<PackageReference Include="Umbraco.Cms.Infrastructure" Version="13.3.2" />
<PackageReference Include="Dawoe.OEmbedPickerPropertyEditor" Version="13.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Wmca.Core\Wmca.Core.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,35 @@ class AccessibilityReporter {

const testRequest = new Request(testUrl);
await fetch(testRequest);
const iframeId = "arTestIframe" + crypto.randomUUID();
const iframeId = "arTestIframe" + AccessibilityReporter.randomUUID();
const container = document.getElementById(showWhileRunning ? 'dashboard-ar-tests' : 'contentcolumn');
let testIframe = document.createElement("iframe");

function cleanUpIframe() {
testIframe.src = "";
testIframe.remove();
testIframe = null;
if (testIframe) {
testIframe.src = "";
testIframe.remove();
testIframe = null;
}
}

window.addEventListener("message", function (message) {
const handleTestResultMessage = function (message) {
if (!message.data.testRunner) {
return;
}
if (message.data.testRunner.name !== 'axe') {
return;
}
cleanUpIframe();
if (message.data) {
resolve(message.data);
} else {
reject(message);
}
message = null;
}, { once: true });
window.removeEventListener("message", handleTestResultMessage, true);
}
window.addEventListener("message", handleTestResultMessage, true);

testIframe.setAttribute("src", testUrl);
testIframe.setAttribute("id", iframeId);
Expand All @@ -41,12 +51,12 @@ class AccessibilityReporter {
testIframe.style.position = "absolute";
}

setTimeout(()=> {
setTimeout(() => {
container.appendChild(testIframe);
}, 0);

testIframe.onload = function () {
if(testIframe.contentWindow.document.body) {
if (testIframe.contentWindow.document.body) {
let scriptAxe = testIframe.contentWindow.document.createElement("script");
scriptAxe.type = "text/javascript";
scriptAxe.src = "/App_Plugins/AccessibilityReporter/libs/axe.min.js";
Expand Down Expand Up @@ -369,6 +379,13 @@ class AccessibilityReporter {
return numberToFormat.toLocaleString();
}

static randomUUID() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
return v.toString(16);
});
}

}

angular.module("umbraco")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,8 @@ class ARChart extends HTMLElement {
borderWidth: 2,
font: labelFontStyles,
align: 'top',
display: 'auto',
formatter: ((context, args)=> {
if (context < 5) {
return null;
}
if(context) {
const index = args.dataIndex;
return context + " " + args.chart.data.labels[index];
Expand Down

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions Wmca.Web/App_Plugins/AccessibilityReporter/libs/axe.min.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "AccessibilityReporter",
"version": "3.0.0",
"version": "3.2.1",
"allowPackageTelemetry": true,
"javascript": [
"~/App_Plugins/AccessibilityReporter/accessibility-reporter.resource.js",
Expand Down
11 changes: 11 additions & 0 deletions Wmca.Web/App_Plugins/cmsimport/dialogs/clearcache.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<div class="umb-dialog umb-pane" ng-controller="seoChecker.ClearCacheDialogController">
<div class="umb-dialog-body" auto-scale="90">

<p class="abstract">
{{confirmCaption}}
</p>

<umb-confirm on-confirm="confirm" confirm-button-style="success" on-cancel="cancel"></umb-confirm>

</div>
</div>
54 changes: 54 additions & 0 deletions Wmca.Web/App_Plugins/cmsimport/dialogs/elementpicker.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<div class="umb-dialog umb-pane" ng-controller="cmsimport.elementPickerDialogController">
<form name="frm" novalidate
val-form-manager>
<umb-editor-view>

<umb-editor-header name="model.pageName"
name-locked="true"
hide-icon="true"
hide-description="true"
hide-alias="true">
</umb-editor-header>

<umb-editor-container>

<umb-tabs-content class="form-horizontal" view="true">
<umb-empty-state ng-if="hasNoElements()"position="center">
<localize key="cmsimportElementField_elementPickerNoElements"></localize>
</umb-empty-state>

<div class="umb-block-card-grid">
<div ng-repeat="block in model.elementConfig.elementDefinitionConfig" class="umb-block-card" ng-click="select(block)">
<div class="__showcase">
<div class="__icon">
<umb-icon icon="{{block.ContentElementIcon}}">
</umb-icon>
</div>
</div>
<div class="__info">
<div class="__name" ng-bind="block.ContentElementName"></div>
</div>
</div>

</div>

</umb-tabs-content>
</umb-editor-container>

<umb-editor-footer>
<umb-editor-footer-content-right>
<div class="umb-pane btn-toolbar umb-btn-toolbar">
<div>
<a href class="btn btn-link" ng-click="onCancel()"><localize key="general_cancel">Cancel</localize></a>
</div>
</div>
</umb-editor-footer-content-right>
</umb-editor-footer>

</umb-editor-view>
</form>

</div>
<div>

</div>
69 changes: 69 additions & 0 deletions Wmca.Web/App_Plugins/cmsimport/fields/elementeditorfield.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<div ng-controller="cmsimport.elementEditorController">
<div ui-sortable ng-model="model.value.elements">
<div ng-repeat="element in model.value.elements" class="umb-block-list__block">
<div class="umb-block-list__block--view blockelement__draggable-element">
<div class="blockelement-inlineblock-editor">
<div class="cmsimportElementHeader" ng-click="toggleElement(element)" >
<div class="cmsimportElementInfoHeader" ng-class="{cmsimportFirstElementHeader: $first}">
<div class="cmsimportElementInfoIcons">
<span class="cmsimportElementArrow " ng-class="{ cmsimportElementArrowActive: element.active === true,cmsimportElementArrowInActive: element.active === false}"></span>
<umb-icon icon="{{element.elementTypeIcon}}" class="icon"></umb-icon>
</div>
<span >{{element.elementTypeName}}</span>
</div>
<div class="cmsimportDeleteElement">
<button type="button" class="btn-reset umb-outline action --delete " localize="title" ng-click="removeField($index,model.value.elements);" title="general_delete"> <umb-icon icon="icon-trash" class="icon"></umb-icon> </button>
</div>
</div>
<div class="blockelement-inlineblock-editor__inner " ng-show="element.active === true">
<div class="umb-group-panel__content" ng-repeat="prop in element.importMapping[0].propertyInfo">
<div class="control-group umb-control-group ">
<div ng-class="{cmimportFieldError: prop.hasErrors === true}">
<div ng-show="{{prop.hasErrors}}" class="alert alert-error property-error">
<ul>
<li ng-repeat="validationMessage in prop.validationErrors">{{validationMessage}}</li>
</ul>
</div>
<div class="umb-el-wrap cmsimportMappingControl" ng-class="{'cmsimportMappingControlAdvancedSetting' : showAdvancedOptionsForm(prop) === true}">
<label class="control-label ng-binding" title="pageTitle">
{{prop.propertyName}}
<small class="ng-binding" ng-show="prop.showAlias">Alias:{{prop.propertyAlias}}</small>
</label>
<div class="controls" noDirtyCheck ng-show="prop.simpleMapping">
<select ng-model="prop.mappedDataSourceColumn" ng-options="column as column for column in element.importMapping[0].columns"></select> <span ng-show="showAdvancedOptionsOption(prop)" class="icon-settings cmsimportAdvancedIcon" title="Collapse advanced settings" ng-click="toggleForm(prop)"></span>
<div ng-if="showAdvancedOptionsForm(prop)" class="cmsimportAdvancedSettings cmsimportAdvancedElementSettings">
<umb-property data-element="property-{{prop.advancedOptionProperties.providerAlia}}" ng-repeat="property in prop.advancedOptionProperties.properties track by property.alias" property="property">
<umb-property-editor model="property"></umb-property-editor>
</umb-property>
</div>
</div>
<div class="controls" noDirtyCheck ng-hide="prop.simpleMapping">
<umb-property data-element="property-{{prop.propertyAlias}}" ng-repeat="property in prop.elementMapping.elements track by property.PropertyAlias" property="property">
<umb-property-editor model="property"></umb-property-editor>
</umb-property>
<button ng-if="!sortingMode"
type="button"
class="umb-group-builder__group-add-property"
ng-click="addElement(prop.elementMapping.elements)">
<localize key="cmsimportElementField_addElement">Add Element</localize>
</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>

</div>

</div>

</div>
<button ng-if="!sortingMode"
type="button"
class="umb-group-builder__group-add-property"
ng-click="addElement(model.value.elements)">
<localize key="cmsimportElementField_addElement">Add Element</localize>
</button>
</div>
8 changes: 0 additions & 8 deletions Wmca.Web/App_Plugins/cmsimport/package.manifest

This file was deleted.

32 changes: 16 additions & 16 deletions Wmca.Web/Wmca.Web.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<CopyRefAssembliesToPublishDirectory>true</CopyRefAssembliesToPublishDirectory>
Expand Down Expand Up @@ -30,25 +30,25 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Umbraco.Cms" Version="12.0.1" />
<PackageReference Include="Limbo.Umbraco.BlockList" Version="3.0.4" />
<PackageReference Include="uSync" Version="12.1.0" />
<PackageReference Include="Umbraco.StorageProviders.AzureBlob" Version="12.0.0" />
<PackageReference Include="Umbraco.StorageProviders.AzureBlob.ImageSharp" Version="12.0.0" />
<PackageReference Include="uSync.Complete" Version="12.0.2" />
<PackageReference Include="Umbraco.Cms" Version="13.3.2" />
<PackageReference Include="Limbo.Umbraco.BlockList" Version="13.0.0" />
<PackageReference Include="uSync" Version="13.2.3" />
<PackageReference Include="Umbraco.StorageProviders.AzureBlob" Version="13.0.1" />
<PackageReference Include="Umbraco.StorageProviders.AzureBlob.ImageSharp" Version="13.0.1" />
<PackageReference Include="uSync.Complete" Version="13.1.4" />
<PackageReference Include="Our.Umbraco.FullTextSearch" Version="3.1.0" />
<PackageReference Include="Umbraco.Community.AccessibilityReporter" Version="3.1.0" />
<PackageReference Include="CMSImport" Version="12.0.0" />
<PackageReference Include="Umbraco.Community.BlockPreview" Version="1.7.1" />
<PackageReference Include="Dawoe.OEmbedPickerPropertyEditor" Version="12.0.0" />
<PackageReference Include="Dawoe.OEmbedPickerPropertyEditor.Core" Version="12.0.0" />
<PackageReference Include="Umbraco.Community.AccessibilityReporter" Version="3.2.1" />
<PackageReference Include="CMSImport" Version="13.1.2" />
<PackageReference Include="Umbraco.Community.BlockPreview" Version="1.8.4" />
<PackageReference Include="Dawoe.OEmbedPickerPropertyEditor" Version="13.0.0" />
<PackageReference Include="Dawoe.OEmbedPickerPropertyEditor.Core" Version="13.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
<PackageReference Include="Umbraco.Community.AzureSSO" Version="1.3.0" />
<PackageReference Include="Umbraco.Forms" Version="12.2.0" />
<PackageReference Include="Umbraco.Community.AzureSSO" Version="1.4.0" />
<PackageReference Include="Umbraco.Forms" Version="13.1.2" />
<PackageReference Include="HotChilli.Umbraco.PageNotFound" Version="2.2.0" />
<PackageReference Include="Infocaster.Umbraco.ETag" Version="11.1.0" />
<PackageReference Include="Skybrud.Umbraco.Redirects" Version="4.0.23" />
<PackageReference Include="StuartMullinger.Sift" Version="11.0.0" />
<PackageReference Include="Skybrud.Umbraco.Redirects" Version="13.0.4" />
<PackageReference Include="StuartMullinger.Sift" Version="13.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<ContentType Key="ea5ec4a9-3fa1-4743-8d2f-8dfea8efc43b" Alias="appGridBlock" Level="6">
<Info>
<Name>App</Name>
<Icon>icon-science</Icon>
<Thumbnail>folder.png</Thumbnail>
<Description></Description>
<AllowAtRoot>False</AllowAtRoot>
<IsListView>False</IsListView>
<Variations>Nothing</Variations>
<IsElement>true</IsElement>
<HistoryCleanup>
<PreventCleanup>False</PreventCleanup>
<KeepAllVersionsNewerThanDays></KeepAllVersionsNewerThanDays>
<KeepLatestVersionPerDayForDays></KeepLatestVersionPerDayForDays>
</HistoryCleanup>
<Folder>Elements/Block+Grid/Blocks/Shared/Main</Folder>
<Compositions />
<DefaultTemplate></DefaultTemplate>
<AllowedTemplates />
</Info>
<Structure />
<GenericProperties>
<GenericProperty>
<Key>d9f121c1-e00f-4171-a128-507c261df83d</Key>
<Name>Body scripts</Name>
<Alias>bodyScripts</Alias>
<Definition>53861d2c-512d-4e60-9025-c2666d4cd701</Definition>
<Type>Umbraco.TinyMCE</Type>
<Mandatory>false</Mandatory>
<Validation></Validation>
<Description><![CDATA[Add your app root div]]></Description>
<SortOrder>0</SortOrder>
<Tab Alias="body">Body</Tab>
<Variations>Nothing</Variations>
<MandatoryMessage></MandatoryMessage>
<ValidationRegExpMessage></ValidationRegExpMessage>
<LabelOnTop>false</LabelOnTop>
</GenericProperty>
</GenericProperties>
<Tabs>
<Tab>
<Key>f939a0dc-b906-42c1-b6f4-d0c26a19f746</Key>
<Caption>Body</Caption>
<Alias>body</Alias>
<Type>Tab</Type>
<SortOrder>1</SortOrder>
</Tab>
</Tabs>
</ContentType>
Loading

0 comments on commit 974e913

Please sign in to comment.