π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
fix: github setup workflow
sriram veeraghanta0587c50cedbd
diff --git a/admin/app/layout.tsx b/admin/app/layout.tsxindex d2df31d59f..e2879a565f 100644--- a/admin/app/layout.tsx+++ b/admin/app/layout.tsx@@ -1,15 +1,17 @@import { ReactNode } from "react";import { Metadata } from "next";// components-import { InstanceFailureView, InstanceNotReady } from "@/components/instance";+import { InstanceFailureView, InstanceSetupForm } from "@/components/instance";// helpersimport { ASSET_PREFIX } from "@/helpers/common.helper";+// layout+import { DefaultLayout } from "@/layouts/default-layout";// libimport { AppProvider } from "@/lib/app-providers";// stylesimport "./globals.css";// services-import { InstanceService } from "@/services";+import { InstanceService } from "@/services/instance.service";const instanceService = new InstanceService();@@ -45,9 +47,23 @@ export default async function RootLayout({ children }: { children: ReactNode })<body className={`antialiased`}><AppProvider initialState={{ instance: instanceDetails }}>{instanceDetails ? (- <>{instanceDetails?.instance?.is_setup_done ? <>{children}</> : <InstanceNotReady />}</>+ <>+ {instanceDetails?.instance?.is_setup_done ? (+ <>{children}</>+ ) : (+ <DefaultLayout>+ <div className="relative w-screen min-h-screen overflow-y-auto px-5 py-10 mx-auto flex justify-center items-center">+ <InstanceSetupForm />+ </div>+ </DefaultLayout>+ )}+ </>) : (- <InstanceFailureView />+ <DefaultLayout>+ <div className="relative w-screen min-h-[500px] overflow-y-auto px-5 mx-auto flex justify-center items-center">+ <InstanceFailureView />+ </div>+ </DefaultLayout>)}</AppProvider></body>diff --git a/admin/app/setup/components/index.ts b/admin/app/setup/components/index.tsdeleted file mode 100644index 558353b2ea..0000000000--- a/admin/app/setup/components/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./sign-up-form";diff --git a/admin/app/setup/layout.tsx b/admin/app/setup/layout.tsxindex ba889b7ae5..61038f97f4 100644--- a/admin/app/setup/layout.tsx+++ b/admin/app/setup/layout.tsx@@ -1,23 +1,14 @@"use client";import { ReactNode } from "react";-// helpers-import { EAuthenticationPageType, EInstancePageType } from "@/helpers";-// lib-import { AuthWrapper, InstanceWrapper } from "@/lib/wrappers";-+// layouts+import { DefaultLayout } from "@/layouts/default-layout";interface SetupLayoutProps {children: ReactNode;params: any;}export default function SetupLayout(props: SetupLayoutProps) {- const { children, params } = props;- const { error_code } = params;- console.log("error_code", error_code);- return (- <InstanceWrapper pageType={EInstancePageType.PRE_SETUP}>- <AuthWrapper authType={EAuthenticationPageType.NOT_AUTHENTICATED}>{children}</AuthWrapper>- </InstanceWrapper>- );+ const { children } = props;+ return <DefaultLayout>{children}</DefaultLayout>;}diff --git a/admin/app/setup/page.tsx b/admin/app/setup/page.tsxindex 1ef22b1f28..06174f7922 100644--- a/admin/app/setup/page.tsx+++ b/admin/app/setup/page.tsx@@ -1,19 +1,11 @@import { Metadata } from "next";-// layouts-import { DefaultLayout } from "@/layouts/default-layout";// components-import { InstanceSignUpForm } from "./components";+import { InstanceSetupForm } from "@/components/instance";export const metadata: Metadata = {title: "Setup - God Mode",};export default function SetupPage() {- return (- <>- <DefaultLayout>- <InstanceSignUpForm />- </DefaultLayout>- </>- );+ return <InstanceSetupForm />;}diff --git a/admin/components/admin-sidebar/sidebar-dropdown.tsx b/admin/components/admin-sidebar/sidebar-dropdown.tsxindex f7de3f277d..84583e24b3 100644--- a/admin/components/admin-sidebar/sidebar-dropdown.tsx+++ b/admin/components/admin-sidebar/sidebar-dropdown.tsx@@ -11,7 +11,7 @@ import { API_BASE_URL, cn } from "@/helpers/common.helper";import { useTheme, useUser } from "@/hooks/store";// helpers// services-import { AuthService } from "@/services";+import { AuthService } from "@/services/auth.service";// service initializationconst authService = new AuthService();diff --git a/admin/components/instance/index.ts b/admin/components/instance/index.tsindex 1f52843a04..56d1933f41 100644--- a/admin/components/instance/index.ts+++ b/admin/components/instance/index.ts@@ -1,2 +1,3 @@export * from "./instance-not-ready";export * from "./instance-failure-view";+export * from "./setup-form";diff --git a/admin/app/setup/components/sign-up-form.tsx b/admin/components/instance/setup-form.tsxsimilarity index 98%rename from admin/app/setup/components/sign-up-form.tsxrename to admin/components/instance/setup-form.tsxindex 1a117620d1..c3dfb5dcba 100644--- a/admin/app/setup/components/sign-up-form.tsx+++ b/admin/components/instance/setup-form.tsx@@ -52,7 +52,7 @@ const defaultFromData: TFormData = {is_telemetry_enabled: true,};-export const InstanceSignUpForm: FC = (props) => {+export const InstanceSetupForm: FC = (props) => {const {} = props;// search paramsconst searchParams = useSearchParams();@@ -122,7 +122,7 @@ export const InstanceSignUpForm: FC = (props) => {);return (- <div className="relative w-full h-full overflow-hidden container mx-auto max-w-lg px-10 lg:max-w-md lg:px-5 flex flex-col justify-center items-center">+ <div className="max-w-lg px-10 lg:max-w-md lg:px-5"><div className="relative flex flex-col space-y-6"><div className="text-center space-y-1"><h3 className="flex gap-4 justify-center text-3xl font-bold text-onboarding-text-100">diff --git a/admin/services/index.ts b/admin/services/index.tsdeleted file mode 100644index 57313a87fb..0000000000--- a/admin/services/index.ts+++ /dev/null@@ -1,3 +0,0 @@-export * from "./auth.service";-export * from "./instance.service";-export * from "./user.service";diff --git a/admin/services/instance.service.ts b/admin/services/instance.service.tsindex e995ee821d..13431a834f 100644--- a/admin/services/instance.service.ts+++ b/admin/services/instance.service.ts@@ -13,8 +13,7 @@ export class InstanceService extends APIService {return this.get<IInstance>("/api/instances/").then((response) => response.data).catch((error) => {- console.log("error", error);- throw error;+ throw error?.response?.data;});}diff --git a/admin/store/user.store.ts b/admin/store/user.store.tsindex 271c6be348..60638f0cd6 100644--- a/admin/store/user.store.ts+++ b/admin/store/user.store.ts@@ -3,7 +3,7 @@ import { IUser } from "@plane/types";// helpersimport { EUserStatus, TUserStatus } from "@/helpers";// services-import { AuthService } from "@/services";+import { AuthService } from "@/services/auth.service";import { UserService } from "@/services/user.service";// root storeimport { RootStore } from "@/store/root.store";diff --git a/apiserver/plane/license/utils/encryption.py b/apiserver/plane/license/utils/encryption.pyindex 11bd9000e4..6781605dd3 100644--- a/apiserver/plane/license/utils/encryption.py+++ b/apiserver/plane/license/utils/encryption.py@@ -3,6 +3,8 @@ import hashlibfrom django.conf import settingsfrom cryptography.fernet import Fernet+from plane.utils.exception_logger import log_exception+def derive_key(secret_key):# Use a key derivation function to get a suitable encryption key@@ -12,21 +14,29 @@ def derive_key(secret_key):# Encrypt datadef encrypt_data(data):- if data:- cipher_suite = Fernet(derive_key(settings.SECRET_KEY))- encrypted_data = cipher_suite.encrypt(data.encode())- return encrypted_data.decode() # Convert bytes to string- else:+ try:+ if data:+ cipher_suite = Fernet(derive_key(settings.SECRET_KEY))+ encrypted_data = cipher_suite.encrypt(data.encode())+ return encrypted_data.decode() # Convert bytes to string+ else:+ return ""+ except Exception as e:+ log_exception(e)return ""# Decrypt datadef decrypt_data(encrypted_data):- if encrypted_data:- cipher_suite = Fernet(derive_key(settings.SECRET_KEY))- decrypted_data = cipher_suite.decrypt(- encrypted_data.encode()- ) # Convert string back to bytes- return decrypted_data.decode()- else:+ try:+ if encrypted_data:+ cipher_suite = Fernet(derive_key(settings.SECRET_KEY))+ decrypted_data = cipher_suite.decrypt(+ encrypted_data.encode()+ ) # Convert string back to bytes+ return decrypted_data.decode()+ else:+ return ""+ except Exception as e:+ log_exception(e)return ""