#706 fix search atomicdata.dev

atomicdata-dev · Nov 29, 2023 · 52a5533 · 52a5533
1 parent c2595bd
commit 52a5533
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ See [STATUS.md](server/STATUS.md) to learn more about which features will remain
 
 ## UNRELEASED
 
+- Fix locally searching for atomicdata.dev resources in external servers #706
 - Use Earthly for CI: building, testing, pushing Docker images #576
 - Host @tomic NPM docs [on Netlify](https://atomic-lib.netlify.app/) #707
 

diff --git a/cli/tests/tests.rs b/cli/tests/tests.rs
@@ -2,6 +2,9 @@
 mod test {
     use assert_cmd::Command;
 
+    const TEST_URL: &str =
+        "https://atomicdata.dev/agents/QmfpRIBn2JYEatT0MjSkMNoBJzstz19orwnT5oT2rcQ=";
+
     #[test]
     fn get_fail() {
         let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
@@ -19,31 +22,29 @@ mod test {
     #[test]
     fn get_url() {
         let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
-        cmd.args(["get", "https://atomicdata.dev/classes"])
-            .assert()
-            .success();
+        cmd.args(["get", TEST_URL]).assert().success();
     }
 
     #[test]
     fn get_path() {
         let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
-        cmd.args(["get", "https://atomicdata.dev/classes members"])
+        cmd.args(["get", &format!("{TEST_URL} name")])
             .assert()
             .success();
     }
 
     #[test]
     fn get_path_array() {
         let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
-        cmd.args(["get", "https://atomicdata.dev/classes is-a 0"])
+        cmd.args(["get", &format!("{TEST_URL} is-a 0")])
             .assert()
             .success();
     }
 
     #[test]
     fn get_path_array_non_existent() {
         let mut cmd = Command::cargo_bin(assert_cmd::crate_name!()).unwrap();
-        cmd.args(["get", "https://atomicdata.dev/classes is-a 1"])
+        cmd.args(["get", &format!("{TEST_URL} is-a 1")])
             .assert()
             .failure();
     }

diff --git a/lib/defaults/default_store.json b/lib/defaults/default_store.json
@@ -1,4 +1,23 @@
 [
+    {
+        "@id": "https://atomicdata.dev",
+        "https://atomicdata.dev/properties/read": [
+            "https://atomicdata.dev/agents/publicAgent"
+        ],
+        "https://atomicdata.dev/properties/classtype": "https://atomicdata.dev/classes/Drive"
+    },
+    {
+        "@id": "https://atomicdata.dev/properties",
+        "https://atomicdata.dev/properties/parent": "https://atomicdata.dev"
+    },
+    {
+        "@id": "https://atomicdata.dev/classes",
+        "https://atomicdata.dev/properties/parent": "https://atomicdata.dev"
+    },
+    {
+        "@id": "https://atomicdata.dev/datatypes",
+        "https://atomicdata.dev/properties/parent": "https://atomicdata.dev"
+    },
     {
         "@id": "https://atomicdata.dev/properties/endpoint/parameters",
         "https://atomicdata.dev/properties/classtype": "https://atomicdata.dev/classes/Property",

diff --git a/server/src/appstate.rs b/server/src/appstate.rs
@@ -89,6 +89,9 @@ pub fn init(config: Config) -> AtomicServerResult<AppState> {
             .map_err(|e| format!("Error while setting up initial invite: {}", e))?;
         // This means that editing the .env does _not_ grant you the rights to edit the Drive.
         tracing::info!("Setting rights to Drive {}", store.get_server_url());
+
+        tracing::info!("Adding all resources to search index");
+        crate::search::add_all_resources(&search_state, &store)?
     }
 
     Ok(AppState {