Merge pull request #83 from ONLYOFFICE/develop

Release/4.1.0

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 4.1.0
+## Added
+- button ONLYOFFICE in confluence preview 
+
+## Changed
+- compatible with Confluence 7.19.0
+
 ## 4.0.0
 ## Added
 - review display settings

pom.xml

@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>onlyoffice</groupId>
     <artifactId>onlyoffice-confluence-plugin</artifactId>
-    <version>4.0.0</version>
+    <version>4.1.0</version>
 
     <organization>
         <name>Ascensio System SIA</name>

src/main/java/onlyoffice/conditions/confluence/previews/plugin/OnlyofficeButton.java

@@ -0,0 +1,91 @@
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2022
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package onlyoffice.conditions.confluence.previews.plugin;
+
+import com.atlassian.confluence.pages.Attachment;
+import com.atlassian.confluence.pages.AttachmentManager;
+import com.atlassian.confluence.user.AuthenticatedUserThreadLocal;
+import com.atlassian.confluence.user.ConfluenceUser;
+import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
+import onlyoffice.managers.document.DocumentManager;
+import onlyoffice.utils.attachment.AttachmentUtil;
+import onlyoffice.utils.parsing.ParsingUtil;
+import org.json.JSONObject;
+
+import javax.inject.Inject;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+
+public class OnlyofficeButton extends HttpServlet {
+    @ComponentImport
+    AttachmentManager attachmentManager;
+
+    private final ParsingUtil parsingUtil;
+    private final AttachmentUtil attachmentUtil;
+    private final DocumentManager documentManager;
+
+    @Inject
+    public OnlyofficeButton(AttachmentManager attachmentManager, ParsingUtil parsingUtil, AttachmentUtil attachmentUtil, DocumentManager documentManager) {
+        this.attachmentManager = attachmentManager;
+        this.parsingUtil = parsingUtil;
+        this.attachmentUtil = attachmentUtil;
+        this.documentManager = documentManager;
+    }
+
+    @Override
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        InputStream requestStream = request.getInputStream();
+        String body = parsingUtil.getBody(requestStream);
+
+        try {
+            JSONObject bodyJson = new JSONObject(body);
+            String attachmentIdString = bodyJson.getString("attachmentId");
+            Long attachmentId = Long.parseLong(attachmentIdString);
+            Attachment attachment = attachmentManager.getAttachment(attachmentId);
+
+            ConfluenceUser user = AuthenticatedUserThreadLocal.get();
+            boolean accessEdit = attachmentUtil.checkAccess(attachment, user, true);
+            boolean accessView = attachmentUtil.checkAccess(attachment, user, false);
+
+            String ext = attachment.getFileExtension();
+            String access = null;
+
+            if (accessEdit && documentManager.isEditable(ext)) {
+                access = "edit";
+            } else if (accessEdit && documentManager.isFillForm(ext)) {
+                access = "fillform";
+            } else if (accessView && documentManager.isViewable(ext) &&
+                    !(accessEdit && (documentManager.isEditable(ext) || documentManager.isFillForm(ext)))) {
+                access = "view";
+            }
+
+            response.setContentType("application/json");
+            PrintWriter writer = response.getWriter();
+            writer.write("{\"access\":\"" + access + "\"}");
+
+        } catch (Exception e) {
+            throw new IOException(e.getMessage());
+        }
+    }
+}

src/main/java/onlyoffice/utils/attachment/AttachmentUtilImpl.java

@@ -107,7 +107,7 @@ public boolean checkAccess(Attachment attachment, User user, boolean forEdit) {
         if (forEdit) {
             boolean create = checkAccessCreate(user, attachment.getContainer().getId());
             boolean access = permissionManager.hasPermission(user, Permission.EDIT, attachment);
-            return create && access;
+            return create && access && attachment.isLatestVersion();
         } else {
             boolean access = permissionManager.hasPermission(user, Permission.VIEW, attachment);
             return access;

src/main/resources/atlassian-plugin-marketing.xml

@@ -1,10 +1,10 @@
 <atlassian-plugin-marketing>
     <compatibility>
-        <product name="confluence" min="6.13.1" max="7.18.3" />
+        <product name="confluence" min="6.13.1" max="7.19.0" />
     </compatibility>
 
     <logo image="images/144.png"/>
-    <banner image="images/banner.jpg"/>
+    <banner image="images/banner.png"/>
 
     <highlights>
         <highlight image="images/hss1.png" cropped="images/hss1c.png"/>

src/main/resources/atlassian-plugin.xml

@@ -51,6 +51,23 @@
         <context>page</context>
     </web-resource>
 
+    <web-resource key="onlyoffice-confluence-previews-plugin" name="Button ONLYOFFICE for confluence preview lightbox">
+        <transformation extension="js">
+            <transformer key="jsI18n"/>
+        </transformation>
+        <transformation extension="soy">
+            <transformer key="soyTransformer"/>
+        </transformation>
+
+        <dependency>com.atlassian.confluence.plugins.confluence-previews:confluence-previews-resources</dependency>
+
+        <resource type="download" name="cp-onlyoffice-button.soy.js" location="/templates/confluence-previews-plugin/onlyoffice-button.soy"/>
+        <resource type="download" name="cp-onlyoffice-button-plugin.js" location="/js/confluence-previews-plugin/onlyoffice-button.js"/>
+        <resource type="download" name="cp-onlyoffice-button.css" location="/css/confluence-previews-plugin/onlyoffice-button.css"/>
+        <resource type="download" name="cp-onlyoffice-button.svg" location="images/confluence-previews-plugin/onlyoffice-button.svg"/>
+        <context>media-viewer</context>
+    </web-resource>
+
     <web-resource key="onlyoffice-confluence-plugin-resources-editor" name="Web Resources container for the editor page">
         <dependency>com.atlassian.confluence.editor:page-editor-js</dependency>
         <dependency>com.atlassian.confluence.plugins.drag-and-drop:editor-drop-handler</dependency>
@@ -141,4 +158,8 @@
         <description>ONLYOFFICE API Handler.</description>
         <url-pattern>/onlyoffice/api</url-pattern>
     </servlet>
+    <servlet key="OnlyOfficeButtonCondition" class="onlyoffice.conditions.confluence.previews.plugin.OnlyofficeButton" name="ONLYOFFICE Button Condition">
+        <description>Conditions for displaying ONLYOFFICE button in confluence preview.</description>
+        <url-pattern>/onlyoffice/confluence/previews/plugin/access</url-pattern>
+    </servlet>
 </atlassian-plugin>

src/main/resources/css/confluence-previews-plugin/onlyoffice-button.css

@@ -0,0 +1,21 @@
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2022
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#cp-control-panel-onlyoffice {
+    background-image: url(cp-onlyoffice-button.svg);
+}

src/main/resources/js/confluence-previews-plugin/onlyoffice-button.js

@@ -0,0 +1,91 @@
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2022
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+define('cp/component/onlyoffice-button', [
+    'jquery',
+    'ajs',
+    'backbone',
+    'core/template-store-singleton'
+], function ($,
+             AJS,
+             Backbone,
+             templateStore) {
+    'use strict';
+
+    var OnlyofficeButtonView = Backbone.View.extend({
+        tagName: 'span',
+
+        initialize: function (options) {
+            this._mediaViewer = options.mediaViewer;
+        },
+
+        render: function () {
+            var attachmentId = this._mediaViewer.getCurrentFile().get('id');
+
+            var xhr = new XMLHttpRequest();
+
+            xhr.open("POST", "/plugins/servlet/onlyoffice/confluence/previews/plugin/access", false);
+            xhr.send(JSON.stringify({
+                 attachmentId: attachmentId
+            }));
+
+            var title;
+
+            if (xhr.status == 200) {
+                var response = JSON.parse(xhr.responseText);
+
+                if (response.access == "edit") {
+                    title = AJS.I18n.getText('onlyoffice.editor.editlink');
+                } else if (response.access == "view") {
+                    title = AJS.I18n.getText('onlyoffice.editor.viewlink');
+                } else if (response.access == "fillform") {
+                    title = AJS.I18n.getText('onlyoffice.editor.fillFormlink');
+                }
+            }
+
+            if (title) {
+                this.$el.html(templateStore.get('controlOnlyofficeButton')({
+                    attachmentId: attachmentId,
+                    title: title
+                }));
+                if ($.fn.tooltip) {
+                    this.$('a').tooltip({gravity: 'n'});
+                }
+            }
+
+            return this;
+        }
+    });
+
+    var OnlyofficeButton = function (mediaViewer) {
+        mediaViewer.getView().fileControlsView.addLayerView('onlyofficeButton', OnlyofficeButtonView, {
+            weight: 1,
+            predicate: function (mediaViewer) {
+                return true;
+            }
+        });
+    };
+
+    return OnlyofficeButton;
+});
+
+(function () {
+    var OnlyofficeButton = require('cp/component/onlyoffice-button');
+    var MediaViewer = require('MediaViewer');
+    MediaViewer.registerPlugin('onlyofficebutton', OnlyofficeButton);
+})();

src/main/resources/templates/confluence-previews-plugin/onlyoffice-button.soy

@@ -0,0 +1,10 @@
+{namespace FileViewer.Templates}
+
+/**
+* Onlyoffice button for opening editor.
+* @param attachmentId The id attachment.
+* @param title The title ONLYOFFICE button.
+*/
+{template .controlOnlyofficeButton}
+    <a role="button" target="_blank" tabindex=58" aria-haspopup="true" id="cp-control-panel-onlyoffice" href="/plugins/servlet/onlyoffice/doceditor?attachmentId={$attachmentId}" title="{$title}" class="cp-icon"></a>
+{/template}