Skip to content

Commit

Permalink
Upgrade to 14.0.0-rc4
Browse files Browse the repository at this point in the history
  • Loading branch information
Rick Butterfield committed May 23, 2024
1 parent 306d5f1 commit 5928275
Show file tree
Hide file tree
Showing 27 changed files with 221 additions and 382 deletions.
2 changes: 1 addition & 1 deletion ...munity.Sustainability.TestSite.14.x/Umbraco.Community.Sustainability.TestSite.14.x.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Umbraco.Cms" Version="14.0.0-rc3" />
<PackageReference Include="Umbraco.Cms" Version="14.0.0-rc4" />
<PackageReference Include="uSync" Version="14.0.0-rc2" />
</ItemGroup>

Expand Down
5 changes: 2 additions & 3 deletions src/Umbraco.Community.Sustainability.TestSite.14.x/appsettings-schema.Umbraco.Cms.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"PreviewBadge": {
"type": "string",
"description": "Gets or sets a value for the preview badge mark-up.\n ",
"default": "\n <div id=\"umbracoPreviewBadge\" class=\"umbraco-preview-badge\">\n <span class=\"umbraco-preview-badge__header\">Preview mode</span>\n <a href=\"{0}/preview/?id={2}\" class=\"umbraco-preview-badge__a open\" title=\"Open preview in BackOffice\">\n …\n </a>\n <a href=\"{0}/preview/end?redir={1}\" class=\"umbraco-preview-badge__a end\" title=\"End preview mode\">\n <svg viewBox=\"0 0 100 100\" xmlns=\"http://www.w3.org/2000/svg\"><title>Click to end preview mode</title><path fill=\"#fff\" d=\"M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z\"/><path fill=\"#fff\" d=\"M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z\"/><path fill=\"#fff\" d=\"M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z\"/><path fill=\"#fff\" d=\"M42.7 2.5h14.6v49.4H42.7z\"/></svg>\n </a>\n </div>\n <style type=\"text/css\">\n .umbraco-preview-badge {{\n position: fixed;\n bottom: 0;\n display: inline-flex;\n background: rgba(27, 38, 79, 0.9);\n color: #fff;\n font-size: 12px;\n z-index: 99999999;\n justify-content: center;\n align-items: center;\n box-shadow: 0 5px 10px rgba(0, 0, 0, .2), 0 1px 2px rgba(0, 0, 0, .2);\n line-height: 1;\n pointer-events:none;\n left: 50%;\n transform: translate(-50%, 40px);\n animation: umbraco-preview-badge--effect 10s 1.2s ease both;\n border-radius: 3px 3px 0 0;\n }}\n @keyframes umbraco-preview-badge--effect {{\n 0% {{\n transform: translate(-50%, 40px);\n animation-timing-function: ease-out;\n }}\n 1.5% {{\n transform: translate(-50%, -20px);\n animation-timing-function: ease-in;\n }}\n 5.0% {{\n transform: translate(-50%, -8px);\n animation-timing-function: ease-in;\n }}\n 7.5% {{\n transform: translate(-50%, -4px);\n animation-timing-function: ease-in;\n }}\n 9.2% {{\n transform: translate(-50%, -2px);\n animation-timing-function: ease-in;\n }}\n 3.5%,\n 6.5%,\n 8.5% {{\n transform: translate(-50%, 0);\n animation-timing-function: ease-out;\n }}\n 9.7% {{\n transform: translate(-50%, 0);\n animation-timing-function: ease-out;\n }}\n 10.0% {{\n transform: translate(-50%, 0);\n }}\n\n\n 60% {{\n transform: translate(-50%, 0);\n animation-timing-function: ease-out;\n }}\n 61.5% {{\n transform: translate(-50%, -20px);\n animation-timing-function: ease-in;\n }}\n 65.0% {{\n transform: translate(-50%, -8px);\n animation-timing-function: ease-in;\n }}\n 67.5% {{\n transform: translate(-50%, -4px);\n animation-timing-function: ease-in;\n }}\n 69.2% {{\n transform: translate(-50%, -2px);\n animation-timing-function: ease-in;\n }}\n 63.5%,\n 66.5%,\n 68.5% {{\n transform: translate(-50%, 0);\n animation-timing-function: ease-out;\n }}\n 69.7% {{\n transform: translate(-50%, 0);\n animation-timing-function: ease-out;\n }}\n 70.0% {{\n transform: translate(-50%, 0);\n }}\n 100.0% {{\n transform: translate(-50%, 0);\n }}\n }}\n .umbraco-preview-badge__header {{\n padding: 1em;\n font-weight: bold;\n pointer-events:none;\n }}\n .umbraco-preview-badge__a {{\n width: 3em;\n padding: 1em;\n display: flex;\n flex-shrink: 0;\n align-items: center;\n align-self: stretch;\n color:white;\n text-decoration:none;\n font-weight: bold;\n border-left: 1px solid hsla(0,0%,100%,.25);\n pointer-events:all;\n }}\n .umbraco-preview-badge__a svg {{\n width: 1em;\n height:1em;\n }}\n .umbraco-preview-badge__a:hover {{\n background: #202d5e;\n }}\n .umbraco-preview-badge__end svg {{\n fill: #fff;\n width:1em;\n }}\n </style>\n <script type=\"text/javascript\" data-umbraco-path=\"{0}\" src=\"{0}/js/umbraco.websitepreview.min.js\"></script>"
"default": "\n<script src=\"{0}/website/preview.js\"></script>\n<umb-website-preview path=\"{0}\" url=\"{1}\" unique=\"{2}\"></umb-website-preview>"
},
"ShowDeprecatedPropertyEditors": {
"type": "boolean",
Expand Down Expand Up @@ -1483,9 +1483,8 @@
"description": "Gets or sets a value indicating whether the use of alternative templates should be validated.\n ",
"default": false
},
"DisableFindContentByIdPath": {
"DisableFindContentByIdentifierPath": {
"type": "boolean",
"description": "Gets or sets a value indicating whether find content ID by path is disabled.\n ",
"default": false
},
"DisableRedirectUrlTracking": {
Expand Down
153 changes: 148 additions & 5 deletions src/Umbraco.Community.Sustainability.TestSite.14.x/umbraco-package-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2731,6 +2731,13 @@
"description": "The alias of the extension, ensure it is unique",
"type": "string"
},
"conditions": {
"description": "Set the conditions for when the extension should be loaded",
"items": {
"$ref": "#/definitions/ConditionTypes"
},
"type": "array"
},
"element": {
"description": "The file location of the element javascript file to load",
"type": "string"
Expand All @@ -2757,6 +2764,20 @@
"description": "The friendly name of the extension",
"type": "string"
},
"overwrites": {
"anyOf": [
{
"items": {
"type": "string"
},
"type": "array"
},
{
"type": "string"
}
],
"description": "Define one or more extension aliases that this extension should overwrite."
},
"type": {
"const": "menuItem",
"description": "The type of extension such as dashboard etc...",
Expand All @@ -2781,6 +2802,13 @@
"description": "The alias of the extension, ensure it is unique",
"type": "string"
},
"conditions": {
"description": "Set the conditions for when the extension should be loaded",
"items": {
"$ref": "#/definitions/ConditionTypes"
},
"type": "array"
},
"element": {
"description": "The file location of the element javascript file to load",
"type": "string"
Expand All @@ -2806,6 +2834,20 @@
"description": "The friendly name of the extension",
"type": "string"
},
"overwrites": {
"anyOf": [
{
"items": {
"type": "string"
},
"type": "array"
},
{
"type": "string"
}
],
"description": "Define one or more extension aliases that this extension should overwrite."
},
"type": {
"const": "menuItem",
"description": "The type of extension such as dashboard etc...",
Expand Down Expand Up @@ -2928,6 +2970,49 @@
],
"type": "object"
},
"ManifestMonacoMarkdownEditorAction": {
"properties": {
"alias": {
"description": "The alias of the extension, ensure it is unique",
"type": "string"
},
"api": {
"type": "string"
},
"js": {
"description": "The file location of the javascript file to load",
"type": "string"
},
"kind": {
"description": "The kind of the extension, used to group extensions together",
"examples": [
"button"
]
},
"meta": {
"$ref": "#/definitions/MetaMonacoMarkdownEditorAction"
},
"name": {
"description": "The friendly name of the extension",
"type": "string"
},
"type": {
"const": "monacoMarkdownEditorAction",
"description": "The type of extension such as dashboard etc...",
"type": "string"
},
"weight": {
"description": "Extensions such as dashboards are ordered by weight with lower numbers being first in the list",
"type": "number"
}
},
"required": [
"alias",
"name",
"type"
],
"type": "object"
},
"ManifestPackageView": {
"properties": {
"alias": {
Expand Down Expand Up @@ -2978,6 +3063,55 @@
],
"type": "object"
},
"ManifestPreviewAppProvider": {
"description": "Preview apps are displayed in the menu of the preview window.",
"properties": {
"alias": {
"description": "The alias of the extension, ensure it is unique",
"type": "string"
},
"element": {
"description": "The file location of the element javascript file to load",
"type": "string"
},
"elementName": {
"description": "The HTML web component name to use such as 'my-dashboard'\nNote it is NOT <my-dashboard></my-dashboard>, just the element name.",
"type": "string"
},
"js": {
"description": "The file location of the javascript file to load",
"type": "string"
},
"kind": {
"description": "The kind of the extension, used to group extensions together",
"examples": [
"button"
]
},
"meta": {
"description": "This contains properties specific to the type of extension"
},
"name": {
"description": "The friendly name of the extension",
"type": "string"
},
"type": {
"const": "previewApp",
"description": "The type of extension such as dashboard etc...",
"type": "string"
},
"weight": {
"description": "Extensions such as dashboards are ordered by weight with lower numbers being first in the list",
"type": "number"
}
},
"required": [
"alias",
"name",
"type"
],
"type": "object"
},
"ManifestPropertyAction<MetaPropertyAction>": {
"properties": {
"alias": {
Expand Down Expand Up @@ -3965,10 +4099,10 @@
"$ref": "#/definitions/ManifestTree"
},
{
"$ref": "#/definitions/ManifestAppEntryPoint"
"$ref": "#/definitions/ManifestAuthProvider"
},
{
"$ref": "#/definitions/ManifestAuthProvider"
"$ref": "#/definitions/ManifestAppEntryPoint"
},
{
"$ref": "#/definitions/ManifestBackofficeEntryPoint"
Expand Down Expand Up @@ -4096,9 +4230,15 @@
{
"$ref": "#/definitions/ManifestMfaLoginProvider"
},
{
"$ref": "#/definitions/ManifestMonacoMarkdownEditorAction"
},
{
"$ref": "#/definitions/ManifestPackageView"
},
{
"$ref": "#/definitions/ManifestPreviewAppProvider"
},
{
"$ref": "#/definitions/ManifestPropertyAction<MetaPropertyAction>"
},
Expand Down Expand Up @@ -5784,6 +5924,9 @@
},
"type": "object"
},
"MetaMonacoMarkdownEditorAction": {
"type": "object"
},
"MetaPackageView": {
"properties": {
"packageName": {
Expand Down Expand Up @@ -6158,6 +6301,9 @@
},
"propertyEditorUiAlias": {
"type": "string"
},
"weight": {
"type": "number"
}
},
"required": [
Expand Down Expand Up @@ -6418,9 +6564,6 @@
"filter": {
"type": "object"
},
"hideTreeRoot": {
"type": "boolean"
},
"multiple": {
"type": "boolean"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Community.Sustainability/Controllers/SustainabilityWorkspaceController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public async Task<IActionResult> GetPageData([FromQuery] Guid pageGuid)
return NoContent();
}

var pageMetrics = await _pageMetricService.GetPageMetrics(contentItem.Id);
var pageMetrics = await _pageMetricService.GetPageMetrics(contentItem.Key);
var mostRecent = pageMetrics.OrderByDescending(x => x.RequestDate).FirstOrDefault();
if (mostRecent?.PageData == null)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Umbraco.Community.Sustainability/Services/PageMetricService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public interface IPageMetricService
{
Task<IEnumerable<PageMetric>> GetOverviewMetrics();
Task<AveragePageMetrics> GetAverageMetrics();
Task<IEnumerable<PageMetric>> GetPageMetrics(int pageId);
Task<IEnumerable<PageMetric>> GetPageMetrics(Guid pageKey);
Task AddPageMetric(PageMetric pageMetric);
}

Expand Down Expand Up @@ -61,10 +61,10 @@ public async Task<AveragePageMetrics> GetAverageMetrics()
return new();
}

public async Task<IEnumerable<PageMetric>> GetPageMetrics(int pageId)
public async Task<IEnumerable<PageMetric>> GetPageMetrics(Guid pageKey)
{
using var scope = _scopeProvider.CreateScope();
var queryResults = await scope.Database.FetchAsync<PageMetric>($"SELECT * FROM {PageMetric.TableName} WHERE NodeId = @0", pageId);
var queryResults = await scope.Database.FetchAsync<PageMetric>($"SELECT * FROM {PageMetric.TableName} WHERE NodeKey = @0", pageKey);
scope.Complete();

return queryResults;
Expand Down
7 changes: 3 additions & 4 deletions src/Umbraco.Community.Sustainability/Umbraco.Community.Sustainability.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
<PackageReference Include="Microsoft.Playwright" Version="1.40.0" />
<PackageReference Include="Umbraco.Cms.Web.Website" Version="[14.0.0-rc3, 15.0.0)" />
<PackageReference Include="Umbraco.Cms.Api.Common" Version="[14.0.0-rc3, 15.0.0)" />
<PackageReference Include="Microsoft.Playwright" Version="1.44.0" />
<PackageReference Include="Umbraco.Cms.Web.Website" Version="[14.0.0-rc4, 15.0.0)" />
<PackageReference Include="Umbraco.Cms.Api.Common" Version="[14.0.0-rc4, 15.0.0)" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 5928275

Please sign in to comment.