WIP

algolia · Oct 2, 2020 · 24a9051 · 24a9051
1 parent 432b67a
commit 24a9051
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 8 deletions.
diff --git a/frontend/src/AlgoliasearchNetlify.ts b/frontend/src/AlgoliasearchNetlify.ts
@@ -1,7 +1,10 @@
 import { AutocompleteWrapper } from './AutocompleteWrapper';
 import { Options } from './options';
 
-const defaultOptions: Omit<Options, 'appId' | 'apiKey' | 'indexName'> = {
+const defaultOptions: Omit<
+  Options,
+  'appId' | 'apiKey' | 'indexName' | 'siteId' | 'branch'
+> = {
   analytics: true,
   autocomplete: {
     hitsPerPage: 5,
@@ -20,11 +23,21 @@ class AlgoliasearchNetlify {
   constructor(_options: Options) {
     AlgoliasearchNetlify.instances.push(this);
 
+    // Temporary
+    const splitIndexName = (
+      indexName: string
+    ): { siteId: string; branch: string } => {
+      const regexp = /^netlify_([0-9a-f-]+)_(.*)_all$/;
+      const [, siteId, branch] = indexName.match(regexp)!;
+      return { siteId, branch };
+    };
+
     // eslint-disable-next-line no-warning-comments
     // TODO: add validation
     const options = {
       ...defaultOptions,
       ..._options,
+      ...(_options.indexName && splitIndexName(_options.indexName)), // Temporary
       autocomplete: {
         ...defaultOptions.autocomplete,
         ..._options.autocomplete,

diff --git a/frontend/src/AutocompleteWrapper.ts b/frontend/src/AutocompleteWrapper.ts
@@ -33,15 +33,14 @@ const SM_WIDTH = 600;
 class AutocompleteWrapper {
   // All fields are private because they're just here for debugging
   private client: SearchClient;
-  private indexName: string;
   private index: SearchIndex;
 
   private $inputs: HTMLInputElement[] = [];
   private autocompletes: AutocompleteJs[] = [];
 
-  constructor({ appId, apiKey, indexName }: Options) {
+  constructor({ appId, apiKey, siteId, branch }: Options) {
     this.client = this.createClient(appId, apiKey);
-    this.indexName = indexName;
+    const indexName = this.computeIndexName(siteId, branch);
     this.index = this.client.initIndex(indexName);
   }
 
@@ -108,6 +107,14 @@ class AutocompleteWrapper {
     this.autocompletes = autocompletes;
   }
 
+  private computeIndexName(siteId: string, branch: string): string {
+    // Keep in sync with crawler code in /netlify/crawl
+    const cleanBranch = branch
+      .replace(/[^\p{L}\p{N}_.-]+/gu, '-')
+      .replace(/-{2,}/g, '-');
+    return `netlify_${siteId}_${cleanBranch}_all`;
+  }
+
   private createClient(appId: string, apiKey: string): SearchClient {
     const client = algoliasearch(appId, apiKey);
     client.addAlgoliaAgent(`Netlify integration ${version}`);

diff --git a/frontend/src/options.ts b/frontend/src/options.ts
@@ -2,7 +2,11 @@ export interface Options {
   // Mandatory
   appId: string;
   apiKey: string;
-  indexName: string;
+
+  // Temporary
+  indexName?: string;
+  siteId: string;
+  branch: string;
 
   // Optional
   analytics: boolean;

diff --git a/public/1.html b/public/1.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <title>First test page</title>
+    <meta name="description" content="First test page description" />
   </head>
   <body>
     <h2>First test page</h2>

diff --git a/public/2.html b/public/2.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <title>Second test page</title>
+    <meta name="description" content="Second test page description" />
   </head>
   <body>
     <h2>Second test page</h2>

diff --git a/public/index.html b/public/index.html
@@ -3,6 +3,8 @@
 
 <head>
   <title>Algoliasearch Netlify Test Website</title>
+  <meta name="description" content="Algolia x Netlify testing website." />
+
   <link rel="icon" href="/favicon.ico" />
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/necolas/normalize.css@8.0.1/normalize.css" />
 
@@ -145,9 +147,9 @@ <h2>Test content</h2>
     type="text/javascript"></script>
   <script type="text/javascript">
     const DEFAULT_SOURCE = `algoliasearchNetlify({
-          appId: 'FHMV5EW9NC',
-          apiKey: 'aea9a7c4604b1e1a4d57fd29b2dc0a3f',
-          indexName: 'test-manual-index',
+          appId: '4C7VLPQA76',
+          apiKey: 'a9cfed5acb56143690b612167d89a1b5',
+          indexName: 'netlify_9209706f-d5b7-46e2-bb88-5d6bedd2823f_feat-plugin-add-siteid-branch-param_all',
           debug: true,
         });`
       .split('\n')