@fabriktor/fx 0.0.109 → 0.0.110

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.109",
+  "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.84",
+    "@fabriktor/client": "0.0.85",
     "@fabriktor/fx": "0.0.94",
     "@fabriktor/schema": "0.0.63"
   }