From ecfe6baeaf28a81416e667455f236849b17c8b85 Mon Sep 17 00:00:00 2001
From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com>
Date: Thu, 14 Oct 2021 14:29:38 +0300
Subject: [PATCH] Tech | MW 0.16.03 (#1853)

* update proto

* update version

* ci

* Update check.yml
---
 .../anytype/core_models/ObjectType.kt         |  3 ++-
 dependencies.gradle                           |  2 +-
 .../middleware/mappers/ToCoreModelMappers.kt  |  1 +
 .../mappers/ToMiddlewareModelMappers.kt       |  1 +
 protocol/src/main/proto/commands.proto        | 25 +++++++++++++++++++
 protocol/src/main/proto/events.proto          |  7 ++++++
 protocol/src/main/proto/models.proto          |  1 +
 7 files changed, 38 insertions(+), 2 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 e7660a4fb5..645a7a579d 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
@@ -31,7 +31,8 @@ data class ObjectType(
         FILE(6),
         DASHBOARD(7),
         IMAGE(8),
-        DATABASE(20),
+        NOTE(9),
+        DATABASE(20)
     }
 
     /**
diff --git a/dependencies.gradle b/dependencies.gradle
index cb6e8dd2b1..e01a12dbae 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -87,7 +87,7 @@ ext {
 
     // Anytype
 
-    middleware_version = 'v0.16.0'
+    middleware_version = 'v0.16.3'
 
     mainApplication = [
             kotlin:                     "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version",
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 f4a460bad4..aaae6e6367 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
@@ -422,6 +422,7 @@ fun MOTypeLayout.toCoreModels(): ObjectType.Layout = when (this) {
     MOTypeLayout.dashboard -> ObjectType.Layout.DASHBOARD
     MOTypeLayout.database -> ObjectType.Layout.DATABASE
     MOTypeLayout.image -> ObjectType.Layout.IMAGE
+    MOTypeLayout.note -> ObjectType.Layout.NOTE
 }
 
 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 b5de2e905e..8a5e7ba2d9 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
@@ -313,6 +313,7 @@ fun ObjectType.Layout.toMiddlewareModel(): MOTypeLayout = when (this) {
     ObjectType.Layout.DASHBOARD -> MOTypeLayout.dashboard
     ObjectType.Layout.DATABASE -> MOTypeLayout.database
     ObjectType.Layout.IMAGE -> MOTypeLayout.image
+    ObjectType.Layout.NOTE -> MOTypeLayout.note
 }
 
 fun Relation.Format.toMiddlewareModel(): MRelationFormat = when (this) {
diff --git a/protocol/src/main/proto/commands.proto b/protocol/src/main/proto/commands.proto
index ba6d9774cc..d9c000ad48 100644
--- a/protocol/src/main/proto/commands.proto
+++ b/protocol/src/main/proto/commands.proto
@@ -1398,6 +1398,31 @@ message Rpc {
                     }
                 }
             }
+            message ViewSetPosition {
+                message Request {
+                    string contextId = 1; // id of the context block
+                    string blockId = 2; // id of the dataview
+                    string viewId = 4; // id of the view to remove
+                    uint32 position = 5; // index of view position (0 - means first)
+                }
+
+                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;
+                            // ...
+                        }
+                    }
+                }
+            }
 
             // set the current active view (persisted only within a session)
             message ViewSetActive {
diff --git a/protocol/src/main/proto/events.proto b/protocol/src/main/proto/events.proto
index c838e6ed68..394da3d7d1 100644
--- a/protocol/src/main/proto/events.proto
+++ b/protocol/src/main/proto/events.proto
@@ -55,6 +55,7 @@ message Event {
             Block.Dataview.SourceSet blockDataviewSourceSet = 35;
             Block.Dataview.ViewSet blockDataviewViewSet = 19;
             Block.Dataview.ViewDelete blockDataviewViewDelete = 20;
+            Block.Dataview.ViewOrder blockDataviewViewOrder = 29;
             Block.Dataview.RelationDelete blockDataviewRelationDelete = 24;
             Block.Dataview.RelationSet blockDataviewRelationSet = 23;
 
@@ -573,6 +574,12 @@ message Event {
                 string viewId = 2; // view id to remove
             }
 
+
+            message ViewOrder {
+                string id = 1; // dataview block's id
+                repeated string viewIds = 2; // view ids in new order
+            }
+
             message SourceSet {
                 string id = 1; // dataview block's id
                 repeated string source = 2;
diff --git a/protocol/src/main/proto/models.proto b/protocol/src/main/proto/models.proto
index c578e5703d..4f3a242bbb 100644
--- a/protocol/src/main/proto/models.proto
+++ b/protocol/src/main/proto/models.proto
@@ -452,6 +452,7 @@ message ObjectType {
         file = 6;
         dashboard = 7;
         image = 8;
+        note = 9;
 
         database = 20; // to be released later
     }