12167: Merge branch 'master'

[arvados.git] / sdk / R / R / Collection.R

diff --git a/sdk/R/R/Collection.R b/sdk/R/R/Collection.R
index 37b2fb9cc2b302a62215352b695d38b2f2001f81..fad452ac7a05e97ab1ceabac0696028085426c9e 100644 (file)
--- a/sdk/R/R/Collection.R
+++ b/sdk/R/R/Collection.R
@@ -53,67 +53,18 @@ Collection <- R6::R6Class(
 
     public = list(
 
-               uuid                     = NULL,
-               etag                     = NULL,
-               owner_uuid               = NULL,
-               created_at               = NULL,
-               modified_by_client_uuid  = NULL,
-               modified_by_user_uuid    = NULL,
-               modified_at              = NULL,
-               portable_data_hash       = NULL,
-               replication_desired      = NULL,
-               replication_confirmed_at = NULL,
-               replication_confirmed    = NULL,
-               updated_at               = NULL,
-               manifest_text            = NULL,
-               name                     = NULL,
-               description              = NULL,
-               properties               = NULL,
-               delete_at                = NULL,
-               file_names               = NULL,
-               trash_at                 = NULL,
-               is_trashed               = NULL,
-
-               initialize = function(uuid = NULL, etag = NULL, owner_uuid = NULL,
-                              created_at = NULL, modified_by_client_uuid = NULL,
-                              modified_by_user_uuid = NULL, modified_at = NULL,
-                              portable_data_hash = NULL, replication_desired = NULL,
-                              replication_confirmed_at = NULL,
-                              replication_confirmed = NULL, updated_at = NULL,
-                              manifest_text = NULL, name = NULL, description = NULL,
-                              properties = NULL, delete_at = NULL, file_names = NULL,
-                              trash_at = NULL, is_trashed = NULL) 
+               uuid = NULL,
+        # api  = NULL,
+
+               initialize = function(api, uuid) 
         {
-                       self$uuid                     <- uuid
-                       self$etag                     <- etag
-                       self$owner_uuid               <- owner_uuid
-                       self$created_at               <- created_at
-                       self$modified_by_client_uuid  <- modified_by_client_uuid
-                       self$modified_by_user_uuid    <- modified_by_user_uuid
-                       self$modified_at              <- modified_at
-                       self$portable_data_hash       <- portable_data_hash
-                       self$replication_desired      <- replication_desired
-                       self$replication_confirmed_at <- replication_confirmed_at
-                       self$replication_confirmed    <- replication_confirmed
-                       self$updated_at               <- updated_at
-                       self$manifest_text            <- manifest_text
-                       self$name                     <- name
-                       self$description              <- description
-                       self$properties               <- properties
-                       self$delete_at                <- delete_at
-                       self$file_names               <- file_names
-                       self$trash_at                 <- trash_at
-                       self$is_trashed               <- is_trashed
-                       
-                       private$classFields <- c("uuid", "etag", "owner_uuid", 
-                                     "created_at", "modified_by_client_uuid",
-                                     "modified_by_user_uuid", "modified_at",
-                                     "portable_data_hash", "replication_desired",
-                                     "replication_confirmed_at",
-                                     "replication_confirmed", "updated_at",
-                                     "manifest_text", "name", "description", 
-                                     "properties", "delete_at", "file_names",
-                                     "trash_at", "is_trashed")
+            # self$api <- api
+            private$REST <- api$getRESTService()
+
+            self$uuid <- uuid
+
+            private$fileContent <- private$REST$getCollectionContent(uuid)
+            private$tree <- CollectionTree$new(private$fileContent, self)
         },
 
         add = function(content, relativePath = "")
@@ -266,6 +217,27 @@ Collection <- R6::R6Class(
             private$tree$getElement(relativePath)
         },
 
+               toJSON = function() 
+        {
+                       fields <- sapply(private$classFields, function(field)
+                       {
+                               self[[field]]
+                       }, USE.NAMES = TRUE)
+                       
+                       jsonlite::toJSON(list("collection" = 
+                     Filter(Negate(is.null), fields)), auto_unbox = TRUE)
+               },
+
+               isEmpty = function() {
+                       fields <- sapply(private$classFields,
+                                        function(field) self[[field]])
+
+                       if(any(sapply(fields, function(field) !is.null(field) && field != "")))
+                               FALSE
+                       else
+                               TRUE
+               },
+
         getRESTService = function() private$REST,
         setRESTService = function(newRESTService) private$REST <- newRESTService
     ),