Fix: build is failing because of type issues in issueHistory store

tegonhq · Nov 25, 2024 · d85316a · d85316a
1 parent 65e35aa
commit d85316a
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 16 deletions.
diff --git a/apps/webapp/src/common/types/issue-relation.ts b/apps/webapp/src/common/types/issue-relation.ts
@@ -9,6 +9,20 @@ export enum IssueRelationEnum {
   SIMILAR = 'SIMILAR',
 }
 
+export const IssueRelationEnumType = {
+  BLOCKS: 'BLOCKS',
+  BLOCKED: 'BLOCKED',
+  RELATED: 'RELATED',
+  DUPLICATE: 'DUPLICATE',
+  DUPLICATE_OF: 'DUPLICATE_OF',
+  PARENT: 'PARENT',
+  SUB_ISSUE: 'SUB_ISSUE',
+  SIMILAR: 'SIMILAR',
+};
+
+export type IssueRelationEnumType =
+  (typeof IssueRelationEnumType)[keyof typeof IssueRelationEnumType];
+
 export interface IssueRelationType {
   id: string;
   createdAt: string;

diff --git a/apps/webapp/src/common/types/issue.ts b/apps/webapp/src/common/types/issue.ts
@@ -1,4 +1,4 @@
-import type { IssueRelationEnum } from './issue-relation';
+import { IssueRelationEnumType } from './issue-relation';
 
 export interface IssueSourceMetadataType {
   type: string;
@@ -43,7 +43,7 @@ export interface IssueHistoryType {
   createdAt: string;
   updatedAt: string;
   userId?: string;
-  issueId: string;
+  issueId?: string;
   addedLabelIds: string[];
   removedLabelIds: string[];
   fromPriority?: number;
@@ -58,9 +58,9 @@ export interface IssueHistoryType {
   toParentId?: string;
   relationChanges?: {
     isDeleted?: boolean;
-    issueId: string;
-    relatedIssueId: string;
-    type: IssueRelationEnum;
+    issueId?: string;
+    relatedIssueId?: string;
+    type?: IssueRelationEnumType;
   };
 }
 

diff --git a/...bapp/src/modules/issues/single-issue/left-side/activity/issue-activity/subscribe-view.tsx b/...bapp/src/modules/issues/single-issue/left-side/activity/issue-activity/subscribe-view.tsx
@@ -34,16 +34,14 @@ export function SubscribeView() {
   };
 
   return (
-    <div className="flex gap-2 items-center">
+    <div className="flex gap-2 shrink-0 items-center">
       <div>
-        <Button variant="ghost" onClick={toggleSubscribe}>
+        <Button variant="ghost" onClick={toggleSubscribe} className="mr-1">
           {subscribed ? 'Unsubscribe' : 'Subscribe'}
         </Button>
       </div>
       {issue.subscriberIds.length > 0 && (
-        <div className="flex">
-          <SubscribeDropdown value={issue.subscriberIds} />
-        </div>
+        <SubscribeDropdown value={issue.subscriberIds} />
       )}
     </div>
   );

diff --git a/apps/webapp/src/store/conversation-history/models.ts b/apps/webapp/src/store/conversation-history/models.ts
@@ -7,8 +7,8 @@ export const ConversationHistory = types.model({
   createdAt: types.string,
   updatedAt: types.string,
   message: types.string,
-  context: types.union(types.null, types.undefined, types.string),
-  thoughts: types.union(types.null, types.undefined, types.string),
+  context: types.union(types.null, types.string),
+  thoughts: types.union(types.null, types.string),
   userId: types.union(types.null, types.string),
   userType: types.enumeration(['Agent', 'User', 'System']),
   conversationId: types.string,

diff --git a/apps/webapp/src/store/issue-history/models.ts b/apps/webapp/src/store/issue-history/models.ts
@@ -7,9 +7,12 @@ export const RelationChangeModel = types.model({
     'RELATED',
     'DUPLICATE',
     'DUPLICATE_OF',
+    'SIMILAR',
+    'SUB_ISSUE',
+    'PARENT',
   ]),
-  relatedIssueId: types.string,
-  issueId: types.string,
+  relatedIssueId: types.union(types.string, types.null),
+  issueId: types.union(types.string, types.null),
   isDeleted: types.union(types.boolean, types.undefined),
 });
 
@@ -18,7 +21,7 @@ export const IssueHistory = types.model({
   createdAt: types.string,
   updatedAt: types.string,
   userId: types.union(types.string, types.null),
-  issueId: types.string,
+  issueId: types.union(types.null, types.undefined, types.string),
 
   addedLabelIds: types.array(types.string),
   removedLabelIds: types.array(types.string),

diff --git a/apps/webapp/src/store/issue-history/store.ts b/apps/webapp/src/store/issue-history/store.ts
@@ -61,7 +61,7 @@ export const IssueHistoryStore: IAnyStateTreeNode = types
     return { update, deleteById, load };
   })
   .views((self) => ({
-    getIssueHistories(issueId: string) {
+    getIssueHistories(issueId: string): IssueHistoryType[] {
       return issueId === self.issueId ? self.issueHistories : [];
     },
   }));