Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
Caleb-T-Owens committed Nov 4, 2024
1 parent 2bf1528 commit 8d0e589
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 17 deletions.
147 changes: 147 additions & 0 deletions packages/shared/src/lib/cloud/patches/events.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
import { derived, type Readable, type Writable } from 'svelte/store';

Check failure on line 1 in packages/shared/src/lib/cloud/patches/events.ts

View workflow job for this annotation

GitHub Actions / lint-node

'Writable' is defined but never used. Allowed unused vars must match /^_/u
import { CloudPatch, type ApiPatch } from '$lib/cloud/types';

Check failure on line 2 in packages/shared/src/lib/cloud/patches/events.ts

View workflow job for this annotation

GitHub Actions / lint-node

`$lib/cloud/types` import should occur before import of `svelte/store`
import type { HttpClient } from '$lib/httpClient';

interface ApiChatUser {
id: number;
login: string;
name: string;
email: string;
avatar_url?: string;
}

class CloudChatUser {
id: number;
login: string;
name: string;
email: string;
avatarUrl?: string;

constructor(apiChatUser: ApiChatUser) {
this.id = apiChatUser.id;
this.login = apiChatUser.login;
this.name = apiChatUser.name;
this.email = apiChatUser.email;
this.avatarUrl = apiChatUser.avatar_url;
}
}

interface DiffPatchEntry {
type: 'context' | 'added' | 'removed';
left?: number;
right?: number;
line: string;
}

interface ApiChatMessage {
uuid: string;
user: ApiChatUser;
outdated: boolean;
issue: boolean;
resolved: boolean;
thread_id?: string;
comment: unknown;

// data needed if commenting on part of a patch
diff_sha?: string;
range?: string;
diff_patch_array?: DiffPatchEntry[];

created_at: string;
updated_at: string;
}

class CloudChatMessage {
uuid: string;
user: CloudChatUser;
outdated: boolean;
issue: boolean;
resolved: boolean;
threadId?: string;
comment: unknown;

// data needed if commenting on part of a patch
diffSha?: string;
range?: string;
diffPatchArray?: DiffPatchEntry[];

createdAt: Date;
updatedAt: Date;

constructor(apiChatMessage: ApiChatMessage) {
this.uuid = apiChatMessage.uuid;
this.user = new CloudChatUser(apiChatMessage.user);
this.outdated = apiChatMessage.outdated;
this.issue = apiChatMessage.issue;
this.resolved = apiChatMessage.resolved;
this.threadId = apiChatMessage.thread_id;
this.comment = apiChatMessage.comment;
this.diffSha = apiChatMessage.diff_sha;
this.range = apiChatMessage.range;
this.diffPatchArray = apiChatMessage.diff_patch_array;
this.createdAt = new Date(apiChatMessage.created_at);
this.updatedAt = new Date(apiChatMessage.updated_at);
}
}

type EventableTypes = 'chat' | 'issue_status' | 'patch_version' | 'patch_status';

interface ApiPatchEvent<T extends EventableTypes = EventableTypes> {
uuid: string;
user: ApiChatUser;
event_type: T;
eventable: T extends 'chat' | 'issue_status' ? ApiChatMessage : ApiPatch;
}

class CloudPatchEvent<T extends EventableTypes> {

Check failure on line 96 in packages/shared/src/lib/cloud/patches/events.ts

View workflow job for this annotation

GitHub Actions / lint-node

'CloudPatchEvent' is defined but never used. Allowed unused vars must match /^_/u
uuid: string;
user: CloudChatUser;
eventType: T;
eventable: T extends 'chat' | 'issue_status' ? CloudChatMessage : CloudPatch;

constructor(apiPatchEvent: ApiPatchEvent<T>) {
this.uuid = apiPatchEvent.uuid;
this.user = new CloudChatUser(apiPatchEvent.user);
this.eventType = apiPatchEvent.event_type;
if (this.eventType === 'chat' || this.eventType === 'issue_status') {
// @ts-expect-error For some reason the conditional on T does not infer correctly
this.eventable = new CloudChatMessage(apiPatchEvent.eventable as ApiChatMessage);
} else {
// @ts-expect-error For some reason the conditional on T does not infer correctly
this.eventable = new CloudPatch(apiPatchEvent.eventable as ApiPatch);
}
}
}

export class ApiPatchEventsService {
readonly canGetEvents: Readable<boolean>;
readonly canSubscribeToEvents: Readable<boolean>;
readonly canCreateEvents: Readable<boolean>;

constructor(
private readonly httpClient: HttpClient,
readonly token: Readable<string | undefined>
) {
this.canGetEvents = httpClient.authenticationAvailable;
this.canSubscribeToEvents = derived(token, (token) => !!token);
this.canCreateEvents = httpClient.authenticationAvailable;
}

async getEvents(repositoryId: string, changeId: string): Promise<ApiPatchEvent[] | undefined> {
try {
return await this.httpClient.get<ApiPatchEvent[]>(`${repositoryId}/patch/${changeId}`);
} catch (e: unknown) {
// If the internet is down, silently fail
if (e instanceof TypeError) {
return undefined;
} else {
throw e;
}
}
}
}

export class CloudPatchEventsService {
// private readonly apiPatchEvents: Writable<Set<ApiPatchEvent>>;
// readonly patchEvents: Readable<CloudPatchEvent[]>;
}
21 changes: 6 additions & 15 deletions packages/shared/src/lib/cloud/patches/sections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,7 @@ export class PatchSectionsService {
* This means that it will move the section towards the index 0 of the array
*/
moveSectionUp(identifier: string) {
if (!get(this.canMoveSection)) return;

const patch = get(this.cloudPatchService.patch).value;
if (!patch) return;

const identifiers = patch.sections.map((section) => section.identifier);

const sectionIndex = identifiers.findIndex(
(listedIdentifier) => listedIdentifier === identifier
);

swap(identifiers, sectionIndex, sectionIndex - 1);

this.cloudPatchService.update({ sectionOrder: identifiers });
this.moveSection(identifier, -1);
}

/**
Expand All @@ -36,6 +23,10 @@ export class PatchSectionsService {
* This means that it will move the section away from the index 0 of the array
*/
moveSectionDown(identifier: string) {
this.moveSection(identifier, 1);
}

private moveSection(identifier: string, offset: number) {
if (!get(this.canMoveSection)) return;

const patch = get(this.cloudPatchService.patch).value;
Expand All @@ -47,7 +38,7 @@ export class PatchSectionsService {
(listedIdentifier) => listedIdentifier === identifier
);

swap(identifiers, sectionIndex, sectionIndex + 1);
swap(identifiers, sectionIndex, sectionIndex + offset);

this.cloudPatchService.update({ sectionOrder: identifiers });
}
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/src/lib/httpClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ export class HttpClient {
readonly authenticationAvailable: Readable<boolean>;

constructor(
public fetch = window.fetch,
public readonly fetch = window.fetch,
publicApiBaseUrl: string,
private token: Readable<string | undefined>
private readonly token: Readable<string | undefined>
) {
this.apiUrl = new URL('/api/', publicApiBaseUrl);

Expand Down

0 comments on commit 8d0e589

Please sign in to comment.