Merge pull request #976 from filecoin-project/@martinalong/elastic-se…

…arch-v1 @martinalong/elastic search v1
filecoin-project · Nov 1, 2021 · 2d33c0e · 2d33c0e
2 parents b2135c2 + 745bcd5
commit 2d33c0e
Show file tree

Hide file tree

Showing 37 changed files with 1,495 additions and 353 deletions.
diff --git a/common/actions.js b/common/actions.js
@@ -98,6 +98,13 @@ export const sendFilecoin = async (data) => {
 //   }
 // };
 
+export const search = async (data) => {
+  return await returnJSON(`/api/search/search`, {
+    ...DEFAULT_OPTIONS,
+    body: JSON.stringify({ data }),
+  });
+};
+
 export const checkUsername = async (data) => {
   return await returnJSON(`/api/users/check-username`, {
     ...DEFAULT_OPTIONS,
@@ -196,17 +203,17 @@ export const createSubscription = async (data) => {
   });
 };
 
-export const search = async (data) => {
-  await Websockets.checkWebsocket();
-  if (Strings.isEmpty(data.query)) {
-    return { decorator: "NO_SERVER_TRIP", data: { results: [] } };
-  }
+// export const search = async (data) => {
+//   await Websockets.checkWebsocket();
+//   if (Strings.isEmpty(data.query)) {
+//     return { decorator: "NO_SERVER_TRIP", data: { results: [] } };
+//   }
 
-  return await returnJSON(`${Environment.URI_LENS}/search`, {
-    ...CORS_OPTIONS,
-    body: JSON.stringify({ data }),
-  });
-};
+//   return await returnJSON(`${Environment.URI_LENS}/search`, {
+//     ...CORS_OPTIONS,
+//     body: JSON.stringify({ data }),
+//   });
+// };
 
 export const createFile = async (data) => {
   await Websockets.checkWebsocket();
@@ -303,13 +310,6 @@ export const updateStatus = async (data) => {
   });
 };
 
-export const updateSearch = async (data) => {
-  return await returnJSON(`/api/search/update`, {
-    ...DEFAULT_OPTIONS,
-    body: JSON.stringify({ data }),
-  });
-};
-
 // export const checkCIDStatus = async (data) => {
 //   return await returnJSON(`/api/data/cid-status`, {
 //     ...DEFAULT_OPTIONS,

diff --git a/common/user-behaviors.js b/common/user-behaviors.js
@@ -107,8 +107,6 @@ export const signOut = async ({ viewer }) => {
 
 // NOTE(jim): Permanently deletes you, forever.
 export const deleteMe = async ({ viewer }) => {
-  await Actions.updateSearch("delete-user");
-
   let response = await Actions.deleteViewer();
 
   if (Events.hasError(response)) {

diff --git a/components/core/Application.js b/components/core/Application.js
@@ -285,10 +285,6 @@ export default class ApplicationPage extends React.Component {
       });
     }
 
-    if (newAccount) {
-      Actions.updateSearch("create-user");
-    }
-
     // let redirected = this._handleURLRedirect();
     // if (!redirected) {
     //   this._handleAction({ type: "NAVIGATE", value: "NAV_DATA" });

diff --git a/components/core/ApplicationHeader.js b/components/core/ApplicationHeader.js
@@ -5,6 +5,7 @@ import * as Events from "~/common/custom-events";
 import * as Styles from "~/common/styles";
 import * as Upload from "~/components/core/Upload";
 import * as Filter from "~/components/core/Filter";
+import * as Actions from "~/common/actions";
 
 import {
   ApplicationUserControls,
@@ -18,17 +19,17 @@ import { ButtonPrimary, ButtonTertiary } from "~/components/system/components/Bu
 import { Match, Switch } from "~/components/utility/Switch";
 import { Show } from "~/components/utility/Show";
 import { useField, useMediaQuery } from "~/common/hooks";
-import { Input } from "~/components/system";
+import { Input } from "~/components/system/components/Input";
 import { AnimatePresence, motion } from "framer-motion";
 
 const STYLES_SEARCH_COMPONENT = (theme) => css`
   background-color: transparent;
-  border-radius: 8px;
   box-shadow: none;
   height: 100%;
   input {
     height: 100%;
-    padding: 0px;
+    padding: 0px 4px;
+    border-radius: 0px;
   }
   &::placeholder {
     color: ${theme.semantic.textGray};
@@ -134,6 +135,7 @@ export default function ApplicationHeader({ viewer, page, data, onAction }) {
     showDropdown: false,
     popup: null,
     isRefreshing: false,
+    query: "",
   });
 
   const _handleTogglePopup = (value) => {
@@ -144,23 +146,30 @@ export default function ApplicationHeader({ viewer, page, data, onAction }) {
     }
   };
 
-  const handleCreateSearch = (searchQuery) => {
-    setState((prev) => ({ ...prev, showDropdown: false }));
-    Events.dispatchCustomEvent({
-      name: "show-search",
-      detail: {
-        initialValue: searchQuery,
-      },
+  const _handleInputChange = (e) => {
+    setState((prev) => ({ ...prev, query: e.target.value }));
+  };
+
+  //TODO(amine): plug in the right values
+  //for more context, look at node_common/managers/search/search.js
+  //types: leaving it null searches everything. Doing ["SLATE"] searches just slates, doing ["USER", "FILE"] searches users and files.
+  //globalSearch: whether you are just searching the user's files/slates or global files/slates. This option doesn't exist for searching users since there is no notion of public or private users
+  //tagIds: only applies when searching files. the ids of the tags (aka collections) you are searching within. aka if you only want to search for files in a given slate, provide that slate's id. If no tag ids are provided, it searches all files
+  //grouped: whether to group the results by type (slate, user, file) when searching multiple types. Doesn't apply when searching only one type e.g. types: ["SLATE"]
+  const handleSearch = async () => {
+    const response = await Actions.search({
+      types: null,
+      query: state.query,
+      globalSearch: true,
+      tagIds: null,
+      grouped: true,
     });
+    console.log(response);
   };
 
-  const {
-    getFieldProps,
-    value: searchQuery,
-    setFieldValue,
-  } = useField({
+  const { getFieldProps, value: searchQuery, setFieldValue } = useField({
     initialValue: "",
-    onSubmit: handleCreateSearch,
+    onSubmit: handleSearch,
   });
 
   const handleDismissSearch = () => setFieldValue("");
@@ -198,15 +207,17 @@ export default function ApplicationHeader({ viewer, page, data, onAction }) {
                 full
                 placeholder={`Search ${!viewer ? "slate.host" : ""}`}
                 inputCss={STYLES_SEARCH_COMPONENT}
-                onSubmit={handleCreateSearch}
+                onSubmit={handleSearch}
                 name="search"
                 {...getFieldProps()}
+                onChange={_handleInputChange}
+                value={state.query}
               />
             </div>
             <Upload.Provider page={page} data={data} viewer={viewer}>
               <Upload.Root data={data}>
                 <div css={STYLES_RIGHT}>
-                  <Actions
+                  <UserActions
                     uploadAction={
                       <Upload.Trigger
                         viewer={viewer}
@@ -249,7 +260,7 @@ export default function ApplicationHeader({ viewer, page, data, onAction }) {
   );
 }
 
-const Actions = ({ uploadAction, isSignedOut, isSearching, onAction, onDismissSearch }) => {
+const UserActions = ({ uploadAction, isSignedOut, isSearching, onAction, onDismissSearch }) => {
   const authActions = React.useMemo(
     () => (
       <>

diff --git a/node_common/environment.js b/node_common/environment.js
@@ -57,3 +57,8 @@ export const MICROLINK_API_KEY = process.env.MICROLINK_API_KEY;
 
 //NOTE(martina): Estuary
 export const ESTUARY_API_KEY = process.env.ESTUARY_API_KEY;
+
+//NOTE(martina): Elastic search
+export const ELASTIC_SEARCH_CLOUD_ID = process.env.ELASTIC_SEARCH_CLOUD_ID;
+export const ELASTIC_SEARCH_API_KEY_ID = process.env.ELASTIC_SEARCH_API_KEY_ID;
+export const ELASTIC_SEARCH_API_KEY = process.env.ELASTIC_SEARCH_API_KEY;
diff --git a/node_common/managers/search.js b/node_common/managers/search.js
diff --git a/node_common/managers/search/index.js b/node_common/managers/search/index.js
@@ -0,0 +1,49 @@
+import {
+  createUserIndex,
+  createFileIndex,
+  createSlateIndex,
+  deleteUserIndex,
+  deleteFileIndex,
+  deleteSlateIndex,
+} from "~/node_common/managers/search/manage";
+import {
+  searchMultiple,
+  searchUser,
+  searchSlate,
+  searchFile,
+} from "~/node_common/managers/search/search";
+import {
+  indexUser,
+  indexSlate,
+  indexFile,
+  updateUser,
+  updateSlate,
+  updateFile,
+  deleteUser,
+  deleteSlate,
+  deleteFile,
+} from "~/node_common/managers/search/update";
+
+const SearchManager = {
+  createUserIndex,
+  createFileIndex,
+  createSlateIndex,
+  deleteUserIndex,
+  deleteFileIndex,
+  deleteSlateIndex,
+  indexUser,
+  indexSlate,
+  indexFile,
+  updateUser,
+  updateSlate,
+  updateFile,
+  deleteUser,
+  deleteSlate,
+  deleteFile,
+  searchMultiple,
+  searchUser,
+  searchSlate,
+  searchFile,
+};
+
+export default SearchManager;