Merge pull request #482 from highperformancecoder/ravel-498-confused-…

…pick-slices

Rejig pick-slices to use direct query of backend api, rather than com…

gui-js/apps/minsky-electron/src/app/backend-init.ts

@@ -52,7 +52,6 @@ export async function backend(command: string, ...args: any[]): Promise<any> {
     }
     CppClass.record(`${command} ${arg}`);
 
-    log.info('Async Rest API: ',command,arg);
     let response=await restService.call(command, arg);
     if (logFilter(command))
       log.info('Async Rest API: ',command,arg,"=>",response);

gui-js/apps/minsky-electron/src/app/events/electron.events.ts

@@ -11,7 +11,6 @@ import {
   events,
   HandleDescriptionPayload,
   HandleDimensionPayload,
-  PickSlicesPayload,
   MinskyProcessPayload,
   minsky,
   RenderNativeWindow,
@@ -175,13 +174,6 @@ ipcMain.handle(
   }
 );
 
-ipcMain.handle(
-  events.SAVE_PICK_SLICES,
-  async (event, payload: PickSlicesPayload) => {
-    return await CommandsManager.savePickSlices(payload);
-  }
-);
-
 ipcMain.handle(
   events.CURRENT_TAB_POSITION,
   async (event)=>{

gui-js/apps/minsky-electron/src/app/managers/CommandsManager.ts

@@ -4,7 +4,6 @@ import {
   events,
   Functions,
   HandleDimensionPayload,
-  PickSlicesPayload,
   InitializePopupWindowPayload,
   electronMenuBarHeightForWindows, HandleDescriptionPayload,
   importCSVvariableName,
@@ -1067,24 +1066,15 @@ export class CommandsManager {
   }
 
   static async pickSlices(ravel: Ravel, handleIndex: number) {
-    // encode slice labels for transport through CGI URI 
-    const allSliceLabels = (await ravel.allSliceLabels()).map(x=>encodeURIComponent(x));
-    const pickedSliceLabels = (await ravel.pickedSliceLabels()).map(x=>encodeURIComponent(x));
-
     const window=WindowManager.createPopupWindowWithRouting({
       title: `Pick slices`,
-      url: `#/headless/pick-slices?command=${ravel.$prefix()}&handleIndex=${handleIndex}&allSliceLabels=${allSliceLabels.join()}&pickedSliceLabels=${pickedSliceLabels.join()}`,
+      url: `#/headless/pick-slices?command=${ravel.$prefix()}&handleIndex=${handleIndex}`,
       height: 400,
       width: 400,
     });
     Object.defineProperty(window,'dontCloseOnReturn',{value: true,writable:false});
   }
 
-  static async savePickSlices(payload: PickSlicesPayload) {
-    await (new Ravel(payload.command)).pickSliceLabels(payload.handleIndex, payload.pickedSliceLabels);
-    minsky.reset();
-  }
-
   static async lockSpecificHandles(ravel: Ravel) {
     let allLockHandles = await ravel.lockGroup.allLockHandles();
     if(Object.keys(allLockHandles).length === 0) {

gui-js/apps/minsky-electron/src/app/managers/ContextMenuManager.ts

@@ -927,8 +927,8 @@ export class ContextMenuManager {
       new MenuItem({
         label: 'Pick axis slices',
         enabled: handleAvailable,
-        click: async () => {
-          await CommandsManager.pickSlices(ravel,handleIndex);
+        click: () => {
+          CommandsManager.pickSlices(ravel,handleIndex);
         }
       }),
     new MenuItem({

gui-js/libs/core/src/lib/services/electron/electron.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { events, CurrentWindowDetails, HandleDescriptionPayload, HandleDimensionPayload, PickSlicesPayload,} from '@minsky/shared';
+import { events, CurrentWindowDetails, HandleDescriptionPayload, HandleDimensionPayload,} from '@minsky/shared';
 import isElectron from 'is-electron';
 import {Minsky, CppClass} from '@minsky/shared';
 
@@ -69,10 +69,6 @@ export class ElectronService {
     return await this.ipcRenderer.invoke(events.SAVE_HANDLE_DIMENSION, payload);
   }
 
-  async savePickSlices(payload: PickSlicesPayload) {
-    return await this.ipcRenderer.invoke(events.SAVE_PICK_SLICES, payload);
-  }
-
   async currentTabPosition(): Promise<number[]> {
     return await this.ipcRenderer.invoke(events.CURRENT_TAB_POSITION);
   }

gui-js/libs/shared/src/lib/interfaces/Interfaces.ts

@@ -52,12 +52,6 @@ export interface HandleDimensionPayload {
   units: string;
 }
 
-export interface PickSlicesPayload {
-  command: string;
-  handleIndex: number;
-  pickedSliceLabels: string[];
-}
-
 export interface ElectronCanvasOffset {
   left: number;
   top: number;

gui-js/libs/ui-components/src/lib/pick-slices/pick-slices.component.ts

@@ -4,6 +4,7 @@ import { ElectronService } from '@minsky/core';
 import { MessageBoxSyncOptions } from 'electron/renderer';
 import { MatButtonModule } from '@angular/material/button';
 import { NgFor } from '@angular/common';
+import {Ravel} from '@minsky/shared';
 
 @Component({
     selector: 'minsky-pick-slices',
@@ -15,7 +16,7 @@ import { NgFor } from '@angular/common';
 export class PickSlicesComponent implements OnInit {
   sliceLabels: {label: string, selected: boolean, lastClicked: boolean}[] = [];
 
-  command: string;
+  ravel: Ravel;
   handleIndex: number;
 
   constructor(
@@ -24,16 +25,16 @@ export class PickSlicesComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this.route.queryParams.subscribe((params) => {
-      this.command=params['command'];
+    this.route.queryParams.subscribe(async (params) => {
+      this.ravel=new Ravel(params['command']);
       this.handleIndex = +params['handleIndex'];
-
-      const pickedSliceLabels = params['pickedSliceLabels'].split(',');
-      this.sliceLabels = params['allSliceLabels'].split(',').map(l => ({
-        label: l,
-        selected: pickedSliceLabels.includes(l),
-        lastClicked: false
-      }));
+      const pickedSliceLabels = await this.ravel.pickedSliceLabels();
+      const allSliceLabels=await this.ravel.allSliceLabelsAxis(this.handleIndex);
+      this.sliceLabels = allSliceLabels.map(l => ({
+          label: l,
+          selected: pickedSliceLabels.includes(l),
+          lastClicked: false
+        }));
     });
   }
 
@@ -48,11 +49,7 @@ export class PickSlicesComponent implements OnInit {
 
         await this.electronService.showMessageBoxSync(options);
       } else {
-        await this.electronService.savePickSlices({
-          command: this.command,
-          handleIndex: this.handleIndex,
-          pickedSliceLabels: this.sliceLabels.filter(sl => sl.selected).map(sl => sl.label)
-        });
+        await this.ravel.pickSliceLabels(this.handleIndex, this.sliceLabels.filter(sl => sl.selected).map(sl => sl.label));
       }
     }
     this.closeWindow();