#24

eez-open · Sep 3, 2018 · c819010 · c819010
1 parent 2e5a934
commit c819010
Show file tree

Hide file tree

Showing 34 changed files with 788 additions and 224 deletions.
diff --git a/src/activity-viewer/activity-viewer-extension.ts b/src/activity-viewer/activity-viewer-extension.ts
diff --git a/src/activity-viewer/package.json b/src/activity-viewer/package.json
diff --git a/src/activity-viewer/section.tsx b/src/activity-viewer/section.tsx
diff --git a/src/home/drag-and-drop.ts b/src/home/drag-and-drop.ts
@@ -0,0 +1,38 @@
+import { extensions } from "shared/extensions/extensions";
+
+export function handleDragAndDrop() {
+    function removeDragData(ev: DragEvent) {
+        if (ev.dataTransfer.items) {
+            // Use DataTransferItemList interface to remove the drag data
+            ev.dataTransfer.items.clear();
+        } else {
+            // Use DataTransfer interface to remove the drag data
+            ev.dataTransfer.clearData();
+        }
+    }
+
+    $(document).on("dragover", $ev => {
+        $ev.preventDefault();
+        const ev = $ev.originalEvent as DragEvent;
+        ev.dataTransfer.dropEffect = "copy";
+    });
+
+    $(document).on("drop", async $ev => {
+        $ev.preventDefault();
+        const ev = $ev.originalEvent as DragEvent;
+
+        var dt = ev.dataTransfer;
+        var files = dt.files;
+
+        for (let file of files) {
+            for (let extension of extensions) {
+                const handleDragAndDropFile = extension[1].handleDragAndDropFile;
+                if (handleDragAndDropFile && (await handleDragAndDropFile(file.path))) {
+                    break;
+                }
+            }
+        }
+
+        removeDragData(ev);
+    });
+}
diff --git a/src/home/main.tsx b/src/home/main.tsx
@@ -3,6 +3,8 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import { configure } from "mobx";
 
+import { handleDragAndDrop } from "home/drag-and-drop";
+
 configure({ enforceActions: true });
 
 EEZStudio.electron.ipcRenderer.on("beforeClose", () => {
@@ -25,33 +27,6 @@ EEZStudio.electron.ipcRenderer.on(
     }
 );
 
-function handleDragAndDrop() {
-    function removeDragData(ev: DragEvent) {
-        console.log("Removing drag data");
-
-        if (ev.dataTransfer.items) {
-            // Use DataTransferItemList interface to remove the drag data
-            ev.dataTransfer.items.clear();
-        } else {
-            // Use DataTransfer interface to remove the drag data
-            ev.dataTransfer.clearData();
-        }
-    }
-
-    $(document).on("dragover", $ev => {
-        $ev.preventDefault();
-        const ev = $ev.originalEvent as DragEvent;
-        ev.dataTransfer.dropEffect = "copy";
-    });
-
-    $(document).on("drop", $ev => {
-        $ev.preventDefault();
-        const ev = $ev.originalEvent as DragEvent;
-        console.log(ev);
-        removeDragData(ev);
-    });
-}
-
 async function main() {
     const { App } = await import("home/app");
     ReactDOM.render(<App />, document.getElementById("EezStudio_Content"));

diff --git a/src/instrument/window/history/filters.tsx b/src/instrument/window/history/filters.tsx
@@ -12,15 +12,24 @@ import { IAppStore, History } from "instrument/window/history/history";
 import { IHistoryItem } from "instrument/window/history/item";
 
 export class Filters {
-    @observable connectsAndDisconnects: boolean = true;
-    @observable scpi: boolean = true;
-    @observable downloadedFiles: boolean = true;
-    @observable uploadedFiles: boolean = true;
-    @observable attachedFiles: boolean = true;
-    @observable charts: boolean = true;
-    @observable lists: boolean = true;
-    @observable notes: boolean = true;
-    @observable launchedScripts: boolean = true;
+    @observable
+    connectsAndDisconnects: boolean = true;
+    @observable
+    scpi: boolean = true;
+    @observable
+    downloadedFiles: boolean = true;
+    @observable
+    uploadedFiles: boolean = true;
+    @observable
+    attachedFiles: boolean = true;
+    @observable
+    charts: boolean = true;
+    @observable
+    lists: boolean = true;
+    @observable
+    notes: boolean = true;
+    @observable
+    launchedScripts: boolean = true;
 
     filterActivityLogEntry(activityLogEntry: IActivityLogEntry): boolean {
         if (activityLogEntry.type.startsWith("activity-log/session")) {
@@ -149,15 +158,24 @@ export class Filters {
 }
 
 export class FilterStats {
-    @observable connectsAndDisconnects = 0;
-    @observable scpi = 0;
-    @observable downloadedFiles = 0;
-    @observable uploadedFiles = 0;
-    @observable attachedFiles = 0;
-    @observable charts = 0;
-    @observable lists = 0;
-    @observable notes = 0;
-    @observable launchedScripts = 0;
+    @observable
+    connectsAndDisconnects = 0;
+    @observable
+    scpi = 0;
+    @observable
+    downloadedFiles = 0;
+    @observable
+    uploadedFiles = 0;
+    @observable
+    attachedFiles = 0;
+    @observable
+    charts = 0;
+    @observable
+    lists = 0;
+    @observable
+    notes = 0;
+    @observable
+    launchedScripts = 0;
 
     constructor(public history: History) {
         scheduleTask(
@@ -169,7 +187,7 @@ export class FilterStats {
                         `SELECT
                             type, count(*) AS count
                         FROM
-                            activityLog
+                            ${history.table} AS T1
                         WHERE
                             ${this.history.oidWhereClause} AND NOT deleted
                         GROUP BY

diff --git a/src/instrument/window/history/history-view.tsx b/src/instrument/window/history/history-view.tsx
@@ -342,14 +342,20 @@ export class HistoryView extends React.Component<{
             isClosable: false
         };
 
-        const sessionsItem = {
-            id: "sessions",
-            type: "component",
-            componentName: "Sessions",
-            componentState: {},
-            title: "Sessions",
-            isClosable: false
-        };
+        const content2 = [calendarItem];
+
+        if (this.props.appStore.history.isSessionsSupported) {
+            const sessionsItem = {
+                id: "sessions",
+                type: "component",
+                componentName: "Sessions",
+                componentState: {},
+                title: "Sessions",
+                isClosable: false
+            };
+
+            content2.push(sessionsItem);
+        }
 
         let content;
         if (searchResultsItem) {
@@ -361,7 +367,7 @@ export class HistoryView extends React.Component<{
                         filtersItem,
                         {
                             type: "stack",
-                            content: [calendarItem, sessionsItem]
+                            content: content2
                         }
                     ]
                 }
@@ -374,7 +380,7 @@ export class HistoryView extends React.Component<{
                         filtersItem,
                         {
                             type: "stack",
-                            content: [calendarItem, sessionsItem]
+                            content: content2
                         }
                     ]
                 }
@@ -401,11 +407,19 @@ export class HistoryView extends React.Component<{
             />
         );
 
+        let layoutId = "layout/2";
+        if (searchResultsItem) {
+            layoutId += "/with-search-results";
+        }
+        if (!this.props.appStore.history.isSessionsSupported) {
+            layoutId += "/without-sessions";
+        }
+
         return (
             <SideDock
                 ref={ref => (this.sideDock = ref)}
                 persistId={this.props.persistId + "/side-dock"}
-                layoutId={"layout/2" + (searchResultsItem ? "/with-search-results" : "")}
+                layoutId={layoutId}
                 defaultLayoutConfig={defaultLayoutConfig}
                 registerComponents={(goldenLayout: any) => {
                     goldenLayout.registerComponent("SearchResults", function(