Merge pull request #1 from bwaidelich/feature/some-tweaks

FEATURE: Some tweaks and improvements

Classes/DataSource/PreviewLinkViewDataSource.php

@@ -14,6 +14,11 @@
  */
 class PreviewLinkViewDataSource implements DataSourceInterface
 {
+    private const ERROR_NONE = 'none';
+    private const ERROR_MISSING_NODE = 'missingNode';
+    private const ERROR_PUBLIC_WORKSPACE = 'publicWorkspace';
+    private const ERROR_MISSING_TOKEN = 'missingToken';
+
     /**
      * @var ControllerContext
      */
@@ -52,46 +57,50 @@ public static function getIdentifier()
      */
     public function getData(NodeInterface $node = null, array $arguments)
     {
-        if ($node === null) {
-            return [
-                'data' => [
-                    'link' => '---'
-                ]
-            ];
-        }
-
+        $link = $this->getLink($node, $error);
         return [
             'data' => [
-                'link' => $this->getLink($node)
+                'link' => $link,
+                'error' => $error,
             ]
         ];
     }
 
     /**
-     * @param NodeInterface $node
+     * @param NodeInterface|null $node
+     * @param string $error
      * @return string
+     * @throws MissingActionNameException
      */
-    protected function getLink(NodeInterface $node): string
+    protected function getLink(NodeInterface $node = null, string &$error = null): string
     {
+        if ($node === null) {
+            $error = self::ERROR_MISSING_NODE;
+            return '';
+        }
         $personalWorkspace = $this->userService->getPersonalWorkspace();
         $baseWorkspace = $personalWorkspace->getBaseWorkspace();
 
         if ($baseWorkspace->isPublicWorkspace()) {
-            return '---';
+            $error = self::ERROR_PUBLIC_WORKSPACE;
+            return '';
         }
 
         $hashAndRoles = $this->getHashTokenForWorkspace($baseWorkspace->getName());
         if ($hashAndRoles === null) {
-            return 'No token';
+            $error = self::ERROR_MISSING_TOKEN;
+            return '';
         }
 
         $contextPath = str_replace('@' . $personalWorkspace->getName(), '@' . $hashAndRoles->getSettings()['workspaceName'], $node->getContextPath());
 
-        return $this->controllerContext->getUriBuilder()->reset()->setCreateAbsoluteUri(true)
+        $url = $this->controllerContext->getUriBuilder()->reset()->setCreateAbsoluteUri(true)
             ->uriFor('authenticate', [
             '_authenticationHashToken' => $hashAndRoles->getHash(),
             'node' => $contextPath
             ], 'HashTokenLogin', 'Flownative.WorkspacePreview', null);
+        $error = self::ERROR_NONE;
+        return $url;
     }
 
     /**

Configuration/NodeTypes.yaml

@@ -3,14 +3,12 @@
     inspector:
       views:
         previewlink:
-          label: 'Preview'
+          label: i18n
           group: 'nodeInfo'
           position: 20
           view: 'Flownative.WorkspacePreview/LinkView'
           viewOptions:
             dataSource: 'PreviewLinkView'
-            columns:
-              - data: 'link'
 
 'Neos.Neos:Document':
   superTypes:

Configuration/Settings.yaml

@@ -26,6 +26,12 @@ Neos:
         'Flownative.WorkspacePreview': true
 
   Neos:
+    userInterface:
+      translation:
+        autoInclude:
+          'Flownative.WorkspacePreview':
+            - Main
+            - 'NodeTypes/*'
     Ui:
       resources:
         javascript:

Resources/Private/JavaScript/LinkView/src/LinkView.js

@@ -3,25 +3,37 @@ import PropTypes from 'prop-types';
 import Clipboard from 'react-clipboard.js';
 import {dataLoader} from '@neos-project/neos-ui-views';
 import {$get} from "plow-js";
+import {neos} from '@neos-project/neos-ui-decorators';
+import {Icon, Button} from '@neos-project/react-ui-components';
 
 @dataLoader()
+@neos(globalRegistry => ({
+  i18nRegistry: globalRegistry.get('i18n'),
+}))
 export default class LinkView extends PureComponent {
   static propTypes = {
     data: PropTypes.object.isRequired
   };
 
   render() {
     const linkUrl = $get(['link'], this.props.data);
+    const error = $get(['error'], this.props.data);
 
-    if (linkUrl === '---') {
+    if (error !== 'none') {
       return (
-        <div>---</div>
+        <div>{this.props.i18nRegistry.translate('Flownative.WorkspacePreview:Main:error.' + error, 'Error: ' + error)}</div>
       )
     }
-
     return (
       <div>
-        <Clipboard data-clipboard-text={linkUrl}>Copy Preview Link</Clipboard>
+        <Clipboard
+            data-clipboard-text={linkUrl}
+            component={Button}
+            button-style="lighter"
+        >
+          <Icon icon="copy" padded="right" />
+          {this.props.i18nRegistry.translate('Flownative.WorkspacePreview:Main:copyPreviewLink', 'Copy Preview Link')}
+        </Clipboard>
       </div>
     );
   }

Resources/Private/Translations/de/Main.xlf

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file original="" product-name="Flownative.WorkspacePreview" source-language="en" target-language="de" datatype="plaintext">
+		<body>
+			<trans-unit id="copyPreviewLink" xml:space="preserve">
+				<source>Copy Preview Link</source>
+				<target xml:lang="de">Vorschau-Link kopieren</target>
+			</trans-unit>
+			<trans-unit id="error.missingNode" xml:space="preserve">
+				<source>The currently selected node can't be found</source>
+				<target xml:lang="de">Der aktuell ausgewählte Node kann nicht gefunden werden</target>
+			</trans-unit>
+			<trans-unit id="error.publicWorkspace" xml:space="preserve">
+				<source>Preview link is not required for public workspaces</source>
+				<target xml:lang="de">Für öffentliche Workspaces sind keine Vorschau-Links erforderlich</target>
+			</trans-unit>
+			<trans-unit id="error.missingToken" xml:space="preserve">
+				<source>For this workspace no preview token has been generated yet. This can be changed in the "Workspaces"-module</source>
+				<target xml:lang="de">Für diesen Workspace wurde noch kein Vorschau-Token generiert. Das kann im "Arbeitsbereiche"-Modul geändert werden</target>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>

Resources/Private/Translations/de/NodeTypes/PreviewLinkMixin.xlf

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+	<file original="" product-name="Flownative.WorkspacePreview" source-language="en" target-language="de" datatype="plaintext">
+		<body>
+			<trans-unit id="views.previewlink" xml:space="preserve">
+				<source>Preview Link</source>
+				<target xml:lang="de">Vorschau-Link</target>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>

Resources/Private/Translations/en/Main.xlf

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+	<file original="" product-name="Flownative.WorkspacePreview" source-language="en" datatype="plaintext">
+		<body>
+			<trans-unit id="copyPreviewLink" xml:space="preserve">
+				<source>Copy Preview Link</source>
+			</trans-unit>
+			<trans-unit id="error.missingNode" xml:space="preserve">
+				<source>The currently selected node can't be found</source>
+			</trans-unit>
+			<trans-unit id="error.publicWorkspace" xml:space="preserve">
+				<source>Preview link is not required for public workspaces</source>
+			</trans-unit>
+			<trans-unit id="error.missingToken" xml:space="preserve">
+				<source>For this workspace no preview token has been generated yet. This can be changed in the "Workspaces"-module</source>
+			</trans-unit>
+		</body>
+	</file>
+</xliff>