BDE-226 fixing-up document browsing (json tab included)

nuxeo · Mar 11, 2024 · 34cb624 · 34cb624
1 parent ce089ef
commit 34cb624
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/src/main/document-browser.js b/src/main/document-browser.js
@@ -11,6 +11,7 @@ class DocumentBrowser {
     this.worker = worker;
 
     // Bind methods
+    this.jsonOf = this.jsonOf.bind(this);
     this.openDocument = this.openDocument.bind(this);
     this.openDocFromId = this.openDocFromId.bind(this);
     this.openDocFromPath = this.openDocFromPath.bind(this);
@@ -130,7 +131,7 @@ class DocumentBrowser {
       });
   }
 
-  getJson(repository, path) {
+  jsonOf(repository, path) {
     return this.worker.serverConnector.withNuxeo()
       .then((nuxeo) => nuxeo
         .request(`/repo/${repository}/${path}`)

diff --git a/src/main/json-highlighter.js b/src/main/json-highlighter.js
@@ -1,18 +1,21 @@
 class JsonHighlighter {
   // eslint-disable-next-line no-unused-vars
   constructor(worker) {
-    this.inpur = '';
+    this._input = '';
+
+    // Bind methods
+    this.input = this.input.bind(this);
   }
 
   input(input) {
     if (input) {
-      this.input = input;
+      this._input = input;
     }
     return new Promise((resolve, reject) => {
       if (!this.input) {
         reject(new Error('No json input text provided'));
       }
-      resolve(this.input);
+      resolve(this._input);
     });
   }
 }

diff --git a/src/main/server-connector.js b/src/main/server-connector.js
@@ -181,23 +181,26 @@ class ServerConnector {
       }));
   }
 
-  query(schemas = ['dublincore', 'common', 'uid'], query) {
+  query(input, schemas = ['dublincore', 'common', 'uid']) {
     return Promise.all([this.runtimeInfo(), this.withNuxeo()])
       .then(([runtimeInfo, nuxeo]) => {
-        const username = runtimeInfo.nuxeo._auth.username;
+        const userid = runtimeInfo.nuxeo.user.id;
         const defaultSelectClause = '* FROM Document';
-        const defaultWhereClause = `ecm:path STARTSWITH "/default-domain/UserWorkspaces/${username}"`;
+        const defaultWhereClause = `ecm:path STARTSWITH "/default-domain/UserWorkspaces/${userid}"`;
         const defaultQuery = `SELECT ${defaultSelectClause} WHERE ${defaultWhereClause}"`;
-        const sortBy = query && query.sortBy ? query.sortBy : 'dc:modified DESC';
+        const defaultSortBy = 'dc:modified DESC';
 
-        if (!query || (typeof query === 'object' && !query.query)) {
-          query = defaultQuery;
+        if (!input || (typeof input === 'object' && !input.query)) {
+          input.query = defaultQuery;
+        }
+        if (!input.sortBy) {
+          input.sortBy = defaultSortBy;
         }
 
         return nuxeo
           .repository()
           .schemas(schemas)
-          .query({ query, sortBy });
+          .query(input);
       });
   }
 

diff --git a/src/popup/index.js b/src/popup/index.js
@@ -331,7 +331,7 @@ function loadPage(serviceWorker) {
       function doGetJson(path) {
         serviceWorker.browserStore.get({ highlight: true }).then((res) => {
           if (res.highlight) {
-            serviceWorker.documentBrowser.getJsonFromPath(repository, path)
+            serviceWorker.documentBrowser.jsonOf(repository, path)
               .then(openJsonWindow);
           } else {
             const jsonPath = `api/v1/repo/${repository}/${path}?enrichers.document=acls,permissions&properties=*`;
@@ -591,13 +591,13 @@ function loadPage(serviceWorker) {
               $('table').css('margin-top', '20px');
               res.entries.forEach((doc) => {
                 $('html').outerHeight($('html').height());
-                const icon = doc.get('common:icon');
-                const title = doc.get('dc:title');
+                const icon = doc.properties['common:icon'];
+                const title = doc.properties['dc:title'];
                 const re = /^(.*[\/])/;
                 const path = re.exec(doc.path)[1];
                 const uid = doc.uid;
-                const vMajor = doc.get('uid:major_version');
-                const vMinor = doc.get('uid:minor_version');
+                const vMajor = doc.properties['uid:major_version'];
+                const vMinor = doc.properties['uid:minor_version'];
                 showSearchResults(icon, title, path, uid, vMajor, vMinor);
               });
               $('.doc-title').click((event) => {
@@ -633,7 +633,7 @@ function loadPage(serviceWorker) {
       let openJsonWindow = (jsonObject) => {
         const jsonString = JSON.stringify(jsonObject, undefined, 2);
         serviceWorker.jsonHighlighter.input(DOMPurify.sanitize(jsonString));
-        serviceWorker.serverLocator.loadNewExtensionTab('json.html');
+        serviceWorker.serverLocator.loadNewExtensionTab('json/index.html');
       };
 
       $('#restart-button').on('click', () => {