diff --git a/apps/webapp/src/common/types/action.ts b/apps/webapp/src/common/types/action.ts index 27612869..c7daa86e 100644 --- a/apps/webapp/src/common/types/action.ts +++ b/apps/webapp/src/common/types/action.ts @@ -1,4 +1,4 @@ -import type { ActionStatus } from '@tegonhq/types'; +import type { ActionStatusEnum } from '@tegonhq/types'; export interface ActionType { id: string; @@ -6,7 +6,7 @@ export interface ActionType { updatedAt: string; config: string; data?: string; - status: ActionStatus; + status: ActionStatusEnum; version: string; slug: string; name: string; diff --git a/apps/webapp/src/modules/views/views-list.tsx b/apps/webapp/src/modules/views/views-list.tsx index 58775cc1..d30d1afc 100644 --- a/apps/webapp/src/modules/views/views-list.tsx +++ b/apps/webapp/src/modules/views/views-list.tsx @@ -49,7 +49,7 @@ export function ViewItem({ view }: ViewItemProps) { }} > {view.isBookmarked ? ( - + ) : ( )} diff --git a/apps/webapp/src/services/integration-definition/get-integration-definition.tsx b/apps/webapp/src/services/integration-definition/get-integration-definition.tsx index 4ecbeb7b..5f33c379 100644 --- a/apps/webapp/src/services/integration-definition/get-integration-definition.tsx +++ b/apps/webapp/src/services/integration-definition/get-integration-definition.tsx @@ -1,8 +1,8 @@ +import type { IntegrationDefinition } from '@tegonhq/types'; + import { getIntegrationDefinition } from '@tegonhq/services'; import { type UseQueryResult, useQuery } from 'react-query'; -import type { IntegrationDefinition } from 'common/types'; - import { type XHRErrorResponse } from 'services/utils'; /** diff --git a/apps/webapp/src/services/integration-definition/get-integration-definitions.tsx b/apps/webapp/src/services/integration-definition/get-integration-definitions.tsx index 0718c25a..1fc66595 100644 --- a/apps/webapp/src/services/integration-definition/get-integration-definitions.tsx +++ b/apps/webapp/src/services/integration-definition/get-integration-definitions.tsx @@ -1,8 +1,8 @@ +import type { IntegrationDefinition } from '@tegonhq/types'; + import { getIntegrationDefinitions } from '@tegonhq/services'; import { type UseQueryResult, useQuery } from 'react-query'; -import type { IntegrationDefinition } from 'common/types'; - import { type XHRErrorResponse } from 'services/utils'; /** diff --git a/apps/webapp/src/services/oauth/update-integration-account.ts b/apps/webapp/src/services/oauth/update-integration-account.ts index 0a692808..57ba2bf1 100644 --- a/apps/webapp/src/services/oauth/update-integration-account.ts +++ b/apps/webapp/src/services/oauth/update-integration-account.ts @@ -1,11 +1,10 @@ import { useMutation } from 'react-query'; -import type { IntegrationAccountType, Settings } from 'common/types'; +import type { IntegrationAccountType } from 'common/types'; import { ajaxPost } from 'services/utils'; export interface UpdateIntegrationAccountParams { - settings: Settings; integrationAccountId: string; } diff --git a/apps/webapp/src/store/integration-accounts/save-data.ts b/apps/webapp/src/store/integration-accounts/save-data.ts index b6d7b513..faf255ef 100644 --- a/apps/webapp/src/store/integration-accounts/save-data.ts +++ b/apps/webapp/src/store/integration-accounts/save-data.ts @@ -19,6 +19,7 @@ export async function saveIntegrationAccountData( integratedById: record.data.integratedById, integrationDefinitionId: record.data.integrationDefinitionId, workspaceId: record.data.workspaceId, + personal: record.data.personal, }; switch (record.action) { diff --git a/docker-compose.yaml b/docker-compose.yaml index 1e10d7b7..d6ccf217 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,17 +1,17 @@ version: "3" services: - webapp: - container_name: webapp - build: - context: . - dockerfile: ./apps/webapp/Dockerfile - image: tegonhq/tegon-webapp:0.2.0-alpha - restart: always - ports: - - 3000:3000 - networks: - - tegon + # webapp: + # container_name: webapp + # build: + # context: . + # dockerfile: ./apps/webapp/Dockerfile + # image: tegonhq/tegon-webapp:0.2.0-alpha + # restart: always + # ports: + # - 3000:3000 + # networks: + # - tegon server: container_name: server diff --git a/packages/ui/package.json b/packages/ui/package.json index 49312210..036396ba 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -5,6 +5,7 @@ "scripts": { "ui:add": "pnpm dlx shadcn-ui@latest add", "generate": "tailwindcss -i ./src/global.css -o ./dist/index.css --watch", + "build": "tailwindcss -i ./src/global.css -o ./dist/index.css", "lint": "eslint . --fix" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ffae54da..a6321913 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -381,7 +381,7 @@ importers: version: 3.20.0(react@18.3.1) ai: specifier: ^3.2.37 - version: 3.2.37(openai@4.52.7(encoding@0.1.13))(react@18.3.1)(sswr@2.1.0(svelte@4.2.18))(svelte@4.2.18)(vue@3.4.34(typescript@5.5.3))(zod@3.23.8) + version: 3.2.37(openai@4.52.7)(react@18.3.1)(sswr@2.1.0(svelte@4.2.18))(svelte@4.2.18)(vue@3.4.34(typescript@5.5.3))(zod@3.23.8) class-variance-authority: specifier: ^0.7.0 version: 0.7.0 @@ -884,7 +884,7 @@ importers: version: 2.5.4(@tiptap/core@2.5.4(@tiptap/pm@2.5.4))(@tiptap/pm@2.5.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) ai: specifier: ^3.2.37 - version: 3.2.37(openai@4.52.7(encoding@0.1.13))(react@18.3.1)(sswr@2.1.0(svelte@4.2.18))(svelte@4.2.18)(vue@3.4.34(typescript@5.5.3))(zod@3.23.8) + version: 3.2.37(openai@4.52.7)(react@18.3.1)(sswr@2.1.0(svelte@4.2.18))(svelte@4.2.18)(vue@3.4.34(typescript@5.5.3))(zod@3.23.8) class-variance-authority: specifier: ^0.7.0 version: 0.7.0 @@ -15999,7 +15999,7 @@ snapshots: - solid-js - vue - ai@3.2.37(openai@4.52.7(encoding@0.1.13))(react@18.3.1)(sswr@2.1.0(svelte@4.2.18))(svelte@4.2.18)(vue@3.4.34(typescript@5.5.3))(zod@3.23.8): + ai@3.2.37(openai@4.52.7)(react@18.3.1)(sswr@2.1.0(svelte@4.2.18))(svelte@4.2.18)(vue@3.4.34(typescript@5.5.3))(zod@3.23.8): dependencies: '@ai-sdk/provider': 0.0.14 '@ai-sdk/provider-utils': 1.0.5(zod@3.23.8) diff --git a/turbo.json b/turbo.json index a1a5fc1b..c8712170 100644 --- a/turbo.json +++ b/turbo.json @@ -81,27 +81,27 @@ "ui": "tui", "tasks": { "start-prod": { - "dependsOn": ["db:init-resources"], + "dependsOn": [ "db:init-resources" ], "cache": false }, "generate": { "cache": false }, "dev": { - "dependsOn": ["db:init-resources", "generate"], + "dependsOn": [ "db:init-resources", "^generate" ], "cache": false }, "build": { - "dependsOn": ["db:init-resources", "generate"], - "outputs": ["dist/**", ".next/**"] + "dependsOn": [ "^build" ], + "outputs": [ "dist/**", ".next/**" ] }, - "lint": {}, + "lint": { }, "create-resources": { "interactive": true, "cache": false }, "deploy-trigger-tasks": { - "env": ["TRIGGER_ACCESS_TOKEN", "TRIGGER_API_URL"], + "env": [ "TRIGGER_ACCESS_TOKEN", "TRIGGER_API_URL" ], "cache": false }, "trigger-dev": {