From 3509b3a203025b4c9a5caab7f790f626dbcb26b0 Mon Sep 17 00:00:00 2001
From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com>
Date: Mon, 7 Oct 2024 18:24:13 +0200
Subject: [PATCH] DROID-2910 Protocol | Enhancement | MW 0.36.0-rc7 (#1642)

---
 .../anytype/core_models/ObjectType.kt         |  3 ++-
 gradle/libs.versions.toml                     |  2 +-
 .../middleware/mappers/ToCoreModelMappers.kt  |  1 +
 .../mappers/ToMiddlewareModelMappers.kt       |  1 +
 .../presentation/objects/SupportedLayouts.kt  |  1 +
 protocol/src/main/proto/commands.proto        | 24 +------------------
 protocol/src/main/proto/models.proto          |  5 ++++
 7 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectType.kt b/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectType.kt
index 1a63db9b62..a6f42f1bb0 100644
--- a/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectType.kt
+++ b/core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectType.kt
@@ -52,7 +52,8 @@ data class ObjectType(
         PARTICIPANT(19),
         PDF(20),
         CHAT(21),
-        CHAT_DERIVED(22);
+        CHAT_DERIVED(22),
+        TAG(23);
 
         fun isProfileOrParticipant() = this == PROFILE || this == PARTICIPANT
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b7c217fa84..0df2526fe3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-middlewareVersion = "v0.36.0-rc6"
+middlewareVersion = "v0.36.0-rc7"
 kotlinVersion = '2.0.0'
 kspVersion = "2.0.0-1.0.22"
 
diff --git a/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt b/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt
index f7560157cb..10383be43f 100644
--- a/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt
+++ b/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt
@@ -696,6 +696,7 @@ fun MOTypeLayout.toCoreModels(): ObjectType.Layout = when (this) {
     MOTypeLayout.pdf -> ObjectType.Layout.PDF
     MOTypeLayout.chat -> ObjectType.Layout.CHAT
     MOTypeLayout.chatDerived -> ObjectType.Layout.CHAT_DERIVED
+    MOTypeLayout.tag -> ObjectType.Layout.TAG
 }
 
 fun MRelationDataSource.source(): Relation.Source = when (this) {
diff --git a/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToMiddlewareModelMappers.kt b/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToMiddlewareModelMappers.kt
index 99458a9f78..fe69858158 100644
--- a/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToMiddlewareModelMappers.kt
+++ b/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToMiddlewareModelMappers.kt
@@ -499,6 +499,7 @@ fun ObjectType.Layout.toMiddlewareModel(): MOTypeLayout = when (this) {
     ObjectType.Layout.PDF -> MOTypeLayout.pdf
     ObjectType.Layout.CHAT -> MOTypeLayout.chat
     ObjectType.Layout.CHAT_DERIVED -> MOTypeLayout.chatDerived
+    ObjectType.Layout.TAG -> MOTypeLayout.tag
 }
 
 fun Relation.Format.toMiddlewareModel(): MRelationFormat = when (this) {
diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/SupportedLayouts.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/SupportedLayouts.kt
index 3559de9a30..f1972cc238 100644
--- a/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/SupportedLayouts.kt
+++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/SupportedLayouts.kt
@@ -41,6 +41,7 @@ object SupportedLayouts {
         ObjectType.Layout.DASHBOARD,
         ObjectType.Layout.SPACE,
         ObjectType.Layout.SPACE_VIEW,
+        ObjectType.Layout.TAG
     )
 
     val createObjectLayouts = listOf(
diff --git a/protocol/src/main/proto/commands.proto b/protocol/src/main/proto/commands.proto
index 240ce4533e..f5fa385814 100644
--- a/protocol/src/main/proto/commands.proto
+++ b/protocol/src/main/proto/commands.proto
@@ -3078,6 +3078,7 @@ message Rpc {
                 string lastVersionId = 2;
                 // desired count of versions
                 int32 limit = 3;
+                bool notIncludeVersion = 4;
             }
 
             message Response {
@@ -5648,29 +5649,6 @@ message Rpc {
                     }
                 }
             }
-            message ListAvailable {
-                message Request {
-                    string contextId = 1;
-                    string blockId = 2;
-                }
-
-                message Response {
-                    Error error = 1;
-                    repeated anytype.model.Relation relations = 2;
-
-                    message Error {
-                        Code code = 1;
-                        string description = 2;
-
-                        enum Code {
-                            NULL = 0;
-                            UNKNOWN_ERROR = 1;
-                            BAD_INPUT = 2;
-                            // ...
-                        }
-                    }
-                }
-            }
         }
         message SetSource {
             message Request {
diff --git a/protocol/src/main/proto/models.proto b/protocol/src/main/proto/models.proto
index a0a3253dc0..8534bb002b 100644
--- a/protocol/src/main/proto/models.proto
+++ b/protocol/src/main/proto/models.proto
@@ -553,6 +553,10 @@ message Block {
                 Codepen = 16;
                 Bilibili = 17;
                 Excalidraw = 18;
+                Kroki = 19;
+                Graphviz = 20;
+                Sketchfab = 21;
+                Image = 22;
             }
         }
 
@@ -760,6 +764,7 @@ message ObjectType {
         pdf = 20;
         chat = 21;
         chatDerived = 22;
+        tag = 23;
     }
 }