Merge branch 'main' of https://github.com/mit-27/Panora into ui-enhan…

…cement
panoratech · Jun 11, 2024 · e8c6758 · e8c6758
2 parents 0130c73 + e9d6ea2
commit e8c6758
Show file tree

Hide file tree

Showing 153 changed files with 3,269 additions and 1,369 deletions.
diff --git a/.env.example b/.env.example
@@ -3,7 +3,7 @@
 # ================================================
 ENV=dev
 DISTRIBUTION=selfhosted # selfhosted or managed
-OAUTH_REDIRECT_BASE=http://localhost:3000
+PANORA_BASE_API_URL=http://localhost:3000
 JWT_SECRET=secret_jwt
 ENCRYPT_CRYPTO_SECRET_KEY="0123456789abcdef0123456789abcdef"
 #Managed only
@@ -16,6 +16,10 @@ REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_USER=default
 REDIS_PASS=A3vniod98Zbuvn9u5
+
+#REDIS_TLS=
+
+
 # ================================================
 
 # ================================================
@@ -64,7 +68,8 @@ GORGIAS_TICKETING_CLOUD_CLIENT_SECRET=
 GORGIAS_TICKETING_CLOUD_SUBDOMAIN=
 FRONT_TICKETING_CLOUD_CLIENT_ID=
 FRONT_TICKETING_CLOUD_CLIENT_SECRET=
-
+GITLAB_TICKETING_CLOUD_CLIENT_ID=
+GITLAB_TICKETING_CLOUD_CLIENT_SECRET=
 # ================================================
 # Webapp settings
 # Must be set in the perspective of the end user browser

diff --git a/.github/workflows/docker.check-build.backend.selfhosted.yml b/.github/workflows/docker.check-build.backend.selfhosted.yml
@@ -27,7 +27,7 @@ jobs:
           push: false
           tags: panoradotdev/backend-api:selfhosted
           build-args: |
-            OAUTH_REDIRECT_BASE=${{ env.OAUTH_REDIRECT_BASE }}
+            PANORA_BASE_API_URL=${{ env.PANORA_BASE_API_URL }}
             DISTRIBUTION=${{ env.DISTRIBUTION }}
             ENV=${{ ENV }}
             DATABASE_URL=postgresql://${{env.POSTGRES_USER}}:${{secrets.POSTGRES_PASSWORD}}@${{env.POSTGRES_HOST}}:5432/${{env.POSTGRES_DB}}?ssl=false

diff --git a/.github/workflows/docker.export.backend.selfhosted.yml b/.github/workflows/docker.export.backend.selfhosted.yml
@@ -33,7 +33,7 @@ jobs:
           push: true
           tags: panoradotdev/backend-api:selfhosted
           build-args: |
-            OAUTH_REDIRECT_BASE=${{ env.OAUTH_REDIRECT_BASE }}
+            PANORA_BASE_API_URL=${{ env.PANORA_BASE_API_URL }}
             DISTRIBUTION=${{ env.DISTRIBUTION }}
             ENV=${{ ENV }}
             DATABASE_URL=postgresql://${{env.POSTGRES_USER}}:${{secrets.POSTGRES_PASSWORD}}@${{env.POSTGRES_HOST}}:5432/${{env.POSTGRES_DB}}?ssl=false

diff --git a/.github/workflows/porter_stack_panora-backend.yml b/.github/workflows/porter_stack_panora-backend.yml
diff --git a/apps/client-ts/Dockerfile b/apps/client-ts/Dockerfile
@@ -13,7 +13,7 @@ ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
 
 WORKDIR /app
-RUN pnpm add -g turbo
+RUN pnpm add -g turbo@1.13.4
 COPY . .
 RUN turbo prune client-ts --docker
 

diff --git a/apps/client-ts/Dockerfile.dev b/apps/client-ts/Dockerfile.dev
@@ -21,7 +21,7 @@ ENV VITE_STYTCH_TOKEN="$VITE_STYTCH_TOKEN"
 RUN corepack enable
 
 WORKDIR /app
-RUN pnpm add -g turbo
+RUN pnpm add -g turbo@1.13.4
 
 # Start the Webapp
 CMD cd apps/client-ts && pnpm install && pnpm run dev
diff --git a/apps/client-ts/src/components/Configuration/Catalog/CatalogWidget.tsx b/apps/client-ts/src/components/Configuration/Catalog/CatalogWidget.tsx
@@ -32,7 +32,7 @@ export function CatalogWidget() {
     useEffect(() => {
       if (data) {
           const filteredData = Object.entries(data).reduce((acc, [key, value]) => {
-              if (key !== 'id_project' && key !== 'id_project_connector') {
+              if (key !== 'id_connector_set') {
                   acc[key] = Boolean(value);
               }
               return acc;