Fix eval

Makefile

@@ -24,4 +24,4 @@ server-repl:
 	source ./.env && clj -M:server:server-test:nrepl
 
 up:
-	docker compose --profile local up
+	docker compose --profile local up -d

README.md

@@ -9,17 +9,16 @@ To run the client, you'll need to have Clojure, Node.js and npm installed on you
 
 1. Install the dependencies: `npm install`
 2. Install postcss globally - `npm install -g postcss postcss-cli`
-3. Start the development server: `make client-rep`
+3. Start the development server: `make client-repl`
 
 The client should now be running at `http://localhost:8280`.
 
 ## Server
 
 To run server, you need to have Clojure and Docker installed on your machine. Once you have it, follow these steps:
 
-1. Source `.env` dev environment variables.
-2. Start local DB `docker compose --profile local up`
-3. Start the server: `make server-repl`
+1. Start local DB `make up`
+1. Start the server: `make server-repl`
 
 The server should now be running at `http://localhost:8080`.
 

compose.yml

@@ -74,8 +74,7 @@ services:
       - dev
 
 volumes:
-  vdd-data:
-    external: true
+  vdd-data: {}
 
 networks:
   vd-network: {}

src/clj/vd_designer/aidbox.clj

@@ -56,13 +56,12 @@
 (defn eval-view-definition
   [{:keys [box-url request fhir-server-headers]}]
   (let [{:keys [vd]} (:body-params request)]
-    @(martian/response-for
-       (aidbox-client/aidbox-client box-url)
-       :rpc
-       (merge {:method 'sof/eval-view
-               :params {:limit 100
-                        :view  vd}}
-              fhir-server-headers))))
+    @(martian/response-for (aidbox-client/aidbox-client box-url)
+                           :view-definition-run
+                           (merge {:body {:resourceType "Parameters"
+                                          :parameter [{:name "_format" :valueCode "json"}
+                                                      {:name "viewResource" :resource vd}]}}
+                                  fhir-server-headers))))
 
 (defn save-view-definition
   [{:keys [box-url request fhir-server-headers]}]

src/clj/vd_designer/clients/aidbox.clj

@@ -52,6 +52,15 @@
     :consumes       ["application/json"]
     :method         :delete}
 
+   {:route-name     :view-definition-run
+    :path-parts     ["/fhir/ViewDefinition/$run"]
+    :headers-schema {(s/optional-key :Cookie)        s/Str
+                     (s/optional-key :Authorization) s/Str}
+    :produces       ["application/json"]
+    :consumes       ["application/json"]
+    :method         :post
+    :body-schema    {:body s/Any}}
+
    {:route-name     :rpc
     :path-parts     ["/rpc"]
     :method         :post

src/cljs/vd_designer/pages/form/controller.cljs

@@ -478,7 +478,7 @@
  ::on-eval-view-definition-success
  (fn [db [_ result]]
    (assoc db
-          ::m/resource-data (:result result)
+          ::m/resource-data {:data result}
           ::m/eval-loading false)))
 
 (reg-event-fx