@fabriktor/fx 0.0.108 → 0.0.110

package/dist/src/chat/chat.d.ts

@@ -1,4 +1,4 @@
-import type { ChatOperator, UsersOperator, WSCloseHandler, WSConnection, WSErrorHandler, WSMessageHandler } from "@fabriktor/client";
+import { type ChatOperator, type UsersOperator, type WSCloseHandler, type WSConnection, type WSErrorHandler, type WSMessageHandler } from "@fabriktor/client";
 import { type Chat, type ChatRoom, type ChatRoomMember, type User } from "@fabriktor/schema";
 import { type RequiredSearchOptions, type SearchOptions, type SearchPage, type SearchPaginationOptions } from "../core/search.js";
 import { ChatSendQueue, type ChatSendQueueOptions } from "./send-queue.js";
@@ -26,7 +26,7 @@ type SearchChatsScope = {
     chat_room_id?: string;
     owner_id: string;
 };
-export type SearchChatsOptions = SearchChatsScope & RequiredSearchOptions;
+export type SearchChatsOptions = SearchChatsScope & RequiredSearchOptions & Pick<SearchOptions, "signal">;
 export type SearchChatsPage = SearchPage<Chat>;
 export type LatestChatsOptions = SearchPaginationOptions & {
     chat_room_id: string;

package/dist/src/chat/chat.js

@@ -3,7 +3,8 @@
 // Licensed under the Apache License, Version 2.0 (the "License"); you may
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-import { IDKey, } from "@fabriktor/schema";
+import { queryParam, queryParams, } from "@fabriktor/client";
+import { IDKey, OwnerIDKey, } from "@fabriktor/schema";
 import { errRequired, errResolveFailed, errValidation } from "../core/err.js";
 import { requiredOperationID } from "../core/id.js";
 import { normalizeSearchPage, normalizeSearchPerPage, normalizeSearchQuery, runSearch, } from "../core/search.js";
@@ -69,13 +70,14 @@ export class ChatFX {
         }
         return await runSearch({
             search: (searchOpts) => this.chat.searchManyChats(searchOpts),
-            query: {
+            query: queryParams({
                 chat_room_id: opts.chat_room_id,
-                owner_id: opts.owner_id,
-            },
+                [OwnerIDKey]: opts.owner_id,
+            }),
             q,
             page: opts.page,
             per_page: opts.per_page,
+            signal: opts.signal,
         });
     }
     newLatestChatsCursor(opts) {
@@ -89,9 +91,7 @@ export class ChatFX {
     async latestChats(opts) {
         const raw = await runSearch({
             search: (searchOpts) => this.chat.searchManyChats(searchOpts),
-            query: {
-                chat_room_id: opts.chat_room_id,
-            },
+            query: queryParam("chat_room_id", opts.chat_room_id),
             page: opts.page,
             per_page: opts.per_page,
         });
@@ -113,19 +113,16 @@ export class ChatFX {
     async searchChatRoomMembers(opts) {
         return await runSearch({
             search: (searchOpts) => this.chat.searchManyChatRoomMembers(searchOpts),
-            query: {
-                chat_room_id: opts.chat_room_id,
-            },
+            query: queryParam("chat_room_id", opts.chat_room_id),
             q: opts.q,
             page: opts.page,
             per_page: opts.per_page,
+            signal: opts.signal,
         });
     }
     async chatRoomMembers(opts) {
         const out = await this.chat.queryChatRoomMembers({
-            query: {
-                chat_room_id: opts.chat_room_id,
-            },
+            query: queryParam("chat_room_id", opts.chat_room_id),
         });
         return out.value ?? [];
     }
@@ -135,17 +132,13 @@ export class ChatFX {
             return [];
         }
         const out = await this.chat.queryChatRooms({
-            query: {
-                [IDKey]: ids,
-            },
+            query: queryParam(IDKey, ids),
         });
         return out.value ?? [];
     }
     async myChatRoomMembers(opts) {
         const out = await this.chat.queryChatRoomMembers({
-            query: {
-                owner_id: opts.owner_id,
-            },
+            query: queryParam(OwnerIDKey, opts.owner_id),
         });
         return out.value ?? [];
     }

package/dist/src/contacts/contacts.d.ts

@@ -1,4 +1,4 @@
-import type { ContactsOperator, UsersOperator } from "@fabriktor/client";
+import { type ContactsOperator, type UsersOperator } from "@fabriktor/client";
 import { Friend, Hired, Manager, Na, OldHire, type Contact, type ID, type OperationResult, type User } from "@fabriktor/schema";
 type ContactInsertOptions = Parameters<ContactsOperator["insertOneContact"]>[0];
 type ContactReplaceOptions = Parameters<ContactsOperator["replaceOneContact"]>[0];

package/dist/src/contacts/contacts.js

@@ -3,6 +3,7 @@
 // Licensed under the Apache License, Version 2.0 (the "License"); you may
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+import { queryParam, } from "@fabriktor/client";
 import { Friend, Hired, IDKey, Na, OldHire, UserTypeEmployee, UserTypeEmployer, } from "@fabriktor/schema";
 import { errRequired, errResolveFailed, errValidation } from "../core/err.js";
 import { requiredOperationID } from "../core/id.js";
@@ -250,7 +251,7 @@ export class ContactsFX {
         }
         const pages = await Promise.all(chunks(values, employmentUserBatchSize).map((chunk) => runSearch({
             per_page: chunk.length,
-            query: { [IDKey]: chunk },
+            query: queryParam(IDKey, chunk),
             search: (searchOpts) => this.users.searchManyUsers({
                 ...searchOpts,
                 uid,

package/dist/src/core/search-controller.d.ts

@@ -24,6 +24,7 @@ export declare class SearchController<T extends SearchResultWithID, Options exte
     replace(selection: Options): Promise<boolean>;
     loadMore(): Promise<boolean>;
     retry(): Promise<boolean>;
+    updateResult(value: T): void;
     private load;
     private emptyState;
     private publish;

package/dist/src/core/search-controller.js

@@ -41,6 +41,16 @@ export class SearchController {
     async retry() {
         return await this.load(this.next_page > normalizeSearchPage());
     }
+    // Update a displayed record without changing membership or backend position.
+    // Use query replacement when a mutation can affect either of those.
+    updateResult(value) {
+        if (!this.current.results.some((result) => result.id === value.id))
+            return;
+        this.publish({
+            ...this.current,
+            results: this.current.results.map((result) => result.id === value.id ? value : result),
+        });
+    }
     async load(append) {
         if (!this.selection || this.current.loading || this.current.loading_more) {
             return false;

package/dist/src/jobs/jobs.d.ts

@@ -26,21 +26,15 @@ export type ArchiveLocationOptions = {
     owner_id: string;
     location: Location;
 };
-export type SearchLocationsOptions = OwnerSearchOptions & {
-    is_archived?: boolean;
-};
-export type SearchAccessibleLocationsOptions = SearchOptions & {
-    is_archived?: boolean;
-};
-export type SearchJobProgramsOptions = OwnerSearchOptions & {
-    location_id?: string;
-};
-export type SearchJobsOptions = OwnerSearchOptions & {
-    location_id?: string;
-};
-export type SearchAccessibleJobsOptions = SearchOptions & {
-    location_id?: string;
-};
+type LocationSearchFields = Partial<Pick<Location, "is_archived">>;
+type JobSearchFields = Partial<Pick<Job, "location_id" | "status">>;
+export type SearchLocationsOptions = OwnerSearchOptions & LocationSearchFields;
+export type SearchAccessibleLocationsOptions = SearchOptions & LocationSearchFields;
+export type SearchJobProgramsOptions = OwnerSearchOptions & Partial<Pick<JobProgram, "finished">> & {
+    location_id?: JobProgram["job_location_id"];
+};
+export type SearchJobsOptions = OwnerSearchOptions & JobSearchFields;
+export type SearchAccessibleJobsOptions = SearchOptions & JobSearchFields;
 export type SearchLocationsPage = SearchPage<Location>;
 export type SearchJobProgramsPage = SearchPage<JobProgram>;
 export type SearchJobsPage = SearchPage<Job>;

package/dist/src/jobs/jobs.js

@@ -168,12 +168,13 @@ export class JobsFX {
         };
     }
     async searchJobPrograms(opts) {
-        const { location_id, ...searchOpts } = opts;
+        const { location_id, finished, ...searchOpts } = opts;
         return await runOwnerSearch({
             ...searchOpts,
-            query: location_id === undefined
-                ? undefined
-                : queryParams({ job_location_id: location_id }),
+            query: queryParams({
+                job_location_id: resolvedID(location_id),
+                finished,
+            }),
             search: (searchOpts) => this.jobs.searchManyJobPrograms(searchOpts),
         });
     }
@@ -219,20 +220,18 @@ export class JobsFX {
         return await this.findJob(id);
     }
     async searchJobs(opts) {
-        const { location_id, ...searchOpts } = opts;
-        const id = resolvedID(location_id);
+        const { location_id, status, ...searchOpts } = opts;
         return await runOwnerSearch({
             ...searchOpts,
-            query: id === undefined ? undefined : queryParams({ location_id: id }),
+            query: jobSearchQuery({ location_id, status }),
             search: (opts) => this.jobs.searchManyJobs(opts),
         });
     }
     async searchAccessibleJobs(opts = {}) {
-        const { location_id, ...searchOpts } = opts;
-        const id = resolvedID(location_id);
+        const { location_id, status, ...searchOpts } = opts;
         return await runSearch({
             ...searchOpts,
-            query: id === undefined ? undefined : queryParams({ location_id: id }),
+            query: jobSearchQuery({ location_id, status }),
             search: (opts) => this.jobs.searchMineJobs(opts),
         });
     }
@@ -440,6 +439,12 @@ export class JobsFX {
         return job;
     }
 }
+function jobSearchQuery(fields) {
+    return queryParams({
+        location_id: resolvedID(fields.location_id),
+        status: fields.status,
+    });
+}
 function jobMembershipInput(opts) {
     const id = requiredID(opts.job.id, "job", msgJobIDRequired);
     const location_id = locationID(opts.location, opts.job.location_id, "job", msgJobLocationMismatch);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/fx",
-  "version": "0.0.108",
+  "version": "0.0.110",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {
@@ -17,7 +17,7 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@fabriktor/client": "0.0.83",
+    "@fabriktor/client": "0.0.85",
     "@fabriktor/fx": "0.0.94",
     "@fabriktor/schema": "0.0.63"
   }