From 146a0b552290833b96f25df34acabc66c5609ad4 Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:47:14 +0100 Subject: [PATCH 01/12] Rename Web.UI.New back to Web.UI --- .../Views/Partials/blockgrid/area.cshtml | 10 ---- .../Views/Partials/blockgrid/areas.cshtml | 13 ------ .../Views/Partials/blockgrid/default.cshtml | 11 ----- .../Views/Partials/blockgrid/items.cshtml | 36 -------------- .../Views/Partials/blocklist/default.cshtml | 13 ------ .../Views/_ViewImports.cshtml | 6 --- src/Umbraco.Web.UI.New/wwwroot/favicon.ico | Bin 15406 -> 0 bytes .../.gitignore | 0 .../ControllersAsServicesComposer.cs | 0 .../Program.cs | 0 .../Properties/launchSettings.json | 0 .../Umbraco.Web.UI.csproj} | 0 .../appsettings.Development.template.json | 0 .../appsettings.template.json | 0 templates/Umbraco.Templates.csproj | 44 +++++++++++++----- .../UmbracoBuilderExtensions.cs | 2 +- umbraco.sln | 3 +- 17 files changed, 34 insertions(+), 104 deletions(-) delete mode 100644 src/Umbraco.Web.UI.New/Views/Partials/blockgrid/area.cshtml delete mode 100644 src/Umbraco.Web.UI.New/Views/Partials/blockgrid/areas.cshtml delete mode 100644 src/Umbraco.Web.UI.New/Views/Partials/blockgrid/default.cshtml delete mode 100644 src/Umbraco.Web.UI.New/Views/Partials/blockgrid/items.cshtml delete mode 100644 src/Umbraco.Web.UI.New/Views/Partials/blocklist/default.cshtml delete mode 100644 src/Umbraco.Web.UI.New/Views/_ViewImports.cshtml delete mode 100644 src/Umbraco.Web.UI.New/wwwroot/favicon.ico rename src/{Umbraco.Web.UI.New => Umbraco.Web.UI}/.gitignore (100%) rename src/{Umbraco.Web.UI.New => Umbraco.Web.UI}/Composers/ControllersAsServicesComposer.cs (100%) rename src/{Umbraco.Web.UI.New => Umbraco.Web.UI}/Program.cs (100%) rename src/{Umbraco.Web.UI.New => Umbraco.Web.UI}/Properties/launchSettings.json (100%) rename src/{Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj => Umbraco.Web.UI/Umbraco.Web.UI.csproj} (100%) rename src/{Umbraco.Web.UI.New => Umbraco.Web.UI}/appsettings.Development.template.json (100%) rename src/{Umbraco.Web.UI.New => Umbraco.Web.UI}/appsettings.template.json (100%) diff --git a/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/area.cshtml b/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/area.cshtml deleted file mode 100644 index 361484757c3f..000000000000 --- a/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/area.cshtml +++ /dev/null @@ -1,10 +0,0 @@ -@using Umbraco.Extensions -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage - -
- @await Html.GetBlockGridItemsHtmlAsync(Model) -
diff --git a/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/areas.cshtml b/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/areas.cshtml deleted file mode 100644 index 30f987ce1ebd..000000000000 --- a/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/areas.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@using Umbraco.Extensions -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage -@{ - if (Model?.Areas.Any() != true) { return; } -} - -
- @foreach (var area in Model.Areas) - { - @await Html.GetBlockGridItemAreaHtmlAsync(area) - } -
diff --git a/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/default.cshtml b/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/default.cshtml deleted file mode 100644 index e25839ebb18b..000000000000 --- a/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/default.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -@using Umbraco.Extensions -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage -@{ - if (Model?.Any() != true) { return; } -} - -
- @await Html.GetBlockGridItemsHtmlAsync(Model) -
diff --git a/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/items.cshtml b/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/items.cshtml deleted file mode 100644 index 2703fa5701f3..000000000000 --- a/src/Umbraco.Web.UI.New/Views/Partials/blockgrid/items.cshtml +++ /dev/null @@ -1,36 +0,0 @@ -@using Umbraco.Cms.Core.Models.Blocks -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage> -@{ - if (Model?.Any() != true) { return; } -} - -
- @foreach (var item in Model) - { - -
- @{ - var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias; - try - { - @await Html.PartialAsync(partialViewName, item) - } - catch (InvalidOperationException) - { -

- Could not render component of type: @(item.Content.ContentType.Alias) -
- This likely happened because the partial view @partialViewName could not be found. -

- } - } -
- } -
diff --git a/src/Umbraco.Web.UI.New/Views/Partials/blocklist/default.cshtml b/src/Umbraco.Web.UI.New/Views/Partials/blocklist/default.cshtml deleted file mode 100644 index accca2ef37c9..000000000000 --- a/src/Umbraco.Web.UI.New/Views/Partials/blocklist/default.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage -@{ - if (Model?.Any() != true) { return; } -} -
- @foreach (var block in Model) - { - if (block?.ContentUdi == null) { continue; } - var data = block.Content; - - @await Html.PartialAsync("blocklist/Components/" + data.ContentType.Alias, block) - } -
diff --git a/src/Umbraco.Web.UI.New/Views/_ViewImports.cshtml b/src/Umbraco.Web.UI.New/Views/_ViewImports.cshtml deleted file mode 100644 index 929938d2d11c..000000000000 --- a/src/Umbraco.Web.UI.New/Views/_ViewImports.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@using Umbraco.Extensions -@using Umbraco.Cms.Web.Common.PublishedModels -@using Umbraco.Cms.Web.Common.Views -@using Umbraco.Cms.Core.Models.PublishedContent -@using Microsoft.AspNetCore.Html -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/src/Umbraco.Web.UI.New/wwwroot/favicon.ico b/src/Umbraco.Web.UI.New/wwwroot/favicon.ico deleted file mode 100644 index c0749ddf7f1b68606b0672aa8d709779d6b0817a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15406 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 diff --git a/src/Umbraco.Web.UI.New/.gitignore b/src/Umbraco.Web.UI/.gitignore similarity index 100% rename from src/Umbraco.Web.UI.New/.gitignore rename to src/Umbraco.Web.UI/.gitignore diff --git a/src/Umbraco.Web.UI.New/Composers/ControllersAsServicesComposer.cs b/src/Umbraco.Web.UI/Composers/ControllersAsServicesComposer.cs similarity index 100% rename from src/Umbraco.Web.UI.New/Composers/ControllersAsServicesComposer.cs rename to src/Umbraco.Web.UI/Composers/ControllersAsServicesComposer.cs diff --git a/src/Umbraco.Web.UI.New/Program.cs b/src/Umbraco.Web.UI/Program.cs similarity index 100% rename from src/Umbraco.Web.UI.New/Program.cs rename to src/Umbraco.Web.UI/Program.cs diff --git a/src/Umbraco.Web.UI.New/Properties/launchSettings.json b/src/Umbraco.Web.UI/Properties/launchSettings.json similarity index 100% rename from src/Umbraco.Web.UI.New/Properties/launchSettings.json rename to src/Umbraco.Web.UI/Properties/launchSettings.json diff --git a/src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj similarity index 100% rename from src/Umbraco.Web.UI.New/Umbraco.Web.UI.New.csproj rename to src/Umbraco.Web.UI/Umbraco.Web.UI.csproj diff --git a/src/Umbraco.Web.UI.New/appsettings.Development.template.json b/src/Umbraco.Web.UI/appsettings.Development.template.json similarity index 100% rename from src/Umbraco.Web.UI.New/appsettings.Development.template.json rename to src/Umbraco.Web.UI/appsettings.Development.template.json diff --git a/src/Umbraco.Web.UI.New/appsettings.template.json b/src/Umbraco.Web.UI/appsettings.template.json similarity index 100% rename from src/Umbraco.Web.UI.New/appsettings.template.json rename to src/Umbraco.Web.UI/appsettings.template.json diff --git a/templates/Umbraco.Templates.csproj b/templates/Umbraco.Templates.csproj index 8d349c6ddc40..7fba38376bc5 100644 --- a/templates/Umbraco.Templates.csproj +++ b/templates/Umbraco.Templates.csproj @@ -13,13 +13,41 @@ - - - - + UmbracoProject\Program.cs UmbracoProject + + UmbracoProject\Views\Partials\blockgrid\area.cshtml + UmbracoProject\Views\Partials\blockgrid + + + UmbracoProject\Views\Partials\blockgrid\areas.cshtml + UmbracoProject\Views\Partials\blockgrid + + + UmbracoProject\Views\Partials\blockgrid\default.cshtml + UmbracoProject\Views\Partials\blockgrid + + + UmbracoProject\Views\Partials\blockgrid\items.cshtml + UmbracoProject\Views\Partials\blockgrid + + + UmbracoProject\Views\Partials\blocklist\default.cshtml + UmbracoProject\Views\Partials\blocklist + + + UmbracoProject\Views\_ViewImports.cshtml + UmbracoProject\Views + + + UmbracoProject\wwwroot\favicon.ico + UmbracoProject\wwwroot + + + + UmbracoProject\Views\Partials\blocklist\%(RecursiveDir)%(Filename)%(Extension) UmbracoProject\Views\Partials\blocklist @@ -32,14 +60,6 @@ UmbracoProject\Views\Partials\blockgrid\%(RecursiveDir)%(Filename)%(Extension) UmbracoProject\Views\Partials\blockgrid - - UmbracoProject\Views\_ViewImports.cshtml - UmbracoProject\Views - - - UmbracoProject\wwwroot\favicon.ico - UmbracoProject\wwwroot - diff --git a/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs index c224ad2f62e6..bd0a8bc5bccd 100644 --- a/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs +++ b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs @@ -120,7 +120,7 @@ private static ILocalizedTextService GetLocalizedTextService(IServiceProvider fa var currFolder = new DirectoryInfo(srcFolder); - var uiProject = currFolder.GetDirectories("Umbraco.Web.UI.New", SearchOption.TopDirectoryOnly).First(); + var uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First(); var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang")); return new LocalizedTextServiceFileSources( diff --git a/umbraco.sln b/umbraco.sln index d536a47c62e9..8e1f0bef9d2f 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -153,7 +153,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Imaging.ImageSh EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{05878304-40EB-4F84-B40B-91BDB70DE094}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI.New", "src\Umbraco.Web.UI.New\Umbraco.Web.UI.New.csproj", "{C55CA725-9F4E-4618-9435-6B8AE05DA14D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{C55CA725-9F4E-4618-9435-6B8AE05DA14D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Api.Common", "src\Umbraco.Cms.Api.Common\Umbraco.Cms.Api.Common.csproj", "{D48B5D6B-82FF-4235-986C-CDE646F41DEC}" EndProject @@ -394,7 +394,6 @@ Global {2B47AD9F-FFF1-448A-88F1-D4F568811738} = {F2BF84D9-0A14-40AF-A0F3-B9BBBBC16A44} {25AECCB5-B187-4406-844B-91B8FF0FCB37} = {2B47AD9F-FFF1-448A-88F1-D4F568811738} {EA628ABD-624E-4AF3-B548-6710D4D66531} = {2B47AD9F-FFF1-448A-88F1-D4F568811738} - {C55CA725-9F4E-4618-9435-6B8AE05DA14D} = {995D9EFA-8BB1-4333-80AD-C525A06FD984} {D88A926B-E8D6-495A-A2ED-8EFD0C847C62} = {995D9EFA-8BB1-4333-80AD-C525A06FD984} {A13FF0A0-69FA-468A-9F79-565401D5C341} = {B5BD12C1-A454-435E-8A46-FF4A364C0382} EndGlobalSection From aeca48851a27aa481b06e790471e59b53a04e38a Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:49:37 +0100 Subject: [PATCH 02/12] Delete new backoffiec folder --- .github/New BackOffice - README.md | 38 ------------------------------ umbraco.sln | 7 ------ 2 files changed, 45 deletions(-) delete mode 100644 .github/New BackOffice - README.md diff --git a/.github/New BackOffice - README.md b/.github/New BackOffice - README.md deleted file mode 100644 index 5557678c9a48..000000000000 --- a/.github/New BackOffice - README.md +++ /dev/null @@ -1,38 +0,0 @@ -# New backoffice - -> **Warning**: -> This is an early WIP and is set not to be packable since we don't want to release this yet. There will be breaking changes in these projects. - -This solution folder contains the projects for the new backoffice. If you're looking to fix or improve the existing CMS, this is not the place to do it, although we do very much appreciate your efforts. - -### Getting Started: Management API - -This branch contains the project for the new Management API as well as the new Backoffice. To get started with the Management API you should: -* Run any of the executables (Umbraco.Web.UI or Umbraco.Web.UI.New) -* Access "/umbraco/swagger" in the browser to see the Swagger interface -* The API lives in the Umbraco.Cms.Api.Management project - -### Getting Started: Backoffice -To run the new Backoffice: -* Execute `git submodule init` and then `git submodule update` to get the files into Umbraco.Web.UI.New.Client project -* Run Umbraco.Web.UI.New project - * If you get a white page delete Umbraco.Cms.StaticAssets\wwwroot\umbraco folder and run `npm ci && npm run build:for:cms` inside Umbraco.Web.UI.New.Client folder to clear out any leftover files from older versions. -* If you are going to work on the Backoffice, you can either go to the Umbraco.Web.UI.New.Client folder and check out a new branch or set it up in your IDE, which will allow you to commit to each repository simultaneously: - * **Rider**: Preferences -> Version Control -> Directory Mappings -> Click the '+' sign - -### Latest version -* If you want to get the latest changes from the Backoffice repository, run `git submodule update` again which will pull the latest main branch. - -### Project structure - -Since the new backoffice API is still very much a work in progress, we've created new projects for the new backoffice API: - -* Umbrao.Cms.ManagementApi - The "presentation layer" for the management API -* "New" versions of existing projects, should be merged with the existing projects when the new API is released: - * Umbraco.Cms.Core - * Umbraco.Cms.Infrastructure - * Umbraco.Cms.Web.Common - * Umbraco.Web.UI.New - * Umbraco.Web.UI.New.Client - -This also means that we have to use "InternalsVisibleTo" for the new projects since these should be able to access the internal classes since they will when they get merged. diff --git a/umbraco.sln b/umbraco.sln index 8e1f0bef9d2f..ba1850e013b7 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -92,11 +92,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Templates", "templa EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms", "src\Umbraco.Cms\Umbraco.Cms.csproj", "{92EAA57A-CC99-4F5D-9D9C-B865293F6000}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NewBackoffice", "NewBackoffice", "{995D9EFA-8BB1-4333-80AD-C525A06FD984}" - ProjectSection(SolutionItems) = preProject - .github\New BackOffice - README.md = .github\New BackOffice - README.md - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Api.Management", "src\Umbraco.Cms.Api.Management\Umbraco.Cms.Api.Management.csproj", "{0946531B-F06D-415B-A4E3-6CBFF5DB1C12}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Targets", "src\Umbraco.Cms.Targets\Umbraco.Cms.Targets.csproj", "{B51C10FC-FD20-451E-90DD-A117133403DF}" @@ -388,13 +383,11 @@ Global {9102ABDF-E537-4E46-B525-C9ED4833EED0} = {B5BD12C1-A454-435E-8A46-FF4A364C0382} {2A5027D9-F71D-4957-929E-F7A56AA1B95A} = {05878304-40EB-4F84-B40B-91BDB70DE094} {05C1D0C8-C592-468F-AF8F-A299B9B3A903} = {6D72A60B-0542-4AA9-A493-DD4179E838A1} - {0946531B-F06D-415B-A4E3-6CBFF5DB1C12} = {995D9EFA-8BB1-4333-80AD-C525A06FD984} {20CE9C97-9314-4A19-BCF1-D12CF49B7205} = {E5D4B5F9-6CCE-46CE-8985-9A350445F92B} {F2BF84D9-0A14-40AF-A0F3-B9BBBBC16A44} = {20CE9C97-9314-4A19-BCF1-D12CF49B7205} {2B47AD9F-FFF1-448A-88F1-D4F568811738} = {F2BF84D9-0A14-40AF-A0F3-B9BBBBC16A44} {25AECCB5-B187-4406-844B-91B8FF0FCB37} = {2B47AD9F-FFF1-448A-88F1-D4F568811738} {EA628ABD-624E-4AF3-B548-6710D4D66531} = {2B47AD9F-FFF1-448A-88F1-D4F568811738} - {D88A926B-E8D6-495A-A2ED-8EFD0C847C62} = {995D9EFA-8BB1-4333-80AD-C525A06FD984} {A13FF0A0-69FA-468A-9F79-565401D5C341} = {B5BD12C1-A454-435E-8A46-FF4A364C0382} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution From 16bcbac6de417525e488dad8bd6e7aeaee6ce702 Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:11:21 +0100 Subject: [PATCH 03/12] Rename client project --- build/azure-pipelines.yml | 20 +++++++++---------- .../Umbraco.Cms.StaticAssets.csproj | 6 +++--- .../Umbraco.Cms.Targets.csproj | 2 +- src/Umbraco.Web.UI.New.Client | 1 - umbraco.sln | 8 ++++---- 5 files changed, 18 insertions(+), 19 deletions(-) delete mode 160000 src/Umbraco.Web.UI.New.Client diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 856711d48e02..5a82951cabc6 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -93,17 +93,17 @@ stages: workingDirectory: src/Umbraco.Web.UI.Login - script: npm ci --no-fund --no-audit --prefer-offline displayName: Run npm ci (Bellissima) - workingDirectory: src/Umbraco.Web.UI.New.Client + workingDirectory: src/Umbraco.Web.UI.Client - script: npm run generate:api-local displayName: Generate API models (Bellissima) - workingDirectory: src/Umbraco.Web.UI.New.Client + workingDirectory: src/Umbraco.Web.UI.Client enabled: false - script: npm run build:for:cms displayName: Run build (Bellissima) - workingDirectory: src/Umbraco.Web.UI.New.Client + workingDirectory: src/Umbraco.Web.UI.Client - script: npm run build displayName: Run Login Build (Bellissima) - workingDirectory: src/Umbraco.Web.UI.New.Client/apps/auth + workingDirectory: src/Umbraco.Web.UI.Client/apps/auth - task: UseDotNet@2 displayName: Use .NET SDK from global.json inputs: @@ -142,7 +142,7 @@ stages: displayName: Prepare Bellissima npm package env: PACKAGE_VERSION: $(build.NBGV_NpmPackageVersion) - workingDirectory: src/Umbraco.Web.UI.New.Client + workingDirectory: src/Umbraco.Web.UI.Client - task: PublishPipelineArtifact@1 displayName: Publish Bellissima npm artifact inputs: @@ -225,26 +225,26 @@ stages: - task: Cache@2 displayName: Cache node_modules inputs: - key: '"npm_client" | "$(Agent.OS)"| $(Build.SourcesDirectory)/src/Umbraco.Web.UI.New.Client/package-lock.json' + key: '"npm_client" | "$(Agent.OS)"| $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Client/package-lock.json' restoreKeys: | "npm_client" | "$(Agent.OS)" "npm_client" path: $(npm_config_cache) - script: npm ci --no-fund --no-audit --prefer-offline - workingDirectory: src/Umbraco.Web.UI.New.Client + workingDirectory: src/Umbraco.Web.UI.Client displayName: Run npm ci - script: npm run storybook:build displayName: Build Storybook env: VITE_BASE_PATH: $(BASE_PATH)/ - workingDirectory: $(Build.SourcesDirectory)/src/Umbraco.Web.UI.New.Client + workingDirectory: $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Client - script: sed -i "s|/umbraco/backoffice|$(BASE_PATH)/umbraco/backoffice|" assets/*.js displayName: Replace BASE_PATH on assets - workingDirectory: $(Build.SourcesDirectory)/src/Umbraco.Web.UI.New.Client/storybook-static + workingDirectory: $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Client/storybook-static - task: ArchiveFiles@2 displayName: Archive js Docs inputs: - rootFolderOrFile: $(Build.SourcesDirectory)/src/Umbraco.Web.UI.New.Client/storybook-static + rootFolderOrFile: $(Build.SourcesDirectory)/src/Umbraco.Web.UI.Client/storybook-static includeRootFolder: false archiveFile: $(Build.ArtifactStagingDirectory)/ui-docs.zip - task: PublishPipelineArtifact@1 diff --git a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj index 58d8a0e4e90d..2436754ad2b9 100644 --- a/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj +++ b/src/Umbraco.Cms.StaticAssets/Umbraco.Cms.StaticAssets.csproj @@ -31,12 +31,12 @@ - - + + - + diff --git a/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj b/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj index 140cb8a115e5..b83a582ade9a 100644 --- a/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj +++ b/src/Umbraco.Cms.Targets/Umbraco.Cms.Targets.csproj @@ -62,7 +62,7 @@ - + diff --git a/src/Umbraco.Web.UI.New.Client b/src/Umbraco.Web.UI.New.Client deleted file mode 160000 index ece5b173398b..000000000000 --- a/src/Umbraco.Web.UI.New.Client +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ece5b173398bc227762f0f5cfb85caa3c853f7f3 diff --git a/umbraco.sln b/umbraco.sln index ba1850e013b7..98d22936b9c9 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -152,25 +152,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "src\Umbra EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Api.Common", "src\Umbraco.Cms.Api.Common\Umbraco.Cms.Api.Common.csproj", "{D48B5D6B-82FF-4235-986C-CDE646F41DEC}" EndProject -Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.New.Client", "src\Umbraco.Web.UI.New.Client\", "{D88A926B-E8D6-495A-A2ED-8EFD0C847C62}" +Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.Client", "src\Umbraco.Web.UI.Client\", "{D88A926B-E8D6-495A-A2ED-8EFD0C847C62}" ProjectSection(WebsiteProperties) = preProject TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.8" Debug.AspNetCompiler.VirtualPath = "/localhost_55211" - Debug.AspNetCompiler.PhysicalPath = "src\Umbraco.Web.UI.New.Client\" + Debug.AspNetCompiler.PhysicalPath = "src\Umbraco.Web.UI.Client\" Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_55211\" Debug.AspNetCompiler.Updateable = "true" Debug.AspNetCompiler.ForceOverwrite = "true" Debug.AspNetCompiler.FixedNames = "false" Debug.AspNetCompiler.Debug = "True" Release.AspNetCompiler.VirtualPath = "/localhost_55211" - Release.AspNetCompiler.PhysicalPath = "src\Umbraco.Web.UI.New.Client\" + Release.AspNetCompiler.PhysicalPath = "src\Umbraco.Web.UI.Client\" Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_55211\" Release.AspNetCompiler.Updateable = "true" Release.AspNetCompiler.ForceOverwrite = "true" Release.AspNetCompiler.FixedNames = "false" Release.AspNetCompiler.Debug = "False" VWDPort = "55211" - SlnRelativePath = "src\Umbraco.Web.UI.New.Client\" + SlnRelativePath = "src\Umbraco.Web.UI.Client\" EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Cms.Api.Delivery", "src\Umbraco.Cms.Api.Delivery\Umbraco.Cms.Api.Delivery.csproj", "{9AA3D21F-81A9-4F27-85D1-CE850B59DC2D}" From fdcaf7a21cb662019d1cb6d7f4d177f131dc52f6 Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:15:05 +0100 Subject: [PATCH 04/12] Add new submodule --- .gitmodules | 4 ++-- src/Umbraco.Web.UI.Client | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 160000 src/Umbraco.Web.UI.Client diff --git a/.gitmodules b/.gitmodules index 2106b81d2f90..d1e6ead0dde8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "src/Umbraco.Web.UI.New.Client"] - path = src/Umbraco.Web.UI.New.Client +[submodule "src/Umbraco.Web.UI.Client"] + path = src/Umbraco.Web.UI.Client url = https://github.com/umbraco/Umbraco.CMS.Backoffice.git diff --git a/src/Umbraco.Web.UI.Client b/src/Umbraco.Web.UI.Client new file mode 160000 index 000000000000..5540b4381acd --- /dev/null +++ b/src/Umbraco.Web.UI.Client @@ -0,0 +1 @@ +Subproject commit 5540b4381acdc8363cefc60a8a81871f35529dcc From 791e9cc0090180cbc2a5a431c2f9fc120d7c90c2 Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:51:08 +0100 Subject: [PATCH 05/12] Update template csproj --- templates/Umbraco.Templates.csproj | 42 ++++++++---------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/templates/Umbraco.Templates.csproj b/templates/Umbraco.Templates.csproj index 7fba38376bc5..df30d0a612d7 100644 --- a/templates/Umbraco.Templates.csproj +++ b/templates/Umbraco.Templates.csproj @@ -17,49 +17,29 @@ UmbracoProject\Program.cs UmbracoProject - - UmbracoProject\Views\Partials\blockgrid\area.cshtml - UmbracoProject\Views\Partials\blockgrid - - - UmbracoProject\Views\Partials\blockgrid\areas.cshtml - UmbracoProject\Views\Partials\blockgrid - - - UmbracoProject\Views\Partials\blockgrid\default.cshtml - UmbracoProject\Views\Partials\blockgrid - - - UmbracoProject\Views\Partials\blockgrid\items.cshtml - UmbracoProject\Views\Partials\blockgrid - - - UmbracoProject\Views\Partials\blocklist\default.cshtml - UmbracoProject\Views\Partials\blocklist - - - UmbracoProject\Views\_ViewImports.cshtml - UmbracoProject\Views - - - UmbracoProject\wwwroot\favicon.ico - UmbracoProject\wwwroot - - + UmbracoProject\Views\Partials\blocklist\%(RecursiveDir)%(Filename)%(Extension) UmbracoProject\Views\Partials\blocklist - + UmbracoProject\Views\Partials\grid\%(RecursiveDir)%(Filename)%(Extension) UmbracoProject\Views\Partials\grid - + UmbracoProject\Views\Partials\blockgrid\%(RecursiveDir)%(Filename)%(Extension) UmbracoProject\Views\Partials\blockgrid + + UmbracoProject\Views\_ViewImports.cshtml + UmbracoProject\Views + + + UmbracoProject\wwwroot\favicon.ico + UmbracoProject\wwwroot + From 0f400538ac0fe9461eed073c9005453694482a9f Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 5 Mar 2024 12:03:19 +0100 Subject: [PATCH 06/12] Remove more mentions of new --- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 76b6132870a7..acd631e1ad5e 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -1,6 +1,6 @@ - Umbraco.Cms.Web.UI.New + Umbraco.Cms.Web.UI false false From de1b21bfefbeb7b547a45cea72d1d63ac8ee391f Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:13:15 +0100 Subject: [PATCH 07/12] Add missing views --- .../Views/Partials/blockgrid/area.cshtml | 10 +++++ .../Views/Partials/blockgrid/areas.cshtml | 13 +++++++ .../Views/Partials/blockgrid/default.cshtml | 11 ++++++ .../Views/Partials/blockgrid/items.cshtml | 36 ++++++++++++++++++ .../Views/Partials/blocklist/default.cshtml | 13 +++++++ src/Umbraco.Web.UI/Views/_ViewImports.cshtml | 6 +++ src/Umbraco.Web.UI/wwwroot/favicon.ico | Bin 0 -> 15406 bytes 7 files changed, 89 insertions(+) create mode 100644 src/Umbraco.Web.UI/Views/Partials/blockgrid/area.cshtml create mode 100644 src/Umbraco.Web.UI/Views/Partials/blockgrid/areas.cshtml create mode 100644 src/Umbraco.Web.UI/Views/Partials/blockgrid/default.cshtml create mode 100644 src/Umbraco.Web.UI/Views/Partials/blockgrid/items.cshtml create mode 100644 src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml create mode 100644 src/Umbraco.Web.UI/Views/_ViewImports.cshtml create mode 100644 src/Umbraco.Web.UI/wwwroot/favicon.ico diff --git a/src/Umbraco.Web.UI/Views/Partials/blockgrid/area.cshtml b/src/Umbraco.Web.UI/Views/Partials/blockgrid/area.cshtml new file mode 100644 index 000000000000..361484757c3f --- /dev/null +++ b/src/Umbraco.Web.UI/Views/Partials/blockgrid/area.cshtml @@ -0,0 +1,10 @@ +@using Umbraco.Extensions +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage + +
+ @await Html.GetBlockGridItemsHtmlAsync(Model) +
diff --git a/src/Umbraco.Web.UI/Views/Partials/blockgrid/areas.cshtml b/src/Umbraco.Web.UI/Views/Partials/blockgrid/areas.cshtml new file mode 100644 index 000000000000..30f987ce1ebd --- /dev/null +++ b/src/Umbraco.Web.UI/Views/Partials/blockgrid/areas.cshtml @@ -0,0 +1,13 @@ +@using Umbraco.Extensions +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage +@{ + if (Model?.Areas.Any() != true) { return; } +} + +
+ @foreach (var area in Model.Areas) + { + @await Html.GetBlockGridItemAreaHtmlAsync(area) + } +
diff --git a/src/Umbraco.Web.UI/Views/Partials/blockgrid/default.cshtml b/src/Umbraco.Web.UI/Views/Partials/blockgrid/default.cshtml new file mode 100644 index 000000000000..e25839ebb18b --- /dev/null +++ b/src/Umbraco.Web.UI/Views/Partials/blockgrid/default.cshtml @@ -0,0 +1,11 @@ +@using Umbraco.Extensions +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage +@{ + if (Model?.Any() != true) { return; } +} + +
+ @await Html.GetBlockGridItemsHtmlAsync(Model) +
diff --git a/src/Umbraco.Web.UI/Views/Partials/blockgrid/items.cshtml b/src/Umbraco.Web.UI/Views/Partials/blockgrid/items.cshtml new file mode 100644 index 000000000000..2703fa5701f3 --- /dev/null +++ b/src/Umbraco.Web.UI/Views/Partials/blockgrid/items.cshtml @@ -0,0 +1,36 @@ +@using Umbraco.Cms.Core.Models.Blocks +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage> +@{ + if (Model?.Any() != true) { return; } +} + +
+ @foreach (var item in Model) + { + +
+ @{ + var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias; + try + { + @await Html.PartialAsync(partialViewName, item) + } + catch (InvalidOperationException) + { +

+ Could not render component of type: @(item.Content.ContentType.Alias) +
+ This likely happened because the partial view @partialViewName could not be found. +

+ } + } +
+ } +
diff --git a/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml b/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml new file mode 100644 index 000000000000..accca2ef37c9 --- /dev/null +++ b/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml @@ -0,0 +1,13 @@ +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage +@{ + if (Model?.Any() != true) { return; } +} +
+ @foreach (var block in Model) + { + if (block?.ContentUdi == null) { continue; } + var data = block.Content; + + @await Html.PartialAsync("blocklist/Components/" + data.ContentType.Alias, block) + } +
diff --git a/src/Umbraco.Web.UI/Views/_ViewImports.cshtml b/src/Umbraco.Web.UI/Views/_ViewImports.cshtml new file mode 100644 index 000000000000..929938d2d11c --- /dev/null +++ b/src/Umbraco.Web.UI/Views/_ViewImports.cshtml @@ -0,0 +1,6 @@ +@using Umbraco.Extensions +@using Umbraco.Cms.Web.Common.PublishedModels +@using Umbraco.Cms.Web.Common.Views +@using Umbraco.Cms.Core.Models.PublishedContent +@using Microsoft.AspNetCore.Html +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/src/Umbraco.Web.UI/wwwroot/favicon.ico b/src/Umbraco.Web.UI/wwwroot/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c0749ddf7f1b68606b0672aa8d709779d6b0817a GIT binary patch literal 15406 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 literal 0 HcmV?d00001 From 1a7e7f6d987f93b21d79e2bdb69e2f8169e015e7 Mon Sep 17 00:00:00 2001 From: Elitsa Date: Mon, 11 Mar 2024 14:12:42 +0100 Subject: [PATCH 08/12] Moving up the "Umbraco.Web.UI" proj reference, so that it is the first project listed in solution file (.sln) since it will be selected as startup one in VS by default. --- umbraco.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/umbraco.sln b/umbraco.sln index 98d22936b9c9..119318caa4f5 100644 --- a/umbraco.sln +++ b/umbraco.sln @@ -2,6 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.32328.378 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{C55CA725-9F4E-4618-9435-6B8AE05DA14D}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B5BD12C1-A454-435E-8A46-FF4A364C0382}" ProjectSection(SolutionItems) = preProject tests\.editorconfig = tests\.editorconfig @@ -148,8 +150,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Imaging.ImageSh EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{05878304-40EB-4F84-B40B-91BDB70DE094}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Web.UI", "src\Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{C55CA725-9F4E-4618-9435-6B8AE05DA14D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Cms.Api.Common", "src\Umbraco.Cms.Api.Common\Umbraco.Cms.Api.Common.csproj", "{D48B5D6B-82FF-4235-986C-CDE646F41DEC}" EndProject Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Umbraco.Web.UI.Client", "src\Umbraco.Web.UI.Client\", "{D88A926B-E8D6-495A-A2ED-8EFD0C847C62}" From e77a2fbd6b0b8d46b49a46746240a70b5f0f4907 Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:04:13 +0100 Subject: [PATCH 09/12] don't include grid --- templates/Umbraco.Templates.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/templates/Umbraco.Templates.csproj b/templates/Umbraco.Templates.csproj index df30d0a612d7..8301264ec826 100644 --- a/templates/Umbraco.Templates.csproj +++ b/templates/Umbraco.Templates.csproj @@ -24,10 +24,6 @@ UmbracoProject\Views\Partials\blocklist\%(RecursiveDir)%(Filename)%(Extension) UmbracoProject\Views\Partials\blocklist - - UmbracoProject\Views\Partials\grid\%(RecursiveDir)%(Filename)%(Extension) - UmbracoProject\Views\Partials\grid - UmbracoProject\Views\Partials\blockgrid\%(RecursiveDir)%(Filename)%(Extension) UmbracoProject\Views\Partials\blockgrid From c3dbebe891f839d8e5c9a4794cacd2edfbda8b8d Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:09:26 +0100 Subject: [PATCH 10/12] Update with section of how to get started with backoffice --- .github/BUILD.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/BUILD.md b/.github/BUILD.md index 4f2523624ad5..d7b9865af43b 100644 --- a/.github/BUILD.md +++ b/.github/BUILD.md @@ -13,6 +13,15 @@ If the answer is yes, please read on. Otherwise, make sure to head on over [to t ↖️ You can jump to any section by using the "table of contents" button ( ![Table of contents icon](img/tableofcontentsicon.svg) ) above. +## Getting Started: +To run umbraco, we first need to initialize the client git submodule: +* Execute `git submodule init` and then `git submodule update` to get the files into Umbraco.Web.UI.New.Client project +* If you are going to work on the Backoffice, you can either go to the Umbraco.Web.UI.Client folder and check out a new branch or set it up in your IDE, which will allow you to commit to each repository simultaneously: + * **Rider**: Preferences -> Version Control -> Directory Mappings -> Click the '+' sign + +### Latest version +* If you want to get the latest changes from the client repository, run `git submodule update` again which will pull the latest main branch. + ## Debugging source locally From deafee6bfd9f969992b48cdccb0897e1ada8ee0b Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:36:33 +0100 Subject: [PATCH 11/12] Update .github/BUILD.md Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> --- .github/BUILD.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/BUILD.md b/.github/BUILD.md index d7b9865af43b..97df71e02085 100644 --- a/.github/BUILD.md +++ b/.github/BUILD.md @@ -15,7 +15,7 @@ If the answer is yes, please read on. Otherwise, make sure to head on over [to t ## Getting Started: To run umbraco, we first need to initialize the client git submodule: -* Execute `git submodule init` and then `git submodule update` to get the files into Umbraco.Web.UI.New.Client project +* Execute `git submodule init` and then `git submodule update` to get the files into Umbraco.Web.UI.Client project * If you are going to work on the Backoffice, you can either go to the Umbraco.Web.UI.Client folder and check out a new branch or set it up in your IDE, which will allow you to commit to each repository simultaneously: * **Rider**: Preferences -> Version Control -> Directory Mappings -> Click the '+' sign From ccaecf61d014b842f7749e9d72d308358bc89e46 Mon Sep 17 00:00:00 2001 From: Zeegaan Date: Tue, 12 Mar 2024 09:46:07 +0100 Subject: [PATCH 12/12] Add line about white page --- .github/BUILD.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/BUILD.md b/.github/BUILD.md index 97df71e02085..f5e1eb0b3485 100644 --- a/.github/BUILD.md +++ b/.github/BUILD.md @@ -18,6 +18,7 @@ To run umbraco, we first need to initialize the client git submodule: * Execute `git submodule init` and then `git submodule update` to get the files into Umbraco.Web.UI.Client project * If you are going to work on the Backoffice, you can either go to the Umbraco.Web.UI.Client folder and check out a new branch or set it up in your IDE, which will allow you to commit to each repository simultaneously: * **Rider**: Preferences -> Version Control -> Directory Mappings -> Click the '+' sign +* If you get a white page delete Umbraco.Cms.StaticAssets\wwwroot\umbraco folder and run `npm ci && npm run build:for:cms` inside Umbraco.Web.UI.Client folder to clear out any leftover files from older versions. ### Latest version * If you want to get the latest changes from the client repository, run `git submodule update` again which will pull the latest main branch.