@brftech/filex-core 0.41.1 → 0.41.2

package/dist/index.d.ts

@@ -5263,6 +5263,37 @@ export declare type OperationsStore = ReturnType<typeof useOperations>;
 
 export declare type OperationStatus = 'running' | 'done' | 'error' | 'aborted';
 
+/** 0–100, or `null` when there is no honest number to draw. */
+export declare function opPercent(op: OpProgressLike): number | null;
+
+/**
+ * opProgress — the one rule for "how far along is this queued operation".
+ *
+ * Both progress surfaces read it: the explorer's operations center
+ * (PendingOpsTray → OperationsCenter) and the admin app's bottom-right tray.
+ * Two copies of this rule are how one tray starts saying something the other
+ * does not (filex lesson #119).
+ *
+ * Issue #27: a queued op counts SOURCES, so moving one large file — or one
+ * folder of a thousand files — is "0 of 1" until the very end. Drawn as a
+ * percentage that is a bar frozen at 0% that then vanishes, which the reporter
+ * read as stuck. So:
+ *
+ *   - a running cross-storage transfer reports bytes (`bytes_done` /
+ *     `bytes_total`); when the total is known that is the percentage;
+ *   - bytes moving with no total yet, or a single source with nothing but a
+ *     source count, has NO honest percentage: `null`, and the surface shows
+ *     an indeterminate indicator instead of a fake 0%;
+ *   - several sources still report per source, as before.
+ */
+export declare interface OpProgressLike {
+    status: string;
+    progress_total: number;
+    progress_done: number;
+    bytes_total?: number;
+    bytes_done?: number;
+}
+
 declare type PaneId = 'main' | 'split';
 
 /**
@@ -5294,6 +5325,9 @@ export declare interface PendingOp {
     status: 'pending' | 'running' | 'done' | 'error';
     progress_total: number;
     progress_done: number;
+    /** Running cross-storage transfer's bytes (issue #27); absent otherwise. */
+    bytes_total?: number;
+    bytes_done?: number;
     target_path: string | null;
     source_dir: string | null;
     source_count: number;
@@ -7012,6 +7046,8 @@ export declare function usePendingOps(config: ExplorerConfig, api: FileApi, opts
     status: "pending" | "running" | "done" | "error";
     progress_total: number;
     progress_done: number;
+    bytes_total?: number | undefined;
+    bytes_done?: number | undefined;
     target_path: string | null;
     source_dir: string | null;
     source_count: number;
@@ -7025,6 +7061,8 @@ export declare function usePendingOps(config: ExplorerConfig, api: FileApi, opts
     status: "pending" | "running" | "done" | "error";
     progress_total: number;
     progress_done: number;
+    bytes_total?: number | undefined;
+    bytes_done?: number | undefined;
     target_path: string | null;
     source_dir: string | null;
     source_count: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brftech/filex-core",
-  "version": "0.41.1",
+  "version": "0.41.2",
   "description": "filex core — Vue 3 source of truth for the filex file manager (FileExplorer + ConnectionsPanel SFCs, composables, types)",
   "type": "module",
   "main": "./dist/filex-core.umd.cjs",

package/src/components/FilePane.vue

@@ -66,6 +66,7 @@
 import { computed, provide, ref, watch } from 'vue';
 
 import type { FileApi } from '../composables/useFileApi';
+import type { ClickMod } from '../composables/useRowTouch';
 import type { FileNode, ViewMode } from '../types/FileNode';
 import type { LocaleCode, ThemeMode } from '../types/ExplorerConfig';
 import { useLocale } from '../composables/useLocale';
@@ -443,12 +444,35 @@ const paneSubfolders = computed(() =>
  * `useSelection` instance for this pane answers. One set of Ctrl/Shift
  * semantics for both panes — the old right pane had a simplified copy in
  * which Shift behaved as Ctrl. */
-function onViewClick(n: FileNode, mod: { ctrl: boolean; shift: boolean; touch?: boolean }) {
-  /* issue #26 — a finger has no double-click, so a TAP is the open gesture:
-   * with nothing selected it opens what it lands on, exactly as a double-click
-   * would. Once something is selected (a long press selects, via its menu) a
-   * tap adds to or removes from the selection, so picking several files still
-   * works. A mouse keeps click-to-select; see composables/useRowTouch. */
+/* issue #26, second round — a press on the NAME opens, so the second click of
+ * a habitual double-click lands on whatever the NEW listing put under the
+ * pointer (the folder already opened on the first click). Without this guard
+ * that click would open or select a row the user never aimed at, and a file's
+ * name would open twice (two viewer tabs). */
+const NAME_OPEN_GUARD_MS = 500;
+let nameOpenedAt = 0;
+
+function withinNameOpenGuard(): boolean {
+  return Date.now() - nameOpenedAt < NAME_OPEN_GUARD_MS;
+}
+
+function onViewClick(n: FileNode, mod: ClickMod) {
+  if (withinNameOpenGuard()) return;
+  /* issue #26, second round — the reporter's rule on every device: a press on
+   * the item's name opens it, mouse or finger, selection or not. Ctrl/shift
+   * still mean "add to / extend the selection", so a modifier click on a name
+   * selects as it always did. The checkbox selects on its own path. */
+  if (mod.name && !mod.ctrl && !mod.shift) {
+    nameOpenedAt = Date.now();
+    onRowOpen(n);
+    return;
+  }
+  /* issue #26 — a finger has no double-click, so a TAP elsewhere on the item
+   * is the open gesture too: with nothing selected it opens what it lands on,
+   * exactly as a double-click would. Once something is selected (a long press
+   * selects, via its menu) such a tap adds to or removes from the selection,
+   * so picking several files still works. A mouse click beside the name keeps
+   * click-to-select; see composables/useRowTouch. */
   if (mod.touch && !mod.ctrl && !mod.shift) {
     if (props.selected.size === 0) {
       onRowOpen(n);
@@ -460,6 +484,11 @@ function onViewClick(n: FileNode, mod: { ctrl: boolean; shift: boolean; touch?:
   emit('click-row', n, mod);
 }
 
+function onViewDbl(n: FileNode) {
+  if (withinNameOpenGuard()) return;
+  onRowOpen(n);
+}
+
 function onViewContext(n: FileNode, ev: MouseEvent) {
   ev.preventDefault();
   ev.stopPropagation();
@@ -891,7 +920,7 @@ watch(panePath, () => {
         :auth-credentials="authCredentials"
         @click-row="onViewClick"
         @display-order="(nodes: FileNode[]) => emit('display-order', nodes)"
-        @dbl-row="onRowOpen"
+        @dbl-row="onViewDbl"
         @context-row="onViewContext"
         @item-drag-start="onRowDragStart"
         @item-drop-into="onViewDropInto"
@@ -917,7 +946,7 @@ watch(panePath, () => {
         :auth-credentials="authCredentials"
         @click-card="onViewClick"
         @display-order="(nodes: FileNode[]) => emit('display-order', nodes)"
-        @dbl-card="onRowOpen"
+        @dbl-card="onViewDbl"
         @context-card="onViewContext"
         @item-drag-start="onRowDragStart"
         @item-drop-into="onViewDropInto"
@@ -940,7 +969,7 @@ watch(panePath, () => {
         :auth-headers="authHeaders"
         :auth-credentials="authCredentials"
         @click-card="onViewClick"
-        @dbl-card="onRowOpen"
+        @dbl-card="onViewDbl"
         @context-card="onViewContext"
         @item-drag-start="onRowDragStart"
         @item-drop-into="onViewDropInto"

package/src/components/GalleryView.vue

@@ -13,7 +13,7 @@ import { hasInternalDrag } from '../lib/dragOut';
 import type { FileNode } from '../types/FileNode';
 import type { LocaleCode } from '../types/ExplorerConfig';
 import { useLocale } from '../composables/useLocale';
-import { useRowTouch } from '../composables/useRowTouch';
+import { clickMod, useRowTouch, type ClickMod } from '../composables/useRowTouch';
 import { encryptedFolderTile, fileIconTile, isEncryptedFolder } from '../lib/fileIcons';
 import {
   createFilePreviews,
@@ -77,7 +77,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-  (e: 'click-card', node: FileNode, mod: { ctrl: boolean; shift: boolean; touch?: boolean }): void;
+  (e: 'click-card', node: FileNode, mod: ClickMod): void;
   (e: 'dbl-card', node: FileNode): void;
   (e: 'context-card', node: FileNode, ev: MouseEvent): void;
   (e: 'item-drag-start', node: FileNode, ev: DragEvent): void;
@@ -159,7 +159,7 @@ function isSelected(n: FileNode): boolean {
 }
 
 function onClick(n: FileNode, ev: MouseEvent) {
-  emit('click-card', n, { ctrl: ev.ctrlKey || ev.metaKey, shift: ev.shiftKey, touch: touch.isTap(ev) });
+  emit('click-card', n, clickMod(ev, touch.isTap(ev), '.fe-gal__label'));
 }
 
 function onDbl(n: FileNode) {

package/src/components/GridView.vue

@@ -20,7 +20,7 @@ import type { FileNode } from '../types/FileNode';
 import { hasInternalDrag } from '../lib/dragOut';
 import type { LocaleCode } from '../types/ExplorerConfig';
 import { useLocale } from '../composables/useLocale';
-import { useRowTouch } from '../composables/useRowTouch';
+import { clickMod, useRowTouch, type ClickMod } from '../composables/useRowTouch';
 import { encryptedFolderTile, fileIconTile, isEncryptedFolder } from '../lib/fileIcons';
 import {
   createFilePreviews,
@@ -111,7 +111,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-  (e: 'click-card', node: FileNode, mod: { ctrl: boolean; shift: boolean; touch?: boolean }): void;
+  (e: 'click-card', node: FileNode, mod: ClickMod): void;
   (e: 'dbl-card', node: FileNode): void;
   (e: 'context-card', node: FileNode, ev: MouseEvent): void;
   (e: 'item-drag-start', node: FileNode, ev: DragEvent): void;
@@ -268,7 +268,7 @@ function isSelected(n: FileNode): boolean {
 }
 
 function onClick(n: FileNode, ev: MouseEvent) {
-  emit('click-card', n, { ctrl: ev.ctrlKey || ev.metaKey, shift: ev.shiftKey, touch: touch.isTap(ev) });
+  emit('click-card', n, clickMod(ev, touch.isTap(ev), '.fe-grid__label'));
 }
 
 function onDbl(n: FileNode) {
@@ -547,11 +547,15 @@ function snippetTitle(snippet: string): string {
             >{{ keepGlyph(keepBadgeFor(n)!) }}</span>
           </div>
           <div class="fe-grid__meta">{{ captionFor(n) }}</div>
+          <!-- A card at a storage's root has no parent folder to name: no line,
+               not an em dash — the same rule the gallery follows and the list's
+               Location cell (tablo:t1). The dash read as a stray character under
+               the filename in search results. -->
           <div
-            v-if="showParentPath"
+            v-if="showParentPath && parentDirOf(n.path)"
             class="fe-grid__parent"
             :title="parentDirOf(n.path)"
-          >{{ parentDirOf(n.path) || '—' }}</div>
+          >{{ parentDirOf(n.path) }}</div>
           <!-- bul:s3 — content snippet («» → <mark> via TEXT segments, no innerHTML) -->
           <div v-if="cardSnippet(n)" class="fe-grid__snippet" :title="snippetTitle(cardSnippet(n))">
             <template v-for="(seg, si) in snippetSegments(cardSnippet(n))" :key="si">

package/src/components/ListView.vue

@@ -11,7 +11,7 @@ import { hasInternalDrag } from '../lib/dragOut';
 import type { FileNode } from '../types/FileNode';
 import type { LocaleCode, ThemeMode } from '../types/ExplorerConfig';
 import { useLocale } from '../composables/useLocale';
-import { useRowTouch } from '../composables/useRowTouch';
+import { clickMod, useRowTouch, type ClickMod } from '../composables/useRowTouch';
 import {
   arrivedFromOutside,
   ownedByViewer,
@@ -139,7 +139,7 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-  (e: 'click-row', node: FileNode, mod: { ctrl: boolean; shift: boolean; touch?: boolean }): void;
+  (e: 'click-row', node: FileNode, mod: ClickMod): void;
   (e: 'dbl-row', node: FileNode): void;
   (e: 'context-row', node: FileNode, ev: MouseEvent): void;
   (e: 'item-drag-start', node: FileNode, ev: DragEvent): void;
@@ -174,7 +174,7 @@ function isSelected(n: FileNode): boolean {
 }
 
 function onRowClick(n: FileNode, ev: MouseEvent) {
-  emit('click-row', n, { ctrl: ev.ctrlKey || ev.metaKey, shift: ev.shiftKey, touch: touch.isTap(ev) });
+  emit('click-row', n, clickMod(ev, touch.isTap(ev), '.fe-list__name'));
 }
 
 function onRowDbl(n: FileNode) {

package/src/components/PendingOpsTray.vue

@@ -17,6 +17,7 @@ import { watch } from 'vue';
 import type { LocaleCode } from '../types/ExplorerConfig';
 import type { PendingOp } from '../composables/usePendingOps';
 import type { OperationsStore, OperationStatus } from '../composables/useOperations';
+import { opPercent } from '../lib/opProgress';
 
 const props = defineProps<{
   ops: PendingOp[];
@@ -35,11 +36,9 @@ function mapStatus(op: PendingOp): OperationStatus {
   return 'running'; // pending | running
 }
 
-function percentOf(op: PendingOp): number | null {
-  if (op.status === 'done') return 100;
-  if (op.progress_total <= 0) return null;
-  return Math.min(100, Math.round((op.progress_done / op.progress_total) * 100));
-}
+/* issue #27 — bytes when a cross-storage transfer reports them, no fake 0%
+ * otherwise; the rule is shared with the admin tray (lib/opProgress). */
+const percentOf = (op: PendingOp): number | null => opPercent(op);
 
 watch(
   () => props.ops,

package/src/composables/usePendingOps.ts

@@ -23,6 +23,9 @@ export interface PendingOp {
   status: 'pending' | 'running' | 'done' | 'error';
   progress_total: number;
   progress_done: number;
+  /** Running cross-storage transfer's bytes (issue #27); absent otherwise. */
+  bytes_total?: number;
+  bytes_done?: number;
   target_path: string | null;
   source_dir: string | null;
   source_count: number;
@@ -69,6 +72,8 @@ function normalizeOp(raw: Record<string, unknown>): PendingOp {
     status,
     progress_total: num(raw.progress_total, raw.total, sources.length),
     progress_done: num(raw.progress_done, raw.done),
+    bytes_total: num(raw.bytes_total),
+    bytes_done: num(raw.bytes_done),
     target_path: str(raw.target_path, raw.dest),
     source_dir: str(raw.source_dir),
     source_count: num(raw.source_count, sources.length),

package/src/composables/useRowTouch.ts

@@ -13,6 +13,13 @@
  *
  * The views only report. What a tap means is decided once, in FilePane.
  *
+ * Issue #26, second round (the reporter's rule, on EVERY device):
+ *   - a press on the item's NAME opens it — mouse click or finger tap, with or
+ *     without a selection;
+ *   - a long press (finger) or a right click (mouse) opens the menu;
+ *   - the checkbox selects, exactly as before.
+ * So the views also report whether the click landed on the name (`name`).
+ *
  * ⚠ A tap is judged from the gesture that produced the click, never from the
  * screen: `pointerType` where the browser sets it on click (Chromium, Firefox),
  * and the touchend that just preceded the click where it does not (older
@@ -37,6 +44,30 @@ export interface TouchPoint {
   clientY: number;
 }
 
+/** What a view reports about a click on one of its items. */
+export interface ClickMod {
+  ctrl: boolean;
+  shift: boolean;
+  /** The click was a finger's tap. */
+  touch?: boolean;
+  /** The click landed on the item's name. */
+  name?: boolean;
+}
+
+/**
+ * The one place a view turns a click into a `ClickMod`. `nameSelector` is the
+ * view's own name element (`.fe-list__name`, `.fe-grid__label`, …).
+ */
+export function clickMod(ev: MouseEvent, touch: boolean, nameSelector: string): ClickMod {
+  const target = ev.target as Element | null;
+  return {
+    ctrl: ev.ctrlKey || ev.metaKey,
+    shift: ev.shiftKey,
+    touch,
+    name: typeof target?.closest === 'function' && target.closest(nameSelector) !== null,
+  };
+}
+
 export function useRowTouch<T>(onLongPress: (item: T, at: TouchPoint) => void) {
   let timer: ReturnType<typeof setTimeout> | undefined;
   let target: T | null = null;

package/src/index.ts

@@ -55,6 +55,11 @@ export {
 } from './lib/destinationTree';
 export type { DestinationRow } from './lib/destinationTree';
 
+/* issue #27 — the one "how far along is this queued op" rule, shared by the
+ * explorer's operations center and a host's own tray (the admin app's). */
+export { opPercent } from './lib/opProgress';
+export type { OpProgressLike } from './lib/opProgress';
+
 /* tasi:m1 — "download the selection as one archive". Exported so a host that
  * draws its own selection bar gets the real two-step flow (authorized mint,
  * then a navigation that streams) instead of reaching for window.open per

package/src/lib/opProgress.ts

@@ -0,0 +1,43 @@
+/**
+ * opProgress — the one rule for "how far along is this queued operation".
+ *
+ * Both progress surfaces read it: the explorer's operations center
+ * (PendingOpsTray → OperationsCenter) and the admin app's bottom-right tray.
+ * Two copies of this rule are how one tray starts saying something the other
+ * does not (filex lesson #119).
+ *
+ * Issue #27: a queued op counts SOURCES, so moving one large file — or one
+ * folder of a thousand files — is "0 of 1" until the very end. Drawn as a
+ * percentage that is a bar frozen at 0% that then vanishes, which the reporter
+ * read as stuck. So:
+ *
+ *   - a running cross-storage transfer reports bytes (`bytes_done` /
+ *     `bytes_total`); when the total is known that is the percentage;
+ *   - bytes moving with no total yet, or a single source with nothing but a
+ *     source count, has NO honest percentage: `null`, and the surface shows
+ *     an indeterminate indicator instead of a fake 0%;
+ *   - several sources still report per source, as before.
+ */
+
+export interface OpProgressLike {
+  status: string;
+  progress_total: number;
+  progress_done: number;
+  bytes_total?: number;
+  bytes_done?: number;
+}
+
+function clampPercent(n: number): number {
+  return Math.max(0, Math.min(100, Math.round(n)));
+}
+
+/** 0–100, or `null` when there is no honest number to draw. */
+export function opPercent(op: OpProgressLike): number | null {
+  if (op.status === 'done') return 100;
+  const bytesTotal = op.bytes_total ?? 0;
+  const bytesDone = op.bytes_done ?? 0;
+  if (bytesTotal > 0) return clampPercent((bytesDone / bytesTotal) * 100);
+  if (bytesDone > 0) return null;
+  if (op.progress_total <= 1) return null;
+  return clampPercent((op.progress_done / op.progress_total) * 100);
+}