diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 75a58c4196..b05d35fee5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -middlewareVersion = "v0.26.0-rc2" +middlewareVersion = "v0.26.0-rc3" kotlinVersion = '1.7.10' androidxCoreVersion = "1.9.0" androidxComposeVersion1 = '1.3.1' diff --git a/protocol/src/main/proto/commands.proto b/protocol/src/main/proto/commands.proto index a9b823dc01..3ae7b1c203 100644 --- a/protocol/src/main/proto/commands.proto +++ b/protocol/src/main/proto/commands.proto @@ -1292,6 +1292,7 @@ message Rpc { string relationKey = 2; repeated anytype.model.Block.Content.Dataview.Filter filters = 3; repeated string source = 4; + string collectionId = 5; } message Response { @@ -1838,11 +1839,12 @@ message Rpc { HtmlParams htmlParams = 5; TxtParams txtParams = 6; PbParams pbParams = 7; + CsvParams csvParams = 8; } - repeated Snapshot snapshots = 8; // optional, for external developers usage - bool updateExistingObjects = 9; - Type type = 10; - Mode mode = 11; + repeated Snapshot snapshots = 9; // optional, for external developers usage + bool updateExistingObjects = 10; + Type type = 11; + Mode mode = 12; message NotionParams { string apiKey = 1; @@ -1873,6 +1875,16 @@ message Rpc { string path = 1; } + message CsvParams { + repeated string path = 1; + Mode mode = 2; + + enum Mode { + COLLECTION = 0; + TABLE = 1; + }; + } + enum Mode { ALL_OR_NOTHING = 0; IGNORE_ERRORS = 1; @@ -1889,6 +1901,7 @@ message Rpc { Migration = 3; Html = 4; Txt = 5; + Csv = 6; }; } @@ -1928,6 +1941,8 @@ message Rpc { UNAUTHORIZED = 2; UNKNOWN_ERROR = 3; BAD_INPUT = 4; + FORBIDDEN = 5; + SERVICE_UNAVAILABLE = 6; } } } @@ -4686,6 +4701,33 @@ message Rpc { } } } + + message Move { + message Request { + string contextId = 1; + string blockId = 2; + string viewId = 3; + string groupId = 4; + string afterId = 5; + repeated string objectIds = 6; + } + + message Response { + Error error = 1; + ResponseEvent event = 2; + + message Error { + Code code = 1; + string description = 2; + + enum Code { + NULL = 0; + UNKNOWN_ERROR = 1; + BAD_INPUT = 2; + } + } + } + } } message CreateFromExistingObject { diff --git a/protocol/src/main/proto/events.proto b/protocol/src/main/proto/events.proto index 07c6b66778..8b093d16a5 100644 --- a/protocol/src/main/proto/events.proto +++ b/protocol/src/main/proto/events.proto @@ -67,6 +67,7 @@ message Event { Block.Dataview.RelationSet blockDataviewRelationSet = 123; Block.Dataview.ViewUpdate blockDataviewViewUpdate = 125; Block.Dataview.TargetObjectIdSet blockDataviewTargetObjectIdSet = 126; + Block.Dataview.IsCollectionSet blockDataviewIsCollectionSet = 127; // deprecated Block.Dataview.OldRelationDelete blockDataviewOldRelationDelete = 24; @@ -849,6 +850,11 @@ message Event { string id = 1; // dataview block's id string targetObjectId = 2; } + + message IsCollectionSet { + string id = 1; // dataview block's id + bool value = 2; + } } } diff --git a/protocol/src/main/proto/models.proto b/protocol/src/main/proto/models.proto index 71a5f8fd92..b8d3bbebca 100644 --- a/protocol/src/main/proto/models.proto +++ b/protocol/src/main/proto/models.proto @@ -318,6 +318,7 @@ message Block { repeated ObjectOrder objectOrders = 13; repeated anytype.model.RelationLink relationLinks = 5; string TargetObjectId = 6; + bool isCollection = 14; message View { string id = 1;