@mapcreator/api 0.0.0-co-edit.9 → 0.0.0-json-object.1

package/src/README.md

@@ -1,126 +1,126 @@
-### Used type system
-
-We use type declarations for both the data coming over the wire and the data used by the application. In general, these types differ only in the presence of additional fields in the data arriving over the network (like `created_at`), and used naming convention. Data over the network uses the so-called snake case.
-
-All in all, we can use TypeScript's native mechanisms to convert one type to another and fully define just one type:
-
-```typescript
-import type { CamelCasedProperties } from 'type-fest';
-
-type ApiType =
-  | ({
-      data: {
-        prop: unknown;
-      } & ApiCommonData;
-    } & Omit<ApiSuccess, 'data'>)
-  | ApiError;
-
-type AppType = CamelCasedProperties<Omit<Exclude<ApiType, ApiError>['data'], keyof ApiCommonData>>;
-```
-
-or in reverse order:
-
-```typescript
-import type { SnakeCasedProperties } from 'type-fest';
-
-type AppType = {
-  prop: unknown;
-};
-
-type ApiType =
-  | ({
-      data: SnakeCasedProperties<AppType> & ApiCommonData;
-    } & Omit<ApiSuccess, 'data'>)
-  | ApiError;
-```
-
-But the decision was made not to do this, since it may be more difficult for the developer to make the conversion in their head than to see it in front of their eyes.
-
-### Using a `request()`
-
-The function has the following signature:
-
-```typescript
-async function request<I extends ApiCommon, O extends Record<string, unknown> | string>(
-  path: string,
-  body?: XMLHttpRequestBodyInit | Record<string | number, unknown> | null,
-  extraHeaders?: Record<string, string> | null,
-  extraOptions?: ExtraOptions<I, O>,
-): Promise<O | O[]> { /* ... */ }
-```
-
-Let's take it step by step.
-
-`I extends ApiCommon` - represents the type of data we receive over the network.
-
-`O extends Record<string, unknown> | string` - represents the data type that will be used in the application.
-
-Ideally you should describe and convey both types. This will help to check the data types in the arguments passed.
-See current data types for an example.
-
-`path: string` - the path to the resource, must include the API version, but must not include the schema or authority.
-Example: `/v1/jobs/12345`
-
-`body?: XMLHttpRequestBodyInit | Record<string | number, unknown> | null` - any meaningful body type. In general,
-the presence of an JSON object is assumed (or the absence of one for methods that only request data), but you can
-also pass `Blob`, `FormData`, `URLSearchParams` or just `ArrayBuffer`. The required content type will be added to
-the headers automatically.
-
-`extraHeaders?: Record<string, string> | null` - the object with additional headers.
-
-`extraOptions?: ExtraOptions<I, O>` - where `ExtraOptions<I, O>` is defined like this:
-
-```typescript
-interface ExtraOptions<I extends ApiCommon, O extends Record<string, unknown> | string> {
-  method?: 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
-  revivers?: O extends Record<string, unknown> ? Revivers<I, O> : never;
-  sendNull?: boolean;
-  withMeta?: boolean;
-}
-```
-
-Most fields are self-explanatory.
-
-`sendNull` can be used if you really want to pass `null` as body content.
-
-`revivers` is used to specify an object that can modify the behavior of the internal handler of data coming over
-the network. Let's take a closer look at this moment.
-
-#### Revivers
-
-By default, the `request()` function does the following things with data coming over the network:
-
-- It removes `created_at`, `updated_at`, `deleted_at` fields from the output objects.
-- It preserves all the remaining fields but converts their names into camelCase.
-
-When passing an object with revivers you can a couple of things:
-
-- You can list the fields that you want **to exclude** from the result object. To do this, the field must be assigned an
-`undefined` value.
-- You can **add** new fields or **modify** the type of existing ones. To do this, you need to pass a function as a field
-value, which will receive the original object as input.
-
-Example:
-
-```typescript
-const jobRevivers: Revivers<ApiJob, Job> = {
-  user_id: undefined,
-  description: undefined,
-  share_token: undefined,
-  autosave_preview_path: undefined,
-  job_folder_id: undefined,
-
-  jobTypeId: () => 9,
-  createdAt: (data: ApiJobData) => data.created_at as string,
-  previewPath: (data: ApiJobData) => data.autosave_preview_path ?? undefined,
-};
-```
-
-`user_id`, `description`, `share_token`, `autosave_preview_path`, `job_folder_id` fields will be excluded from the
-result object.
-
-`jobTypeId` will be always **9**.
-
-`createdAt` will be returned (please note that that field is excluded by default)
-
-`previewPath` - some actions will be performed with the source data.
+### Used type system
+
+We use type declarations for both the data coming over the wire and the data used by the application. In general, these types differ only in the presence of additional fields in the data arriving over the network (like `created_at`), and used naming convention. Data over the network uses the so-called snake case.
+
+All in all, we can use TypeScript's native mechanisms to convert one type to another and fully define just one type:
+
+```typescript
+import type { CamelCasedProperties } from 'type-fest';
+
+type ApiType =
+  | ({
+      data: {
+        prop: unknown;
+      } & ApiCommonData;
+    } & Omit<ApiSuccess, 'data'>)
+  | ApiError;
+
+type AppType = CamelCasedProperties<Omit<Exclude<ApiType, ApiError>['data'], keyof ApiCommonData>>;
+```
+
+or in reverse order:
+
+```typescript
+import type { SnakeCasedProperties } from 'type-fest';
+
+type AppType = {
+  prop: unknown;
+};
+
+type ApiType =
+  | ({
+      data: SnakeCasedProperties<AppType> & ApiCommonData;
+    } & Omit<ApiSuccess, 'data'>)
+  | ApiError;
+```
+
+But the decision was made not to do this, since it may be more difficult for the developer to make the conversion in their head than to see it in front of their eyes.
+
+### Using a `request()`
+
+The function has the following signature:
+
+```typescript
+async function request<I extends ApiCommon, O extends Record<string, unknown> | string>(
+  path: string,
+  body?: XMLHttpRequestBodyInit | Record<string | number, unknown> | null,
+  extraHeaders?: Record<string, string> | null,
+  extraOptions?: ExtraOptions<I, O>,
+): Promise<O | O[]> { /* ... */ }
+```
+
+Let's take it step by step.
+
+`I extends ApiCommon` - represents the type of data we receive over the network.
+
+`O extends Record<string, unknown> | string` - represents the data type that will be used in the application.
+
+Ideally you should describe and convey both types. This will help to check the data types in the arguments passed.
+See current data types for an example.
+
+`path: string` - the path to the resource, must include the API version, but must not include the schema or authority.
+Example: `/v1/jobs/12345`
+
+`body?: XMLHttpRequestBodyInit | Record<string | number, unknown> | null` - any meaningful body type. In general,
+the presence of an JSON object is assumed (or the absence of one for methods that only request data), but you can
+also pass `Blob`, `FormData`, `URLSearchParams` or just `ArrayBuffer`. The required content type will be added to
+the headers automatically.
+
+`extraHeaders?: Record<string, string> | null` - the object with additional headers.
+
+`extraOptions?: ExtraOptions<I, O>` - where `ExtraOptions<I, O>` is defined like this:
+
+```typescript
+interface ExtraOptions<I extends ApiCommon, O extends Record<string, unknown> | string> {
+  method?: 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
+  revivers?: O extends Record<string, unknown> ? Revivers<I, O> : never;
+  sendNull?: boolean;
+  withMeta?: boolean;
+}
+```
+
+Most fields are self-explanatory.
+
+`sendNull` can be used if you really want to pass `null` as body content.
+
+`revivers` is used to specify an object that can modify the behavior of the internal handler of data coming over
+the network. Let's take a closer look at this moment.
+
+#### Revivers
+
+By default, the `request()` function does the following things with data coming over the network:
+
+- It removes `created_at`, `updated_at`, `deleted_at` fields from the output objects.
+- It preserves all the remaining fields but converts their names into camelCase.
+
+When passing an object with revivers you can a couple of things:
+
+- You can list the fields that you want **to exclude** from the result object. To do this, the field must be assigned an
+`undefined` value.
+- You can **add** new fields or **modify** the type of existing ones. To do this, you need to pass a function as a field
+value, which will receive the original object as input.
+
+Example:
+
+```typescript
+const jobRevivers: Revivers<ApiJob, Job> = {
+  user_id: undefined,
+  description: undefined,
+  share_token: undefined,
+  autosave_preview_path: undefined,
+  job_folder_id: undefined,
+
+  jobTypeId: () => 9,
+  createdAt: (data: ApiJobData) => data.created_at as string,
+  previewPath: (data: ApiJobData) => data.autosave_preview_path ?? undefined,
+};
+```
+
+`user_id`, `description`, `share_token`, `autosave_preview_path`, `job_folder_id` fields will be excluded from the
+result object.
+
+`jobTypeId` will be always **9**.
+
+`createdAt` will be returned (please note that that field is excluded by default)
+
+`previewPath` - some actions will be performed with the source data.

package/src/api/apiCommon.ts

@@ -9,20 +9,6 @@ import {
   request,
 } from '../utils.js';
 
-export type DashboardSortType =
-  | 'created'
-  | '-created'
-  | 'updated'
-  | '-updated'
-  | 'last_opened'
-  | '-last_opened'
-  | 'last_saved'
-  | '-last_saved'
-  | 'name'
-  | '-name';
-
-export type DashboardFilterType = 'all' | 'starred' | 'private';
-
 export interface JobSearchResult {
   pageCount: number;
   data: Job[];
@@ -30,18 +16,25 @@ export interface JobSearchResult {
 
 export async function listJobs(
   pathname: string,
-  search: string,
-  sort: DashboardSortType,
-  filter: DashboardFilterType,
+  title: string,
   page: number,
-  folderId: number | null = null,
+  searchOptions?: Record<string, unknown>,
 ): Promise<JobSearchResult> {
+  const defaultSearchOptions = {
+    sort: '-updated',
+    only_downloaded: false,
+  };
+
+  const search = { ...defaultSearchOptions, ...searchOptions };
+
   const query = getSearchParams({
-    search,
-    sort,
-    ...(filter === 'private' && { only_private: true }),
-    ...(filter === 'starred' && { only_starred: true }),
-    ...(folderId !== null && { folder_id: folderId }),
+    only_with_revisions: true,
+    search: {
+      job_type_id: ['9', '6'],
+      converted_job_id: '=:',
+      ...(title.length > 0 && { title: `~:${title}` }),
+    },
+    ...search,
   });
 
   const path = `${pathname}?${query}`;

package/src/api/job.ts

@@ -1,5 +1,5 @@
 import type { ApiJobShare, JobShare, JobShareVisibility } from './jobShare.js';
-import { type DashboardSortType, type JobSearchResult, listJobs } from './apiCommon.js';
+import { type JobSearchResult, listJobs } from './apiCommon.js';
 import {
   type ApiCommon,
   type ApiCommonData,
@@ -14,54 +14,40 @@ import {
 export type Job = {
   id: number;
   jobTypeId: number;
-  title: string;
-  autosavePreviewPath: string | null;
-  previewPath: string | undefined;
   userId: number;
-  userName: string | null;
-  orgId: number;
-  orgName: string;
-  jobOpenUserName: string | null;
+  title: string;
   jobFolderId: number | null;
   jobFolderName: string | null;
   star: boolean;
-  private: boolean;
-  convertedJobId: number | null;
-  lastOpened: string | null;
-  downloadedAt: string | null;
-  lastSavedAt: string;
-  latestRevision: number;
   createdAt: string;
-  updatedAt: string;
+  previewPath: string | undefined;
+  convertedJobId: number | null;
+
+  userEmail: string | undefined; // ?
+  orgName: string | undefined;  // ?
 };
 
 export type ApiJob = {
   data: {
     id: number;                 // The job id (sortable)
     job_type_id: number;        // The id of the job type (searchable)
+    user_id: number;            // The user id (searchable)
     title: string;              // The title of the job (searchable, sortable)
+    description: string | null; // The description of the job (searchable, sortable)
+    share_token: string | null; // The token used for sharing this job
     autosave_preview_path: string | null; //  The preview path of the Job
-    preview_path: string;
-    user_id: number;            // The user id (searchable)
-    user_name: string | null;
-    org_id: number;
-    org_name: string;
-    job_open_user_name: string | null;
     job_folder_id: number | null; // TODO: not present in API specification!
-    job_folder_name: string | null; // TODO: not present in API specification!
+    job_folder_name?: string | null; // TODO: not present in API specification!
     star: boolean;              // TODO: not present in API specification!
-    private: boolean;
-    converted_job_id: number | null;
-    last_opened: string | null;
-    downloaded_at: string | null;
-    last_saved_at: string;
-    latest_revision: number;
-  } & Omit<ApiCommonData, 'deleted_at'>;
+    converted_job_id?: number | null;
+  } & ApiCommonData;
 } & Omit<ApiSuccess, 'data'> | ApiError;
 
 export type ApiJobData = Flatten<Exclude<ApiJob, ApiError>['data']>;
 
 export const jobRevivers: Revivers<ApiJob, Job> = {
+  description: undefined,
+  share_token: undefined,
   autosave_preview_path: undefined,
 
   jobFolderName: (data: ApiJobData) => data.job_folder_name ?? null,
@@ -94,12 +80,6 @@ export async function deleteJob(jobId: number): Promise<Record<string, never>> {
   return request<ApiCommon, Record<string, never>>(path, null, null, { method: 'DELETE' });
 }
 
-export async function restoreJob(jobId: number): Promise<Record<string, never>> {
-  const path = `/v1/jobs/${jobId}`;
-
-  return request<ApiCommon, Record<string, never>>(path, null, null, { method: 'PUT' });
-}
-
 export async function updateJob(jobId: number, newTitle: string): Promise<Record<string, never>> {
   const path = `/v1/jobs/${jobId}`;
   const body = { title: newTitle };
@@ -121,13 +101,6 @@ export async function starJob(jobId: number, star: boolean): Promise<Record<stri
   return request<ApiCommon, Record<string, never>>(path, body, null, { method: 'PATCH' });
 }
 
-export async function privateJob(jobId: number, privateValue: boolean): Promise<Record<string, never>> {
-  const path = `/v1/jobs/${jobId}`;
-  const body = { private: privateValue };
-
-  return request<ApiCommon, Record<string, never>>(path, body, null, { method: 'PATCH' });
-}
-
 export async function resetConvertedJob(jobId: number): Promise<Record<string, never>> {
   const path = `/v1/jobs/${jobId}/reset-converted`;
 
@@ -158,51 +131,9 @@ export async function uploadJobPreview(
 }
 
 export async function listFeaturedJobs(
-  search: string,
-  sort: DashboardSortType,
+  title: string,
   page: number,
+  options?: Record<string, unknown>,
 ): Promise<JobSearchResult> {
-  return listJobs(`/v1/jobs/featured`, search, sort, 'all', page);
-}
-
-export type JobCoEditEvent = {
-  jobId: number;
-  userName: string;
-  status: 'open' | 'close';
-};
-
-export type JobTakeoverEvent = {
-  userId: number;
-  userName: string;
-  requestedAt: string;
-  status: 'pending' | 'approved' | 'denied' | 'cancelled';
-};
-
-export async function openJob(jobId: number): Promise<Record<string, never>> {
-  return request<ApiCommon, Record<string, never>>(`/v1/jobs/${jobId}/open`, null, null, { method: 'POST' });
-}
-
-export async function heartbeat(jobId: number): Promise<Record<string, never>> {
-  // TODO handle disconnections. Throw the right error so we can show a modal in the tool when the connection is down
-  return request<ApiCommon, Record<string, never>>(`/v1/jobs/${jobId}/heartbeat`, null, null, { method: 'POST' });
-}
-
-export async function requestTakeover(jobId: number): Promise<Record<string, never>> {
-  return request<ApiCommon, Record<string, never>>(`/v1/jobs/${jobId}/takeover/request`, null, null, { method: 'POST' });
-}
-
-export async function approveTakeover(jobId: number, userId: number): Promise<Record<string, never>> {
-  return request<ApiCommon, Record<string, never>>(`/v1/jobs/${jobId}/takeover/approve`, { user_id: userId }, null, { method: 'POST' });
-}
-
-export async function denyTakeover(jobId: number, userId: number): Promise<Record<string, never>> {
-  return request<ApiCommon, Record<string, never>>(`/v1/jobs/${jobId}/takeover/deny`, { user_id: userId }, null, { method: 'POST' });
-}
-
-export async function cancelTakeover(jobId: number): Promise<Record<string, never>> {
-  return request<ApiCommon, Record<string, never>>(`/v1/jobs/${jobId}/takeover/cancel`, null, null, { method: 'POST' });
-}
-
-export async function closeJob(jobId: number): Promise<Record<string, never>> {
-  return request<ApiCommon, Record<string, never>>(`/v1/jobs/${jobId}/close`, null, null, { method: 'POST' });
+  return listJobs(`/v1/jobs/featured`, title, page, options);
 }

package/src/api/jobRevision.ts

@@ -82,7 +82,7 @@ export async function createJobRevision(
   const body = {
     language_code: languageCode,
     mapstyle_set_id: mapstyleSetId,
-    object: JSON.stringify(jobObject),
+    object: jobObject,
     output,
     layers,
     ...skipValidation && { skip_validation: skipValidation },
@@ -354,3 +354,53 @@ export async function getJobRevisionOutputForBackend(
 
   return fetchOutput(jobId);
 }
+
+export async function startJobRevisionSSR(
+  jobId: number,
+  revision: number | typeof lastJobRevision = lastJobRevision,
+): Promise<string> {
+  const pathname = `/v1/jobs/${jobId}/revisions/${revision}/build/ssr`;
+  const path = `${pathname}?${deletedNoneParam}`;
+
+  return request<ApiCommon, string>(path, null, null, { method: 'POST' });
+}
+
+export async function getJobRevisionOutputForSSR(
+  id: number, // jobRevisionId
+  echo: Echo<'reverb'>,
+  signal?: AbortSignal,
+  onProgress?: (percent: number) => void,
+): Promise<string> {
+  signal?.throwIfAborted();
+
+  return new Promise((resolve, reject) => {
+    const channel = `ssr.${id}`;
+
+    const onAbort = (): void => {
+      echo.leave(channel);
+      reject(signal?.reason);
+    };
+
+    const cleanup = (): void => {
+      echo.leave(channel);
+      signal?.removeEventListener('abort', onAbort);
+    };
+
+    const handler = (event: { jobRevisionId: number; status: string; url?: string }): void => {
+      if (event.status === 'RUNNING') {
+        onProgress?.(0);
+      } else if (event.status === 'SUCCEEDED' && event.url) {
+        cleanup();
+        resolve(event.url);
+      } else if (event.status === 'FAILED' || event.status === 'SUCCEEDED' && !event.url) {
+        cleanup();
+        reject(
+          new APIError({ success: false, error: { type: 'API Error', message: event.status } }),
+        );
+      }
+    };
+
+    signal?.addEventListener('abort', onAbort, { once: true });
+    echo.private(channel).listen('.ServerSideRenderingEvent', handler);
+  });
+}

package/src/api/organisation.ts

@@ -1,5 +1,5 @@
 import type { ApiJobShareArray, JobShare } from './jobShare.js';
-import { type DashboardFilterType, type DashboardSortType, type JobSearchResult, listJobs } from './apiCommon.js';
+import { type JobSearchResult, listJobs } from './apiCommon.js';
 import {
   type ApiCommonData,
   type ApiError,
@@ -74,13 +74,13 @@ export async function getOrganisation(
 
 export async function listOrganisationJobs(
   organisationId: number | typeof myOrganisations,
-  search: string,
-  sort: DashboardSortType,
-  filter: DashboardFilterType,
+  title: string,
   page: number,
-  folderId: number | null
+  options?: Record<string, unknown>,
 ): Promise<JobSearchResult> {
-  return listJobs(`/v1/organisations/${organisationId}/jobs`, search, sort, filter, page, folderId);
+  const search = { ...options };
+
+  return listJobs(`/v1/organisations/${organisationId}/jobs`, title, page, search);
 }
 
 export async function listOrganisationShares(jobId: number): Promise<JobShare[]> {

package/src/api/resources.ts

@@ -48,32 +48,7 @@ export type CustomFeature =
   | 'hosted_svg_output'
   | 'hosted_png_output'
   | 'hosted_jpg_output'
-  | 'developer_menu'
-  | 'allow_editing_other_users_jobs';
-
-export type ApiJobFolder = {
-  id: number;
-  organisation_id: number;
-  name: string;
-};
-
-export type JobFolder = {
-  id: number;
-  organisationId: number;
-  name: string;
-};
-
-export type ApiAccessibleOrganisation = {
-  id: number;
-  name: string;
-  job_folders: ApiJobFolder[];
-};
-
-export type AccessibleOrganisation = {
-  id: number;
-  name: string;
-  jobFolders: JobFolder[];
-};
+  | 'developer_menu';
 
 export interface Resources {
   organisation: Organisation;
@@ -90,7 +65,6 @@ export interface Resources {
   layers: Layer[];
   fonts: Font[];
   fontFamilies: FontFamily[];
-  accessibleOrganisations: AccessibleOrganisation[];
 }
 
 type ApiResources = {
@@ -113,7 +87,6 @@ type ApiResources = {
     layers: ApiLayerData[];
     fonts: ApiFontData[];
     font_families: ApiFontFamilyData[];
-    accessible_organisations: ApiAccessibleOrganisation[];
   } & ApiCommonData;
 } & Omit<ApiSuccess, 'data'> | ApiError;
 
@@ -158,10 +131,6 @@ export async function loadResources(): Promise<Resources> {
     svgSets: (raw.svgSets?.map(processData, getContext(svgSetRevivers)) ?? []) as SvgSet[],
     fonts: (raw.fonts?.map(processData, getContext(fontRevivers)) ?? []) as Font[],
     fontFamilies: (raw.fontFamilies?.map(processData, getContext(fontFamilyRevivers)) ?? []) as FontFamily[],
-    // TODO revivers and such
-    accessibleOrganisations: (raw.accessibleOrganisations?.map(
-      processData, getContext({})
-    ) ?? []) as AccessibleOrganisation[],
   };
 }