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

Legger til støtte for nye læringssti steg. #2323

Merged
merged 9 commits into from
Feb 3, 2025
Merged

Legger til støtte for nye læringssti steg. #2323

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
be9b0c0
Split learningpath embed into multiple files for readability
MaPoKen Jan 22, 2025
c7a2975
Update packages
MaPoKen Jan 23, 2025
617d5e5
Merge branch 'master' of github.com:NDLANO/ndla-frontend into split-l…
MaPoKen Jan 23, 2025
45646be
Remove optional fields from creation
MaPoKen Jan 23, 2025
41c7cf9
Adjust step footer length
MaPoKen Jan 29, 2025
1532fd7
Find step index in list instead of relying on seqno as it can be nega…
MaPoKen Jan 29, 2025
23d0ac2
Merge branch 'master' of github.com:NDLANO/ndla-frontend into split-l…
MaPoKen Jan 30, 2025
de47ee3
Simplify with Katrine comments
MaPoKen Jan 31, 2025
1c989d1
Merge branch 'master' of github.com:NDLANO/ndla-frontend into split-l…
MaPoKen Feb 3, 2025
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
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"@graphql-eslint/eslint-plugin": "^4.3.0",
"@ndla/preset-panda": "^0.0.49",
"@ndla/scripts": "^2.1.7",
"@ndla/types-backend": "^1.0.5",
"@ndla/types-embed": "^5.0.9-alpha.0",
"@ndla/types-backend": "^1.0.17",
"@ndla/types-embed": "^5.0.10-alpha.0",
"@ndla/types-taxonomy": "^1.0.34",
"@pandacss/dev": "^0.48.0",
"@playwright/test": "^1.49.1",
Expand Down Expand Up @@ -90,17 +90,17 @@
"@fontsource/source-sans-pro": "^4.5.9",
"@fontsource/source-serif-pro": "^4.5.7",
"@lexical/react": "^0.12.4",
"@ndla/article-converter": "^10.0.95-alpha.0",
"@ndla/article-converter": "^10.0.96-alpha.0",
"@ndla/core": "^5.0.3",
"@ndla/hooks": "^2.1.11",
"@ndla/icons": "^8.0.50-alpha.0",
"@ndla/image-search": "^11.0.78-alpha.0",
"@ndla/image-search": "^11.0.79-alpha.0",
"@ndla/licenses": "^8.0.6-alpha.0",
"@ndla/primitives": "^1.0.69-alpha.0",
"@ndla/safelink": "^7.0.70-alpha.0",
"@ndla/primitives": "^1.0.70-alpha.0",
"@ndla/safelink": "^7.0.71-alpha.0",
"@ndla/styled-system": "^0.0.30",
"@ndla/tracker": "^5.0.16-alpha.0",
"@ndla/ui": "^56.0.92-alpha.0",
"@ndla/ui": "^56.0.93-alpha.0",
"@ndla/util": "^5.0.5-alpha.0",
"@sentry/react": "^8.42.0",
"cross-env": "^7.0.3",
Expand Down
4 changes: 2 additions & 2 deletions src/components/Disclaimer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import {
DialogTitle,
DialogTrigger,
} from "@ndla/primitives";
import { GQLTransformedDisclaimerContent } from "../graphqlTypes";
import { DialogCloseButton } from "./DialogCloseButton";
import { GQLTransformedArticleContent } from "../graphqlTypes";

interface Props {
disclaimer: GQLTransformedDisclaimerContent;
disclaimer: GQLTransformedArticleContent;
}

const Disclaimer = ({ disclaimer }: Props) => {
Expand Down
52 changes: 12 additions & 40 deletions src/components/Learningpath/Learningpath.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
import { useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { gql } from "@apollo/client";
import { transform } from "@ndla/article-converter";
import { ArrowDownShortLine, ArrowLeftLine, ArrowRightLine } from "@ndla/icons";
import { getLicenseByAbbreviation } from "@ndla/licenses";
import {
AccordionItem,
AccordionItemContent,
Expand All @@ -24,29 +22,28 @@ import {
} from "@ndla/primitives";
import { SafeLinkButton } from "@ndla/safelink";
import { styled } from "@ndla/styled-system/jsx";
import { ArticleContent, ArticleHeader, ArticleWrapper, ContentTypeBadge, HomeBreadcrumb, LicenseLink } from "@ndla/ui";
import { ContentTypeBadge, HomeBreadcrumb } from "@ndla/ui";
import { contains } from "@ndla/util";
import LastLearningpathStepInfo from "./LastLearningpathStepInfo";
import LearningpathEmbed, { EmbedPageContent } from "./LearningpathEmbed";
import LearningpathMenu from "./LearningpathMenu";
import type { LearningpathContext } from "./learningpathUtils";
import {
GQLLearningpath_LearningpathFragment,
GQLLearningpath_LearningpathStepFragment,
GQLLearningpathPage_NodeFragment,
} from "../../graphqlTypes";
import { Breadcrumb as BreadcrumbType } from "../../interfaces";
import { Breadcrumb } from "../../interfaces";
import { routes, toLearningPath } from "../../routeHelpers";
import FavoriteButton from "../Article/FavoritesButton";
import { PageContainer } from "../Layout/PageContainer";
import AddResourceToFolderModal from "../MyNdla/AddResourceToFolderModal";
import { LearningpathStep } from "./components/LearningpathStep";

interface Props {
learningpath: GQLLearningpath_LearningpathFragment;
learningpathStep: GQLLearningpath_LearningpathStepFragment;
resource?: GQLLearningpathPage_NodeFragment;
skipToContentId?: string;
breadcrumbItems: BreadcrumbType[];
breadcrumbItems: Breadcrumb[];
resourcePath?: string;
context?: LearningpathContext;
}
Expand Down Expand Up @@ -190,7 +187,7 @@ const Learningpath = ({
breadcrumbItems,
context = "default",
}: Props) => {
const { t, i18n } = useTranslation();
const { t } = useTranslation();
const [accordionValue, setAccordionValue] = useState<string[]>();
const accordionRef = useRef<HTMLDivElement>(null);

Expand Down Expand Up @@ -273,39 +270,14 @@ const Learningpath = ({
</StyledAccordionRoot>
{context === "default" && <MenuWrapper>{menu}</MenuWrapper>}
<StyledPageContent variant="article" gutters="never">
{(!!learningpathStep.description || !!learningpathStep.showTitle) && (
<EmbedPageContent variant="content">
<ArticleWrapper>
{!!learningpathStep.showTitle && (
<ArticleHeader>
<Heading id={learningpathStep.showTitle ? skipToContentId : undefined}>
{learningpathStep.title}
</Heading>
<LicenseLink
license={getLicenseByAbbreviation(learningpathStep.license?.license ?? "", i18n.language)}
/>
</ArticleHeader>
)}
<ArticleContent>
{!!learningpathStep.description && <section>{transform(learningpathStep.description, {})}</section>}
</ArticleContent>
</ArticleWrapper>
</EmbedPageContent>
)}
<LearningpathEmbed
key={learningpathStep.id}
skipToContentId={!learningpathStep.showTitle ? skipToContentId : undefined}
<LearningpathStep
resource={resource}
subjectId={root?.id}
learningpathStep={learningpathStep}
learningpath={learningpath}
breadcrumbItems={breadcrumbItems}
>
<LastLearningpathStepInfo
seqNo={learningpathStep.seqNo}
numberOfLearningSteps={learningpath.learningsteps.length - 1}
title={learningpath.title}
resource={resource}
/>
</LearningpathEmbed>
skipToContentId={skipToContentId}
learningpathStep={learningpathStep}
/>
{/* TODO: How should this handle long titles on smaller screens? */}
<PageButtonsContainer>
{previousStep ? (
Expand Down Expand Up @@ -362,7 +334,7 @@ Learningpath.fragments = {
...LearningpathMenu_LearningpathStep
}
${LearningpathMenu.fragments.step}
${LearningpathEmbed.fragments.learningpathStep}
${LearningpathStep.fragments.learningpathStep}
`,
learningpath: gql`
fragment Learningpath_Learningpath on Learningpath {
Expand Down
Loading
Loading