@adcops/autocore-react 3.0.26 → 3.0.29

package/dist/components/FileSelect.d.ts

@@ -2,6 +2,8 @@ import React from 'react';
 type FileSelectProps = {
     domain?: string;
     subdir?: string;
+    /** Filter results using unix-style patterns. */
+    filter?: string | null;
     onFileSelected?: (fileName: string) => void;
     onAccept?: (fileName: string) => void;
     onCancel?: () => void;

package/dist/components/FileSelect.js

@@ -1 +1 @@
-import{jsx as _jsx,jsxs as _jsxs}from"react/jsx-runtime";import{useState,useContext,useEffect}from"react";import{DataTable}from"primereact/datatable";import{Column}from"primereact/column";import{Button}from"primereact/button";import{EventEmitterContext}from"../core/EventEmitterContext";export const FileSelect=({domain:e="DATASTORE",subdir:t,onFileSelected:n,onAccept:a,onCancel:l})=>{const{invoke:i}=useContext(EventEmitterContext),[o,s]=useState([]),[c,m]=useState(null),r=e=>{m(e),n&&n(e.name)};return useEffect((()=>{(async()=>{try{const n=t?{subdir:t}:{},a=(await i(e,"list_files",n)).data.map(((e,t)=>({id:t+1,name:e})));s(a)}catch(e){}})()}),[e,t]),_jsxs("div",{children:[_jsxs(DataTable,{value:o,selectionMode:"single",selection:c,onSelectionChange:e=>r(e.value),children:[_jsx(Column,{field:"name",header:"File Name"}),_jsx(Column,{body:e=>_jsx(Button,{label:c?.name===e.name?"Selected":"Select",icon:c?.name===e.name?"pi pi-check-circle":"pi pi-circle-off",onClick:()=>r(e),className:"p-button-rounded "+(c?.name===e.name?"p-button-success":"p-button-outlined"),"aria-label":"Select",size:"small"}),header:"Select"})]}),_jsxs("div",{style:{display:"flex",justifyContent:"flex-end",marginTop:"10px"},children:[_jsx(Button,{label:"Cancel",icon:"pi pi-times",className:"p-button-text",onClick:l}),_jsx(Button,{label:"Accept",icon:"pi pi-check",className:"p-button",onClick:()=>{void 0!==a&&null!==c&&a(null!==c?void 0!==t?`${t}/${c.name}`:c.name:"")},disabled:!c})]})]})};export default FileSelect;
+import{jsx as _jsx,jsxs as _jsxs}from"react/jsx-runtime";import{useState,useContext,useEffect}from"react";import{DataTable}from"primereact/datatable";import{Column}from"primereact/column";import{Button}from"primereact/button";import{EventEmitterContext}from"../core/EventEmitterContext";export const FileSelect=({domain:e="DATASTORE",subdir:t,filter:n,onFileSelected:l,onAccept:i,onCancel:o})=>{const{invoke:a}=useContext(EventEmitterContext),[s,c]=useState([]),[r,m]=useState(null),u=e=>{m(e),l&&l(e.name)};return useEffect((()=>{(async()=>{try{let l;l=null!=n?t?{subdir:t,options:{filter:n}}:{options:{filter:n}}:t?{subdir:t}:{};const i=(await a(e,"list_files",l)).data.map(((e,t)=>({id:t+1,name:e})));c(i)}catch(e){}})()}),[e,t]),_jsxs("div",{children:[_jsxs(DataTable,{value:s,selectionMode:"single",selection:r,onSelectionChange:e=>u(e.value),children:[_jsx(Column,{field:"name",header:"File Name"}),_jsx(Column,{body:e=>_jsx(Button,{label:r?.name===e.name?"Selected":"Select",icon:r?.name===e.name?"pi pi-check-circle":"pi pi-circle-off",onClick:()=>u(e),className:"p-button-rounded "+(r?.name===e.name?"p-button-success":"p-button-outlined"),"aria-label":"Select",size:"small"}),header:"Select"})]}),_jsxs("div",{style:{display:"flex",justifyContent:"flex-end",marginTop:"10px"},children:[_jsx(Button,{label:"Cancel",icon:"pi pi-times",className:"p-button-text",onClick:o}),_jsx(Button,{label:"Accept",icon:"pi pi-check",className:"p-button",onClick:()=>{void 0!==i&&null!==r&&i(null!==r?void 0!==t?`${t}/${r.name}`:r.name:"")},disabled:!r})]})]})};export default FileSelect;

package/dist/hub/index.js

@@ -1 +1 @@
-import{HubTauri}from"./HubTauri";import{HubWebSocket}from"./HubWebSocket";import{HubSimulate}from"./HubSimulate";export function createHub(){return void 0!==window.__TAURI__&&null!==window.__TAURI__?new HubTauri:new HubWebSocket}export{HubBase as Hub}from"./HubBase";export{HubTauri};export{HubWebSocket};export{HubSimulate};
+import{HubTauri}from"./HubTauri";import{HubWebSocket}from"./HubWebSocket";import{HubSimulate}from"./HubSimulate";let hubInstance=null;export function createHub(){return hubInstance||(hubInstance=void 0!==window.__TAURI__&&null!==window.__TAURI__?new HubTauri:new HubWebSocket),hubInstance}export{HubBase as Hub}from"./HubBase";export{HubTauri};export{HubWebSocket};export{HubSimulate};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@adcops/autocore-react",
-    "version": "3.0.26",
+    "version": "3.0.29",
     "description": "A React component library for industrial user interfaces.",
     "private": false,
     "type": "module",

package/src/components/FileSelect.tsx

@@ -2,7 +2,7 @@
  * Copyright (C) 2024 Automated Design Corp.. All Rights Reserved.
  * Created Date: 2024-04-28 16:06:59
  * -----
- * Last Modified: 2024-05-01 07:30:49
+ * Last Modified: 2024-06-12 14:40:20
  * -----
  * 
  */
@@ -18,6 +18,8 @@ import { EventEmitterContext } from "../core/EventEmitterContext";
 type FileSelectProps = {
     domain?: string,
     subdir?: string,
+    /** Filter results using unix-style patterns. */
+    filter?: string | null,
     onFileSelected?: (fileName: string) => void,
     onAccept?: (fileName: string) => void,
     onCancel?: () => void
@@ -31,6 +33,7 @@ type FileItem = {
 export const FileSelect: React.FC<FileSelectProps> = ({
     domain = "DATASTORE",
     subdir,
+    filter,
     onFileSelected,
     onAccept,
     onCancel
@@ -41,7 +44,16 @@ export const FileSelect: React.FC<FileSelectProps> = ({
 
     const listFiles = async () => {
         try {
-            const args = subdir ? { "subdir": subdir } : {};
+            
+            let args;
+
+            if (filter !== undefined && filter !== null) {
+                args = subdir ? { "subdir": subdir, options : {"filter" : filter }} : {options : {"filter" : filter }};
+            }
+            else {
+                args = subdir ? { "subdir": subdir } : {};
+            }
+
             const res = await invoke(domain, "list_files", args);
             const items = res.data.map((item: string, index: number) => ({
                 id: index + 1,

package/src/hub/index.ts

@@ -2,7 +2,7 @@
  * Copyright (C) 2024 Automated Design Corp. All Rights Reserved.
  * Created Date: 2024-01-16 21:07:29
  * -----
- * Last Modified: 2024-04-25 07:18:48
+ * Last Modified: 2024-05-31 07:51:19
  * Modified By: ADC
  * -----
  * 
@@ -14,35 +14,49 @@ import { HubWebSocket } from "./HubWebSocket";
 import {HubSimulate} from "./HubSimulate"
 import { CommandMessage, CommandMessageResult } from './CommandMessage';
 
+
+let hubInstance: Hub | null = null;
+
 /**
  * Creates a connection to the backend.
  * @returns Hub 
  */
 export function createHub(): Hub {
 
-    if (window.__TAURI__ !== undefined && window.__TAURI__ !== null) {
-        // Standalone Tauri application
-        console.log("HUB: Starting link to Tauri backend.");
-        return new HubTauri();
+    if (!hubInstance) {
+        if (window.__TAURI__ !== undefined && window.__TAURI__ !== null) {
+            console.log("HUB: Starting link to Tauri backend.");
+            hubInstance = new HubTauri();
+        } else {
+            console.log("HUB: Starting websocket connection.");
+            hubInstance = new HubWebSocket();
+        }
     }
-    // else if (
-    //     window.location.port !== undefined
-    //     &&  window.location.port.length > 0
-    //     && window.location.port !== '80' 
-    //     && window.location.port !== '8080' 
-    //     && window.location.port !== '443' 
-    // ) {
+    return hubInstance;
+        
+    // if (window.__TAURI__ !== undefined && window.__TAURI__ !== null) {
+    //     // Standalone Tauri application
+    //     console.log("HUB: Starting link to Tauri backend.");
+    //     return new HubTauri();
+    // }
+    // // else if (
+    // //     window.location.port !== undefined
+    // //     &&  window.location.port.length > 0
+    // //     && window.location.port !== '80' 
+    // //     && window.location.port !== '8080' 
+    // //     && window.location.port !== '443' 
+    // // ) {
     
-    //     // We're loaded in some development environment
-    //     console.log("HUB: Starting HUB SIMULATOR.");
-    //     return new HubSimulate();
-
-    // } 
-    else {
-        // A web-app that must communicate with a backend in another process.
-        console.log("HUB: Starting websocket connection.");
-        return new HubWebSocket();
-    }
+    // //     // We're loaded in some development environment
+    // //     console.log("HUB: Starting HUB SIMULATOR.");
+    // //     return new HubSimulate();
+
+    // // } 
+    // else {
+    //     // A web-app that must communicate with a backend in another process.
+    //     console.log("HUB: Starting websocket connection.");
+    //     return new HubWebSocket();
+    // }
 }