Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCC-245: Update OC preview version and fix breaking changes #16

Merged
merged 32 commits into from
Jul 28, 2024
Merged

OCC-245: Update OC preview version and fix breaking changes #16

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
dff16fe
Update OC preview version.
sarahelsaig May 28, 2024
9de987e
Fix breaking changes.
sarahelsaig May 28, 2024
82ae0d9
Update OC preview version.
sarahelsaig May 30, 2024
a94c9ac
Fix walkthrough elements.
sarahelsaig Jun 2, 2024
9d605ff
Fix walkthrough elements.
sarahelsaig Jun 2, 2024
c34cfaa
Update OC preview version.
sarahelsaig Jun 5, 2024
a77bd12
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jun 14, 2024
16e3466
Merge branch 'task/system-text-json-migration' into issue/OCC-245
sarahelsaig Jun 17, 2024
407934a
Update OC version.
sarahelsaig Jun 18, 2024
7081fdc
Update OC version.
sarahelsaig Jun 19, 2024
7ebf4b6
Update OC preview version.
sarahelsaig Jun 20, 2024
5503de0
Update OC preview version.
sarahelsaig Jun 21, 2024
9bce617
Merge remote-tracking branch 'origin/issue/OCC-245' into issue/OCC-245
sarahelsaig Jun 21, 2024
ce8cade
Update HL and UITT NuGet versions.
sarahelsaig Jun 24, 2024
d2e58e7
Update OC NuGet versions.
sarahelsaig Jun 24, 2024
59e2316
Update to latest OC preview version.
sarahelsaig Jul 2, 2024
9ed82dc
Update OC preview version.
sarahelsaig Jul 11, 2024
22aeb10
Update HL version.
sarahelsaig Jul 13, 2024
9e826db
Update UITT version.
sarahelsaig Jul 13, 2024
43b368d
Update HL nuget version.
sarahelsaig Jul 16, 2024
19d60d6
Update all UITT Nuget versions.
sarahelsaig Jul 16, 2024
bb2e47e
Update package version.
sarahelsaig Jul 16, 2024
34dbdc2
Update OC preview versions.
sarahelsaig Jul 24, 2024
fc9eafe
Removing outdated test code
Piedone Jul 26, 2024
318c3bd
Update HL preview version.
sarahelsaig Jul 26, 2024
4db7593
Update UITT preview version.
sarahelsaig Jul 26, 2024
b0ac929
Update HL preview.
sarahelsaig Jul 27, 2024
bb78b4e
Update UITT version.
sarahelsaig Jul 27, 2024
4bd2ce1
Update UITT preview version.
sarahelsaig Jul 27, 2024
f4a37c7
NuGet.config
sarahelsaig Jul 27, 2024
bf66e28
Update HL nuget version.
sarahelsaig Jul 27, 2024
4a1c134
Update HL.
sarahelsaig Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions Lombiq.Walkthroughs.Test.UI/Extensions/TestCaseUITestContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,12 +359,8 @@ await AssertStepAndClickNextAsync(
await AssertStepAndFillInShepherdTargetAndClickNextAsync("Layout widgets", "Give it a title.", "Sample paragraph widget");
await AssertStepAndClickNextAsync("Layout widgets", "Give it some content.");
await AssertStepAndClickShepherdTargetAsync("Layout widgets", "We are ready, let's publish it!");
// In Orchard Core 1.8 this link doesn't open a new tab anymore so these three lines will need to be switched to
// just AssertStepAndClickShepherdTargetAsync() after an Orchard upgrade.
AssertStep(
await AssertStepAndClickShepherdTargetAsync(
"Layout widgets", "Your paragraph widget is now published.", assertShepherdTargetIsNotBody: false);
await context.ClickReliablyOnAsync(_byShepherdTarget);
SwitchToLastWindowAndSetDefaultBrowserSize();
await AssertStepAndClickNextAsync(
"Layout widgets", "You should see your paragraph", assertShepherdTargetIsNotBody: false);
});
Expand Down
2 changes: 1 addition & 1 deletion Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.1" />
<PackageReference Include="Lombiq.Tests.UI" Version="10.0.2-preview.5.occ-245" />
</ItemGroup>

<ItemGroup>
Expand Down
72 changes: 39 additions & 33 deletions Lombiq.Walkthroughs/Assets/Scripts/walkthroughs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ jQuery(($) => {
addShepherdQueryParams();
}

function firstWithText(query, text) {
return Array
.from(document.querySelectorAll(query))
.filter((element) => element.textContent.includes(text))[0];
}

const backButton = {
action: function () {
return this.back();
Expand Down Expand Up @@ -148,7 +154,7 @@ jQuery(($) => {
steps: [
{
title: 'Welcome to the<br>Orchard Core Admin Walkthrough!',
text: `This walkthrough covers key Orchard Core features, such as content management, user roles,
text: `This walkthrough covers key Orchard Core features, such as content management, user roles,
and theme selection, and points you to further learning resources.`,
buttons: [
{
Expand All @@ -169,16 +175,16 @@ jQuery(($) => {
},
{
title: 'Setup recipe',
text: `<p>The setup recipe in the Walkthroughs module used the
text: `<p>The setup recipe in the Walkthroughs module used the
<a href="https://docs.orchardcore.net/en/latest/docs/getting-started/starter-recipes/#theblogtheme-and-blog-recipe" target="_blank">
Blog recipe</a> as a base recipe.</p>
<p>In Orchard Core, a
<p>In Orchard Core, a
<a href="https://docs.orchardcore.net/en/main/docs/reference/modules/Recipes/" target="_blank">
recipe</a> is a JSON file that defines a set of instructions for setting up and configuring
an Orchard Core application. Recipes can include predefined content types, widgets, menus,
content items, and other configuration. They are used to streamline the setup of an Orchard
Core site, making it easier to create consistent site structures and content.</p>
<p>Setup recipes can be executed during the initial setup of a site, and non-setup recipes
<p>Setup recipes can be executed during the initial setup of a site, and non-setup recipes
at any point to apply configuration or import content.</p>`,
buttons: [
backButton,
Expand All @@ -188,7 +194,7 @@ jQuery(($) => {
},
{
title: 'Site setup',
text: `To get to this point (a set up site), first you will need to get through the setup
text: `To get to this point (a set up site), first you will need to get through the setup
screen. There you can decide which setup recipe you'd like to use. Currently, we are using
the Walkthroughs recipe.`,
buttons: [
Expand All @@ -199,7 +205,7 @@ jQuery(($) => {
},
{
title: 'Log in',
text: `Let's log in! Please go to the <em>"~/Login"</em>, by clicking on the <em>"Next"</em>
text: `Let's log in! Please go to the <em>"~/Login"</em>, by clicking on the <em>"Next"</em>
button.`,
buttons: [
backButton,
Expand Down Expand Up @@ -317,7 +323,7 @@ jQuery(($) => {
},
{
title: 'Admin dashboard',
text: `Let's see the admin dashboard now! Please go to the <em>"~/Admin"</em> URL by
text: `Let's see the admin dashboard now! Please go to the <em>"~/Admin"</em> URL by
clicking on the <em>"Next"</em> button.`,
buttons: [
backButton,
Expand Down Expand Up @@ -375,7 +381,7 @@ jQuery(($) => {
},
{
title: 'Top menu',
text: `This is the top menu. Here you can switch between dark and light modes, go to the
text: `This is the top menu. Here you can switch between dark and light modes, go to the
homepage, log off, or take a look at your profile.`,
attachTo: { element: '.user-top-navbar', on: 'bottom' },

Expand All @@ -394,7 +400,7 @@ jQuery(($) => {
recipe as a base. There is also a singular blog content item and there is a menu pointing
to it.</p>
<p>Click on the <em>"Blog"</em> link and you will see all the blog posts within the blog.</p>`,
attachTo: { element: '.icon-class-fas.icon-class-fa-rss.item-label.d-flex', on: 'right' },
attachTo: { element: () => firstWithText('.item-label', 'Blog'), on: 'right' },
buttons: [
backButton,
],
Expand Down Expand Up @@ -473,7 +479,7 @@ jQuery(($) => {
},
{
title: 'Permalink',
text: `You can give the blog post an URL by hand, but you can leave it empty to let Orchard
text: `You can give the blog post an URL by hand, but you can leave it empty to let Orchard
Core auto-generate it. We recommend you let Orchard do its magic.`,
attachTo: { element: '#AutoroutePart_Path', on: 'bottom' },
buttons: [
Expand Down Expand Up @@ -1063,7 +1069,7 @@ jQuery(($) => {
},
{
title: 'Managing the menu',
text: `<p>As you can see, you can easily access it via the menu. It's a pity our new article
text: `<p>As you can see, you can easily access it via the menu. It's a pity our new article
doesn't have this... Let's add a menu item for it too!</p>
<p>Go back to the admin dashboard by clicking on the <em>"Next"</em> button.</p>`,
attachTo: { element: 'body', on: 'top' },
Expand Down Expand Up @@ -1092,7 +1098,7 @@ jQuery(($) => {
{
title: 'Managing the menu',
text: 'Click on the <em>"Main Menu"</em> link.',
attachTo: { element: '.icon-class-fas.icon-class-fa-sitemap.item-label.d-flex', on: 'right' }, // #spell-check-ignore-line
attachTo: { element: () => firstWithText('.item-label', 'Main Menu'), on: 'right' }, // #spell-check-ignore-line
buttons: [
{
action: function () {
Expand Down Expand Up @@ -1170,7 +1176,7 @@ jQuery(($) => {
},
{
title: 'Managing the menu',
text: `<p>For now, let's go with the Link Menu Item one. This can be used to easily add menu
text: `<p>For now, let's go with the Link Menu Item one. This can be used to easily add menu
items for any URL.</p>
<p>Click on the <em>"Add"</em> button.</p>`,
attachTo: { element: 'a[href*="Create/LinkMenuItem"]', on: 'bottom' },
Expand Down Expand Up @@ -1311,7 +1317,7 @@ jQuery(($) => {
},
{
title: 'Content listing',
text: `Now let's go back to the admin dashboard! We'll check out how you can list all the
text: `Now let's go back to the admin dashboard! We'll check out how you can list all the
content of your website. Click on the <em>"Next"</em> button.`,
buttons: [
backButton,
Expand Down Expand Up @@ -1399,9 +1405,9 @@ jQuery(($) => {
title: 'Taxonomies',
text: `<p>We'll now see how to use the Taxonomies module for categorization (remember the Tags
and Categories fields of blog posts?).</p>
<p>With this module you can create Taxonomy content items that can contain Taxonomy Terms.
These will be the specific categories or tags, and they can even be organized as a
hierarchy (like News → Sports). Then, you can use the Taxonomy Field on other content items
<p>With this module you can create Taxonomy content items that can contain Taxonomy Terms.
These will be the specific categories or tags, and they can even be organized as a
hierarchy (like News → Sports). Then, you can use the Taxonomy Field on other content items
(like blog posts) to add these terms to them.</p>`,
buttons: [
{
Expand All @@ -1427,7 +1433,7 @@ jQuery(($) => {
},
{
title: 'Taxonomies',
text: `<p>You can access this list by filtering for the <em>"Taxonomy"</em> content type (see
text: `<p>You can access this list by filtering for the <em>"Taxonomy"</em> content type (see
top-right corner).</p>
<p>There are two taxonomies here: Categories and Tags. These are both used for blog posts.</p>`,
attachTo: { element: '.list-group.with-checkbox', on: 'top' },
Expand Down Expand Up @@ -1501,8 +1507,8 @@ jQuery(($) => {
},
{
title: 'Taxonomies',
text: `You can select an icon for the category. This will be displayed as decoration when
listing categories on the frontend (like <a href="/categories" target="_blank">here</a>).
text: `You can select an icon for the category. This will be displayed as decoration when
listing categories on the frontend (like <a href="/categories" target="_blank">here</a>).
You need to pick an icon, otherwise you can't publish your category.)`,
// Not attaching to #Category_Icon because then the opening UI overlay would be partially
// obstructed.
Expand All @@ -1526,7 +1532,7 @@ jQuery(($) => {
},
{
title: 'Taxonomies',
text: `And you can set a permalink for it or just leave it blank for Orchard Core to
text: `And you can set a permalink for it or just leave it blank for Orchard Core to
auto-generate it.`,
attachTo: { element: '#AutoroutePart_Path', on: 'top' },
buttons: [
Expand Down Expand Up @@ -1840,7 +1846,7 @@ jQuery(($) => {
},
{
title: 'Flow Part',
text: `<p>The page has a part called <em>"Flow Part"</em>. It allows you to add different
text: `<p>The page has a part called <em>"Flow Part"</em>. It allows you to add different
widgets to your page, building complex layouts that are displayed in a responsive way, so
they look good on all screen sizes (hence the name "flow").</p>
<p>If you want a simple page, with only some simpler HTML content, it's better to create an
Expand All @@ -1861,8 +1867,8 @@ jQuery(($) => {
},
{
title: 'Flow Part',
text: `<p>You will see the different widgets here that you can add. Blockquote, Image, Paragraph,
and Raw Html are all just what their names suggest. Container is a container for widgets,
text: `<p>You will see the different widgets here that you can add. Blockquote, Image, Paragraph,
and Raw Html are all just what their names suggest. Container is a container for widgets,
so you can build some multi-level structure.</p>
<p>These widgets came with the Blog recipe, but modules can add new ones too, and you can
create your own widget types as well!</p>
Expand Down Expand Up @@ -1912,7 +1918,7 @@ jQuery(($) => {
title: 'Flow Part',
text: 'Click on the dropdown to edit it!',
attachTo: {
element: '.btn.btn-outline-secondary.btn-sm.widget-editor-btn-toggle.widget-editor-btn-expand',
element: '.widget-editor-btn-toggle.widget-editor-btn-expand',
on: 'top',
},
buttons: [
Expand Down Expand Up @@ -2630,7 +2636,7 @@ jQuery(($) => {
},
{
title: 'Audit Trail',
text: `<p>The Audit Trail module provides an immutable (for users, even administrators, but not
text: `<p>The Audit Trail module provides an immutable (for users, even administrators, but not
for developers), auditable log of certain changes and events in the system. This includes
e.g. creation or deletion of content items, and events like user login failures. For
content items, previous versions and deleted items can be restored, and changes can be
Expand Down Expand Up @@ -3492,7 +3498,7 @@ jQuery(($) => {
},
{
title: 'Deployment',
text: `<p><em>"Update Content Definitions"</em> exports the chosen content types and parts (you
text: `<p><em>"Update Content Definitions"</em> exports the chosen content types and parts (you
can configure it later which ones).</p>
<p>After running the deployment plan, each step will add its own JSON to the final
<em>"recipe.json"</em> file, which you can later download. You can then import this file on
Expand Down Expand Up @@ -3584,7 +3590,7 @@ jQuery(($) => {
},
{
title: 'Deployment',
text: `Here you can use <em>"File Download"</em> so the exported <em>recipe.json</em> file will
text: `Here you can use <em>"File Download"</em> so the exported <em>recipe.json</em> file will
be downloaded (inside a zip file).`,
attachTo: { element: '.btn.btn-primary.btn-sm[href*="ExportFile"]', on: 'right' },
buttons: [
Expand Down Expand Up @@ -3680,7 +3686,7 @@ jQuery(($) => {
},
{
title: 'Deployment',
text: `After you selected the file, click on <em>"Import"</em> to import it. This will add,
text: `After you selected the file, click on <em>"Import"</em> to import it. This will add,
delete, or change everything that is configured in the deployment plan.`,
attachTo: { element: '.btn.btn-primary.import', on: 'top' },
buttons: [
Expand All @@ -3707,7 +3713,7 @@ jQuery(($) => {
{
title: 'Themes and modules',
text: `<p>Now let's take a look at how plugins work in Orchard Core. Note that we call them
extensions here.</p>
extensions here.</p>
<p>There are many built-in extensions (like all the ones that you use during this
walkthrough), and you or other developers can create their own ones too.</p>
<p>We have two kinds of extensions: Themes and modules. Themes define how a website looks
Expand Down Expand Up @@ -3854,7 +3860,7 @@ jQuery(($) => {
},
{
title: 'Walkthrough completed',
text: `<p>Congratulations! You completed the walkthrough. For further learning, we recommend you
text: `<p>Congratulations! You completed the walkthrough. For further learning, we recommend you
check out the following resources:</p>
<ul>
<li>
Expand Down Expand Up @@ -3909,9 +3915,9 @@ jQuery(($) => {
{
title: 'Select walkthrough!',
text: `<p>Welcome! The <a href="https://github.com/Lombiq/Orchard-Walkthroughs" target="_blank">
Lombiq.Walkthroughs module</a> is active. This module includes various walkthroughs that
Lombiq.Walkthroughs module</a> is active. This module includes various walkthroughs that
provide hands-on tutorials guided by interactive tooltips.</p>
<p>Do you prefer tutorial videos or deep-diving into the code instead? Check out
<p>Do you prefer tutorial videos or deep-diving into the code instead? Check out
<a href="https://orcharddojo.net/orchard-training/dojo-course-3-the-full-orchard-core-tutorial" target="_blank">
Dojo Course 3</a>!</p>
<p>You can pause a walkthrough at any time. Just bookmark the page and you can open it later to
Expand Down
1 change: 0 additions & 1 deletion Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using OrchardCore.ContentManagement;
using OrchardCore.DisplayManagement;
using OrchardCore.DisplayManagement.Layout;
using OrchardCore.Modules;
Expand Down
Loading