From 2496739e9ed0cdb0659203143303509308f9d137 Mon Sep 17 00:00:00 2001 From: jingrow Date: Tue, 23 Dec 2025 20:48:07 +0800 Subject: [PATCH] update press - jcloude --- .cspell.json | 2 +- .github/helper/install.sh | 4 +- .github/workflows/main.yaml | 22 +- .gitignore | 16 +- .pre-commit-config.yaml | 10 +- CODEOWNERS | 2 +- README.md | 6 +- codecov.yml | 2 +- dashboard/index.html | 2 +- .../src/components/AccessRequestDialog.vue | 2 +- .../components/AccessRequestStatusDialog.vue | 2 +- .../src/components/ActiveServersDialog.vue | 2 +- dashboard/src/components/AddDomainDialog.vue | 6 +- dashboard/src/components/AddTagDialog.vue | 2 +- dashboard/src/components/AddressForm.vue | 4 +- .../src/components/BackupFilesUploader.vue | 2 +- .../src/components/BuyPrepaidCreditsForm.vue | 4 +- .../components/BuyPrepaidCreditsRazorpay.vue | 6 +- .../components/BuyPrepaidCreditsStripe.vue | 2 +- .../src/components/ChurnFeedbackDialog.vue | 2 +- .../components/CommunicationInfoDialog.vue | 4 +- .../src/components/ConfigEditorDialog.vue | 2 +- dashboard/src/components/CustomAlerts.vue | 4 +- .../src/components/GitHubAppSelector.vue | 6 +- dashboard/src/components/HomeSummary.vue | 2 +- dashboard/src/components/InvoiceTable.vue | 2 +- dashboard/src/components/LinkControl.vue | 2 +- .../src/components/MarketplaceAppListing.vue | 10 +- dashboard/src/components/MobileNav.vue | 2 +- dashboard/src/components/NavigationItems.vue | 4 +- dashboard/src/components/NewAppDialog.vue | 4 +- dashboard/src/components/Onboarding.vue | 2 +- .../src/components/OnboardingAppSelector.vue | 2 +- .../components/OnboardingWithoutPayment.vue | 2 +- dashboard/src/components/SiteDailyUsage.vue | 2 +- .../components/SiteDatabaseAccessDialog.vue | 2 +- .../components/SiteDatabaseRestoreDialog.vue | 2 +- dashboard/src/components/SiteUpdateDialog.vue | 2 +- dashboard/src/components/StripeCard.vue | 10 +- .../src/components/SupportAccessDialog.vue | 2 +- .../src/components/UpdateBillingDetails.vue | 4 +- .../components/UpdateBillingDetailsForm.vue | 4 +- .../src/components/auth/Configure2FA.vue | 6 +- .../components/billing/AddExchangeRate.vue | 2 +- .../src/components/billing/BillingDetails.vue | 2 +- .../src/components/billing/BillingSummary.vue | 4 +- .../components/billing/BuyCreditsRazorpay.vue | 4 +- .../components/billing/BuyCreditsStripe.vue | 2 +- dashboard/src/components/billing/CardForm.vue | 10 +- .../components/billing/ChangeCardDialog.vue | 6 +- .../billing/FinalizeInvoicesDialog.vue | 4 +- .../src/components/billing/NewAddressForm.vue | 6 +- .../src/components/billing/PaymentDetails.vue | 6 +- .../components/billing/PrepaidCreditsForm.vue | 6 +- .../billing/mpesa/AddMpesaCredentials.vue | 4 +- .../billing/mpesa/AddPaymentGateway.vue | 6 +- .../billing/mpesa/BuyPrepaidCreditsMpesa.vue | 6 +- .../billing/mpesa/PartnerPaymentPayout.vue | 8 +- .../BinlogBrowserIndexStatusDialog.vue | 4 +- .../database/DatabaseAddIndexButton.vue | 2 +- .../database/DatabaseProcessKillButton.vue | 2 +- .../database/DatabaseSQLPlaygroundLog.vue | 2 +- .../src/components/group/AddAppDialog.vue | 4 +- .../src/components/group/AddRegionDialog.vue | 2 +- .../src/components/group/BenchLogsDialog.vue | 4 +- .../group/ChangeAppBranchDialog.vue | 4 +- .../src/components/group/PatchAppDialog.vue | 2 +- .../group/SupervisorProcessesDialog.vue | 2 +- .../group/UpdateReleaseGroupDialog.vue | 4 +- .../marketplace/AppListingStepsDialog.vue | 2 +- .../marketplace/ChangeAppBranchDialog.vue | 4 +- .../marketplace/MarketplaceAppAnalytics.vue | 4 +- .../src/components/marketplace/NewComment.vue | 2 +- .../marketplace/NewMarketplaceAppDialog.vue | 4 +- .../components/marketplace/PlansDialog.vue | 6 +- .../marketplace/ReplyMarketplaceApp.vue | 2 +- .../partners/BuyPartnerCreditsRazorpay.vue | 4 +- .../partners/BuyPartnerCreditsStripe.vue | 2 +- .../partners/ChangePartnerDialog.vue | 4 +- .../src/components/partners/InvoiceDetail.vue | 2 +- .../components/partners/LeadActivities.vue | 2 +- .../components/partners/LeadDetailsDialog.vue | 2 +- .../components/partners/LeadDetailsForm.vue | 6 +- .../src/components/partners/LeadFollowup.vue | 2 +- .../components/partners/LinkCertificate.vue | 4 +- .../components/partners/NewPartnerLead.vue | 4 +- .../partners/PartnerCertificateRequest.vue | 4 +- .../partners/PartnerContribution.vue | 2 +- .../partners/PartnerContributionList.vue | 2 +- .../components/partners/PartnerCustomers.vue | 6 +- .../components/partners/PartnerDashboard.vue | 10 +- .../partners/PartnerLeadOverview.vue | 2 +- .../src/components/partners/PartnerLeads.vue | 4 +- .../partners/PartnerLocalPaymentSetup.vue | 2 +- .../components/partners/PartnerMembers.vue | 2 +- .../components/partners/PartnerOverview.vue | 6 +- .../components/partners/PartnerResources.vue | 2 +- .../partners/PartnerWebsiteDetails.vue | 2 +- .../partners/UpdateEngagementStageDialog.vue | 2 +- .../partners/UpdateFollowupDialog.vue | 4 +- .../components/partners/UpdateLostDialog.vue | 2 +- .../components/partners/UpdateWonDialog.vue | 2 +- .../components/partners/WebsiteInfoDialog.vue | 2 +- .../server/AutoscaleScheduleDialog.vue | 4 +- .../src/components/server/CleanupDialog.vue | 2 +- .../server/ConfigureAutomatedScaling.vue | 2 +- .../server/DatabaseBinlogsDialog.vue | 4 +- .../server/DatabaseConfigurationDialog.vue | 2 +- .../components/server/ReleaseGroupCharts.vue | 14 +- .../server/SecondaryServerPlanDialog.vue | 2 +- .../src/components/server/ServerCharts.vue | 38 +- .../components/server/ServerLoadAverage.vue | 2 +- .../server/ServerNewSnapshotDialog.vue | 4 +- .../src/components/server/ServerOverview.vue | 2 +- .../components/server/ServerPlansDialog.vue | 2 +- .../server/StorageBreakdownDialog.vue | 4 +- .../settings/ActivateWebhookDialog.vue | 4 +- .../settings/AddNewWebhookDialog.vue | 4 +- .../components/settings/DeveloperSettings.vue | 16 +- .../components/settings/EditWebhookDialog.vue | 6 +- .../src/components/settings/RoleList.vue | 2 +- .../settings/WebhookAttemptDetails.vue | 2 +- .../settings/WebhookAttemptsDialog.vue | 2 +- .../settings/profile/AccountPartner.vue | 8 +- .../settings/profile/AccountProfile.vue | 16 +- .../profile/TFARecoveryCodesDialog.vue | 6 +- .../src/components/site/InstallAppDialog.vue | 2 +- .../src/components/site/SiteAnalytics.vue | 8 +- .../site/SiteAppPlanSelectDialog.vue | 2 +- .../components/site/SiteChangeGroupDialog.vue | 6 +- .../site/SiteChangeRegionDialog.vue | 4 +- .../site/SiteChangeServerDialog.vue | 8 +- .../site/SiteDatabaseRestoreFromURLDialog.vue | 4 +- .../site/SiteEnableMonitoringDialog.vue | 2 +- dashboard/src/components/site/SiteLogs.vue | 4 +- .../site/SiteVersionUpgradeDialog.vue | 8 +- .../components/site/UninstallAppDialog.vue | 2 +- .../site/performance/SiteBinaryLogs.vue | 2 +- .../site/performance/SiteDatabaseProcess.vue | 2 +- .../site/performance/SiteDeadlockReport.vue | 2 +- .../site/performance/SiteProcessList.vue | 2 +- .../site/performance/SiteRequestLogs.vue | 2 +- .../site/performance/SiteSlowQueries.vue | 2 +- .../SiteDatabaseAddEditUserDialog.vue | 6 +- .../SiteDatabaseUserCredentialDialog.vue | 4 +- .../SiteDatabaseUserLogs.vue | 2 +- dashboard/src/controllers/s3FileUploader.js | 4 +- dashboard/src/data/notifications.js | 2 +- dashboard/src/data/plans.js | 2 +- dashboard/src/data/session.js | 2 +- dashboard/src/data/team.js | 4 +- dashboard/src/dialogs/AppVersionsDialog.vue | 4 +- dashboard/src/main.js | 30 +- dashboard/src/objects/bench.ts | 2 +- dashboard/src/objects/marketplace.js | 2 +- dashboard/src/objects/notification.js | 4 +- dashboard/src/objects/site.js | 4 +- dashboard/src/objects/tabs/site/logs.ts | 2 +- dashboard/src/pages/BillingForecast.vue | 2 +- dashboard/src/pages/BillingInvoices.vue | 2 +- dashboard/src/pages/BillingMpesaInvoices.vue | 2 +- dashboard/src/pages/BillingOverview.vue | 4 +- dashboard/src/pages/Checkout.vue | 2 +- dashboard/src/pages/CheckoutAddress.vue | 2 +- dashboard/src/pages/CheckoutPayment.vue | 8 +- dashboard/src/pages/CheckoutPlans.vue | 2 +- .../src/pages/CreateSiteForMarketplaceApp.vue | 2 +- dashboard/src/pages/DeployCandidate.vue | 2 +- dashboard/src/pages/InstallApp.vue | 10 +- dashboard/src/pages/ListPage.vue | 4 +- dashboard/src/pages/LogPage.vue | 2 +- dashboard/src/pages/LoginSignup.vue | 24 +- dashboard/src/pages/NewReleaseGroup.vue | 6 +- dashboard/src/pages/NewServer.vue | 8 +- dashboard/src/pages/NewSite.vue | 8 +- dashboard/src/pages/PartnerList.vue | 2 +- dashboard/src/pages/PartnerNewPayout.vue | 10 +- .../src/pages/ReleaseGroupBenchSites.vue | 2 +- dashboard/src/pages/ResetPassword.vue | 8 +- dashboard/src/pages/SetupAccount.vue | 10 +- dashboard/src/pages/SiteLogin.vue | 10 +- dashboard/src/pages/Subscription.vue | 4 +- .../pages/devtools/database/BinlogBrowser.vue | 10 +- .../devtools/database/DatabaseAnalyzer.vue | 12 +- .../database/DatabaseSQLPlayground.vue | 4 +- .../pages/devtools/log-browser/LogBrowser.vue | 2 +- .../pages/devtools/log-browser/LogList.vue | 4 +- dashboard/src/pages/signup/AppSelector.vue | 4 +- dashboard/src/pages/signup/Login.vue | 8 +- .../src/pages/signup/OAuthSetupAccount.vue | 4 +- dashboard/src/pages/signup/SetupSite.vue | 4 +- dashboard/src/pages/signup/Signup.vue | 6 +- dashboard/src/pages/signup/VerifyEmail.vue | 8 +- dashboard/src/utils/agentJob.js | 2 +- .../tests-e2e/tests/cron/signup.cron.spec.ts | 6 +- .../tests-e2e/tests/dashboard/auth.setup.ts | 2 +- .../tests/dashboard/coverage.fixture.ts | 4 +- .../tests-e2e/tests/dashboard/sites.test.ts | 2 +- dashboard/vite.config.ts | 6 +- deployment/nginx.conf | 6 +- deployment/supervisor.conf | 14 +- docs/General Guide/DevOps Manual.MD | 4 +- docs/How to ?/Add New Press Webhook.MD | 8 +- docs/Internals/Billing & Subscription.MD | 4 +- docs/Introduction/Local Setup Using Cloud.MD | 12 +- .../Introduction/Local Setup Using Vagrant.MD | 8 +- guide-to-testing.md | 28 +- libs/README.md | 2 +- libs/fc_cli/fc/authentication/login.py | 6 +- libs/fc_cli/fc/authentication/session.py | 2 +- libs/fc_cli/fc/commands/deploy.py | 18 +- libs/fc_cli/fc/commands/server.py | 18 +- libs/fc_cli/fc/commands/sites.py | 14 +- libs/fc_cli/pyproject.toml | 2 +- libs/fcrestore/main.go | 2 +- libs/fcrestore/requests.go | 18 +- libs/fcrestore/tui/progressbar.go | 4 +- libs/fcrestore/tui/spinner.go | 2 +- libs/fcrestore/uploader.go | 8 +- package.json | 8 +- press-semgrep-rules.yml | 2 +- press/access/__init__.py | 4 +- press/access/decorators.py | 2 +- press/access/support_access.py | 8 +- press/agent.py | 30 +- press/api/__init__.py | 6 +- press/api/access.py | 2 +- press/api/account.py | 36 +- press/api/analytics.py | 22 +- press/api/app.py | 8 +- press/api/bench.py | 46 +- press/api/billing.py | 26 +- press/api/callbacks.py | 10 +- press/api/central.py | 10 +- press/api/client.py | 12 +- press/api/config.py | 2 +- press/api/dashboard.py | 4 +- press/api/developer/marketplace.py | 12 +- press/api/developer/saas.py | 8 +- press/api/email.py | 22 +- press/api/github.py | 4 +- press/api/google.py | 6 +- press/api/log_browser.py | 2 +- press/api/marketplace.py | 22 +- press/api/monitoring.py | 6 +- press/api/notifications.py | 4 +- press/api/oauth.py | 10 +- press/api/partner.py | 12 +- press/api/product_trial.py | 10 +- press/api/regional_payments/mpesa/utils.py | 2 +- press/api/saas.py | 16 +- press/api/security.py | 4 +- press/api/selfhosted.py | 8 +- press/api/server.py | 34 +- press/api/site.py | 52 +- press/api/site_backup.py | 4 +- press/api/site_login.py | 2 +- press/api/spaces.py | 4 +- press/api/telegram.py | 4 +- press/api/tests/test_account.py | 6 +- press/api/tests/test_bench.py | 60 +-- press/api/tests/test_billing.py | 2 +- press/api/tests/test_marketplace.py | 24 +- press/api/tests/test_server.py | 42 +- press/api/tests/test_site.py | 116 ++--- press/api/webhook.py | 4 +- press/auth.py | 22 +- press/bootstrap.py | 6 +- press/commands.py | 4 +- press/config/docs.py | 4 +- press/docker/docker-compose.yml | 8 +- press/docker/registry.conf | 2 +- press/fixtures/press_method_permission.json | 48 +- press/guards/role_guard/__init__.py | 6 +- press/guards/team_guard.py | 4 +- press/hooks.py | 452 +++++++++--------- .../incident_investigator.py | 8 +- .../test_incident_investigator.py | 20 +- .../arm_build_record/arm_build_record.py | 12 +- .../arm_build_record/test_arm_build_record.py | 18 +- .../ssh_access_audit/ssh_access_audit.py | 6 +- .../virtual_disk_resize.py | 6 +- .../virtual_machine_migration.py | 16 +- .../virtual_machine_replacement.py | 4 +- .../marketplace_app_feedback.py | 2 +- .../marketplace_app_plan.py | 2 +- .../test_marketplace_app_plan.py | 4 +- .../marketplace_app_subscription.py | 2 +- .../test_marketplace_app_subscription.py | 10 +- press/metrics.py | 28 +- press/overrides.py | 14 +- .../certificate_link_request.py | 2 +- .../partner_approval_request.py | 6 +- .../doctype/partner_lead/partner_lead.py | 2 +- press/patches.txt | 284 +++++------ .../add_domains_in_site_config_preview.py | 2 +- .../v0_0_1/add_domains_to_site_config.py | 2 +- ...eakdown_site_usage_into_multiple_fields.py | 2 +- ...erence_from_deploy_candidate_difference.py | 6 +- .../v0_0_1/create_app_source_from_app.py | 22 +- .../v0_0_1/create_balance_transactions.py | 4 +- ...create_balance_transactions_from_stripe.py | 4 +- .../v0_0_1/create_certificate_authorities.py | 4 +- .../create_child_table_records_in_teams.py | 4 +- .../patches/v0_0_1/create_default_cluster.py | 4 +- .../v0_0_1/create_invoice_for_past_ples.py | 4 +- .../create_root_domain_from_press_settings.py | 18 +- .../v0_0_1/create_site_plan_change_log.py | 2 +- .../v0_0_1/create_site_subscriptions.py | 4 +- .../v0_0_1/delete_logs_from_archived_sites.py | 2 +- .../v0_0_1/make_default_site_domain.py | 4 +- press/patches/v0_0_1/new_onboarding.py | 4 +- press/patches/v0_0_1/patch_invoice.py | 4 +- press/patches/v0_0_1/ple_to_usage_record.py | 2 +- press/patches/v0_0_1/rename_archived_sites.py | 4 +- press/patches/v0_0_1/rename_release_groups.py | 6 +- .../v0_0_1/rename_site_backup_fields.py | 2 +- ...rename_transaction_currency_to_currency.py | 2 +- .../v0_0_1/set_app_title_from_custom_field.py | 2 +- .../v0_0_1/set_billing_name_for_teams.py | 2 +- .../v0_0_1/set_cluster_in_press_settings.py | 14 +- .../set_dependencies_in_release_group.py | 4 +- .../v0_0_1/set_document_type_in_plan.py | 2 +- press/patches/v0_0_1/set_domain_in_site.py | 2 +- .../patches/v0_0_1/set_hostname_in_server.py | 2 +- ...set_marketplace_app_app_field_from_name.py | 2 +- .../set_monitoring_password_in_cluster.py | 2 +- ..._app_release_based_on_app_source_public.py | 2 +- .../set_rate_limit_config_based_on_plan.py | 4 +- ...oup_version_and_title_from_custom_field.py | 2 +- .../v0_0_1/set_remote_file_location.py | 2 +- .../set_team_field_for_permission_checks.py | 2 +- ...in_tls_certificate_based_on_domain_team.py | 4 +- .../track_offsite_backups_via_remote_files.py | 2 +- ..._proxy_for_suspended_and_inactive_sites.py | 2 +- .../patches/v0_0_1/update_site_config_doc.py | 4 +- .../v0_0_1/use_private_ip_for_upstreams.py | 4 +- press/patches/v0_0_1/user_account_to_team.py | 8 +- .../v0_7_0/set_hostname_abbreviation.py | 4 +- .../roles/migrate_to_fc/tasks/main.yml | 2 +- .../playbooks/roles/prometheus/tasks/main.yml | 6 +- .../roles/prometheus/templates/press.yml.j2 | 34 +- .../roles/prometheus/templates/prometheus.yml | 6 +- press/playbooks/roles/proxy/tasks/main.yml | 2 +- .../reconfigure_prometheus/tasks/main.yml | 4 +- press/playbooks/roles/scaleway/tasks/main.yml | 2 +- .../roles/scaleway_dedibox/tasks/main.yml | 2 +- .../roles/ssl_nginx/templates/ssl.conf | 2 +- press/press/audit.py | 28 +- .../account_request/account_request.json | 4 +- .../account_request/account_request.py | 14 +- .../account_request/test_account_request.py | 4 +- .../account_request_press_role.json | 4 +- .../account_request_press_role.py | 2 +- .../add_on_storage_log/add_on_storage_log.py | 4 +- press/press/doctype/agent_job/agent_job.py | 56 +-- .../agent_job/agent_job_notifications.py | 8 +- .../press/doctype/agent_job/test_agent_job.py | 24 +- .../doctype/agent_job_type/agent_job_type.py | 4 +- .../agent_request_failure.py | 4 +- .../doctype/agent_update/agent_update.py | 12 +- .../alertmanager_webhook_log.py | 16 +- .../test_alertmanager_webhook_log.py | 10 +- ...alertmanager_webhook_log_reaction_job.json | 8 +- .../alertmanager_webhook_log_reaction_job.py | 4 +- .../analytics_server/analytics_server.py | 6 +- .../ansible_console/ansible_console.json | 2 +- .../ansible_console/ansible_console.py | 6 +- .../ansible_console_log.py | 2 +- .../doctype/ansible_play/ansible_play.py | 4 +- press/press/doctype/app/app.py | 4 +- press/press/doctype/app/test_app.py | 4 +- press/press/doctype/app_patch/app_patch.py | 6 +- .../press/doctype/app_release/app_release.py | 16 +- .../doctype/app_release/test_app_release.py | 4 +- .../app_release_approval_request.py | 6 +- .../app_release_difference.py | 2 +- press/press/doctype/app_source/app_source.py | 12 +- .../doctype/app_source/test_app_source.py | 10 +- press/press/doctype/audit_log/audit_log.py | 2 +- .../auto_scale_record/auto_scale_record.py | 30 +- .../test_auto_scale_record.py | 12 +- .../aws_savings_plan_recommendation.py | 4 +- .../backup_restoration_test.py | 4 +- .../backup_restoration_test/backup_test.py | 4 +- .../balance_transaction.py | 4 +- .../test_balance_transaction.py | 2 +- press/press/doctype/bench/bench.py | 60 +-- press/press/doctype/bench/test_bench.py | 92 ++-- .../bench_dependency/bench_dependency.py | 2 +- .../bench_get_app_cache.py | 4 +- .../doctype/bench_shell/bench_shell.json | 2 +- .../press/doctype/bench_shell/bench_shell.py | 2 +- .../doctype/bench_update/bench_update.py | 12 +- .../build_cache_shell/build_cache_shell.json | 2 +- .../build_cache_shell/build_cache_shell.py | 2 +- .../doctype/build_metric/build_metric.py | 2 +- .../certificate_authority.py | 4 +- press/press/doctype/cluster/cluster.py | 28 +- press/press/doctype/cluster/test_cluster.py | 40 +- .../doctype/cluster_plan/cluster_plan.py | 2 +- .../press/doctype/code_server/code_server.py | 6 +- .../common_site_config/common_site_config.py | 2 +- .../dashboard_banner/dashboard_banner.py | 2 +- .../database_server/database_server.js | 2 +- .../database_server/database_server.py | 42 +- .../database_server/test_database_server.py | 30 +- .../database_server_mariadb_variable.py | 4 +- .../patches/add_unique_constraint.py | 2 +- .../test_database_server_mariadb_variable.py | 52 +- press/press/doctype/deploy/deploy.py | 12 +- .../deploy_candidate/deploy_candidate.js | 2 +- .../deploy_candidate/deploy_candidate.py | 20 +- .../deploy_candidate/deploy_candidate_list.js | 2 +- .../deploy_candidate/deploy_notifications.py | 14 +- .../deploy_candidate/docker_output_parsers.py | 6 +- .../deploy_candidate/test_deploy_candidate.py | 72 +-- press/press/doctype/deploy_candidate/utils.py | 4 +- .../doctype/deploy_candidate/validations.py | 10 +- .../patches/set_app_name_to_app.py | 2 +- .../deploy_candidate_build.js | 6 +- .../deploy_candidate_build.py | 50 +- .../test_deploy_candidate_build.py | 32 +- .../deploy_candidate_difference.py | 4 +- .../test_deploy_candidate_difference.py | 4 +- .../disk_performance/disk_performance.py | 2 +- .../downtime_analysis/downtime_analysis.py | 2 +- press/press/doctype/drip_email/drip_email.py | 6 +- .../doctype/drip_email/test_drip_email.py | 14 +- .../erpnext_consultant/erpnext_consultant.py | 2 +- .../doctype/frappe_version/frappe_version.py | 2 +- .../github_webhook_log/github_webhook_log.py | 4 +- press/press/doctype/incident/incident.py | 52 +- press/press/doctype/incident/test_incident.py | 54 +-- .../incident_settings/incident_settings.py | 4 +- .../inspect_trace_id/inspect_trace_id.py | 2 +- ...ripe_payment_intent_succeeded_webhook.json | 2 +- press/press/doctype/invoice/invoice.py | 26 +- .../invoice/patches/set_free_credits.py | 2 +- .../patches/set_transaction_details.py | 2 +- .../doctype/invoice/stripe_webhook_handler.py | 2 +- press/press/doctype/invoice/test_invoice.py | 6 +- press/press/doctype/log_server/log_server.py | 6 +- .../logical_replication_backup.py | 32 +- .../doctype/malware_scan/malware_scan.py | 4 +- .../doctype/mariadb_binlog/mariadb_binlog.py | 6 +- .../doctype/mariadb_stalk/mariadb_stalk.py | 6 +- .../mariadb_variable/mariadb_variable.py | 2 +- .../mariadb_variable/test_mariadb_variable.py | 2 +- press/press/doctype/marketplace_app/events.py | 2 +- .../marketplace_app/marketplace_app.py | 24 +- .../marketplace_app/test_marketplace_app.py | 2 +- .../doctype/monitor_server/monitor_server.py | 36 +- .../patches/add_unique_constraint.py | 2 +- press/press/doctype/nfs_server/nfs_server.py | 10 +- .../nfs_volume_attachment.py | 18 +- .../nfs_volume_detachment.py | 18 +- .../partner_payment_payout.js | 2 +- .../partner_payment_payout.py | 2 +- .../payment_dispute/payment_dispute.py | 2 +- .../doctype/payout_order/payout_order.py | 8 +- .../doctype/payout_order/test_payout_order.py | 10 +- .../physical_backup_group.py | 4 +- .../physical_backup_group_site.py | 2 +- .../physical_backup_restoration.py | 22 +- .../physical_restoration_test.py | 6 +- press/press/doctype/press_job/press_job.py | 10 +- .../doctype/press_job_step/press_job_step.py | 2 +- .../doctype/press_job_type/press_job_type.py | 2 +- .../press_notification/press_notification.py | 6 +- .../test_press_notification.py | 14 +- .../press_permission_group.py | 6 +- .../test_press_permission_group.py | 4 +- .../press_role/patches/migrate_permissions.py | 2 +- press/press/doctype/press_role/press_role.py | 22 +- .../doctype/press_role/test_press_role.py | 2 +- .../press_role_permission.py | 4 +- .../patches/set_minimum_rebuild_memory.py | 2 +- .../patches/set_press_monitoring_password.py | 4 +- .../press_settings/press_settings.json | 8 +- .../doctype/press_settings/press_settings.py | 18 +- .../press_settings/test_press_settings.py | 6 +- .../press/doctype/press_tag/test_press_tag.py | 2 +- .../test_press_user_permission.py | 38 +- .../doctype/press_webhook/press_webhook.py | 12 +- .../press_webhook_log/press_webhook_log.py | 6 +- .../process_snapshot/process_snapshot.py | 2 +- .../prometheus_alert_rule.json | 4 +- .../prometheus_alert_rule.py | 14 +- .../test_prometheus_alert_rule.py | 4 +- .../doctype/proxy_failover/proxy_failover.py | 4 +- .../generate_proxysql_monitor_password.py | 2 +- .../doctype/proxy_server/proxy_server.js | 2 +- .../doctype/proxy_server/proxy_server.py | 10 +- .../doctype/proxy_server/test_proxy_server.py | 26 +- .../razorpay_payment_record.py | 6 +- .../razorpay_webhook_log.py | 4 +- .../registry_server/registry_server.py | 6 +- .../doctype/release_group/release_group.py | 68 +-- .../release_group/test_release_group.py | 54 +-- .../release_group_app/release_group_app.py | 2 +- .../release_group_dependency.py | 2 +- .../press/doctype/remote_file/remote_file.py | 14 +- .../press/doctype/resource_tag/tag_helpers.py | 2 +- .../press/doctype/root_domain/root_domain.py | 6 +- .../doctype/root_domain/test_root_domain.py | 10 +- .../security_update/security_update.py | 4 +- .../security_update_check.py | 8 +- .../self_hosted_server/self_hosted_server.py | 12 +- .../test_self_hosted_server.py | 30 +- .../serial_console_log.json | 2 +- .../serial_console_log/serial_console_log.py | 2 +- press/press/doctype/server/server.js | 2 +- press/press/doctype/server/server.py | 98 ++-- press/press/doctype/server/test_server.py | 40 +- .../press/doctype/server_plan/server_plan.py | 2 +- .../doctype/server_plan/test_server_plan.py | 2 +- .../server_snapshot/server_snapshot.json | 16 +- .../server_snapshot/server_snapshot.py | 72 +-- .../server_snapshot_plan.py | 2 +- .../server_snapshot_recovery.py | 20 +- .../server_storage_plan.py | 2 +- .../doctype/silenced_alert/silenced_alert.py | 2 +- press/press/doctype/site/archive.py | 4 +- press/press/doctype/site/backups.py | 16 +- press/press/doctype/site/erpnext_site.py | 6 +- .../set_database_access_credentials.py | 2 +- press/press/doctype/site/pool.py | 4 +- press/press/doctype/site/saas_pool.py | 4 +- press/press/doctype/site/saas_site.py | 4 +- press/press/doctype/site/site.js | 4 +- press/press/doctype/site/site.py | 126 ++--- press/press/doctype/site/site_usages.py | 10 +- press/press/doctype/site/test_backups.py | 14 +- press/press/doctype/site/test_site.py | 58 +-- .../doctype/site_activity/site_activity.py | 2 +- .../site_activity/test_site_activity.py | 4 +- .../doctype/site_analytics/site_analytics.py | 10 +- press/press/doctype/site_app/site_app.py | 2 +- .../press/doctype/site_backup/site_backup.py | 14 +- .../doctype/site_backup/test_site_backup.py | 6 +- .../site_database_user/site_database_user.py | 12 +- .../press/doctype/site_domain/site_domain.py | 14 +- .../doctype/site_domain/test_site_domain.py | 16 +- .../site_group_deploy/site_group_deploy.py | 6 +- .../doctype/site_migration/site_migration.py | 26 +- .../site_migration/test_site_migration.py | 16 +- press/press/doctype/site_plan/plan.py | 2 +- press/press/doctype/site_plan/site_plan.py | 6 +- .../site_plan_change/site_plan_change.py | 2 +- .../site_plan_change/test_site_plan_change.py | 4 +- .../site_replication/site_replication.py | 4 +- .../site_update/scheduled_auto_updates.py | 6 +- .../press/doctype/site_update/site_update.py | 22 +- .../doctype/site_update/test_site_update.py | 24 +- .../site_user_session/site_user_session.py | 2 +- .../sql_playground_log/sql_playground_log.py | 2 +- .../ssh_certificate/ssh_certificate.py | 4 +- .../ssh_certificate/test_ssh_certificate.py | 14 +- .../ssh_certificate_authority.py | 4 +- press/press/doctype/ssh_key/test_ssh_key.py | 2 +- .../storage_integration_subscription.js | 2 +- .../storage_integration_subscription.py | 8 +- .../stripe_micro_charge_record.py | 2 +- .../stripe_payment_event.py | 4 +- .../stripe_payment_method.py | 10 +- .../stripe_webhook_log/stripe_webhook_log.py | 6 +- .../doctype/subscription/subscription.py | 8 +- .../doctype/subscription/test_subscription.py | 6 +- .../doctype/support_access/support_access.py | 8 +- .../support_access/test_support_access.py | 2 +- .../doctype/team/patches/set_partner_email.py | 4 +- .../doctype/team/patches/set_referrer_id.py | 2 +- press/press/doctype/team/suspend_sites.py | 2 +- press/press/doctype/team/team.py | 50 +- press/press/doctype/team/team_invoice.py | 2 +- press/press/doctype/team/test_team.py | 8 +- .../team_deletion_request.py | 14 +- .../test_team_deletion_request.py | 8 +- .../create_groups_from_press_settings.py | 6 +- .../doctype/telegram_group/telegram_group.py | 2 +- .../telegram_message/telegram_message.py | 2 +- .../telegram_message/test_telegram_message.py | 4 +- .../tls_certificate/test_tls_certificate.py | 10 +- .../tls_certificate/tls_certificate.py | 18 +- .../doctype/trace_server/trace_server.py | 6 +- press/press/doctype/user_2fa/test_user_2fa.py | 2 +- press/press/doctype/user_2fa/user_2fa.py | 2 +- .../user_ssh_certificate.py | 2 +- .../doctype/user_ssh_key/test_user_ssh_key.py | 12 +- .../doctype/user_ssh_key/user_ssh_key.py | 2 +- .../version_upgrade/test_version_upgrade.py | 14 +- .../version_upgrade/version_upgrade.py | 8 +- .../virtual_disk_snapshot.py | 4 +- .../patches/populate_volumes_table.py | 4 +- .../patches/set_naming_fields.py | 2 +- .../virtual_machine/test_virtual_machine.py | 8 +- .../virtual_machine/virtual_machine.py | 52 +- .../virtual_machine/virtual_machine_list.js | 2 +- .../test_virtual_machine_image.py | 8 +- .../virtual_machine_image.py | 2 +- .../doctype/wireguard_peer/wireguard_peer.py | 6 +- .../report/agent_versions/agent_versions.js | 2 +- .../report/agent_versions/agent_versions.py | 4 +- .../aws_rightsizing_recommendation.js | 2 +- .../aws_rightsizing_recommendation.py | 2 +- .../bench_memory_limits.py | 2 +- .../binary_log_browser/binary_log_browser.py | 2 +- .../mariadb_locks_list/mariadb_locks_list.py | 2 +- .../mariadb_process_list.js | 2 +- .../mariadb_process_list.py | 2 +- .../mariadb_slow_queries.js | 2 +- .../mariadb_slow_queries.py | 2 +- .../marketplace_app_repository_visibility.js | 2 +- .../press_endpoints_audit.py | 2 +- .../press/report/server_stats/server_stats.py | 2 +- .../shared_app_server_stats.py | 2 +- press/public/build.json | 4 +- press/public/email/tailwind.config.js | 2 +- press/public/js/datatable.js | 2 +- press/public/js/utils.js | 6 +- press/public/marketplace/tailwind.config.js | 6 +- press/public/migrate | 2 +- press/public/migrate_2 | 2 +- press/runner.py | 12 +- press/saas/README.md | 6 +- press/saas/api/auth.py | 4 +- press/saas/api/billing.py | 6 +- press/saas/api/readme.md | 4 +- press/saas/api/site.py | 4 +- press/saas/api/team.py | 2 +- .../doctype/product_trial/product_trial.py | 16 +- .../product_trial/test_product_trial.py | 10 +- .../product_trial_request.py | 14 +- press/saas/doctype/saas_app/saas_app.py | 4 +- .../doctype/saas_app_plan/saas_app_plan.py | 4 +- .../saas_app_subscription.py | 2 +- .../doctype/saas_settings/saas_settings.py | 2 +- .../saas_settings/test_saas_settings.py | 10 +- .../saas_signup_generator.py | 2 +- .../infrastructure/server_conversion.py | 8 +- press/scripts/migrate.py | 30 +- press/scripts/mypy_line_count_check.sh | 2 +- press/signup_e2e.py | 2 +- press/telegram_utils.py | 2 +- press/templates/includes/signup.js | 2 +- press/templates/marketplace/base.html | 6 +- press/templates/pages/base.html | 4 +- press/templates/saas/billing_layout.html | 2 +- press/templates/saas/setup-account.html | 8 +- press/templates/saas/signup.html | 8 +- press/templates/saas/tailwind.config.js | 2 +- press/templates/saas_signup_layout.html | 2 +- press/tests/before_test.py | 2 +- press/tests/test_2fa.py | 6 +- press/tests/test_agent.py | 6 +- press/tests/test_audit.py | 30 +- press/tests/test_billing_utils.py | 2 +- press/tests/test_cleanup.py | 60 +-- press/tests/test_sanity.py | 2 +- press/tests/test_scheduled_auto_updates.py | 4 +- press/utils/__init__.py | 12 +- press/utils/billing.py | 48 +- press/utils/dns.py | 6 +- press/utils/jobs.py | 2 +- press/utils/telemetry.py | 2 +- press/www/dashboard.py | 12 +- press/www/github/authorize.py | 2 +- press/www/github/redirect.py | 2 +- press/www/marketplace/index.html | 4 +- press/www/prepare-site.html | 4 +- press/www/saas-oauth.html | 6 +- press/www/saas/billing.html | 8 +- press/www/saas/billing.js | 8 +- press/www/stripe/card-status.html | 2 +- press/www/stripe/setup-account.html | 6 +- press/www/stripe/signup.html | 8 +- pyproject.toml | 6 +- 678 files changed, 3246 insertions(+), 3246 deletions(-) diff --git a/.cspell.json b/.cspell.json index 5de63cf5..a106d4ba 100644 --- a/.cspell.json +++ b/.cspell.json @@ -13,7 +13,7 @@ "test_**", "**.conf", "requirements.txt", - "press/utils/country_timezone.py" + "jcloude/utils/country_timezone.py" ], "words": [ "2.4.6", diff --git a/.github/helper/install.sh b/.github/helper/install.sh index f935a53d..b0938aba 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -27,13 +27,13 @@ sed -i 's/schedule:/# schedule:/g' Procfile sed -i 's/socketio:/# socketio:/g' Procfile sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile -bench get-app press "${GITHUB_WORKSPACE}" +bench get-app jcloude "${GITHUB_WORKSPACE}" bench setup requirements --dev bench start &> bench_start_logs.txt & CI=Yes bench build --app jingrow & bench new-site --db-root-password root --admin-password admin test_site -bench --site test_site install-app press +bench --site test_site install-app jcloude bench set-config -g server_script_enabled 1 bench set-config -g http_port 8000 diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 35fbaa3e..d976e616 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -84,7 +84,7 @@ jobs: - name: Run Semgrep rules run: | pip install semgrep==1.32 - semgrep ci --config ./press-semgrep-rules.yml --config r/python.lang.correctness + semgrep ci --config ./jcloude-semgrep-rules.yml --config r/python.lang.correctness ui-tests: name: Client @@ -162,22 +162,22 @@ jobs: uses: crazy-max/ghaction-github-runtime@v3 - name: Install Playwright browsers - working-directory: /home/runner/jingrow-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/jcloude/dashboard run: npx playwright install chromium - name: Setup Test Users - working-directory: /home/runner/jingrow-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/jcloude/dashboard run: | - bench --site test_site execute press.press.doctype.team.test_team.create_test_press_admin_team \ + bench --site test_site execute jcloude.jcloude.doctype.team.test_team.create_test_jcloude_admin_team \ --kwargs "{\"email\": \"${PRESS_ADMIN_USER_EMAIL}\", \"free_account\": True, \"skip_onboarding\": True}" bench --site test_site set-password "$PRESS_ADMIN_USER_EMAIL" "$PRESS_ADMIN_USER_PASSWORD" - name: Run Playwright Tests - working-directory: /home/runner/jingrow-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/jcloude/dashboard run: npx playwright test --project=chromium - name: Generate Coverage Report - working-directory: /home/runner/jingrow-bench/apps/press/dashboard + working-directory: /home/runner/jingrow-bench/apps/jcloude/dashboard run: npx nyc report --reporter=cobertura --reporter=text --report-dir=./coverage - name: Upload Playwright Test report @@ -185,17 +185,17 @@ jobs: uses: actions/upload-artifact@v4 with: name: playwright-report - path: /home/runner/jingrow-bench/apps/press/dashboard/playwright-report + path: /home/runner/jingrow-bench/apps/jcloude/dashboard/playwright-report - name: Upload coverage data uses: codecov/codecov-action@v5 with: disable_search: true - files: /home/runner/jingrow-bench/apps/press/dashboard/coverage/cobertura-coverage.xml + files: /home/runner/jingrow-bench/apps/jcloude/dashboard/coverage/cobertura-coverage.xml fail_ci_if_error: false verbose: true token: ${{ secrets.CODECOV_TOKEN }} - name: press-dashboard + name: jcloude-dashboard flags: dashboard tests: @@ -283,10 +283,10 @@ jobs: working-directory: /home/runner/jingrow-bench run: | bench --site test_site set-config allow_tests true - bench --site test_site run-parallel-tests --app press --with-coverage --total-builds 2 --build-number ${{ matrix.container }} + bench --site test_site run-parallel-tests --app jcloude --with-coverage --total-builds 2 --build-number ${{ matrix.container }} env: TYPE: server - COVERAGE_RCFILE: /home/runner/jingrow-bench/apps/press/.coveragerc + COVERAGE_RCFILE: /home/runner/jingrow-bench/apps/jcloude/.coveragerc - name: Upload coverage reports to Codecov uses: actions/upload-artifact@v4 diff --git a/.gitignore b/.gitignore index e310501d..41f6b043 100644 --- a/.gitignore +++ b/.gitignore @@ -136,12 +136,12 @@ dmypy.json *.swp tags node_modules -press/docs/current -press/public/dashboard -press/www/dashboard.html -press/www/dashboard-old.html -press/public/css/email.css -press/public/css/saas-next.css +jcloude/docs/current +jcloude/public/dashboard +jcloude/www/dashboard.html +jcloude/www/dashboard-old.html +jcloude/public/css/email.css +jcloude/public/css/saas-next.css dashboard/tailwind.theme.json dashboard/components.d.ts @@ -158,8 +158,8 @@ backbone/packer/meta-data backbone/packer/cloud-init-scaleway.img # marketplace -press/public/css/marketplace.css -press/public/css/marketplace-next.css +jcloude/public/css/marketplace.css +jcloude/public/css/marketplace-next.css # Vim .vim diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 54ccdf58..0fdddb7c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,12 +11,12 @@ repos: # Ignore any files that might contain jinja / bundles exclude: | (?x)^( - press/public/dist/.*| + jcloude/public/dist/.*| .*node_modules.*| .*boilerplate.*| - press/www/website_script.js| - press/templates/includes/.*| - press/public/js/.*min.js + jcloude/www/website_script.js| + jcloude/templates/includes/.*| + jcloude/public/js/.*min.js )$ - repo: http://git.jingrow.com/pre-commit/pre-commit-hooks @@ -24,7 +24,7 @@ repos: hooks: - id: debug-statements - id: trailing-whitespace - files: 'press.*' + files: 'jcloude.*' exclude: '.*json$|.*txt$|.*csv|.*md|.*svg' - id: check-merge-conflict - id: check-ast diff --git a/CODEOWNERS b/CODEOWNERS index 8788841e..f23c77e2 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -22,4 +22,4 @@ dashboard/ @regdocs saas @rutwikhdev deploy* @18alantom -press/Dockerfile @18alantom +jcloude/Dockerfile @18alantom diff --git a/README.md b/README.md index 85ea75cc..ccf4c4e1 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,17 @@ **Full Service Cloud Hosting For The Jingrow Stack - Powers Jingrow Cloud** -[![codecov](https://codecov.io/gh/jingrow/press/branch/master/graph/badge.svg?token=0puvH0jUx9)](https://codecov.io/gh/jingrow/press) +[![codecov](https://codecov.io/gh/jingrow/jcloude/branch/master/graph/badge.svg?token=0puvH0jUx9)](https://codecov.io/gh/jingrow/jcloude) [![unittests](http://git.jingrow.com/jingrow/jcloude/actions/workflows/main.yaml/badge.svg)](http://git.jingrow.com/jingrow/jcloude/actions/workflows/main.yaml)
- Managed press + Managed jcloude

- Website + Website - Documentation
diff --git a/codecov.yml b/codecov.yml index 5564e53d..2865d643 100644 --- a/codecov.yml +++ b/codecov.yml @@ -10,4 +10,4 @@ coverage: threshold: 0% if_ci_failed: ignore ignore: - - press/press/report/** + - jcloude/jcloude/report/** diff --git a/dashboard/index.html b/dashboard/index.html index e47b348b..5d5d1bac 100644 --- a/dashboard/index.html +++ b/dashboard/index.html @@ -5,7 +5,7 @@ Jingrow Cloud - + diff --git a/dashboard/src/components/AccessRequestDialog.vue b/dashboard/src/components/AccessRequestDialog.vue index 293cf9c0..a7ba7c1d 100644 --- a/dashboard/src/components/AccessRequestDialog.vue +++ b/dashboard/src/components/AccessRequestDialog.vue @@ -100,7 +100,7 @@ const permissionsMeta = computed(() => ({ })); const request = createResource({ - url: 'press.api.client.insert', + url: 'jcloude.api.client.insert', makeParams: () => { const permission = Object.keys(permissionsMeta.value).reduce( (acc, permission) => { diff --git a/dashboard/src/components/AccessRequestStatusDialog.vue b/dashboard/src/components/AccessRequestStatusDialog.vue index 77f317e8..53c1f781 100644 --- a/dashboard/src/components/AccessRequestStatusDialog.vue +++ b/dashboard/src/components/AccessRequestStatusDialog.vue @@ -74,7 +74,7 @@ const emit = defineEmits<{ const open = ref(true); const status = createResource({ - url: 'press.api.access.status', + url: 'jcloude.api.access.status', auto: true, params: { doctype: props.doctype, diff --git a/dashboard/src/components/ActiveServersDialog.vue b/dashboard/src/components/ActiveServersDialog.vue index 8d3089bd..f36eb5af 100644 --- a/dashboard/src/components/ActiveServersDialog.vue +++ b/dashboard/src/components/ActiveServersDialog.vue @@ -30,7 +30,7 @@ export default { }, resources: { activeServers: { - url: 'press.api.account.active_servers', + url: 'jcloude.api.account.active_servers', auto: true, }, }, diff --git a/dashboard/src/components/AddDomainDialog.vue b/dashboard/src/components/AddDomainDialog.vue index 59498015..f33191bc 100644 --- a/dashboard/src/components/AddDomainDialog.vue +++ b/dashboard/src/components/AddDomainDialog.vue @@ -165,13 +165,13 @@ export default { }, resources: { checkDNS: { - url: 'press.api.site.check_dns', + url: 'jcloude.api.site.check_dns', validate() { if (!this.newDomain) throw new DashboardError('Domain cannot be empty'); }, }, addDomain: { - url: 'press.api.site.add_domain', + url: 'jcloude.api.site.add_domain', onSuccess() { this.$resources.checkDNS.reset(); this.$emit('domainAdded'); @@ -179,7 +179,7 @@ export default { }, }, retryAddDomain: { - url: 'press.api.site.retry_add_domain', + url: 'jcloude.api.site.retry_add_domain', onSuccess() { this.$emit('domainAdded'); // this.$resources.domains.fetch(); diff --git a/dashboard/src/components/AddTagDialog.vue b/dashboard/src/components/AddTagDialog.vue index e136ba84..ea575faa 100644 --- a/dashboard/src/components/AddTagDialog.vue +++ b/dashboard/src/components/AddTagDialog.vue @@ -26,7 +26,7 @@ diff --git a/dashboard/src/components/AddressForm.vue b/dashboard/src/components/AddressForm.vue index 9d3e3543..ab2d8a7c 100644 --- a/dashboard/src/components/AddressForm.vue +++ b/dashboard/src/components/AddressForm.vue @@ -65,7 +65,7 @@ export default { }, resources: { countryList: { - url: 'press.api.account.country_list', + url: 'jcloude.api.account.country_list', auto: true, onSuccess() { let userCountry = this.$team?.pg.country; @@ -79,7 +79,7 @@ export default { }, validateGST() { return { - url: 'press.api.billing.validate_gst', + url: 'jcloude.api.billing.validate_gst', makeParams() { return { address: this.address, diff --git a/dashboard/src/components/BackupFilesUploader.vue b/dashboard/src/components/BackupFilesUploader.vue index 228be626..3ad58522 100644 --- a/dashboard/src/components/BackupFilesUploader.vue +++ b/dashboard/src/components/BackupFilesUploader.vue @@ -183,7 +183,7 @@ export default { return true; } let post = createResource({ - url: 'press.api.site.validate_restoration_space_requirements', + url: 'jcloude.api.site.validate_restoration_space_requirements', method: 'POST', }); return post.fetch({ diff --git a/dashboard/src/components/BuyPrepaidCreditsForm.vue b/dashboard/src/components/BuyPrepaidCreditsForm.vue index 50e0a33f..5302c699 100644 --- a/dashboard/src/components/BuyPrepaidCreditsForm.vue +++ b/dashboard/src/components/BuyPrepaidCreditsForm.vue @@ -49,7 +49,7 @@ > Razorpay Logo @@ -64,7 +64,7 @@ > Stripe Logo diff --git a/dashboard/src/components/BuyPrepaidCreditsRazorpay.vue b/dashboard/src/components/BuyPrepaidCreditsRazorpay.vue index e10ffc9f..600f38ea 100644 --- a/dashboard/src/components/BuyPrepaidCreditsRazorpay.vue +++ b/dashboard/src/components/BuyPrepaidCreditsRazorpay.vue @@ -64,7 +64,7 @@ export default { resources: { createRazorpayOrder() { return { - url: 'press.api.billing.create_razorpay_order', + url: 'jcloude.api.billing.create_razorpay_order', params: { amount: this.amount, transaction_type: this.type, @@ -83,7 +83,7 @@ export default { }, handlePaymentFailed() { return { - url: 'press.api.billing.handle_razorpay_payment_failed', + url: 'jcloude.api.billing.handle_razorpay_payment_failed', onSuccess() { console.log('Payment Failed.'); }, @@ -99,7 +99,7 @@ export default { key: data.key_id, order_id: data.order_id, name: 'Jingrow Cloud', - image: '/assets/press/images/jingrow-cloud-logo.png', + image: '/assets/jcloude/images/jingrow-cloud-logo.png', prefill: { email: this.$team.pg.user, }, diff --git a/dashboard/src/components/BuyPrepaidCreditsStripe.vue b/dashboard/src/components/BuyPrepaidCreditsStripe.vue index 4f0b8e52..617d5b00 100644 --- a/dashboard/src/components/BuyPrepaidCreditsStripe.vue +++ b/dashboard/src/components/BuyPrepaidCreditsStripe.vue @@ -76,7 +76,7 @@ export default { resources: { createPaymentIntent() { return { - url: 'press.api.billing.create_payment_intent_for_buying_credits', + url: 'jcloude.api.billing.create_payment_intent_for_buying_credits', params: { amount: this.amount, }, diff --git a/dashboard/src/components/ChurnFeedbackDialog.vue b/dashboard/src/components/ChurnFeedbackDialog.vue index 5f8aaa42..2973b300 100644 --- a/dashboard/src/components/ChurnFeedbackDialog.vue +++ b/dashboard/src/components/ChurnFeedbackDialog.vue @@ -74,7 +74,7 @@ export default { resources: { submitFeedback() { return { - url: 'press.api.account.feedback', + url: 'jcloude.api.account.feedback', makeParams() { return { team: this.team, diff --git a/dashboard/src/components/CommunicationInfoDialog.vue b/dashboard/src/components/CommunicationInfoDialog.vue index dad5c7b7..924d0907 100644 --- a/dashboard/src/components/CommunicationInfoDialog.vue +++ b/dashboard/src/components/CommunicationInfoDialog.vue @@ -111,7 +111,7 @@ export default { resources: { getCommunicationInfos() { return { - url: 'press.api.client.run_pg_method', + url: 'jcloude.api.client.run_pg_method', makeParams() { return { dt: this.referenceDoctype, @@ -127,7 +127,7 @@ export default { }, updateCommunicationInfos() { return { - url: 'press.api.client.run_pg_method', + url: 'jcloude.api.client.run_pg_method', makeParams() { return { dt: this.referenceDoctype, diff --git a/dashboard/src/components/ConfigEditorDialog.vue b/dashboard/src/components/ConfigEditorDialog.vue index 9d212b87..597255d3 100644 --- a/dashboard/src/components/ConfigEditorDialog.vue +++ b/dashboard/src/components/ConfigEditorDialog.vue @@ -122,7 +122,7 @@ export default { resources: { standardKeys() { return { - url: 'press.api.site.get_site_config_standard_keys', + url: 'jcloude.api.site.get_site_config_standard_keys', cache: 'Site Config Standard Keys', initialData: [], auto: true, diff --git a/dashboard/src/components/CustomAlerts.vue b/dashboard/src/components/CustomAlerts.vue index 24a73adb..850327a4 100644 --- a/dashboard/src/components/CustomAlerts.vue +++ b/dashboard/src/components/CustomAlerts.vue @@ -108,7 +108,7 @@ export default { resources: { banners() { return { - url: 'press.api.account.get_user_banners', + url: 'jcloude.api.account.get_user_banners', auto: !!this.$team?.pg, onSuccess: (data) => { try { @@ -148,7 +148,7 @@ export default { }; }, dismissBanner() { - return { url: 'press.api.account.dismiss_banner' }; + return { url: 'jcloude.api.account.dismiss_banner' }; }, }, }; diff --git a/dashboard/src/components/GitHubAppSelector.vue b/dashboard/src/components/GitHubAppSelector.vue index 77b05f7d..8a50199c 100644 --- a/dashboard/src/components/GitHubAppSelector.vue +++ b/dashboard/src/components/GitHubAppSelector.vue @@ -149,18 +149,18 @@ export default { resources: { options() { return { - url: 'press.api.github.options', + url: 'jcloude.api.github.options', auto: true, }; }, branches() { return { - url: 'press.api.github.branches', + url: 'jcloude.api.github.branches', }; }, clearAccessToken() { return { - url: 'press.api.github.clear_token_and_get_installation_url', + url: 'jcloude.api.github.clear_token_and_get_installation_url', onSuccess(installation_url) { window.location.href = installation_url + '?state=' + this.state; }, diff --git a/dashboard/src/components/HomeSummary.vue b/dashboard/src/components/HomeSummary.vue index e9769cbd..2dac775a 100644 --- a/dashboard/src/components/HomeSummary.vue +++ b/dashboard/src/components/HomeSummary.vue @@ -35,7 +35,7 @@ export default { home() { if (!this.$team.pg?.name) return; return { - url: 'press.api.client.run_pg_method', + url: 'jcloude.api.client.run_pg_method', cache: ['home_data', this.$team.pg.name], makeParams() { return { diff --git a/dashboard/src/components/InvoiceTable.vue b/dashboard/src/components/InvoiceTable.vue index e9db6c07..e490b6e8 100644 --- a/dashboard/src/components/InvoiceTable.vue +++ b/dashboard/src/components/InvoiceTable.vue @@ -160,7 +160,7 @@ export default { }, downloadInvoiceAsCSV() { return { - url: 'press.api.billing.fetch_invoice_items', + url: 'jcloude.api.billing.fetch_invoice_items', makeParams() { return { invoice: this.invoiceId, diff --git a/dashboard/src/components/LinkControl.vue b/dashboard/src/components/LinkControl.vue index 6f8aa79d..f793f80c 100644 --- a/dashboard/src/components/LinkControl.vue +++ b/dashboard/src/components/LinkControl.vue @@ -38,7 +38,7 @@ export default { resources: { options() { return { - url: 'press.api.client.search_link', + url: 'jcloude.api.client.search_link', params: { doctype: this.options.doctype, order_by: this.options.orderBy, diff --git a/dashboard/src/components/MarketplaceAppListing.vue b/dashboard/src/components/MarketplaceAppListing.vue index 600bd7d1..c422952d 100644 --- a/dashboard/src/components/MarketplaceAppListing.vue +++ b/dashboard/src/components/MarketplaceAppListing.vue @@ -33,7 +33,7 @@ :upload-args="{ doctype: 'Marketplace App', docname: app.pg.name, - method: 'press.api.marketplace.update_app_image', + method: 'jcloude.api.marketplace.update_app_image', }" >