github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'preview' of gurusainath:makeplane/plane into revamp-estimates

Browse Source
This commit is contained in:
guru_sainath 2024-05-30 17:04:17 +05:30
commit 42b3607ba1
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apiserver/plane/settings/common.py
View File

@ -225,6 +225,9 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend" EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
# Storage Settings # Storage Settings
# Use Minio settings
USE_MINIO = int(os.environ.get("USE_MINIO", 0)) == 1
STORAGES = { STORAGES = {
"staticfiles": { "staticfiles": {
"BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage", "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
@ -243,7 +246,7 @@ AWS_S3_FILE_OVERWRITE = False
AWS_S3_ENDPOINT_URL = os.environ.get( AWS_S3_ENDPOINT_URL = os.environ.get(
"AWS_S3_ENDPOINT_URL", None "AWS_S3_ENDPOINT_URL", None
) or os.environ.get("MINIO_ENDPOINT_URL", None) ) or os.environ.get("MINIO_ENDPOINT_URL", None)
if AWS_S3_ENDPOINT_URL: if AWS_S3_ENDPOINT_URL and USE_MINIO:
parsed_url = urlparse(os.environ.get("WEB_URL", "http://localhost")) parsed_url = urlparse(os.environ.get("WEB_URL", "http://localhost"))
AWS_S3_CUSTOM_DOMAIN = f"{parsed_url.netloc}/{AWS_STORAGE_BUCKET_NAME}" AWS_S3_CUSTOM_DOMAIN = f"{parsed_url.netloc}/{AWS_STORAGE_BUCKET_NAME}"
AWS_S3_URL_PROTOCOL = f"{parsed_url.scheme}:" AWS_S3_URL_PROTOCOL = f"{parsed_url.scheme}:"
@ -307,8 +310,6 @@ GITHUB_ACCESS_TOKEN = os.environ.get("GITHUB_ACCESS_TOKEN", False)
ANALYTICS_SECRET_KEY = os.environ.get("ANALYTICS_SECRET_KEY", False) ANALYTICS_SECRET_KEY = os.environ.get("ANALYTICS_SECRET_KEY", False)
ANALYTICS_BASE_API = os.environ.get("ANALYTICS_BASE_API", False) ANALYTICS_BASE_API = os.environ.get("ANALYTICS_BASE_API", False)
# Use Minio settings
USE_MINIO = int(os.environ.get("USE_MINIO", 0)) == 1
# Posthog settings # Posthog settings
POSTHOG_API_KEY = os.environ.get("POSTHOG_API_KEY", False) POSTHOG_API_KEY = os.environ.get("POSTHOG_API_KEY", False)
@ -350,4 +351,4 @@ CSRF_FAILURE_VIEW = "plane.authentication.views.common.csrf_failure"
# Base URLs # Base URLs
ADMIN_BASE_URL = os.environ.get("ADMIN_BASE_URL", None) ADMIN_BASE_URL = os.environ.get("ADMIN_BASE_URL", None)
SPACE_BASE_URL = os.environ.get("SPACE_BASE_URL", None) SPACE_BASE_URL = os.environ.get("SPACE_BASE_URL", None)
APP_BASE_URL = os.environ.get("APP_BASE_URL") or os.environ.get("WEB_URL") APP_BASE_URL = os.environ.get("APP_BASE_URL")

3
packages/editor/rich-text-editor/src/ui/extensions/index.tsx
View File

@ -17,5 +17,6 @@ export const RichTextEditorExtensions = ({
}: TArguments) => [ }: TArguments) => [
SlashCommand(uploadFile), SlashCommand(uploadFile),
dragDropEnabled === true && DragAndDrop(setHideDragHandle), dragDropEnabled === true && DragAndDrop(setHideDragHandle),
EnterKeyExtension(onEnterKeyPress), // TODO; add the extension conditionally for forms that don't require it
// EnterKeyExtension(onEnterKeyPress),
]; ];

8
web/store/user/index.ts
View File

@ -97,9 +97,11 @@ export class UserStore implements IUserStore {
}); });
const user = await this.userService.currentUser(); const user = await this.userService.currentUser();
if (user && user?.id) { if (user && user?.id) {
await this.userProfile.fetchUserProfile(); await Promise.all([
await this.userSettings.fetchCurrentUserSettings(); this.userProfile.fetchUserProfile(),
await this.store.workspaceRoot.fetchWorkspaces(); this.userSettings.fetchCurrentUserSettings(),
this.store.workspaceRoot.fetchWorkspaces(),
]);
runInAction(() => { runInAction(() => {
this.data = user; this.data = user;
this.isLoading = false; this.isLoading = false;

1
web/store/user/profile.store.ts
View File

@ -104,6 +104,7 @@ export class ProfileStore implements IUserProfileStore {
message: "Failed to fetch user profile", message: "Failed to fetch user profile",
}; };
}); });
throw error;
} }
}; };

1
web/store/user/settings.store.ts
View File

@ -73,6 +73,7 @@ export class UserSettingsStore implements IUserSettingsStore {
message: "Failed to fetch user settings", message: "Failed to fetch user settings",
}; };
}); });
throw error;
} }
}; };
} }