Finalize nav buttons, clean up

discoveryjs · Nov 26, 2024 · 6fb3b14 · 6fb3b14
1 parent bb55e2b
commit 6fb3b14
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 31 deletions.
diff --git a/src/app.js b/src/app.js
@@ -54,8 +54,6 @@ getSettings().then(settings => {
         app.setPageHash(location.hash);
         app.setLocationSync(true);
 
-        app.notify('test', { test: 123 });
-
         iframe.classList.add('ready');
     });
 });
diff --git a/src/discovery/img/clipboard.png b/src/discovery/img/clipboard.png
diff --git a/src/discovery/index.css b/src/discovery/index.css
@@ -16,8 +16,6 @@
  * Navigation bar
  */
 .discovery-nav-popup .splitter {
-    margin: 4px 0;
-    height: 1px;
     border-bottom: inherit;
 }
 
@@ -61,10 +59,25 @@
     background-color: currentColor;
     visibility: visible;
 }
-
 .view-page-header .view-button.expand-all:empty::after {
     mask-image: url('./img/expand-all.svg');
 }
+.view-page-header .view-button.expand-all:empty::after {
+    mask-image: url('./img/expand-all.svg');
+}
+
+.discovery-nav > .view-nav-button[data-name="upload-data-from-clipboard"]::before {
+    content: '';
+    display: inline-block;
+    vertical-align: text-top;
+    height: 15px;
+    aspect-ratio: 1;
+    margin-left: -7px;
+    margin-right: -7px;
+    mask: url('./img/clipboard.png') no-repeat center / 17px;
+    background-color: currentColor;
+    opacity: .85;
+}
 
 /* Safari quirk mode fix */
 .view-expand > .header > .trigger {

diff --git a/src/discovery/index.js b/src/discovery/index.js
@@ -61,15 +61,39 @@ export function initDiscovery() {
  * Discovery empty page initialization
  */
 export function initAppDiscovery() {
-    const discovery = new App({
+    new App({
         ...commonConfig,
         mode: 'modelfree',
         upload: { clipboard: true },
         extensions: [
             embedExtension,
-            flashMessages
+            flashMessages,
+            function buttons(host) {
+                host.nav.before('inspect', {
+                    name: 'upload-data-from-clipboard',
+                    when: '#.actions.uploadDataFromClipboard and #.datasets',
+                    onClick: '=#.actions.uploadDataFromClipboard',
+                    tooltip: {
+                        position: 'trigger',
+                        content: 'text:"Paste JSON from clipboard"'
+                    }
+                });
+                // FIXME: use navButtons.unloadData instead, once issue with modelfree render cancel is solved
+                host.nav.menu.append({
+                    name: 'unload-data',
+                    when: '#.actions.unloadData and #.datasets',
+                    content: 'text:"Unload data"',
+                    onClick() {
+                        host.action.call('unloadData');
+                        host.scheduleRender();
+                    }
+                });
+                host.nav.primary.append({
+                    name: 'github',
+                    href: 'https://github.com/discoveryjs/JsonDiscovery',
+                    external: true
+                });
+            }
         ]
     });
-
-    // discovery.nav.remove('index-page');
 }
diff --git a/src/discovery/navbar.js b/src/discovery/navbar.js
@@ -1,5 +1,3 @@
-import { copyText } from '@discoveryjs/discovery/lib/core/utils/copy-text.js';
-
 const splitter = {
     view: 'block',
     className: 'splitter'
@@ -18,22 +16,14 @@ export default host => {
             host.setPage('whatsnew');
         }
     });
-    host.nav.prepend({
-        when: '#.page = "discovery"',
-        content: 'text:"Copy URL"',
-        async onClick() {
-            copyText(await host.action.call('permalink'));
-            host.action.call('flashMessage', 'URL copied to clipboard');
-        }
-    });
     host.nav.prepend({
         when: '#.page != "raw"',
         content: 'text:"Raw JSON"',
-        onClick: () => host.setPage('raw'),
-        tooltip: {
-            position: 'trigger',
-            content: 'text:"Show JSON as is"'
-        }
+        onClick: () => host.setPage('raw')
+        // tooltip: {
+        //     position: 'trigger',
+        //     content: 'text:"Show JSON as is"'
+        // }
     });
     host.nav.prepend({
         when: '#.page != "default"',
@@ -47,19 +37,29 @@ export default host => {
     //
     // Burger menu
     //
+    host.nav.menu.append(splitter);
+    host.nav.menu.append({
+        content: 'text:"Copy JSON to clipboard"',
+        async onClick(_, { hide }) {
+            hide();
+            await host.action.call('copyToClipboard');
+            host.action.call('flashMessage', 'JSON copied to clipboard');
+        }
+    });
     host.nav.menu.append({
         content: 'text:"Download JSON as file"',
+        when: '#.actions.downloadAsFile',
         onClick(_, { hide }) {
             hide();
             host.action.call('downloadAsFile');
         }
     });
     host.nav.menu.append({
-        content: 'text:"Copy JSON to clipboard"',
-        async onClick(_, { hide }) {
+        content: 'text:"Save JSON as file..."',
+        when: '#.actions.saveAsFile',
+        onClick(_, { hide }) {
             hide();
-            await host.action.call('copyToClipboard');
-            host.action.call('flashMessage', 'JSON copied to clipboard');
+            host.action.call('saveAsFile');
         }
     });
 
@@ -71,10 +71,8 @@ export default host => {
             host.setPage('whatsnew');
         }
     });
-
-    host.nav.menu.append(splitter);
     host.nav.menu.append({
-        content: 'text:"Settings"',
+        content: 'text:"Settings..."',
         onClick(_, { hide }) {
             hide();
             host.setPage('settings');
@@ -89,4 +87,12 @@ export default host => {
         href: 'https://github.com/discoveryjs/JsonDiscovery',
         external: true
     });
+
+    // host.nav.primary.append({
+    //     content: 'text:"\u00D7"',
+    //     tooltip: { position: 'trigger', content: 'text:"Close JsonDiscovery"' },
+    //     onClick() {
+    //         host.action.call('exit');
+    //     }
+    // });
 };