Merge pull request #47 from supproduction/bugix/cc-34208-cms-pages

feat: cms content

libs/domain/content/link/link.component.ts

@@ -35,10 +35,11 @@ export class ContentLinkComponent extends ContentMixin<
 
   protected $link = computed(() => {
     const { url, type, id, qualifier, params } = this.$options();
+
     if (url) return of(url);
     if (type)
       return this.semanticLinkService.get({
-        type: type,
+        type,
         id,
         qualifier,
         params,

libs/domain/content/src/index.ts

@@ -1,3 +1,4 @@
 export * from './feature';
 export * from './models';
+export * from './resolvers';
 export * from './services';

libs/template/labs/src/articles/article.model.ts → libs/domain/content/src/models/cms.model.ts

@@ -1,14 +1,18 @@
+// TODO: create dynamic types and dependable dynamic pages.
+export const cmsTypes = ['article', 'faq', 'about'];
+
 declare global {
   interface ContentFields {
     article: undefined;
-    about: undefined;
     faq: undefined;
+    about: undefined;
   }
 }
 
-export interface ArticleContent {
+export interface CmsContent {
   heading: string;
   description: string;
   content: string;
   type: string;
+  [key: string]: unknown;
 }

libs/domain/content/src/models/content.model.ts

@@ -1,5 +1,8 @@
 declare global {
   interface ContentFields {
+    /**
+     * Page or component config. // ExperienceComponent
+     */
     component: undefined;
   }
 }

libs/domain/content/src/models/index.ts

@@ -1,3 +1,4 @@
+export * from './cms.model';
 export * from './content.model';
 
 /**

libs/template/labs/src/articles/resolvers/article-page-description-meta.resolver.ts → libs/domain/content/src/resolvers/cms-page-description-meta.resolver.ts

@@ -1,8 +1,3 @@
-import {
-  ContentContext,
-  ContentQualifier,
-  ContentService,
-} from '@oryx-frontend/content';
 import {
   ContextService,
   ElementResolver,
@@ -11,9 +6,10 @@ import {
 import { inject } from '@oryx-frontend/di';
 import { RouterService } from '@oryx-frontend/router';
 import { Observable, combineLatest, map, of, switchMap } from 'rxjs';
-import { ArticleContent } from '../article.model';
+import { CmsContent, ContentQualifier } from '../models';
+import { ContentContext, ContentService } from '../services';
 
-export class ArticlePageDescriptionMetaResolver implements PageMetaResolver {
+export class CmsPageDescriptionMetaResolver implements PageMetaResolver {
   constructor(
     protected context = inject(ContextService),
     protected content = inject(ContentService),
@@ -26,7 +22,11 @@ export class ArticlePageDescriptionMetaResolver implements PageMetaResolver {
       combineLatest([
         this.context.get(null, ContentContext.Content),
         this.router.currentRoute(),
-      ]).pipe(map(([type, route]) => route.includes(`/${type}/`))),
+      ]).pipe(
+        map(([qualifier, route]) =>
+          route.includes(`/${qualifier?.type}/${qualifier?.id}`)
+        )
+      ),
     ]);
   }
 
@@ -41,7 +41,7 @@ export class ArticlePageDescriptionMetaResolver implements PageMetaResolver {
           if (!id || !type) return of({});
 
           return this.content
-            .get<ArticleContent>({
+            .get<CmsContent>({
               id,
               type,
               entities: [type],

libs/template/labs/src/articles/resolvers/article-page-title-meta.resolver.ts → libs/domain/content/src/resolvers/cms-page-title-meta.resolver.ts

@@ -1,8 +1,3 @@
-import {
-  ContentContext,
-  ContentQualifier,
-  ContentService,
-} from '@oryx-frontend/content';
 import {
   ContextService,
   ElementResolver,
@@ -11,9 +6,10 @@ import {
 import { inject } from '@oryx-frontend/di';
 import { RouterService } from '@oryx-frontend/router';
 import { Observable, combineLatest, map, of, switchMap } from 'rxjs';
-import { ArticleContent } from '../article.model';
+import { CmsContent, ContentQualifier } from '../models';
+import { ContentContext, ContentService } from '../services';
 
-export class ArticlePageTitleMetaResolver implements PageMetaResolver {
+export class CmsPageTitleMetaResolver implements PageMetaResolver {
   constructor(
     protected context = inject(ContextService),
     protected router = inject(RouterService),
@@ -26,7 +22,11 @@ export class ArticlePageTitleMetaResolver implements PageMetaResolver {
       combineLatest([
         this.context.get(null, ContentContext.Content),
         this.router.currentRoute(),
-      ]).pipe(map(([type, route]) => route.includes(`/${type}/`))),
+      ]).pipe(
+        map(([qualifier, route]) =>
+          route.includes(`/${qualifier?.type}/${qualifier?.id}`)
+        )
+      ),
     ]);
   }
 
@@ -41,7 +41,7 @@ export class ArticlePageTitleMetaResolver implements PageMetaResolver {
           if (!id || !type) return of({});
 
           return this.content
-            .get<ArticleContent>({
+            .get<CmsContent>({
               id,
               type,
               entities: [type],

libs/domain/content/src/resolvers/index.ts

@@ -0,0 +1,2 @@
+export * from './cms-page-description-meta.resolver';
+export * from './cms-page-title-meta.resolver';

libs/template/labs/src/articles/article-context.ts → libs/domain/content/src/services/cms/cms-context.ts

@@ -1,10 +1,10 @@
-import { ContentContext } from '@oryx-frontend/content';
 import { ContextFallback } from '@oryx-frontend/core';
 import { inject, Provider } from '@oryx-frontend/di';
 import { RouterService } from '@oryx-frontend/router';
 import { combineLatest, map } from 'rxjs';
+import { ContentContext } from '../content-context';
 
-export const ArticleQualifierContextFallback: Provider = {
+export const CmsQualifierContextFallback: Provider = {
   provide: `${ContextFallback}${ContentContext.Content}`,
   useFactory: () =>
     combineLatest([

libs/template/labs/src/articles/article-providers.ts → libs/domain/content/src/services/cms/cms-providers.ts

@@ -1,30 +1,29 @@
-import {
-  Content,
-  ContentConfig,
-  ContentQualifier,
-  ContentService,
-} from '@oryx-frontend/content';
 import { PageMetaResolver, provideEntity } from '@oryx-frontend/core';
 import { Provider } from '@oryx-frontend/di';
-import { provideExperienceData } from '@oryx-frontend/experience';
-import { ArticleQualifierContextFallback } from './article-context';
-import { experienceArticlePages } from './article-page';
-import { articleTypes } from './article-types';
+import { Content, ContentQualifier, cmsTypes } from '../../models';
 import {
-  ArticlePageDescriptionMetaResolver,
-  ArticlePageTitleMetaResolver,
-} from './resolvers';
+  CmsPageDescriptionMetaResolver,
+  CmsPageTitleMetaResolver,
+} from '../../resolvers';
+import { ContentConfig } from '../adapter';
+import { ContentService } from '../content.service';
+import { CmsQualifierContextFallback } from './cms-context';
+import { contentfulProviders } from './contentful';
+import { storyblokProviders } from './storyblok';
+import { strapiProviders } from './strapi';
 
-export const articleProviders: Provider[] = [
-  ArticleQualifierContextFallback,
-  provideExperienceData(experienceArticlePages),
+export const cmsProviders: Provider[] = [
+  ...contentfulProviders,
+  ...storyblokProviders,
+  ...strapiProviders,
+  CmsQualifierContextFallback,
   {
     provide: PageMetaResolver,
-    useClass: ArticlePageTitleMetaResolver,
+    useClass: CmsPageTitleMetaResolver,
   },
   {
     provide: PageMetaResolver,
-    useClass: ArticlePageDescriptionMetaResolver,
+    useClass: CmsPageDescriptionMetaResolver,
   },
   {
     provide: ContentConfig,
@@ -41,10 +40,10 @@ export const articleProviders: Provider[] = [
       },
     },
   },
-  ...articleTypes.map((type) =>
+  ...cmsTypes.map((type) =>
     provideEntity<Content | null | undefined, ContentQualifier>(type, {
       service: ContentService,
-      context: type,
+      context: 'content',
       get: (service, qualifier) =>
         (service as ContentService).get({ ...qualifier, type }),
     })

libs/domain/content/src/services/cms/index.ts

@@ -1,3 +1,5 @@
+export * from './cms-context';
+export * from './cms-providers';
 export * from './contentful';
 export * from './storyblok';
 export * from './strapi';

libs/domain/content/src/services/content.providers.ts

@@ -2,11 +2,7 @@ import { provideEntity } from '@oryx-frontend/core';
 import { Provider } from '@oryx-frontend/di';
 import { ExperienceAdapter } from '@oryx-frontend/experience';
 import { ContentExperienceAdapter } from './adapter';
-import {
-  contentfulProviders,
-  storyblokProviders,
-  strapiProviders,
-} from './cms';
+import { cmsProviders } from './cms';
 import { ContentContext } from './content-context';
 import { ContentService } from './content.service';
 import { DefaultContentService } from './default-content.service';
@@ -25,11 +21,9 @@ export const contentProviders: Provider[] = [
     provide: FontService,
     useClass: DefaultFontService,
   },
-  ...contentfulProviders,
-  ...storyblokProviders,
-  ...strapiProviders,
   provideEntity('content', {
     service: ContentService,
     context: ContentContext.Content,
   }),
+  ...cmsProviders,
 ];

libs/platform/core/src/services/page-meta/page-meta-resolver/default-page-meta-resolver.service.ts

@@ -37,7 +37,10 @@ export class DefaultPageMetaResolverService implements PageMetaResolverService {
     ).pipe(
       map((data) =>
         data
-          .filter(([score]) => score !== ResolverScore.NotUsed)
+          .filter(
+            ([score, data]) =>
+              score !== ResolverScore.NotUsed && Object.keys(data).length
+          )
           .sort(([aScore], [bScore]) => aScore - bScore)
           .reduce((acc, [_, elements]) => ({ ...acc, ...elements }), {})
       )

libs/platform/experience/data-text/data-text.component.ts

@@ -20,6 +20,7 @@ export class DataTextComponent extends TextMixin(
 
   protected $data = computed<string | undefined>(() => {
     const { entity: type, field } = this.$options();
+
     return this.entityService
       .getField<string>({ element: this, type, field })
       .pipe(catchError(() => of()));