Fix for OC10 admin menu

drawio/appinfo/app.php

@@ -13,4 +13,6 @@
 
 use OCP\App;
 
+App::registerAdmin("drawio", "settings");
+
 $app = new Application();

drawio/appinfo/info.xml

@@ -21,9 +21,9 @@
     <repository type="git">https://github.com/pawelrojek/nextcloud-drawio.git</repository>
     <dependencies>
         <nextcloud min-version="11" max-version="15"/>
-        <owncloud min-version="10.0" max-version="10.1" />
+        <owncloud min-version="10" max-version="10" />
     </dependencies>
     <settings>
-        <admin>OCA\Drawio\AdminSettings</admin>
+	<admin>OCA\Drawio\Settings\AdminSettings</admin>
     </settings>
 </info>

drawio/controller/editorcontroller.php

@@ -163,7 +163,8 @@ private function getFile($fileId)
             return [null, $this->trans->t("FileId is empty")];
         }
 
-        $files = $this->root->getById($fileId);
+        //$files = $this->root->getById($fileId);
+        $files = \OC::$server->getUserFolder()->getById($fileId);
         if (empty($files))
         {
             return [null, $this->trans->t("File not found")];

drawio/js/editor.js

@@ -121,4 +121,106 @@
         }
         window.addEventListener("message", receiver);
     }
+
+    OCA.DrawIO.EditFileWImport = function (editWindow, filePath, origin) {
+        var ncClient = OC.Files.getClient();
+        var supportedExtension = "drawio"
+
+        // Check extension
+        var isSupportedExt = filePath.split('.').pop() == supportedExtension
+        // Response arraybuffer for non XML files
+        if (isSupportedExt) {
+            var responseType = ""
+            var fileToSave = filePath
+        } else {
+            var responseType = "arraybuffer"
+            var date = new Date()
+            var datetime =  "Opened_" +
+                            date.getDate() + "-" +
+                            (date.getMonth()+1) + "-" +
+                            date.getFullYear() + "_T" +
+                            date.getHours() + "." +
+                            date.getMinutes()
+            var fileToSave = filePath + "_" + datetime + "." + supportedExtension
+        }
+
+        var receiver = function (evt) {
+            if (evt.data.length > 0 && origin.includes(evt.origin)) {
+                var payload = JSON.parse(evt.data);
+                if (payload.event === "init") {
+                    var loadMsg = OC.Notification.show(t(OCA.DrawIO.AppName, "Loading, please wait."));
+                    ncClient.getFileContentsRT(filePath, null, responseType)
+                    .then(function (status, contents) {
+                        if(isSupportedExt) {
+                            if (contents === " ") {
+                                editWindow.postMessage(JSON.stringify({
+                                    action: "template",
+                                    name: filePath
+                                }), "*");
+                            } else if (contents.indexOf("mxGraphModel") !== -1) {
+                                // TODO: show error to user
+                                OCA.DrawIO.Cleanup(receiver, filePath);
+                            } else {
+                                editWindow.postMessage(JSON.stringify({
+                                    action: "load",
+                                    xml: contents
+                                }), "*");
+                            }
+                        } else {
+                            blob = new Blob([contents], {type: "application/vnd.visio"})
+
+                            reader = new FileReader();
+                            reader.onloadend = function() {
+                                editWindow.postMessage(JSON.stringify({
+                                    action: "load",
+                                    title: fileToSave,
+                                    xml: reader.result
+                                }), "*");
+                            }
+                            reader.readAsDataURL(blob);
+                        }
+                    })
+                    .fail(function (status) {
+                        console.log("Status Error: " + status);
+                        // TODO: show error on failed read
+                        OCA.DrawIO.Cleanup(receiver, filePath);
+                    })
+                    .done(function () {
+                        OC.Notification.hide(loadMsg);
+                    });
+                } else if (payload.event === "load") {
+                    // TODO: notify user of loaded
+                } else if (payload.event === "export") {
+                    // TODO: handle export event
+                } else if (payload.event === "save") {
+                    var saveMsg = OC.Notification.show(t(OCA.DrawIO.AppName, "Saving..."));
+                    ncClient.putFileContents(
+                        fileToSave,
+                        payload.xml, {
+                            contentType: "x-application/drawio",
+                            overwrite: false
+                        }
+                    )
+                    .then(function (status) {
+                        OC.Notification.showTemporary(t(OCA.DrawIO.AppName, "File saved as " + fileToSave));
+                    })
+                    .fail(function (status) {
+                        // TODO: handle on failed write
+                        OC.Notification.showTemporary(t(OCA.DrawIO.AppName, "File not saved!"));
+                    })
+                    .done(function () {
+                        OC.Notification.hide(saveMsg);
+                    });
+                } else if (payload.event === "exit") {
+                    OCA.DrawIO.Cleanup(receiver, filePath);
+                } else {
+                    console.log("DrawIO Integration: unknown event " + payload.event);
+                    console.dir(payload);
+                }
+            } else {
+                console.log("DrawIO Integration: bad origin " + evt.origin);
+            }
+        }
+        window.addEventListener("message", receiver);
+    }
 })(OCA);

drawio/lib/appconfig.php

@@ -17,7 +17,7 @@
 
 class AppConfig {
 
-    private $predefDrawioUrl = "https://www.draw.io";
+    private $predefDrawioUrl = "https://embed.diagrams.net";
     private $predefOverrideXML = "yes";
     private $predefOfflineMode = "no";
     private $predefTheme = "kennedy"; //kennedy, minimal, atlas, dark
@@ -123,4 +123,4 @@ public function GetLang()
             "drawio" => [ "mime" => "application/x-drawio", "type" => "text" ]
         ];
 
-}
+}