Smartsheet: get sources of sheets

urweb · Aug 13, 2023 · 9604a64 · 9604a64
1 parent a8325fd
commit 9604a64
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 5 deletions.
diff --git a/examples/smartsheetDemo.ur b/examples/smartsheetDemo.ur
@@ -101,7 +101,9 @@ val main =
         {List.mapX (fn r =>
 		       case r.Id of
 			   None => error <xml>No ID returned for sheet</xml>
-			 | Some sid => <xml><li><a link={sheet sid}>{[r.Nam]}</a></li></xml>) shs}
+			 | Some sid => <xml><li><a link={sheet sid}>{[r.Nam]}</a>{case r.Source of
+                                                                                      None => <xml></xml>
+                                                                                    | Some s => <xml> (from {[s.Id]})</xml>}</li></xml>) shs}
       </ul>
 
       <h2>Templates</h2>

diff --git a/src/ur/smartsheet.ur b/src/ur/smartsheet.ur
@@ -35,6 +35,8 @@ val _ : json template_type = json_derived
 
 type template_id = int
 val show_template_id = _
+val eq_template_id = _
+fun template_id x = x
 
 type template = {
      Id : option template_id,
@@ -152,20 +154,45 @@ val _ : json row = json_record_withOptional
                         Columns = "columns",
                         RowNumber = "rowNumber"}
 
+datatype source_type = Report | Sheet | Sight | Template
+
+val _ : json source_type = json_derived
+                               (fn x =>
+                                   case x of
+                                       "report" => Report
+                                     | "sheet" => Sheet
+                                     | "sight" => Sight
+                                     | "template" => Template
+                                     | _ => error <xml>Bad Smartsheet source type {[x]}</xml>)
+                               (fn x =>
+                                   case x of
+                                       Report => "report"
+                                     | Sheet => "sheet"
+                                     | Sight => "sight"
+                                     | Template => "template")
+
+type source = {
+     Id : int,
+     Typ : source_type
+}
+val _ : json source = json_record {Id = "id", Typ = "type"}
+
 type sheet = {
      Id : option sheet_id,
      Nam : string,
      FromId : option template_id,
      Columns : option (list column),
-     Rows : option (list row)
+     Rows : option (list row),
+     Source : option source
 }
 
 val _ : json sheet = json_record_withOptional
                          {Nam = "name"}
                          {Id = "id",
                           FromId = "fromId",
                           Columns = "columns",
-                          Rows = "rows"}
+                          Rows = "rows",
+                          Source = "source"}
 
 type workspace_id = int
 val show_workspace_id = _
@@ -248,7 +275,7 @@ functor Make(M : AUTH) = struct
 
     structure Sheets = struct
         val list =
-            s <- api "sheets?includeAll=true";
+            s <- api "sheets?includeAll=true&include=source";
             return ((fromJson s : sheets).Data)
 
         fun get id =

diff --git a/src/ur/smartsheet.urs b/src/ur/smartsheet.urs
@@ -24,6 +24,8 @@ type workspace = {
 
 type template_id
 val show_template_id : show template_id
+val eq_template_id : eq template_id
+val template_id : int -> template_id
 
 type template = {
      Id : option template_id,
@@ -80,12 +82,20 @@ type row = {
      RowNumber : option int
 }
 
+datatype source_type = Report | Sheet | Sight | Template
+
+type source = {
+     Id : int,
+     Typ : source_type
+}
+
 type sheet = {
      Id : option sheet_id,
      Nam : string,
      FromId : option template_id,
      Columns : option (list column),
-     Rows : option (list row)
+     Rows : option (list row),
+     Source : option source
 }
 
 functor Make(M : AUTH) : sig