Merge pull request #120 from episerver/bugfix/CMS-43246-variation-small-bugs

Small bugfixes (variations)

Author: exacs

packages/optimizely-cms-sdk/src/graph/createQuery.ts

@@ -289,6 +289,9 @@ query GetContent($where: _ContentWhereInput, $variation: VariationInput) {
     item {
       __typename
       ...${contentType}
+      _metadata {
+        variation
+      }
     }
   }
 }

packages/optimizely-cms-sdk/src/graph/filters.ts

@@ -51,7 +51,6 @@ export function previewFilter(params: {
     },
     variation: {
       include: 'ALL',
-      includeOriginal: true,
     },
   };
 }
@@ -69,13 +68,13 @@ export function variationFilter(value: string): ContentInput {
  * Arguments for querying content via the Graph API.
  */
 export type ContentInput = {
-  variation?: VariationInput;
+  variation?: GraphVariationInput;
   where?: ContentWhereInput;
 };
 
-export type VariationInput =
+export type GraphVariationInput =
   | { include: 'NONE' }
-  | { include: 'ALL'; includeOriginal?: boolean }
+  | { include: 'ALL' }
   | {
       include: 'SOME';
       value: string[];

packages/optimizely-cms-sdk/src/graph/index.ts

@@ -12,7 +12,7 @@ import {
   ContentInput as GraphVariables,
   pathFilter,
   previewFilter,
-  VariationInput,
+  GraphVariationInput,
 } from './filters.js';
 
 /** Options for Graph */
@@ -29,10 +29,12 @@ export type PreviewParams = {
   loc: string;
 };
 
-type FetchContentOptions = {
-  variation?: VariationInput;
+export type GraphGetContentOptions = {
+  variation?: GraphVariationInput;
 };
 
+export { GraphVariationInput };
+
 const GET_CONTENT_METADATA_QUERY = `
 query GetContentMetadata($where: _ContentWhereInput, $variation: VariationInput) {
   _Content(where: $where, variation: $variation) {
@@ -187,7 +189,10 @@ export class GraphClient {
    *
    * @returns An iterator that traverses all found items
    */
-  async getContentByPath<T = any>(path: string, options?: FetchContentOptions) {
+  async getContentByPath<T = any>(
+    path: string,
+    options?: GraphGetContentOptions
+  ) {
     const input: GraphVariables = {
       ...pathFilter(path),
       variation: options?.variation,

packages/optimizely-cms-sdk/src/index.ts

@@ -8,8 +8,11 @@ export {
   initContentTypeRegistry,
   initDisplayTemplateRegistry,
 } from './model/index.js';
-export { GraphClient } from './graph/index.js';
-export { createSingleContentQuery } from './graph/createQuery.js';
+export {
+  GraphClient,
+  GraphGetContentOptions,
+  GraphVariationInput,
+} from './graph/index.js';
 export type { PreviewParams } from './graph/index.js';
 export {
   BlankSectionContentType,