fix(taboule): expect 'publicKey' to be passed as query param

tracking-exposed · Oct 17, 2022 · 4cba72e · 4cba72e
1 parent dbc67df
commit 4cba72e
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 35 deletions.
diff --git a/packages/taboule/src/components/Taboule.tsx b/packages/taboule/src/components/Taboule.tsx
@@ -5,10 +5,9 @@ import {
   GridColTypeDef,
   GridEventListener,
 } from '@mui/x-data-grid';
-import { APIError } from '@shared/errors/APIError';
 import { AppError } from '@shared/errors/AppError';
 import { GetLogger } from '@shared/logger';
-import { ObservableQuery } from 'avenger/lib/Query';
+import { ParsedInfo } from '@yttrex/shared/src/models/Metadata';
 import * as QR from 'avenger/lib/QueryResult';
 import { WithQueries } from 'avenger/lib/react';
 import debug from 'debug';
@@ -19,11 +18,14 @@ import { PathReporter } from 'io-ts/lib/PathReporter';
 import * as React from 'react';
 import * as config from '../config';
 import { TabouleDataProvider } from '../state';
-import { Results, SearchRequestInput, TabouleQueries } from '../state/queries';
+import {
+  EndpointQuery,
+  SearchRequestInput,
+  TabouleQueries,
+} from '../state/queries';
 import { TabouleQueryKey } from '../state/types';
 import { ErrorOverlay } from './ErrorOverlay';
 import ExpandView from './expand-view/ExpandView';
-import { ParsedInfo } from '@yttrex/shared/src/models/Metadata';
 import './Taboule.css';
 
 debug.enable(process.env.DEBUG ?? '');
@@ -95,11 +97,9 @@ export const Taboule = <Q extends keyof TabouleQueries>({
     () => TabouleDataProvider(baseURL),
     [baseURL]
   );
-  const query: ObservableQuery<
-    SearchRequestInput,
-    APIError,
-    Results<any>
-  > = tabouleQueries.queries[queryKey];
+  const query: EndpointQuery<SearchRequestInput, any> = tabouleQueries.queries[
+    queryKey
+  ] as any;
 
   const { inputs, ...queryConfig } = React.useMemo(
     () =>

diff --git a/packages/taboule/src/state/queries.ts b/packages/taboule/src/state/queries.ts
@@ -23,7 +23,7 @@ import { Step } from '@shared/models/Step';
 import { ListMetadataQuery } from '@yttrex/shared/endpoints/v2/metadata.endpoints';
 
 export interface SearchRequestInput {
-  Params: any;
+  Params: { publicKey: string };
   Query: SearchQuery;
 }
 
@@ -37,20 +37,27 @@ export interface Results<T> {
   content: T[];
 }
 
-type EndpointQuery<C> = CachedQuery<SearchRequestInput, APIError, Results<C>>;
+export type EndpointQuery<Q extends {}, C> = CachedQuery<
+  Q,
+  APIError,
+  Results<C>
+>;
 
 export interface TabouleQueries {
-  YCAIccRelatedUsers: EndpointQuery<ChannelRelated>;
-  youtubeGetExperimentById: EndpointQuery<Step>;
-  youtubeGetExperimentList: EndpointQuery<GuardoniExperiment>;
-  youtubePersonalSearches: EndpointQuery<SearchMetadata>;
-  youtubePersonalAds: EndpointQuery<any>;
-  youtubePersonalHomes: EndpointQuery<HomeMetadata>;
-  youtubePersonalVideos: EndpointQuery<VideoMetadata>;
+  YCAIccRelatedUsers: EndpointQuery<any, ChannelRelated>;
+  youtubeGetExperimentById: EndpointQuery<any, Step>;
+  youtubeGetExperimentList: EndpointQuery<
+    SearchRequestInput,
+    GuardoniExperiment
+  >;
+  youtubePersonalSearches: EndpointQuery<SearchRequestInput, SearchMetadata>;
+  youtubePersonalAds: EndpointQuery<SearchRequestInput, any>;
+  youtubePersonalHomes: EndpointQuery<SearchRequestInput, HomeMetadata>;
+  youtubePersonalVideos: EndpointQuery<SearchRequestInput, VideoMetadata>;
   // tik tok
-  tikTokPersonalHTMLSummary: EndpointQuery<SummaryHTMLMetadata>;
-  tikTokPersonalSearch: EndpointQuery<TikTokPSearchMetadata>;
-  tikTokSearches: EndpointQuery<TKSearchMetadata>;
+  tikTokPersonalHTMLSummary: EndpointQuery<any, SummaryHTMLMetadata>;
+  tikTokPersonalSearch: EndpointQuery<any, TikTokPSearchMetadata>;
+  tikTokSearches: EndpointQuery<any, TKSearchMetadata>;
 }
 
 interface GetTabouleQueriesProps {
@@ -153,7 +160,6 @@ export const GetTabouleQueries = ({
             researchTag: undefined,
             format: 'json',
             nature: 'home',
-            publicKey: 'H7AsuUszehN4qKTj2GYYwNNzkJVqUQBRo2wgKevzeUwx',
           },
         }),
         TE.map((content) => {
@@ -193,14 +199,14 @@ export const GetTabouleQueries = ({
       pipe(
         YTAPI.v2.Metadata.ListMetadata({
           Query: {
+            ...input.Params,
             ...input.Query,
             amount: '20' as any,
             skip: '0' as any,
             experimentId: undefined,
             researchTag: undefined,
             format: 'json',
             nature: 'video',
-            publicKey: 'H7AsuUszehN4qKTj2GYYwNNzkJVqUQBRo2wgKevzeUwx',
           },
         }),
         TE.map((content) => {
@@ -231,12 +237,13 @@ export const GetTabouleQueries = ({
             researchTag: undefined,
             format: 'json',
             nature: 'search',
-            publicKey: 'H7AsuUszehN4qKTj2GYYwNNzkJVqUQBRo2wgKevzeUwx',
           },
         }),
         TE.map((content) => {
-          const x = content.filter((c) => c.type === 'search');
-          return x as any[] as SearchMetadata[];
+          const x = content.filter(
+            (c) => c.type === 'search'
+          ) as any[] as SearchMetadata[];
+          return x;
         }),
         TE.map((content) => ({
           total: content.length ?? 0,
@@ -263,16 +270,21 @@ export const GetTabouleQueries = ({
   );
 
   const tikTokPersonalSearch = queryStrict<
-    SearchRequestInput,
+    SearchRequestInput & { Params: { publicKey: string } },
     APIError,
     Results<TikTokPSearchMetadata>
   >(
     (input) =>
       pipe(
-        YTAPI.v1.Public.GetPersonalSearchByPublicKey(input),
+        TK_API.v2.Personal.GetPersonalJSON({
+          Params: {
+            ...input.Params,
+            what: 'search',
+          },
+        }),
         TE.map((content) => ({
-          total: content.metadata.length,
-          content: content.metadata,
+          total: content.total,
+          content: content.content as any[],
         }))
       ),
     available

diff --git a/platforms/yttrex/shared/src/models/Metadata.ts b/platforms/yttrex/shared/src/models/Metadata.ts
@@ -14,17 +14,17 @@ export const ParsedInfo = t.strict(
     verified: t.union([t.boolean, t.null]),
     // foryou: t.union([t.string, t.undefined, t.null]),
     parameter: t.union([t.string, t.undefined]),
-    params: t.union([t.record(t.string, t.string), t.undefined]),
+    params: t.union([t.record(t.string, t.string), t.undefined, t.null]),
     title: t.union([t.string, t.undefined]),
     recommendedHref: t.string,
     recommendedTitle: t.union([t.string, t.undefined]),
     recommendedSource: t.union([t.string, t.null, t.undefined]),
     recommendedLength: t.union([t.number, t.undefined]),
-    recommendedDisplayL: t.union([t.string, t.undefined]),
+    recommendedDisplayL: t.union([t.string, t.undefined, t.null]),
     // moment duration as string
-    recommendedPubTime: t.union([t.any, t.undefined]),
-    publicationTime: t.union([DateFromISOString, t.undefined]),
-    recommendedThumbnail: t.union([t.string, t.undefined]),
+    recommendedPubTime: t.union([t.any, t.undefined, t.null]),
+    publicationTime: t.union([DateFromISOString, t.undefined, t.null]),
+    recommendedThumbnail: t.union([t.string, t.undefined, t.null]),
     recommendedViews: t.union([t.number, t.undefined]),
     views: t.union([t.number, t.undefined]),
   },