Include campaigns in "query-sheets" results; implement :known-campaigns

dhleong · Feb 9, 2019 · a00dfb9 · a00dfb9
1 parent 77ae1c1
commit a00dfb9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/src/cljs/wish/providers/gdrive.cljs b/src/cljs/wish/providers/gdrive.cljs
@@ -510,7 +510,9 @@
   (query-sheets [this]
     (when-gapi-available
       query-files
-      "appProperties has { key='wish-type' and value='wish-sheet' }"))
+      #_"appProperties has { key='wish-type' and value='wish-sheet' }"
+      (str "(appProperties has { key='wish-type' and value='wish-sheet' }) "
+           "or (appProperties has { key='wish-type' and value='wish-campaign' })")))
 
   (register-data-source [this]
     ; TODO sanity checks galore

diff --git a/src/cljs/wish/providers/gdrive/api.cljs b/src/cljs/wish/providers/gdrive/api.cljs
@@ -40,15 +40,19 @@
                  (map
                    (fn [raw-file]
                      [(make-id :gdrive (:id raw-file))
-                      (-> raw-file
-                          (select-keys [:name])
-                          (assoc :mine? (:ownedByMe raw-file)))]))))]
+                      {:name (:name raw-file)
+                       :mine? (:ownedByMe raw-file)
+                       :type (-> raw-file
+                                 :appProperties
+                                 :wish-type
+                                 (subs (count "wish-"))
+                                 keyword)}]))))]
 
     (-> js/gapi.client.drive.files
       (.list #js {:q q
                   :pageSize page-size
                   :spaces "drive"
-                  :fields "nextPageToken, files(id, name, ownedByMe)"})
+                  :fields "nextPageToken, files(id, name, ownedByMe, appProperties)"})
       (promise->chan 1 (map (fn [[err resp :as r]]
                               (if resp
                                 ; success!

diff --git a/src/cljs/wish/sheets.cljs b/src/cljs/wish/sheets.cljs
@@ -77,7 +77,7 @@
      :updated (.getTime (js/Date.))  ; date
      :kind kind
 
-     :name sheet-name
+     :name campaign-name
 
      :sources (:default-sources kind-meta)
 

diff --git a/src/cljs/wish/subs.cljs b/src/cljs/wish/subs.cljs
@@ -141,7 +141,7 @@
            :id sheet-id)))
 
 (reg-sub
-  :known-sheets
+  ::known-files
   :<- [:sheets]
   :<- [:my-sheets]
   (fn [[sheets my-sheets] _]
@@ -164,6 +164,15 @@
          (filter :name)
          (sort-by :name))))
 
+(reg-sub
+  :known-sheets
+  :<- [::known-files]
+  (fn [all-files _]
+    (->> all-files
+         (filter (comp (partial = :sheet)
+                       :type))
+         (sort-by :name))))
+
 (reg-sub
   :filtered-known-sheets
   :<- [:known-sheets]
@@ -182,9 +191,13 @@
 
 (reg-sub
   :known-campaigns
-  (fn [db]
-    ; TODO
-    nil))
+  :<- [::known-files]
+  (fn [all-files _]
+    (->> all-files
+         (filter (comp (partial = :campaign)
+                       :type))
+         (sort-by :name))))
+
 
 ; if a specific sheet-id is not provided, loads
 ; for the active sheet id