diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d976e616..b4024034 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -1,4 +1,4 @@ -name: Press Tests +name: Jcloude Tests on: push: diff --git a/README.md b/README.md index ccf4c4e1..a0bb9706 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
-Press logo -

Press

+Jcloude logo +

Jcloude

**Full Service Cloud Hosting For The Jingrow Stack - Powers Jingrow Cloud** @@ -20,9 +20,9 @@ Documentation
-## Press +## Jcloude -Press is a 100% open-source cloud hosting for the Jingrow stack. +Jcloude is a 100% open-source cloud hosting for the Jingrow stack. ### Motivation @@ -32,12 +32,12 @@ Additionally, customers lacked full control over their servers—no SSH access, ### Key Features -- **Multitenancy Made Easy**: Press simplifies multi-tenancy by enabling multiple sites on a single platform, each with its app version, allowing independent updates and minimal downtime, even for large sites. +- **Multitenancy Made Easy**: Jcloude simplifies multi-tenancy by enabling multiple sites on a single platform, each with its app version, allowing independent updates and minimal downtime, even for large sites. - **Dashboard**: The dashboard provides a centralized interface to manage apps, servers, sites, billing, backups, and updates, offering real-time insights and streamlined control of complex operations. - **Permissions**: Granular access controls let team owners manage roles and resources efficiently, ensuring users have access only to relevant information and actions for their roles. -- **Simplified Management**: Press streamlines site management with automated backups, real-time monitoring, role-based access, and easy scaling, making it ideal for growing Jingrow environments. +- **Simplified Management**: Jcloude streamlines site management with automated backups, real-time monitoring, role-based access, and easy scaling, making it ideal for growing Jingrow environments. - **Billing**: Automated billing supports daily or monthly subscriptions, flexible payment methods, wallet credits, and ERP integration, simplifying customer invoicing and payments. @@ -59,7 +59,7 @@ Additionally, customers lacked full control over their servers—no SSH access, - [**Jingrow UI**](http://git.jingrow.com/jingrow/jingrow-ui): A Vue-based UI library, to provide a modern user interface. The Jingrow UI library provides a variety of components that can be used to build single-page applications on top of the Jingrow Framework. -- [**Agent**](http://git.jingrow.com/jingrow/agent): A flask app designed to work along with Press. It provides a CLI interface for Press to communicate with the sites and benches. +- [**Agent**](http://git.jingrow.com/jingrow/agent): A flask app designed to work along with Jcloude. It provides a CLI interface for Jcloude to communicate with the sites and benches. - [**Docker**](https://www.docker.com): An open-source platform that enables developers to build, package, and deploy applications in lightweight, portable containers. @@ -67,7 +67,7 @@ Additionally, customers lacked full control over their servers—no SSH access, ## Setup -To self host or to setup Press locally follow the steps in the [Local Development Environment Setup Guide](https://docs.framework.jingrow.com/cloud/local-fc-setup) or [this YouTube video](https://www.learn.jingrow.com/watch?v=Xb9QHnUrIEk) +To self host or to setup Jcloude locally follow the steps in the [Local Development Environment Setup Guide](https://docs.framework.jingrow.com/cloud/local-fc-setup) or [this YouTube video](https://www.learn.jingrow.com/watch?v=Xb9QHnUrIEk) ### Pre-commit diff --git a/backbone/README.md b/backbone/README.md index 333dccbe..adf5eaf8 100644 --- a/backbone/README.md +++ b/backbone/README.md @@ -4,4 +4,4 @@ ## Installation -Automatically installed with Press +Automatically installed with Jcloude diff --git a/dashboard/src/components/AddTagDialog.vue b/dashboard/src/components/AddTagDialog.vue index ea575faa..184b3ae6 100644 --- a/dashboard/src/components/AddTagDialog.vue +++ b/dashboard/src/components/AddTagDialog.vue @@ -57,7 +57,7 @@ export default { existingTags() { return { type: 'list', - doctype: 'Press Tag', + doctype: 'Jcloude Tag', filters: { doctype_name: this.doctype }, fields: ['tag'], pageLength: 1000, diff --git a/dashboard/src/components/AddressableErrorDialog.vue b/dashboard/src/components/AddressableErrorDialog.vue index 298c3260..7334a3ef 100644 --- a/dashboard/src/components/AddressableErrorDialog.vue +++ b/dashboard/src/components/AddressableErrorDialog.vue @@ -77,7 +77,7 @@ export default { notification() { return { type: 'document', - doctype: 'Press Notification', + doctype: 'Jcloude Notification', name: this.name, whitelistedMethods: { markAsAddressed: 'mark_as_addressed', diff --git a/dashboard/src/components/NavigationItems.vue b/dashboard/src/components/NavigationItems.vue index a3078eab..249f9256 100644 --- a/dashboard/src/components/NavigationItems.vue +++ b/dashboard/src/components/NavigationItems.vue @@ -53,7 +53,7 @@ export default { name: 'Notifications', icon: () => h(Notification), route: '/notifications', - isActive: routeName === 'Press Notification List', + isActive: routeName === 'Jcloude Notification List', condition: onboardingComplete && !isSaasUser, badge: () => { if (unreadNotificationsCount.data > 0) { @@ -229,7 +229,7 @@ export default { }, }, mounted() { - this.$socket.emit('doctype_subscribe', 'Press Notification'); + this.$socket.emit('doctype_subscribe', 'Jcloude Notification'); this.$socket.on('jcloude_notification', (data) => { if (data.team === this.$team.pg.name) { unreadNotificationsCount.setData((data) => data + 1); diff --git a/dashboard/src/components/partners/PartnerCreditsForm.vue b/dashboard/src/components/partners/PartnerCreditsForm.vue index 80551603..f40a4705 100644 --- a/dashboard/src/components/partners/PartnerCreditsForm.vue +++ b/dashboard/src/components/partners/PartnerCreditsForm.vue @@ -94,8 +94,8 @@ const emit = defineEmits(['success']); const team = inject('team'); const pressSettings = createDocumentResource({ - doctype: 'Press Settings', - name: 'Press Settings', + doctype: 'Jcloude Settings', + name: 'Jcloude Settings', auto: true, initialData: {}, }); diff --git a/dashboard/src/components/settings/ActivateWebhookDialog.vue b/dashboard/src/components/settings/ActivateWebhookDialog.vue index 72569bea..929cec7a 100644 --- a/dashboard/src/components/settings/ActivateWebhookDialog.vue +++ b/dashboard/src/components/settings/ActivateWebhookDialog.vue @@ -84,7 +84,7 @@ export default { url: 'jcloude.api.client.run_pg_method', makeParams() { return { - dt: 'Press Webhook', + dt: 'Jcloude Webhook', dn: this.webhook.name, method: 'validate_endpoint', }; @@ -115,7 +115,7 @@ export default { url: 'jcloude.api.client.run_pg_method', makeParams() { return { - dt: 'Press Webhook', + dt: 'Jcloude Webhook', dn: this.webhook.name, method: 'activate', }; diff --git a/dashboard/src/components/settings/DeveloperSettings.vue b/dashboard/src/components/settings/DeveloperSettings.vue index df167840..c847ce0a 100644 --- a/dashboard/src/components/settings/DeveloperSettings.vue +++ b/dashboard/src/components/settings/DeveloperSettings.vue @@ -294,7 +294,7 @@ function renderAddNewKeyDialog(listResource) { const webhookListResource = createResource({ url: 'jcloude.api.client.get_list', params: { - doctype: 'Press Webhook', + doctype: 'Jcloude Webhook', fields: ['name', 'enabled', 'endpoint'], }, initialData: [], @@ -368,7 +368,7 @@ const webhookListOptions = computed(() => ({ onClick({ hide }) { disableWebhook .submit({ - dt: 'Press Webhook', + dt: 'Jcloude Webhook', dn: row.name, method: 'disable', }) @@ -406,7 +406,7 @@ const webhookListOptions = computed(() => ({ onClick({ hide }) { deleteWebhook .submit({ - doctype: 'Press Webhook', + doctype: 'Jcloude Webhook', name: row.name, }) .then(hide); diff --git a/dashboard/src/components/settings/EditWebhookDialog.vue b/dashboard/src/components/settings/EditWebhookDialog.vue index 8a5db05d..6622cc6e 100644 --- a/dashboard/src/components/settings/EditWebhookDialog.vue +++ b/dashboard/src/components/settings/EditWebhookDialog.vue @@ -111,7 +111,7 @@ export default { return { url: 'jcloude.api.client.get', params: { - doctype: 'Press Webhook', + doctype: 'Jcloude Webhook', name: this.webhook.name, }, auto: true, diff --git a/dashboard/src/components/settings/InviteTeamMemberDialog.vue b/dashboard/src/components/settings/InviteTeamMemberDialog.vue index 75488208..f3bfe739 100644 --- a/dashboard/src/components/settings/InviteTeamMemberDialog.vue +++ b/dashboard/src/components/settings/InviteTeamMemberDialog.vue @@ -76,7 +76,7 @@ export default { roles() { return { type: 'list', - doctype: 'Press Role', + doctype: 'Jcloude Role', fields: ['name', 'title'], initialData: [], auto: true, diff --git a/dashboard/src/components/settings/Role.vue b/dashboard/src/components/settings/Role.vue index e18f1e59..a7b27b31 100644 --- a/dashboard/src/components/settings/Role.vue +++ b/dashboard/src/components/settings/Role.vue @@ -137,7 +137,7 @@ const user = getSessionUser(); const tab = ref<'members' | 'resources' | 'permissions'>('members'); const role = createDocumentResource({ - doctype: 'Press Role', + doctype: 'Jcloude Role', name: props.id, auto: true, whitelistedMethods: { diff --git a/dashboard/src/components/settings/RoleConfigureDialog.vue b/dashboard/src/components/settings/RoleConfigureDialog.vue index 47f1fd44..403691c3 100644 --- a/dashboard/src/components/settings/RoleConfigureDialog.vue +++ b/dashboard/src/components/settings/RoleConfigureDialog.vue @@ -181,7 +181,7 @@ export default { role() { return { type: 'document', - doctype: 'Press Role', + doctype: 'Jcloude Role', name: this.roleId, whitelistedMethods: { addUser: 'add_user', diff --git a/dashboard/src/components/settings/RoleList.vue b/dashboard/src/components/settings/RoleList.vue index 5527934f..6cf76080 100644 --- a/dashboard/src/components/settings/RoleList.vue +++ b/dashboard/src/components/settings/RoleList.vue @@ -79,7 +79,7 @@ (title, users, resources) => { insert.submit({ pg: { - doctype: 'Press Role', + doctype: 'Jcloude Role', title, users: users.map((u) => ({ user: u, @@ -104,7 +104,7 @@ import RoleCreateDialog from './RoleCreateDialog.vue'; const showCreateDialog = ref(false); const roles = createListResource({ - doctype: 'Press Role', + doctype: 'Jcloude Role', fields: [ 'name', 'title', diff --git a/dashboard/src/controllers/call.js b/dashboard/src/controllers/call.js index a8e1b4d4..38215a51 100644 --- a/dashboard/src/controllers/call.js +++ b/dashboard/src/controllers/call.js @@ -13,7 +13,7 @@ export default async function call(method, args) { let team = localStorage.getItem('current_team') || null; if (team) { - headers['X-Press-Team'] = team; + headers['X-Jcloude-Team'] = team; } if (window.csrf_token && window.csrf_token !== '{{ csrf_token }}') { diff --git a/dashboard/src/dialogs/TagsDialog.vue b/dashboard/src/dialogs/TagsDialog.vue index 5b9cef67..605befab 100644 --- a/dashboard/src/dialogs/TagsDialog.vue +++ b/dashboard/src/dialogs/TagsDialog.vue @@ -43,7 +43,7 @@ export default { availableTags() { return { type: 'list', - doctype: 'Press Tag', + doctype: 'Jcloude Tag', filters: { doctype_name: this.doctype }, fields: ['tag'], pageLength: 1000, diff --git a/dashboard/src/main.js b/dashboard/src/main.js index e6169a90..84ba63b7 100644 --- a/dashboard/src/main.js +++ b/dashboard/src/main.js @@ -22,7 +22,7 @@ const request = (options) => { const currentTeam = localStorage.getItem('current_team') || window.default_team; if (currentTeam) { - _options.headers['X-Press-Team'] = currentTeam; + _options.headers['X-Jcloude-Team'] = currentTeam; } return frappeRequest(_options); }; diff --git a/dashboard/src/objects/group.js b/dashboard/src/objects/group.js index c150df29..d52cbe35 100644 --- a/dashboard/src/objects/group.js +++ b/dashboard/src/objects/group.js @@ -60,7 +60,7 @@ export default { label: 'Tag', fieldname: 'tags.tag', options: { - doctype: 'Press Tag', + doctype: 'Jcloude Tag', filters: { doctype_name: 'Release Group', }, diff --git a/dashboard/src/objects/notification.js b/dashboard/src/objects/notification.js index c87a6ef6..d71c75fc 100644 --- a/dashboard/src/objects/notification.js +++ b/dashboard/src/objects/notification.js @@ -9,7 +9,7 @@ import { toast } from 'vue-sonner'; const getNotification = (name) => { return getDocResource({ - doctype: 'Press Notification', + doctype: 'Jcloude Notification', name: name, whitelistedMethods: { markNotificationAsRead: 'mark_as_read', @@ -18,14 +18,14 @@ const getNotification = (name) => { }; export default { - doctype: 'Press Notification', + doctype: 'Jcloude Notification', whitelistedMethods: {}, list: { resource() { let $team = getTeam(); return { type: 'list', - doctype: 'Press Notification', + doctype: 'Jcloude Notification', url: 'jcloude.api.notifications.get_notifications', auto: true, filters: { diff --git a/dashboard/src/objects/server.js b/dashboard/src/objects/server.js index 7afb368a..78c910a5 100644 --- a/dashboard/src/objects/server.js +++ b/dashboard/src/objects/server.js @@ -348,7 +348,7 @@ export default { label: 'Tag', fieldname: 'tags.tag', options: { - doctype: 'Press Tag', + doctype: 'Jcloude Tag', filters: { doctype_name: 'Site', }, @@ -460,7 +460,7 @@ export default { label: 'Tag', fieldname: 'tags.tag', options: { - doctype: 'Press Tag', + doctype: 'Jcloude Tag', filters: { doctype_name: 'Release Group', }, diff --git a/dashboard/src/objects/site.js b/dashboard/src/objects/site.js index 978c3d00..a35c8157 100644 --- a/dashboard/src/objects/site.js +++ b/dashboard/src/objects/site.js @@ -127,7 +127,7 @@ export default { label: 'Tag', fieldname: 'tags.tag', options: { - doctype: 'Press Tag', + doctype: 'Jcloude Tag', filters: { doctype_name: 'Site', }, diff --git a/dashboard/src/pages/DeployCandidate.vue b/dashboard/src/pages/DeployCandidate.vue index cd5721b3..cf10464d 100644 --- a/dashboard/src/pages/DeployCandidate.vue +++ b/dashboard/src/pages/DeployCandidate.vue @@ -146,12 +146,12 @@ export default { return { type: 'list', cache: [ - 'Press Notification', + 'Jcloude Notification', 'Warning', 'Deploy Candidate Build', this.id, ], - doctype: 'Press Notification', + doctype: 'Jcloude Notification', auto: true, fields: ['title', 'name'], filters: { @@ -166,12 +166,12 @@ export default { return { type: 'list', cache: [ - 'Press Notification', + 'Jcloude Notification', 'Error', 'Deploy Candidate Build', this.id, ], - doctype: 'Press Notification', + doctype: 'Jcloude Notification', auto: true, fields: ['title', 'name'], filters: { diff --git a/dashboard/src/pages/JobPage.vue b/dashboard/src/pages/JobPage.vue index 19e4b7d4..bb7d398e 100644 --- a/dashboard/src/pages/JobPage.vue +++ b/dashboard/src/pages/JobPage.vue @@ -132,8 +132,8 @@ export default { errors() { return { type: 'list', - cache: ['Press Notification', 'Error', 'Agent Job', this.id], - doctype: 'Press Notification', + cache: ['Jcloude Notification', 'Error', 'Agent Job', this.id], + doctype: 'Jcloude Notification', auto: true, fields: ['title', 'name'], filters: { diff --git a/docs/How to ?/Add New Press Webhook.MD b/docs/How to ?/Add New Press Webhook.MD index c0043d47..52b94261 100644 --- a/docs/How to ?/Add New Press Webhook.MD +++ b/docs/How to ?/Add New Press Webhook.MD @@ -9,7 +9,7 @@ General introduction to jcloude webhook can be found in [the public documentatio Add New Webhook Event --------------------- -1. Go to `Press Webhook Event` doctype in desk. +1. Go to `Jcloude Webhook Event` doctype in desk. 2. Create a new record and fill up the title and description of event. This title and description will be shown to users to select. 3. If you are on local development setup, you can export fixtures. 4. Update the documentation of `Webhook Events` as well > @@ -47,8 +47,8 @@ It may not work because in agent job update process functions and other places, Related Doctypes ---------------- -1. **Press Webhook Event** - Type of webhook events (e.g. *Site Status Update*). -2. **Press Webhook** - Holds the configured webhook of teams. -3. **Press Webhook Selected Event** - Child table to hold selected events for `Press Webhook` doctype. -4. **Press Webhook Log** - This doctype record gets created, when we try to dispatch a webhook event to a team. It has a child table `Press Webhook Attempts` which hold request/response of webhook calls. Also manage status, retry information as well. -5. **Press Webhook Attempt** - Child table which hold request, response, status code, overall status, timestamp of a webhook request. +1. **Jcloude Webhook Event** - Type of webhook events (e.g. *Site Status Update*). +2. **Jcloude Webhook** - Holds the configured webhook of teams. +3. **Jcloude Webhook Selected Event** - Child table to hold selected events for `Jcloude Webhook` doctype. +4. **Jcloude Webhook Log** - This doctype record gets created, when we try to dispatch a webhook event to a team. It has a child table `Jcloude Webhook Attempts` which hold request/response of webhook calls. Also manage status, retry information as well. +5. **Jcloude Webhook Attempt** - Child table which hold request, response, status code, overall status, timestamp of a webhook request. diff --git a/docs/How to ?/Update Agents on Prod.MD b/docs/How to ?/Update Agents on Prod.MD index f0469701..ffa2bfa3 100644 --- a/docs/How to ?/Update Agents on Prod.MD +++ b/docs/How to ?/Update Agents on Prod.MD @@ -27,7 +27,7 @@ Top section contains overall status, start and end time. You need to provide the info of git repo and branch info here. -You can ignore all of these fields, the repo and branch will be fetched from `Press Settings` in case you don't provide any choice. +You can ignore all of these fields, the repo and branch will be fetched from `Jcloude Settings` in case you don't provide any choice. If you want to update to a specific commit hash only, you can provide that info, else it will auto populate the info after save. diff --git a/docs/Introduction/Local Setup Using Cloud.MD b/docs/Introduction/Local Setup Using Cloud.MD index e4466c73..84c3b0da 100644 --- a/docs/Introduction/Local Setup Using Cloud.MD +++ b/docs/Introduction/Local Setup Using Cloud.MD @@ -94,7 +94,7 @@ Now, create a new site and install `jcloude` on this site. Open the site and login as Administrator. -Press Settings +Jcloude Settings -------------- ### Create a `Root Domain` @@ -114,9 +114,9 @@ Save it. > You can get your Access Keys by going to AWS Console > IAM > User > John Doe (create one if required) > Security credentials > Access Keys -Open `Press Settings` now. Now, set the `Domain` to the root domain you created in the previous step and cluster to `Default`. +Open `Jcloude Settings` now. Now, set the `Domain` to the root domain you created in the previous step and cluster to `Default`. -Now, there is going to be a lot of back and forth between your terminal and `Press Settings`, so sit tight. +Now, there is going to be a lot of back and forth between your terminal and `Jcloude Settings`, so sit tight. ### Let's Encrypt @@ -158,7 +158,7 @@ Go to your terminal and `cd` into your `bench` directory. Create two directories 2. `.docker-builds` -Go back to the `Press Settings`and paste the absolute paths of the above two directories to the `Clone Directory` and `Build Directory` respectively. Leave the other field empty and save the settings. +Go back to the `Jcloude Settings`and paste the absolute paths of the above two directories to the `Clone Directory` and `Build Directory` respectively. Leave the other field empty and save the settings. Sometimes, there is an issue while uploading a docker image in the background and you have to manually `push` it to registry. For that case, you have to login to digital ocean registry through docker before pushing. You can do this by running this command: @@ -171,7 +171,7 @@ This step is optional and is required only if you are planning to work on billin You can signup for a new Stripe account from [https://dashboard.stripe.com/](https://dashboard.stripe.com). By default, Stripe gives you a test account which is enough for our development purposes. -Get the Publishable Key and Secret Key from Stripe dashboard and create your Stripe Account and set it in Press Settings. Set values for Credits on Signup fields. For e.g., INR 1800 and USD 25. +Get the Publishable Key and Secret Key from Stripe dashboard and create your Stripe Account and set it in Jcloude Settings. Set values for Credits on Signup fields. For e.g., INR 1800 and USD 25. Now click on Create Stripe Webhook. It should create webhook endpoints on Stripe and set the field Stripe Webhook Endpoint ID. @@ -275,7 +275,7 @@ That's it for the `f` server. Setting up Builds ----------------- -Under **Press Settings** > **Docker** > **Docker Build** set **Build Server** to the app server you have created in the previous set. +Under **Jcloude Settings** > **Docker** > **Docker Build** set **Build Server** to the app server you have created in the previous set. Now, when you run a _Build and Deploy_, the image that is created for the deployment will be built on the Build Server. @@ -299,7 +299,7 @@ You should create at least one site plan for the tenants to be able to start usi ![](../files/site-plan-16c3ee4.png) -Now under Roles, add `Press Admin` and `Press Member`. +Now under Roles, add `Jcloude Admin` and `Jcloude Member`. ![](../files/site-plan-2.png) diff --git a/docs/Other Setup Guide/Database Server Setup.MD b/docs/Other Setup Guide/Database Server Setup.MD index dce68f8c..6c7c6a16 100644 --- a/docs/Other Setup Guide/Database Server Setup.MD +++ b/docs/Other Setup Guide/Database Server Setup.MD @@ -9,7 +9,7 @@ Database Server runs MariaDB server listening on a private IP address. > Note: See [Server Setup](/internal/servers/server-setup) for detailed explanation. #### Requires -- Press host must have root SSH access to the target machine. +- Jcloude host must have root SSH access to the target machine. #### Steps diff --git a/docs/Other Setup Guide/Proxy Server Setup.MD b/docs/Other Setup Guide/Proxy Server Setup.MD index d3c7c154..f387ec57 100644 --- a/docs/Other Setup Guide/Proxy Server Setup.MD +++ b/docs/Other Setup Guide/Proxy Server Setup.MD @@ -9,7 +9,7 @@ Proxy Server runs NGINX as a reverse proxy. > Note: See [Server Setup](/internal/servers/server-setup) for detailed explanation. #### Requires -Press host must have root SSH access to the target machine. +Jcloude host must have root SSH access to the target machine. #### Steps diff --git a/docs/Other Setup Guide/Server Setup.MD b/docs/Other Setup Guide/Server Setup.MD index 61492956..4e16a168 100644 --- a/docs/Other Setup Guide/Server Setup.MD +++ b/docs/Other Setup Guide/Server Setup.MD @@ -9,7 +9,7 @@ Server runs benches as well as its own MariaDB database. > Note: [Proxy Server Setup](/internal/servers/proxy-server-setup) must be completed before Server setup. #### Requires -- Press host must have root SSH access to the target machine. +- Jcloude host must have root SSH access to the target machine. #### Steps diff --git a/docs/order.yml b/docs/order.yml index 6a8ee7ad..62a6397a 100644 --- a/docs/order.yml +++ b/docs/order.yml @@ -10,7 +10,7 @@ - Debugging Issues - Marketplace Review Process - How to ?: - - Add New Press Webhook + - Add New Jcloude Webhook - Build a Bench - Update Agents on Prod - Setup Database Replica diff --git a/guide-to-testing.md b/guide-to-testing.md index be645046..0889615e 100644 --- a/guide-to-testing.md +++ b/guide-to-testing.md @@ -5,7 +5,7 @@ styling tools setup so CI won't fail from these Instructions [here](http://git.jingrow.com/jingrow/jcloude/issues/424#issuecomment-1193375098) -# Writing Tests for Press +# Writing Tests for Jcloude Writing tests involve running tests locally (duh). So let's get that setup. (You'll only have to do this once) @@ -38,13 +38,13 @@ bench --site test_site reinstall --yes ## Writing tests -This is the hard part. Because of Press's dependency with outside world, it's +This is the hard part. Because of Jcloude's dependency with outside world, it's hard to isolate unit tests to this project. Regardless it's still possible with plain old python's built in libraries. Majority of this is done with the help of python's `unittest.mock` library. We use this library to mock parts of code when referencing things that are out of -Press's control. +Jcloude's control. Eg: We can mock all Agent Job creation calls by decorating the TestCase class like so @@ -177,7 +177,7 @@ http://git.jingrow.com/jingrow/jcloude/blob/23711e2799f2d24dfd7bbe2b6cd148f54f4b Here, we check what args was Ansible constructor was called with. -That's pretty much all you need to write safe, rerunnable tests for Press. You +That's pretty much all you need to write safe, rerunnable tests for Jcloude. You can checkout https://docs.python.org/3/library/unittest.mock.html for more things you can do with the standard python libraries. If your editor and plugins are setup configured nicely, you can even do TDD with ease. diff --git a/libs/README.md b/libs/README.md index b0e1b328..802d01d7 100644 --- a/libs/README.md +++ b/libs/README.md @@ -1,4 +1,4 @@ -This folder holds the library / tools written for Press or agent. +This folder holds the library / tools written for Jcloude or agent. Please check the `README.md` of the library / tool for more details. diff --git a/libs/fc_cli/pyproject.toml b/libs/fc_cli/pyproject.toml index 5e014452..9dae245c 100644 --- a/libs/fc_cli/pyproject.toml +++ b/libs/fc_cli/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "Press-CLI" +name = "Jcloude-CLI" description = "CLI to manage jingrow cloud" readme = "README.md" license = "AGPL-3.0-only" diff --git a/libs/fcrestore/requests.go b/libs/fcrestore/requests.go index e7ef6631..65f27009 100644 --- a/libs/fcrestore/requests.go +++ b/libs/fcrestore/requests.go @@ -143,7 +143,7 @@ func (s *Session) SendRequestWithContext(ctx context.Context, method string, pay } req.Header = http.Header{ "Content-Type": {"application/json"}, - "X-Press-Team": {s.CurrentTeam}, + "X-Jcloude-Team": {s.CurrentTeam}, "Cookie": {fmt.Sprintf("sid=%s", s.SessionID)}, } diff --git a/press/access/support_access.py b/press/access/support_access.py index fd27f512..c05ef8e7 100644 --- a/press/access/support_access.py +++ b/press/access/support_access.py @@ -39,7 +39,7 @@ def has_support_access(doctype: str, docname: str, action: str | None = None) -> if jingrow.local.system_user(): return True - if not jcloude_utils.has_role("Press Support Agent"): + if not jcloude_utils.has_role("Jcloude Support Agent"): return False if access_utils.is_public_resource(doctype, docname): diff --git a/press/agent.py b/press/agent.py index f0027ec4..71998143 100644 --- a/press/agent.py +++ b/press/agent.py @@ -55,7 +55,7 @@ class Agent: def new_bench(self, bench: "Bench"): settings = jingrow.db.get_value( - "Press Settings", + "Jcloude Settings", None, ["docker_registry_url", "docker_registry_username", "docker_registry_password"], as_dict=True, @@ -536,7 +536,7 @@ class Agent: data = {"with_files": site_backup.with_files} if site_backup.offsite: - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") backups_path = os.path.join(site.name, str(date.today())) backup_bucket = get_backup_bucket(site.cluster, region=True) bucket_name = backup_bucket.get("name") if isinstance(backup_bucket, dict) else backup_bucket @@ -906,7 +906,7 @@ class Agent: password = get_decrypted_password(self.server_type, self.server, "agent_password") headers = {"Authorization": f"bearer {password}", "X-Agent-Job-Id": agent_job_id} url = f"https://{self.server}:{self.port}/agent/{path}" - intermediate_ca = jingrow.db.get_value("Press Settings", "Press Settings", "backbone_intermediate_ca") + intermediate_ca = jingrow.db.get_value("Jcloude Settings", "Jcloude Settings", "backbone_intermediate_ca") if jingrow.conf.developer_mode and intermediate_ca: root_ca = jingrow.db.get_value("Certificate Authority", intermediate_ca, "parent_authority") verify = jingrow.get_pg("Certificate Authority", root_ca).certificate_file @@ -1058,7 +1058,7 @@ Response: {reason or getattr(result, "text", "Unknown")} """ disable_agent_job_deduplication = jingrow.db.get_single_value( - "Press Settings", "disable_agent_job_deduplication", cache=True + "Jcloude Settings", "disable_agent_job_deduplication", cache=True ) if not disable_agent_job_deduplication: @@ -1434,7 +1434,7 @@ Response: {reason or getattr(result, "text", "Unknown")} def pull_docker_images(self, image_tags: list[str], reference_doctype=None, reference_name=None): settings = jingrow.db.get_value( - "Press Settings", + "Jcloude Settings", None, ["docker_registry_url", "docker_registry_username", "docker_registry_password"], as_dict=True, @@ -1458,7 +1458,7 @@ Response: {reason or getattr(result, "text", "Unknown")} self, images: list[str], reference_doctype: str | None = None, reference_name: str | None = None ) -> AgentJob: settings = jingrow.db.get_value( - "Press Settings", + "Jcloude Settings", None, ["docker_registry_url", "docker_registry_username", "docker_registry_password"], as_dict=True, @@ -1484,7 +1484,7 @@ Response: {reason or getattr(result, "text", "Unknown")} if self.server_type != "Database Server": return NotImplementedError("Only Database Server supports this method") - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") backup_bucket = get_backup_bucket( jingrow.get_value("Database Server", self.server, "cluster"), region=True ) @@ -1688,7 +1688,7 @@ Response: {reason or getattr(result, "text", "Unknown")} } # offsite config - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") backups_path = os.path.join(site, str(date.today())) backup_bucket = get_backup_bucket(cluster, region=True) bucket_name = backup_bucket.get("name") if isinstance(backup_bucket, dict) else backup_bucket @@ -1726,7 +1726,7 @@ Response: {reason or getattr(result, "text", "Unknown")} } # offsite config - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") backups_path = os.path.join(site, str(date.today())) backup_bucket = get_backup_bucket(cluster, region=True) bucket_name = backup_bucket.get("name") if isinstance(backup_bucket, dict) else backup_bucket diff --git a/press/api/account.py b/press/api/account.py index b958e9d8..21055475 100644 --- a/press/api/account.py +++ b/press/api/account.py @@ -61,7 +61,7 @@ def signup(email: str, product: str | None = None, referrer: str | None = None) { "doctype": "Account Request", "email": email, - "role": "Press Admin", + "role": "Jcloude Admin", "referrer_id": referrer, "send_email": True, "product_trial": product, @@ -512,7 +512,7 @@ def _get(): "saas_site_request": team_pg.get_pending_saas_site_request(), "feature_flags": { "verify_cards_with_micro_charge": jingrow.db.get_single_value( - "Press Settings", "verify_cards_with_micro_charge" + "Jcloude Settings", "verify_cards_with_micro_charge" ) }, "partner_email": team_pg.partner_email or "", @@ -537,7 +537,7 @@ def current_team(): def get_permissions(): user = jingrow.session.user groups = tuple( - [*jingrow.get_all("Press Permission Group User", {"user": user}, pluck="parent"), "1", "2"] + [*jingrow.get_all("Jcloude Permission Group User", {"user": user}, pluck="parent"), "1", "2"] ) # [1, 2] is for avoiding singleton tuples docperms = jingrow.db.sql( f""" @@ -564,7 +564,7 @@ def has_method_permission(doctype, docname, method) -> bool: def signup_settings(product=None, fetch_countries=False, timezone=None): from jcloude.utils.country_timezone import get_country_from_timezone - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") product = jingrow.utils.cstr(product) product_trial = None @@ -594,7 +594,7 @@ def signup_settings(product=None, fetch_countries=False, timezone=None): @jingrow.whitelist(allow_guest=True) def guest_feature_flags(): return { - "enable_google_oauth": jingrow.db.get_single_value("Press Settings", "enable_google_oauth"), + "enable_google_oauth": jingrow.db.get_single_value("Jcloude Settings", "enable_google_oauth"), } @@ -636,7 +636,7 @@ def new_team(email, current_team): { "doctype": "Account Request", "email": email, - "role": "Press Member", + "role": "Jcloude Member", "send_email": True, "team": email, "invited_by": current_team, @@ -694,7 +694,7 @@ def update_profile_picture(): @jingrow.whitelist() def update_feature_flags(values=None): - jingrow.only_for("Press Admin") + jingrow.only_for("Jcloude Admin") team = get_current_team(get_pg=True) values = jingrow.parse_json(values) fields = [ @@ -885,7 +885,7 @@ def validate_pincode(billing_details): @jingrow.whitelist(allow_guest=True) def feedback(team, message, note, rating, route=None): - feedback = jingrow.new_pg("Press Feedback") + feedback = jingrow.new_pg("Jcloude Feedback") team_pg = jingrow.get_pg("Team", team) feedback.team = team feedback.message = message @@ -1064,12 +1064,12 @@ def get_permission_options(name, ptype): available_actions, ) - doctypes = jingrow.get_all("Press Method Permission", pluck="document_type", distinct=True) + doctypes = jingrow.get_all("Jcloude Method Permission", pluck="document_type", distinct=True) options = [] for doctype in doctypes: pg = jingrow.qb.DocType(doctype) - perm_pg = jingrow.qb.DocType("Press User Permission") + perm_pg = jingrow.qb.DocType("Jcloude User Permission") subtable = ( jingrow.qb.from_(perm_pg) .select("*") @@ -1106,7 +1106,7 @@ def update_permissions(user, ptype, updated): for pg, updated_perms in docs.items(): ptype_cap = ptype.capitalize() old_perms = jingrow.get_all( - "Press User Permission", + "Jcloude User Permission", filters={ "type": ptype_cap, ptype: user, @@ -1122,7 +1122,7 @@ def update_permissions(user, ptype, updated): # perms to remove remove = set(old_perms).difference(set(updated_perms)) drop += jingrow.get_all( - "Press User Permission", + "Jcloude User Permission", filters={ "type": ptype_cap, ptype: user, @@ -1135,56 +1135,56 @@ def update_permissions(user, ptype, updated): if values: jingrow.db.bulk_insert( - "Press User Permission", + "Jcloude User Permission", fields=["name", "type", "document_type", "document_name", ptype, "action"], values=set(values), ignore_duplicates=True, ) if drop: - jingrow.db.delete("Press User Permission", {"name": ("in", drop)}) + jingrow.db.delete("Jcloude User Permission", {"name": ("in", drop)}) jingrow.db.commit() @jingrow.whitelist() def groups(): - return jingrow.get_all("Press Permission Group", {"team": get_current_team()}, ["name", "title"]) + return jingrow.get_all("Jcloude Permission Group", {"team": get_current_team()}, ["name", "title"]) @jingrow.whitelist() def permission_group_users(name): - if get_current_team() != jingrow.db.get_value("Press Permission Group", name, "team"): + if get_current_team() != jingrow.db.get_value("Jcloude Permission Group", name, "team"): jingrow.throw("You are not allowed to view this group") - return jingrow.get_all("Press Permission Group User", {"parent": name}, pluck="user") + return jingrow.get_all("Jcloude Permission Group User", {"parent": name}, pluck="user") @jingrow.whitelist() def add_permission_group(title): pg = jingrow.get_pg( - {"doctype": "Press Permission Group", "team": get_current_team(), "title": title} + {"doctype": "Jcloude Permission Group", "team": get_current_team(), "title": title} ).insert(ignore_permissions=True) return {"name": pg.name, "title": pg.title} @jingrow.whitelist() -@protected("Press Permission Group") +@protected("Jcloude Permission Group") def remove_permission_group(name): - jingrow.db.delete("Press User Permission", {"group": name}) - jingrow.delete_pg("Press Permission Group", name) + jingrow.db.delete("Jcloude User Permission", {"group": name}) + jingrow.delete_pg("Jcloude Permission Group", name) @jingrow.whitelist() -@protected("Press Permission Group") +@protected("Jcloude Permission Group") def add_permission_group_user(name, user): - pg = jingrow.get_pg("Press Permission Group", name) + pg = jingrow.get_pg("Jcloude Permission Group", name) pg.append("users", {"user": user}) pg.save(ignore_permissions=True) @jingrow.whitelist() -@protected("Press Permission Group") +@protected("Jcloude Permission Group") def remove_permission_group_user(name, user): - pg = jingrow.get_pg("Press Permission Group", name) + pg = jingrow.get_pg("Jcloude Permission Group", name) for group_user in pg.users: if group_user.user == user: pg.remove(group_user) @@ -1194,8 +1194,8 @@ def remove_permission_group_user(name, user): @jingrow.whitelist() def get_permission_roles(): - PressRole = jingrow.qb.DocType("Press Role") - PressRoleUser = jingrow.qb.DocType("Press Role User") + PressRole = jingrow.qb.DocType("Jcloude Role") + PressRoleUser = jingrow.qb.DocType("Jcloude Role User") return ( jingrow.qb.from_(PressRole) diff --git a/press/api/analytics.py b/press/api/analytics.py index 83ac6c30..37fe3688 100644 --- a/press/api/analytics.py +++ b/press/api/analytics.py @@ -107,7 +107,7 @@ class StackedGroupByChart: resource_type: ResourceType, max_no_of_paths: int = MAX_NO_OF_PATHS, ): - self.log_server = jingrow.db.get_single_value("Press Settings", "log_server") + self.log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if not self.log_server: return @@ -280,7 +280,7 @@ class StackedGroupByChart: return True def run(self): - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if not log_server: return {"datasets": [], "labels": []} return self.get_stacked_histogram_chart() @@ -366,7 +366,7 @@ class NginxRequestGroupByChart(StackedGroupByChart): def setup_search_filters(self): super().setup_search_filters() - jcloude_settings: PressSettings = jingrow.get_cached_pg("Press Settings") + jcloude_settings: PressSettings = jingrow.get_cached_pg("Jcloude Settings") if not ( jcloude_settings.monitor_server and ( @@ -375,7 +375,7 @@ class NginxRequestGroupByChart(StackedGroupByChart): ) ) ): - jingrow.throw("Monitor server not set in Press Settings") + jingrow.throw("Monitor server not set in Jcloude Settings") self.search = self.search.exclude("match_phrase", source__ip=monitor_ip) if ResourceType(self.resource_type) is ResourceType.SITE: server = jingrow.db.get_value("Site", self.name, "server") @@ -457,7 +457,7 @@ class SlowLogGroupByChart(StackedGroupByChart): def _query_prometheus(query: dict[str, str]) -> dict[str, float | str]: - monitor_server = jingrow.db.get_single_value("Press Settings", "monitor_server") + monitor_server = jingrow.db.get_single_value("Jcloude Settings", "monitor_server") url = f"https://{monitor_server}/prometheus/api/v1/query_range" password = get_decrypted_password("Monitor Server", monitor_server, "grafana_password") return requests.get(url, params=query, auth=("jingrow", password)).json() @@ -755,7 +755,7 @@ def get_rounded_boundaries(timespan: int, timegrain: int, timezone: str = "UTC") def get_uptime(site, timezone, timespan, timegrain): - monitor_server = jingrow.db.get_single_value("Press Settings", "monitor_server") + monitor_server = jingrow.db.get_single_value("Jcloude Settings", "monitor_server") if not monitor_server: return [] @@ -990,7 +990,7 @@ class GenerateReportReports(BackgroundJobGroupByChart): def get_usage(site, type, timezone, timespan, timegrain): - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if not log_server: return {"datasets": [], "labels": []} @@ -1049,7 +1049,7 @@ def get_usage(site, type, timezone, timespan, timegrain): def get_current_cpu_usage(site): try: - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if not log_server: return 0 @@ -1081,7 +1081,7 @@ def get_current_cpu_usage(site): def get_current_cpu_usage_for_sites_on_server(server): result = {} with suppress(Exception): - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if not log_server: return result @@ -1152,7 +1152,7 @@ def get_current_cpu_usage_for_sites_on_server(server): @site.feature("monitor_access") def request_logs(site, timezone, date, sort=None, start=0): result = [] - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if not log_server: jingrow.log_error("Log server not configured") return result @@ -1293,7 +1293,7 @@ def deadlock_report(site, start_datetime, stop_datetime, max_log_size=500): @protected("Marketplace App") def plausible_analytics(name): response = {} - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") api_endpoints = { "aggregate": "/api/v1/stats/aggregate", "timeseries": "/api/v1/stats/timeseries", diff --git a/press/api/bench.py b/press/api/bench.py index 239db2c9..38dee8d9 100644 --- a/press/api/bench.py +++ b/press/api/bench.py @@ -89,7 +89,7 @@ def get(name): "no_sites": jingrow.db.count("Site", {"group": group.name, "status": "Active"}), "bench_tags": [{"name": x.tag, "tag": x.tag_name} for x in group.tags], "tags": jingrow.get_all( - "Press Tag", {"team": group.team, "doctype_name": "Release Group"}, ["name", "tag"] + "Jcloude Tag", {"team": group.team, "doctype_name": "Release Group"}, ["name", "tag"] ), } @@ -166,7 +166,7 @@ def all(server=None, bench_filter=None): @jingrow.whitelist() def bench_tags(): team = get_current_team() - return jingrow.get_all("Press Tag", {"team": team, "doctype_name": "Release Group"}, pluck="tag") + return jingrow.get_all("Jcloude Tag", {"team": team, "doctype_name": "Release Group"}, pluck="tag") def get_app_counts_for_groups(rg_names): @@ -198,7 +198,7 @@ def exists(title): @jingrow.whitelist() def get_default_apps(): - jcloude_settings = jingrow.get_single("Press Settings") + jcloude_settings = jingrow.get_single("Jcloude Settings") default_apps = jcloude_settings.get_default_apps() versions, rows = get_app_versions_list() diff --git a/press/api/billing.py b/press/api/billing.py index c3ee4afc..bf42417b 100644 --- a/press/api/billing.py +++ b/press/api/billing.py @@ -270,7 +270,7 @@ def create_payment_intent_for_micro_debit(): micro_debit_charge_field = ( "micro_debit_charge_usd" if team.currency == "USD" else "micro_debit_charge_inr" ) - amount = jingrow.db.get_single_value("Press Settings", micro_debit_charge_field) + amount = jingrow.db.get_single_value("Jcloude Settings", micro_debit_charge_field) intent = stripe.PaymentIntent.create( amount=int(amount * 100), @@ -288,7 +288,7 @@ def create_payment_intent_for_micro_debit(): @role_guard.api("billing") def create_payment_intent_for_partnership_fees(): team = get_current_team(True) - jcloude_settings = jingrow.get_cached_pg("Press Settings") + jcloude_settings = jingrow.get_cached_pg("Jcloude Settings") metadata = {"payment_for": "partnership_fee"} fee_amount = jcloude_settings.partnership_fee_usd @@ -323,7 +323,7 @@ def create_payment_intent_for_buying_credits(amount): jingrow.throw(f"Amount {amount} is less than the total unpaid amount {total_unpaid}.") if team.currency == "INR": - gst_amount = amount * jingrow.db.get_single_value("Press Settings", "gst_percentage") + gst_amount = amount * jingrow.db.get_single_value("Jcloude Settings", "gst_percentage") amount += gst_amount metadata.update({"gst": round(gst_amount, 2)}) @@ -674,7 +674,7 @@ def team_has_balance_for_invoice(prepaid_mode_invoice): @jingrow.whitelist() @role_guard.api("billing") def is_paypal_enabled() -> bool: - return jingrow.db.get_single_value("Press Settings", "paypal_enabled") + return jingrow.db.get_single_value("Jcloude Settings", "paypal_enabled") @jingrow.whitelist() @@ -693,7 +693,7 @@ def create_razorpay_order(amount, transaction_type, pg_name=None) -> dict | None # GST for INR transactions gst_amount = 0 if team.currency == "INR": - gst_amount = amount * jingrow.db.get_single_value("Press Settings", "gst_percentage") + gst_amount = amount * jingrow.db.get_single_value("Jcloude Settings", "gst_percentage") amount += gst_amount # normalize type for payment record diff --git a/press/api/callbacks.py b/press/api/callbacks.py index 6031cc31..8b12a6e2 100644 --- a/press/api/callbacks.py +++ b/press/api/callbacks.py @@ -57,7 +57,7 @@ def handle_job_updates(server: str, job_identifier: str): job_id = job_identifier agent = Agent(server, "Server") jcloude_settings_use_callbacks = jingrow.get_value( - "Press Settings", fieldname=["use_agent_job_callbacks"] + "Jcloude Settings", fieldname=["use_agent_job_callbacks"] ) if not jcloude_settings_use_callbacks or not server_info.use_agent_job_callbacks: diff --git a/press/api/central.py b/press/api/central.py index d6e4b822..ef59713d 100644 --- a/press/api/central.py +++ b/press/api/central.py @@ -36,7 +36,7 @@ def account_request( "erpnext": True, "subdomain": subdomain, "email": email, - "role": "Press Admin", + "role": "Jcloude Admin", "first_name": first_name, "last_name": last_name, "phone_number": phone_number, diff --git a/press/api/client.py b/press/api/client.py index 6fef5d9c..f0644ea1 100644 --- a/press/api/client.py +++ b/press/api/client.py @@ -44,8 +44,8 @@ ALLOWED_DOCTYPES = [ "Release Group App", "Release Group Dependency", "Cluster", - "Press Permission Group", - "Press Role", + "Jcloude Permission Group", + "Jcloude Role", "Team", "Product Trial Request", "Deploy Candidate", @@ -60,7 +60,7 @@ ALLOWED_DOCTYPES = [ "Server Plan", "Release Group Variable", "Resource Tag", - "Press Tag", + "Jcloude Tag", "Partner Approval Request", "Marketplace App", "Subscription", @@ -70,15 +70,15 @@ ALLOWED_DOCTYPES = [ "Payout Order", "App Patch", "Product Trial", - "Press Notification", + "Jcloude Notification", "User SSH Key", "Jingrow Version", "Dashboard Banner", "App Release Approval Request", - "Press Webhook", + "Jcloude Webhook", "SQL Playground Log", "Site Database User", - "Press Settings", + "Jcloude Settings", "Mpesa Payment Record", "Partner Certificate", "Partner Payment Payout", @@ -126,7 +126,7 @@ def get_list( apply_team_filter = not ( filters.get("skip_team_filter_for_system_user_and_support_agent") - and (jingrow.local.system_user() or has_role("Press Support Agent")) + and (jingrow.local.system_user() or has_role("Jcloude Support Agent")) ) if apply_team_filter and meta.has_field("team"): valid_filters.team = jingrow.local.team().name diff --git a/press/api/dashboard.py b/press/api/dashboard.py index a2cfff11..cd922017 100644 --- a/press/api/dashboard.py +++ b/press/api/dashboard.py @@ -24,11 +24,11 @@ def all(): @protected(["Site", "Release Group", "Server", "Database Server"]) def create_new_tag(name, doctype, tag): team = get_current_team() - if jingrow.db.exists("Press Tag", {"tag": tag, "doctype_name": doctype, "team": team}): + if jingrow.db.exists("Jcloude Tag", {"tag": tag, "doctype_name": doctype, "team": team}): jingrow.throw(f"Tag '{tag}' already exists") tag = jingrow.get_pg( { - "doctype": "Press Tag", + "doctype": "Jcloude Tag", "doctype_name": doctype, "team": team, "tag": tag, diff --git a/press/api/email.py b/press/api/email.py index 03f5ccfd..0d986c0d 100644 --- a/press/api/email.py +++ b/press/api/email.py @@ -159,7 +159,7 @@ def validate_plan(secret_key): def make_spamd_request(jcloude_settings: PressSettings, message: bytes): headers = {} if jcloude_settings.spamd_api_key: - spamd_api_secret = get_decrypted_password("Press Settings", "Press Settings", "spamd_api_secret") + spamd_api_secret = get_decrypted_password("Jcloude Settings", "Jcloude Settings", "spamd_api_secret") headers["Authorization"] = f"token {jcloude_settings.spamd_api_key}:{spamd_api_secret}" r = requests.post( jcloude_settings.spamd_endpoint, @@ -172,7 +172,7 @@ def make_spamd_request(jcloude_settings: PressSettings, message: bytes): def check_spam(message: bytes): jcloude_settings = jingrow.get_cached_value( - "Press Settings", + "Jcloude Settings", None, ["enable_spam_check", "spamd_endpoint", "spamd_api_key"], as_dict=True, @@ -216,7 +216,7 @@ def send_mime_mail(**data): validate_plan(data["sk_mail"]) - api_key, domain = jingrow.db.get_value("Press Settings", None, ["mailgun_api_key", "root_domain"]) + api_key, domain = jingrow.db.get_value("Jcloude Settings", None, ["mailgun_api_key", "root_domain"]) message: bytes = files["mime"].read() check_spam(message) diff --git a/press/api/github.py b/press/api/github.py index 0c506d06..8555d5ef 100644 --- a/press/api/github.py +++ b/press/api/github.py @@ -53,8 +53,8 @@ def hook(*args, **kwargs): def get_jwt_token(): - key = jingrow.db.get_single_value("Press Settings", "github_app_private_key") - app_id = jingrow.db.get_single_value("Press Settings", "github_app_id") + key = jingrow.db.get_single_value("Jcloude Settings", "github_app_private_key") + app_id = jingrow.db.get_single_value("Jcloude Settings", "github_app_id") now = datetime.now() expiry = now + timedelta(minutes=9) payload = {"iat": int(now.timestamp()), "exp": int(expiry.timestamp()), "iss": app_id} @@ -64,7 +64,7 @@ def get_jwt_token(): def get_access_token(installation_id: str | None = None): if not installation_id: return jingrow.db.get_value( - "Press Settings", + "Jcloude Settings", None, "github_access_token", ) @@ -84,7 +84,7 @@ def get_access_token(installation_id: str | None = None): @jingrow.whitelist() def clear_token_and_get_installation_url(): clear_current_team_access_token() - public_link = jingrow.db.get_single_value("Press Settings", "github_app_public_link") + public_link = jingrow.db.get_single_value("Jcloude Settings", "github_app_public_link") return f"{public_link}/installations/new" @@ -97,7 +97,7 @@ def clear_current_team_access_token(): def options(): team = get_current_team() token = jingrow.db.get_value("Team", team, "github_access_token") - public_link = jingrow.db.get_single_value("Press Settings", "github_app_public_link") + public_link = jingrow.db.get_single_value("Jcloude Settings", "github_app_public_link") return { "authorized": bool(token), @@ -166,7 +166,7 @@ def repositories(installation, token): def repository(owner, name, installation=None): token = "" if not installation: - token = jingrow.db.get_value("Press Settings", "github_access_token") + token = jingrow.db.get_value("Jcloude Settings", "github_access_token") else: token = get_access_token(installation) headers = { @@ -240,7 +240,7 @@ def branches(owner, name, installation=None): if installation: token = get_access_token(installation) else: - token = jingrow.get_value("Press Settings", None, "github_access_token") + token = jingrow.get_value("Jcloude Settings", None, "github_access_token") if token: headers = { diff --git a/press/api/google.py b/press/api/google.py index 14fc32a4..d45a717c 100644 --- a/press/api/google.py +++ b/press/api/google.py @@ -101,7 +101,7 @@ def callback(code=None, state=None): # noqa: C901 email=email, first_name=id_info.get("given_name"), last_name=id_info.get("family_name"), - role="Press Admin", + role="Jcloude Admin", oauth_signup=True, product_trial=product_trial.name if product_trial else None, ) diff --git a/press/api/marketplace.py b/press/api/marketplace.py index f1587df6..4dadd175 100644 --- a/press/api/marketplace.py +++ b/press/api/marketplace.py @@ -158,7 +158,7 @@ def get_install_app_options(marketplace_app: str) -> dict: "private_groups": private_groups, "clusters": clusters, "closest_cluster": get_nearest_cluster(), - "domain": jingrow.db.get_single_value("Press Settings", "domain"), + "domain": jingrow.db.get_single_value("Jcloude Settings", "domain"), } @@ -218,7 +218,7 @@ def create_site_on_public_bench( "apps": [{"app": app["app"]} for app in apps], "cluster": cluster, "group": group, - "domain": jingrow.db.get_single_value("Press Settings", "domain"), + "domain": jingrow.db.get_single_value("Jcloude Settings", "domain"), "team": get_current_team(), "app_plans": app_plans, } diff --git a/press/api/monitoring.py b/press/api/monitoring.py index a75f0db5..1c69a079 100644 --- a/press/api/monitoring.py +++ b/press/api/monitoring.py @@ -129,7 +129,7 @@ MONITORING_ENDPOINT_RATE_LIMIT_WINDOW_SECONDS = 60 def targets(token=None): if not token: jingrow.throw_permission_error() - monitor_token = jingrow.db.get_single_value("Press Settings", "monitor_token", cache=True) + monitor_token = jingrow.db.get_single_value("Jcloude Settings", "monitor_token", cache=True) if token != monitor_token: return None @@ -142,7 +142,7 @@ def alert(*args, **kwargs): try: webhook_token = jingrow.db.get_value( "Monitor Server", - jingrow.db.get_single_value("Press Settings", "monitor_server", cache=True), + jingrow.db.get_single_value("Jcloude Settings", "monitor_server", cache=True), "webhook_token", cache=True, ) diff --git a/press/api/notifications.py b/press/api/notifications.py index 8bc8aac5..c986efea 100644 --- a/press/api/notifications.py +++ b/press/api/notifications.py @@ -26,7 +26,7 @@ def get_notifications( if not filters: filters = {} - PressNotification = jingrow.qb.DocType("Press Notification") + PressNotification = jingrow.qb.DocType("Jcloude Notification") query = ( jingrow.qb.from_(PressNotification) .select( @@ -80,9 +80,9 @@ def get_notifications( @jingrow.whitelist() def mark_all_notifications_as_read(): - jingrow.db.set_value("Press Notification", {"team": get_current_team()}, "read", 1, update_modified=False) + jingrow.db.set_value("Jcloude Notification", {"team": get_current_team()}, "read", 1, update_modified=False) @jingrow.whitelist() def get_unread_count(): - return jingrow.db.count("Press Notification", {"read": False, "team": get_current_team()}) + return jingrow.db.count("Jcloude Notification", {"read": False, "team": get_current_team()}) diff --git a/press/api/oauth.py b/press/api/oauth.py index 91006214..1472343a 100644 --- a/press/api/oauth.py +++ b/press/api/oauth.py @@ -140,7 +140,7 @@ def create_account_request(email, first_name, last_name, phone_number=""): "last_name": last_name, "phone_number": phone_number, "send_email": False, - "role": "Press Admin", + "role": "Jcloude Admin", "oauth_signup": True, } ).insert(ignore_permissions=True) @@ -182,7 +182,7 @@ def saas_setup(key, app, country, subdomain): "saas": True, "erpnext": False, "saas_app": app, - "role": "Press Admin", + "role": "Jcloude Admin", "country": country, "subdomain": subdomain, } diff --git a/press/api/partner.py b/press/api/partner.py index 844036ba..191c2e6a 100644 --- a/press/api/partner.py +++ b/press/api/partner.py @@ -141,7 +141,7 @@ def approve_certificate_link_request(key): @jingrow.whitelist() @role_guard.api("partner") def get_resource_url(): - return jingrow.db.get_value("Press Settings", "Press Settings", "drive_resource_link") + return jingrow.db.get_value("Jcloude Settings", "Jcloude Settings", "drive_resource_link") @jingrow.whitelist() @@ -817,7 +817,7 @@ def get_fc_plans(): site_plans = jingrow.get_all( "Site Plan", {"enabled": 1, "document_type": "Site", "price_inr": (">", 0)}, pluck="name" ) - return [*site_plans, "Dedicated Server", "Managed Press"] + return [*site_plans, "Dedicated Server", "Managed Jcloude"] @jingrow.whitelist() diff --git a/press/api/saas.py b/press/api/saas.py index 1508bb97..93e9b1fd 100644 --- a/press/api/saas.py +++ b/press/api/saas.py @@ -65,7 +65,7 @@ def account_request( "erpnext": False, "subdomain": subdomain, "email": email, - "role": "Press Admin", + "role": "Jcloude Admin", "first_name": clean_html(first_name), "last_name": clean_html(last_name), "country": country, diff --git a/press/api/server.py b/press/api/server.py index 42fada84..c9e4df5c 100644 --- a/press/api/server.py +++ b/press/api/server.py @@ -128,7 +128,7 @@ def all(server_filter=None): # noqa: C901 @jingrow.whitelist() def server_tags(): team = get_current_team() - return jingrow.get_all("Press Tag", {"team": team, "doctype_name": "Server"}, pluck="tag") + return jingrow.get_all("Jcloude Tag", {"team": team, "doctype_name": "Server"}, pluck="tag") @jingrow.whitelist() @@ -147,7 +147,7 @@ def get(name): "Cluster", server.cluster, ["name", "title", "image"], as_dict=True ), "server_tags": [{"name": x.tag, "tag": x.tag_name} for x in server.tags], - "tags": jingrow.get_all("Press Tag", {"team": server.team, "doctype_name": "Server"}, ["name", "tag"]), + "tags": jingrow.get_all("Jcloude Tag", {"team": server.team, "doctype_name": "Server"}, ["name", "tag"]), "type": "database-server" if server.meta.name == "Database Server" else "server", } @@ -244,7 +244,7 @@ def new(server): def get_cpu_and_memory_usage(name: str, time_range: str = "4m") -> dict[str, float]: """Returns simplified CPU and memory usage [0..1] for autoscale triggers""" - monitor_server = jingrow.db.get_single_value("Press Settings", "monitor_server") + monitor_server = jingrow.db.get_single_value("Jcloude Settings", "monitor_server") if not monitor_server: return {"vcpu": 0.0, "memory": 0.0} @@ -492,7 +492,7 @@ def get_slow_logs_by_site(name, query, timezone, duration, normalize=False): def prometheus_query(query, function, timezone, timespan, timegrain): - monitor_server = jingrow.db.get_single_value("Press Settings", "monitor_server") + monitor_server = jingrow.db.get_single_value("Jcloude Settings", "monitor_server") if not monitor_server: return {"datasets": [], "labels": []} @@ -574,7 +574,7 @@ def options(): @jingrow.whitelist() def get_autoscale_discount(): - return jingrow.db.get_single_value("Press Settings", "autoscale_discount", cache=True) + return jingrow.db.get_single_value("Jcloude Settings", "autoscale_discount", cache=True) @jingrow.whitelist() @@ -587,7 +587,7 @@ def secondary_server_plans( current_price = jingrow.db.get_value("Server Plan", current_plan, "price_inr") ServerPlan = jingrow.qb.DocType("Server Plan") HasRole = jingrow.qb.DocType("Has Role") - autoscale_discount = jingrow.db.get_single_value("Press Settings", "autoscale_discount") + autoscale_discount = jingrow.db.get_single_value("Jcloude Settings", "autoscale_discount") query = ( jingrow.qb.from_(ServerPlan) @@ -688,8 +688,8 @@ def change_plan(name, plan): @protected(["Server", "Database Server"]) def jcloude_jobs(name): jobs = [] - for job in jingrow.get_all("Press Job", {"server": name}, pluck="name"): - jobs.append(jingrow.get_pg("Press Job", job).detail()) + for job in jingrow.get_all("Jcloude Job", {"server": name}, pluck="name"): + jobs.append(jingrow.get_pg("Jcloude Job", job).detail()) return jobs @@ -792,7 +792,7 @@ def benches_are_idle(server: str, access_token: str) -> None: scaled_up_at = jingrow.db.get_value( "Auto Scale Record", {"secondary_server": server, "scale_up": True}, "modified" ) - cool_off_period = jingrow.db.get_single_value("Press Settings", "cool_off_period") + cool_off_period = jingrow.db.get_single_value("Jcloude Settings", "cool_off_period") should_scale_down = ( not running_scale_down diff --git a/press/api/site.py b/press/api/site.py index 860fbab3..7d1ccbd5 100644 --- a/press/api/site.py +++ b/press/api/site.py @@ -141,7 +141,7 @@ def _new(site, server: str | None = None, ignore_plan_validation: bool = False): if not (domain and jingrow.db.exists("Root Domain", {"name": domain})): jingrow.throw("No root domain for site") - cluster = site.get("cluster") or jingrow.db.get_single_value("Press Settings", "cluster") + cluster = site.get("cluster") or jingrow.db.get_single_value("Jcloude Settings", "cluster") Bench = jingrow.qb.DocType("Bench") Server = jingrow.qb.DocType("Server") @@ -287,7 +287,7 @@ def validate_plan(server: str, plan: str) -> None: @jingrow.whitelist() def new(site): if not hasattr(site, "domain") and not site.get("domain"): - site["domain"] = jingrow.db.get_single_value("Press Settings", "domain") + site["domain"] = jingrow.db.get_single_value("Jcloude Settings", "domain") return _new(site) @@ -380,7 +380,7 @@ def running_jobs(name): @jingrow.whitelist() @protected("Site") def backups(name): - available_offsite_backups = jingrow.db.get_single_value("Press Settings", "offsite_backups_count") or 30 + available_offsite_backups = jingrow.db.get_single_value("Jcloude Settings", "offsite_backups_count") or 30 fields = [ "name", "with_files", @@ -585,7 +585,7 @@ def options_for_new(for_bench: str | None = None): # noqa: C901 # app source details are all fetched from marketplace apps for public sites marketplace_details = None - default_domain = jingrow.db.get_single_value("Press Settings", "domain") + default_domain = jingrow.db.get_single_value("Jcloude Settings", "domain") cluster_specific_root_domains = jingrow.db.get_all( "Root Domain", {"name": ("like", f"%.{default_domain}")}, @@ -603,7 +603,7 @@ def options_for_new(for_bench: str | None = None): # noqa: C901 def set_default_apps(app_source_details_grouped): - jcloude_settings = jingrow.get_single("Press Settings") + jcloude_settings = jingrow.get_single("Jcloude Settings") default_apps = jcloude_settings.get_default_apps() for app_source in app_source_details_grouped.values(): @@ -722,7 +722,7 @@ def set_bench_and_clusters(version, for_bench): @jingrow.whitelist() def get_domain(): - return jingrow.db.get_value("Press Settings", "Press Settings", ["domain"]) + return jingrow.db.get_value("Jcloude Settings", "Jcloude Settings", ["domain"]) @jingrow.whitelist() @@ -1081,7 +1081,7 @@ def get_sites_query(site_filter, benches_with_updates): @jingrow.whitelist() def site_tags(): team = get_current_team() - return jingrow.get_all("Press Tag", {"team": team, "doctype_name": "Site"}, pluck="tag") + return jingrow.get_all("Jcloude Tag", {"team": team, "doctype_name": "Site"}, pluck="tag") @jingrow.whitelist() @@ -1170,7 +1170,7 @@ def get(name): ], "ip": ip, "site_tags": [{"name": x.tag, "tag": x.tag_name} for x in site.tags], - "tags": jingrow.get_all("Press Tag", {"team": team, "doctype_name": "Site"}, ["name", "tag"]), + "tags": jingrow.get_all("Jcloude Tag", {"team": team, "doctype_name": "Site"}, ["name", "tag"]), "info": { "owner": jingrow.db.get_value( "User", @@ -1731,21 +1731,21 @@ def update_config(name, config): @jingrow.whitelist() def get_trial_plan(): - return jingrow.db.get_value("Press Settings", None, "jcloude_trial_plan") + return jingrow.db.get_value("Jcloude Settings", None, "jcloude_trial_plan") @jingrow.whitelist() def get_upload_link(file, parts=1): - bucket_name = jingrow.db.get_single_value("Press Settings", "remote_uploads_bucket") - expiration = jingrow.db.get_single_value("Press Settings", "remote_link_expiry") or 3600 + bucket_name = jingrow.db.get_single_value("Jcloude Settings", "remote_uploads_bucket") + expiration = jingrow.db.get_single_value("Jcloude Settings", "remote_link_expiry") or 3600 object_name = get_remote_key(file) parts = int(parts) s3_client = client( "s3", - aws_access_key_id=jingrow.db.get_single_value("Press Settings", "remote_access_key_id"), + aws_access_key_id=jingrow.db.get_single_value("Jcloude Settings", "remote_access_key_id"), aws_secret_access_key=get_decrypted_password( - "Press Settings", "Press Settings", "remote_secret_access_key" + "Jcloude Settings", "Jcloude Settings", "remote_secret_access_key" ), region_name="ap-south-1", ) @@ -1779,13 +1779,13 @@ def get_upload_link(file, parts=1): @jingrow.whitelist() def multipart_exit(file, id, action, parts=None): - bucket_name = jingrow.db.get_single_value("Press Settings", "remote_uploads_bucket") + bucket_name = jingrow.db.get_single_value("Jcloude Settings", "remote_uploads_bucket") s3_client = client( "s3", - aws_access_key_id=jingrow.db.get_single_value("Press Settings", "remote_access_key_id"), + aws_access_key_id=jingrow.db.get_single_value("Jcloude Settings", "remote_access_key_id"), aws_secret_access_key=get_decrypted_password( - "Press Settings", - "Press Settings", + "Jcloude Settings", + "Jcloude Settings", "remote_secret_access_key", raise_exception=False, ), @@ -1815,7 +1815,7 @@ def uploaded_backup_info(file=None, path=None, type=None, size=None, url=None): "file_size": size, "file_path": path, "url": url, - "bucket": jingrow.db.get_single_value("Press Settings", "remote_uploads_bucket"), + "bucket": jingrow.db.get_single_value("Jcloude Settings", "remote_uploads_bucket"), } ).insert() add_tag("Site Upload", pg.doctype, pg.name) diff --git a/press/api/spaces.py b/press/api/spaces.py index fb4d2dcb..1b37ccbd 100644 --- a/press/api/spaces.py +++ b/press/api/spaces.py @@ -50,7 +50,7 @@ def code_server_domain(): """ Returns the domain for code servers """ - return jingrow.db.get_single_value("Press Settings", "spaces_domain") + return jingrow.db.get_single_value("Jcloude Settings", "spaces_domain") @jingrow.whitelist() diff --git a/press/api/tests/test_server.py b/press/api/tests/test_server.py index c36324ad..b4b16160 100644 --- a/press/api/tests/test_server.py +++ b/press/api/tests/test_server.py @@ -256,7 +256,7 @@ class TestAPIServer(FrappeTestCase): server = jingrow.get_last_pg("Server") db_server = jingrow.get_last_pg("Database Server") jingrow.db.set_value( - "Press Job", {"status": "Running"}, "status", "Success" + "Jcloude Job", {"status": "Running"}, "status", "Success" ) # Mark running jobs as success as extra steps we don't check change_plan( @@ -273,7 +273,7 @@ class TestAPIServer(FrappeTestCase): self.assertEqual(server.plan, app_plan_2.name) self.assertEqual(server.ram, app_plan_2.memory) jingrow.db.set_value( - "Press Job", {"status": "Running"}, "status", "Success" + "Jcloude Job", {"status": "Running"}, "status", "Success" ) # Mark running jobs as success as extra steps we don't check change_plan( diff --git a/press/api/tests/test_site.py b/press/api/tests/test_site.py index 1092aeee..2e6c9469 100644 --- a/press/api/tests/test_site.py +++ b/press/api/tests/test_site.py @@ -46,7 +46,7 @@ class TestAPISite(FrappeTestCase): self.team.payment_mode = "Prepaid Credits" self.team.save() - self.domain = jingrow.db.get_single_value("Press Settings", "domain") + self.domain = jingrow.db.get_single_value("Jcloude Settings", "domain") def tearDown(self): jingrow.db.rollback() @@ -123,7 +123,7 @@ class TestAPISite(FrappeTestCase): cluster = create_test_cluster("Default", public=True) root_domain = create_test_root_domain("local.fc.jingrow.dev") - jingrow.db.set_single_value("Press Settings", "domain", root_domain.name) + jingrow.db.set_single_value("Jcloude Settings", "domain", root_domain.name) n1_server = create_test_proxy_server(cluster=cluster.name, domain=root_domain.name) f1_server = create_test_server(cluster=cluster.name, proxy_server=n1_server.name) @@ -167,7 +167,7 @@ class TestAPISite(FrappeTestCase): cluster = create_test_cluster("Default", public=True) root_domain = create_test_root_domain("local.fc.jingrow.dev") - jingrow.db.set_single_value("Press Settings", "domain", root_domain.name) + jingrow.db.set_single_value("Jcloude Settings", "domain", root_domain.name) n1_server = create_test_proxy_server(cluster=cluster.name, domain=root_domain.name) f1_server = create_test_server(cluster=cluster.name, proxy_server=n1_server.name) @@ -204,7 +204,7 @@ class TestAPISite(FrappeTestCase): cluster = create_test_cluster("Default", public=True) root_domain = create_test_root_domain("local.fc.jingrow.dev") - jingrow.db.set_single_value("Press Settings", "domain", root_domain.name) + jingrow.db.set_single_value("Jcloude Settings", "domain", root_domain.name) jingrow_app = create_test_app(name="jingrow") @@ -264,7 +264,7 @@ class TestAPISite(FrappeTestCase): cluster = create_test_cluster("Default", public=True) root_domain = create_test_root_domain("local.fc.jingrow.dev") - jingrow.db.set_single_value("Press Settings", "domain", root_domain.name) + jingrow.db.set_single_value("Jcloude Settings", "domain", root_domain.name) jingrow_app = create_test_app(name="jingrow") @@ -380,7 +380,7 @@ class TestAPISite(FrappeTestCase): "ip": jingrow.get_last_pg("Proxy Server").ip, "site_tags": [{"name": x.tag, "tag": x.tag_name} for x in site.tags], "tags": jingrow.get_all( - "Press Tag", + "Jcloude Tag", {"team": self.team.name, "doctype_name": "Site"}, ["name", "tag"], ), diff --git a/press/api/webhook.py b/press/api/webhook.py index c5ed2e17..1722bb1b 100644 --- a/press/api/webhook.py +++ b/press/api/webhook.py @@ -14,7 +14,7 @@ from jcloude.guards import role_guard @jingrow.whitelist(allow_guest=True) def available_events(): return jingrow.get_all( - "Press Webhook Event", + "Jcloude Webhook Event", fields=["name", "description"], filters={"enabled": 1}, order_by="creation desc", @@ -22,9 +22,9 @@ def available_events(): @jingrow.whitelist() -@role_guard.document(document_type=lambda _: "Press Webhook") +@role_guard.document(document_type=lambda _: "Jcloude Webhook") def add(endpoint: str, secret: str, events: list[str]): - pg = jingrow.new_pg("Press Webhook") + pg = jingrow.new_pg("Jcloude Webhook") pg.endpoint = endpoint pg.secret = secret pg.team = jingrow.local.team().name @@ -34,10 +34,10 @@ def add(endpoint: str, secret: str, events: list[str]): @jingrow.whitelist() -@protected("Press Webhook") -@role_guard.document(document_type=lambda _: "Press Webhook") +@protected("Jcloude Webhook") +@role_guard.document(document_type=lambda _: "Jcloude Webhook") def update(name: str, endpoint: str, secret: str, events: list[str]): - pg = jingrow.get_pg("Press Webhook", name) + pg = jingrow.get_pg("Jcloude Webhook", name) pg.endpoint = endpoint pg.secret = secret or pg.secret pg.events = [] @@ -47,14 +47,14 @@ def update(name: str, endpoint: str, secret: str, events: list[str]): @jingrow.whitelist() -@protected("Press Webhook") -@role_guard.document(document_type=lambda _: "Press Webhook Log") +@protected("Jcloude Webhook") +@role_guard.document(document_type=lambda _: "Jcloude Webhook Log") def attempts(webhook: str): - pg = jingrow.get_pg("Press Webhook", webhook) + pg = jingrow.get_pg("Jcloude Webhook", webhook) pg.has_permission("read") - PressWebhookAttempt = jingrow.qb.DocType("Press Webhook Attempt") - PressWebhookLog = jingrow.qb.DocType("Press Webhook Log") + PressWebhookAttempt = jingrow.qb.DocType("Jcloude Webhook Attempt") + PressWebhookLog = jingrow.qb.DocType("Jcloude Webhook Log") query = ( jingrow.qb.from_(PressWebhookAttempt) .select( @@ -74,10 +74,10 @@ def attempts(webhook: str): @jingrow.whitelist() -@role_guard.document(document_type=lambda _: "Press Webhook Attempt") +@role_guard.document(document_type=lambda _: "Jcloude Webhook Attempt") def attempt(name: str): - pg = jingrow.get_pg("Press Webhook Attempt", name) + pg = jingrow.get_pg("Jcloude Webhook Attempt", name) pg.has_permission("read") data = pg.as_dict() - data.request_payload = json.loads(jingrow.get_value("Press Webhook Log", pg.parent, "request_payload")) + data.request_payload = json.loads(jingrow.get_value("Jcloude Webhook Log", pg.parent, "request_payload")) return data diff --git a/press/bootstrap.py b/press/bootstrap.py index db5fa726..1b583100 100644 --- a/press/bootstrap.py +++ b/press/bootstrap.py @@ -40,7 +40,7 @@ MAIL_PASSWORD = "" def prepare(): complete_setup_wizard() - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") setup_certbot(settings) setup_root_domain(settings) setup_stripe(settings) @@ -311,8 +311,8 @@ def setup_plans(): "max_storage_usage": 10240 * index, "roles": [ {"role": "System Manager"}, - {"role": "Press Admin"}, - {"role": "Press Member"}, + {"role": "Jcloude Admin"}, + {"role": "Jcloude Member"}, ], } ).insert() diff --git a/press/commands.py b/press/commands.py index ecf4657f..cd8654f1 100644 --- a/press/commands.py +++ b/press/commands.py @@ -17,7 +17,7 @@ def start_ngrok_and_set_webhook(context): jingrow.connect() # Set ngrok auth token - auth_token = jingrow.db.get_single_value("Press Settings", "ngrok_auth_token") + auth_token = jingrow.db.get_single_value("Jcloude Settings", "ngrok_auth_token") if auth_token: ngrok.set_auth_token(auth_token) @@ -32,7 +32,7 @@ def start_ngrok_and_set_webhook(context): stripe = get_stripe() url = f"{public_url}/api/method/jcloude.jcloude.doctype.stripe_webhook_log.stripe_webhook_log.stripe_webhook_handler" stripe.WebhookEndpoint.modify( - jingrow.db.get_single_value("Press Settings", "stripe_webhook_endpoint_id"), url=url + jingrow.db.get_single_value("Jcloude Settings", "stripe_webhook_endpoint_id"), url=url ) print("Updated Stripe Webhook Endpoint") diff --git a/press/config/desktop.py b/press/config/desktop.py index 9bdc6bc2..35ed93f8 100644 --- a/press/config/desktop.py +++ b/press/config/desktop.py @@ -6,13 +6,13 @@ from jingrow import _ def get_data(): return [ { - "module_name": "Press", + "module_name": "Jcloude", "category": "Modules", "color": "grey", "description": "Managed Jingrow Hosting", "icon": "octicon octicon-rocket", "type": "module", - "label": _("Press"), + "label": _("Jcloude"), "reverse": 1, } ] diff --git a/press/config/docs.py b/press/config/docs.py index b74379e2..7b2557d3 100644 --- a/press/config/docs.py +++ b/press/config/docs.py @@ -9,4 +9,4 @@ Configuration for docs def get_context(context): - context.brand_html = "Press" + context.brand_html = "Jcloude" diff --git a/press/experimental/doctype/referral_bonus/referral_bonus.py b/press/experimental/doctype/referral_bonus/referral_bonus.py index f688d0d3..86702feb 100644 --- a/press/experimental/doctype/referral_bonus/referral_bonus.py +++ b/press/experimental/doctype/referral_bonus/referral_bonus.py @@ -21,7 +21,7 @@ class ReferralBonus(Document): team = jingrow.get_pg("Team", self.referred_by) credits_field = "free_credits_inr" if team.currency == "INR" else "free_credits_usd" - credit_amount = jingrow.db.get_single_value("Press Settings", credits_field) + credit_amount = jingrow.db.get_single_value("Jcloude Settings", credits_field) if not credit_amount: return @@ -32,7 +32,7 @@ class ReferralBonus(Document): self.reload() -# TODO: Remove hardcoded values and add fields in Press Settings +# TODO: Remove hardcoded values and add fields in Jcloude Settings def team_has_spent(team, usd_amount=25.0, inr_amount=1800.0): """Has the team spent atleast the given amount yet (on stripe)""" team_currency = jingrow.db.get_value("Team", team, "currency") diff --git a/press/fixtures/press_job_type.json b/press/fixtures/press_job_type.json index 8f4aad35..2c552f88 100644 --- a/press/fixtures/press_job_type.json +++ b/press/fixtures/press_job_type.json @@ -3,7 +3,7 @@ "callback_max_retry": 5, "callback_script": "snapshot = jingrow.get_pg(\"Server Snapshot\", arguments.get(\"server_snapshot\"))\nif pg.server_type == \"Server\":\n\tsnapshot.resume_app_server_services()\nelif pg.server_type == \"Database Server\":\n\tsnapshot.resume_database_server_services()\n\nif pg.status == \"Failure\":\n jingrow.db.set_value(\"Server Snapshot\", snapshot.name, \"status\", \"Failure\", update_modified=False)\n for s in snapshot.snapshots:\n try:\n jingrow.get_pg(\"Virtual Disk Snapshot\", s).delete_snapshot()\n except:\n pass\n \nelse:\n snapshot.sync(now=False)", "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-09-24 16:33:10.530624", "name": "Snapshot Disk", "steps": [ @@ -38,7 +38,7 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-08-12 16:24:10.555919", "name": "Attach Volume", "steps": [ @@ -53,7 +53,7 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-01-02 15:33:27.252601", "name": "Resize Server", "steps": [ @@ -103,7 +103,7 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2024-02-05 17:08:00.514456", "name": "Create Server Snapshot", "steps": [ @@ -143,7 +143,7 @@ "callback_max_retry": 0, "callback_script": "server = jingrow.get_pg(pg.server_type, pg.server)\n\nif pg.server_type in [\"Server\", \"Database Server\"] and server.is_for_recovery:\n filter_field = \"app_server\" if pg.server_type == \"Server\" else \"database_server\"\n recovery_record_name = jingrow.db.get_value(\"Server Snapshot Recovery\", {filter_field: pg.server}, \"name\")\n if recovery_record_name:\n recovery_record = jingrow.get_pg(\"Server Snapshot Recovery\", recovery_record_name, for_update=True)\n \n if pg.status == \"Success\":\n if pg.server_type == \"Server\":\n recovery_record.app_server_archived = True\n else:\n recovery_record.database_server_archived = True\n recovery_record.save()", "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-09-08 11:42:40.490054", "name": "Archive Server", "steps": [ @@ -168,7 +168,7 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2024-01-05 13:40:21.038901", "name": "Upgrade MariaDB", "steps": [ @@ -203,7 +203,7 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-02-14 14:30:00.676187", "name": "Increase Disk Size", "steps": [ @@ -243,12 +243,12 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-11-12 09:35:41.121169", "name": "Prune Docker system", "steps": [ { - "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Press Settings\").telegram_message\ntelegram_message.enqueue(f\"Pruning docker cache on [{server.name}]({jingrow.utils.get_url_to_form(server.doctype, server.name)})\", \"Information\")\nserver.prune_docker_system()", + "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Jcloude Settings\").telegram_message\ntelegram_message.enqueue(f\"Pruning docker cache on [{server.name}]({jingrow.utils.get_url_to_form(server.doctype, server.name)})\", \"Information\")\nserver.prune_docker_system()", "step_name": "Prune Docker system", "wait_until_true": 0 }, @@ -263,12 +263,12 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-11-12 09:35:21.819679", "name": "Increase Swap", "steps": [ { - "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Press Settings\").telegram_message\ntelegram_message.enqueue(f\"Increasing swap on [{server.name}]({jingrow.utils.get_url_to_form(server.doctype, server.name)})\", \"Information\")\nserver.increase_swap(4)", + "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Jcloude Settings\").telegram_message\ntelegram_message.enqueue(f\"Increasing swap on [{server.name}]({jingrow.utils.get_url_to_form(server.doctype, server.name)})\", \"Information\")\nserver.increase_swap(4)", "step_name": "Add swap on server", "wait_until_true": 0 }, @@ -283,7 +283,7 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2024-12-06 10:59:08.032149", "name": "Stop and Start Server", "steps": [ @@ -318,12 +318,12 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-11-12 09:34:59.467479", "name": "Reset Swap", "steps": [ { - "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Press Settings\").telegram_message\ntelegram_message.enqueue(f\"Resetting swap on [{server.name}]({jingrow.utils.get_url_to_form(server.doctype, server.name)})\", \"Information\")\nserver.reset_swap()", + "script": "server = jingrow.get_pg(pg.server_type, pg.server)\ntelegram_message = jingrow.get_pg(\"Jcloude Settings\").telegram_message\ntelegram_message.enqueue(f\"Resetting swap on [{server.name}]({jingrow.utils.get_url_to_form(server.doctype, server.name)})\", \"Information\")\nserver.reset_swap()", "step_name": "Reset swap on server", "wait_until_true": 0 }, @@ -338,7 +338,7 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-07-11 15:20:56.780290", "name": "Warn disk at 80%", "steps": [ @@ -353,7 +353,7 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-07-25 21:43:11.895128", "name": "Trigger Build Server Cleanup", "steps": [ @@ -368,7 +368,7 @@ "callback_max_retry": 0, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-08-31 20:54:46.857348", "name": "Create Server (old)", "steps": [ @@ -453,7 +453,7 @@ "callback_max_retry": 0, "callback_script": "", "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-09-08 11:36:55.450275", "name": "Resume Services After Snapshot", "steps": [ @@ -473,7 +473,7 @@ "callback_max_retry": 1, "callback_script": "server = jingrow.get_pg(pg.server_type, pg.server)\n\nif pg.server_type in [\"Server\", \"Database Server\"] and server.is_for_recovery:\n filter_field = \"app_server\" if pg.server_type == \"Server\" else \"database_server\"\n recovery_record_name = jingrow.db.get_value(\"Server Snapshot Recovery\", {filter_field: pg.server}, \"name\")\n if recovery_record_name:\n recovery_record = jingrow.get_pg(\"Server Snapshot Recovery\", recovery_record_name, for_update=True)\n \n if pg.status == \"Success\":\n if pg.server_type == \"Server\":\n recovery_record.is_app_server_ready = True\n else:\n recovery_record.is_database_server_ready = True\n recovery_record.save()\n else:\n recovery_record.mark_server_provisioning_as_failed()\n \nif pg.server_type in [\"Server\", \"Database Server\"] and \"logical_replication_backup\" in arguments:\n if pg.status == \"Success\":\n jingrow.get_pg(\"Logical Replication Backup\", arguments.get(\"logical_replication_backup\")).next()\n if pg.status == \"Failure\":\n jingrow.get_pg(\"Logical Replication Backup\", arguments.get(\"logical_replication_backup\")).fail()", "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-10-18 20:59:59.413236", "name": "Create Server", "steps": [ @@ -623,7 +623,7 @@ "callback_max_retry": 1, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-11-12 11:06:08.243873", "name": "Prune Mirror Registry", "steps": [ @@ -638,7 +638,7 @@ "callback_max_retry": 1, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-12-18 15:28:08.243873", "name": "Auto Scale Up Application Server", "steps": [ @@ -653,7 +653,7 @@ "callback_max_retry": 1, "callback_script": null, "docstatus": 0, - "doctype": "Press Job Type", + "doctype": "Jcloude Job Type", "modified": "2025-12-18 15:28:08.243873", "name": "Auto Scale Down Application Server", "steps": [ diff --git a/press/fixtures/press_method_permission.json b/press/fixtures/press_method_permission.json index 1459f53d..2497fd5d 100644 --- a/press/fixtures/press_method_permission.json +++ b/press/fixtures/press_method_permission.json @@ -2,7 +2,7 @@ { "checkbox_label": "View", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Server", "method": "jcloude.api.server.overview", "modified": "2023-10-30 00:06:29.049045", @@ -11,7 +11,7 @@ { "checkbox_label": "Reboot", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Server", "method": "jcloude.api.server.reboot", "modified": "2023-10-28 20:24:00.088011", @@ -20,7 +20,7 @@ { "checkbox_label": "Login as Admin", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.login", "modified": "2023-09-04 21:22:19.952471", @@ -29,7 +29,7 @@ { "checkbox_label": "Database Access", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.enable_database_access", "modified": "2023-09-04 22:20:23.131654", @@ -38,7 +38,7 @@ { "checkbox_label": "Update", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Release Group", "method": "jcloude.api.bench.update", "modified": "2023-08-09 23:22:21.493409", @@ -47,7 +47,7 @@ { "checkbox_label": "Update", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.update", "modified": "2023-08-09 23:22:16.445271", @@ -56,7 +56,7 @@ { "checkbox_label": "View", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.overview", "modified": "2023-10-30 00:28:47.065270", @@ -65,7 +65,7 @@ { "checkbox_label": "Restore", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.restore", "modified": "2023-08-10 23:21:37.969947", @@ -74,7 +74,7 @@ { "checkbox_label": "Migrate", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.migrate", "modified": "2023-09-25 11:41:46.915505", @@ -83,7 +83,7 @@ { "checkbox_label": "View", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Release Group", "method": "jcloude.api.bench.get", "modified": "2023-08-11 11:08:02.298748", @@ -92,7 +92,7 @@ { "checkbox_label": "Update", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.update", "modified": "2023-08-11 11:14:41.597516", @@ -101,7 +101,7 @@ { "checkbox_label": "Deploy", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Release Group", "method": "jcloude.api.bench.deploy_and_update", "modified": "2023-08-16 00:02:26.396406", @@ -110,7 +110,7 @@ { "checkbox_label": "Archive", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.archive", "modified": "2023-09-25 21:34:34.964150", @@ -119,7 +119,7 @@ { "checkbox_label": "Reset", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.reset", "modified": "2023-09-25 21:36:30.485983", @@ -128,7 +128,7 @@ { "checkbox_label": "Deactivate", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.deactivate", "modified": "2023-09-25 21:36:56.303022", @@ -137,7 +137,7 @@ { "checkbox_label": "SSH Access", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Release Group", "method": "jcloude.api.bench.generate_certificate", "modified": "2023-09-25 21:40:01.706266", @@ -146,7 +146,7 @@ { "checkbox_label": "Restart", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Release Group", "method": "jcloude.api.bench.restart", "modified": "2023-09-25 21:40:40.280318", @@ -155,7 +155,7 @@ { "checkbox_label": "Change Plan", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.change_plan", "modified": "2023-09-25 21:42:47.001379", @@ -164,7 +164,7 @@ { "checkbox_label": "Download Backups", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Site", "method": "jcloude.api.site.get_backup_link", "modified": "2023-09-25 21:46:24.621413", @@ -173,7 +173,7 @@ { "checkbox_label": "View", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Database Server", "method": "jcloude.api.server.overview", "modified": "2023-10-30 00:06:13.793641", @@ -182,7 +182,7 @@ { "checkbox_label": "Drop", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Server", "method": "jcloude.api.server.archive", "modified": "2023-10-30 00:04:57.685127", @@ -191,7 +191,7 @@ { "checkbox_label": "Drop", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Database Server", "method": "jcloude.api.server.archive", "modified": "2023-10-30 00:05:06.341786", @@ -200,7 +200,7 @@ { "checkbox_label": "Reboot", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Database Server", "method": "jcloude.api.server.reboot", "modified": "2023-10-30 00:05:29.046083", @@ -209,7 +209,7 @@ { "checkbox_label": "View", "docstatus": 0, - "doctype": "Press Method Permission", + "doctype": "Jcloude Method Permission", "document_type": "Marketplace App", "method": "jcloude.api.marketplace.get_app", "modified": "2023-10-30 00:15:04.814190", diff --git a/press/fixtures/press_webhook_event.json b/press/fixtures/press_webhook_event.json index d17f7b9c..35fa8423 100644 --- a/press/fixtures/press_webhook_event.json +++ b/press/fixtures/press_webhook_event.json @@ -2,7 +2,7 @@ { "description": "Get notified for changes in the site's subscription plan", "docstatus": 0, - "doctype": "Press Webhook Event", + "doctype": "Jcloude Webhook Event", "enabled": 1, "modified": "2024-09-23 12:06:21.293809", "name": "Site Plan Change", @@ -11,7 +11,7 @@ { "description": "Pending, Installing, Updating, Active, Inactive, Broken, Archived, Suspended", "docstatus": 0, - "doctype": "Press Webhook Event", + "doctype": "Jcloude Webhook Event", "enabled": 1, "modified": "2024-09-23 11:47:30.206054", "name": "Site Status Update", @@ -20,7 +20,7 @@ { "description": "Draft, Scheduled, Pending, Preparing, Running, Success, Failure", "docstatus": 0, - "doctype": "Press Webhook Event", + "doctype": "Jcloude Webhook Event", "enabled": 1, "modified": "2025-04-09 12:16:17.266946", "name": "Bench Deploy Status Update", @@ -29,7 +29,7 @@ { "description": "Pending, Installing, Updating, Active, Broken, Archived", "docstatus": 0, - "doctype": "Press Webhook Event", + "doctype": "Jcloude Webhook Event", "enabled": 1, "modified": "2024-09-23 12:16:32.881258", "name": "Bench Status Update", diff --git a/press/fixtures/print_format.json b/press/fixtures/print_format.json index ecbe4ef0..c7839cdc 100644 --- a/press/fixtures/print_format.json +++ b/press/fixtures/print_format.json @@ -13,7 +13,7 @@ "html": null, "line_breaks": 0, "modified": "2020-07-23 12:04:26.876744", - "module": "Press", + "module": "Jcloude", "name": "Jingrow Brand 2020", "parent": null, "parentfield": null, diff --git a/press/fixtures/role.json b/press/fixtures/role.json index d7892d6c..0de6224a 100644 --- a/press/fixtures/role.json +++ b/press/fixtures/role.json @@ -11,10 +11,10 @@ "is_custom": 0, "list_sidebar": 0, "modified": "2024-05-27 11:14:43.545958", - "name": "Press Support Agent", + "name": "Jcloude Support Agent", "notifications": 0, "restrict_to_domain": null, - "role_name": "Press Support Agent", + "role_name": "Jcloude Support Agent", "search_bar": 0, "timeline": 0, "two_factor_auth": 0, @@ -32,10 +32,10 @@ "is_custom": 0, "list_sidebar": 0, "modified": "2020-04-06 22:48:03.538506", - "name": "Press Admin", + "name": "Jcloude Admin", "notifications": 0, "restrict_to_domain": null, - "role_name": "Press Admin", + "role_name": "Jcloude Admin", "search_bar": 0, "timeline": 0, "two_factor_auth": 0, @@ -53,10 +53,10 @@ "is_custom": 0, "list_sidebar": 0, "modified": "2020-04-06 22:48:33.006868", - "name": "Press Member", + "name": "Jcloude Member", "notifications": 0, "restrict_to_domain": null, - "role_name": "Press Member", + "role_name": "Jcloude Member", "search_bar": 0, "timeline": 0, "two_factor_auth": 0, @@ -70,9 +70,9 @@ "home_page": null, "is_custom": 0, "modified": "2025-08-20 19:55:50.325493", - "name": "Press Marketplace Manager", + "name": "Jcloude Marketplace Manager", "restrict_to_domain": null, - "role_name": "Press Marketplace Manager", + "role_name": "Jcloude Marketplace Manager", "two_factor_auth": 0 } ] diff --git a/press/guards/role_guard/__init__.py b/press/guards/role_guard/__init__.py index 52920763..ccb79cd9 100644 --- a/press/guards/role_guard/__init__.py +++ b/press/guards/role_guard/__init__.py @@ -37,8 +37,8 @@ def api(scope: Literal["billing", "partner"]): team: Team = get_current_team(get_pg=True) if team.is_team_owner() or team.is_admin_user(): return fn(*args, **kwargs) - PressRole = jingrow.qb.DocType("Press Role") - PressRoleUser = jingrow.qb.DocType("Press Role User") + PressRole = jingrow.qb.DocType("Jcloude Role") + PressRoleUser = jingrow.qb.DocType("Jcloude Role User") has_permission = ( jingrow.qb.from_(PressRole) .inner_join(PressRoleUser) @@ -74,8 +74,8 @@ def action(): team: Team = get_current_team(get_pg=True) if team.is_team_owner() or team.is_admin_user(): return fn(self, *args, **kwargs) - PressRole = jingrow.qb.DocType("Press Role") - PressRoleUser = jingrow.qb.DocType("Press Role User") + PressRole = jingrow.qb.DocType("Jcloude Role") + PressRoleUser = jingrow.qb.DocType("Jcloude Role User") has_permission = ( jingrow.qb.from_(PressRole) .inner_join(PressRoleUser) @@ -157,10 +157,10 @@ def document( def base_query() -> QueryBuilder: """ - Get a base query for Press Role documents based on the current team context. + Get a base query for Jcloude Role documents based on the current team context. """ - PressRole = jingrow.qb.DocType("Press Role") - PressRoleUser = jingrow.qb.DocType("Press Role User") + PressRole = jingrow.qb.DocType("Jcloude Role") + PressRoleUser = jingrow.qb.DocType("Jcloude Role User") return ( jingrow.qb.from_(PressRole) .select(PressRole.name) @@ -182,11 +182,11 @@ def check(document_type: str, document_name: str) -> bool | list[str]: match document_type: case "Marketplace App": return marketplace_check(query) - case "Press Webhook": + case "Jcloude Webhook": return webhook_check(query) - case "Press Webhook Attempt": + case "Jcloude Webhook Attempt": return webhook_check(query) - case "Press Webhook Log": + case "Jcloude Webhook Log": return webhook_check(query) case "Release Group": return document_check(query, document_type, document_name) @@ -210,7 +210,7 @@ def roles_enabled() -> bool: return bool( jingrow.db.exists( { - "doctype": "Press Role", + "doctype": "Jcloude Role", "team": get_current_team(), } ) diff --git a/press/guards/role_guard/action.py b/press/guards/role_guard/action.py index 3fb864fd..8e8b1f8e 100644 --- a/press/guards/role_guard/action.py +++ b/press/guards/role_guard/action.py @@ -8,6 +8,6 @@ def action_key(document: Document) -> str: return "allow_server_creation" if document.doctype == "Release Group" and document.is_new(): return "allow_bench_creation" - if document.doctype == "Press Webhook": + if document.doctype == "Jcloude Webhook": return "allow_webhook_configuration" return "" diff --git a/press/guards/role_guard/document.py b/press/guards/role_guard/document.py index aece4ef8..81c3fc3c 100644 --- a/press/guards/role_guard/document.py +++ b/press/guards/role_guard/document.py @@ -11,8 +11,8 @@ def check(base_query: QueryBuilder, document_type: str, document_name: str) -> b def documents(base_query: QueryBuilder, document_type: str) -> list[str]: - PressRole = jingrow.qb.DocType("Press Role") - PressRoleResource = jingrow.qb.DocType("Press Role Resource") + PressRole = jingrow.qb.DocType("Jcloude Role") + PressRoleResource = jingrow.qb.DocType("Jcloude Role Resource") return [ pg.document_name for pg in base_query.inner_join(PressRoleResource) @@ -28,8 +28,8 @@ def documents(base_query: QueryBuilder, document_type: str) -> list[str]: def document(base_query: QueryBuilder, document_type: str, document_name: str) -> bool: - PressRole = jingrow.qb.DocType("Press Role") - PressRoleResource = jingrow.qb.DocType("Press Role Resource") + PressRole = jingrow.qb.DocType("Jcloude Role") + PressRoleResource = jingrow.qb.DocType("Jcloude Role Resource") return ( base_query.inner_join(PressRoleResource) .on( diff --git a/press/guards/role_guard/marketplace.py b/press/guards/role_guard/marketplace.py index eaa17bde..7710b950 100644 --- a/press/guards/role_guard/marketplace.py +++ b/press/guards/role_guard/marketplace.py @@ -4,7 +4,7 @@ from jingrow.query_builder.terms import QueryBuilder def check(base_query: QueryBuilder) -> bool: - PressRole = jingrow.qb.DocType("Press Role") + PressRole = jingrow.qb.DocType("Jcloude Role") return ( base_query.where(PressRole.allow_apps == 1) .select(Count(PressRole.name).as_("count")) diff --git a/press/guards/role_guard/server_snapshot.py b/press/guards/role_guard/server_snapshot.py index 698291fa..8e74d029 100644 --- a/press/guards/role_guard/server_snapshot.py +++ b/press/guards/role_guard/server_snapshot.py @@ -4,8 +4,8 @@ from jingrow.query_builder.terms import QueryBuilder def check(base_query: QueryBuilder, document_name: str) -> bool: - PressRole = jingrow.qb.DocType("Press Role") - PressRoleResource = jingrow.qb.DocType("Press Role Resource") + PressRole = jingrow.qb.DocType("Jcloude Role") + PressRoleResource = jingrow.qb.DocType("Jcloude Role Resource") ServerSnapshot = jingrow.qb.DocType("Server Snapshot") return ( base_query.left_join(PressRoleResource) diff --git a/press/guards/role_guard/site_backup.py b/press/guards/role_guard/site_backup.py index b83c8f14..c7ea8d67 100644 --- a/press/guards/role_guard/site_backup.py +++ b/press/guards/role_guard/site_backup.py @@ -4,8 +4,8 @@ from jingrow.query_builder.terms import QueryBuilder def check(base_query: QueryBuilder, document_name: str) -> bool: - PressRole = jingrow.qb.DocType("Press Role") - PressRoleResource = jingrow.qb.DocType("Press Role Resource") + PressRole = jingrow.qb.DocType("Jcloude Role") + PressRoleResource = jingrow.qb.DocType("Jcloude Role Resource") SiteBackup = jingrow.qb.DocType("Site Backup") return ( base_query.left_join(PressRoleResource) diff --git a/press/guards/role_guard/webhook.py b/press/guards/role_guard/webhook.py index fc03b447..9bcb77c2 100644 --- a/press/guards/role_guard/webhook.py +++ b/press/guards/role_guard/webhook.py @@ -4,7 +4,7 @@ from jingrow.query_builder.terms import QueryBuilder def check(base_query: QueryBuilder) -> bool: - PressRole = jingrow.qb.DocType("Press Role") + PressRole = jingrow.qb.DocType("Jcloude Role") return ( base_query.where(PressRole.allow_webhook_configuration == 1) .select(Count(PressRole.name).as_("document_count")) diff --git a/press/guards/settings.py b/press/guards/settings.py index 3e4223c8..20380ad0 100644 --- a/press/guards/settings.py +++ b/press/guards/settings.py @@ -2,12 +2,12 @@ import functools import jingrow -SETTINGS_DOCTYPE = "Press Settings" +SETTINGS_DOCTYPE = "Jcloude Settings" def enabled(key: str, default_value=None, raise_error: bool = False): """ - Decorator to check if a feature is enabled in Press Settings. + Decorator to check if a feature is enabled in Jcloude Settings. Example: ```python diff --git a/press/hooks.py b/press/hooks.py index 4be25902..0a0b94ad 100644 --- a/press/hooks.py +++ b/press/hooks.py @@ -3,7 +3,7 @@ from jcloude.api.account import get_jingrow_io_auth_url from . import __version__ as app_version app_name = "jcloude" -app_title = "Press" +app_title = "Jcloude" app_publisher = "Jingrow" app_description = "Managed Jingrow Hosting" app_icon = "octicon octicon-rocket" @@ -122,8 +122,8 @@ permission_query_conditions = { "Server": "jcloude.jcloude.doctype.server.server.get_permission_query_conditions", "Database Server": "jcloude.jcloude.doctype.database_server.database_server.get_permission_query_conditions", "Virtual Machine": "jcloude.jcloude.doctype.virtual_machine.virtual_machine.get_permission_query_conditions", - "Press Webhook": "jcloude.jcloude.doctype.jcloude_webhook.jcloude_webhook.get_permission_query_conditions", - "Press Webhook Log": "jcloude.jcloude.doctype.jcloude_webhook_log.jcloude_webhook_log.get_permission_query_conditions", + "Jcloude Webhook": "jcloude.jcloude.doctype.jcloude_webhook.jcloude_webhook.get_permission_query_conditions", + "Jcloude Webhook Log": "jcloude.jcloude.doctype.jcloude_webhook_log.jcloude_webhook_log.get_permission_query_conditions", "SQL Playground Log": "jcloude.jcloude.doctype.sql_playground_log.sql_playground_log.get_permission_query_conditions", "Site Database User": "jcloude.jcloude.doctype.site_database_user.site_database_user.get_permission_query_conditions", "Server Snapshot": "jcloude.jcloude.doctype.server_snapshot.server_snapshot.get_permission_query_conditions", @@ -148,9 +148,9 @@ has_permission = { "Bench": "jcloude.overrides.has_permission", "Server": "jcloude.overrides.has_permission", "Database Server": "jcloude.overrides.has_permission", - "Press Webhook": "jcloude.overrides.has_permission", - "Press Webhook Log": "jcloude.overrides.has_permission", - "Press Webhook Attempt": "jcloude.jcloude.doctype.jcloude_webhook_attempt.jcloude_webhook_attempt.has_permission", + "Jcloude Webhook": "jcloude.overrides.has_permission", + "Jcloude Webhook Log": "jcloude.overrides.has_permission", + "Jcloude Webhook Attempt": "jcloude.jcloude.doctype.jcloude_webhook_attempt.jcloude_webhook_attempt.has_permission", "SQL Playground Log": "jcloude.overrides.has_permission", "Site Database User": "jcloude.overrides.has_permission", "Server Snapshot": "jcloude.overrides.has_permission", @@ -384,17 +384,17 @@ deploy_hours = [1, 2, 3, 4, 5, 21, 22, 23] # Purposefully avoiding 0 fixtures = [ "Agent Job Type", - "Press Job Type", + "Jcloude Job Type", "Jingrow Version", "MariaDB Variable", "Cloud Region", - {"dt": "Role", "filters": [["role_name", "like", "Press%"]]}, + {"dt": "Role", "filters": [["role_name", "like", "Jcloude%"]]}, "Site Config Key Blacklist", - "Press Method Permission", + "Jcloude Method Permission", "Bench Dependency", "Server Storage Plan", "Server Snapshot Plan", - "Press Webhook Event", + "Jcloude Webhook Event", ] # Testing # ------- diff --git a/press/incident_management/doctype/incident_investigator/incident_investigator.py b/press/incident_management/doctype/incident_investigator/incident_investigator.py index fc0f5064..408f3963 100644 --- a/press/incident_management/doctype/incident_investigator/incident_investigator.py +++ b/press/incident_management/doctype/incident_investigator/incident_investigator.py @@ -38,7 +38,7 @@ class Status(Enum): def get_prometheus_client() -> PrometheusConnect: """Get prometheus client""" - monitor_server = jingrow.db.get_single_value("Press Settings", "monitor_server") + monitor_server = jingrow.db.get_single_value("Jcloude Settings", "monitor_server") password = get_decrypted_password("Monitor Server", monitor_server, "grafana_password") return PrometheusConnect(f"https://{monitor_server}/prometheus", auth=("jingrow", password)) @@ -471,7 +471,7 @@ class IncidentInvestigator(Document): self.stop_calls_on_high_disk_usage() self.add_investigation_actions() execute_action_steps = jingrow.db.get_single_value( - "Press Settings", "execute_incident_action", cache=True + "Jcloude Settings", "execute_incident_action", cache=True ) if self.action_steps and execute_action_steps: jingrow.enqueue_pg(self.doctype, self.name, "execute_action_steps", queue="long") diff --git a/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.py b/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.py index 120e8872..40079794 100644 --- a/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.py +++ b/press/infrastructure/doctype/ssh_access_audit/ssh_access_audit.py @@ -95,7 +95,7 @@ class SSHAccessAudit(Document): def set_inventory(self): all_servers = [] - domain = jingrow.db.get_value("Press Settings", None, "domain") + domain = jingrow.db.get_value("Jcloude Settings", None, "domain") for server_type in SERVER_TYPES: # Skip self-hosted servers filters = {"status": "Active", "domain": domain} @@ -113,7 +113,7 @@ class SSHAccessAudit(Document): self.inventory = ",".join(all_servers) def get_self_inventory(self): - # Press should audit itself + # Jcloude should audit itself servers = [jingrow.local.site, f"db.{jingrow.local.site}"] if jingrow.conf.replica_host: servers.append(f"db2.{jingrow.local.site}") @@ -138,7 +138,7 @@ class SSHAccessAudit(Document): @cached_property def acceptable_keys(self): keys = {} - domain = jingrow.db.get_value("Press Settings", None, "domain") + domain = jingrow.db.get_value("Jcloude Settings", None, "domain") fields = self.get_acceptable_key_fields() for doctype, field in fields: filters = {} diff --git a/press/marketplace/doctype/app_user_review/app_user_review.json b/press/marketplace/doctype/app_user_review/app_user_review.json index a1ebf8e2..30792745 100644 --- a/press/marketplace/doctype/app_user_review/app_user_review.json +++ b/press/marketplace/doctype/app_user_review/app_user_review.json @@ -84,7 +84,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1, "write": 1 } diff --git a/press/marketplace/doctype/developer_review_reply/developer_review_reply.json b/press/marketplace/doctype/developer_review_reply/developer_review_reply.json index 50854fca..8ca67103 100644 --- a/press/marketplace/doctype/developer_review_reply/developer_review_reply.json +++ b/press/marketplace/doctype/developer_review_reply/developer_review_reply.json @@ -60,7 +60,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1, "write": 1 } diff --git a/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.json b/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.json index b380e686..ec47d3c0 100644 --- a/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.json +++ b/press/marketplace/doctype/marketplace_app_feedback/marketplace_app_feedback.json @@ -104,7 +104,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "select": 1, "share": 1, "write": 1 diff --git a/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.json b/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.json index da4d5c6d..45f38b26 100644 --- a/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.json +++ b/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.json @@ -69,7 +69,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1, "write": 1 } diff --git a/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.py b/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.py index 01fc80c4..b8b0ff52 100644 --- a/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.py +++ b/press/marketplace/doctype/marketplace_app_payment/marketplace_app_payment.py @@ -7,16 +7,16 @@ from jingrow.model.document import Document class MarketplaceAppPayment(Document): def has_threshold_passed(self): - exchange_rate = jingrow.db.get_single_value("Press Settings", "usd_rate") + exchange_rate = jingrow.db.get_single_value("Jcloude Settings", "usd_rate") total = self.total_usd + (self.total_inr / exchange_rate) if exchange_rate > 0 else 80 - return total >= jingrow.db.get_single_value("Press Settings", "threshold") + return total >= jingrow.db.get_single_value("Jcloude Settings", "threshold") def get_commission(self, total): # TODO: Handle partial commission # if first month collection: $20, second month: $1000 and $500 - cap/threshold # then commission should be calculated for $520 from second month collection onwards return ( - total * jingrow.db.get_single_value("Press Settings", "commission") + total * jingrow.db.get_single_value("Jcloude Settings", "commission") if self.has_threshold_passed() else total ) diff --git a/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.json b/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.json index 83df9c0f..75ad38c4 100644 --- a/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.json +++ b/press/marketplace/doctype/marketplace_app_plan/marketplace_app_plan.json @@ -130,7 +130,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1, "write": 1 } diff --git a/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.json b/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.json index 7eb1b507..cf26bee6 100644 --- a/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.json +++ b/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.json @@ -133,7 +133,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1, "write": 1 } diff --git a/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.py b/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.py index 4f653a26..93ea5531 100644 --- a/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.py +++ b/press/marketplace/doctype/marketplace_app_subscription/marketplace_app_subscription.py @@ -115,7 +115,7 @@ class MarketplaceAppSubscription(Document): config.append( { "key": "app_include_js", - "value": [jingrow.db.get_single_value("Press Settings", "app_include_script")], + "value": [jingrow.db.get_single_value("Jcloude Settings", "app_include_script")], "type": "JSON", } ) diff --git a/press/marketplace/doctype/marketplace_promotional_banner/marketplace_promotional_banner.json b/press/marketplace/doctype/marketplace_promotional_banner/marketplace_promotional_banner.json index 64d5d865..30a8edcd 100644 --- a/press/marketplace/doctype/marketplace_promotional_banner/marketplace_promotional_banner.json +++ b/press/marketplace/doctype/marketplace_promotional_banner/marketplace_promotional_banner.json @@ -75,7 +75,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1, "write": 1 } diff --git a/press/marketplace/doctype/marketplace_publisher_profile/marketplace_publisher_profile.json b/press/marketplace/doctype/marketplace_publisher_profile/marketplace_publisher_profile.json index c4b07f52..d644160d 100644 --- a/press/marketplace/doctype/marketplace_publisher_profile/marketplace_publisher_profile.json +++ b/press/marketplace/doctype/marketplace_publisher_profile/marketplace_publisher_profile.json @@ -140,7 +140,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1, "write": 1 } diff --git a/press/marketplace/doctype/marketplace_settings/marketplace_settings.json b/press/marketplace/doctype/marketplace_settings/marketplace_settings.json index 4f09805e..a14b582e 100644 --- a/press/marketplace/doctype/marketplace_settings/marketplace_settings.json +++ b/press/marketplace/doctype/marketplace_settings/marketplace_settings.json @@ -67,7 +67,7 @@ "email": 1, "print": 1, "read": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1, "write": 1 } diff --git a/press/metrics.py b/press/metrics.py index 89a29926..515f5f3c 100644 --- a/press/metrics.py +++ b/press/metrics.py @@ -36,7 +36,7 @@ class MetricsRenderer: "jcloude_builds_suspended", "Are docker builds suspended", registry=self.registry ) suspended_builds.set( - cint(jingrow.db.get_value("Press Settings", None, "suspend_builds")) + cint(jingrow.db.get_value("Jcloude Settings", None, "suspend_builds")) ) self.get_status( "jcloude_deploy_candidate_total", @@ -60,7 +60,7 @@ class MetricsRenderer: self.get_status("jcloude_site_migration_total", "Site Migration") self.get_status("jcloude_site_upgrade_total", "Version Upgrade") - self.get_status("jcloude_jcloude_job_total", "Press Job") + self.get_status("jcloude_jcloude_job_total", "Jcloude Job") self.get_status( "jcloude_ansible_play_total", "Ansible Play", filters={"status": ("!=", "Success")} ) diff --git a/press/modules.txt b/press/modules.txt index d3146624..d001bfdf 100644 --- a/press/modules.txt +++ b/press/modules.txt @@ -1,4 +1,4 @@ -Press +Jcloude Experimental Marketplace SaaS diff --git a/press/overrides.py b/press/overrides.py index e9f400a0..522ace03 100644 --- a/press/overrides.py +++ b/press/overrides.py @@ -130,7 +130,7 @@ def cleanup_ansible_tmp_files(): def update_website_context(context): if (jingrow.request and jingrow.request.path.startswith("/docs")) and not jingrow.db.get_single_value( - "Press Settings", "publish_docs" + "Jcloude Settings", "publish_docs" ): raise jingrow.DoesNotExistError diff --git a/press/partner/doctype/certificate_link_request/certificate_link_request.json b/press/partner/doctype/certificate_link_request/certificate_link_request.json index d4a481a2..4c440ca6 100644 --- a/press/partner/doctype/certificate_link_request/certificate_link_request.json +++ b/press/partner/doctype/certificate_link_request/certificate_link_request.json @@ -84,7 +84,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -95,7 +95,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 }, diff --git a/press/partner/doctype/partner_approval_request/partner_approval_request.json b/press/partner/doctype/partner_approval_request/partner_approval_request.json index 959c9eb3..4d3b97e9 100644 --- a/press/partner/doctype/partner_approval_request/partner_approval_request.json +++ b/press/partner/doctype/partner_approval_request/partner_approval_request.json @@ -92,7 +92,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 } diff --git a/press/partner/doctype/partner_certificate_request/partner_certificate_request.json b/press/partner/doctype/partner_certificate_request/partner_certificate_request.json index cc2629e3..65dc3ec4 100644 --- a/press/partner/doctype/partner_certificate_request/partner_certificate_request.json +++ b/press/partner/doctype/partner_certificate_request/partner_certificate_request.json @@ -62,14 +62,14 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "export": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/partner/doctype/partner_consent/partner_consent.json b/press/partner/doctype/partner_consent/partner_consent.json index 01f220d7..5cc4596c 100644 --- a/press/partner/doctype/partner_consent/partner_consent.json +++ b/press/partner/doctype/partner_consent/partner_consent.json @@ -64,7 +64,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -75,7 +75,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1 } ], diff --git a/press/partner/doctype/partner_lead/partner_lead.json b/press/partner/doctype/partner_lead/partner_lead.json index 33dcfbb4..ade22ed4 100644 --- a/press/partner/doctype/partner_lead/partner_lead.json +++ b/press/partner/doctype/partner_lead/partner_lead.json @@ -458,7 +458,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -469,7 +469,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/patches/v0_0_1/create_balance_transactions.py b/press/patches/v0_0_1/create_balance_transactions.py index 850dd516..d573cc0b 100644 --- a/press/patches/v0_0_1/create_balance_transactions.py +++ b/press/patches/v0_0_1/create_balance_transactions.py @@ -45,7 +45,7 @@ def execute(): def get_free_credits_left(team): invoices = jingrow.db.get_all("Invoice", {"team": team.name, "status": ("!=", "Draft")}) - settings = jingrow.get_pg("Press Settings") + settings = jingrow.get_pg("Jcloude Settings") total_free_credits = ( settings.free_credits_inr if team.currency == "INR" else settings.free_credits_usd ) diff --git a/press/patches/v0_0_1/create_root_domain_from_press_settings.py b/press/patches/v0_0_1/create_root_domain_from_press_settings.py index 80b40213..13cbbe1f 100644 --- a/press/patches/v0_0_1/create_root_domain_from_press_settings.py +++ b/press/patches/v0_0_1/create_root_domain_from_press_settings.py @@ -8,7 +8,7 @@ import jingrow def execute(): jingrow.reload_pg("jcloude", "doctype", "root_domain") - jcloude_settings = jingrow.get_pg("Press Settings", "Press Settings") + jcloude_settings = jingrow.get_pg("Jcloude Settings", "Jcloude Settings") if ( jcloude_settings.domain and jcloude_settings.aws_secret_access_key diff --git a/press/patches/v0_0_1/set_cluster_in_press_settings.py b/press/patches/v0_0_1/set_cluster_in_press_settings.py index 2a1c34a8..986ef12d 100644 --- a/press/patches/v0_0_1/set_cluster_in_press_settings.py +++ b/press/patches/v0_0_1/set_cluster_in_press_settings.py @@ -10,7 +10,7 @@ def execute(): jingrow.reload_pg("jcloude", "doctype", "erpnext_app") jingrow.reload_pg("jcloude", "doctype", "jcloude_settings") jingrow.clear_cache() - jcloude_settings = jingrow.get_pg("Press Settings", "Press Settings") + jcloude_settings = jingrow.get_pg("Jcloude Settings", "Jcloude Settings") if not jcloude_settings.get("cluster"): jcloude_settings.cluster = jingrow.db.get_value( "Root Domain", jcloude_settings.domain, "default_cluster" diff --git a/press/patches/v0_0_1/set_domain_in_site.py b/press/patches/v0_0_1/set_domain_in_site.py index 10acb16e..564f6bc6 100644 --- a/press/patches/v0_0_1/set_domain_in_site.py +++ b/press/patches/v0_0_1/set_domain_in_site.py @@ -7,7 +7,7 @@ import jingrow def execute(): jingrow.reload_pg("jcloude", "doctype", "site") - domain = jingrow.db.get_single_value("Press Settings", "domain") + domain = jingrow.db.get_single_value("Jcloude Settings", "domain") jingrow.db.sql( "UPDATE tabSite SET domain = %s WHERE IFNULL(domain, '') = ''", (domain,) ) diff --git a/press/patches/v0_0_1/set_hostname_in_server.py b/press/patches/v0_0_1/set_hostname_in_server.py index c1c1f106..f03c0d55 100644 --- a/press/patches/v0_0_1/set_hostname_in_server.py +++ b/press/patches/v0_0_1/set_hostname_in_server.py @@ -10,7 +10,7 @@ def execute(): for doctype in doctypes: jingrow.reload_pg("jcloude", "doctype", jingrow.scrub(doctype)) servers = jingrow.get_all(doctype, {"hostname": ("is", "not set")}) - domain = jingrow.db.get_single_value("Press Settings", "domain") + domain = jingrow.db.get_single_value("Jcloude Settings", "domain") for server in servers: hostname = server.name.replace(f".{domain}", "") jingrow.db.set_value(doctype, server.name, "hostname", hostname) diff --git a/press/patches/v0_0_1/set_remote_file_location.py b/press/patches/v0_0_1/set_remote_file_location.py index 45f0e314..730057e2 100644 --- a/press/patches/v0_0_1/set_remote_file_location.py +++ b/press/patches/v0_0_1/set_remote_file_location.py @@ -12,7 +12,7 @@ def execute(): remote_files = ( x["name"] for x in jingrow.get_all("Remote File", [["bucket", "like", ""]]) ) - uploads_bucket = jingrow.db.get_single_value("Press Settings", "remote_uploads_bucket") + uploads_bucket = jingrow.db.get_single_value("Jcloude Settings", "remote_uploads_bucket") for remote_file in remote_files: jingrow.db.set_value("Remote File", remote_file, "bucket", uploads_bucket) diff --git a/press/patches/v0_0_1/track_offsite_backups_via_remote_files.py b/press/patches/v0_0_1/track_offsite_backups_via_remote_files.py index c942febf..6d002924 100644 --- a/press/patches/v0_0_1/track_offsite_backups_via_remote_files.py +++ b/press/patches/v0_0_1/track_offsite_backups_via_remote_files.py @@ -11,7 +11,7 @@ from jingrow.desk.doctype.tag.tag import add_tag def execute(): jingrow.reload_pg("jcloude", "doctype", "site_backup") - bucket = jingrow.db.get_single_value("Press Settings", "aws_s3_bucket") + bucket = jingrow.db.get_single_value("Jcloude Settings", "aws_s3_bucket") offsite_backups = [ jingrow.get_pg("Site Backup", x["name"]) for x in jingrow.get_all("Site Backup", {"offsite": 1}) diff --git a/press/patches/v0_0_1/use_private_ip_for_upstreams.py b/press/patches/v0_0_1/use_private_ip_for_upstreams.py index 42aa2c27..0b971f84 100644 --- a/press/patches/v0_0_1/use_private_ip_for_upstreams.py +++ b/press/patches/v0_0_1/use_private_ip_for_upstreams.py @@ -9,7 +9,7 @@ from jcloude.agent import Agent def execute(): - settings = jingrow.get_pg("Press Settings", "Press Settings") + settings = jingrow.get_pg("Jcloude Settings", "Jcloude Settings") settings.agent_repository_owner = "jingrow" settings.agent_github_access_token = input("GitHub Access Token: ") diff --git a/press/patches/v0_0_1/user_account_to_team.py b/press/patches/v0_0_1/user_account_to_team.py index 3e4955b3..3f3cac3c 100644 --- a/press/patches/v0_0_1/user_account_to_team.py +++ b/press/patches/v0_0_1/user_account_to_team.py @@ -40,7 +40,7 @@ def execute(): account_request.request_key = d.account_key account_request.email = d.user account_request.team = d.user - account_request.role = "Press Admin" + account_request.role = "Jcloude Admin" account_request.creation = d.creation account_request.insert() diff --git a/press/playbooks/roles/prometheus/tasks/main.yml b/press/playbooks/roles/prometheus/tasks/main.yml index 0d463a5f..0fc39f8f 100644 --- a/press/playbooks/roles/prometheus/tasks/main.yml +++ b/press/playbooks/roles/prometheus/tasks/main.yml @@ -45,7 +45,7 @@ force: true mode: 0600 -- name: Configure Prometheus Service Discovery for Press Server +- name: Configure Prometheus Service Discovery for Jcloude Server become: yes become_user: jingrow template: diff --git a/press/playbooks/roles/reconfigure_prometheus/tasks/main.yml b/press/playbooks/roles/reconfigure_prometheus/tasks/main.yml index c6c2f254..115ecafe 100644 --- a/press/playbooks/roles/reconfigure_prometheus/tasks/main.yml +++ b/press/playbooks/roles/reconfigure_prometheus/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: Configure Prometheus Service Discovery for Press Server +- name: Configure Prometheus Service Discovery for Jcloude Server become: yes become_user: jingrow template: diff --git a/press/press/audit.py b/press/press/audit.py index 56e9d0da..c60f8b94 100644 --- a/press/press/audit.py +++ b/press/press/audit.py @@ -284,7 +284,7 @@ class OffsiteBackupCheck(Audit): def _get_all_files_in_s3(self) -> list[str]: all_files = [] - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") s3 = settings.boto3_offsite_backup_session.resource("s3") for s3_object in s3.Bucket(settings.aws_s3_bucket).objects.all(): all_files.append(s3_object.key) diff --git a/press/press/custom/address.json b/press/press/custom/address.json index 279188dd..3d51ec9a 100644 --- a/press/press/custom/address.json +++ b/press/press/custom/address.json @@ -153,7 +153,7 @@ "print": 0, "read": 1, "report": 0, - "role": "Press Admin", + "role": "Jcloude Admin", "select": 0, "share": 0, "submit": 0, @@ -277,7 +277,7 @@ "print": 0, "read": 1, "report": 0, - "role": "Press Member", + "role": "Jcloude Member", "select": 0, "share": 0, "submit": 0, diff --git a/press/press/doctype/account_request/account_request.json b/press/press/doctype/account_request/account_request.json index da494578..7d00fe9e 100644 --- a/press/press/doctype/account_request/account_request.json +++ b/press/press/doctype/account_request/account_request.json @@ -259,8 +259,8 @@ { "fieldname": "jcloude_roles", "fieldtype": "Table MultiSelect", - "label": "Press Roles", - "options": "Account Request Press Role" + "label": "Jcloude Roles", + "options": "Account Request Jcloude Role" }, { "fieldname": "otp", @@ -312,7 +312,7 @@ "links": [], "modified": "2025-10-29 07:26:37.983114", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Account Request", "owner": "Administrator", "permissions": [ @@ -330,11 +330,11 @@ }, { "create": 1, - "role": "Press Admin" + "role": "Jcloude Admin" }, { "create": 1, - "role": "Press Member" + "role": "Jcloude Member" } ], "row_format": "Dynamic", diff --git a/press/press/doctype/account_request/account_request.py b/press/press/doctype/account_request/account_request.py index affd9029..a5acb71d 100644 --- a/press/press/doctype/account_request/account_request.py +++ b/press/press/doctype/account_request/account_request.py @@ -74,7 +74,7 @@ class AccountRequest(Document): # because, in general flow we already have e-mail link/otp based verification if ( not jingrow.conf.developer_mode - and jingrow.db.get_single_value("Press Settings", "enable_email_pre_verification") + and jingrow.db.get_single_value("Jcloude Settings", "enable_email_pre_verification") and self.saas and not self.oauth_signup and not is_valid_email_address(self.email) @@ -238,7 +238,7 @@ class AccountRequest(Document): sender = jingrow.get_value("Email Account", email_account, "email_id") else: template = "verify_account" - if self.invited_by and self.role != "Press Admin": + if self.invited_by and self.role != "Jcloude Admin": subject = f"You are invited by {self.invited_by} to join Jingrow Cloud" template = "invite_team_member" diff --git a/press/press/doctype/account_request/test_account_request.py b/press/press/doctype/account_request/test_account_request.py index 6167f61f..6cedceaa 100644 --- a/press/press/doctype/account_request/test_account_request.py +++ b/press/press/doctype/account_request/test_account_request.py @@ -53,7 +53,7 @@ class TestAccountRequest(FrappeTestCase): @patch("jcloude.utils.disposable_emails.domains") def test_temporary_email_provider(self, domains): - jingrow.db.set_value("Press Settings", "Press Settings", "disallow_disposable_emails", 1) + jingrow.db.set_value("Jcloude Settings", "Jcloude Settings", "disallow_disposable_emails", 1) domain = jingrow.mock("domain_name") domains.return_value = [domain] diff --git a/press/press/doctype/account_request_press_role/account_request_press_role.json b/press/press/doctype/account_request_press_role/account_request_press_role.json index 5be5cb9b..1132dac5 100644 --- a/press/press/doctype/account_request_press_role/account_request_press_role.json +++ b/press/press/doctype/account_request_press_role/account_request_press_role.json @@ -12,8 +12,8 @@ { "fieldname": "jcloude_role", "fieldtype": "Link", - "label": "Press Role", - "options": "Press Role" + "label": "Jcloude Role", + "options": "Jcloude Role" } ], "index_web_pages_for_search": 1, @@ -21,8 +21,8 @@ "links": [], "modified": "2024-07-07 11:29:10.685626", "modified_by": "Administrator", - "module": "Press", - "name": "Account Request Press Role", + "module": "Jcloude", + "name": "Account Request Jcloude Role", "owner": "Administrator", "permissions": [], "sort_field": "creation", diff --git a/press/press/doctype/add_on_settings/add_on_settings.json b/press/press/doctype/add_on_settings/add_on_settings.json index 7c32fd19..2be613fc 100644 --- a/press/press/doctype/add_on_settings/add_on_settings.json +++ b/press/press/doctype/add_on_settings/add_on_settings.json @@ -33,7 +33,7 @@ "links": [], "modified": "2022-02-14 19:25:23.215420", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Add On Settings", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/add_on_storage_log/add_on_storage_log.json b/press/press/doctype/add_on_storage_log/add_on_storage_log.json index 22858a21..e41f7489 100644 --- a/press/press/doctype/add_on_storage_log/add_on_storage_log.json +++ b/press/press/doctype/add_on_storage_log/add_on_storage_log.json @@ -99,7 +99,7 @@ "links": [], "modified": "2025-07-17 21:51:34.568795", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Add On Storage Log", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/agent_job/agent_job.json b/press/press/doctype/agent_job/agent_job.json index 153d8d45..a4ebebff 100644 --- a/press/press/doctype/agent_job/agent_job.json +++ b/press/press/doctype/agent_job/agent_job.json @@ -258,7 +258,7 @@ "links": [], "modified": "2025-11-19 15:54:21.538789", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Agent Job", "owner": "Administrator", "permissions": [ @@ -277,13 +277,13 @@ { "create": 1, "if_owner": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "if_owner": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 }, { diff --git a/press/press/doctype/agent_job/agent_job.py b/press/press/doctype/agent_job/agent_job.py index 059bb324..f82c8336 100644 --- a/press/press/doctype/agent_job/agent_job.py +++ b/press/press/doctype/agent_job/agent_job.py @@ -323,7 +323,7 @@ class AgentJob(Document): jingrow.delete_pg("Agent Job Step", step.name) jingrow.db.delete( - "Press Notification", + "Jcloude Notification", {"document_type": self.doctype, "document_name": self.name}, ) @@ -358,7 +358,7 @@ class AgentJob(Document): "Incident", { "server": self.server, - "status": ("in", ["Auto-Resolved", "Resolved", "Press-Resolved"]), + "status": ("in", ["Auto-Resolved", "Resolved", "Jcloude-Resolved"]), "creation": ( "between", [ @@ -551,7 +551,7 @@ def handle_polled_job(polled_job, pending_jobs=None, job=None): def populate_output_cache(polled_job, job): - if not cint(jingrow.get_cached_value("Press Settings", None, "realtime_job_updates")): + if not cint(jingrow.get_cached_value("Jcloude Settings", None, "realtime_job_updates")): return steps = jingrow.get_all( "Agent Job Step", @@ -841,7 +841,7 @@ def is_auto_retry_disabled(server): _auto_retry_disabled = False # Global Config - _auto_retry_disabled = jingrow.db.get_single_value("Press Settings", "disable_auto_retry", cache=True) + _auto_retry_disabled = jingrow.db.get_single_value("Jcloude Settings", "disable_auto_retry", cache=True) if _auto_retry_disabled: return True diff --git a/press/press/doctype/agent_job/agent_job_notifications.py b/press/press/doctype/agent_job/agent_job_notifications.py index 2053fe6f..a461fe41 100644 --- a/press/press/doctype/agent_job/agent_job_notifications.py +++ b/press/press/doctype/agent_job/agent_job_notifications.py @@ -87,7 +87,7 @@ def handlers() -> list[UserAddressableHandlerTuple]: is called. `UserAddressableHandler` is used to update the details - used to create the Press Notification + used to create the Jcloude Notification `UserAddressableHandler` can return False if it isn't user addressable, in this case the remaining handler @@ -127,7 +127,7 @@ def create_job_failed_notification( details = get_details(job, title, message) pg_dict = { - "doctype": "Press Notification", + "doctype": "Jcloude Notification", "team": team, "type": notification_type, "document_type": job.doctype, @@ -139,7 +139,7 @@ def create_job_failed_notification( pg.insert() jingrow.db.commit() - jingrow.publish_realtime("jcloude_notification", doctype="Press Notification", message={"team": team}) + jingrow.publish_realtime("jcloude_notification", doctype="Jcloude Notification", message={"team": team}) return details["is_actionable"] diff --git a/press/press/doctype/agent_job/test_agent_job.py b/press/press/doctype/agent_job/test_agent_job.py index cc9caa50..02fadd37 100644 --- a/press/press/doctype/agent_job/test_agent_job.py +++ b/press/press/doctype/agent_job/test_agent_job.py @@ -259,7 +259,7 @@ class TestAgentJob(FrappeTestCase): site.update_site_config({"maintenance_mode": "1"}) job = jingrow.get_last_pg("Agent Job", {"job_type": "Update Site Configuration"}) - jingrow.db.set_single_value("Press Settings", "disable_agent_job_deduplication", False) + jingrow.db.set_single_value("Jcloude Settings", "disable_agent_job_deduplication", False) # create a new job with same type and site job_name = site.update_site_config({"host_name": f"https://{site.host_name}"}) @@ -271,7 +271,7 @@ class TestAgentJob(FrappeTestCase): site.update_site_config({"maintenance_mode": "1"}) job = jingrow.get_last_pg("Agent Job", {"job_type": "Update Site Configuration"}) - jingrow.db.set_single_value("Press Settings", "disable_agent_job_deduplication", False) + jingrow.db.set_single_value("Jcloude Settings", "disable_agent_job_deduplication", False) # check if similar job exists agent = Agent(site.server) @@ -284,4 +284,4 @@ class TestAgentJob(FrappeTestCase): self.assertEqual(in_execution_job.name, job.name) - jingrow.db.set_single_value("Press Settings", "disable_agent_job_deduplication", True) + jingrow.db.set_single_value("Jcloude Settings", "disable_agent_job_deduplication", True) diff --git a/press/press/doctype/agent_job_callback/agent_job_callback.json b/press/press/doctype/agent_job_callback/agent_job_callback.json index 79651c49..784d7285 100644 --- a/press/press/doctype/agent_job_callback/agent_job_callback.json +++ b/press/press/doctype/agent_job_callback/agent_job_callback.json @@ -42,7 +42,7 @@ "links": [], "modified": "2025-03-27 09:22:13.862830", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Agent Job Callback", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/agent_job_step/agent_job_step.json b/press/press/doctype/agent_job_step/agent_job_step.json index 1a69c13d..a07176cf 100644 --- a/press/press/doctype/agent_job_step/agent_job_step.json +++ b/press/press/doctype/agent_job_step/agent_job_step.json @@ -96,7 +96,7 @@ "links": [], "modified": "2025-11-19 15:53:58.641560", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Agent Job Step", "owner": "Administrator", "permissions": [ @@ -114,11 +114,11 @@ }, { "create": 1, - "role": "Press Admin" + "role": "Jcloude Admin" }, { "create": 1, - "role": "Press Member" + "role": "Jcloude Member" } ], "row_format": "Dynamic", diff --git a/press/press/doctype/agent_job_type/agent_job_type.json b/press/press/doctype/agent_job_type/agent_job_type.json index e949d49c..1c68f9e5 100644 --- a/press/press/doctype/agent_job_type/agent_job_type.json +++ b/press/press/doctype/agent_job_type/agent_job_type.json @@ -61,7 +61,7 @@ "links": [], "modified": "2023-11-16 12:19:35.365980", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Agent Job Type", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/agent_job_type_step/agent_job_type_step.json b/press/press/doctype/agent_job_type_step/agent_job_type_step.json index 10702fba..d465829b 100644 --- a/press/press/doctype/agent_job_type_step/agent_job_type_step.json +++ b/press/press/doctype/agent_job_type_step/agent_job_type_step.json @@ -20,7 +20,7 @@ "links": [], "modified": "2020-01-14 10:43:26.284328", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Agent Job Type Step", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/agent_request_failure/agent_request_failure.json b/press/press/doctype/agent_request_failure/agent_request_failure.json index 72cbc19e..b7951fe8 100644 --- a/press/press/doctype/agent_request_failure/agent_request_failure.json +++ b/press/press/doctype/agent_request_failure/agent_request_failure.json @@ -73,7 +73,7 @@ "links": [], "modified": "2024-06-12 15:05:52.948905", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Agent Request Failure", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/agent_update/agent_update.json b/press/press/doctype/agent_update/agent_update.json index 0c427d8d..61537657 100644 --- a/press/press/doctype/agent_update/agent_update.json +++ b/press/press/doctype/agent_update/agent_update.json @@ -263,7 +263,7 @@ "links": [], "modified": "2025-05-16 13:41:29.319164", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Agent Update", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/agent_update/agent_update.py b/press/press/doctype/agent_update/agent_update.py index 225f0e0e..f68bc1bf 100644 --- a/press/press/doctype/agent_update/agent_update.py +++ b/press/press/doctype/agent_update/agent_update.py @@ -147,7 +147,7 @@ class AgentUpdate(Document): self.agent_startup_timeout_minutes = 10 # Set repo - jcloude_settings = jingrow.get_single("Press Settings") + jcloude_settings = jingrow.get_single("Jcloude Settings") if not self.repo: repository_owner = jcloude_settings.agent_repository_owner or "jingrow" self.repo = f"git.jingrow.com/{repository_owner}/agent" @@ -597,7 +597,7 @@ class AgentUpdate(Document): @property def github_access_token_header(self): - github_access_token = jingrow.get_cached_value("Press Settings", None, "github_access_token") + github_access_token = jingrow.get_cached_value("Jcloude Settings", None, "github_access_token") if not github_access_token: return {} diff --git a/press/press/doctype/agent_update_server/agent_update_server.json b/press/press/doctype/agent_update_server/agent_update_server.json index 9b3ec7a4..5c23db8f 100644 --- a/press/press/doctype/agent_update_server/agent_update_server.json +++ b/press/press/doctype/agent_update_server/agent_update_server.json @@ -152,7 +152,7 @@ "links": [], "modified": "2025-05-16 12:40:42.296680", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Agent Update Server", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.json b/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.json index 41397b7b..accf3c13 100644 --- a/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.json +++ b/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.json @@ -138,7 +138,7 @@ "links": [], "modified": "2024-04-30 15:39:21.126637", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Alertmanager Webhook Log", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.py b/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.py index cabef667..a482bf9c 100644 --- a/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.py +++ b/press/press/doctype/alertmanager_webhook_log/alertmanager_webhook_log.py @@ -116,11 +116,11 @@ class AlertmanagerWebhookLog(Document): enqueue_after_commit=True, ) if not jingrow.get_cached_value("Prometheus Alert Rule", self.alert, "silent"): - send_telegram_notifs = jingrow.db.get_single_value("Press Settings", "send_telegram_notifications") + send_telegram_notifs = jingrow.db.get_single_value("Jcloude Settings", "send_telegram_notifications") if send_telegram_notifs: enqueue_pg(self.doctype, self.name, "send_telegram_notification", enqueue_after_commit=True) - send_email_notifs = jingrow.db.get_single_value("Press Settings", "send_email_notifications") + send_email_notifs = jingrow.db.get_single_value("Jcloude Settings", "send_email_notifications") if send_email_notifs: enqueue_pg(self.doctype, self.name, "send_email_notification", enqueue_after_commit=True) @@ -279,7 +279,7 @@ class AlertmanagerWebhookLog(Document): def send_email_notification(self): message = self.generate_telegram_message() - recipient_emails = jingrow.db.get_single_value("Press Settings", "email_recipients") + recipient_emails = jingrow.db.get_single_value("Jcloude Settings", "email_recipients") email_list = [email.strip() for email in recipient_emails.split(",")] jingrow.sendmail( recipients=email_list, diff --git a/press/press/doctype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.json b/press/press/doctype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.json index 4864816e..347a1789 100644 --- a/press/press/doctype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.json +++ b/press/press/doctype/alertmanager_webhook_log_reaction_job/alertmanager_webhook_log_reaction_job.json @@ -13,16 +13,16 @@ "fieldname": "jcloude_job_type", "fieldtype": "Link", "in_list_view": 1, - "label": "Press Job Type", - "options": "Press Job Type", + "label": "Jcloude Job Type", + "options": "Jcloude Job Type", "read_only": 1 }, { "fieldname": "jcloude_job", "fieldtype": "Link", "in_list_view": 1, - "label": "Press Job", - "options": "Press Job", + "label": "Jcloude Job", + "options": "Jcloude Job", "read_only": 1 } ], @@ -31,7 +31,7 @@ "links": [], "modified": "2024-12-26 13:54:57.631772", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Alertmanager Webhook Log Reaction Job", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/analytics_server/analytics_server.json b/press/press/doctype/analytics_server/analytics_server.json index 3aa9385d..1ccf0f2a 100644 --- a/press/press/doctype/analytics_server/analytics_server.json +++ b/press/press/doctype/analytics_server/analytics_server.json @@ -263,7 +263,7 @@ ], "modified": "2025-09-02 16:43:53.162616", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Analytics Server", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/analytics_server/analytics_server.py b/press/press/doctype/analytics_server/analytics_server.py index 901ba0fc..b7a24fe4 100644 --- a/press/press/doctype/analytics_server/analytics_server.py +++ b/press/press/doctype/analytics_server/analytics_server.py @@ -65,7 +65,7 @@ class AnalyticsServer(BaseServer): ) certificate = jingrow.get_pg("TLS Certificate", certificate_name) - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if log_server: kibana_password = jingrow.get_pg("Log Server", log_server).get_password("kibana_password") else: diff --git a/press/press/doctype/ansible_console/ansible_console.json b/press/press/doctype/ansible_console/ansible_console.json index fa4141e0..42433e3d 100644 --- a/press/press/doctype/ansible_console/ansible_console.json +++ b/press/press/doctype/ansible_console/ansible_console.json @@ -70,7 +70,7 @@ "links": [], "modified": "2023-11-24 14:46:36.102377", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Ansible Console", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/ansible_console_log/ansible_console_log.json b/press/press/doctype/ansible_console_log/ansible_console_log.json index af907225..8c7ca065 100644 --- a/press/press/doctype/ansible_console_log/ansible_console_log.json +++ b/press/press/doctype/ansible_console_log/ansible_console_log.json @@ -45,7 +45,7 @@ "links": [], "modified": "2023-11-24 11:52:08.811559", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Ansible Console Log", "naming_rule": "Expression", "owner": "Administrator", diff --git a/press/press/doctype/ansible_console_output/ansible_console_output.json b/press/press/doctype/ansible_console_output/ansible_console_output.json index bc827cbf..8970097c 100644 --- a/press/press/doctype/ansible_console_output/ansible_console_output.json +++ b/press/press/doctype/ansible_console_output/ansible_console_output.json @@ -66,7 +66,7 @@ "links": [], "modified": "2023-11-24 13:52:32.105261", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Ansible Console Output", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/ansible_play/ansible_play.json b/press/press/doctype/ansible_play/ansible_play.json index fc13425b..d34ab21e 100644 --- a/press/press/doctype/ansible_play/ansible_play.json +++ b/press/press/doctype/ansible_play/ansible_play.json @@ -179,7 +179,7 @@ "links": [], "modified": "2025-11-19 15:53:46.951150", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Ansible Play", "owner": "Administrator", "permissions": [ @@ -197,12 +197,12 @@ }, { "create": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/ansible_task/ansible_task.json b/press/press/doctype/ansible_task/ansible_task.json index 81fc10ef..257d9dfe 100644 --- a/press/press/doctype/ansible_task/ansible_task.json +++ b/press/press/doctype/ansible_task/ansible_task.json @@ -132,7 +132,7 @@ "links": [], "modified": "2025-11-19 15:53:26.168512", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Ansible Task", "owner": "Administrator", "permissions": [ @@ -150,12 +150,12 @@ }, { "create": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/app/app.json b/press/press/doctype/app/app.json index 2337f402..78df3ab0 100644 --- a/press/press/doctype/app/app.json +++ b/press/press/doctype/app/app.json @@ -128,7 +128,7 @@ "links": [], "modified": "2025-08-20 20:18:02.312328", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "App", "owner": "Administrator", "permissions": [ @@ -147,12 +147,12 @@ { "create": 1, "read": 1, - "role": "Press Admin" + "role": "Jcloude Admin" }, { "create": 1, "read": 1, - "role": "Press Member" + "role": "Jcloude Member" }, { "create": 1, @@ -161,7 +161,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "select": 1, "share": 1, "write": 1 diff --git a/press/press/doctype/app_group/app_group.json b/press/press/doctype/app_group/app_group.json index f1a0bb59..1b76f2a8 100644 --- a/press/press/doctype/app_group/app_group.json +++ b/press/press/doctype/app_group/app_group.json @@ -36,7 +36,7 @@ "links": [], "modified": "2024-09-04 12:02:25.463128", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "App Group", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/app_patch/app_patch.json b/press/press/doctype/app_patch/app_patch.json index c7481d81..c5e2bcb1 100644 --- a/press/press/doctype/app_patch/app_patch.json +++ b/press/press/doctype/app_patch/app_patch.json @@ -118,7 +118,7 @@ "links": [], "modified": "2025-04-17 11:22:43.781613", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "App Patch", "naming_rule": "Autoincrement", "owner": "Administrator", @@ -143,7 +143,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -155,7 +155,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/app_release/app_release.json b/press/press/doctype/app_release/app_release.json index 04dd1b92..d1780009 100644 --- a/press/press/doctype/app_release/app_release.json +++ b/press/press/doctype/app_release/app_release.json @@ -200,7 +200,7 @@ ], "modified": "2025-08-22 22:42:45.172216", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "App Release", "owner": "Administrator", "permissions": [ @@ -219,13 +219,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 }, { @@ -235,7 +235,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1, "write": 1 } diff --git a/press/press/doctype/app_release/app_release.py b/press/press/doctype/app_release/app_release.py index 2f9cf6f0..e68cd73d 100644 --- a/press/press/doctype/app_release/app_release.py +++ b/press/press/doctype/app_release/app_release.py @@ -109,7 +109,7 @@ class AppRelease(Document): def _has_auto_deploy_marker(self) -> tuple[bool, str | None]: """- | """ - deploy_marker = jingrow.db.get_single_value("Press Settings", "deploy_marker", cache=False) + deploy_marker = jingrow.db.get_single_value("Jcloude Settings", "deploy_marker", cache=False) # Acts as a feature flag for global auto deploys if not deploy_marker or not self.message or deploy_marker not in self.message: @@ -244,7 +244,7 @@ class AppRelease(Document): raise e def set_clone_directory(self): - clone_directory = jingrow.db.get_single_value("Press Settings", "clone_directory") + clone_directory = jingrow.db.get_single_value("Jcloude Settings", "clone_directory") self.clone_directory = os.path.join(clone_directory, self.app, self.source, self.hash[:10]) def _set_prepared_clone_directory(self, delete_if_exists: bool = False): @@ -256,7 +256,7 @@ class AppRelease(Document): ) def _set_code_server_url(self) -> None: - code_server = jingrow.db.get_single_value("Press Settings", "code_server") + code_server = jingrow.db.get_single_value("Jcloude Settings", "code_server") code_server_url = ( f"{code_server}/?folder=/home/coder/project/{self.app}/{self.source}/{self.hash[:10]}" ) @@ -474,7 +474,7 @@ def get_prepared_clone_directory( hash: str, delete_if_exists: bool = False, ) -> str: - clone_directory: str = jingrow.db.get_single_value("Press Settings", "clone_directory") + clone_directory: str = jingrow.db.get_single_value("Jcloude Settings", "clone_directory") if not os.path.exists(clone_directory): os.mkdir(clone_directory) diff --git a/press/press/doctype/app_release/patches/set_clone_directory.py b/press/press/doctype/app_release/patches/set_clone_directory.py index 0b4156b9..6b1c2900 100644 --- a/press/press/doctype/app_release/patches/set_clone_directory.py +++ b/press/press/doctype/app_release/patches/set_clone_directory.py @@ -7,7 +7,7 @@ import jingrow def execute(): jingrow.reload_doctype("App Release") - clone_directory = jingrow.db.get_single_value("Press Settings", "clone_directory") + clone_directory = jingrow.db.get_single_value("Jcloude Settings", "clone_directory") releases = jingrow.get_all( "App Release", {"clone_directory": ("is", "not set")}, diff --git a/press/press/doctype/app_release_approval_request/app_release_approval_request.json b/press/press/doctype/app_release_approval_request/app_release_approval_request.json index 2b0eb4b9..3326561c 100644 --- a/press/press/doctype/app_release_approval_request/app_release_approval_request.json +++ b/press/press/doctype/app_release_approval_request/app_release_approval_request.json @@ -171,7 +171,7 @@ "links": [], "modified": "2025-08-22 22:42:15.984891", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "App Release Approval Request", "owner": "Administrator", "permissions": [ @@ -195,7 +195,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "select": 1, "share": 1, "write": 1 diff --git a/press/press/doctype/app_release_difference/app_release_difference.json b/press/press/doctype/app_release_difference/app_release_difference.json index 0d5ae8f1..83a39f47 100644 --- a/press/press/doctype/app_release_difference/app_release_difference.json +++ b/press/press/doctype/app_release_difference/app_release_difference.json @@ -121,7 +121,7 @@ "links": [], "modified": "2021-02-16 11:05:32.813726", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "App Release Difference", "owner": "Administrator", "permissions": [ @@ -139,11 +139,11 @@ }, { "create": 1, - "role": "Press Admin" + "role": "Jcloude Admin" }, { "create": 1, - "role": "Press Member" + "role": "Jcloude Member" } ], "sort_field": "modified", diff --git a/press/press/doctype/app_release_difference/app_release_difference.py b/press/press/doctype/app_release_difference/app_release_difference.py index 3f203ed1..2c562bb9 100644 --- a/press/press/doctype/app_release_difference/app_release_difference.py +++ b/press/press/doctype/app_release_difference/app_release_difference.py @@ -78,7 +78,7 @@ class AppReleaseDifference(Document): except KeyError: jingrow.throw(f"Could not get access token for app source {source.name}") else: - github_access_token = jingrow.get_value("Press Settings", None, "github_access_token") + github_access_token = jingrow.get_value("Jcloude Settings", None, "github_access_token") client = Github(github_access_token) try: diff --git a/press/press/doctype/app_rename/app_rename.json b/press/press/doctype/app_rename/app_rename.json index 037bda28..e2049ac0 100644 --- a/press/press/doctype/app_rename/app_rename.json +++ b/press/press/doctype/app_rename/app_rename.json @@ -69,7 +69,7 @@ "links": [], "modified": "2025-08-05 15:27:10.390732", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "App Rename", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/app_source/app_source.json b/press/press/doctype/app_source/app_source.json index 851816b0..a95a3660 100644 --- a/press/press/doctype/app_source/app_source.json +++ b/press/press/doctype/app_source/app_source.json @@ -185,7 +185,7 @@ ], "modified": "2025-08-20 20:18:42.547327", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "App Source", "owner": "Administrator", "permissions": [ @@ -204,13 +204,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 }, { @@ -220,7 +220,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1 } ], diff --git a/press/press/doctype/app_source/app_source.py b/press/press/doctype/app_source/app_source.py index d8de6950..13049633 100644 --- a/press/press/doctype/app_source/app_source.py +++ b/press/press/doctype/app_source/app_source.py @@ -276,7 +276,7 @@ class AppSource(Document): if self.github_installation_id: return get_access_token(self.github_installation_id) - return jingrow.get_value("Press Settings", None, "github_access_token") + return jingrow.get_value("Jcloude Settings", None, "github_access_token") def get_repo_url(self) -> str: if not self.github_installation_id: diff --git a/press/press/doctype/app_source_version/app_source_version.json b/press/press/doctype/app_source_version/app_source_version.json index fe5c9470..7fe37ad5 100644 --- a/press/press/doctype/app_source_version/app_source_version.json +++ b/press/press/doctype/app_source_version/app_source_version.json @@ -23,7 +23,7 @@ "links": [], "modified": "2020-12-01 09:22:53.614702", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "App Source Version", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/app_tag/app_tag.json b/press/press/doctype/app_tag/app_tag.json index e3811c23..7013b633 100644 --- a/press/press/doctype/app_tag/app_tag.json +++ b/press/press/doctype/app_tag/app_tag.json @@ -67,7 +67,7 @@ "links": [], "modified": "2022-12-08 14:04:14.096037", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "App Tag", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/audit_log/audit_log.json b/press/press/doctype/audit_log/audit_log.json index d6fb7e83..f6259c18 100644 --- a/press/press/doctype/audit_log/audit_log.json +++ b/press/press/doctype/audit_log/audit_log.json @@ -51,7 +51,7 @@ "links": [], "modified": "2025-08-07 21:50:25.321975", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Audit Log", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/audit_log/audit_log.py b/press/press/doctype/audit_log/audit_log.py index e858f196..70b68a28 100644 --- a/press/press/doctype/audit_log/audit_log.py +++ b/press/press/doctype/audit_log/audit_log.py @@ -39,7 +39,7 @@ class AuditLog(Document): self.notify() def notify(self): - domain = jingrow.get_value("Press Settings", "Press Settings", "domain") + domain = jingrow.get_value("Jcloude Settings", "Jcloude Settings", "domain") message = f""" *FAILED AUDIT* [{self.audit_type}]({domain}{self.get_url()}) diff --git a/press/press/doctype/auto_scale_record/auto_scale_record.json b/press/press/doctype/auto_scale_record/auto_scale_record.json index 446078ef..23b48839 100644 --- a/press/press/doctype/auto_scale_record/auto_scale_record.json +++ b/press/press/doctype/auto_scale_record/auto_scale_record.json @@ -109,13 +109,13 @@ "index_web_pages_for_search": 1, "links": [ { - "link_doctype": "Press Notification", + "link_doctype": "Jcloude Notification", "link_fieldname": "document_name" } ], "modified": "2025-12-18 16:19:12.134366", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Auto Scale Record", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/auto_scale_record/auto_scale_record.py b/press/press/doctype/auto_scale_record/auto_scale_record.py index 9df6fe69..6e594035 100644 --- a/press/press/doctype/auto_scale_record/auto_scale_record.py +++ b/press/press/doctype/auto_scale_record/auto_scale_record.py @@ -33,7 +33,7 @@ class AutoScaleStepFailureHandler: team = jingrow.db.get_value("Server", self.primary_server, "team") jcloude_notification = jingrow.get_pg( { - "doctype": "Press Notification", + "doctype": "Jcloude Notification", "team": team, "type": "Auto Scale", "document_type": self.doctype, @@ -259,14 +259,14 @@ class AutoScaleRecord(Document, AutoScaleStepFailureHandler, StepHandler): def switch_to_secondary(self, step: "ScaleStep"): """Prepare Agent To Switch To Secondary""" settings = jingrow.db.get_value( - "Press Settings", + "Jcloude Settings", None, ["docker_registry_url", "docker_registry_username", "docker_registry_password"], as_dict=True, ) primary_server_private_ip = jingrow.db.get_value("Server", self.primary_server, "private_ip") secondary_server_private_ip = jingrow.db.get_value("Server", self.secondary_server, "private_ip") - shared_directory = jingrow.db.get_single_value("Press Settings", "shared_directory") + shared_directory = jingrow.db.get_single_value("Jcloude Settings", "shared_directory") agent_job = Agent(self.secondary_server).change_bench_directory( redis_connection_string_ip=primary_server_private_ip, @@ -412,7 +412,7 @@ class AutoScaleRecord(Document, AutoScaleStepFailureHandler, StepHandler): def switch_to_primary(self, step: "ScaleStep"): """Prepare Agent To Switch To Primary""" secondary_server_private_ip = jingrow.db.get_value("Server", self.secondary_server, "private_ip") - shared_directory = jingrow.db.get_single_value("Press Settings", "shared_directory") + shared_directory = jingrow.db.get_single_value("Jcloude Settings", "shared_directory") agent_job = Agent(self.primary_server).change_bench_directory( redis_connection_string_ip="localhost", @@ -637,7 +637,7 @@ class AutoScaleRecord(Document, AutoScaleStepFailureHandler, StepHandler): def create_autoscale_failure_notification(team: str, name: str, exc: str): jcloude_notification = jingrow.get_pg( { - "doctype": "Press Notification", + "doctype": "Jcloude Notification", "team": team, "type": "Auto Scale", "document_type": "Auto Scale Record", @@ -803,7 +803,7 @@ def calculate_secondary_server_price(team: str, secondary_server_plan: str) -> f price_field = "price_inr" if is_inr else "price_usd" server_price = jingrow.db.get_value("Server Plan", secondary_server_plan, price_field) - autoscale_discount = jingrow.db.get_single_value("Press Settings", "autoscale_discount") + autoscale_discount = jingrow.db.get_single_value("Jcloude Settings", "autoscale_discount") server_price_with_discount = server_price * autoscale_discount _, days_in_this_month = calendar.monthrange(datetime.date.today().year, datetime.date.today().month) diff --git a/press/press/doctype/auto_scale_trigger/auto_scale_trigger.json b/press/press/doctype/auto_scale_trigger/auto_scale_trigger.json index 797dc349..9cc8b1cf 100644 --- a/press/press/doctype/auto_scale_trigger/auto_scale_trigger.json +++ b/press/press/doctype/auto_scale_trigger/auto_scale_trigger.json @@ -45,7 +45,7 @@ "links": [], "modified": "2025-12-17 13:18:19.622890", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Auto Scale Trigger", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.json b/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.json index 9215ede8..0d79c868 100644 --- a/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.json +++ b/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.json @@ -145,7 +145,7 @@ "links": [], "modified": "2024-09-12 17:03:38.977549", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "AWS Savings Plan Recommendation", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py b/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py index c56453d0..ac1cfedd 100644 --- a/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py +++ b/press/press/doctype/aws_savings_plan_recommendation/aws_savings_plan_recommendation.py @@ -101,7 +101,7 @@ ROI Percentage: {cint(self.roi_percentage)} %""" @property def client(self): - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") return boto3.client( "ce", region_name="us-east-1", diff --git a/press/press/doctype/backup_bucket/backup_bucket.json b/press/press/doctype/backup_bucket/backup_bucket.json index baa086a4..e6486373 100644 --- a/press/press/doctype/backup_bucket/backup_bucket.json +++ b/press/press/doctype/backup_bucket/backup_bucket.json @@ -41,7 +41,7 @@ "links": [], "modified": "2023-03-12 15:34:52.023834", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Backup Bucket", "naming_rule": "By fieldname", "owner": "Administrator", diff --git a/press/press/doctype/backup_restoration_test/backup_restoration_test.json b/press/press/doctype/backup_restoration_test/backup_restoration_test.json index a09be03b..9e54f133 100644 --- a/press/press/doctype/backup_restoration_test/backup_restoration_test.json +++ b/press/press/doctype/backup_restoration_test/backup_restoration_test.json @@ -56,7 +56,7 @@ "links": [], "modified": "2022-07-27 10:51:47.263608", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Backup Restoration Test", "naming_rule": "Expression (old style)", "owner": "Administrator", diff --git a/press/press/doctype/balance_transaction/balance_transaction.json b/press/press/doctype/balance_transaction/balance_transaction.json index 901a2a97..2fb2eaef 100644 --- a/press/press/doctype/balance_transaction/balance_transaction.json +++ b/press/press/doctype/balance_transaction/balance_transaction.json @@ -113,7 +113,7 @@ "links": [], "modified": "2025-01-24 17:32:30.535457", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Balance Transaction", "naming_rule": "Expression (old style)", "owner": "Administrator", @@ -139,7 +139,7 @@ "create": 1, "delete": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "submit": 1, "write": 1 } diff --git a/press/press/doctype/balance_transaction_allocation/balance_transaction_allocation.json b/press/press/doctype/balance_transaction_allocation/balance_transaction_allocation.json index dd94438a..65b091fc 100644 --- a/press/press/doctype/balance_transaction_allocation/balance_transaction_allocation.json +++ b/press/press/doctype/balance_transaction_allocation/balance_transaction_allocation.json @@ -43,7 +43,7 @@ "links": [], "modified": "2023-11-18 23:53:33.424419", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Balance Transaction Allocation", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/bastion_server/bastion_server.json b/press/press/doctype/bastion_server/bastion_server.json index b979a451..d81240db 100644 --- a/press/press/doctype/bastion_server/bastion_server.json +++ b/press/press/doctype/bastion_server/bastion_server.json @@ -125,7 +125,7 @@ "links": [], "modified": "2025-09-24 12:10:34.450038", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bastion Server", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/bench/bench.json b/press/press/doctype/bench/bench.json index 87020017..49816021 100644 --- a/press/press/doctype/bench/bench.json +++ b/press/press/doctype/bench/bench.json @@ -381,7 +381,7 @@ "links": [], "modified": "2025-10-13 17:14:44.604617", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench", "owner": "Administrator", "permissions": [ @@ -400,13 +400,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/bench/bench.py b/press/press/doctype/bench/bench.py index 9e450229..fd24eb36 100644 --- a/press/press/doctype/bench/bench.py +++ b/press/press/doctype/bench/bench.py @@ -261,7 +261,7 @@ class Bench(Document): def build_redis_uri(self, port: int) -> str: """Get passworded protected redis uri if configured""" - set_redis_password = jingrow.get_cached_value("Press Settings", None, "set_redis_password") + set_redis_password = jingrow.get_cached_value("Jcloude Settings", None, "set_redis_password") if not set_redis_password: return f"redis://localhost:{port}" @@ -309,7 +309,7 @@ class Bench(Document): ) jcloude_settings_common_site_config = jingrow.db.get_single_value( - "Press Settings", "bench_configuration" + "Jcloude Settings", "bench_configuration" ) if jcloude_settings_common_site_config: config.update(json.loads(jcloude_settings_common_site_config)) @@ -725,7 +725,7 @@ class Bench(Document): def get_memory_info(self) -> tuple[bool, float, float]: """Returns a tuple: (is_info_available, free_memory_in_gb, required_memory_in_gb)""" - jcloude_settings: PressSettings = jingrow.get_cached_pg("Press Settings") + jcloude_settings: PressSettings = jingrow.get_cached_pg("Jcloude Settings") required_memory_gb = jcloude_settings.minimum_rebuild_memory free_memory_bytes = self.get_free_memory() @@ -1150,7 +1150,7 @@ class Bench(Document): class StagingSite(Site): def __init__(self, bench: Bench): - plan = jingrow.db.get_value("Press Settings", None, "staging_plan") + plan = jingrow.db.get_value("Jcloude Settings", None, "staging_plan") if not plan: jingrow.throw("Staging plan not set in settings") log_error(title="Staging plan not set in settings") @@ -1168,7 +1168,7 @@ class StagingSite(Site): @classmethod def archive_expired(cls): - expiry = jingrow.db.get_single_value("Press Settings", "staging_expiry") or 24 + expiry = jingrow.db.get_single_value("Jcloude Settings", "staging_expiry") or 24 sites = jingrow.get_all( "Site", {"staging": True, "creation": ("<", jingrow.utils.add_to_date(None, hours=-expiry))}, diff --git a/press/press/doctype/bench/test_bench.py b/press/press/doctype/bench/test_bench.py index 413f2f6e..2d3a3fb3 100644 --- a/press/press/doctype/bench/test_bench.py +++ b/press/press/doctype/bench/test_bench.py @@ -60,7 +60,7 @@ class TestStagingSite(FrappeTestCase): def test_create_staging_site(self): bench = create_test_bench() # also creates jcloude settings - jingrow.db.set_single_value("Press Settings", "staging_plan", create_test_plan("Site").name) + jingrow.db.set_single_value("Jcloude Settings", "staging_plan", create_test_plan("Site").name) count_before = jingrow.db.count("Site") site = StagingSite(bench).insert() @@ -107,7 +107,7 @@ class TestBench(FrappeTestCase): high_memory_max = 4020 low_memory_max = 1029 - jcloude_settings: PressSettings = jingrow.get_pg("Press Settings") + jcloude_settings: PressSettings = jingrow.get_pg("Jcloude Settings") if not jcloude_settings.minimum_rebuild_memory: jcloude_settings.certbot_directory = "./" @@ -598,7 +598,7 @@ class TestArchiveObsoleteBenches(FrappeTestCase): def test_bench_and_release_group_redis_password(self): with fake_agent_job({"New Bench": {"status": "Success"}, "Add User to Proxy": {"status": "Success"}}): - jingrow.db.set_single_value("Press Settings", "set_redis_password", True) + jingrow.db.set_single_value("Jcloude Settings", "set_redis_password", True) bench = create_test_bench() release_group = jingrow.get_pg("Release Group", bench.group) @@ -610,7 +610,7 @@ class TestArchiveObsoleteBenches(FrappeTestCase): self.assertEqual(redis_cache_uri.password, release_group.get_password("redis_password")) self.assertNotEqual(redis_cache_uri.password, None) - jingrow.db.set_single_value("Press Settings", "set_redis_password", False) + jingrow.db.set_single_value("Jcloude Settings", "set_redis_password", False) bench_without_password = create_test_bench() common_site_config = json.loads(bench_without_password.config) diff --git a/press/press/doctype/bench_app/bench_app.json b/press/press/doctype/bench_app/bench_app.json index 7a84d790..3b67c0bb 100644 --- a/press/press/doctype/bench_app/bench_app.json +++ b/press/press/doctype/bench_app/bench_app.json @@ -55,7 +55,7 @@ "links": [], "modified": "2020-12-22 21:13:18.733825", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench App", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/bench_dependency/bench_dependency.json b/press/press/doctype/bench_dependency/bench_dependency.json index a6abad75..cb99da89 100644 --- a/press/press/doctype/bench_dependency/bench_dependency.json +++ b/press/press/doctype/bench_dependency/bench_dependency.json @@ -37,7 +37,7 @@ "links": [], "modified": "2024-07-18 16:19:44.928250", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench Dependency", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/bench_dependency_version/bench_dependency_version.json b/press/press/doctype/bench_dependency_version/bench_dependency_version.json index 1f386195..1cfd0cb2 100644 --- a/press/press/doctype/bench_dependency_version/bench_dependency_version.json +++ b/press/press/doctype/bench_dependency_version/bench_dependency_version.json @@ -29,7 +29,7 @@ "links": [], "modified": "2023-10-06 15:44:52.752799", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench Dependency Version", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/bench_get_app_cache/bench_get_app_cache.json b/press/press/doctype/bench_get_app_cache/bench_get_app_cache.json index 4297b99e..c475b3bf 100644 --- a/press/press/doctype/bench_get_app_cache/bench_get_app_cache.json +++ b/press/press/doctype/bench_get_app_cache/bench_get_app_cache.json @@ -79,7 +79,7 @@ "links": [], "modified": "2024-02-02 18:54:26.533734", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench Get App Cache", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/bench_mount/bench_mount.json b/press/press/doctype/bench_mount/bench_mount.json index 42abbd22..e202dea6 100644 --- a/press/press/doctype/bench_mount/bench_mount.json +++ b/press/press/doctype/bench_mount/bench_mount.json @@ -46,7 +46,7 @@ "links": [], "modified": "2023-12-14 11:01:53.689356", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench Mount", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/bench_shell/bench_shell.json b/press/press/doctype/bench_shell/bench_shell.json index 5b055ac1..4b7f2125 100644 --- a/press/press/doctype/bench_shell/bench_shell.json +++ b/press/press/doctype/bench_shell/bench_shell.json @@ -137,7 +137,7 @@ "links": [], "modified": "2025-07-21 11:46:10.327341", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench Shell", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/bench_shell_log/bench_shell_log.json b/press/press/doctype/bench_shell_log/bench_shell_log.json index 13856082..ba3cfbb0 100644 --- a/press/press/doctype/bench_shell_log/bench_shell_log.json +++ b/press/press/doctype/bench_shell_log/bench_shell_log.json @@ -132,7 +132,7 @@ "links": [], "modified": "2024-03-21 11:44:01.218664", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench Shell Log", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/bench_site_update/bench_site_update.json b/press/press/doctype/bench_site_update/bench_site_update.json index cc5e53b5..bec164a9 100644 --- a/press/press/doctype/bench_site_update/bench_site_update.json +++ b/press/press/doctype/bench_site_update/bench_site_update.json @@ -73,7 +73,7 @@ "links": [], "modified": "2025-03-18 10:10:11.728611", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench Site Update", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/bench_update/bench_update.json b/press/press/doctype/bench_update/bench_update.json index 601554d1..80c3fb3b 100644 --- a/press/press/doctype/bench_update/bench_update.json +++ b/press/press/doctype/bench_update/bench_update.json @@ -84,7 +84,7 @@ "links": [], "modified": "2024-08-23 12:20:58.651546", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench Update", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/bench_update_app/bench_update_app.json b/press/press/doctype/bench_update_app/bench_update_app.json index b4dca72b..1cfde951 100644 --- a/press/press/doctype/bench_update_app/bench_update_app.json +++ b/press/press/doctype/bench_update_app/bench_update_app.json @@ -59,7 +59,7 @@ "links": [], "modified": "2023-10-05 15:38:24.315931", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench Update App", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/bench_variable/bench_variable.json b/press/press/doctype/bench_variable/bench_variable.json index ef6927f9..5b1dedde 100644 --- a/press/press/doctype/bench_variable/bench_variable.json +++ b/press/press/doctype/bench_variable/bench_variable.json @@ -31,7 +31,7 @@ "links": [], "modified": "2025-05-20 18:21:27.911885", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench Variable", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/blocked_domain/blocked_domain.json b/press/press/doctype/blocked_domain/blocked_domain.json index 27632e5e..b2170bb5 100644 --- a/press/press/doctype/blocked_domain/blocked_domain.json +++ b/press/press/doctype/blocked_domain/blocked_domain.json @@ -28,7 +28,7 @@ "links": [], "modified": "2023-01-25 10:59:42.568228", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Blocked Domain", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/build_cache_shell/build_cache_shell.json b/press/press/doctype/build_cache_shell/build_cache_shell.json index ac4ad21d..29b1c8e8 100644 --- a/press/press/doctype/build_cache_shell/build_cache_shell.json +++ b/press/press/doctype/build_cache_shell/build_cache_shell.json @@ -97,7 +97,7 @@ "links": [], "modified": "2024-06-11 10:37:05.598121", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Build Cache Shell", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/build_metric/build_metric.json b/press/press/doctype/build_metric/build_metric.json index 6be97065..248941aa 100644 --- a/press/press/doctype/build_metric/build_metric.json +++ b/press/press/doctype/build_metric/build_metric.json @@ -33,7 +33,7 @@ "links": [], "modified": "2025-04-29 13:26:52.477384", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Build Metric", "naming_rule": "Random", "owner": "Administrator", diff --git a/press/press/doctype/certificate_authority/certificate_authority.json b/press/press/doctype/certificate_authority/certificate_authority.json index 89c1c8a1..ab1053e4 100644 --- a/press/press/doctype/certificate_authority/certificate_authority.json +++ b/press/press/doctype/certificate_authority/certificate_authority.json @@ -135,7 +135,7 @@ "links": [], "modified": "2020-09-17 19:30:23.565306", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Certificate Authority", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/child_team_member/child_team_member.json b/press/press/doctype/child_team_member/child_team_member.json index 1259c1d6..ed78d304 100644 --- a/press/press/doctype/child_team_member/child_team_member.json +++ b/press/press/doctype/child_team_member/child_team_member.json @@ -29,7 +29,7 @@ "links": [], "modified": "2023-04-22 10:27:26.970665", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Child Team Member", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/cloud_region/cloud_region.json b/press/press/doctype/cloud_region/cloud_region.json index a83aba8f..33423213 100644 --- a/press/press/doctype/cloud_region/cloud_region.json +++ b/press/press/doctype/cloud_region/cloud_region.json @@ -31,7 +31,7 @@ "links": [], "modified": "2024-09-14 12:04:26.561520", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Cloud Region", "naming_rule": "By fieldname", "owner": "Administrator", diff --git a/press/press/doctype/cluster/cluster.json b/press/press/doctype/cluster/cluster.json index 49b2a95b..9eaf2e80 100644 --- a/press/press/doctype/cluster/cluster.json +++ b/press/press/doctype/cluster/cluster.json @@ -340,7 +340,7 @@ ], "modified": "2025-09-19 16:27:01.820199", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Cluster", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/cluster/cluster.py b/press/press/doctype/cluster/cluster.py index 9013b545..b835e8d6 100644 --- a/press/press/doctype/cluster/cluster.py +++ b/press/press/doctype/cluster/cluster.py @@ -132,7 +132,7 @@ class Cluster(Document): self.validate_hetzner_api_token() def validate_hetzner_api_token(self): - settings: "PressSettings" = jingrow.get_single("Press Settings") + settings: "PressSettings" = jingrow.get_single("Jcloude Settings") api_token = settings.get_password("hetzner_api_token") client = Client(token=api_token) try: @@ -150,7 +150,7 @@ class Cluster(Document): jingrow.throw(f"An error occurred while validating the API token: {e}") def validate_aws_credentials(self): - settings: "PressSettings" = jingrow.get_single("Press Settings") + settings: "PressSettings" = jingrow.get_single("Jcloude Settings") if self.public and not self.aws_access_key_id: self.aws_access_key_id = settings.aws_access_key_id self.aws_secret_access_key = settings.get_password("aws_secret_access_key") @@ -192,8 +192,8 @@ class Cluster(Document): ) ] - # Get Hetzner API token from Press Settings - settings: "PressSettings" = jingrow.get_single("Press Settings") + # Get Hetzner API token from Jcloude Settings + settings: "PressSettings" = jingrow.get_single("Jcloude Settings") api_token = settings.get_password("hetzner_api_token") client = Client(token=api_token) @@ -920,7 +920,7 @@ class Cluster(Document): jingrow.ValidationError, ) - domain = domain or jingrow.db.get_single_value("Press Settings", "domain") + domain = domain or jingrow.db.get_single_value("Jcloude Settings", "domain") server_series = {**self.base_servers, **self.private_servers} team = team or get_current_team() plan = plan or self.get_or_create_basic_plan(doctype) diff --git a/press/press/doctype/cluster/test_cluster.py b/press/press/doctype/cluster/test_cluster.py index 19d0944d..dc28a5c8 100644 --- a/press/press/doctype/cluster/test_cluster.py +++ b/press/press/doctype/cluster/test_cluster.py @@ -141,9 +141,9 @@ class TestPrivateCluster(TestCluster): self._setup_fake_vmis(["m", "f", "n", "p", "e", "fs"]) root_domain = create_test_root_domain("local.fc.jingrow.dev") - jingrow.db.set_single_value("Press Settings", "domain", root_domain.name) - jingrow.db.set_single_value("Press Settings", "aws_access_key_id", "test") - jingrow.db.set_single_value("Press Settings", "aws_secret_access_key", "test") + jingrow.db.set_single_value("Jcloude Settings", "domain", root_domain.name) + jingrow.db.set_single_value("Jcloude Settings", "aws_access_key_id", "test") + jingrow.db.set_single_value("Jcloude Settings", "aws_secret_access_key", "test") server_count_before = jingrow.db.count("Server") database_server_count_before = jingrow.db.count("Database Server") @@ -183,7 +183,7 @@ class TestPublicCluster(TestCluster): @patch.object(ProxyServer, "validate_domains", new=Mock()) def test_create_servers_without_vmis_throws_err(self): root_domain = create_test_root_domain("local.fc.jingrow.dev") - jingrow.db.set_single_value("Press Settings", "domain", root_domain.name) + jingrow.db.set_single_value("Jcloude Settings", "domain", root_domain.name) server_count_before = jingrow.db.count("Server") database_server_count_before = jingrow.db.count("Database Server") @@ -211,7 +211,7 @@ class TestPublicCluster(TestCluster): @patch.object(ProxyServer, "validate_domains", new=Mock()) def test_creation_of_public_cluster_with_servers_creates_3(self): root_domain = create_test_root_domain("local.fc.jingrow.dev") - jingrow.db.set_single_value("Press Settings", "domain", root_domain.name) + jingrow.db.set_single_value("Jcloude Settings", "domain", root_domain.name) self._setup_fake_vmis(["m", "f", "n", "fs"]) server_count_before = jingrow.db.count("Server") diff --git a/press/press/doctype/cluster_plan/cluster_plan.json b/press/press/doctype/cluster_plan/cluster_plan.json index 5f5db081..49082000 100644 --- a/press/press/doctype/cluster_plan/cluster_plan.json +++ b/press/press/doctype/cluster_plan/cluster_plan.json @@ -65,7 +65,7 @@ "links": [], "modified": "2024-03-14 18:42:28.291997", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Cluster Plan", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/code_server/code_server.json b/press/press/doctype/code_server/code_server.json index 9afc3b71..2b93ffcc 100644 --- a/press/press/doctype/code_server/code_server.json +++ b/press/press/doctype/code_server/code_server.json @@ -103,7 +103,7 @@ ], "modified": "2023-07-28 15:51:07.083218", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Code Server", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/common_site_config/common_site_config.json b/press/press/doctype/common_site_config/common_site_config.json index 8c683a0d..16c3d85c 100644 --- a/press/press/doctype/common_site_config/common_site_config.json +++ b/press/press/doctype/common_site_config/common_site_config.json @@ -47,7 +47,7 @@ "links": [], "modified": "2024-02-23 10:04:24.528062", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Common Site Config", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/communication_info/communication_info.json b/press/press/doctype/communication_info/communication_info.json index 5a0caaad..004d1fda 100644 --- a/press/press/doctype/communication_info/communication_info.json +++ b/press/press/doctype/communication_info/communication_info.json @@ -41,7 +41,7 @@ "links": [], "modified": "2025-09-26 16:54:55.748655", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Communication Info", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/cookie_preference_log/cookie_preference_log.json b/press/press/doctype/cookie_preference_log/cookie_preference_log.json index 36d1a780..ec1203fb 100644 --- a/press/press/doctype/cookie_preference_log/cookie_preference_log.json +++ b/press/press/doctype/cookie_preference_log/cookie_preference_log.json @@ -46,7 +46,7 @@ "links": [], "modified": "2021-11-24 14:28:51.910191", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Cookie Preference Log", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/currency_exchange/currency_exchange.json b/press/press/doctype/currency_exchange/currency_exchange.json index 051a6737..8226bedc 100644 --- a/press/press/doctype/currency_exchange/currency_exchange.json +++ b/press/press/doctype/currency_exchange/currency_exchange.json @@ -52,7 +52,7 @@ "links": [], "modified": "2025-01-18 10:54:45.521101", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Currency Exchange", "naming_rule": "Expression", "owner": "Administrator", diff --git a/press/press/doctype/dashboard_banner/dashboard_banner.json b/press/press/doctype/dashboard_banner/dashboard_banner.json index cc2c239a..5d49c9a7 100644 --- a/press/press/doctype/dashboard_banner/dashboard_banner.json +++ b/press/press/doctype/dashboard_banner/dashboard_banner.json @@ -215,7 +215,7 @@ "links": [], "modified": "2025-10-30 20:48:50.537360", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Dashboard Banner", "naming_rule": "Random", "owner": "Administrator", diff --git a/press/press/doctype/dashboard_banner_dismissal/dashboard_banner_dismissal.json b/press/press/doctype/dashboard_banner_dismissal/dashboard_banner_dismissal.json index 5bd96cfe..2c214f1d 100644 --- a/press/press/doctype/dashboard_banner_dismissal/dashboard_banner_dismissal.json +++ b/press/press/doctype/dashboard_banner_dismissal/dashboard_banner_dismissal.json @@ -32,7 +32,7 @@ "links": [], "modified": "2025-10-06 15:46:04.371635", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Dashboard Banner Dismissal", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/database_server/database_server.json b/press/press/doctype/database_server/database_server.json index 8c604fa6..df390116 100644 --- a/press/press/doctype/database_server/database_server.json +++ b/press/press/doctype/database_server/database_server.json @@ -776,7 +776,7 @@ ], "modified": "2025-12-09 17:09:43.687660", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Database Server", "owner": "Administrator", "permissions": [ @@ -795,13 +795,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/database_server/database_server.py b/press/press/doctype/database_server/database_server.py index cf7a98a1..9459dccb 100644 --- a/press/press/doctype/database_server/database_server.py +++ b/press/press/doctype/database_server/database_server.py @@ -764,7 +764,7 @@ class DatabaseServer(BaseServer): ) certificate = jingrow.get_pg("TLS Certificate", certificate_name) - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if log_server: kibana_password = jingrow.get_pg("Log Server", log_server).get_password("kibana_password") else: @@ -1394,7 +1394,7 @@ class DatabaseServer(BaseServer): ) certificate = jingrow.get_pg("TLS Certificate", certificate_name) monitoring_password = jingrow.get_pg("Cluster", self.cluster).get_password("monitoring_password") - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if log_server: kibana_password = jingrow.get_pg("Log Server", log_server).get_password("kibana_password") else: @@ -2277,7 +2277,7 @@ def monitor_disk_performance(): def sync_binlogs_info(): - if jingrow.db.get_single_value("Press Settings", "disable_binlog_indexer_service"): + if jingrow.db.get_single_value("Jcloude Settings", "disable_binlog_indexer_service"): return databases = jingrow.db.get_all( @@ -2297,7 +2297,7 @@ def sync_binlogs_info(): def remove_uploaded_binlogs_from_disk(): - if jingrow.db.get_single_value("Press Settings", "disable_binlog_indexer_service"): + if jingrow.db.get_single_value("Jcloude Settings", "disable_binlog_indexer_service"): return databases = jingrow.db.get_all( @@ -2317,7 +2317,7 @@ def remove_uploaded_binlogs_from_disk(): def remove_uploaded_binlogs_from_s3(): - if jingrow.db.get_single_value("Press Settings", "disable_binlog_indexer_service"): + if jingrow.db.get_single_value("Jcloude Settings", "disable_binlog_indexer_service"): return databases = jingrow.db.get_all( @@ -2337,7 +2337,7 @@ def remove_uploaded_binlogs_from_s3(): def delete_mariadb_binlog_for_archived_servers(): - if jingrow.db.get_single_value("Press Settings", "disable_binlog_indexer_service"): + if jingrow.db.get_single_value("Jcloude Settings", "disable_binlog_indexer_service"): return """ Delete binlog records for archived servers @@ -2363,7 +2363,7 @@ def delete_mariadb_binlog_for_archived_servers(): def unindex_mariadb_binlogs(): - if jingrow.db.get_single_value("Press Settings", "disable_binlog_indexer_service"): + if jingrow.db.get_single_value("Jcloude Settings", "disable_binlog_indexer_service"): return databases = jingrow.get_all( "Database Server", diff --git a/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.json b/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.json index e352580d..e6da4580 100644 --- a/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.json +++ b/press/press/doctype/database_server_mariadb_variable/database_server_mariadb_variable.json @@ -59,7 +59,7 @@ "links": [], "modified": "2024-07-03 07:15:03.695917", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Database Server MariaDB Variable", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/deploy/deploy.json b/press/press/doctype/deploy/deploy.json index c33be32c..efa34b15 100644 --- a/press/press/doctype/deploy/deploy.json +++ b/press/press/doctype/deploy/deploy.json @@ -71,7 +71,7 @@ "links": [], "modified": "2025-05-28 11:45:25.237521", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Deploy", "owner": "Administrator", "permissions": [ @@ -90,13 +90,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/deploy/deploy.py b/press/press/doctype/deploy/deploy.py index 403e204a..031b220e 100644 --- a/press/press/doctype/deploy/deploy.py +++ b/press/press/doctype/deploy/deploy.py @@ -70,7 +70,7 @@ class Deploy(Document): cluster_docker_repository = jingrow.db.get_value("Cluster", cluster, "repository") if cluster_docker_repository: - hub_registry_url = jingrow.db.get_value("Press Settings", None, "docker_registry_url") + hub_registry_url = jingrow.db.get_value("Jcloude Settings", None, "docker_registry_url") image = image.replace(hub_registry_url, cluster_docker_repository) new = jingrow.get_pg( diff --git a/press/press/doctype/deploy_bench/deploy_bench.json b/press/press/doctype/deploy_bench/deploy_bench.json index 77ffb045..8fdbea02 100644 --- a/press/press/doctype/deploy_bench/deploy_bench.json +++ b/press/press/doctype/deploy_bench/deploy_bench.json @@ -30,7 +30,7 @@ "links": [], "modified": "2020-12-16 18:32:30.211437", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Deploy Bench", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/deploy_candidate/deploy_candidate.json b/press/press/doctype/deploy_candidate/deploy_candidate.json index b93f9992..d6176bce 100644 --- a/press/press/doctype/deploy_candidate/deploy_candidate.json +++ b/press/press/doctype/deploy_candidate/deploy_candidate.json @@ -227,7 +227,7 @@ "link_fieldname": "reference_name" }, { - "link_doctype": "Press Notification", + "link_doctype": "Jcloude Notification", "link_fieldname": "document_name" }, { @@ -237,7 +237,7 @@ ], "modified": "2025-05-27 22:02:19.465983", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Deploy Candidate", "owner": "Administrator", "permissions": [ @@ -256,13 +256,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/deploy_candidate/deploy_candidate.py b/press/press/doctype/deploy_candidate/deploy_candidate.py index 125c7b39..73ab28c1 100644 --- a/press/press/doctype/deploy_candidate/deploy_candidate.py +++ b/press/press/doctype/deploy_candidate/deploy_candidate.py @@ -108,7 +108,7 @@ class DeployCandidate(Document): results = query.run(as_dict=True) names = [r.name for r in results if r.status and r.status != "Success"] notifications = jingrow.get_all( - "Press Notification", + "Jcloude Notification", fields=["name", "document_name"], filters={ "document_type": "Deploy Candidate", @@ -163,7 +163,7 @@ class DeployCandidate(Document): def on_trash(self): jingrow.db.delete( - "Press Notification", + "Jcloude Notification", {"document_type": self.doctype, "document_name": self.name}, ) @@ -303,7 +303,7 @@ class DeployCandidate(Document): raise subprocess.CalledProcessError(return_code, command) def generate_ssh_keys(self, build_directory: str): - ca = jingrow.db.get_single_value("Press Settings", "ssh_certificate_authority") + ca = jingrow.db.get_single_value("Jcloude Settings", "ssh_certificate_authority") if not ca: return @@ -675,7 +675,7 @@ get_permission_query_conditions = get_permission_query_conditions_for_doctype("D @jingrow.whitelist() def toggle_builds(suspend): jingrow.only_for("System Manager") - jingrow.db.set_single_value("Press Settings", "suspend_builds", suspend) + jingrow.db.set_single_value("Jcloude Settings", "suspend_builds", suspend) # Key: stage_slug diff --git a/press/press/doctype/deploy_candidate/deploy_candidate_list.js b/press/press/doctype/deploy_candidate/deploy_candidate_list.js index 85a9317c..5c16b3ff 100644 --- a/press/press/doctype/deploy_candidate/deploy_candidate_list.js +++ b/press/press/doctype/deploy_candidate/deploy_candidate_list.js @@ -7,7 +7,7 @@ function show_toggle_builds_button(list_view) { return; jingrow.db - .get_single_value('Press Settings', 'suspend_builds') + .get_single_value('Jcloude Settings', 'suspend_builds') .then((suspend_builds) => { const label = suspend_builds ? __('Resume Builds') : __('Suspend Builds'); diff --git a/press/press/doctype/deploy_candidate/deploy_notifications.py b/press/press/doctype/deploy_candidate/deploy_notifications.py index 72bc1b26..04322332 100644 --- a/press/press/doctype/deploy_candidate/deploy_notifications.py +++ b/press/press/doctype/deploy_candidate/deploy_notifications.py @@ -96,7 +96,7 @@ def handlers() -> "list[UserAddressableHandlerTuple]": is called. `UserAddressableHandler` is used to update the details - used to create the Press Notification + used to create the Jcloude Notification `UserAddressableHandler` can return False if it isn't user addressable, in this case the remaining handler @@ -263,7 +263,7 @@ def create_build_warning_notification( """Create a warning notification for build""" warning_details = {"title": title, "message": message} pg_dict = { - "doctype": "Press Notification", + "doctype": "Jcloude Notification", "team": dc.team, "type": "Bench Deploy", "document_type": dcb.doctype, @@ -275,7 +275,7 @@ def create_build_warning_notification( pg.insert() jingrow.db.commit() - jingrow.publish_realtime("jcloude_notification", doctype="Press Notification", message={"team": dc.team}) + jingrow.publish_realtime("jcloude_notification", doctype="Jcloude Notification", message={"team": dc.team}) return True @@ -299,7 +299,7 @@ def create_build_failed_notification( details = get_details(deploy_candidate=dc, deploy_candidate_build=dcb, exc=exc) pg_dict = { - "doctype": "Press Notification", + "doctype": "Jcloude Notification", "team": dc.team, "type": "Bench Deploy", "document_type": dcb.doctype, @@ -311,7 +311,7 @@ def create_build_failed_notification( pg.insert() jingrow.db.commit() - jingrow.publish_realtime("jcloude_notification", doctype="Press Notification", message={"team": dc.team}) + jingrow.publish_realtime("jcloude_notification", doctype="Jcloude Notification", message={"team": dc.team}) return details["is_actionable"] diff --git a/press/press/doctype/deploy_candidate/utils.py b/press/press/doctype/deploy_candidate/utils.py index d00833b8..ce16ff02 100644 --- a/press/press/doctype/deploy_candidate/utils.py +++ b/press/press/doctype/deploy_candidate/utils.py @@ -136,7 +136,7 @@ def get_will_fail_checker(error_key: str): def is_suspended() -> bool: - return bool(jingrow.db.get_single_value("Press Settings", "suspend_builds")) + return bool(jingrow.db.get_single_value("Jcloude Settings", "suspend_builds")) class BuildValidationError(jingrow.ValidationError): ... @@ -147,7 +147,7 @@ def get_build_server(group: str | None = None) -> str | None: Order of build server selection precedence: 1. Build Server set on Release Group 2. Build Server with least active builds - 3. Build Server set in Press Settings + 3. Build Server set in Jcloude Settings This returns the build server based on the first server in the release group depending on the platform of the server, if more servers exist in the release group deploy candidate will trigger another build based on the platform of the next server @@ -173,7 +173,7 @@ def get_build_server(group: str | None = None) -> str | None: if server := get_intel_build_server_with_least_active_builds(): return server - return jingrow.get_value("Press Settings", None, "build_server") + return jingrow.get_value("Jcloude Settings", None, "build_server") def get_intel_build_server_with_least_active_builds() -> str | None: diff --git a/press/press/doctype/deploy_candidate_app/deploy_candidate_app.json b/press/press/doctype/deploy_candidate_app/deploy_candidate_app.json index 79ced19c..0de51f49 100644 --- a/press/press/doctype/deploy_candidate_app/deploy_candidate_app.json +++ b/press/press/doctype/deploy_candidate_app/deploy_candidate_app.json @@ -106,7 +106,7 @@ "links": [], "modified": "2024-01-30 12:41:26.703875", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Deploy Candidate App", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/deploy_candidate_build/deploy_candidate_build.json b/press/press/doctype/deploy_candidate_build/deploy_candidate_build.json index b6e7bf34..2faf5443 100644 --- a/press/press/doctype/deploy_candidate_build/deploy_candidate_build.json +++ b/press/press/doctype/deploy_candidate_build/deploy_candidate_build.json @@ -306,7 +306,7 @@ "link_fieldname": "reference_name" }, { - "link_doctype": "Press Notification", + "link_doctype": "Jcloude Notification", "link_fieldname": "document_name" }, { @@ -316,7 +316,7 @@ ], "modified": "2025-07-02 17:15:11.366578", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Deploy Candidate Build", "owner": "Administrator", "permissions": [ @@ -340,7 +340,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -351,7 +351,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/deploy_candidate_build/deploy_candidate_build.py b/press/press/doctype/deploy_candidate_build/deploy_candidate_build.py index b09c7c3f..842aa9d0 100644 --- a/press/press/doctype/deploy_candidate_build/deploy_candidate_build.py +++ b/press/press/doctype/deploy_candidate_build/deploy_candidate_build.py @@ -856,7 +856,7 @@ class DeployCandidateBuild(Document): self.correct_upload_step_status() def _prepare_build_directory(self): - build_directory = jingrow.get_value("Press Settings", None, "build_directory") + build_directory = jingrow.get_value("Jcloude Settings", None, "build_directory") if not os.path.exists(build_directory): os.mkdir(build_directory) @@ -1001,7 +1001,7 @@ class DeployCandidateBuild(Document): def _fetch_registry_settings(self): return jingrow.db.get_value( - "Press Settings", + "Jcloude Settings", None, [ "domain", @@ -1585,7 +1585,7 @@ def correct_status(dcb_name: str): def throw_no_build_server(): jingrow.throw( "Server not found to run builds. " - "Please set Build Server under Press Settings > Docker > Docker Build." + "Please set Build Server under Jcloude Settings > Docker > Docker Build." ) diff --git a/press/press/doctype/deploy_candidate_build/test_deploy_candidate_build.py b/press/press/doctype/deploy_candidate_build/test_deploy_candidate_build.py index 1cf2ea1d..b04ef0bd 100644 --- a/press/press/doctype/deploy_candidate_build/test_deploy_candidate_build.py +++ b/press/press/doctype/deploy_candidate_build/test_deploy_candidate_build.py @@ -39,7 +39,7 @@ class TestDeployCandidateBuild(FrappeTestCase): self.create_build_servers() group = create_test_release_group([app], self.user) group.db_set("team", self.team.name) - jingrow.db.set_single_value("Press Settings", "docker_registry_url", "registry.digitalocean.com") + jingrow.db.set_single_value("Jcloude Settings", "docker_registry_url", "registry.digitalocean.com") jingrow.set_user(self.user) self.deploy_candidate = create_test_deploy_candidate(group) self.deploy_candidate_build = create_test_deploy_candidate_build(self.deploy_candidate) diff --git a/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.json b/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.json index 26dab8df..ac82db59 100644 --- a/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.json +++ b/press/press/doctype/deploy_candidate_build_step/deploy_candidate_build_step.json @@ -126,7 +126,7 @@ "links": [], "modified": "2021-06-07 11:34:27.499558", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Deploy Candidate Build Step", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/deploy_candidate_dependency/deploy_candidate_dependency.json b/press/press/doctype/deploy_candidate_dependency/deploy_candidate_dependency.json index 315bcdfb..c22623bb 100644 --- a/press/press/doctype/deploy_candidate_dependency/deploy_candidate_dependency.json +++ b/press/press/doctype/deploy_candidate_dependency/deploy_candidate_dependency.json @@ -28,7 +28,7 @@ "links": [], "modified": "2021-05-18 18:28:47.923629", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Deploy Candidate Dependency", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.json b/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.json index 168ad6c2..c991ce5d 100644 --- a/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.json +++ b/press/press/doctype/deploy_candidate_difference/deploy_candidate_difference.json @@ -84,7 +84,7 @@ "links": [], "modified": "2021-02-15 11:25:01.985359", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Deploy Candidate Difference", "owner": "Administrator", "permissions": [ @@ -103,13 +103,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/deploy_candidate_difference_app/deploy_candidate_difference_app.json b/press/press/doctype/deploy_candidate_difference_app/deploy_candidate_difference_app.json index 134c9ebc..90b68c79 100644 --- a/press/press/doctype/deploy_candidate_difference_app/deploy_candidate_difference_app.json +++ b/press/press/doctype/deploy_candidate_difference_app/deploy_candidate_difference_app.json @@ -64,7 +64,7 @@ "links": [], "modified": "2020-12-15 22:42:32.347582", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Deploy Candidate Difference App", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/deploy_candidate_package/deploy_candidate_package.json b/press/press/doctype/deploy_candidate_package/deploy_candidate_package.json index e7e918c5..8f66188f 100644 --- a/press/press/doctype/deploy_candidate_package/deploy_candidate_package.json +++ b/press/press/doctype/deploy_candidate_package/deploy_candidate_package.json @@ -49,7 +49,7 @@ "links": [], "modified": "2023-12-14 16:22:57.324933", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Deploy Candidate Package", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/deploy_candidate_variable/deploy_candidate_variable.json b/press/press/doctype/deploy_candidate_variable/deploy_candidate_variable.json index 588dde43..03b5b11b 100644 --- a/press/press/doctype/deploy_candidate_variable/deploy_candidate_variable.json +++ b/press/press/doctype/deploy_candidate_variable/deploy_candidate_variable.json @@ -30,7 +30,7 @@ "links": [], "modified": "2025-05-11 14:43:27.654938", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Deploy Candidate Variable", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/disk_performance/disk_performance.json b/press/press/doctype/disk_performance/disk_performance.json index 5e19c5e5..24d38bfa 100644 --- a/press/press/doctype/disk_performance/disk_performance.json +++ b/press/press/doctype/disk_performance/disk_performance.json @@ -70,7 +70,7 @@ "links": [], "modified": "2025-03-21 18:31:18.676867", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Disk Performance", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/downtime_analysis/downtime_analysis.json b/press/press/doctype/downtime_analysis/downtime_analysis.json index 1bd067c1..e8bb533d 100644 --- a/press/press/doctype/downtime_analysis/downtime_analysis.json +++ b/press/press/doctype/downtime_analysis/downtime_analysis.json @@ -112,7 +112,7 @@ "links": [], "modified": "2025-09-23 14:57:02.949448", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Downtime Analysis", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/downtime_analysis/downtime_analysis.py b/press/press/doctype/downtime_analysis/downtime_analysis.py index 2704133b..5a54c051 100644 --- a/press/press/doctype/downtime_analysis/downtime_analysis.py +++ b/press/press/doctype/downtime_analysis/downtime_analysis.py @@ -85,7 +85,7 @@ class DowntimeAnalysis(Document): pluck="name", ) - monitor_server = jingrow.db.get_single_value("Press Settings", "monitor_server") + monitor_server = jingrow.db.get_single_value("Jcloude Settings", "monitor_server") data = get_data_for_all_clusters( start_date=start_date, end_date=end_date, diff --git a/press/press/doctype/drip_email/drip_email.json b/press/press/doctype/drip_email/drip_email.json index 8bfca16e..4c840be2 100644 --- a/press/press/doctype/drip_email/drip_email.json +++ b/press/press/doctype/drip_email/drip_email.json @@ -191,7 +191,7 @@ "links": [], "modified": "2025-05-22 15:14:07.377379", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Drip Email", "naming_rule": "Expression (old style)", "owner": "Administrator", diff --git a/press/press/doctype/erpnext_app/erpnext_app.json b/press/press/doctype/erpnext_app/erpnext_app.json index 425b0788..5f28ee3a 100644 --- a/press/press/doctype/erpnext_app/erpnext_app.json +++ b/press/press/doctype/erpnext_app/erpnext_app.json @@ -22,7 +22,7 @@ "links": [], "modified": "2021-03-31 11:08:26.860569", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "ERPNext App", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/erpnext_consultant/erpnext_consultant.json b/press/press/doctype/erpnext_consultant/erpnext_consultant.json index 1a22e4fb..60fe2725 100644 --- a/press/press/doctype/erpnext_consultant/erpnext_consultant.json +++ b/press/press/doctype/erpnext_consultant/erpnext_consultant.json @@ -42,7 +42,7 @@ "links": [], "modified": "2021-04-21 18:08:19.750497", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "ERPNext Consultant", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.json b/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.json index ed108f2e..38e0ca63 100644 --- a/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.json +++ b/press/press/doctype/erpnext_consultant_region/erpnext_consultant_region.json @@ -22,7 +22,7 @@ "links": [], "modified": "2021-04-29 20:25:56.246263", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "ERPNext Consultant Region", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/erpnext_site_settings/erpnext_site_settings.json b/press/press/doctype/erpnext_site_settings/erpnext_site_settings.json index f7156be6..a94b1342 100644 --- a/press/press/doctype/erpnext_site_settings/erpnext_site_settings.json +++ b/press/press/doctype/erpnext_site_settings/erpnext_site_settings.json @@ -76,7 +76,7 @@ "links": [], "modified": "2022-06-20 06:58:05.388164", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "ERPNext Site Settings", "naming_rule": "By fieldname", "owner": "Administrator", diff --git a/press/press/doctype/frappe_version/frappe_version.json b/press/press/doctype/frappe_version/frappe_version.json index 91d0efdb..24603b31 100644 --- a/press/press/doctype/frappe_version/frappe_version.json +++ b/press/press/doctype/frappe_version/frappe_version.json @@ -74,7 +74,7 @@ ], "modified": "2025-08-20 20:19:03.766199", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Jingrow Version", "naming_rule": "Set by user", "owner": "Administrator", @@ -97,7 +97,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1 } ], diff --git a/press/press/doctype/frappe_version_dependency/frappe_version_dependency.json b/press/press/doctype/frappe_version_dependency/frappe_version_dependency.json index e001b96d..d6887f2e 100644 --- a/press/press/doctype/frappe_version_dependency/frappe_version_dependency.json +++ b/press/press/doctype/frappe_version_dependency/frappe_version_dependency.json @@ -30,7 +30,7 @@ "links": [], "modified": "2023-07-19 15:45:52.544440", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Jingrow Version Dependency", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/github_webhook_log/github_webhook_log.json b/press/press/doctype/github_webhook_log/github_webhook_log.json index de1034a8..a39d0773 100644 --- a/press/press/doctype/github_webhook_log/github_webhook_log.json +++ b/press/press/doctype/github_webhook_log/github_webhook_log.json @@ -111,7 +111,7 @@ "links": [], "modified": "2025-11-22 22:29:45.236252", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "GitHub Webhook Log", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/github_webhook_log/github_webhook_log.py b/press/press/doctype/github_webhook_log/github_webhook_log.py index c0a961e5..00d2838c 100644 --- a/press/press/doctype/github_webhook_log/github_webhook_log.py +++ b/press/press/doctype/github_webhook_log/github_webhook_log.py @@ -39,7 +39,7 @@ class GitHubWebhookLog(Document): # end: auto-generated types def validate(self): # noqa: C901 - secret = jingrow.db.get_single_value("Press Settings", "github_webhook_secret") + secret = jingrow.db.get_single_value("Jcloude Settings", "github_webhook_secret") digest = hmac.HMAC(secret.encode(), self.payload.encode(), hashlib.sha1) if not hmac.compare_digest(digest.hexdigest(), self.signature): jingrow.throw("Invalid Signature") diff --git a/press/press/doctype/incident/incident.json b/press/press/doctype/incident/incident.json index 96b0bdda..063b87e0 100644 --- a/press/press/doctype/incident/incident.json +++ b/press/press/doctype/incident/incident.json @@ -226,7 +226,7 @@ "links": [], "modified": "2025-09-30 17:33:41.729833", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Incident", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/incident/incident.py b/press/press/doctype/incident/incident.py index 049bd080..18ee9aae 100644 --- a/press/press/doctype/incident/incident.py +++ b/press/press/doctype/incident/incident.py @@ -107,7 +107,7 @@ class Incident(WebsiteGenerator): "Investigating", "Resolved", "Auto-Resolved", - "Press-Resolved", + "Jcloude-Resolved", ] subject: DF.Data | None subtype: DF.Literal["High CPU: user", "High CPU: iowait", "Disk full"] @@ -367,9 +367,9 @@ class Incident(WebsiteGenerator): @cached_property def monitor_server(self) -> MonitorServer: - jcloude_settings: PressSettings = jingrow.get_cached_pg("Press Settings") + jcloude_settings: PressSettings = jingrow.get_cached_pg("Jcloude Settings") if not (monitor_url := jcloude_settings.monitor_server): - jingrow.throw("Monitor Server not set in Press Settings") + jingrow.throw("Monitor Server not set in Jcloude Settings") return jingrow.get_cached_pg("Monitor Server", monitor_url) def get_grafana_auth_header(self): @@ -482,16 +482,16 @@ class Incident(WebsiteGenerator): @property def twilio_phone_number(self): - jcloude_settings: PressSettings = jingrow.get_cached_pg("Press Settings") + jcloude_settings: PressSettings = jingrow.get_cached_pg("Jcloude Settings") return Phone(jcloude_settings.twilio_phone_number) @property def twilio_client(self): - jcloude_settings: PressSettings = jingrow.get_cached_pg("Press Settings") + jcloude_settings: PressSettings = jingrow.get_cached_pg("Jcloude Settings") try: return jcloude_settings.twilio_client except Exception: - log_error("Twilio Client not configured in Press Settings") + log_error("Twilio Client not configured in Jcloude Settings") if not jingrow.flags.in_test: jingrow.db.commit() raise @@ -563,7 +563,7 @@ Likely due to insufficient balance or incorrect credentials""", ignore_since := jingrow.db.get_value("Server", self.server, "ignore_incidents_till") ) and ignore_since < jingrow.utils.now_datetime(): return - domain = jingrow.db.get_value("Press Settings", None, "domain") + domain = jingrow.db.get_value("Jcloude Settings", None, "domain") incident_link = f"https://{domain}{self.get_url()}" message = f"Incident on server: {self.server}\n\nURL: {incident_link}\n\nID: {self.name}" for human in self.get_humans(): diff --git a/press/press/doctype/incident/test_incident.py b/press/press/doctype/incident/test_incident.py index 0df94acf..adf78e33 100644 --- a/press/press/doctype/incident/test_incident.py +++ b/press/press/doctype/incident/test_incident.py @@ -136,10 +136,10 @@ class TestIncident(FrappeTestCase): super().setUp() self.from_ = "+911234567892" - jingrow.db.set_single_value("Press Settings", "twilio_account_sid", "test") - jingrow.db.set_single_value("Press Settings", "twilio_api_key_sid", "test") - jingrow.db.set_single_value("Press Settings", "twilio_api_key_secret", "test") - jingrow.db.set_single_value("Press Settings", "twilio_phone_number", self.from_) + jingrow.db.set_single_value("Jcloude Settings", "twilio_account_sid", "test") + jingrow.db.set_single_value("Jcloude Settings", "twilio_api_key_sid", "test") + jingrow.db.set_single_value("Jcloude Settings", "twilio_api_key_secret", "test") + jingrow.db.set_single_value("Jcloude Settings", "twilio_phone_number", self.from_) self._create_test_incident_settings() diff --git a/press/press/doctype/incident_alerts/incident_alerts.json b/press/press/doctype/incident_alerts/incident_alerts.json index f5acc304..312be114 100644 --- a/press/press/doctype/incident_alerts/incident_alerts.json +++ b/press/press/doctype/incident_alerts/incident_alerts.json @@ -38,7 +38,7 @@ "links": [], "modified": "2023-10-18 10:40:59.417560", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Incident Alerts", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/incident_settings/incident_settings.json b/press/press/doctype/incident_settings/incident_settings.json index 79d01208..1c3b30c1 100644 --- a/press/press/doctype/incident_settings/incident_settings.json +++ b/press/press/doctype/incident_settings/incident_settings.json @@ -114,7 +114,7 @@ "links": [], "modified": "2025-01-24 11:07:55.944210", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Incident Settings", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.json b/press/press/doctype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.json index 79461be9..574b18b8 100644 --- a/press/press/doctype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.json +++ b/press/press/doctype/incident_settings_self_hosted_user/incident_settings_self_hosted_user.json @@ -38,7 +38,7 @@ "links": [], "modified": "2024-01-11 19:09:17.571549", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Incident Settings Self Hosted User", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/incident_settings_user/incident_settings_user.json b/press/press/doctype/incident_settings_user/incident_settings_user.json index 01d91c26..767a71dc 100644 --- a/press/press/doctype/incident_settings_user/incident_settings_user.json +++ b/press/press/doctype/incident_settings_user/incident_settings_user.json @@ -39,7 +39,7 @@ "links": [], "modified": "2024-01-11 19:09:25.518329", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Incident Settings User", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/incident_suggestion/incident_suggestion.json b/press/press/doctype/incident_suggestion/incident_suggestion.json index b15f215d..3c7b0f5f 100644 --- a/press/press/doctype/incident_suggestion/incident_suggestion.json +++ b/press/press/doctype/incident_suggestion/incident_suggestion.json @@ -34,7 +34,7 @@ "links": [], "modified": "2025-01-23 22:23:23.513166", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Incident Suggestion", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/incident_updates/incident_updates.json b/press/press/doctype/incident_updates/incident_updates.json index 4d98ee1d..35d83c54 100644 --- a/press/press/doctype/incident_updates/incident_updates.json +++ b/press/press/doctype/incident_updates/incident_updates.json @@ -31,7 +31,7 @@ "links": [], "modified": "2023-12-22 07:17:00.449557", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Incident Updates", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/inspect_trace_id/inspect_trace_id.json b/press/press/doctype/inspect_trace_id/inspect_trace_id.json index c750a4d7..bef92997 100644 --- a/press/press/doctype/inspect_trace_id/inspect_trace_id.json +++ b/press/press/doctype/inspect_trace_id/inspect_trace_id.json @@ -31,7 +31,7 @@ "links": [], "modified": "2025-05-12 18:28:47.694295", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Inspect Trace ID", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/inspect_trace_id/inspect_trace_id.py b/press/press/doctype/inspect_trace_id/inspect_trace_id.py index 73a8337e..61c1fd5c 100644 --- a/press/press/doctype/inspect_trace_id/inspect_trace_id.py +++ b/press/press/doctype/inspect_trace_id/inspect_trace_id.py @@ -34,7 +34,7 @@ class InspectTraceID(Document): if not self.trace_id: return - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if not log_server: return diff --git a/press/press/doctype/invoice/invoice.json b/press/press/doctype/invoice/invoice.json index 192a70be..911b6101 100644 --- a/press/press/doctype/invoice/invoice.json +++ b/press/press/doctype/invoice/invoice.json @@ -551,7 +551,7 @@ ], "modified": "2025-10-14 14:39:14.404906", "modified_by": "aysha@framework.jingrow.com", - "module": "Press", + "module": "Jcloude", "name": "Invoice", "naming_rule": "Expression", "owner": "Administrator", @@ -577,13 +577,13 @@ "create": 1, "print": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "submit": 1, "write": 1 }, { "read": 1, - "role": "Press Member" + "role": "Jcloude Member" }, { "read": 1, diff --git a/press/press/doctype/invoice/invoice.py b/press/press/doctype/invoice/invoice.py index ec78b5c5..a40991da 100644 --- a/press/press/doctype/invoice/invoice.py +++ b/press/press/doctype/invoice/invoice.py @@ -355,7 +355,7 @@ class Invoice(Document): return if self.currency == "INR" and self.type == "Subscription": - gst_rate = jingrow.db.get_single_value("Press Settings", "gst_percentage") + gst_rate = jingrow.db.get_single_value("Jcloude Settings", "gst_percentage") self.gst = flt(self.amount_due * gst_rate, 2) self.amount_due_with_tax = flt(self.amount_due + self.gst, 2) @@ -727,7 +727,7 @@ class Invoice(Document): npo_discount_applicable = jingrow.db.get_value("Team", self.team, "apply_npo_discount") if npo_discount_applicable: - npo_discount = jingrow.db.get_single_value("Press Settings", "npo_discount") + npo_discount = jingrow.db.get_single_value("Jcloude Settings", "npo_discount") if npo_discount: self.total_discount_amount += flt(self.total * (npo_discount / 100), 2) @@ -903,7 +903,7 @@ class Invoice(Document): return client = self.get_frappeio_connection() - print_format = jingrow.db.get_single_value("Press Settings", "print_format") + print_format = jingrow.db.get_single_value("Jcloude Settings", "print_format") params = urlencode( { "doctype": "Sales Invoice", diff --git a/press/press/doctype/invoice/test_invoice.py b/press/press/doctype/invoice/test_invoice.py index 7fd6e8e7..68511148 100644 --- a/press/press/doctype/invoice/test_invoice.py +++ b/press/press/doctype/invoice/test_invoice.py @@ -487,7 +487,7 @@ class TestInvoice(FrappeTestCase): def test_tax_without_credits(self): team = create_test_team("tax_without_credits@example.com") - jingrow.db.set_single_value("Press Settings", "gst_percentage", 0.18) + jingrow.db.set_single_value("Jcloude Settings", "gst_percentage", 0.18) invoice = jingrow.get_pg(doctype="Invoice", team=team.name) invoice.append("items", {"quantity": 1, "rate": 10, "amount": 10}) @@ -501,7 +501,7 @@ class TestInvoice(FrappeTestCase): """Test invoice with tax when payment mode is prepaid credits""" team = create_test_team("tax_with_credits@example.com") team.allocate_credit_amount(5, source="Prepaid Credits") - jingrow.db.set_single_value("Press Settings", "gst_percentage", 0.18) + jingrow.db.set_single_value("Jcloude Settings", "gst_percentage", 0.18) invoice = jingrow.get_pg(doctype="Invoice", team=team.name) invoice.append("items", {"quantity": 1, "rate": 10, "amount": 10}) @@ -520,7 +520,7 @@ class TestInvoice(FrappeTestCase): team.allocate_credit_amount(5, source="Prepaid Credits") jingrow.db.set_value("Team", team.name, "payment_mode", "Card") # team.reload() - jingrow.db.set_single_value("Press Settings", "gst_percentage", 0.18) + jingrow.db.set_single_value("Jcloude Settings", "gst_percentage", 0.18) invoice = jingrow.get_pg(doctype="Invoice", team=team.name) invoice.append("items", {"quantity": 1, "rate": 10, "amount": 10}) @@ -534,7 +534,7 @@ class TestInvoice(FrappeTestCase): def test_tax_for_usd_accounts(self): team = create_test_team("tax_for_usd_accounts@example.com", "United States") - jingrow.db.set_single_value("Press Settings", "gst_percentage", 0.18) + jingrow.db.set_single_value("Jcloude Settings", "gst_percentage", 0.18) invoice = jingrow.get_pg(doctype="Invoice", team=team.name) invoice.append("items", {"quantity": 1, "rate": 10, "amount": 10}) @@ -549,7 +549,7 @@ class TestInvoice(FrappeTestCase): team = create_test_team("npo_team_discount@gmail.com") team.apply_npo_discount = 1 team.save() - jingrow.db.set_single_value("Press Settings", "npo_discount", 10) + jingrow.db.set_single_value("Jcloude Settings", "npo_discount", 10) invoice = jingrow.get_pg(doctype="Invoice", team=team.name) invoice.append("items", {"quantity": 1, "rate": 100, "amount": 100}) diff --git a/press/press/doctype/invoice_credit_allocation/invoice_credit_allocation.json b/press/press/doctype/invoice_credit_allocation/invoice_credit_allocation.json index ce485856..773e4f5e 100644 --- a/press/press/doctype/invoice_credit_allocation/invoice_credit_allocation.json +++ b/press/press/doctype/invoice_credit_allocation/invoice_credit_allocation.json @@ -43,7 +43,7 @@ "links": [], "modified": "2020-11-12 22:25:22.163211", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Invoice Credit Allocation", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/invoice_discount/invoice_discount.json b/press/press/doctype/invoice_discount/invoice_discount.json index ef2d4e50..844f6152 100644 --- a/press/press/doctype/invoice_discount/invoice_discount.json +++ b/press/press/doctype/invoice_discount/invoice_discount.json @@ -68,7 +68,7 @@ "links": [], "modified": "2023-02-15 15:00:20.433287", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Invoice Discount", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/invoice_item/invoice_item.json b/press/press/doctype/invoice_item/invoice_item.json index 621d77e0..bd7f4a0c 100644 --- a/press/press/doctype/invoice_item/invoice_item.json +++ b/press/press/doctype/invoice_item/invoice_item.json @@ -99,7 +99,7 @@ "links": [], "modified": "2024-11-06 20:44:24.686991", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Invoice Item", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/invoice_transaction_fee/invoice_transaction_fee.json b/press/press/doctype/invoice_transaction_fee/invoice_transaction_fee.json index 2f24393f..a6278ccf 100644 --- a/press/press/doctype/invoice_transaction_fee/invoice_transaction_fee.json +++ b/press/press/doctype/invoice_transaction_fee/invoice_transaction_fee.json @@ -35,7 +35,7 @@ "links": [], "modified": "2020-11-24 20:55:02.468579", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Invoice Transaction Fee", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/log_counter/log_counter.json b/press/press/doctype/log_counter/log_counter.json index d173bc5a..f327187d 100644 --- a/press/press/doctype/log_counter/log_counter.json +++ b/press/press/doctype/log_counter/log_counter.json @@ -71,7 +71,7 @@ "links": [], "modified": "2024-04-19 13:17:13.153028", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Log Counter", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/log_server/log_server.json b/press/press/doctype/log_server/log_server.json index 2a945d9f..758e3d9e 100644 --- a/press/press/doctype/log_server/log_server.json +++ b/press/press/doctype/log_server/log_server.json @@ -228,7 +228,7 @@ ], "modified": "2025-11-22 15:50:53.703274", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Log Server", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/logical_replication_backup/logical_replication_backup.json b/press/press/doctype/logical_replication_backup/logical_replication_backup.json index 6e87e4b8..ef88e9d0 100644 --- a/press/press/doctype/logical_replication_backup/logical_replication_backup.json +++ b/press/press/doctype/logical_replication_backup/logical_replication_backup.json @@ -228,7 +228,7 @@ "links": [], "modified": "2025-08-21 16:54:30.994648", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Logical Replication Backup", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/logical_replication_backup/logical_replication_backup.py b/press/press/doctype/logical_replication_backup/logical_replication_backup.py index 705f30d5..0d9f9728 100644 --- a/press/press/doctype/logical_replication_backup/logical_replication_backup.py +++ b/press/press/doctype/logical_replication_backup/logical_replication_backup.py @@ -491,14 +491,14 @@ class LogicalReplicationBackup(Document): if server.status != "Active": return StepStatus.Running - # Check status of Create Server Press Job + # Check status of Create Server Jcloude Job jcloude_job_status = jingrow.db.get_value( - "Press Job", + "Jcloude Job", {"server_type": "Database Server", "server": server.name, "job_type": "Create Server"}, "status", ) if not jcloude_job_status: - # Press Job might not have created yet + # Jcloude Job might not have created yet return StepStatus.Running if jcloude_job_status in ["Pending", "Running"]: diff --git a/press/press/doctype/logical_replication_server/logical_replication_server.json b/press/press/doctype/logical_replication_server/logical_replication_server.json index 44dda5d3..067d6536 100644 --- a/press/press/doctype/logical_replication_server/logical_replication_server.json +++ b/press/press/doctype/logical_replication_server/logical_replication_server.json @@ -53,7 +53,7 @@ "links": [], "modified": "2025-08-21 02:43:26.472015", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Logical Replication Server", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/logical_replication_step/logical_replication_step.json b/press/press/doctype/logical_replication_step/logical_replication_step.json index dedb68ec..f3ff27c2 100644 --- a/press/press/doctype/logical_replication_step/logical_replication_step.json +++ b/press/press/doctype/logical_replication_step/logical_replication_step.json @@ -104,7 +104,7 @@ "links": [], "modified": "2025-08-21 10:56:47.022439", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Logical Replication Step", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/mail_log/mail_log.json b/press/press/doctype/mail_log/mail_log.json index 6cb7dd33..f23e3990 100644 --- a/press/press/doctype/mail_log/mail_log.json +++ b/press/press/doctype/mail_log/mail_log.json @@ -111,7 +111,7 @@ "links": [], "modified": "2025-10-06 16:21:14.518847", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Mail Log", "naming_rule": "Expression (old style)", "owner": "Administrator", diff --git a/press/press/doctype/mail_setup/mail_setup.json b/press/press/doctype/mail_setup/mail_setup.json index 055acbdc..ba480759 100644 --- a/press/press/doctype/mail_setup/mail_setup.json +++ b/press/press/doctype/mail_setup/mail_setup.json @@ -28,7 +28,7 @@ "links": [], "modified": "2022-02-28 19:15:00.462629", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Mail Setup", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/malware_scan/malware_scan.json b/press/press/doctype/malware_scan/malware_scan.json index 7c585bb8..e3883196 100644 --- a/press/press/doctype/malware_scan/malware_scan.json +++ b/press/press/doctype/malware_scan/malware_scan.json @@ -53,7 +53,7 @@ "links": [], "modified": "2023-11-22 17:24:35.104095", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Malware Scan", "naming_rule": "Random", "owner": "Administrator", diff --git a/press/press/doctype/malware_scan/malware_scan.py b/press/press/doctype/malware_scan/malware_scan.py index 25f219a2..f4deedbd 100644 --- a/press/press/doctype/malware_scan/malware_scan.py +++ b/press/press/doctype/malware_scan/malware_scan.py @@ -102,7 +102,7 @@ class MalwareScan(Document): self.fail() def send_infected_alert(self): - domain = jingrow.get_value("Press Settings", "Press Settings", "domain") + domain = jingrow.get_value("Jcloude Settings", "Jcloude Settings", "domain") message = f""" Malware Scan for *{self.server}* found malware, review. @@ -112,7 +112,7 @@ Malware Scan for *{self.server}* found malware, review. def fail(self): self.status = "Failure" - domain = jingrow.get_value("Press Settings", "Press Settings", "domain") + domain = jingrow.get_value("Jcloude Settings", "Jcloude Settings", "domain") message = f""" Malware Scan for *{self.server}* failed. diff --git a/press/press/doctype/managed_database_service/managed_database_service.json b/press/press/doctype/managed_database_service/managed_database_service.json index 11669e6c..e98faa35 100644 --- a/press/press/doctype/managed_database_service/managed_database_service.json +++ b/press/press/doctype/managed_database_service/managed_database_service.json @@ -79,7 +79,7 @@ "links": [], "modified": "2024-05-29 19:11:14.644480", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Managed Database Service", "naming_rule": "By fieldname", "owner": "Administrator", diff --git a/press/press/doctype/mariadb_binlog/mariadb_binlog.json b/press/press/doctype/mariadb_binlog/mariadb_binlog.json index fd0a8fa8..d69294c0 100644 --- a/press/press/doctype/mariadb_binlog/mariadb_binlog.json +++ b/press/press/doctype/mariadb_binlog/mariadb_binlog.json @@ -115,7 +115,7 @@ "links": [], "modified": "2025-12-08 12:36:55.422452", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "MariaDB Binlog", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/mariadb_stalk/mariadb_stalk.json b/press/press/doctype/mariadb_stalk/mariadb_stalk.json index ff2822bc..fb4360d0 100644 --- a/press/press/doctype/mariadb_stalk/mariadb_stalk.json +++ b/press/press/doctype/mariadb_stalk/mariadb_stalk.json @@ -52,7 +52,7 @@ "links": [], "modified": "2023-12-21 18:55:52.236854", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "MariaDB Stalk", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.json b/press/press/doctype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.json index b44e81d7..bb7aaf39 100644 --- a/press/press/doctype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.json +++ b/press/press/doctype/mariadb_stalk_diagnostic/mariadb_stalk_diagnostic.json @@ -31,7 +31,7 @@ "links": [], "modified": "2023-12-21 18:57:47.641855", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "MariaDB Stalk Diagnostic", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/mariadb_variable/mariadb_variable.json b/press/press/doctype/mariadb_variable/mariadb_variable.json index f559e6a5..c2315fb5 100644 --- a/press/press/doctype/mariadb_variable/mariadb_variable.json +++ b/press/press/doctype/mariadb_variable/mariadb_variable.json @@ -87,7 +87,7 @@ "links": [], "modified": "2025-03-25 22:21:06.165678", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "MariaDB Variable", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/marketplace_app/marketplace_app.json b/press/press/doctype/marketplace_app/marketplace_app.json index d0ff9d23..8f0217f1 100644 --- a/press/press/doctype/marketplace_app/marketplace_app.json +++ b/press/press/doctype/marketplace_app/marketplace_app.json @@ -439,7 +439,7 @@ ], "modified": "2025-09-30 11:48:31.952469", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Marketplace App", "owner": "Administrator", "permissions": [ @@ -463,7 +463,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "select": 1, "share": 1, "write": 1 diff --git a/press/press/doctype/marketplace_app/marketplace_app.py b/press/press/doctype/marketplace_app/marketplace_app.py index efe14bd4..c7291f76 100644 --- a/press/press/doctype/marketplace_app/marketplace_app.py +++ b/press/press/doctype/marketplace_app/marketplace_app.py @@ -201,7 +201,7 @@ class MarketplaceApp(WebsiteGenerator): ) def validate_number_of_screenshots(self): - max_allowed_screenshots = jingrow.db.get_single_value("Press Settings", "max_allowed_screenshots") + max_allowed_screenshots = jingrow.db.get_single_value("Jcloude Settings", "max_allowed_screenshots") if len(self.screenshots) > max_allowed_screenshots: jingrow.throw(f"You cannot add more than {max_allowed_screenshots} screenshots for an app.") @@ -314,7 +314,7 @@ class MarketplaceApp(WebsiteGenerator): if source.github_installation_id: github_access_token = get_access_token(source.github_installation_id) else: - github_access_token = jingrow.get_value("Press Settings", None, "github_access_token") + github_access_token = jingrow.get_value("Jcloude Settings", None, "github_access_token") headers = { "Authorization": f"token {github_access_token}", diff --git a/press/press/doctype/marketplace_app_categories/marketplace_app_categories.json b/press/press/doctype/marketplace_app_categories/marketplace_app_categories.json index 0ad91d7a..67dc10c8 100644 --- a/press/press/doctype/marketplace_app_categories/marketplace_app_categories.json +++ b/press/press/doctype/marketplace_app_categories/marketplace_app_categories.json @@ -22,7 +22,7 @@ "links": [], "modified": "2022-02-23 14:57:18.196374", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Marketplace App Categories", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/marketplace_app_category/marketplace_app_category.json b/press/press/doctype/marketplace_app_category/marketplace_app_category.json index 2609f844..15078de9 100644 --- a/press/press/doctype/marketplace_app_category/marketplace_app_category.json +++ b/press/press/doctype/marketplace_app_category/marketplace_app_category.json @@ -26,7 +26,7 @@ "links": [], "modified": "2025-08-20 20:08:20.571148", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Marketplace App Category", "naming_rule": "Set by user", "owner": "Administrator", @@ -51,7 +51,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "share": 1, "write": 1 } diff --git a/press/press/doctype/marketplace_app_screenshot/marketplace_app_screenshot.json b/press/press/doctype/marketplace_app_screenshot/marketplace_app_screenshot.json index 8508f622..86c77fb1 100644 --- a/press/press/doctype/marketplace_app_screenshot/marketplace_app_screenshot.json +++ b/press/press/doctype/marketplace_app_screenshot/marketplace_app_screenshot.json @@ -27,7 +27,7 @@ "links": [], "modified": "2021-09-02 13:21:05.209666", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Marketplace App Screenshot", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/marketplace_app_version/marketplace_app_version.json b/press/press/doctype/marketplace_app_version/marketplace_app_version.json index 1c42db6f..b9cedf80 100644 --- a/press/press/doctype/marketplace_app_version/marketplace_app_version.json +++ b/press/press/doctype/marketplace_app_version/marketplace_app_version.json @@ -31,7 +31,7 @@ "links": [], "modified": "2021-07-19 12:11:08.469343", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Marketplace App Version", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/marketplace_localisation_app/marketplace_localisation_app.json b/press/press/doctype/marketplace_localisation_app/marketplace_localisation_app.json index ad8d11af..3a96824a 100644 --- a/press/press/doctype/marketplace_localisation_app/marketplace_localisation_app.json +++ b/press/press/doctype/marketplace_localisation_app/marketplace_localisation_app.json @@ -28,7 +28,7 @@ "links": [], "modified": "2025-08-20 20:08:02.368682", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Marketplace Localisation App", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/module_setup_guide/module_setup_guide.json b/press/press/doctype/module_setup_guide/module_setup_guide.json index 4ecdaa87..649f19b9 100644 --- a/press/press/doctype/module_setup_guide/module_setup_guide.json +++ b/press/press/doctype/module_setup_guide/module_setup_guide.json @@ -35,7 +35,7 @@ "links": [], "modified": "2021-04-22 05:29:06.620370", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Module Setup Guide", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/monitor_server/monitor_server.json b/press/press/doctype/monitor_server/monitor_server.json index 29dd1ed0..41036e5c 100644 --- a/press/press/doctype/monitor_server/monitor_server.json +++ b/press/press/doctype/monitor_server/monitor_server.json @@ -281,7 +281,7 @@ ], "modified": "2025-11-22 15:49:17.754965", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Monitor Server", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/monitor_server/monitor_server.py b/press/press/doctype/monitor_server/monitor_server.py index ac4ecbdb..76f4a803 100644 --- a/press/press/doctype/monitor_server/monitor_server.py +++ b/press/press/doctype/monitor_server/monitor_server.py @@ -127,7 +127,7 @@ class MonitorServer(BaseServer): } ) jcloude_url = jingrow.utils.get_url() - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") monitor_token = settings.monitor_token jcloude_monitoring_password = settings.get_password("jcloude_monitoring_password") try: @@ -178,7 +178,7 @@ class MonitorServer(BaseServer): jingrow.enqueue_pg(self.doctype, self.name, "_reconfigure_monitor_server", queue="long", timeout=1200) def _reconfigure_monitor_server(self): - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") jcloude_monitoring_password = settings.get_password("jcloude_monitoring_password") monitoring_password = self.get_password("monitoring_password") diff --git a/press/press/doctype/mpesa_payment_record/mpesa_payment_record.json b/press/press/doctype/mpesa_payment_record/mpesa_payment_record.json index 651d0eff..459015bd 100644 --- a/press/press/doctype/mpesa_payment_record/mpesa_payment_record.json +++ b/press/press/doctype/mpesa_payment_record/mpesa_payment_record.json @@ -180,7 +180,7 @@ "links": [], "modified": "2025-02-02 17:52:49.719724", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Mpesa Payment Record", "naming_rule": "Expression (old style)", "owner": "Administrator", @@ -204,7 +204,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 } diff --git a/press/press/doctype/mpesa_request_log/mpesa_request_log.json b/press/press/doctype/mpesa_request_log/mpesa_request_log.json index 546b558f..e8e243be 100644 --- a/press/press/doctype/mpesa_request_log/mpesa_request_log.json +++ b/press/press/doctype/mpesa_request_log/mpesa_request_log.json @@ -104,7 +104,7 @@ "links": [], "modified": "2025-02-02 18:48:36.387604", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Mpesa Request Log", "owner": "Administrator", "permissions": [ @@ -126,7 +126,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1 } ], diff --git a/press/press/doctype/mpesa_setup/mpesa_setup.json b/press/press/doctype/mpesa_setup/mpesa_setup.json index efe7194e..30e41bbc 100644 --- a/press/press/doctype/mpesa_setup/mpesa_setup.json +++ b/press/press/doctype/mpesa_setup/mpesa_setup.json @@ -107,7 +107,7 @@ "links": [], "modified": "2025-01-31 22:35:54.537908", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Mpesa Setup", "naming_rule": "Expression", "owner": "Administrator", @@ -132,7 +132,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 } diff --git a/press/press/doctype/nfs_server/nfs_server.json b/press/press/doctype/nfs_server/nfs_server.json index 561f5e38..df7f7dd0 100644 --- a/press/press/doctype/nfs_server/nfs_server.json +++ b/press/press/doctype/nfs_server/nfs_server.json @@ -228,7 +228,7 @@ ], "modified": "2025-10-15 23:20:56.419708", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "NFS Server", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.json b/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.json index 49c92ed7..fb42a743 100644 --- a/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.json +++ b/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.json @@ -64,13 +64,13 @@ "index_web_pages_for_search": 1, "links": [ { - "link_doctype": "Press Notification", + "link_doctype": "Jcloude Notification", "link_fieldname": "document_name" } ], "modified": "2025-11-11 16:07:41.830892", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "NFS Volume Attachment", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.py b/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.py index c85866e1..611504bb 100644 --- a/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.py +++ b/press/press/doctype/nfs_volume_attachment/nfs_volume_attachment.py @@ -155,7 +155,7 @@ class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler): """Mount shared folder on secondary server""" secondary_server: Server = jingrow.get_cached_pg("Server", self.secondary_server) primary_server_private_ip = jingrow.db.get_value("Server", secondary_server.primary, "private_ip") - shared_directory = jingrow.db.get_single_value("Press Settings", "shared_directory") + shared_directory = jingrow.db.get_single_value("Jcloude Settings", "shared_directory") step.status = Status.Running step.save() @@ -181,7 +181,7 @@ class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler): def link_benches_to_shared(self, step: "NFSVolumeAttachmentStep") -> None: """Link benches to the shared NFS directory.""" primary_server: Server = jingrow.get_cached_pg("Server", self.primary_server) - shared_directory = jingrow.db.get_single_value("Press Settings", "shared_directory") + shared_directory = jingrow.db.get_single_value("Jcloude Settings", "shared_directory") step.status = Status.Running step.save() @@ -210,7 +210,7 @@ class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler): self.secondary_server, "private_ip", ) - shared_directory = jingrow.db.get_single_value("Press Settings", "shared_directory") + shared_directory = jingrow.db.get_single_value("Jcloude Settings", "shared_directory") agent_job = Agent(self.primary_server).change_bench_directory( redis_connection_string_ip="localhost", @@ -323,7 +323,7 @@ class NFSVolumeAttachment(Document, AutoScaleStepFailureHandler, StepHandler): missing_images = [] registry_settings = jingrow.db.get_value( - "Press Settings", + "Jcloude Settings", None, [ "domain", diff --git a/press/press/doctype/nfs_volume_attachment_step/nfs_volume_attachment_step.json b/press/press/doctype/nfs_volume_attachment_step/nfs_volume_attachment_step.json index 2505b36b..f46e5dcb 100644 --- a/press/press/doctype/nfs_volume_attachment_step/nfs_volume_attachment_step.json +++ b/press/press/doctype/nfs_volume_attachment_step/nfs_volume_attachment_step.json @@ -70,7 +70,7 @@ "links": [], "modified": "2025-10-08 17:38:30.784005", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "NFS Volume Attachment Step", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.json b/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.json index 659ce9cb..b07239d0 100644 --- a/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.json +++ b/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.json @@ -55,13 +55,13 @@ "index_web_pages_for_search": 1, "links": [ { - "link_doctype": "Press Notification", + "link_doctype": "Jcloude Notification", "link_fieldname": "document_name" } ], "modified": "2025-11-11 16:46:53.671641", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "NFS Volume Detachment", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.py b/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.py index 0933574e..4ed1da64 100644 --- a/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.py +++ b/press/press/doctype/nfs_volume_detachment/nfs_volume_detachment.py @@ -96,7 +96,7 @@ class NFSVolumeDetachment(Document, AutoScaleStepFailureHandler, StepHandler): def unlink_benches_from_shared(self, step: "NFSVolumeDetachmentStep"): """Sync data from shared to /home/jingrow/benches""" primary_server: Server = jingrow.get_cached_pg("Server", self.primary_server) - shared_directory = jingrow.db.get_single_value("Press Settings", "shared_directory") + shared_directory = jingrow.db.get_single_value("Jcloude Settings", "shared_directory") step.status = Status.Running step.save() diff --git a/press/press/doctype/nfs_volume_detachment_step/nfs_volume_detachment_step.json b/press/press/doctype/nfs_volume_detachment_step/nfs_volume_detachment_step.json index d0226bca..48a84c79 100644 --- a/press/press/doctype/nfs_volume_detachment_step/nfs_volume_detachment_step.json +++ b/press/press/doctype/nfs_volume_detachment_step/nfs_volume_detachment_step.json @@ -71,7 +71,7 @@ "links": [], "modified": "2025-10-08 16:59:32.287685", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "NFS Volume Detachment Step", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/oauth_domain_mapping/oauth_domain_mapping.json b/press/press/doctype/oauth_domain_mapping/oauth_domain_mapping.json index c3ac3104..512bbe66 100644 --- a/press/press/doctype/oauth_domain_mapping/oauth_domain_mapping.json +++ b/press/press/doctype/oauth_domain_mapping/oauth_domain_mapping.json @@ -43,7 +43,7 @@ "links": [], "modified": "2024-05-13 21:34:04.985596", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "OAuth Domain Mapping", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/partner_payment_payout/partner_payment_payout.json b/press/press/doctype/partner_payment_payout/partner_payment_payout.json index fcc8eee3..2b49c9e6 100644 --- a/press/press/doctype/partner_payment_payout/partner_payment_payout.json +++ b/press/press/doctype/partner_payment_payout/partner_payment_payout.json @@ -131,7 +131,7 @@ "links": [], "modified": "2025-03-26 10:13:59.824685", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Partner Payment Payout", "naming_rule": "Expression", "owner": "Administrator", diff --git a/press/press/doctype/partner_payment_payout_item/partner_payment_payout_item.json b/press/press/doctype/partner_payment_payout_item/partner_payment_payout_item.json index 6a19ab86..f5c076e1 100644 --- a/press/press/doctype/partner_payment_payout_item/partner_payment_payout_item.json +++ b/press/press/doctype/partner_payment_payout_item/partner_payment_payout_item.json @@ -80,7 +80,7 @@ "links": [], "modified": "2025-03-26 09:07:18.191183", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Partner Payment Payout Item", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/payment_dispute/payment_dispute.json b/press/press/doctype/payment_dispute/payment_dispute.json index 9ad4f9a7..4bb0d289 100644 --- a/press/press/doctype/payment_dispute/payment_dispute.json +++ b/press/press/doctype/payment_dispute/payment_dispute.json @@ -63,7 +63,7 @@ "links": [], "modified": "2024-09-23 12:27:14.065913", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Payment Dispute", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/payment_due_extension/payment_due_extension.json b/press/press/doctype/payment_due_extension/payment_due_extension.json index 1d2ba7f0..98a0ec50 100644 --- a/press/press/doctype/payment_due_extension/payment_due_extension.json +++ b/press/press/doctype/payment_due_extension/payment_due_extension.json @@ -49,7 +49,7 @@ "links": [], "modified": "2025-04-14 11:55:56.662380", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Payment Due Extension", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/payment_gateway/payment_gateway.json b/press/press/doctype/payment_gateway/payment_gateway.json index 548d5ad1..d89c4074 100644 --- a/press/press/doctype/payment_gateway/payment_gateway.json +++ b/press/press/doctype/payment_gateway/payment_gateway.json @@ -142,7 +142,7 @@ "links": [], "modified": "2025-02-02 19:51:36.821998", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Payment Gateway", "naming_rule": "By fieldname", "owner": "Administrator", @@ -167,7 +167,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 } diff --git a/press/press/doctype/payment_partner_transaction/payment_partner_transaction.json b/press/press/doctype/payment_partner_transaction/payment_partner_transaction.json index 824560ef..429a5a94 100644 --- a/press/press/doctype/payment_partner_transaction/payment_partner_transaction.json +++ b/press/press/doctype/payment_partner_transaction/payment_partner_transaction.json @@ -151,7 +151,7 @@ "links": [], "modified": "2025-02-02 17:54:48.975501", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Payment Partner Transaction", "naming_rule": "Expression (old style)", "owner": "Administrator", diff --git a/press/press/doctype/payout_order/patches/compute_total_amount.py b/press/press/doctype/payout_order/patches/compute_total_amount.py index 33fdeba9..d674e0c5 100644 --- a/press/press/doctype/payout_order/patches/compute_total_amount.py +++ b/press/press/doctype/payout_order/patches/compute_total_amount.py @@ -6,7 +6,7 @@ from tqdm import tqdm def execute(): - exchange_rate = jingrow.db.get_single_value("Press Settings", "usd_rate") + exchange_rate = jingrow.db.get_single_value("Jcloude Settings", "usd_rate") payout_orders = jingrow.get_all( "Payout Order", {"docstatus": 0}, diff --git a/press/press/doctype/payout_order/payout_order.json b/press/press/doctype/payout_order/payout_order.json index f9ed41ce..544f8056 100644 --- a/press/press/doctype/payout_order/payout_order.json +++ b/press/press/doctype/payout_order/payout_order.json @@ -184,7 +184,7 @@ "links": [], "modified": "2025-03-20 10:23:23.836067", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Payout Order", "naming_rule": "Expression", "owner": "Administrator", diff --git a/press/press/doctype/payout_order/payout_order.py b/press/press/doctype/payout_order/payout_order.py index 04eb6ff4..2cc1dee0 100644 --- a/press/press/doctype/payout_order/payout_order.py +++ b/press/press/doctype/payout_order/payout_order.py @@ -138,7 +138,7 @@ class PayoutOrder(Document): self.status = "Draft" def compute_total_amount(self): - exchange_rate = jingrow.db.get_single_value("Press Settings", "usd_rate") + exchange_rate = jingrow.db.get_single_value("Jcloude Settings", "usd_rate") if self.recipient_currency == "USD": inr_in_usd = 0 if self.net_total_inr > 0: diff --git a/press/press/doctype/payout_order_item/payout_order_item.json b/press/press/doctype/payout_order_item/payout_order_item.json index 267810eb..afd4ab58 100644 --- a/press/press/doctype/payout_order_item/payout_order_item.json +++ b/press/press/doctype/payout_order_item/payout_order_item.json @@ -133,7 +133,7 @@ "links": [], "modified": "2025-03-18 10:10:51.856778", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Payout Order Item", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/physical_backup_group/physical_backup_group.json b/press/press/doctype/physical_backup_group/physical_backup_group.json index cc9419d3..f7bfae45 100644 --- a/press/press/doctype/physical_backup_group/physical_backup_group.json +++ b/press/press/doctype/physical_backup_group/physical_backup_group.json @@ -73,7 +73,7 @@ "links": [], "modified": "2025-02-18 15:14:19.059871", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Physical Backup Group", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/physical_backup_group_site/physical_backup_group_site.json b/press/press/doctype/physical_backup_group_site/physical_backup_group_site.json index 40e9d834..12bf800b 100644 --- a/press/press/doctype/physical_backup_group_site/physical_backup_group_site.json +++ b/press/press/doctype/physical_backup_group_site/physical_backup_group_site.json @@ -64,7 +64,7 @@ "links": [], "modified": "2025-02-18 13:39:44.803273", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Physical Backup Group Site", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/physical_backup_restoration/physical_backup_restoration.json b/press/press/doctype/physical_backup_restoration/physical_backup_restoration.json index f50b334f..f1b113c6 100644 --- a/press/press/doctype/physical_backup_restoration/physical_backup_restoration.json +++ b/press/press/doctype/physical_backup_restoration/physical_backup_restoration.json @@ -231,7 +231,7 @@ ], "modified": "2025-04-17 11:13:10.779531", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Physical Backup Restoration", "owner": "Administrator", "permissions": [ @@ -254,7 +254,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -265,7 +265,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/physical_backup_restoration/physical_backup_restoration.py b/press/press/doctype/physical_backup_restoration/physical_backup_restoration.py index a6063a52..7466b385 100644 --- a/press/press/doctype/physical_backup_restoration/physical_backup_restoration.py +++ b/press/press/doctype/physical_backup_restoration/physical_backup_restoration.py @@ -844,7 +844,7 @@ def process_scheduled_restorations(): # noqa: C901 "Physical Backup Restoration", filters={"status": "Scheduled"}, pluck="name", order_by="creation asc" ) max_concurrent_restorations = jingrow.utils.cint( - jingrow.get_cached_value("Press Settings", "Press Settings", "max_concurrent_physical_restorations") + jingrow.get_cached_value("Jcloude Settings", "Jcloude Settings", "max_concurrent_physical_restorations") ) db_servers_with_max_running_concurrent_restorations = set() db_servers_with_incident = set( diff --git a/press/press/doctype/physical_backup_restoration_step/physical_backup_restoration_step.json b/press/press/doctype/physical_backup_restoration_step/physical_backup_restoration_step.json index cfd5de73..5488ca27 100644 --- a/press/press/doctype/physical_backup_restoration_step/physical_backup_restoration_step.json +++ b/press/press/doctype/physical_backup_restoration_step/physical_backup_restoration_step.json @@ -105,7 +105,7 @@ "links": [], "modified": "2025-03-15 17:35:31.824500", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Physical Backup Restoration Step", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/physical_restoration_test/physical_restoration_test.json b/press/press/doctype/physical_restoration_test/physical_restoration_test.json index 55d7ceb9..145c6148 100644 --- a/press/press/doctype/physical_restoration_test/physical_restoration_test.json +++ b/press/press/doctype/physical_restoration_test/physical_restoration_test.json @@ -75,7 +75,7 @@ "links": [], "modified": "2025-02-18 16:41:44.401442", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Physical Restoration Test", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/physical_restoration_test_result/physical_restoration_test_result.json b/press/press/doctype/physical_restoration_test_result/physical_restoration_test_result.json index ba106755..ff6435bb 100644 --- a/press/press/doctype/physical_restoration_test_result/physical_restoration_test_result.json +++ b/press/press/doctype/physical_restoration_test_result/physical_restoration_test_result.json @@ -59,7 +59,7 @@ "links": [], "modified": "2025-02-18 16:59:59.685437", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Physical Restoration Test Result", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/plan_change/plan_change.json b/press/press/doctype/plan_change/plan_change.json index fecf8c22..b9554968 100644 --- a/press/press/doctype/plan_change/plan_change.json +++ b/press/press/doctype/plan_change/plan_change.json @@ -76,7 +76,7 @@ "links": [], "modified": "2024-02-19 14:03:40.310425", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Plan Change", "owner": "Administrator", "permissions": [ @@ -94,11 +94,11 @@ }, { "create": 1, - "role": "Press Admin" + "role": "Jcloude Admin" }, { "create": 1, - "role": "Press Member" + "role": "Jcloude Member" } ], "quick_entry": 1, diff --git a/press/press/doctype/plan_feature/plan_feature.json b/press/press/doctype/plan_feature/plan_feature.json index ff30a7d7..297d1f79 100644 --- a/press/press/doctype/plan_feature/plan_feature.json +++ b/press/press/doctype/plan_feature/plan_feature.json @@ -22,7 +22,7 @@ "links": [], "modified": "2021-12-22 18:49:19.991998", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Plan Feature", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/press_feedback/press_feedback.js b/press/press/doctype/press_feedback/press_feedback.js index 4f38f9cc..2fc88294 100644 --- a/press/press/doctype/press_feedback/press_feedback.js +++ b/press/press/doctype/press_feedback/press_feedback.js @@ -1,7 +1,7 @@ // Copyright (c) 2020, JINGROW // For license information, please see license.txt -jingrow.ui.form.on('Press Feedback', { +jingrow.ui.form.on('Jcloude Feedback', { // refresh: function(frm) { // } }); diff --git a/press/press/doctype/press_feedback/press_feedback.json b/press/press/doctype/press_feedback/press_feedback.json index 00fd53d8..0bde3950 100644 --- a/press/press/doctype/press_feedback/press_feedback.json +++ b/press/press/doctype/press_feedback/press_feedback.json @@ -71,8 +71,8 @@ "links": [], "modified": "2025-02-03 15:48:45.990977", "modified_by": "Administrator", - "module": "Press", - "name": "Press Feedback", + "module": "Jcloude", + "name": "Jcloude Feedback", "owner": "Administrator", "permissions": [ { @@ -89,11 +89,11 @@ }, { "create": 1, - "role": "Press Admin" + "role": "Jcloude Admin" }, { "create": 1, - "role": "Press Member" + "role": "Jcloude Member" } ], "quick_entry": 1, diff --git a/press/press/doctype/press_job/press_job.js b/press/press/doctype/press_job/press_job.js index 0b5ec675..fb9f7393 100644 --- a/press/press/doctype/press_job/press_job.js +++ b/press/press/doctype/press_job/press_job.js @@ -1,7 +1,7 @@ // Copyright (c) 2022, JINGROW // For license information, please see license.txt -jingrow.ui.form.on('Press Job', { +jingrow.ui.form.on('Jcloude Job', { refresh: function (frm) { [ [__('Force Continue'), 'force_continue', frm.pg.status === 'Failure'], diff --git a/press/press/doctype/press_job/press_job.json b/press/press/doctype/press_job/press_job.json index c096388c..24729c92 100644 --- a/press/press/doctype/press_job/press_job.json +++ b/press/press/doctype/press_job/press_job.json @@ -34,7 +34,7 @@ "in_list_view": 1, "in_standard_filter": 1, "label": "Job Type", - "options": "Press Job Type", + "options": "Jcloude Job Type", "read_only": 1, "reqd": 1 }, @@ -171,14 +171,14 @@ "index_web_pages_for_search": 1, "links": [ { - "link_doctype": "Press Job Step", + "link_doctype": "Jcloude Job Step", "link_fieldname": "job" } ], "modified": "2025-07-31 11:51:16.216581", "modified_by": "Administrator", - "module": "Press", - "name": "Press Job", + "module": "Jcloude", + "name": "Jcloude Job", "naming_rule": "Autoincrement", "owner": "Administrator", "permissions": [ @@ -196,12 +196,12 @@ }, { "create": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/press_job/press_job.py b/press/press/doctype/press_job/press_job.py index fae22f0c..3298a8ae 100644 --- a/press/press/doctype/press_job/press_job.py +++ b/press/press/doctype/press_job/press_job.py @@ -64,11 +64,11 @@ class PressJob(Document): self.publish_update() def create_jcloude_job_steps(self): - job_type = jingrow.get_pg("Press Job Type", self.job_type) + job_type = jingrow.get_pg("Jcloude Job Type", self.job_type) for step in job_type.steps: pg = jingrow.get_pg( { - "doctype": "Press Job Step", + "doctype": "Jcloude Job Step", "job": self.name, "status": "Pending", "job_type": self.job_type, @@ -86,9 +86,9 @@ class PressJob(Document): def fail(self, arguments=None): self.status = "Failure" - pending_steps = jingrow.get_all("Press Job Step", {"job": self.name, "status": "Pending"}) + pending_steps = jingrow.get_all("Jcloude Job Step", {"job": self.name, "status": "Pending"}) for step in pending_steps: - jingrow.db.set_value("Press Job Step", step.name, "status", "Skipped") + jingrow.db.set_value("Jcloude Job Step", step.name, "status", "Skipped") self.end = jingrow.utils.now_datetime() self.duration = (self.end - self.start).total_seconds() self.save() @@ -113,32 +113,32 @@ class PressJob(Document): self.succeed() return - jingrow.enqueue_pg("Press Job Step", next_step, "execute", enqueue_after_commit=True) + jingrow.enqueue_pg("Jcloude Job Step", next_step, "execute", enqueue_after_commit=True) @jingrow.whitelist() def force_continue(self): for step in jingrow.get_all( - "Press Job Step", + "Jcloude Job Step", {"job": self.name, "status": ("in", ("Failure", "Skipped"))}, pluck="name", ): - jingrow.db.set_value("Press Job Step", step, "status", "Pending") + jingrow.db.set_value("Jcloude Job Step", step, "status", "Pending") self.next() @jingrow.whitelist() def force_fail(self): for step in jingrow.get_all( - "Press Job Step", + "Jcloude Job Step", {"job": self.name, "status": "Pending"}, pluck="name", ): - jingrow.db.set_value("Press Job Step", step, "status", "Failure") - jingrow.db.set_value("Press Job", self.name, "status", "Failure") + jingrow.db.set_value("Jcloude Job Step", step, "status", "Failure") + jingrow.db.set_value("Jcloude Job", self.name, "status", "Failure") @property def next_step(self): return jingrow.db.get_value( - "Press Job Step", + "Jcloude Job Step", {"job": self.name, "status": "Pending"}, "name", order_by="name asc", @@ -147,7 +147,7 @@ class PressJob(Document): def detail(self): steps = jingrow.get_all( - "Press Job Step", + "Jcloude Job Step", filters={"job": self.name}, fields=["name", "step_name", "status", "start", "end", "duration"], order_by="name asc", @@ -185,7 +185,7 @@ class PressJob(Document): return job_type = jingrow.db.get_value( - "Press Job Type", self.job_type, ["callback_script", "callback_max_retry"], as_dict=True + "Jcloude Job Type", self.job_type, ["callback_script", "callback_max_retry"], as_dict=True ) if not job_type.callback_script: self.callback_executed = True @@ -218,12 +218,12 @@ class PressJob(Document): self.save() def on_trash(self): - jingrow.db.delete("Press Job Step", {"job": self.name}) + jingrow.db.delete("Jcloude Job Step", {"job": self.name}) def fail_stuck_jcloude_jobs(): jobs = jingrow.get_all( - "Press Job", + "Jcloude Job", filters={ "status": ("in", ["Running", "Pending"]), "creation": ("<", add_days(None, -1)), @@ -232,14 +232,14 @@ def fail_stuck_jcloude_jobs(): limit=100, ) for job_name in jobs: - job = PressJob("Press Job", job_name) + job = PressJob("Jcloude Job", job_name) job.force_fail() jingrow.db.commit() def process_failed_callbacks(): jobs = jingrow.get_all( - "Press Job", + "Jcloude Job", filters={ "status": ("in", ["Success", "Failure"]), "callback_failed": True, @@ -252,7 +252,7 @@ def process_failed_callbacks(): ) for job_name in jobs: jingrow.enqueue_pg( - "Press Job", + "Jcloude Job", job_name, "process_callback", enqueue_after_commit=True, diff --git a/press/press/doctype/press_job_step/press_job_step.js b/press/press/doctype/press_job_step/press_job_step.js index f1335042..cd09cd8c 100644 --- a/press/press/doctype/press_job_step/press_job_step.js +++ b/press/press/doctype/press_job_step/press_job_step.js @@ -1,7 +1,7 @@ // Copyright (c) 2022, JINGROW // For license information, please see license.txt -jingrow.ui.form.on('Press Job Step', { +jingrow.ui.form.on('Jcloude Job Step', { // refresh: function(frm) { // } }); diff --git a/press/press/doctype/press_job_step/press_job_step.json b/press/press/doctype/press_job_step/press_job_step.json index fff57d6a..a204c7e9 100644 --- a/press/press/doctype/press_job_step/press_job_step.json +++ b/press/press/doctype/press_job_step/press_job_step.json @@ -46,7 +46,7 @@ "in_list_view": 1, "in_standard_filter": 1, "label": "Job ", - "options": "Press Job", + "options": "Jcloude Job", "read_only": 1, "reqd": 1 }, @@ -108,7 +108,7 @@ "fieldname": "job_type", "fieldtype": "Link", "label": "Job Type", - "options": "Press Job Type", + "options": "Jcloude Job Type", "reqd": 1 } ], @@ -117,8 +117,8 @@ "links": [], "modified": "2024-08-05 16:56:46.525168", "modified_by": "Administrator", - "module": "Press", - "name": "Press Job Step", + "module": "Jcloude", + "name": "Jcloude Job Step", "naming_rule": "Autoincrement", "owner": "Administrator", "permissions": [ @@ -136,12 +136,12 @@ }, { "create": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/press_job_step/press_job_step.py b/press/press/doctype/press_job_step/press_job_step.py index dd77dedd..c4bd74c4 100644 --- a/press/press/doctype/press_job_step/press_job_step.py +++ b/press/press/doctype/press_job_step/press_job_step.py @@ -41,11 +41,11 @@ class PressJobStep(Document): self.start = jingrow.utils.now_datetime() self.status = "Running" script = jingrow.db.get_value( - "Press Job Type Step", + "Jcloude Job Type Step", {"parent": self.job_type, "step_name": self.step_name}, "script", ) - job: PressJob = jingrow.get_pg("Press Job", self.job) + job: PressJob = jingrow.get_pg("Jcloude Job", self.job) arguments = json.loads(job.arguments) try: local = {"arguments": jingrow._dict(arguments), "result": None, "pg": job} diff --git a/press/press/doctype/press_job_type/press_job_type.js b/press/press/doctype/press_job_type/press_job_type.js index 43ee96e8..39b3bbd8 100644 --- a/press/press/doctype/press_job_type/press_job_type.js +++ b/press/press/doctype/press_job_type/press_job_type.js @@ -1,7 +1,7 @@ // Copyright (c) 2022, JINGROW // For license information, please see license.txt -jingrow.ui.form.on('Press Job Type', { +jingrow.ui.form.on('Jcloude Job Type', { // refresh: function(frm) { // } }); diff --git a/press/press/doctype/press_job_type/press_job_type.json b/press/press/doctype/press_job_type/press_job_type.json index 0e350db1..40ef94c7 100644 --- a/press/press/doctype/press_job_type/press_job_type.json +++ b/press/press/doctype/press_job_type/press_job_type.json @@ -16,11 +16,11 @@ "fieldname": "steps", "fieldtype": "Table", "label": "Steps", - "options": "Press Job Type Step", + "options": "Jcloude Job Type Step", "reqd": 1 }, { - "description": "The callback function will be called once Press Job reaches the terminating state [Success, Failure].", + "description": "The callback function will be called once Jcloude Job reaches the terminating state [Success, Failure].", "fieldname": "callback_script", "fieldtype": "Code", "label": "Callback Script", @@ -39,8 +39,8 @@ "links": [], "modified": "2025-07-31 13:52:28.892322", "modified_by": "Administrator", - "module": "Press", - "name": "Press Job Type", + "module": "Jcloude", + "name": "Jcloude Job Type", "naming_rule": "Set by user", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/press_job_type_step/press_job_type_step.js b/press/press/doctype/press_job_type_step/press_job_type_step.js index eaaedc97..766be444 100644 --- a/press/press/doctype/press_job_type_step/press_job_type_step.js +++ b/press/press/doctype/press_job_type_step/press_job_type_step.js @@ -1,7 +1,7 @@ // Copyright (c) 2022, JINGROW // For license information, please see license.txt -jingrow.ui.form.on('Press Job Type Step', { +jingrow.ui.form.on('Jcloude Job Type Step', { // refresh: function(frm) { // } }); diff --git a/press/press/doctype/press_job_type_step/press_job_type_step.json b/press/press/doctype/press_job_type_step/press_job_type_step.json index e46f8f73..d21203d9 100644 --- a/press/press/doctype/press_job_type_step/press_job_type_step.json +++ b/press/press/doctype/press_job_type_step/press_job_type_step.json @@ -48,8 +48,8 @@ "links": [], "modified": "2022-09-30 16:13:05.783052", "modified_by": "Administrator", - "module": "Press", - "name": "Press Job Type Step", + "module": "Jcloude", + "name": "Jcloude Job Type Step", "owner": "Administrator", "permissions": [], "sort_field": "modified", diff --git a/press/press/doctype/press_method_permission/press_method_permission.js b/press/press/doctype/press_method_permission/press_method_permission.js index dad2eced..5d546574 100644 --- a/press/press/doctype/press_method_permission/press_method_permission.js +++ b/press/press/doctype/press_method_permission/press_method_permission.js @@ -1,7 +1,7 @@ // Copyright (c) 2023, JINGROW // For license information, please see license.txt -// jingrow.ui.form.on("Press Method Permission", { +// jingrow.ui.form.on("Jcloude Method Permission", { // refresh(frm) { // }, diff --git a/press/press/doctype/press_method_permission/press_method_permission.json b/press/press/doctype/press_method_permission/press_method_permission.json index a85e09b0..409bfc6e 100644 --- a/press/press/doctype/press_method_permission/press_method_permission.json +++ b/press/press/doctype/press_method_permission/press_method_permission.json @@ -44,8 +44,8 @@ "links": [], "modified": "2023-09-25 21:33:32.729651", "modified_by": "Administrator", - "module": "Press", - "name": "Press Method Permission", + "module": "Jcloude", + "name": "Jcloude Method Permission", "owner": "Administrator", "permissions": [ { diff --git a/press/press/doctype/press_method_permission/press_method_permission.py b/press/press/doctype/press_method_permission/press_method_permission.py index fb9a96b4..a926d422 100644 --- a/press/press/doctype/press_method_permission/press_method_permission.py +++ b/press/press/doctype/press_method_permission/press_method_permission.py @@ -25,14 +25,14 @@ class PressMethodPermission(Document): def available_actions(): result = {} doctypes = jingrow.get_all( - "Press Method Permission", pluck="document_type", distinct=True + "Jcloude Method Permission", pluck="document_type", distinct=True ) for doctype in doctypes: result[doctype] = { perm["checkbox_label"]: perm["method"] for perm in jingrow.get_all( - "Press Method Permission", {"document_type": doctype}, ["checkbox_label", "method"] + "Jcloude Method Permission", {"document_type": doctype}, ["checkbox_label", "method"] ) } diff --git a/press/press/doctype/press_notification/patches/link_reference_doctype_to_notifications.py b/press/press/doctype/press_notification/patches/link_reference_doctype_to_notifications.py index d3c41351..dcb4e166 100644 --- a/press/press/doctype/press_notification/patches/link_reference_doctype_to_notifications.py +++ b/press/press/doctype/press_notification/patches/link_reference_doctype_to_notifications.py @@ -7,7 +7,7 @@ from tqdm import tqdm def execute(): notifications = jingrow.db.get_all( - "Press Notification", ["name", "document_type", "document_name"] + "Jcloude Notification", ["name", "document_type", "document_name"] ) for notification in tqdm(notifications): if notification.document_type == "Agent Job": @@ -26,7 +26,7 @@ def execute(): ) jingrow.db.set_value( - "Press Notification", + "Jcloude Notification", notification.name, {"reference_doctype": reference_doctype, "reference_name": reference_pg}, update_modified=False, diff --git a/press/press/doctype/press_notification/press_notification.js b/press/press/doctype/press_notification/press_notification.js index c581eeb9..95b8b946 100644 --- a/press/press/doctype/press_notification/press_notification.js +++ b/press/press/doctype/press_notification/press_notification.js @@ -1,7 +1,7 @@ // Copyright (c) 2023, JINGROW // For license information, please see license.txt -// jingrow.ui.form.on("Press Notification", { +// jingrow.ui.form.on("Jcloude Notification", { // refresh(frm) { // }, diff --git a/press/press/doctype/press_notification/press_notification.json b/press/press/doctype/press_notification/press_notification.json index bebfd75d..bdafcd5c 100644 --- a/press/press/doctype/press_notification/press_notification.json +++ b/press/press/doctype/press_notification/press_notification.json @@ -163,8 +163,8 @@ "links": [], "modified": "2025-10-22 11:00:39.063349", "modified_by": "Administrator", - "module": "Press", - "name": "Press Notification", + "module": "Jcloude", + "name": "Jcloude Notification", "owner": "Administrator", "permissions": [ { @@ -186,7 +186,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -197,7 +197,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/press_notification/press_notification.py b/press/press/doctype/press_notification/press_notification.py index fa718df3..018f8f66 100644 --- a/press/press/doctype/press_notification/press_notification.py +++ b/press/press/doctype/press_notification/press_notification.py @@ -100,7 +100,7 @@ class PressNotification(Document): def create_new_notification(team, type, document_type, document_name, message): - if not jingrow.db.exists("Press Notification", {"document_name": document_name}): + if not jingrow.db.exists("Jcloude Notification", {"document_name": document_name}): if document_type == "Agent Job": reference_doctype = "Site" reference_pg = jingrow.db.get_value("Agent Job", document_name, "site") @@ -113,7 +113,7 @@ def create_new_notification(team, type, document_type, document_name, message): jingrow.get_pg( { - "doctype": "Press Notification", + "doctype": "Jcloude Notification", "team": team, "type": type, "document_type": document_type, @@ -123,4 +123,4 @@ def create_new_notification(team, type, document_type, document_name, message): "reference_name": reference_pg, } ).insert() - jingrow.publish_realtime("jcloude_notification", doctype="Press Notification", message={"team": team}) + jingrow.publish_realtime("jcloude_notification", doctype="Jcloude Notification", message={"team": team}) diff --git a/press/press/doctype/press_notification/test_press_notification.py b/press/press/doctype/press_notification/test_press_notification.py index ed3d5bbf..bac97b21 100644 --- a/press/press/doctype/press_notification/test_press_notification.py +++ b/press/press/doctype/press_notification/test_press_notification.py @@ -38,7 +38,7 @@ class TestPressNotification(FrappeTestCase): site = create_test_site(bench=bench1.name) - self.assertEqual(jingrow.db.count("Press Notification"), 0) + self.assertEqual(jingrow.db.count("Jcloude Notification"), 0) with ( fake_agent_job( "Update Site Pull", @@ -52,7 +52,7 @@ class TestPressNotification(FrappeTestCase): site.schedule_update() poll_pending_jobs() - notification = jingrow.get_last_pg("Press Notification") + notification = jingrow.get_last_pg("Jcloude Notification") self.assertEqual(notification.type, "Site Update") # api test is added here since it's trivial # move to separate file if it gets more complex diff --git a/press/press/doctype/press_permission_group/press_permission_group.js b/press/press/doctype/press_permission_group/press_permission_group.js index 18a7df59..f0e0fb64 100644 --- a/press/press/doctype/press_permission_group/press_permission_group.js +++ b/press/press/doctype/press_permission_group/press_permission_group.js @@ -1,7 +1,7 @@ // Copyright (c) 2023, JINGROW // For license information, please see license.txt -// jingrow.ui.form.on("Press Permission Group", { +// jingrow.ui.form.on("Jcloude Permission Group", { // refresh(frm) { // }, diff --git a/press/press/doctype/press_permission_group/press_permission_group.json b/press/press/doctype/press_permission_group/press_permission_group.json index 7719f87a..b0d0daff 100644 --- a/press/press/doctype/press_permission_group/press_permission_group.json +++ b/press/press/doctype/press_permission_group/press_permission_group.json @@ -33,7 +33,7 @@ "fieldname": "users", "fieldtype": "Table", "label": "Users", - "options": "Press Permission Group User" + "options": "Jcloude Permission Group User" }, { "fieldname": "column_break_kbnh", @@ -53,8 +53,8 @@ "links": [], "modified": "2024-03-27 06:03:36.540752", "modified_by": "Administrator", - "module": "Press", - "name": "Press Permission Group", + "module": "Jcloude", + "name": "Jcloude Permission Group", "owner": "Administrator", "permissions": [ { @@ -77,7 +77,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -89,7 +89,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/press_permission_group/press_permission_group.py b/press/press/doctype/press_permission_group/press_permission_group.py index 56e29738..c8a8e82a 100644 --- a/press/press/doctype/press_permission_group/press_permission_group.py +++ b/press/press/doctype/press_permission_group/press_permission_group.py @@ -254,7 +254,7 @@ def get_permitted_methods(doctype: str, name: str, group_names: list | None = No def get_method_perms_for_group(doctype: str, name: str, group_name: str) -> list: - permissions = jingrow.db.get_value("Press Permission Group", group_name, "permissions") + permissions = jingrow.db.get_value("Jcloude Permission Group", group_name, "permissions") if not permissions: # this group allows all methods of all documents @@ -344,7 +344,7 @@ def get_permission_groups(user: str | None = None) -> list: user = jingrow.session.user return jingrow.get_all( - "Press Permission Group User", + "Jcloude Permission Group User", filters={"user": user}, pluck="parent", distinct=True, diff --git a/press/press/doctype/press_permission_group/test_press_permission_group.py b/press/press/doctype/press_permission_group/test_press_permission_group.py index 54a2b6fb..9c4a7011 100644 --- a/press/press/doctype/press_permission_group/test_press_permission_group.py +++ b/press/press/doctype/press_permission_group/test_press_permission_group.py @@ -16,7 +16,7 @@ class TestPressPermissionGroup(FrappeTestCase): super().setUp() jingrow.set_user("Administrator") - jingrow.db.delete("Press Permission Group") + jingrow.db.delete("Jcloude Permission Group") self.team_user = create_user("team@example.com") self.team = create_test_team(self.team_user.email) self.team_member = create_user("user123@example.com") @@ -27,8 +27,8 @@ class TestPressPermissionGroup(FrappeTestCase): def tearDown(self): jingrow.set_user("Administrator") - jingrow.delete_pg("Press Permission Group", self.perm_group.name, force=True) - jingrow.delete_pg("Press Permission Group", self.perm_group2.name, force=True) + jingrow.delete_pg("Jcloude Permission Group", self.perm_group.name, force=True) + jingrow.delete_pg("Jcloude Permission Group", self.perm_group2.name, force=True) jingrow.delete_pg("Team", self.team.name, force=True) jingrow.delete_pg("User", self.team_member.name, force=True) jingrow.delete_pg("User", self.team_user.name, force=True) @@ -139,7 +139,7 @@ class TestPressPermissionGroup(FrappeTestCase): # utils def create_permission_group(team): - pg = jingrow.new_pg("Press Permission Group") + pg = jingrow.new_pg("Jcloude Permission Group") pg.title = "Test Group" pg.team = team pg.save() diff --git a/press/press/doctype/press_permission_group_user/press_permission_group_user.json b/press/press/doctype/press_permission_group_user/press_permission_group_user.json index fc40d7de..7ac7dbaa 100644 --- a/press/press/doctype/press_permission_group_user/press_permission_group_user.json +++ b/press/press/doctype/press_permission_group_user/press_permission_group_user.json @@ -25,8 +25,8 @@ "links": [], "modified": "2023-08-07 13:21:16.669052", "modified_by": "Administrator", - "module": "Press", - "name": "Press Permission Group User", + "module": "Jcloude", + "name": "Jcloude Permission Group User", "owner": "Administrator", "permissions": [], "sort_field": "modified", diff --git a/press/press/doctype/press_role/patches/migrate_permissions.py b/press/press/doctype/press_role/patches/migrate_permissions.py index 8ab11862..f7d68141 100644 --- a/press/press/doctype/press_role/patches/migrate_permissions.py +++ b/press/press/doctype/press_role/patches/migrate_permissions.py @@ -20,14 +20,14 @@ def execute(): def migrate_group_permissions(team): groups = jingrow.qb.get_query( - "Press Permission Group", + "Jcloude Permission Group", fields=["name", "title", "team", {"users": ["user"]}], filters={"team": team}, ).run(as_dict=1) for group in groups: old_group_permissions = jingrow.get_all( - "Press User Permission", + "Jcloude User Permission", filters={"group": group.name, "type": "Group"}, fields=["document_type", "document_name"], distinct=True, @@ -36,10 +36,10 @@ def migrate_group_permissions(team): if not old_group_permissions: continue - if jingrow.db.exists("Press Role", {"title": group.title, "team": group.team}): + if jingrow.db.exists("Jcloude Role", {"title": group.title, "team": group.team}): continue - role = jingrow.new_pg("Press Role") + role = jingrow.new_pg("Jcloude Role") role.title = group.title role.team = team role.enable_billing = 1 @@ -54,7 +54,7 @@ def migrate_group_permissions(team): fieldname = perm.document_type.lower().replace(" ", "_") jingrow.get_pg( { - "doctype": "Press Role Permission", + "doctype": "Jcloude Role Permission", "role": role.name, "team": team, fieldname: perm.document_name, diff --git a/press/press/doctype/press_role/patches/to_resources.py b/press/press/doctype/press_role/patches/to_resources.py index 859594ea..e601aed1 100644 --- a/press/press/doctype/press_role/patches/to_resources.py +++ b/press/press/doctype/press_role/patches/to_resources.py @@ -8,8 +8,8 @@ def execute(): "release_group": "Release Group", } - for permission in jingrow.get_all("Press Role Permission", fields=["role", *maps.keys()]): - role = jingrow.get_pg("Press Role", permission.role) + for permission in jingrow.get_all("Jcloude Role Permission", fields=["role", *maps.keys()]): + role = jingrow.get_pg("Jcloude Role", permission.role) to_append = filter( lambda x: x.get("document_name"), map( diff --git a/press/press/doctype/press_role/press_role.js b/press/press/doctype/press_role/press_role.js index d3ca3e58..0c2ceeb1 100644 --- a/press/press/doctype/press_role/press_role.js +++ b/press/press/doctype/press_role/press_role.js @@ -1,7 +1,7 @@ // Copyright (c) 2024, JINGROW // For license information, please see license.txt -// jingrow.ui.form.on("Press Role", { +// jingrow.ui.form.on("Jcloude Role", { // refresh(frm) { // }, diff --git a/press/press/doctype/press_role/press_role.json b/press/press/doctype/press_role/press_role.json index 4d518202..aec1da20 100644 --- a/press/press/doctype/press_role/press_role.json +++ b/press/press/doctype/press_role/press_role.json @@ -57,7 +57,7 @@ "fieldname": "users", "fieldtype": "Table", "label": "Users", - "options": "Press Role User" + "options": "Jcloude Role User" }, { "fieldname": "section_break_yvqq", @@ -158,15 +158,15 @@ "fieldname": "resources", "fieldtype": "Table", "label": "Resources", - "options": "Press Role Resource" + "options": "Jcloude Role Resource" } ], "index_web_pages_for_search": 1, "links": [], "modified": "2025-12-17 21:41:40.796104", "modified_by": "hello@ssiyad.com", - "module": "Press", - "name": "Press Role", + "module": "Jcloude", + "name": "Jcloude Role", "naming_rule": "Random", "owner": "Administrator", "permissions": [ @@ -190,7 +190,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -200,7 +200,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1 } ], diff --git a/press/press/doctype/press_role/press_role.py b/press/press/doctype/press_role/press_role.py index 9aa82baa..1df844cb 100644 --- a/press/press/doctype/press_role/press_role.py +++ b/press/press/doctype/press_role/press_role.py @@ -70,14 +70,14 @@ class PressRole(Document): self.validate_duplicate_title() def validate_duplicate_title(self): - exists = jingrow.db.exists({"doctype": "Press Role", "title": self.title, "team": self.team}) + exists = jingrow.db.exists({"doctype": "Jcloude Role", "title": self.title, "team": self.team}) if self.is_new() and exists: message = _("Role with title {0} already exists in this team").format(self.title) jingrow.throw(message, jingrow.DuplicateEntryError) def add_jcloude_admin_role(self, user): user = jingrow.get_pg("User", user) - user.append_roles("Press Admin") + user.append_roles("Jcloude Admin") user.save(ignore_permissions=True) def remove_jcloude_admin_role(self, user): @@ -85,8 +85,8 @@ class PressRole(Document): return user = jingrow.get_pg("User", user) existing_roles = {d.role: d for d in user.get("roles")} - if "Press Admin" in existing_roles: - user.get("roles").remove(existing_roles["Press Admin"]) + if "Jcloude Admin" in existing_roles: + user.get("roles").remove(existing_roles["Jcloude Admin"]) user.save(ignore_permissions=True) @dashboard_whitelist() @@ -143,7 +143,7 @@ class PressRole(Document): return super().delete() def on_trash(self) -> None: - jingrow.db.delete("Account Request Press Role", {"jcloude_role": self.name}) + jingrow.db.delete("Account Request Jcloude Role", {"jcloude_role": self.name}) def create_user_resource(document: Document, _): @@ -152,7 +152,7 @@ def create_user_resource(document: Document, _): roles_enabled = bool( jingrow.db.exists( { - "doctype": "Press Role", + "doctype": "Jcloude Role", "team": get_current_team(), } ) @@ -161,7 +161,7 @@ def create_user_resource(document: Document, _): return jingrow.get_pg( { - "doctype": "Press Role", + "doctype": "Jcloude Role", "title": user + " / " + document.name, "team": team, "users": [ diff --git a/press/press/doctype/press_role/test_press_role.py b/press/press/doctype/press_role/test_press_role.py index f2db6fd0..6b0dd3ad 100644 --- a/press/press/doctype/press_role/test_press_role.py +++ b/press/press/doctype/press_role/test_press_role.py @@ -11,7 +11,7 @@ from jcloude.jcloude.doctype.team.test_team import create_test_team class TestPressRole(FrappeTestCase): def setUp(self): jingrow.set_user("Administrator") - jingrow.db.delete("Press Role") + jingrow.db.delete("Jcloude Role") self.team_user = create_user("team@example.com") self.team = create_test_team(self.team_user.email) self.team.user = "Administrator" @@ -25,8 +25,8 @@ class TestPressRole(FrappeTestCase): def tearDown(self): jingrow.set_user("Administrator") - jingrow.delete_pg("Press Role", self.perm_role.name, force=True) - jingrow.delete_pg("Press Role", self.perm_role2.name, force=True) + jingrow.delete_pg("Jcloude Role", self.perm_role.name, force=True) + jingrow.delete_pg("Jcloude Role", self.perm_role2.name, force=True) jingrow.delete_pg("Team", self.team.name, force=True) jingrow.delete_pg("User", self.team_member.name, force=True) jingrow.delete_pg("User", self.team_user.name, force=True) @@ -65,7 +65,7 @@ class TestPressRole(FrappeTestCase): # utils def create_permission_role(team, allow_site_creation=0): - pg = jingrow.new_pg("Press Role") + pg = jingrow.new_pg("Jcloude Role") pg.title = make_autoname("Test-Role-.###") pg.team = team pg.allow_site_creation = allow_site_creation diff --git a/press/press/doctype/press_role_permission/press_role_permission.js b/press/press/doctype/press_role_permission/press_role_permission.js index 28066006..9ea6bd50 100644 --- a/press/press/doctype/press_role_permission/press_role_permission.js +++ b/press/press/doctype/press_role_permission/press_role_permission.js @@ -1,7 +1,7 @@ // Copyright (c) 2024, JINGROW // For license information, please see license.txt -// jingrow.ui.form.on("Press Role Permission", { +// jingrow.ui.form.on("Jcloude Role Permission", { // refresh(frm) { // }, diff --git a/press/press/doctype/press_role_permission/press_role_permission.json b/press/press/doctype/press_role_permission/press_role_permission.json index d2294b9f..d94d2cbd 100644 --- a/press/press/doctype/press_role_permission/press_role_permission.json +++ b/press/press/doctype/press_role_permission/press_role_permission.json @@ -30,7 +30,7 @@ "fieldtype": "Link", "in_list_view": 1, "label": "Role", - "options": "Press Role", + "options": "Jcloude Role", "reqd": 1 }, { @@ -58,8 +58,8 @@ "links": [], "modified": "2025-03-17 12:39:57.349710", "modified_by": "Administrator", - "module": "Press", - "name": "Press Role Permission", + "module": "Jcloude", + "name": "Jcloude Role Permission", "owner": "Administrator", "permissions": [ { @@ -82,7 +82,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -94,7 +94,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/press_role_permission/press_role_permission.py b/press/press/doctype/press_role_permission/press_role_permission.py index 3b521b77..1ff4d2ad 100644 --- a/press/press/doctype/press_role_permission/press_role_permission.py +++ b/press/press/doctype/press_role_permission/press_role_permission.py @@ -35,7 +35,7 @@ class PressRolePermission(Document): jingrow.throw("Only the team owner or admin can create role permissions") if jingrow.db.exists( - "Press Role Permission", + "Jcloude Role Permission", { "role": self.role, "team": self.team, @@ -68,13 +68,13 @@ def is_user_part_of_admin_role(user: str | None = None) -> bool: team = get_current_team() admin_roles = jingrow.get_all( - "Press Role", + "Jcloude Role", filters={"team": team, "admin_access": 1}, fields=["name"], ) users = jingrow.get_all( - "Press Role User", + "Jcloude Role User", filters={"parent": ["in", [role.name for role in admin_roles]], "user": user}, fields=["name"], ) diff --git a/press/press/doctype/press_role_resource/press_role_resource.json b/press/press/doctype/press_role_resource/press_role_resource.json index e3f0ef3f..85f78a10 100644 --- a/press/press/doctype/press_role_resource/press_role_resource.json +++ b/press/press/doctype/press_role_resource/press_role_resource.json @@ -33,8 +33,8 @@ "links": [], "modified": "2025-12-17 21:40:04.499256", "modified_by": "hello@ssiyad.com", - "module": "Press", - "name": "Press Role Resource", + "module": "Jcloude", + "name": "Jcloude Role Resource", "owner": "Administrator", "permissions": [], "row_format": "Dynamic", diff --git a/press/press/doctype/press_role_user/press_role_user.json b/press/press/doctype/press_role_user/press_role_user.json index 10496124..2e7a5540 100644 --- a/press/press/doctype/press_role_user/press_role_user.json +++ b/press/press/doctype/press_role_user/press_role_user.json @@ -39,8 +39,8 @@ "links": [], "modified": "2024-05-13 12:25:17.802189", "modified_by": "Administrator", - "module": "Press", - "name": "Press Role User", + "module": "Jcloude", + "name": "Jcloude Role User", "owner": "Administrator", "permissions": [], "sort_field": "modified", diff --git a/press/press/doctype/press_settings/patches/move_stripe_credentials_to_press_settings.py b/press/press/doctype/press_settings/patches/move_stripe_credentials_to_press_settings.py index 2b1490d6..7c38388b 100644 --- a/press/press/doctype/press_settings/patches/move_stripe_credentials_to_press_settings.py +++ b/press/press/doctype/press_settings/patches/move_stripe_credentials_to_press_settings.py @@ -4,7 +4,7 @@ import jingrow def execute(): from jingrow.utils.password import get_decrypted_password, set_encrypted_password - stripe_account = jingrow.db.get_single_value("Press Settings", "stripe_account") + stripe_account = jingrow.db.get_single_value("Jcloude Settings", "stripe_account") # Fetch credentials from "Stripe Settings" doctype secret_key = get_decrypted_password("Stripe Settings", stripe_account, "secret_key") @@ -12,10 +12,10 @@ def execute(): "Stripe Settings", stripe_account, "publishable_key" ) - jingrow.reload_doctype("Press Settings") + jingrow.reload_doctype("Jcloude Settings") - # Set credentials in Press Settings - jingrow.db.set_single_value("Press Settings", "stripe_publishable_key", publishable_key) + # Set credentials in Jcloude Settings + jingrow.db.set_single_value("Jcloude Settings", "stripe_publishable_key", publishable_key) set_encrypted_password( - "Press Settings", "Press Settings", secret_key, "stripe_secret_key" + "Jcloude Settings", "Jcloude Settings", secret_key, "stripe_secret_key" ) diff --git a/press/press/doctype/press_settings/patches/set_minimum_rebuild_memory.py b/press/press/doctype/press_settings/patches/set_minimum_rebuild_memory.py index c5016a50..afb89b8b 100644 --- a/press/press/doctype/press_settings/patches/set_minimum_rebuild_memory.py +++ b/press/press/doctype/press_settings/patches/set_minimum_rebuild_memory.py @@ -11,8 +11,8 @@ if typing.TYPE_CHECKING: def execute(): - jingrow.reload_doctype("Press Settings") - settings: PressSettings = jingrow.get_single("Press Settings") + jingrow.reload_doctype("Jcloude Settings") + settings: PressSettings = jingrow.get_single("Jcloude Settings") if not settings.minimum_rebuild_memory: settings.minimum_rebuild_memory = 2 diff --git a/press/press/doctype/press_settings/patches/set_press_monitoring_password.py b/press/press/doctype/press_settings/patches/set_press_monitoring_password.py index 780f73b9..75e8ac0e 100644 --- a/press/press/doctype/press_settings/patches/set_press_monitoring_password.py +++ b/press/press/doctype/press_settings/patches/set_press_monitoring_password.py @@ -2,8 +2,8 @@ import jingrow def execute(): - jingrow.reload_doctype("Press Settings") - settings = jingrow.get_single("Press Settings") + jingrow.reload_doctype("Jcloude Settings") + settings = jingrow.get_single("Jcloude Settings") try: settings.get_password("jcloude_monitoring_password") except jingrow.AuthenticationError: diff --git a/press/press/doctype/press_settings/patches/set_redis_cache_size.py b/press/press/doctype/press_settings/patches/set_redis_cache_size.py index 89f60f31..8d019652 100644 --- a/press/press/doctype/press_settings/patches/set_redis_cache_size.py +++ b/press/press/doctype/press_settings/patches/set_redis_cache_size.py @@ -3,8 +3,8 @@ from jingrow.core.utils import find def execute(): - jingrow.reload_doctype("Press Settings") - settings = jingrow.get_single("Press Settings") + jingrow.reload_doctype("Jcloude Settings") + settings = jingrow.get_single("Jcloude Settings") if not settings.redis_cache_size: redis_cache_size_field = find(settings.meta.fields, lambda x: x.fieldname == "redis_cache_size") settings.redis_cache_size = redis_cache_size_field.default diff --git a/press/press/doctype/press_settings/press_settings.js b/press/press/doctype/press_settings/press_settings.js index ef92cf46..2a7c51ec 100644 --- a/press/press/doctype/press_settings/press_settings.js +++ b/press/press/doctype/press_settings/press_settings.js @@ -1,7 +1,7 @@ // Copyright (c) 2020, JINGROW // For license information, please see license.txt -jingrow.ui.form.on('Press Settings', { +jingrow.ui.form.on('Jcloude Settings', { create_stripe_webhook(frm) { frm.call('create_stripe_webhook'); }, diff --git a/press/press/doctype/press_settings/press_settings.json b/press/press/doctype/press_settings/press_settings.json index d3e1ae94..87e8f7d5 100644 --- a/press/press/doctype/press_settings/press_settings.json +++ b/press/press/doctype/press_settings/press_settings.json @@ -1023,7 +1023,7 @@ { "fieldname": "jcloude_monitoring_password", "fieldtype": "Password", - "label": "Press Monitoring Password" + "label": "Jcloude Monitoring Password" }, { "description": "Adds this script to app_include_js via site config. Used for in-site billing", @@ -1290,7 +1290,7 @@ { "fieldname": "jcloude_trial_plan", "fieldtype": "Link", - "label": "Press Trial Plan", + "label": "Jcloude Trial Plan", "options": "Site Plan" }, { @@ -1570,8 +1570,8 @@ "links": [], "modified": "2025-12-09 00:06:25.213870", "modified_by": "Administrator", - "module": "Press", - "name": "Press Settings", + "module": "Jcloude", + "name": "Jcloude Settings", "owner": "Administrator", "permissions": [ { diff --git a/press/press/doctype/press_settings/press_settings.py b/press/press/doctype/press_settings/press_settings.py index 9517aeda..db433f58 100644 --- a/press/press/doctype/press_settings/press_settings.py +++ b/press/press/doctype/press_settings/press_settings.py @@ -285,8 +285,8 @@ class PressSettings(Document): def is_offsite_setup(cls): return any( jingrow.db.get_value( - "Press Settings", - "Press Settings", + "Jcloude Settings", + "Jcloude Settings", ["aws_s3_bucket", "offsite_backups_access_key_id"], ) ) diff --git a/press/press/doctype/press_settings/test_press_settings.py b/press/press/doctype/press_settings/test_press_settings.py index b8d23f79..61c22fe1 100644 --- a/press/press/doctype/press_settings/test_press_settings.py +++ b/press/press/doctype/press_settings/test_press_settings.py @@ -34,7 +34,7 @@ def create_test_jcloude_settings(): } ).insert(ignore_if_duplicate=True) - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") settings.domain = "fc.dev" settings.bench_configuration = "{}" settings.rsa_key_size = 2048 diff --git a/press/press/doctype/press_tag/press_tag.js b/press/press/doctype/press_tag/press_tag.js index a09ad346..c5e6fda3 100644 --- a/press/press/doctype/press_tag/press_tag.js +++ b/press/press/doctype/press_tag/press_tag.js @@ -1,7 +1,7 @@ // Copyright (c) 2023, JINGROW // For license information, please see license.txt -// jingrow.ui.form.on("Press Tag", { +// jingrow.ui.form.on("Jcloude Tag", { // refresh(frm) { // }, diff --git a/press/press/doctype/press_tag/press_tag.json b/press/press/doctype/press_tag/press_tag.json index c6484409..371ec864 100644 --- a/press/press/doctype/press_tag/press_tag.json +++ b/press/press/doctype/press_tag/press_tag.json @@ -36,8 +36,8 @@ "links": [], "modified": "2024-05-30 13:40:56.625943", "modified_by": "Administrator", - "module": "Press", - "name": "Press Tag", + "module": "Jcloude", + "name": "Jcloude Tag", "owner": "Administrator", "permissions": [ { @@ -60,7 +60,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -72,7 +72,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/press_tag/test_press_tag.py b/press/press/doctype/press_tag/test_press_tag.py index 1ca5e2ce..06b9aaef 100644 --- a/press/press/doctype/press_tag/test_press_tag.py +++ b/press/press/doctype/press_tag/test_press_tag.py @@ -10,7 +10,7 @@ from jcloude.jcloude.doctype.team.test_team import create_test_team def create_and_add_test_tag(name: str, doctype: str, tag: str = "test_tag"): test_tag = jingrow.get_pg( { - "doctype": "Press Tag", + "doctype": "Jcloude Tag", "doctype_name": doctype, "team": create_test_team().name, "tag": tag, diff --git a/press/press/doctype/press_user_permission/press_user_permission.js b/press/press/doctype/press_user_permission/press_user_permission.js index 70ae6caa..9fd534ef 100644 --- a/press/press/doctype/press_user_permission/press_user_permission.js +++ b/press/press/doctype/press_user_permission/press_user_permission.js @@ -1,7 +1,7 @@ // Copyright (c) 2023, JINGROW // For license information, please see license.txt -// jingrow.ui.form.on("Press User Permission", { +// jingrow.ui.form.on("Jcloude User Permission", { // refresh(frm) { // }, diff --git a/press/press/doctype/press_user_permission/press_user_permission.json b/press/press/doctype/press_user_permission/press_user_permission.json index 4335b705..6ca31b61 100644 --- a/press/press/doctype/press_user_permission/press_user_permission.json +++ b/press/press/doctype/press_user_permission/press_user_permission.json @@ -72,7 +72,7 @@ "fieldname": "group", "fieldtype": "Link", "label": "Group", - "options": "Press Permission Group" + "options": "Jcloude Permission Group" }, { "depends_on": "eval: pg.type == 'Config';", @@ -85,8 +85,8 @@ "links": [], "modified": "2023-12-15 15:48:28.325993", "modified_by": "Administrator", - "module": "Press", - "name": "Press User Permission", + "module": "Jcloude", + "name": "Jcloude User Permission", "owner": "Administrator", "permissions": [ { diff --git a/press/press/doctype/press_user_permission/press_user_permission.py b/press/press/doctype/press_user_permission/press_user_permission.py index 84f69482..6986e46c 100644 --- a/press/press/doctype/press_user_permission/press_user_permission.py +++ b/press/press/doctype/press_user_permission/press_user_permission.py @@ -42,11 +42,11 @@ def has_user_permission(pg: str, name: str, action: str, groups: list | None = N allowed = False if not groups: - groups = jingrow.get_all("Press Permission Group User", {"user": user}, pluck="parent") + groups = jingrow.get_all("Jcloude Permission Group User", {"user": user}, pluck="parent") # part of a group with access if jingrow.db.exists( - "Press User Permission", + "Jcloude User Permission", { "type": "Group", "group": ("in", groups), @@ -59,7 +59,7 @@ def has_user_permission(pg: str, name: str, action: str, groups: list | None = N # user has granular perm access if jingrow.db.exists( - "Press User Permission", + "Jcloude User Permission", { "type": "User", "user": user, @@ -72,7 +72,7 @@ def has_user_permission(pg: str, name: str, action: str, groups: list | None = N # has config perm access config = jingrow.db.get_value( - "Press User Permission", {"user": user, "type": "Config"}, "config", as_dict=True + "Jcloude User Permission", {"user": user, "type": "Config"}, "config", as_dict=True ) if config: allowed = check_config_perm(jingrow.parse_json(config["config"]), pg, name, action, allowed) diff --git a/press/press/doctype/press_user_permission/test_press_user_permission.py b/press/press/doctype/press_user_permission/test_press_user_permission.py index a19b4ab6..8f487676 100644 --- a/press/press/doctype/press_user_permission/test_press_user_permission.py +++ b/press/press/doctype/press_user_permission/test_press_user_permission.py @@ -26,7 +26,7 @@ class TestPressUserPermission(FrappeTestCase): self.assertFalse(has_user_permission("Site", self.site.name, "jcloude.api.site.login")) jingrow.get_pg( - doctype="Press User Permission", + doctype="Jcloude User Permission", type="User", user=jingrow.session.user, document_type="Site", @@ -38,12 +38,12 @@ class TestPressUserPermission(FrappeTestCase): self.assertFalse(has_user_permission("Site", self.site.name, "jcloude.api.site.migrate")) def test_jcloude_group_permission(self): - group = jingrow.get_pg(doctype="Press Permission Group", team=self.team.name, title="Test Group") + group = jingrow.get_pg(doctype="Jcloude Permission Group", team=self.team.name, title="Test Group") group.append("users", {"user": jingrow.session.user}) group.insert(ignore_permissions=True) jingrow.get_pg( - doctype="Press User Permission", + doctype="Jcloude User Permission", type="Group", group=group.name, document_type="Site", @@ -66,7 +66,7 @@ class TestPressUserPermission(FrappeTestCase): "restricted": {"Site": {"test.jingrow.dev": "jcloude.api.site.migrate"}}, } jingrow.get_pg( - doctype="Press User Permission", + doctype="Jcloude User Permission", type="Config", config=jingrow.as_json(perms), user=jingrow.session.user, diff --git a/press/press/doctype/press_webhook/press_webhook.js b/press/press/doctype/press_webhook/press_webhook.js index 6a1ac0b9..7ce10433 100644 --- a/press/press/doctype/press_webhook/press_webhook.js +++ b/press/press/doctype/press_webhook/press_webhook.js @@ -1,7 +1,7 @@ // Copyright (c) 2024, JINGROW // For license information, please see license.txt -jingrow.ui.form.on('Press Webhook', { +jingrow.ui.form.on('Jcloude Webhook', { refresh(frm) { let webhook = frm.get_pg(); diff --git a/press/press/doctype/press_webhook/press_webhook.json b/press/press/doctype/press_webhook/press_webhook.json index 46a7f4e9..af361dd8 100644 --- a/press/press/doctype/press_webhook/press_webhook.json +++ b/press/press/doctype/press_webhook/press_webhook.json @@ -36,7 +36,7 @@ "fieldname": "events", "fieldtype": "Table", "label": "Events", - "options": "Press Webhook Selected Event", + "options": "Jcloude Webhook Selected Event", "reqd": 1 }, { @@ -59,8 +59,8 @@ "links": [], "modified": "2024-09-23 15:06:57.848414", "modified_by": "Administrator", - "module": "Press", - "name": "Press Webhook", + "module": "Jcloude", + "name": "Jcloude Webhook", "owner": "Administrator", "permissions": [ { @@ -83,7 +83,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 } diff --git a/press/press/doctype/press_webhook/press_webhook.py b/press/press/doctype/press_webhook/press_webhook.py index ae3cda30..d293462a 100644 --- a/press/press/doctype/press_webhook/press_webhook.py +++ b/press/press/doctype/press_webhook/press_webhook.py @@ -40,13 +40,13 @@ class PressWebhook(Document): team: DF.Link # end: auto-generated types - DOCTYPE = "Press Webhook" + DOCTYPE = "Jcloude Webhook" dashboard_fields = ("enabled", "endpoint", "events") @role_guard.action() def validate(self): # maximum 5 webhooks per team - if self.is_new() and jingrow.db.count("Press Webhook", {"team": self.team}) > 5: + if self.is_new() and jingrow.db.count("Jcloude Webhook", {"team": self.team}) > 5: jingrow.throw("You have reached the maximum number of webhooks per team") if self.has_value_changed("endpoint"): @@ -58,7 +58,7 @@ class PressWebhook(Document): self.validate_endpoint_url_format() # check for duplicate webhooks webhooks = jingrow.get_all( - "Press Webhook", + "Jcloude Webhook", filters={"team": self.team, "endpoint": self.endpoint, "name": ("!=", self.name)}, pluck="name", ) @@ -165,7 +165,7 @@ class PressWebhook(Document): @dashboard_whitelist() def delete(self): jingrow.db.sql("delete from `tabPress Webhook Attempt` where webhook = %s", (self.name,)) - jingrow.delete_pg("Press Webhook", self.name) + jingrow.delete_pg("Jcloude Webhook", self.name) get_permission_query_conditions = get_permission_query_conditions_for_doctype("Site") @@ -184,7 +184,7 @@ HAVING (COUNT(CASE WHEN `status` = 'Failed' THEN 1 END) / COUNT(*)) * 100 > 70; as_dict=True, ) endpoints = [row.endpoint for row in data] - pg_names = jingrow.get_all("Press Webhook", filters={"endpoint": ("in", endpoints)}, pluck="name") + pg_names = jingrow.get_all("Jcloude Webhook", filters={"endpoint": ("in", endpoints)}, pluck="name") for pg_name in pg_names: - pg = jingrow.get_pg("Press Webhook", pg_name) + pg = jingrow.get_pg("Jcloude Webhook", pg_name) pg.disable_and_notify() diff --git a/press/press/doctype/press_webhook_attempt/press_webhook_attempt.js b/press/press/doctype/press_webhook_attempt/press_webhook_attempt.js index fe112686..13220a1a 100644 --- a/press/press/doctype/press_webhook_attempt/press_webhook_attempt.js +++ b/press/press/doctype/press_webhook_attempt/press_webhook_attempt.js @@ -1,7 +1,7 @@ // Copyright (c) 2024, JINGROW // For license information, please see license.txt -// jingrow.ui.form.on("Press Webhook Attempt", { +// jingrow.ui.form.on("Jcloude Webhook Attempt", { // refresh(frm) { // }, diff --git a/press/press/doctype/press_webhook_attempt/press_webhook_attempt.json b/press/press/doctype/press_webhook_attempt/press_webhook_attempt.json index 78983931..5c1af0dd 100644 --- a/press/press/doctype/press_webhook_attempt/press_webhook_attempt.json +++ b/press/press/doctype/press_webhook_attempt/press_webhook_attempt.json @@ -22,7 +22,7 @@ "fieldtype": "Link", "in_list_view": 1, "label": "Webhook", - "options": "Press Webhook", + "options": "Jcloude Webhook", "reqd": 1 }, { @@ -85,8 +85,8 @@ "links": [], "modified": "2024-09-25 10:59:44.304591", "modified_by": "Administrator", - "module": "Press", - "name": "Press Webhook Attempt", + "module": "Jcloude", + "name": "Jcloude Webhook Attempt", "owner": "Administrator", "permissions": [], "sort_field": "creation", diff --git a/press/press/doctype/press_webhook_attempt/press_webhook_attempt.py b/press/press/doctype/press_webhook_attempt/press_webhook_attempt.py index 31aa6aef..771dd504 100644 --- a/press/press/doctype/press_webhook_attempt/press_webhook_attempt.py +++ b/press/press/doctype/press_webhook_attempt/press_webhook_attempt.py @@ -31,4 +31,4 @@ class PressWebhookAttempt(Document): def has_permission(pg, ptype, user): if ptype != "read": return False - return jingrow.get_pg("Press Webhook", pg.webhook).has_permission("read", user) + return jingrow.get_pg("Jcloude Webhook", pg.webhook).has_permission("read", user) diff --git a/press/press/doctype/press_webhook_event/press_webhook_event.js b/press/press/doctype/press_webhook_event/press_webhook_event.js index 0c330a4a..d3e0802f 100644 --- a/press/press/doctype/press_webhook_event/press_webhook_event.js +++ b/press/press/doctype/press_webhook_event/press_webhook_event.js @@ -1,7 +1,7 @@ // Copyright (c) 2024, JINGROW // For license information, please see license.txt -// jingrow.ui.form.on("Press Webhook Event", { +// jingrow.ui.form.on("Jcloude Webhook Event", { // refresh(frm) { // }, diff --git a/press/press/doctype/press_webhook_event/press_webhook_event.json b/press/press/doctype/press_webhook_event/press_webhook_event.json index 6b01b96d..0e90fc4d 100644 --- a/press/press/doctype/press_webhook_event/press_webhook_event.json +++ b/press/press/doctype/press_webhook_event/press_webhook_event.json @@ -37,8 +37,8 @@ "links": [], "modified": "2024-09-18 15:21:38.898742", "modified_by": "Administrator", - "module": "Press", - "name": "Press Webhook Event", + "module": "Jcloude", + "name": "Jcloude Webhook Event", "naming_rule": "By fieldname", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/press_webhook_event/press_webhook_event.py b/press/press/doctype/press_webhook_event/press_webhook_event.py index 8ba777f7..5beb35a8 100644 --- a/press/press/doctype/press_webhook_event/press_webhook_event.py +++ b/press/press/doctype/press_webhook_event/press_webhook_event.py @@ -19,5 +19,5 @@ class PressWebhookEvent(Document): title: DF.Data # end: auto-generated types - DOCTYPE = "Press Webhook Event" + DOCTYPE = "Jcloude Webhook Event" dashboard_fields = ("name", "description") diff --git a/press/press/doctype/press_webhook_log/press_webhook_log.js b/press/press/doctype/press_webhook_log/press_webhook_log.js index 1f7adef1..485f1ab8 100644 --- a/press/press/doctype/press_webhook_log/press_webhook_log.js +++ b/press/press/doctype/press_webhook_log/press_webhook_log.js @@ -1,7 +1,7 @@ // Copyright (c) 2024, JINGROW // For license information, please see license.txt -// jingrow.ui.form.on("Press Webhook Log", { +// jingrow.ui.form.on("Jcloude Webhook Log", { // refresh(frm) { // }, diff --git a/press/press/doctype/press_webhook_log/press_webhook_log.json b/press/press/doctype/press_webhook_log/press_webhook_log.json index 6564c1eb..82964097 100644 --- a/press/press/doctype/press_webhook_log/press_webhook_log.json +++ b/press/press/doctype/press_webhook_log/press_webhook_log.json @@ -32,7 +32,7 @@ "fieldtype": "Link", "in_list_view": 1, "label": "Event", - "options": "Press Webhook Event", + "options": "Jcloude Webhook Event", "reqd": 1 }, { @@ -84,15 +84,15 @@ "fieldname": "attempts", "fieldtype": "Table", "label": "Attempts", - "options": "Press Webhook Attempt" + "options": "Jcloude Webhook Attempt" } ], "index_web_pages_for_search": 1, "links": [], "modified": "2024-09-25 16:11:01.102311", "modified_by": "Administrator", - "module": "Press", - "name": "Press Webhook Log", + "module": "Jcloude", + "name": "Jcloude Webhook Log", "owner": "Administrator", "permissions": [ { diff --git a/press/press/doctype/press_webhook_log/press_webhook_log.py b/press/press/doctype/press_webhook_log/press_webhook_log.py index b3bed382..6034fa8d 100644 --- a/press/press/doctype/press_webhook_log/press_webhook_log.py +++ b/press/press/doctype/press_webhook_log/press_webhook_log.py @@ -92,8 +92,8 @@ class PressWebhookLog(Document): def _process_webhook_call(self): try: - PressWebhookSelectedEvent = jingrow.qb.DocType("Press Webhook Selected Event") - PressWebhook = jingrow.qb.DocType("Press Webhook") + PressWebhookSelectedEvent = jingrow.qb.DocType("Jcloude Webhook Selected Event") + PressWebhook = jingrow.qb.DocType("Jcloude Webhook") query = ( jingrow.qb.from_(PressWebhookSelectedEvent) .select(PressWebhook.name, PressWebhook.endpoint, PressWebhook.secret) @@ -152,7 +152,7 @@ class PressWebhookLog(Document): for webhook in webhooks_to_retry: webhook_data = jingrow.get_value( - "Press Webhook", record.webhook, ["endpoint", "secret"], as_dict=True + "Jcloude Webhook", record.webhook, ["endpoint", "secret"], as_dict=True ) is_sent = self._send_webhook_call( webhook, @@ -175,12 +175,12 @@ class PressWebhookLog(Document): self.save() -get_permission_query_conditions = get_permission_query_conditions_for_doctype("Press Webhook Log") +get_permission_query_conditions = get_permission_query_conditions_for_doctype("Jcloude Webhook Log") def process(): records = jingrow.get_all( - "Press Webhook Log", + "Jcloude Webhook Log", filters={ "status": ["in", ["Pending", "Failed", "Partially Sent"]], "retries": ["<=", 3], @@ -190,11 +190,11 @@ def process(): limit=100, ) # set status of these records to Queued - jingrow.db.set_value("Press Webhook Log", {"name": ("in", records)}, "status", "Queued") + jingrow.db.set_value("Jcloude Webhook Log", {"name": ("in", records)}, "status", "Queued") # enqueue these records for record in records: jingrow.enqueue_pg( - "Press Webhook Log", + "Jcloude Webhook Log", record, method="send", queue="default", @@ -205,6 +205,6 @@ def process(): def clean_logs_older_than_24_hours(): names = jingrow.get_all( - "Press Webhook Log", filters={"creation": ["<", jingrow.utils.add_days(None, -1)]}, pluck="name" + "Jcloude Webhook Log", filters={"creation": ["<", jingrow.utils.add_days(None, -1)]}, pluck="name" ) - jingrow.delete_pg("Press Webhook Log", names) + jingrow.delete_pg("Jcloude Webhook Log", names) diff --git a/press/press/doctype/press_webhook_selected_event/press_webhook_selected_event.json b/press/press/doctype/press_webhook_selected_event/press_webhook_selected_event.json index 321cf625..7ddac8ee 100644 --- a/press/press/doctype/press_webhook_selected_event/press_webhook_selected_event.json +++ b/press/press/doctype/press_webhook_selected_event/press_webhook_selected_event.json @@ -14,7 +14,7 @@ "fieldtype": "Link", "in_list_view": 1, "label": "Event", - "options": "Press Webhook Event", + "options": "Jcloude Webhook Event", "reqd": 1 } ], @@ -23,8 +23,8 @@ "links": [], "modified": "2024-09-18 15:22:11.876264", "modified_by": "Administrator", - "module": "Press", - "name": "Press Webhook Selected Event", + "module": "Jcloude", + "name": "Jcloude Webhook Selected Event", "owner": "Administrator", "permissions": [], "sort_field": "creation", diff --git a/press/press/doctype/process_snapshot/process_snapshot.json b/press/press/doctype/process_snapshot/process_snapshot.json index 7ce49c98..3324a2bf 100644 --- a/press/press/doctype/process_snapshot/process_snapshot.json +++ b/press/press/doctype/process_snapshot/process_snapshot.json @@ -38,7 +38,7 @@ "links": [], "modified": "2025-04-08 16:43:12.154769", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Process Snapshot", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.json b/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.json index 472327cd..5a6c5657 100644 --- a/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.json +++ b/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.json @@ -162,8 +162,8 @@ { "fieldname": "jcloude_job_type", "fieldtype": "Link", - "label": "Press Job Type", - "options": "Press Job Type" + "label": "Jcloude Job Type", + "options": "Jcloude Job Type" }, { "fieldname": "column_break_oetk", @@ -198,7 +198,7 @@ ], "modified": "2025-12-18 21:04:16.605761", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Prometheus Alert Rule", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.py b/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.py index 93e71b3d..1edf0447 100644 --- a/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.py +++ b/press/press/doctype/prometheus_alert_rule/prometheus_alert_rule.py @@ -82,7 +82,7 @@ class PrometheusAlertRule(Document): rules = yaml.dump(self.get_rules()) routes = yaml.dump(self.get_routes()) - monitoring_server = jingrow.db.get_single_value("Press Settings", "monitor_server") + monitoring_server = jingrow.db.get_single_value("Jcloude Settings", "monitor_server") agent = Agent(monitoring_server, "Monitor Server") agent.update_monitor_rules(rules, routes) @@ -98,7 +98,7 @@ class PrometheusAlertRule(Document): def get_routes(self): webhook_token = jingrow.db.get_value( - "Monitor Server", jingrow.db.get_single_value("Press Settings", "monitor_server"), "webhook_token" + "Monitor Server", jingrow.db.get_single_value("Jcloude Settings", "monitor_server"), "webhook_token" ) callback_url = jingrow.utils.get_url("api/method/jcloude.api.monitoring.alert") @@ -143,7 +143,7 @@ class PrometheusAlertRule(Document): arguments.update({"labels": labels}) if existing_jobs := jingrow.get_all( - "Press Job", + "Jcloude Job", { "status": ("in", ["Pending", "Running"]), "server_type": server_type, @@ -151,11 +151,11 @@ class PrometheusAlertRule(Document): }, pluck="name", ): - return jingrow.get_pg("Press Job", existing_jobs[0]) + return jingrow.get_pg("Jcloude Job", existing_jobs[0]) return jingrow.get_pg( { - "doctype": "Press Job", + "doctype": "Jcloude Job", "job_type": job_name, "server_type": server_type, "server": server_name, diff --git a/press/press/doctype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.json b/press/press/doctype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.json index 9853c29c..3da2666e 100644 --- a/press/press/doctype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.json +++ b/press/press/doctype/prometheus_alert_rule_cluster/prometheus_alert_rule_cluster.json @@ -23,7 +23,7 @@ "links": [], "modified": "2024-05-24 16:31:37.894227", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Prometheus Alert Rule Cluster", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/proxy_failover/proxy_failover.json b/press/press/doctype/proxy_failover/proxy_failover.json index 7bfdcf46..8e5f2f29 100644 --- a/press/press/doctype/proxy_failover/proxy_failover.json +++ b/press/press/doctype/proxy_failover/proxy_failover.json @@ -72,7 +72,7 @@ "links": [], "modified": "2025-12-01 13:06:24.336533", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Proxy Failover", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/proxy_failover_steps/proxy_failover_steps.json b/press/press/doctype/proxy_failover_steps/proxy_failover_steps.json index 059a6b9a..8490b0d1 100644 --- a/press/press/doctype/proxy_failover_steps/proxy_failover_steps.json +++ b/press/press/doctype/proxy_failover_steps/proxy_failover_steps.json @@ -62,7 +62,7 @@ "links": [], "modified": "2025-11-28 11:20:48.651264", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Proxy Failover Steps", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/proxy_server/proxy_server.json b/press/press/doctype/proxy_server/proxy_server.json index b0e07bdb..3b802c92 100644 --- a/press/press/doctype/proxy_server/proxy_server.json +++ b/press/press/doctype/proxy_server/proxy_server.json @@ -470,7 +470,7 @@ "links": [], "modified": "2025-11-24 13:00:59.569565", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Proxy Server", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/proxy_server/proxy_server.py b/press/press/doctype/proxy_server/proxy_server.py index d0f0cde8..c74bfb12 100644 --- a/press/press/doctype/proxy_server/proxy_server.py +++ b/press/press/doctype/proxy_server/proxy_server.py @@ -98,7 +98,7 @@ class ProxyServer(BaseServer): certificate = jingrow.get_pg("TLS Certificate", certificate_name) monitoring_password = jingrow.get_pg("Cluster", self.cluster).get_password("monitoring_password") - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if log_server: kibana_password = jingrow.get_pg("Log Server", log_server).get_password("kibana_password") else: @@ -163,7 +163,7 @@ class ProxyServer(BaseServer): def _setup_ssh_proxy(self): settings = jingrow.db.get_value( - "Press Settings", + "Jcloude Settings", None, ["docker_registry_url", "docker_registry_username", "docker_registry_password"], as_dict=True, diff --git a/press/press/doctype/proxy_server_domain/proxy_server_domain.json b/press/press/doctype/proxy_server_domain/proxy_server_domain.json index 1c1a22b1..8f47720e 100644 --- a/press/press/doctype/proxy_server_domain/proxy_server_domain.json +++ b/press/press/doctype/proxy_server_domain/proxy_server_domain.json @@ -30,7 +30,7 @@ "links": [], "modified": "2023-07-24 21:41:33.648896", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Proxy Server Domain", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/razorpay_payment_record/razorpay_payment_record.json b/press/press/doctype/razorpay_payment_record/razorpay_payment_record.json index 38674520..370b7d96 100644 --- a/press/press/doctype/razorpay_payment_record/razorpay_payment_record.json +++ b/press/press/doctype/razorpay_payment_record/razorpay_payment_record.json @@ -71,7 +71,7 @@ "links": [], "modified": "2025-01-05 22:06:31.980472", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Razorpay Payment Record", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.json b/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.json index f69735c2..e2e722a4 100644 --- a/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.json +++ b/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.json @@ -38,7 +38,7 @@ "links": [], "modified": "2022-01-19 22:51:03.279573", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Razorpay Webhook Log", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.py b/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.py index 96422e9a..74dc80e6 100644 --- a/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.py +++ b/press/press/doctype/razorpay_webhook_log/razorpay_webhook_log.py @@ -40,7 +40,7 @@ def razorpay_authorized_payment_handler(): try: payload = jingrow.request.get_data() signature = jingrow.get_request_header("X-Razorpay-Signature") - webhook_secret = jingrow.db.get_single_value("Press Settings", "razorpay_webhook_secret") + webhook_secret = jingrow.db.get_single_value("Jcloude Settings", "razorpay_webhook_secret") entity_data = form_dict["payload"]["payment"]["entity"] client.utility.verify_webhook_signature(payload.decode(), signature, webhook_secret) @@ -101,7 +101,7 @@ def razorpay_webhook_handler(): try: payload = jingrow.request.get_data() signature = jingrow.get_request_header("X-Razorpay-Signature") - webhook_secret = jingrow.db.get_single_value("Press Settings", "razorpay_webhook_secret") + webhook_secret = jingrow.db.get_single_value("Jcloude Settings", "razorpay_webhook_secret") client.utility.verify_webhook_signature(payload.decode(), signature, webhook_secret) diff --git a/press/press/doctype/region/region.json b/press/press/doctype/region/region.json index f3689b80..cafa7dc3 100644 --- a/press/press/doctype/region/region.json +++ b/press/press/doctype/region/region.json @@ -30,7 +30,7 @@ "links": [], "modified": "2021-04-30 13:05:32.560491", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Region", "name_case": "Title Case", "owner": "Administrator", diff --git a/press/press/doctype/registry_server/registry_server.json b/press/press/doctype/registry_server/registry_server.json index 83d39bf2..f195b34b 100644 --- a/press/press/doctype/registry_server/registry_server.json +++ b/press/press/doctype/registry_server/registry_server.json @@ -283,7 +283,7 @@ ], "modified": "2025-11-22 15:50:08.907789", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Registry Server", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/registry_server/registry_server.py b/press/press/doctype/registry_server/registry_server.py index ac8d81b3..286fc56d 100644 --- a/press/press/doctype/registry_server/registry_server.py +++ b/press/press/doctype/registry_server/registry_server.py @@ -71,7 +71,7 @@ class RegistryServer(BaseServer): self.monitoring_password = jingrow.generate_hash() def _setup_server(self): - settings = jingrow.get_cached_pg("Press Settings") + settings = jingrow.get_cached_pg("Jcloude Settings") agent_password = self.get_password("agent_password") agent_repository_url = self.get_agent_repository_url() monitoring_password = self.get_password("monitoring_password") @@ -215,7 +215,7 @@ class RegistryServer(BaseServer): def delete_old_images_from_registry(): # noqa: C901 """Purge registry of older images""" - settings = jingrow.get_pg("Press Settings", None) + settings = jingrow.get_pg("Jcloude Settings", None) registry = settings.docker_registry_url requests = FrappeClient(registry).session diff --git a/press/press/doctype/release_group/release_group.json b/press/press/doctype/release_group/release_group.json index 6a2808e1..49b6bb12 100644 --- a/press/press/doctype/release_group/release_group.json +++ b/press/press/doctype/release_group/release_group.json @@ -394,7 +394,7 @@ "links": [], "modified": "2025-11-02 15:12:26.835798", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Release Group", "naming_rule": "Expression (old style)", "owner": "Administrator", @@ -414,13 +414,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/release_group/release_group.py b/press/press/doctype/release_group/release_group.py index e15f9353..ef96e019 100644 --- a/press/press/doctype/release_group/release_group.py +++ b/press/press/doctype/release_group/release_group.py @@ -1583,7 +1583,7 @@ class ReleaseGroup(Document, TagHelpers): if self.use_app_cache: return - if not jingrow.db.get_single_value("Press Settings", "use_app_cache"): + if not jingrow.db.get_single_value("Jcloude Settings", "use_app_cache"): return if not self.can_use_get_app_cache(): @@ -1591,12 +1591,12 @@ class ReleaseGroup(Document, TagHelpers): self.use_app_cache = 1 self.compress_app_cache = jingrow.db.get_single_value( - "Press Settings", + "Jcloude Settings", "compress_app_cache", ) def set_default_delta_builds_flags(self): - if not jingrow.db.get_single_value("Press Settings", "use_delta_builds"): + if not jingrow.db.get_single_value("Jcloude Settings", "use_delta_builds"): return self.use_delta_builds = 0 diff --git a/press/press/doctype/release_group/test_release_group.py b/press/press/doctype/release_group/test_release_group.py index fd8e05a6..7c58f536 100644 --- a/press/press/doctype/release_group/test_release_group.py +++ b/press/press/doctype/release_group/test_release_group.py @@ -363,7 +363,7 @@ class TestReleaseGroup(FrappeTestCase): cluster = create_test_cluster("Default", public=True) root_domain = create_test_root_domain("local.fc.jingrow.dev") - jingrow.db.set_single_value("Press Settings", "domain", root_domain.name) + jingrow.db.set_single_value("Jcloude Settings", "domain", root_domain.name) jingrow_app = create_test_app(name="jingrow") new_jingrow_app_source = create_test_app_source(version="Version 15", app=jingrow_app) diff --git a/press/press/doctype/release_group_app/release_group_app.json b/press/press/doctype/release_group_app/release_group_app.json index b17a9de0..a14bac28 100644 --- a/press/press/doctype/release_group_app/release_group_app.json +++ b/press/press/doctype/release_group_app/release_group_app.json @@ -52,7 +52,7 @@ "links": [], "modified": "2022-09-30 13:22:28.902064", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Release Group App", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/release_group_dependency/release_group_dependency.json b/press/press/doctype/release_group_dependency/release_group_dependency.json index bf8028c2..31f3febb 100644 --- a/press/press/doctype/release_group_dependency/release_group_dependency.json +++ b/press/press/doctype/release_group_dependency/release_group_dependency.json @@ -39,7 +39,7 @@ "links": [], "modified": "2024-07-19 13:13:25.158330", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Release Group Dependency", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/release_group_mount/release_group_mount.json b/press/press/doctype/release_group_mount/release_group_mount.json index bbd6fe7c..9cdeebcb 100644 --- a/press/press/doctype/release_group_mount/release_group_mount.json +++ b/press/press/doctype/release_group_mount/release_group_mount.json @@ -46,7 +46,7 @@ "links": [], "modified": "2023-12-14 11:01:27.384102", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Release Group Mount", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/release_group_package/release_group_package.json b/press/press/doctype/release_group_package/release_group_package.json index 6fd44f6a..77cdac13 100644 --- a/press/press/doctype/release_group_package/release_group_package.json +++ b/press/press/doctype/release_group_package/release_group_package.json @@ -51,7 +51,7 @@ "links": [], "modified": "2023-12-26 18:17:13.374441", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Release Group Package", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/release_group_server/release_group_server.json b/press/press/doctype/release_group_server/release_group_server.json index 0063a947..c38c4b43 100644 --- a/press/press/doctype/release_group_server/release_group_server.json +++ b/press/press/doctype/release_group_server/release_group_server.json @@ -37,7 +37,7 @@ "links": [], "modified": "2020-12-09 10:09:06.272798", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Release Group Server", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/release_group_variable/release_group_variable.json b/press/press/doctype/release_group_variable/release_group_variable.json index beb7ba9a..828c7708 100644 --- a/press/press/doctype/release_group_variable/release_group_variable.json +++ b/press/press/doctype/release_group_variable/release_group_variable.json @@ -38,7 +38,7 @@ "links": [], "modified": "2025-01-20 15:12:45.664299", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Release Group Variable", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/remote_file/remote_file.json b/press/press/doctype/remote_file/remote_file.json index fc94bf91..79988634 100644 --- a/press/press/doctype/remote_file/remote_file.json +++ b/press/press/doctype/remote_file/remote_file.json @@ -2,7 +2,7 @@ "actions": [], "allow_import": 1, "creation": "2020-07-02 14:40:15.222405", - "description": "Tracks S3 uploads made via Press", + "description": "Tracks S3 uploads made via Jcloude", "doctype": "DocType", "engine": "InnoDB", "field_order": [ @@ -98,7 +98,7 @@ "links": [], "modified": "2025-03-18 10:10:24.353402", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Remote File", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/remote_file/remote_file.py b/press/press/doctype/remote_file/remote_file.py index b304a122..951cae9e 100644 --- a/press/press/doctype/remote_file/remote_file.py +++ b/press/press/doctype/remote_file/remote_file.py @@ -27,24 +27,24 @@ def get_remote_key(file): def poll_file_statuses(): - aws_access_key = jingrow.db.get_single_value("Press Settings", "offsite_backups_access_key_id") + aws_access_key = jingrow.db.get_single_value("Jcloude Settings", "offsite_backups_access_key_id") aws_secret_key = get_decrypted_password( - "Press Settings", "Press Settings", "offsite_backups_secret_access_key" + "Jcloude Settings", "Jcloude Settings", "offsite_backups_secret_access_key" ) - default_region = jingrow.db.get_single_value("Press Settings", "backup_region") + default_region = jingrow.db.get_single_value("Jcloude Settings", "backup_region") buckets = [ { - "name": jingrow.db.get_single_value("Press Settings", "aws_s3_bucket"), + "name": jingrow.db.get_single_value("Jcloude Settings", "aws_s3_bucket"), "region": default_region, "access_key_id": aws_access_key, "secret_access_key": aws_secret_key, }, { - "name": jingrow.db.get_single_value("Press Settings", "remote_uploads_bucket"), + "name": jingrow.db.get_single_value("Jcloude Settings", "remote_uploads_bucket"), "region": default_region, - "access_key_id": jingrow.db.get_single_value("Press Settings", "remote_access_key_id"), + "access_key_id": jingrow.db.get_single_value("Jcloude Settings", "remote_access_key_id"), "secret_access_key": get_decrypted_password( - "Press Settings", "Press Settings", "remote_secret_access_key" + "Jcloude Settings", "Jcloude Settings", "remote_secret_access_key" ), }, ] @@ -126,7 +126,7 @@ def delete_remote_backup_objects(remote_files): return None buckets = {bucket: [] for bucket in jingrow.get_all("Backup Bucket", pluck="name")} - buckets.update({jingrow.db.get_single_value("Press Settings", "aws_s3_bucket"): []}) + buckets.update({jingrow.db.get_single_value("Jcloude Settings", "aws_s3_bucket"): []}) [ buckets[bucket].append(file) @@ -167,16 +167,16 @@ class RemoteFile(Document): if not self.bucket: return None - if self.bucket == jingrow.db.get_single_value("Press Settings", "remote_uploads_bucket"): - access_key_id = jingrow.db.get_single_value("Press Settings", "remote_access_key_id") + if self.bucket == jingrow.db.get_single_value("Jcloude Settings", "remote_uploads_bucket"): + access_key_id = jingrow.db.get_single_value("Jcloude Settings", "remote_access_key_id") secret_access_key = get_decrypted_password( - "Press Settings", "Press Settings", "remote_secret_access_key" + "Jcloude Settings", "Jcloude Settings", "remote_secret_access_key" ) elif self.bucket: - access_key_id = jingrow.db.get_single_value("Press Settings", "offsite_backups_access_key_id") + access_key_id = jingrow.db.get_single_value("Jcloude Settings", "offsite_backups_access_key_id") secret_access_key = get_decrypted_password( - "Press Settings", "Press Settings", "offsite_backups_secret_access_key" + "Jcloude Settings", "Jcloude Settings", "offsite_backups_secret_access_key" ) else: @@ -187,7 +187,7 @@ class RemoteFile(Document): aws_access_key_id=access_key_id, aws_secret_access_key=secret_access_key, region_name=jingrow.db.get_value("Backup Bucket", self.bucket, "region") - or jingrow.db.get_single_value("Press Settings", "backup_region"), + or jingrow.db.get_single_value("Jcloude Settings", "backup_region"), ) @property @@ -214,7 +214,7 @@ class RemoteFile(Document): def delete_remote_object(self): self.db_set("status", "Unavailable") return self.s3_client.delete_object( - Bucket=self.bucket or jingrow.db.get_single_value("Press Settings", "remote_uploads_bucket"), + Bucket=self.bucket or jingrow.db.get_single_value("Jcloude Settings", "remote_uploads_bucket"), Key=self.file_path, ) @@ -226,7 +226,7 @@ class RemoteFile(Document): return self.url or self.s3_client.generate_presigned_url( "get_object", Params={"Bucket": self.bucket, "Key": self.file_path}, - ExpiresIn=jingrow.db.get_single_value("Press Settings", "remote_link_expiry") or 3600, + ExpiresIn=jingrow.db.get_single_value("Jcloude Settings", "remote_link_expiry") or 3600, ) def get_content(self): @@ -258,7 +258,7 @@ def delete_s3_files(buckets): from jcloude.utils import chunk - jcloude_settings = jingrow.get_single("Press Settings") + jcloude_settings = jingrow.get_single("Jcloude Settings") for bucket_name in buckets: s3 = resource( "s3", diff --git a/press/press/doctype/remote_operation_log/remote_operation_log.json b/press/press/doctype/remote_operation_log/remote_operation_log.json index 81dd54a6..d06fb928 100644 --- a/press/press/doctype/remote_operation_log/remote_operation_log.json +++ b/press/press/doctype/remote_operation_log/remote_operation_log.json @@ -30,7 +30,7 @@ "links": [], "modified": "2021-02-16 11:10:03.427047", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Remote Operation Log", "owner": "Administrator", "permissions": [ @@ -48,11 +48,11 @@ }, { "create": 1, - "role": "Press Admin" + "role": "Jcloude Admin" }, { "create": 1, - "role": "Press Member" + "role": "Jcloude Member" } ], "sort_field": "modified", diff --git a/press/press/doctype/required_apps/required_apps.json b/press/press/doctype/required_apps/required_apps.json index 074933ff..8943c9e4 100644 --- a/press/press/doctype/required_apps/required_apps.json +++ b/press/press/doctype/required_apps/required_apps.json @@ -24,7 +24,7 @@ "links": [], "modified": "2025-03-28 11:43:50.259197", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Required Apps", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/resource_tag/resource_tag.json b/press/press/doctype/resource_tag/resource_tag.json index 6537a5b6..de7fc58b 100644 --- a/press/press/doctype/resource_tag/resource_tag.json +++ b/press/press/doctype/resource_tag/resource_tag.json @@ -16,7 +16,7 @@ "in_list_view": 1, "in_preview": 1, "label": "Tag", - "options": "Press Tag" + "options": "Jcloude Tag" }, { "fetch_from": "tag.tag", @@ -34,7 +34,7 @@ "links": [], "modified": "2025-11-19 14:03:45.601837", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Resource Tag", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/resource_tag/tag_helpers.py b/press/press/doctype/resource_tag/tag_helpers.py index 240ccab9..4f81b21a 100644 --- a/press/press/doctype/resource_tag/tag_helpers.py +++ b/press/press/doctype/resource_tag/tag_helpers.py @@ -16,14 +16,14 @@ class TagHelpers: return if not jingrow.db.exists( - "Press Tag", {"tag": tag, "doctype_name": self.doctype, "team": team} + "Jcloude Tag", {"tag": tag, "doctype_name": self.doctype, "team": team} ): tag_pg = jingrow.new_pg( - "Press Tag", tag=tag, doctype_name=self.doctype, team=team + "Jcloude Tag", tag=tag, doctype_name=self.doctype, team=team ).insert() else: tag_pg = jingrow.get_pg( - "Press Tag", + "Jcloude Tag", {"tag": tag, "doctype_name": self.doctype, "team": team}, ) diff --git a/press/press/doctype/root_domain/root_domain.json b/press/press/doctype/root_domain/root_domain.json index db3df8b3..f8ac0a72 100644 --- a/press/press/doctype/root_domain/root_domain.json +++ b/press/press/doctype/root_domain/root_domain.json @@ -110,7 +110,7 @@ ], "modified": "2025-12-09 14:04:47.403558", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Root Domain", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/root_domain/root_domain.py b/press/press/doctype/root_domain/root_domain.py index e39e2c84..97dbf72f 100644 --- a/press/press/doctype/root_domain/root_domain.py +++ b/press/press/doctype/root_domain/root_domain.py @@ -52,7 +52,7 @@ class RootDomain(Document): def obtain_root_domain_tls_certificate(self): try: - rsa_key_size = jingrow.db.get_value("Press Settings", "Press Settings", "rsa_key_size") + rsa_key_size = jingrow.db.get_value("Jcloude Settings", "Jcloude Settings", "rsa_key_size") jingrow.get_pg( { "doctype": "TLS Certificate", diff --git a/press/press/doctype/scale_step/scale_step.json b/press/press/doctype/scale_step/scale_step.json index d7d525c1..34c0c789 100644 --- a/press/press/doctype/scale_step/scale_step.json +++ b/press/press/doctype/scale_step/scale_step.json @@ -70,7 +70,7 @@ "links": [], "modified": "2025-11-16 15:11:38.325437", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Scale Step", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/scheduled_auto_update_log/scheduled_auto_update_log.json b/press/press/doctype/scheduled_auto_update_log/scheduled_auto_update_log.json index 7cb46dec..454f00d5 100644 --- a/press/press/doctype/scheduled_auto_update_log/scheduled_auto_update_log.json +++ b/press/press/doctype/scheduled_auto_update_log/scheduled_auto_update_log.json @@ -91,7 +91,7 @@ "links": [], "modified": "2021-11-08 23:18:25.490907", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Scheduled Auto Update Log", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/security_update/security_update.json b/press/press/doctype/security_update/security_update.json index cd3a8cfb..abecb317 100644 --- a/press/press/doctype/security_update/security_update.json +++ b/press/press/doctype/security_update/security_update.json @@ -119,7 +119,7 @@ "links": [], "modified": "2023-08-09 14:06:04.009765", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Security Update", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/security_update_check/security_update_check.json b/press/press/doctype/security_update_check/security_update_check.json index 35feed27..1c3b8d50 100644 --- a/press/press/doctype/security_update_check/security_update_check.json +++ b/press/press/doctype/security_update_check/security_update_check.json @@ -49,7 +49,7 @@ "links": [], "modified": "2022-09-29 20:57:47.002882", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Security Update Check", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/security_update_check/security_update_check.py b/press/press/doctype/security_update_check/security_update_check.py index 53eba8a7..cbfa2393 100644 --- a/press/press/doctype/security_update_check/security_update_check.py +++ b/press/press/doctype/security_update_check/security_update_check.py @@ -70,7 +70,7 @@ class SecurityUpdateCheck(Document): def fail(self): self.status = "Failure" - domain = jingrow.get_value("Press Settings", "Press Settings", "domain") + domain = jingrow.get_value("Jcloude Settings", "Jcloude Settings", "domain") message = f""" Security Update Check for *{self.server}* failed. diff --git a/press/press/doctype/self_hosted_server/self_hosted_server.json b/press/press/doctype/self_hosted_server/self_hosted_server.json index 34ce7a29..484aac6b 100644 --- a/press/press/doctype/self_hosted_server/self_hosted_server.json +++ b/press/press/doctype/self_hosted_server/self_hosted_server.json @@ -453,7 +453,7 @@ "links": [], "modified": "2024-05-29 11:41:41.304954", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Self Hosted Server", "owner": "Administrator", "permissions": [ @@ -472,13 +472,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/self_hosted_server/self_hosted_server.py b/press/press/doctype/self_hosted_server/self_hosted_server.py index dbb43ba8..b3579cc6 100644 --- a/press/press/doctype/self_hosted_server/self_hosted_server.py +++ b/press/press/doctype/self_hosted_server/self_hosted_server.py @@ -545,7 +545,7 @@ class SelfHostedServer(Document): @property def hybrid_domain(self): - return jingrow.db.get_single_value("Press Settings", "hybrid_domain") + return jingrow.db.get_single_value("Jcloude Settings", "hybrid_domain") @jingrow.whitelist() def create_proxy_server(self): @@ -611,7 +611,7 @@ class SelfHostedServer(Document): port=server.ssh_port or 22, variables={ "domain": self.name, - "jcloude_domain": jingrow.db.get_single_value("Press Settings", "domain"), # for ssl renewal + "jcloude_domain": jingrow.db.get_single_value("Jcloude Settings", "domain"), # for ssl renewal }, ) play = ansible.run() diff --git a/press/press/doctype/self_hosted_server/test_self_hosted_server.py b/press/press/doctype/self_hosted_server/test_self_hosted_server.py index 0f73ea57..18246ae5 100644 --- a/press/press/doctype/self_hosted_server/test_self_hosted_server.py +++ b/press/press/doctype/self_hosted_server/test_self_hosted_server.py @@ -186,7 +186,7 @@ class TestSelfHostedServer(FrappeTestCase): server.reload() self.assertEqual(server.private_ip, "192.168.1.1") - @change_settings("Press Settings", {"hybrid_domain": "fc.dev"}) + @change_settings("Jcloude Settings", {"hybrid_domain": "fc.dev"}) def test_create_server_and_check_total_records(self): from jcloude.jcloude.doctype.cluster.test_cluster import create_test_cluster from jcloude.jcloude.doctype.proxy_server.test_proxy_server import ( @@ -207,7 +207,7 @@ class TestSelfHostedServer(FrappeTestCase): self.assertEqual(pre_server_count, post_server_count - 1) self.assertEqual("hybrid-f-00001-default.fc.dev", new_server.name) - @change_settings("Press Settings", {"hybrid_domain": "fc.dev"}) + @change_settings("Jcloude Settings", {"hybrid_domain": "fc.dev"}) def test_create_db_server_and_check_total_records(self): from jcloude.jcloude.doctype.cluster.test_cluster import create_test_cluster from jcloude.jcloude.doctype.proxy_server.test_proxy_server import ( diff --git a/press/press/doctype/self_hosted_site_apps/self_hosted_site_apps.json b/press/press/doctype/self_hosted_site_apps/self_hosted_site_apps.json index db28a998..bc751a78 100644 --- a/press/press/doctype/self_hosted_site_apps/self_hosted_site_apps.json +++ b/press/press/doctype/self_hosted_site_apps/self_hosted_site_apps.json @@ -41,7 +41,7 @@ "links": [], "modified": "2025-03-18 10:09:56.500243", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Self Hosted Site Apps", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/serial_console_log/serial_console_log.json b/press/press/doctype/serial_console_log/serial_console_log.json index 42fa7f85..4f681694 100644 --- a/press/press/doctype/serial_console_log/serial_console_log.json +++ b/press/press/doctype/serial_console_log/serial_console_log.json @@ -93,7 +93,7 @@ "links": [], "modified": "2024-06-12 20:07:15.077206", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Serial Console Log", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/server/server.json b/press/press/doctype/server/server.json index bcfa858d..5a09b33a 100644 --- a/press/press/doctype/server/server.json +++ b/press/press/doctype/server/server.json @@ -736,7 +736,7 @@ ], "modified": "2025-11-17 11:29:25.581882", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Server", "owner": "Administrator", "permissions": [ @@ -755,13 +755,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/server/server.py b/press/press/doctype/server/server.py index bc3a8921..c826620c 100644 --- a/press/press/doctype/server/server.py +++ b/press/press/doctype/server/server.py @@ -454,7 +454,7 @@ class BaseServer(Document, TagHelpers): def autoname(self): if not self.domain: - self.domain = jingrow.db.get_single_value("Press Settings", "domain") + self.domain = jingrow.db.get_single_value("Jcloude Settings", "domain") self.name = f"{self.hostname}.{self.domain}" if self.doctype in ["Database Server", "Server", "Proxy Server"] and self.is_self_hosted: self.name = f"{self.hostname}.{self.self_hosted_server_domain}" @@ -594,12 +594,12 @@ class BaseServer(Document, TagHelpers): self.agent_password = jingrow.generate_hash(length=32) def get_agent_repository_url(self): - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") repository_owner = settings.agent_repository_owner or "jingrow" return f"http://git.jingrow.com/{repository_owner}/agent" def get_agent_repository_branch(self): - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") return settings.branch or "master" @jingrow.whitelist() @@ -694,7 +694,7 @@ class BaseServer(Document, TagHelpers): jingrow.enqueue_pg(self.doctype, self.name, "_install_filebeat", queue="long", timeout=1200) def _install_filebeat(self): - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if log_server: kibana_password = jingrow.get_pg("Log Server", log_server).get_password("kibana_password") else: @@ -740,7 +740,7 @@ class BaseServer(Document, TagHelpers): def _update_agent_ansible(self): try: - agent_branch = jingrow.get_value("Press Settings", "Press Settings", "branch") + agent_branch = jingrow.get_value("Jcloude Settings", "Jcloude Settings", "branch") if not agent_branch: agent_branch = "upstream/master" else: @@ -801,7 +801,7 @@ class BaseServer(Document, TagHelpers): if getattr(self, "use_for_build", False): return True - name = jingrow.db.get_single_value("Press Settings", "build_server") + name = jingrow.db.get_single_value("Jcloude Settings", "build_server") if name == self.name: return True @@ -1042,7 +1042,7 @@ class BaseServer(Document, TagHelpers): @jingrow.whitelist() def archive(self): if jingrow.db.exists( - "Press Job", + "Jcloude Job", { "job_type": "Archive Server", "server": self.name, @@ -1157,7 +1157,7 @@ class BaseServer(Document, TagHelpers): arguments = {} return jingrow.get_pg( { - "doctype": "Press Job", + "doctype": "Jcloude Job", "job_type": job_name, "server_type": self.doctype, "server": self.name, @@ -1188,7 +1188,7 @@ class BaseServer(Document, TagHelpers): return jingrow.get_pg("TLS Certificate", certificate_name) def get_log_server(self): - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if log_server: kibana_password = jingrow.get_pg("Log Server", log_server).get_password("kibana_password") else: @@ -2062,7 +2062,7 @@ node_filesystem_avail_bytes{{instance="{self.name}", mountpoint="{mountpoint}"}} @jingrow.whitelist() def set_additional_config(self): # noqa: C901 """ - Corresponds to Set additional config step in Create Server Press Job + Corresponds to Set additional config step in Create Server Jcloude Job """ if self.doctype == "Database Server": default_variables = jingrow.get_all("MariaDB Variable", {"set_on_new_servers": 1}, pluck="name") @@ -2556,7 +2556,7 @@ class Server(BaseServer): agent_branch = self.get_agent_repository_branch() certificate = self.get_certificate() log_server, kibana_password = self.get_log_server() - agent_sentry_dsn = jingrow.db.get_single_value("Press Settings", "agent_sentry_dsn") + agent_sentry_dsn = jingrow.db.get_single_value("Jcloude Settings", "agent_sentry_dsn") # If database server is set, then define db port under configuration db_port = ( @@ -2651,7 +2651,7 @@ class Server(BaseServer): jingrow.enqueue_pg(self.doctype, self.name, "_setup_agent_sentry") def _setup_agent_sentry(self): - agent_sentry_dsn = jingrow.db.get_single_value("Press Settings", "agent_sentry_dsn") + agent_sentry_dsn = jingrow.db.get_single_value("Jcloude Settings", "agent_sentry_dsn") try: ansible = Ansible( playbook="agent_sentry.yml", @@ -2871,7 +2871,7 @@ class Server(BaseServer): ) certificate = jingrow.get_pg("TLS Certificate", certificate_name) monitoring_password = jingrow.get_pg("Cluster", self.cluster).get_password("monitoring_password") - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if log_server: kibana_password = jingrow.get_pg("Log Server", log_server).get_password("kibana_password") else: @@ -3041,9 +3041,9 @@ class Server(BaseServer): @jingrow.whitelist() def install_wazuh_agent(self): - wazuh_server = jingrow.get_value("Press Settings", "Press Settings", "wazuh_server") + wazuh_server = jingrow.get_value("Jcloude Settings", "Jcloude Settings", "wazuh_server") if not wazuh_server: - jingrow.throw("Please configure Wazuh Server in Press Settings") + jingrow.throw("Please configure Wazuh Server in Jcloude Settings") jingrow.enqueue_pg( self.doctype, self.name, @@ -3164,7 +3164,7 @@ class Server(BaseServer): last_auto_scale_at = jingrow.db.get_value( "Auto Scale Record", {"primary_server": self.name, "status": "Success"}, "modified" ) - cool_off_period = jingrow.db.get_single_value("Press Settings", "cool_off_period") + cool_off_period = jingrow.db.get_single_value("Jcloude Settings", "cool_off_period") time_diff = ( (jingrow.utils.now_datetime() - last_auto_scale_at) if last_auto_scale_at diff --git a/press/press/doctype/server_activity/server_activity.json b/press/press/doctype/server_activity/server_activity.json index f15b0a09..bdeb892d 100644 --- a/press/press/doctype/server_activity/server_activity.json +++ b/press/press/doctype/server_activity/server_activity.json @@ -56,7 +56,7 @@ "links": [], "modified": "2025-08-07 12:09:37.291972", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Server Activity", "owner": "Administrator", "permissions": [ @@ -78,7 +78,7 @@ "export": 1, "print": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1 }, { @@ -87,7 +87,7 @@ "export": 1, "print": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1 } ], diff --git a/press/press/doctype/server_mount/server_mount.json b/press/press/doctype/server_mount/server_mount.json index 60c8f95d..bd7da02a 100644 --- a/press/press/doctype/server_mount/server_mount.json +++ b/press/press/doctype/server_mount/server_mount.json @@ -134,7 +134,7 @@ "links": [], "modified": "2024-11-15 17:24:16.761964", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Server Mount", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/server_plan/server_plan.json b/press/press/doctype/server_plan/server_plan.json index 11d26d2b..2291edf9 100644 --- a/press/press/doctype/server_plan/server_plan.json +++ b/press/press/doctype/server_plan/server_plan.json @@ -140,7 +140,7 @@ "links": [], "modified": "2025-07-10 23:10:18.403862", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Server Plan", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/server_snapshot/server_snapshot.json b/press/press/doctype/server_snapshot/server_snapshot.json index 5567d62b..b21f23a2 100644 --- a/press/press/doctype/server_snapshot/server_snapshot.json +++ b/press/press/doctype/server_snapshot/server_snapshot.json @@ -183,30 +183,30 @@ { "fieldname": "app_server_resume_service_jcloude_job", "fieldtype": "Link", - "label": "App Server Resume Service Press Job", - "options": "Press Job", + "label": "App Server Resume Service Jcloude Job", + "options": "Jcloude Job", "read_only": 1 }, { "fieldname": "app_server_snapshot_jcloude_job", "fieldtype": "Link", "in_list_view": 1, - "label": "App Server Snapshot Press Job", - "options": "Press Job", + "label": "App Server Snapshot Jcloude Job", + "options": "Jcloude Job", "read_only": 1 }, { "fieldname": "database_server_snapshot_jcloude_job", "fieldtype": "Link", - "label": "DB Server Snapshot Press Job", - "options": "Press Job", + "label": "DB Server Snapshot Jcloude Job", + "options": "Jcloude Job", "read_only": 1 }, { "fieldname": "database_server_resume_service_jcloude_job", "fieldtype": "Link", - "label": "DB Server Resume Service Press Job", - "options": "Press Job", + "label": "DB Server Resume Service Jcloude Job", + "options": "Jcloude Job", "read_only": 1 }, { @@ -322,7 +322,7 @@ ], "modified": "2025-09-17 10:45:57.691000", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Server Snapshot", "naming_rule": "Expression", "owner": "Administrator", @@ -346,7 +346,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -356,7 +356,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1 } ], diff --git a/press/press/doctype/server_snapshot/server_snapshot.py b/press/press/doctype/server_snapshot/server_snapshot.py index 7e685054..f4ac338d 100644 --- a/press/press/doctype/server_snapshot/server_snapshot.py +++ b/press/press/doctype/server_snapshot/server_snapshot.py @@ -240,7 +240,7 @@ class ServerSnapshot(Document): ): for job in self.flags.created_jcloude_jobs: with contextlib.suppress(Exception): - jingrow.get_pg("Press Job", job).delete(ignore_permissions=True) + jingrow.get_pg("Jcloude Job", job).delete(ignore_permissions=True) def on_update(self): if self.has_value_changed("status"): @@ -257,7 +257,7 @@ class ServerSnapshot(Document): self.app_server_snapshot_jcloude_job = ( jingrow.get_pg( { - "doctype": "Press Job", + "doctype": "Jcloude Job", "job_type": "Snapshot Disk", "server_type": "Server", "server": self.app_server, @@ -272,7 +272,7 @@ class ServerSnapshot(Document): self.database_server_snapshot_jcloude_job = ( jingrow.get_pg( { - "doctype": "Press Job", + "doctype": "Jcloude Job", "job_type": "Snapshot Disk", "server_type": "Database Server", "server": self.database_server, @@ -320,7 +320,7 @@ class ServerSnapshot(Document): jcloude_job = jingrow.get_pg( { - "doctype": "Press Job", + "doctype": "Jcloude Job", "job_type": "Resume Services After Snapshot", "server_type": server_type, "server": self.app_server if server_type == "Server" else self.database_server, @@ -463,7 +463,7 @@ class ServerSnapshot(Document): if not sites: sites = [] - if not jingrow.db.get_single_value("Press Settings", "enable_server_snapshot_recovery"): + if not jingrow.db.get_single_value("Jcloude Settings", "enable_server_snapshot_recovery"): jingrow.throw("Server Snapshot Recovery is currently disabled. Please try again later.") recover_record = jingrow.get_pg( diff --git a/press/press/doctype/server_snapshot_plan/server_snapshot_plan.json b/press/press/doctype/server_snapshot_plan/server_snapshot_plan.json index 686c2a1d..a8b128fa 100644 --- a/press/press/doctype/server_snapshot_plan/server_snapshot_plan.json +++ b/press/press/doctype/server_snapshot_plan/server_snapshot_plan.json @@ -65,7 +65,7 @@ "links": [], "modified": "2025-08-02 03:22:33.282950", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Server Snapshot Plan", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.json b/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.json index 5b187556..807364a3 100644 --- a/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.json +++ b/press/press/doctype/server_snapshot_recovery/server_snapshot_recovery.json @@ -175,7 +175,7 @@ "links": [], "modified": "2025-08-07 10:50:25.752688", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Server Snapshot Recovery", "owner": "Administrator", "permissions": [ @@ -198,7 +198,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -208,7 +208,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1 } ], diff --git a/press/press/doctype/server_snapshot_site_recovery/server_snapshot_site_recovery.json b/press/press/doctype/server_snapshot_site_recovery/server_snapshot_site_recovery.json index b5428c7c..a4d6ad14 100644 --- a/press/press/doctype/server_snapshot_site_recovery/server_snapshot_site_recovery.json +++ b/press/press/doctype/server_snapshot_site_recovery/server_snapshot_site_recovery.json @@ -128,7 +128,7 @@ "links": [], "modified": "2025-08-07 00:01:51.962501", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Server Snapshot Site Recovery", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/server_storage_plan/server_storage_plan.json b/press/press/doctype/server_storage_plan/server_storage_plan.json index 31439818..825d248d 100644 --- a/press/press/doctype/server_storage_plan/server_storage_plan.json +++ b/press/press/doctype/server_storage_plan/server_storage_plan.json @@ -49,7 +49,7 @@ "links": [], "modified": "2024-06-26 17:50:43.521110", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Server Storage Plan", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/silenced_alert/silenced_alert.json b/press/press/doctype/silenced_alert/silenced_alert.json index dfc5832f..3722fe05 100644 --- a/press/press/doctype/silenced_alert/silenced_alert.json +++ b/press/press/doctype/silenced_alert/silenced_alert.json @@ -110,7 +110,7 @@ "links": [], "modified": "2023-10-19 10:56:12.281776", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Silenced Alert", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/silenced_alert/silenced_alert.py b/press/press/doctype/silenced_alert/silenced_alert.py index 0098fd3f..c032e06e 100644 --- a/press/press/doctype/silenced_alert/silenced_alert.py +++ b/press/press/doctype/silenced_alert/silenced_alert.py @@ -62,7 +62,7 @@ class SilencedAlert(Document): def preview_alerts(self): monitor_server = jingrow.get_pg( "Monitor Server", "monitor.athul.fc.jingrow.dev" - ) # jingrow.db.get_single_value("Press Settings","monitor_server")) + ) # jingrow.db.get_single_value("Jcloude Settings","monitor_server")) auth_token = base64.b64encode( f"jingrow:{monitor_server.get_password('grafana_password')}".encode("utf-8") ).decode("utf-8") @@ -85,7 +85,7 @@ class SilencedAlert(Document): def create_new_silence(self): monitor_server = jingrow.get_pg( "Monitor Server", "monitor.athul.fc.jingrow.dev" - ) # jingrow.db.get_single_value("Press Settings","monitor_server")) + ) # jingrow.db.get_single_value("Jcloude Settings","monitor_server")) auth_token = base64.b64encode( f"jingrow:{monitor_server.get_password('grafana_password')}".encode("utf-8") ).decode("utf-8") @@ -120,7 +120,7 @@ class SilencedAlert(Document): def check_silenced_alerts(): """ - Checks for silenced alerts in Alertmanager and updates the status of the silenced alert in Press + Checks for silenced alerts in Alertmanager and updates the status of the silenced alert in Jcloude Runs every hour """ silences = jingrow.get_all( @@ -128,7 +128,7 @@ def check_silenced_alerts(): ) monitor_server = jingrow.get_pg( "Monitor Server", "monitor.athul.fc.jingrow.dev" - ) # jingrow.db.get_single_value("Press Settings","monitor_server")) + ) # jingrow.db.get_single_value("Jcloude Settings","monitor_server")) auth_token = base64.b64encode( f"jingrow:{monitor_server.get_password('grafana_password')}".encode("utf-8") ).decode("utf-8") diff --git a/press/press/doctype/site/backups.py b/press/press/doctype/site/backups.py index f7b33ddd..a72ac29f 100644 --- a/press/press/doctype/site/backups.py +++ b/press/press/doctype/site/backups.py @@ -145,7 +145,7 @@ class FIFO(BackupRotationScheme): def __init__(self): self.offsite_backups_count = ( - jingrow.db.get_single_value("Press Settings", "offsite_backups_count") or 30 + jingrow.db.get_single_value("Jcloude Settings", "offsite_backups_count") or 30 ) def get_backups_due_for_expiry(self, backup_type: BACKUP_TYPES) -> list[str]: @@ -247,12 +247,12 @@ class ScheduledBackupJob: def __init__(self, backup_type: BACKUP_TYPES): self.backup_type: BACKUP_TYPES = backup_type self.interval: int = ( - jingrow.get_cached_value("Press Settings", "Press Settings", "backup_interval") or 6 + jingrow.get_cached_value("Jcloude Settings", "Jcloude Settings", "backup_interval") or 6 ) - self.offset: int = jingrow.get_cached_value("Press Settings", "Press Settings", "backup_offset") or 0 - self.limit = jingrow.get_cached_value("Press Settings", "Press Settings", "backup_limit") or 100 + self.offset: int = jingrow.get_cached_value("Jcloude Settings", "Jcloude Settings", "backup_offset") or 0 + self.limit = jingrow.get_cached_value("Jcloude Settings", "Jcloude Settings", "backup_limit") or 100 self.max_failed_backup_attempts_in_a_day = ( - jingrow.get_cached_value("Press Settings", "Press Settings", "max_failed_backup_attempts_in_a_day") + jingrow.get_cached_value("Jcloude Settings", "Jcloude Settings", "max_failed_backup_attempts_in_a_day") or 6 ) @@ -387,7 +387,7 @@ def cleanup_offsite(): def _cleanup_offsite(): - scheme = jingrow.db.get_single_value("Press Settings", "backup_rotation_scheme") or "FIFO" + scheme = jingrow.db.get_single_value("Jcloude Settings", "backup_rotation_scheme") or "FIFO" if scheme == "FIFO": rotation = FIFO() elif scheme == "Grandfather-father-son": @@ -409,7 +409,7 @@ def expire_physical(): def _expire_physical_backups(): - scheme = jingrow.db.get_single_value("Press Settings", "backup_rotation_scheme") or "FIFO" + scheme = jingrow.db.get_single_value("Jcloude Settings", "backup_rotation_scheme") or "FIFO" if scheme == "FIFO": rotation = FIFO() elif scheme == "Grandfather-father-son": diff --git a/press/press/doctype/site/erpnext_site.py b/press/press/doctype/site/erpnext_site.py index 8d558c38..434a7a33 100644 --- a/press/press/doctype/site/erpnext_site.py +++ b/press/press/doctype/site/erpnext_site.py @@ -80,23 +80,23 @@ def get_erpnext_bench(): def get_erpnext_domain(): - return jingrow.db.get_single_value("Press Settings", "erpnext_domain") + return jingrow.db.get_single_value("Jcloude Settings", "erpnext_domain") def get_erpnext_plan(): - return jingrow.db.get_single_value("Press Settings", "erpnext_plan") + return jingrow.db.get_single_value("Jcloude Settings", "erpnext_plan") def get_erpnext_group(): - return jingrow.db.get_single_value("Press Settings", "erpnext_group") + return jingrow.db.get_single_value("Jcloude Settings", "erpnext_group") def get_erpnext_cluster(): - return jingrow.db.get_single_value("Press Settings", "erpnext_cluster") + return jingrow.db.get_single_value("Jcloude Settings", "erpnext_cluster") def get_erpnext_apps(): - return [app.app for app in jingrow.get_single("Press Settings").erpnext_apps] + return [app.app for app in jingrow.get_single("Jcloude Settings").erpnext_apps] def process_setup_erpnext_site_job_update(job): diff --git a/press/press/doctype/site/pool.py b/press/press/doctype/site/pool.py index 462b16ec..c9886359 100644 --- a/press/press/doctype/site/pool.py +++ b/press/press/doctype/site/pool.py @@ -16,11 +16,11 @@ from jcloude.utils import log_error class SitePool: def __init__(self): self.site_count = jingrow.db.count("Site", filters={"is_standby": True, "status": "Active"}) - self.pool_size = jingrow.db.get_single_value("Press Settings", "standby_pool_size") - self.queue_size = jingrow.db.get_single_value("Press Settings", "standby_queue_size") + self.pool_size = jingrow.db.get_single_value("Jcloude Settings", "standby_pool_size") + self.queue_size = jingrow.db.get_single_value("Jcloude Settings", "standby_queue_size") def create(self): - pooling_enabled = jingrow.db.get_single_value("Press Settings", "enable_site_pooling") + pooling_enabled = jingrow.db.get_single_value("Jcloude Settings", "enable_site_pooling") if pooling_enabled and self.site_count < self.pool_size: sites_created = 0 while sites_created < self.queue_size: diff --git a/press/press/doctype/site/saas_site.py b/press/press/doctype/site/saas_site.py index 4cd8812e..a7b393ab 100644 --- a/press/press/doctype/site/saas_site.py +++ b/press/press/doctype/site/saas_site.py @@ -250,7 +250,7 @@ def get_app_subscriptions(apps=None, standby_for=None): custom_saas_config.update( { "subscription": {"secret_key": secret_key}, - "app_include_js": [jingrow.db.get_single_value("Press Settings", "app_include_script")], + "app_include_js": [jingrow.db.get_single_value("Jcloude Settings", "app_include_script")], } ) diff --git a/press/press/doctype/site/site.json b/press/press/doctype/site/site.json index ed3b0373..034ed7a1 100644 --- a/press/press/doctype/site/site.json +++ b/press/press/doctype/site/site.json @@ -816,7 +816,7 @@ ], "modified": "2025-10-07 19:14:24.341019", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site", "owner": "Administrator", "permissions": [ @@ -835,13 +835,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 }, { @@ -850,7 +850,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Support Agent", + "role": "Jcloude Support Agent", "share": 1 } ], diff --git a/press/press/doctype/site/site.py b/press/press/doctype/site/site.py index ba0d46b1..aaa341ca 100644 --- a/press/press/doctype/site/site.py +++ b/press/press/doctype/site/site.py @@ -389,7 +389,7 @@ class Site(Document, TagHelpers): def _get_site_name(self, subdomain: str): """Get full site domain name given subdomain.""" if not self.domain: - self.domain = jingrow.db.get_single_value("Press Settings", "domain") + self.domain = jingrow.db.get_single_value("Jcloude Settings", "domain") return f"{subdomain}.{self.domain}" def autoname(self): @@ -1103,7 +1103,7 @@ class Site(Document, TagHelpers): @dashboard_whitelist() @site_action(["Active", "Broken"]) def restore_site_from_physical_backup(self, backup: str): - if jingrow.db.get_single_value("Press Settings", "disable_physical_backup"): + if jingrow.db.get_single_value("Jcloude Settings", "disable_physical_backup"): jingrow.throw("Currently, Physical Backup & Restoration is disabled system wide. Try again later.") jingrow.db.set_value("Site", self.name, "status", "Pending") @@ -1152,7 +1152,7 @@ class Site(Document, TagHelpers): if physical and not self.allow_physical_backup_by_user: jingrow.throw(_("Physical backup is not enabled for this site. Please reach out to support.")) - if physical and jingrow.db.get_single_value("Press Settings", "disable_physical_backup"): + if physical and jingrow.db.get_single_value("Jcloude Settings", "disable_physical_backup"): jingrow.throw(_("Physical backup is disabled system wide. Please try again later.")) # Site deactivation required only for physical backup return self.backup(with_files=with_files, physical=physical, deactivate_site_during_backup=physical) @@ -1764,7 +1764,7 @@ class Site(Document, TagHelpers): "Incident", { "server": self.server, - "status": ("not in", ["Resolved", "Auto-Resolved", "Press-Resolved"]), + "status": ("not in", ["Resolved", "Auto-Resolved", "Jcloude-Resolved"]), }, ): jingrow.throw( @@ -4385,7 +4385,7 @@ def prepare_site(site: str, subdomain: str | None = None) -> dict: "private": backup.remote_private_file, } return { - "domain": jingrow.db.get_single_value("Press Settings", "domain"), + "domain": jingrow.db.get_single_value("Jcloude Settings", "domain"), "plan": pg.plan, "name": site_name, "group": pg.group, @@ -4397,7 +4397,7 @@ def prepare_site(site: str, subdomain: str | None = None) -> dict: @jingrow.whitelist() def options_for_new(group: str | None = None, selected_values=None) -> dict: - domain = jingrow.db.get_single_value("Press Settings", "domain") + domain = jingrow.db.get_single_value("Jcloude Settings", "domain") selected_values = jingrow.parse_json(selected_values) if selected_values else jingrow._dict() versions = [] @@ -4622,7 +4622,7 @@ def archive_suspended_sites(): def send_warning_mail_regarding_sites_exceeding_disk_usage(): - if not jingrow.db.get_single_value("Press Settings", "enforce_storage_limits"): + if not jingrow.db.get_single_value("Jcloude Settings", "enforce_storage_limits"): return free_teams = jingrow.get_all("Team", filters={"free_account": True, "enabled": True}, pluck="name") @@ -4690,7 +4690,7 @@ def send_warning_mail_regarding_sites_exceeding_disk_usage(): def suspend_sites_exceeding_disk_usage_for_last_14_days(): """Suspend sites if they have exceeded database or disk usage limits for the last 14 days.""" - if not jingrow.db.get_single_value("Press Settings", "enforce_storage_limits"): + if not jingrow.db.get_single_value("Jcloude Settings", "enforce_storage_limits"): return free_teams = jingrow.get_all("Team", filters={"free_account": True, "enabled": True}, pluck="name") diff --git a/press/press/doctype/site/test_backups.py b/press/press/doctype/site/test_backups.py index 3d2c2c4d..18f207ba 100644 --- a/press/press/doctype/site/test_backups.py +++ b/press/press/doctype/site/test_backups.py @@ -32,7 +32,7 @@ class TestScheduledBackupJob(FrappeTestCase): super().setUp() self.interval = 6 - jingrow.db.set_single_value("Press Settings", "backup_interval", 6) + jingrow.db.set_single_value("Jcloude Settings", "backup_interval", 6) def _interval_hrs_ago(self): return jingrow.utils.now_datetime() - timedelta(hours=self.interval) diff --git a/press/press/doctype/site/test_site.py b/press/press/doctype/site/test_site.py index 0f95b402..f051bfc8 100644 --- a/press/press/doctype/site/test_site.py +++ b/press/press/doctype/site/test_site.py @@ -201,7 +201,7 @@ class TestSite(FrappeTestCase): def test_rename_updates_name(self): """Ensure rename changes name of site.""" - domain = jingrow.db.get_single_value("Press Settings", "domain") + domain = jingrow.db.get_single_value("Jcloude Settings", "domain") site = create_test_site("old-name") new_name = f"new-name.{domain}" site.rename(new_name) @@ -214,7 +214,7 @@ class TestSite(FrappeTestCase): def test_rename_creates_2_agent_jobs(self): """Ensure rename creates 2 agent jobs (for f & n).""" - domain = jingrow.db.get_single_value("Press Settings", "domain") + domain = jingrow.db.get_single_value("Jcloude Settings", "domain") site = create_test_site("old-name") new_name = f"new-name.{domain}" @@ -690,7 +690,7 @@ class TestSite(FrappeTestCase): @patch("jingrow.sendmail", new=Mock()) def test_suspend_site_on_exceeding_site_usage_for_consecutive_14_days(self): - jingrow.db.set_single_value("Press Settings", "enforce_storage_limits", 1) + jingrow.db.set_single_value("Jcloude Settings", "enforce_storage_limits", 1) team = create_test_team() site: Site = create_test_site(public_server=True, free=False, team=team.name) diff --git a/press/press/doctype/site_activity/site_activity.json b/press/press/doctype/site_activity/site_activity.json index 9f6f0194..46f2c1d4 100644 --- a/press/press/doctype/site_activity/site_activity.json +++ b/press/press/doctype/site_activity/site_activity.json @@ -59,7 +59,7 @@ "links": [], "modified": "2025-10-07 19:31:49.273641", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Activity", "owner": "Administrator", "permissions": [ @@ -77,11 +77,11 @@ }, { "create": 1, - "role": "Press Admin" + "role": "Jcloude Admin" }, { "create": 1, - "role": "Press Member" + "role": "Jcloude Member" } ], "row_format": "Dynamic", diff --git a/press/press/doctype/site_analytics/site_analytics.json b/press/press/doctype/site_analytics/site_analytics.json index 5cdb1064..79f5e112 100644 --- a/press/press/doctype/site_analytics/site_analytics.json +++ b/press/press/doctype/site_analytics/site_analytics.json @@ -196,7 +196,7 @@ "links": [], "modified": "2022-09-29 18:13:51.797874", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Analytics", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/site_analytics_active/site_analytics_active.json b/press/press/doctype/site_analytics_active/site_analytics_active.json index 5730de53..7948de41 100644 --- a/press/press/doctype/site_analytics_active/site_analytics_active.json +++ b/press/press/doctype/site_analytics_active/site_analytics_active.json @@ -67,7 +67,7 @@ "links": [], "modified": "2022-09-30 11:41:01.033086", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Analytics Active", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/site_analytics_app/site_analytics_app.json b/press/press/doctype/site_analytics_app/site_analytics_app.json index 0fcdc81b..28522ee1 100644 --- a/press/press/doctype/site_analytics_app/site_analytics_app.json +++ b/press/press/doctype/site_analytics_app/site_analytics_app.json @@ -34,7 +34,7 @@ "links": [], "modified": "2022-05-05 09:27:45.993311", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Analytics App", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/site_analytics_doctype/site_analytics_doctype.json b/press/press/doctype/site_analytics_doctype/site_analytics_doctype.json index 268672e4..e91d62c2 100644 --- a/press/press/doctype/site_analytics_doctype/site_analytics_doctype.json +++ b/press/press/doctype/site_analytics_doctype/site_analytics_doctype.json @@ -27,7 +27,7 @@ "links": [], "modified": "2022-05-05 09:27:41.077818", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Analytics DocType", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/site_analytics_login/site_analytics_login.json b/press/press/doctype/site_analytics_login/site_analytics_login.json index 2b970b1a..4e0d7f58 100644 --- a/press/press/doctype/site_analytics_login/site_analytics_login.json +++ b/press/press/doctype/site_analytics_login/site_analytics_login.json @@ -34,7 +34,7 @@ "links": [], "modified": "2022-05-05 09:27:37.972446", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Analytics Login", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/site_analytics_user/site_analytics_user.json b/press/press/doctype/site_analytics_user/site_analytics_user.json index 88063b94..4de8ad92 100644 --- a/press/press/doctype/site_analytics_user/site_analytics_user.json +++ b/press/press/doctype/site_analytics_user/site_analytics_user.json @@ -72,7 +72,7 @@ "links": [], "modified": "2022-05-05 09:27:43.694054", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Analytics User", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/site_app/site_app.json b/press/press/doctype/site_app/site_app.json index bf3946dd..6a5f0b29 100644 --- a/press/press/doctype/site_app/site_app.json +++ b/press/press/doctype/site_app/site_app.json @@ -21,7 +21,7 @@ "links": [], "modified": "2020-12-15 22:39:14.441837", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site App", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/site_backup/site_backup.json b/press/press/doctype/site_backup/site_backup.json index bfc9bab2..13a74257 100644 --- a/press/press/doctype/site_backup/site_backup.json +++ b/press/press/doctype/site_backup/site_backup.json @@ -309,7 +309,7 @@ ], "modified": "2025-04-17 10:57:09.359685", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Backup", "owner": "Administrator", "permissions": [ @@ -327,11 +327,11 @@ }, { "create": 1, - "role": "Press Admin" + "role": "Jcloude Admin" }, { "create": 1, - "role": "Press Member" + "role": "Jcloude Member" } ], "sort_field": "modified", diff --git a/press/press/doctype/site_backup/site_backup.py b/press/press/doctype/site_backup/site_backup.py index 643121c2..7ae9e759 100644 --- a/press/press/doctype/site_backup/site_backup.py +++ b/press/press/doctype/site_backup/site_backup.py @@ -544,7 +544,7 @@ def process_backup_site_job_update(job): def get_backup_bucket(cluster, region=False): bucket_for_cluster = jingrow.get_all("Backup Bucket", {"cluster": cluster}, ["name", "region"], limit=1) - default_bucket = jingrow.db.get_single_value("Press Settings", "aws_s3_bucket") + default_bucket = jingrow.db.get_single_value("Jcloude Settings", "aws_s3_bucket") if region: return bucket_for_cluster[0] if bucket_for_cluster else default_bucket diff --git a/press/press/doctype/site_backup_time/site_backup_time.json b/press/press/doctype/site_backup_time/site_backup_time.json index e1f59f60..9ae6a615 100644 --- a/press/press/doctype/site_backup_time/site_backup_time.json +++ b/press/press/doctype/site_backup_time/site_backup_time.json @@ -22,7 +22,7 @@ "links": [], "modified": "2025-04-11 13:35:26.873865", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Backup Time", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/site_config/site_config.json b/press/press/doctype/site_config/site_config.json index 8e1798ca..67647dbf 100644 --- a/press/press/doctype/site_config/site_config.json +++ b/press/press/doctype/site_config/site_config.json @@ -46,7 +46,7 @@ "links": [], "modified": "2024-02-23 09:28:25.746695", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Config", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/site_config_key/site_config_key.json b/press/press/doctype/site_config_key/site_config_key.json index 86240a7b..57fe72cd 100644 --- a/press/press/doctype/site_config_key/site_config_key.json +++ b/press/press/doctype/site_config_key/site_config_key.json @@ -59,7 +59,7 @@ "links": [], "modified": "2021-02-15 20:21:36.837382", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Config Key", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/site_config_key_blacklist/site_config_key_blacklist.json b/press/press/doctype/site_config_key_blacklist/site_config_key_blacklist.json index c66d93c1..a704b6d9 100644 --- a/press/press/doctype/site_config_key_blacklist/site_config_key_blacklist.json +++ b/press/press/doctype/site_config_key_blacklist/site_config_key_blacklist.json @@ -29,7 +29,7 @@ "links": [], "modified": "2021-02-15 20:20:47.860074", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Config Key Blacklist", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/site_database_table_permission/site_database_table_permission.json b/press/press/doctype/site_database_table_permission/site_database_table_permission.json index 10491952..06c1682d 100644 --- a/press/press/doctype/site_database_table_permission/site_database_table_permission.json +++ b/press/press/doctype/site_database_table_permission/site_database_table_permission.json @@ -62,7 +62,7 @@ "links": [], "modified": "2024-10-31 17:17:51.606102", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Database Table Permission", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/site_database_user/site_database_user.json b/press/press/doctype/site_database_user/site_database_user.json index 8ed026d4..9ab683d4 100644 --- a/press/press/doctype/site_database_user/site_database_user.json +++ b/press/press/doctype/site_database_user/site_database_user.json @@ -150,7 +150,7 @@ ], "modified": "2025-09-01 13:44:51.350883", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Database User", "owner": "Administrator", "permissions": [ @@ -174,7 +174,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 } diff --git a/press/press/doctype/site_database_user/site_database_user.py b/press/press/doctype/site_database_user/site_database_user.py index 025a0810..20f1713d 100644 --- a/press/press/doctype/site_database_user/site_database_user.py +++ b/press/press/doctype/site_database_user/site_database_user.py @@ -323,7 +323,7 @@ class SiteDatabaseUser(Document): "You can only search through at max 30 days of logs. Please try again with a smaller range." ) try: - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if not log_server: return [] diff --git a/press/press/doctype/site_domain/site_domain.json b/press/press/doctype/site_domain/site_domain.json index 7785b05e..6d7bf6bb 100644 --- a/press/press/doctype/site_domain/site_domain.json +++ b/press/press/doctype/site_domain/site_domain.json @@ -110,7 +110,7 @@ "links": [], "modified": "2025-03-18 10:09:23.846340", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Domain", "naming_rule": "By fieldname", "owner": "Administrator", @@ -131,14 +131,14 @@ "create": 1, "delete": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "delete": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/site_group_deploy/site_group_deploy.json b/press/press/doctype/site_group_deploy/site_group_deploy.json index c52b8ac8..5c00b2d9 100644 --- a/press/press/doctype/site_group_deploy/site_group_deploy.json +++ b/press/press/doctype/site_group_deploy/site_group_deploy.json @@ -110,7 +110,7 @@ "links": [], "modified": "2024-09-02 10:30:41.897673", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Group Deploy", "naming_rule": "Random", "owner": "Administrator", @@ -135,7 +135,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -147,7 +147,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/site_group_deploy/site_group_deploy.py b/press/press/doctype/site_group_deploy/site_group_deploy.py index 924d6c05..d546874b 100644 --- a/press/press/doctype/site_group_deploy/site_group_deploy.py +++ b/press/press/doctype/site_group_deploy/site_group_deploy.py @@ -67,7 +67,7 @@ class SiteGroupDeploy(Document): if jingrow.db.exists("Release Group", {"title": self.subdomain}): jingrow.throw(f"Release Group with title {self.subdomain} already exists") - domain = jingrow.db.get_single_value("Press Settings", "domain") + domain = jingrow.db.get_single_value("Jcloude Settings", "domain") if Site.exists(self.subdomain, domain): jingrow.throw(f"Site with subdomain {self.subdomain} already exists") @@ -114,7 +114,7 @@ class SiteGroupDeploy(Document): "cluster": self.cluster, "release_group": self.release_group, "bench": self.bench, - "domain": jingrow.db.get_single_value("Press Settings", "domain"), + "domain": jingrow.db.get_single_value("Jcloude Settings", "domain"), "subscription_plan": cheapest_private_bench_plan, "app_plans": app_plan_map, } diff --git a/press/press/doctype/site_group_deploy_app/site_group_deploy_app.json b/press/press/doctype/site_group_deploy_app/site_group_deploy_app.json index e078aeec..48c43473 100644 --- a/press/press/doctype/site_group_deploy_app/site_group_deploy_app.json +++ b/press/press/doctype/site_group_deploy_app/site_group_deploy_app.json @@ -42,7 +42,7 @@ "links": [], "modified": "2024-08-28 20:11:22.334225", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Group Deploy App", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/site_migration/site_migration.json b/press/press/doctype/site_migration/site_migration.json index 21bde8d6..8d8c80be 100644 --- a/press/press/doctype/site_migration/site_migration.json +++ b/press/press/doctype/site_migration/site_migration.json @@ -159,7 +159,7 @@ "links": [], "modified": "2025-05-05 10:32:27.636592", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Migration", "owner": "Administrator", "permissions": [ @@ -192,7 +192,7 @@ "export": 1, "print": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -202,7 +202,7 @@ "export": 1, "print": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/site_migration_step/site_migration_step.json b/press/press/doctype/site_migration_step/site_migration_step.json index 8d65c29f..2e45c5b5 100644 --- a/press/press/doctype/site_migration_step/site_migration_step.json +++ b/press/press/doctype/site_migration_step/site_migration_step.json @@ -52,7 +52,7 @@ "links": [], "modified": "2024-01-12 16:30:57.497115", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Migration Step", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/site_partner_lead/site_partner_lead.json b/press/press/doctype/site_partner_lead/site_partner_lead.json index 9ab42158..bd3c4c68 100644 --- a/press/press/doctype/site_partner_lead/site_partner_lead.json +++ b/press/press/doctype/site_partner_lead/site_partner_lead.json @@ -106,7 +106,7 @@ "links": [], "modified": "2025-09-20 13:15:46.626864", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Partner Lead", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/site_plan/site_plan.json b/press/press/doctype/site_plan/site_plan.json index 79e92448..1b67b87b 100644 --- a/press/press/doctype/site_plan/site_plan.json +++ b/press/press/doctype/site_plan/site_plan.json @@ -251,7 +251,7 @@ "links": [], "modified": "2025-07-30 10:48:08.852441", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Plan", "naming_rule": "Set by user", "owner": "Administrator", @@ -274,7 +274,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1 }, { @@ -283,7 +283,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1 } ], diff --git a/press/press/doctype/site_plan_allowed_app/site_plan_allowed_app.json b/press/press/doctype/site_plan_allowed_app/site_plan_allowed_app.json index bfc665ad..8f68c045 100644 --- a/press/press/doctype/site_plan_allowed_app/site_plan_allowed_app.json +++ b/press/press/doctype/site_plan_allowed_app/site_plan_allowed_app.json @@ -23,7 +23,7 @@ "links": [], "modified": "2024-07-09 23:27:30.587794", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Plan Allowed App", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/site_plan_change/site_plan_change.json b/press/press/doctype/site_plan_change/site_plan_change.json index 367d08c2..4373dd39 100644 --- a/press/press/doctype/site_plan_change/site_plan_change.json +++ b/press/press/doctype/site_plan_change/site_plan_change.json @@ -66,7 +66,7 @@ "links": [], "modified": "2025-03-18 10:10:37.246343", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Plan Change", "owner": "Administrator", "permissions": [ @@ -84,11 +84,11 @@ }, { "create": 1, - "role": "Press Admin" + "role": "Jcloude Admin" }, { "create": 1, - "role": "Press Member" + "role": "Jcloude Member" }, { "create": 1, diff --git a/press/press/doctype/site_plan_release_group/site_plan_release_group.json b/press/press/doctype/site_plan_release_group/site_plan_release_group.json index 4924c3e7..fe58fdbf 100644 --- a/press/press/doctype/site_plan_release_group/site_plan_release_group.json +++ b/press/press/doctype/site_plan_release_group/site_plan_release_group.json @@ -23,7 +23,7 @@ "links": [], "modified": "2024-07-09 12:43:12.168927", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Plan Release Group", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/site_replication/site_replication.json b/press/press/doctype/site_replication/site_replication.json index 204b22fd..252115db 100644 --- a/press/press/doctype/site_replication/site_replication.json +++ b/press/press/doctype/site_replication/site_replication.json @@ -77,7 +77,7 @@ "links": [], "modified": "2022-12-14 17:23:02.252242", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Replication", "naming_rule": "Expression (old style)", "owner": "Administrator", diff --git a/press/press/doctype/site_update/site_update.json b/press/press/doctype/site_update/site_update.json index 340dd63a..06748865 100644 --- a/press/press/doctype/site_update/site_update.json +++ b/press/press/doctype/site_update/site_update.json @@ -344,7 +344,7 @@ "links": [], "modified": "2025-12-06 21:13:57.822331", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Update", "owner": "Administrator", "permissions": [ @@ -362,12 +362,12 @@ }, { "create": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/site_update/site_update.py b/press/press/doctype/site_update/site_update.py index ebd07bc4..86059b1c 100644 --- a/press/press/doctype/site_update/site_update.py +++ b/press/press/doctype/site_update/site_update.py @@ -250,8 +250,8 @@ class SiteUpdate(Document): if self.deploy_type != "Migrate": return - # Check if physical backup is disabled globally from Press Settings - if jingrow.utils.cint(jingrow.get_value("Press Settings", None, "disable_physical_backup")): + # Check if physical backup is disabled globally from Jcloude Settings + if jingrow.utils.cint(jingrow.get_value("Jcloude Settings", None, "disable_physical_backup")): return database_server = jingrow.get_value("Server", self.server, "database_server") @@ -847,7 +847,7 @@ def schedule_updates(): def schedule_updates_server(server): # Prevent flooding the queue - queue_size = jingrow.db.get_single_value("Press Settings", "auto_update_queue_size") + queue_size = jingrow.db.get_single_value("Jcloude Settings", "auto_update_queue_size") pending_update_count = jingrow.db.count( "Site Update", { diff --git a/press/press/doctype/site_usage/site_usage.json b/press/press/doctype/site_usage/site_usage.json index 354b384d..c884503d 100644 --- a/press/press/doctype/site_usage/site_usage.json +++ b/press/press/doctype/site_usage/site_usage.json @@ -64,7 +64,7 @@ "links": [], "modified": "2023-10-19 14:31:13.374011", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site Usage", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/site_user/site_user.json b/press/press/doctype/site_user/site_user.json index 13fc8fd5..77ba888f 100644 --- a/press/press/doctype/site_user/site_user.json +++ b/press/press/doctype/site_user/site_user.json @@ -36,7 +36,7 @@ "links": [], "modified": "2025-02-19 16:35:29.861290", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site User", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/site_user_session/site_user_session.json b/press/press/doctype/site_user_session/site_user_session.json index 615fc8da..eedf6037 100644 --- a/press/press/doctype/site_user_session/site_user_session.json +++ b/press/press/doctype/site_user_session/site_user_session.json @@ -43,7 +43,7 @@ "links": [], "modified": "2025-02-17 12:19:46.639929", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Site User Session", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/sql_playground_log/sql_playground_log.json b/press/press/doctype/sql_playground_log/sql_playground_log.json index 16f7f783..b923b751 100644 --- a/press/press/doctype/sql_playground_log/sql_playground_log.json +++ b/press/press/doctype/sql_playground_log/sql_playground_log.json @@ -57,7 +57,7 @@ "links": [], "modified": "2024-10-24 12:18:15.580077", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "SQL Playground Log", "owner": "Administrator", "permissions": [ @@ -80,7 +80,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1 }, { @@ -90,7 +90,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1 } ], diff --git a/press/press/doctype/ssh_certificate/ssh_certificate.json b/press/press/doctype/ssh_certificate/ssh_certificate.json index 6362f32f..f9ebc3ca 100644 --- a/press/press/doctype/ssh_certificate/ssh_certificate.json +++ b/press/press/doctype/ssh_certificate/ssh_certificate.json @@ -160,7 +160,7 @@ "links": [], "modified": "2022-01-31 10:46:17.476664", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "SSH Certificate", "naming_rule": "Expression (old style)", "owner": "Administrator", @@ -181,14 +181,14 @@ "create": 1, "if_owner": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "if_owner": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/ssh_certificate/ssh_certificate.py b/press/press/doctype/ssh_certificate/ssh_certificate.py index ab6305af..f1cbfc58 100644 --- a/press/press/doctype/ssh_certificate/ssh_certificate.py +++ b/press/press/doctype/ssh_certificate/ssh_certificate.py @@ -73,7 +73,7 @@ class SSHCertificate(Document): def validate_certificate_authority(self): if not self.ssh_certificate_authority: self.ssh_certificate_authority = jingrow.db.get_single_value( - "Press Settings", "ssh_certificate_authority" + "Jcloude Settings", "ssh_certificate_authority" ) if not self.ssh_certificate_authority: jingrow.throw( diff --git a/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.json b/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.json index 8aa87dea..60021569 100644 --- a/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.json +++ b/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.json @@ -62,7 +62,7 @@ "links": [], "modified": "2022-01-16 13:05:32.106981", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "SSH Certificate Authority", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.py b/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.py index fdec6c7b..b194ae1b 100644 --- a/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.py +++ b/press/press/doctype/ssh_certificate_authority/ssh_certificate_authority.py @@ -55,7 +55,7 @@ class SSHCertificateAuthority(Document): if not os.path.exists(self.private_key_file) and not os.path.exists( self.public_key_file ): - domain = jingrow.db.get_value("Press Settings", None, "domain") + domain = jingrow.db.get_value("Jcloude Settings", None, "domain") self.run( f"ssh-keygen -C ca@{domain} -t rsa -b 4096 -f ca -N ''", directory=self.directory ) @@ -138,7 +138,7 @@ class SSHCertificateAuthority(Document): host_key_path = os.path.join(self.build_directory, "ssh_host_rsa_key.pub") - domain = jingrow.db.get_value("Press Settings", None, "domain") + domain = jingrow.db.get_value("Jcloude Settings", None, "domain") self.sign( domain, None, "+52w", host_key_path, cint(self.docker_image_tag) + 1, host_key=True ) @@ -150,7 +150,7 @@ class SSHCertificateAuthority(Document): ) settings = jingrow.db.get_value( - "Press Settings", + "Jcloude Settings", None, ["domain", "docker_registry_url", "docker_registry_namespace"], as_dict=True, @@ -172,7 +172,7 @@ class SSHCertificateAuthority(Document): def _push_docker_image(self): settings = jingrow.db.get_value( - "Press Settings", + "Jcloude Settings", None, ["docker_registry_url", "docker_registry_username", "docker_registry_password"], as_dict=True, diff --git a/press/press/doctype/ssh_key/ssh_key.json b/press/press/doctype/ssh_key/ssh_key.json index 94c80268..72ce1f87 100644 --- a/press/press/doctype/ssh_key/ssh_key.json +++ b/press/press/doctype/ssh_key/ssh_key.json @@ -37,7 +37,7 @@ "links": [], "modified": "2024-02-05 15:49:59.460166", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "SSH Key", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/storage_integration_bucket/storage_integration_bucket.json b/press/press/doctype/storage_integration_bucket/storage_integration_bucket.json index e4af69cb..96c2412c 100644 --- a/press/press/doctype/storage_integration_bucket/storage_integration_bucket.json +++ b/press/press/doctype/storage_integration_bucket/storage_integration_bucket.json @@ -42,7 +42,7 @@ "links": [], "modified": "2022-02-21 21:36:04.024443", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Storage Integration Bucket", "naming_rule": "By fieldname", "owner": "Administrator", diff --git a/press/press/doctype/storage_integration_subscription/storage_integration_subscription.json b/press/press/doctype/storage_integration_subscription/storage_integration_subscription.json index 6d8cb53e..cb9980cd 100644 --- a/press/press/doctype/storage_integration_subscription/storage_integration_subscription.json +++ b/press/press/doctype/storage_integration_subscription/storage_integration_subscription.json @@ -97,7 +97,7 @@ "links": [], "modified": "2022-03-15 09:41:07.473261", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Storage Integration Subscription", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/stripe_micro_charge_record/stripe_micro_charge_record.json b/press/press/doctype/stripe_micro_charge_record/stripe_micro_charge_record.json index f390e30d..6497fd73 100644 --- a/press/press/doctype/stripe_micro_charge_record/stripe_micro_charge_record.json +++ b/press/press/doctype/stripe_micro_charge_record/stripe_micro_charge_record.json @@ -54,7 +54,7 @@ "links": [], "modified": "2022-11-07 11:39:59.912308", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Stripe Micro Charge Record", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/stripe_payment_event/stripe_payment_event.json b/press/press/doctype/stripe_payment_event/stripe_payment_event.json index 4d94c227..b8ce7be6 100644 --- a/press/press/doctype/stripe_payment_event/stripe_payment_event.json +++ b/press/press/doctype/stripe_payment_event/stripe_payment_event.json @@ -60,7 +60,7 @@ "links": [], "modified": "2021-10-31 15:29:13.658976", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Stripe Payment Event", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/stripe_payment_method/stripe_payment_method.json b/press/press/doctype/stripe_payment_method/stripe_payment_method.json index af3a0e76..46765e6a 100644 --- a/press/press/doctype/stripe_payment_method/stripe_payment_method.json +++ b/press/press/doctype/stripe_payment_method/stripe_payment_method.json @@ -114,7 +114,7 @@ "links": [], "modified": "2024-06-26 10:29:16.449579", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Stripe Payment Method", "naming_rule": "Expression", "owner": "Administrator", @@ -135,7 +135,7 @@ "create": 1, "delete": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 } ], diff --git a/press/press/doctype/stripe_webhook_log/stripe_webhook_log.json b/press/press/doctype/stripe_webhook_log/stripe_webhook_log.json index bf601e5d..1dab7ab4 100644 --- a/press/press/doctype/stripe_webhook_log/stripe_webhook_log.json +++ b/press/press/doctype/stripe_webhook_log/stripe_webhook_log.json @@ -80,7 +80,7 @@ "links": [], "modified": "2024-11-29 10:44:55.011202", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Stripe Webhook Log", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/stripe_webhook_log/stripe_webhook_log.py b/press/press/doctype/stripe_webhook_log/stripe_webhook_log.py index 3e5fd18b..a20683e4 100644 --- a/press/press/doctype/stripe_webhook_log/stripe_webhook_log.py +++ b/press/press/doctype/stripe_webhook_log/stripe_webhook_log.py @@ -143,7 +143,7 @@ def get_invoice_id(form_dict): def parse_payload(payload, signature): - secret = jingrow.db.get_single_value("Press Settings", "stripe_webhook_secret") + secret = jingrow.db.get_single_value("Jcloude Settings", "stripe_webhook_secret") stripe = get_stripe() try: return stripe.Webhook.construct_event(payload, signature, secret) diff --git a/press/press/doctype/subscription/subscription.json b/press/press/doctype/subscription/subscription.json index 3ff91ecd..10dbfbe2 100644 --- a/press/press/doctype/subscription/subscription.json +++ b/press/press/doctype/subscription/subscription.json @@ -110,7 +110,7 @@ ], "modified": "2025-12-02 14:15:27.501756", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Subscription", "naming_rule": "Random", "owner": "Administrator", @@ -130,13 +130,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/subscription/subscription.py b/press/press/doctype/subscription/subscription.py index 3888fe85..999e0a96 100644 --- a/press/press/doctype/subscription/subscription.py +++ b/press/press/doctype/subscription/subscription.py @@ -293,10 +293,10 @@ def create_usage_records_of_date( Creates daily usage records for paid Subscriptions If no date is provided, it defaults to today. - If usage_record_creation_batch_size is not provided, it will fetch from `Press Settings` or default to 500. + If usage_record_creation_batch_size is not provided, it will fetch from `Jcloude Settings` or default to 500. """ free_sites = sites_with_free_hosting() - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") subscriptions = jingrow.db.get_all( "Subscription", filters={ diff --git a/press/press/doctype/support_access/support_access.json b/press/press/doctype/support_access/support_access.json index f3f2f765..40f91ee2 100644 --- a/press/press/doctype/support_access/support_access.json +++ b/press/press/doctype/support_access/support_access.json @@ -145,7 +145,7 @@ "links": [], "modified": "2025-11-14 21:55:56.574233", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Support Access", "naming_rule": "Random", "owner": "Administrator", @@ -169,7 +169,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Support Agent", + "role": "Jcloude Support Agent", "share": 1 }, { @@ -178,7 +178,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -188,7 +188,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/support_access/support_access.py b/press/press/doctype/support_access/support_access.py index a326d3be..34b29a09 100644 --- a/press/press/doctype/support_access/support_access.py +++ b/press/press/doctype/support_access/support_access.py @@ -239,7 +239,7 @@ class SupportAccess(Document): jingrow.get_pg( { - "doctype": "Press Notification", + "doctype": "Jcloude Notification", "team": self.requested_team, "type": "Support Access", "document_type": "Support Access", @@ -251,7 +251,7 @@ class SupportAccess(Document): jingrow.publish_realtime( "jcloude_notification", - doctype="Press Notification", + doctype="Jcloude Notification", message={ "team": self.requested_team, }, @@ -275,7 +275,7 @@ class SupportAccess(Document): jingrow.get_pg( { - "doctype": "Press Notification", + "doctype": "Jcloude Notification", "team": self.target_team, "type": "Support Access", "document_type": "Support Access", @@ -287,7 +287,7 @@ class SupportAccess(Document): jingrow.publish_realtime( "jcloude_notification", - doctype="Press Notification", + doctype="Jcloude Notification", message={ "team": self.target_team, }, diff --git a/press/press/doctype/support_access_resource/support_access_resource.json b/press/press/doctype/support_access_resource/support_access_resource.json index 99d32429..5e6a52af 100644 --- a/press/press/doctype/support_access_resource/support_access_resource.json +++ b/press/press/doctype/support_access_resource/support_access_resource.json @@ -31,7 +31,7 @@ "links": [], "modified": "2025-10-07 16:52:18.845514", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Support Access Resource", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/team/team.json b/press/press/doctype/team/team.json index dcfda2c7..9645b0b9 100644 --- a/press/press/doctype/team/team.json +++ b/press/press/doctype/team/team.json @@ -704,7 +704,7 @@ ], "modified": "2025-11-06 18:07:54.307229", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Team", "naming_rule": "Random", "owner": "Administrator", @@ -724,7 +724,7 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { @@ -732,7 +732,7 @@ "export": 1, "print": 1, "report": 1, - "role": "Press Marketplace Manager", + "role": "Jcloude Marketplace Manager", "select": 1, "share": 1 } diff --git a/press/press/doctype/team/team.py b/press/press/doctype/team/team.py index 65bd8401..317f9504 100644 --- a/press/press/doctype/team/team.py +++ b/press/press/doctype/team/team.py @@ -166,8 +166,8 @@ class Team(Document): pg.user_info = user pg.balance = self.get_balance() pg.is_desk_user = user.user_type == "System User" - pg.is_support_agent = has_role("Press Support Agent") - pg.can_request_access = has_role("Press Support Agent") + pg.is_support_agent = has_role("Jcloude Support Agent") + pg.can_request_access = has_role("Jcloude Support Agent") pg.valid_teams = get_valid_teams_for_user(jingrow.session.user) pg.onboarding = self.get_onboarding() pg.billing_info = self.billing_info() @@ -192,7 +192,7 @@ class Team(Document): pg.receive_budget_alerts = self.receive_budget_alerts pg.monthly_alert_threshold = self.monthly_alert_threshold pg.is_binlog_indexer_enabled = not jingrow.db.get_single_value( - "Press Settings", "disable_binlog_indexer_service", cache=True + "Jcloude Settings", "disable_binlog_indexer_service", cache=True ) def onload(self): @@ -372,7 +372,7 @@ class Team(Document): self.save(ignore_permissions=True) for role in jcloude_roles or []: - jingrow.get_pg("Press Role", role.jcloude_role).add_user( + jingrow.get_pg("Jcloude Role", role.jcloude_role).add_user( user.name, skip_validations=skip_validations, ) @@ -383,8 +383,8 @@ class Team(Document): if member_to_remove: self.remove(member_to_remove) - PressRole = jingrow.qb.DocType("Press Role") - PressRoleUser = jingrow.qb.DocType("Press Role User") + PressRole = jingrow.qb.DocType("Jcloude Role") + PressRoleUser = jingrow.qb.DocType("Jcloude Role User") roles = ( jingrow.qb.from_(PressRole) .join(PressRoleUser) @@ -395,7 +395,7 @@ class Team(Document): ) for role in roles: - jingrow.get_pg("Press Role", role).remove_user(member) + jingrow.get_pg("Jcloude Role", role).remove_user(member) else: jingrow.throw(f"Team member {jingrow.bold(member)} does not exists") @@ -839,8 +839,8 @@ class Team(Document): """ Checks if the current user has admin access in the team via roles. """ - PressRole = jingrow.qb.DocType("Press Role") - PressRoleUser = jingrow.qb.DocType("Press Role User") + PressRole = jingrow.qb.DocType("Jcloude Role") + PressRoleUser = jingrow.qb.DocType("Jcloude Role User") return ( jingrow.qb.from_(PressRoleUser) .left_join(PressRole) @@ -864,8 +864,8 @@ class Team(Document): def invite_team_member(self, email, roles=None): from jingrow.utils.user import is_system_user - PressRole = jingrow.qb.DocType("Press Role") - PressRoleUser = jingrow.qb.DocType("Press Role User") + PressRole = jingrow.qb.DocType("Jcloude Role") + PressRoleUser = jingrow.qb.DocType("Jcloude Role User") has_admin_access = ( jingrow.qb.from_(PressRole) @@ -900,7 +900,7 @@ class Team(Document): "doctype": "Account Request", "team": self.name, "email": email, - "role": "Press Member", + "role": "Jcloude Member", "invited_by": self.user, "send_email": True, } @@ -984,10 +984,10 @@ class Team(Document): micro_debit_charge_field = ( "micro_debit_charge_usd" if self.currency == "USD" else "micro_debit_charge_inr" ) - amount = jingrow.db.get_single_value("Press Settings", micro_debit_charge_field) + amount = jingrow.db.get_single_value("Jcloude Settings", micro_debit_charge_field) return { - "gst_percentage": jingrow.db.get_single_value("Press Settings", "gst_percentage"), + "gst_percentage": jingrow.db.get_single_value("Jcloude Settings", "gst_percentage"), "micro_debit_charge_amount": amount, "balance": self.get_balance(), "verified_micro_charge": bool( diff --git a/press/press/doctype/team/test_team.py b/press/press/doctype/team/test_team.py index 6d21811a..93bf3117 100644 --- a/press/press/doctype/team/test_team.py +++ b/press/press/doctype/team/test_team.py @@ -23,7 +23,7 @@ def create_test_jcloude_admin_team( create_test_user(email) user = jingrow.get_pg("User", {"email": email}) user.remove_roles(*jingrow.get_all("Role", pluck="name")) - user.add_roles("Press Admin") + user.add_roles("Jcloude Admin") return create_test_team(email, skip_onboarding=skip_onboarding, free_account=free_account) diff --git a/press/press/doctype/team_change/team_change.json b/press/press/doctype/team_change/team_change.json index 9af570db..ab8035e1 100644 --- a/press/press/doctype/team_change/team_change.json +++ b/press/press/doctype/team_change/team_change.json @@ -73,7 +73,7 @@ "links": [], "modified": "2025-02-20 13:46:49.448661", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Team Change", "owner": "Administrator", "permissions": [ @@ -96,7 +96,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -107,7 +107,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/team_deletion_request/team_deletion_request.json b/press/press/doctype/team_deletion_request/team_deletion_request.json index d91d91f9..7d307143 100644 --- a/press/press/doctype/team_deletion_request/team_deletion_request.json +++ b/press/press/doctype/team_deletion_request/team_deletion_request.json @@ -89,7 +89,7 @@ "links": [], "modified": "2021-04-26 13:13:50.519109", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Team Deletion Request", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/team_member/team_member.json b/press/press/doctype/team_member/team_member.json index bf971126..71170c6a 100644 --- a/press/press/doctype/team_member/team_member.json +++ b/press/press/doctype/team_member/team_member.json @@ -27,7 +27,7 @@ "links": [], "modified": "2020-07-31 11:48:59.695189", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Team Member", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/team_member_deletion_request/team_member_deletion_request.json b/press/press/doctype/team_member_deletion_request/team_member_deletion_request.json index f8b3d22c..ba72faa7 100644 --- a/press/press/doctype/team_member_deletion_request/team_member_deletion_request.json +++ b/press/press/doctype/team_member_deletion_request/team_member_deletion_request.json @@ -36,7 +36,7 @@ "links": [], "modified": "2021-04-26 16:08:26.691639", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Team Member Deletion Request", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/team_member_impersonation/team_member_impersonation.json b/press/press/doctype/team_member_impersonation/team_member_impersonation.json index 8f9e6a41..5532f9e9 100644 --- a/press/press/doctype/team_member_impersonation/team_member_impersonation.json +++ b/press/press/doctype/team_member_impersonation/team_member_impersonation.json @@ -67,7 +67,7 @@ "links": [], "modified": "2020-07-31 12:11:35.425693", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Team Member Impersonation", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/team_onboarding/team_onboarding.json b/press/press/doctype/team_onboarding/team_onboarding.json index ee6938c0..fcaf2011 100644 --- a/press/press/doctype/team_onboarding/team_onboarding.json +++ b/press/press/doctype/team_onboarding/team_onboarding.json @@ -30,7 +30,7 @@ "links": [], "modified": "2020-08-27 17:53:33.267271", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Team Onboarding", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/telegram_group/patches/create_groups_from_press_settings.py b/press/press/doctype/telegram_group/patches/create_groups_from_press_settings.py index 39928881..76655d9f 100644 --- a/press/press/doctype/telegram_group/patches/create_groups_from_press_settings.py +++ b/press/press/doctype/telegram_group/patches/create_groups_from_press_settings.py @@ -7,7 +7,7 @@ def execute(): jingrow.reload_pg("jcloude", "doctype", "telegram_group_topic") jingrow.reload_pg("jcloude", "doctype", "telegram_group") jingrow.reload_pg("jcloude", "doctype", "jcloude_settings") - settings = jingrow.get_pg("Press Settings") + settings = jingrow.get_pg("Jcloude Settings") if settings.telegram_alert_chat_id: group = jingrow.get_pg( { diff --git a/press/press/doctype/telegram_group/telegram_group.json b/press/press/doctype/telegram_group/telegram_group.json index a4711a77..87222d7a 100644 --- a/press/press/doctype/telegram_group/telegram_group.json +++ b/press/press/doctype/telegram_group/telegram_group.json @@ -37,7 +37,7 @@ "links": [], "modified": "2023-12-14 12:49:59.132352", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Telegram Group", "naming_rule": "Set by user", "owner": "Administrator", diff --git a/press/press/doctype/telegram_group_topic/telegram_group_topic.json b/press/press/doctype/telegram_group_topic/telegram_group_topic.json index d886e83f..474251ad 100644 --- a/press/press/doctype/telegram_group_topic/telegram_group_topic.json +++ b/press/press/doctype/telegram_group_topic/telegram_group_topic.json @@ -31,7 +31,7 @@ "links": [], "modified": "2023-05-12 12:25:21.167281", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Telegram Group Topic", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/telegram_message/telegram_message.json b/press/press/doctype/telegram_message/telegram_message.json index 66abf412..8cbf1070 100644 --- a/press/press/doctype/telegram_message/telegram_message.json +++ b/press/press/doctype/telegram_message/telegram_message.json @@ -91,7 +91,7 @@ "links": [], "modified": "2024-05-22 15:25:47.007102", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Telegram Message", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/tls_certificate/tls_certificate.json b/press/press/doctype/tls_certificate/tls_certificate.json index 80f08b87..ced8042e 100644 --- a/press/press/doctype/tls_certificate/tls_certificate.json +++ b/press/press/doctype/tls_certificate/tls_certificate.json @@ -173,7 +173,7 @@ "links": [], "modified": "2025-04-07 14:24:48.585403", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "TLS Certificate", "owner": "Administrator", "permissions": [ @@ -193,14 +193,14 @@ "create": 1, "delete": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "delete": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/tls_certificate/tls_certificate.py b/press/press/doctype/tls_certificate/tls_certificate.py index 690d3d68..ee8c49ed 100644 --- a/press/press/doctype/tls_certificate/tls_certificate.py +++ b/press/press/doctype/tls_certificate/tls_certificate.py @@ -119,7 +119,7 @@ class TLSCertificate(Document): if self.provider != "Let's Encrypt": return try: - settings = jingrow.get_pg("Press Settings", "Press Settings") + settings = jingrow.get_pg("Jcloude Settings", "Jcloude Settings") ca = LetsEncrypt(settings) ( self.certificate, @@ -320,7 +320,7 @@ def rollback_and_fail_tls(certificate: PendingCertificate, e: Exception): def renew_tls_certificates(): - tls_renewal_queue_size = jingrow.db.get_single_value("Press Settings", "tls_renewal_queue_size") + tls_renewal_queue_size = jingrow.db.get_single_value("Jcloude Settings", "tls_renewal_queue_size") pending = jingrow.get_all( "TLS Certificate", fields=["name", "domain", "wildcard", "retry_count"], diff --git a/press/press/doctype/trace_server/trace_server.json b/press/press/doctype/trace_server/trace_server.json index d754191a..a3019149 100644 --- a/press/press/doctype/trace_server/trace_server.json +++ b/press/press/doctype/trace_server/trace_server.json @@ -278,7 +278,7 @@ ], "modified": "2025-09-02 16:44:01.317526", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Trace Server", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/trace_server/trace_server.py b/press/press/doctype/trace_server/trace_server.py index 5617ad7d..8305b493 100644 --- a/press/press/doctype/trace_server/trace_server.py +++ b/press/press/doctype/trace_server/trace_server.py @@ -64,7 +64,7 @@ class TraceServer(BaseServer): ) certificate = jingrow.get_pg("TLS Certificate", certificate_name) - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if log_server: kibana_password = jingrow.get_pg("Log Server", log_server).get_password("kibana_password") else: diff --git a/press/press/doctype/usage_record/usage_record.json b/press/press/doctype/usage_record/usage_record.json index 8c7f449b..d4e95abc 100644 --- a/press/press/doctype/usage_record/usage_record.json +++ b/press/press/doctype/usage_record/usage_record.json @@ -148,7 +148,7 @@ "links": [], "modified": "2024-08-23 16:46:05.290651", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Usage Record", "naming_rule": "Expression (old style)", "owner": "Administrator", diff --git a/press/press/doctype/user_2fa/user_2fa.json b/press/press/doctype/user_2fa/user_2fa.json index 66f00e5a..2dbeb521 100644 --- a/press/press/doctype/user_2fa/user_2fa.json +++ b/press/press/doctype/user_2fa/user_2fa.json @@ -54,7 +54,7 @@ "links": [], "modified": "2025-06-21 16:04:54.476967", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "User 2FA", "naming_rule": "By fieldname", "owner": "Administrator", @@ -79,7 +79,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -91,7 +91,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/user_2fa_recovery_code/user_2fa_recovery_code.json b/press/press/doctype/user_2fa_recovery_code/user_2fa_recovery_code.json index e10d5db7..eb1832ce 100644 --- a/press/press/doctype/user_2fa_recovery_code/user_2fa_recovery_code.json +++ b/press/press/doctype/user_2fa_recovery_code/user_2fa_recovery_code.json @@ -29,7 +29,7 @@ "links": [], "modified": "2025-06-21 16:20:54.624042", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "User 2FA Recovery Code", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/user_ssh_certificate/user_ssh_certificate.json b/press/press/doctype/user_ssh_certificate/user_ssh_certificate.json index d3b2cc06..4968c852 100644 --- a/press/press/doctype/user_ssh_certificate/user_ssh_certificate.json +++ b/press/press/doctype/user_ssh_certificate/user_ssh_certificate.json @@ -141,7 +141,7 @@ "links": [], "modified": "2022-05-24 21:48:18.886106", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "User SSH Certificate", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/user_ssh_key/user_ssh_key.json b/press/press/doctype/user_ssh_key/user_ssh_key.json index 5aae72bd..b755f729 100644 --- a/press/press/doctype/user_ssh_key/user_ssh_key.json +++ b/press/press/doctype/user_ssh_key/user_ssh_key.json @@ -61,7 +61,7 @@ "links": [], "modified": "2025-01-30 17:39:14.574515", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "User SSH Key", "owner": "Administrator", "permissions": [ @@ -82,7 +82,7 @@ "delete": 1, "if_owner": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { @@ -90,7 +90,7 @@ "delete": 1, "if_owner": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/version_upgrade/version_upgrade.json b/press/press/doctype/version_upgrade/version_upgrade.json index 39966c03..23b45441 100644 --- a/press/press/doctype/version_upgrade/version_upgrade.json +++ b/press/press/doctype/version_upgrade/version_upgrade.json @@ -103,7 +103,7 @@ "links": [], "modified": "2024-10-23 22:33:56.984926", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Version Upgrade", "owner": "Administrator", "permissions": [ @@ -125,7 +125,7 @@ "export": 1, "print": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -135,7 +135,7 @@ "export": 1, "print": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.json b/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.json index f00f10c4..838edb3d 100644 --- a/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.json +++ b/press/press/doctype/virtual_disk_snapshot/virtual_disk_snapshot.json @@ -185,7 +185,7 @@ ], "modified": "2025-09-12 18:31:18.904020", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Virtual Disk Snapshot", "owner": "Administrator", "permissions": [ @@ -209,7 +209,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -219,7 +219,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1 } ], diff --git a/press/press/doctype/virtual_machine/virtual_machine.json b/press/press/doctype/virtual_machine/virtual_machine.json index a5b671b0..aca85419 100644 --- a/press/press/doctype/virtual_machine/virtual_machine.json +++ b/press/press/doctype/virtual_machine/virtual_machine.json @@ -428,7 +428,7 @@ ], "modified": "2025-10-13 14:56:34.498409", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Virtual Machine", "owner": "Administrator", "permissions": [ @@ -447,13 +447,13 @@ { "create": 1, "read": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "write": 1 }, { "create": 1, "read": 1, - "role": "Press Member", + "role": "Jcloude Member", "write": 1 } ], diff --git a/press/press/doctype/virtual_machine/virtual_machine.py b/press/press/doctype/virtual_machine/virtual_machine.py index d0bbbade..07a26973 100644 --- a/press/press/doctype/virtual_machine/virtual_machine.py +++ b/press/press/doctype/virtual_machine/virtual_machine.py @@ -1397,7 +1397,7 @@ class VirtualMachine(Document): if self.cloud_provider == "OCI": return (client_type or ComputeClient)(cluster.get_oci_config()) if self.cloud_provider == "Hetzner": - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") api_token = settings.get_password("hetzner_api_token") return Client(token=api_token) @@ -2136,7 +2136,7 @@ def snapshot_aws_servers(): for server_type, name in servers: if ( jingrow.db.count( - "Press Job", + "Jcloude Job", filters={ "status": ("in", ["Pending", "Running"]), "server_type": server_type, diff --git a/press/press/doctype/virtual_machine_image/virtual_machine_image.json b/press/press/doctype/virtual_machine_image/virtual_machine_image.json index c50385a1..39d1f6aa 100644 --- a/press/press/doctype/virtual_machine_image/virtual_machine_image.json +++ b/press/press/doctype/virtual_machine_image/virtual_machine_image.json @@ -184,7 +184,7 @@ "links": [], "modified": "2025-10-13 14:56:47.398186", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Virtual Machine Image", "owner": "Administrator", "permissions": [ diff --git a/press/press/doctype/virtual_machine_image/virtual_machine_image.py b/press/press/doctype/virtual_machine_image/virtual_machine_image.py index 2c75047b..ef9614dd 100644 --- a/press/press/doctype/virtual_machine_image/virtual_machine_image.py +++ b/press/press/doctype/virtual_machine_image/virtual_machine_image.py @@ -262,7 +262,7 @@ class VirtualMachineImage(Document): if cluster.cloud_provider == "OCI": return ComputeClient(cluster.get_oci_config()) if cluster.cloud_provider == "Hetzner": - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") api_token = settings.get_password("hetzner_api_token") return Client(token=api_token) return None diff --git a/press/press/doctype/virtual_machine_image_volume/virtual_machine_image_volume.json b/press/press/doctype/virtual_machine_image_volume/virtual_machine_image_volume.json index 0f08f784..d14d1f9e 100644 --- a/press/press/doctype/virtual_machine_image_volume/virtual_machine_image_volume.json +++ b/press/press/doctype/virtual_machine_image_volume/virtual_machine_image_volume.json @@ -52,7 +52,7 @@ "links": [], "modified": "2024-09-25 14:23:33.386098", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Virtual Machine Image Volume", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.json b/press/press/doctype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.json index 52c8b2a2..ab7e0cbf 100644 --- a/press/press/doctype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.json +++ b/press/press/doctype/virtual_machine_temporary_volume/virtual_machine_temporary_volume.json @@ -22,7 +22,7 @@ "links": [], "modified": "2025-01-15 11:48:44.056676", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Virtual Machine Temporary Volume", "owner": "Administrator", "permissions": [], diff --git a/press/press/doctype/virtual_machine_volume/virtual_machine_volume.json b/press/press/doctype/virtual_machine_volume/virtual_machine_volume.json index 76a1b076..bdcefe00 100644 --- a/press/press/doctype/virtual_machine_volume/virtual_machine_volume.json +++ b/press/press/doctype/virtual_machine_volume/virtual_machine_volume.json @@ -116,7 +116,7 @@ "links": [], "modified": "2025-10-16 13:11:45.102040", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Virtual Machine Volume", "naming_rule": "Autoincrement", "owner": "Administrator", diff --git a/press/press/doctype/wireguard_peer/wireguard_peer.json b/press/press/doctype/wireguard_peer/wireguard_peer.json index 8a9dfe93..48727d7a 100644 --- a/press/press/doctype/wireguard_peer/wireguard_peer.json +++ b/press/press/doctype/wireguard_peer/wireguard_peer.json @@ -153,7 +153,7 @@ "links": [], "modified": "2024-03-11 18:18:39.689700", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Wireguard Peer", "owner": "Administrator", "permissions": [ diff --git a/press/press/report/agent_versions/agent_versions.json b/press/press/report/agent_versions/agent_versions.json index 5a6209a6..5e30d5c5 100644 --- a/press/press/report/agent_versions/agent_versions.json +++ b/press/press/report/agent_versions/agent_versions.json @@ -51,7 +51,7 @@ "letterhead": null, "modified": "2025-01-17 10:49:27.237566", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Agent Versions", "owner": "Administrator", "prepared_report": 0, @@ -63,10 +63,10 @@ "role": "System Manager" }, { - "role": "Press Member" + "role": "Jcloude Member" }, { - "role": "Press Admin" + "role": "Jcloude Admin" } ], "timeout": 0 diff --git a/press/press/report/aws_instance_pricing/aws_instance_pricing.json b/press/press/report/aws_instance_pricing/aws_instance_pricing.json index 46ddf3aa..51d779b9 100644 --- a/press/press/report/aws_instance_pricing/aws_instance_pricing.json +++ b/press/press/report/aws_instance_pricing/aws_instance_pricing.json @@ -143,7 +143,7 @@ "letterhead": null, "modified": "2023-11-06 19:08:45.728372", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "AWS Instance Pricing", "owner": "Administrator", "prepared_report": 0, diff --git a/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json b/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json index b4ca072a..acad9042 100644 --- a/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json +++ b/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.json @@ -160,7 +160,7 @@ "letterhead": null, "modified": "2024-09-17 15:45:42.606684", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "AWS Rightsizing Recommendation", "owner": "Administrator", "prepared_report": 0, diff --git a/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.py b/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.py index 6cf7bd31..f2faaeaf 100644 --- a/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.py +++ b/press/press/report/aws_rightsizing_recommendation/aws_rightsizing_recommendation.py @@ -29,7 +29,7 @@ def execute(filters=None): def get_data(resource_type, action_type): # noqa: C901 - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") client = boto3.client( "cost-optimization-hub", region_name="us-east-1", @@ -73,7 +73,7 @@ def get_data(resource_type, action_type): # noqa: C901 ) if not virtual_machine: - # This resource is not managed by Press. Ignore + # This resource is not managed by Jcloude. Ignore continue virtual_machine = virtual_machine[0] @@ -148,7 +148,7 @@ def rightsize_volumes(filters): volume = find(machine.volumes, lambda v: v.volume_id == row.volume_id) if not volume: - # This volume is not managed by Press. Ignore + # This volume is not managed by Jcloude. Ignore continue # Always downgrade performance diff --git a/press/press/report/bench_memory_limits/bench_memory_limits.json b/press/press/report/bench_memory_limits/bench_memory_limits.json index b64c8432..4d3c3bc1 100644 --- a/press/press/report/bench_memory_limits/bench_memory_limits.json +++ b/press/press/report/bench_memory_limits/bench_memory_limits.json @@ -21,7 +21,7 @@ "letterhead": null, "modified": "2023-10-20 11:26:37.053554", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Bench Memory Limits", "owner": "Administrator", "prepared_report": 0, @@ -32,13 +32,13 @@ "report_type": "Script Report", "roles": [ { - "role": "Press Admin" + "role": "Jcloude Admin" }, { "role": "System Manager" }, { - "role": "Press Member" + "role": "Jcloude Member" }, { "role": "Site Manager" diff --git a/press/press/report/binary_log_browser/binary_log_browser.json b/press/press/report/binary_log_browser/binary_log_browser.json index e9108995..740108e5 100644 --- a/press/press/report/binary_log_browser/binary_log_browser.json +++ b/press/press/report/binary_log_browser/binary_log_browser.json @@ -11,7 +11,7 @@ "is_standard": "Yes", "modified": "2022-11-08 17:10:27.848613", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Binary Log Browser", "owner": "Administrator", "prepared_report": 0, diff --git a/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json b/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json index 2cde6ac1..66807bc2 100644 --- a/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json +++ b/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.json @@ -10,7 +10,7 @@ "is_standard": "Yes", "modified": "2023-05-18 21:38:03.790092", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "MariaDB Deadlock Browser", "owner": "Administrator", "prepared_report": 0, diff --git a/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.py b/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.py index 1d6e1c8c..70a78758 100644 --- a/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.py +++ b/press/press/report/mariadb_deadlock_browser/mariadb_deadlock_browser.py @@ -22,7 +22,7 @@ def fetch_mariadb_error_logs( ) -> list[tuple[str, str]]: server = jingrow.get_value("Site", site, "server") database_server = jingrow.get_value("Server", server, "database_server") - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if not log_server: return [] @@ -248,7 +248,7 @@ COLUMNS = [ def execute(filters=None): - jingrow.only_for(["System Manager", "Site Manager", "Press Admin", "Press Member"]) + jingrow.only_for(["System Manager", "Site Manager", "Jcloude Admin", "Jcloude Member"]) filters.database = jingrow.db.get_value("Site", filters.site, "database_name") if not filters.database: jingrow.throw( diff --git a/press/press/report/mariadb_locks_list/mariadb_locks_list.json b/press/press/report/mariadb_locks_list/mariadb_locks_list.json index e186acd5..8fc6897e 100644 --- a/press/press/report/mariadb_locks_list/mariadb_locks_list.json +++ b/press/press/report/mariadb_locks_list/mariadb_locks_list.json @@ -28,7 +28,7 @@ "letterhead": null, "modified": "2024-03-24 12:46:56.826427", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "MariaDB Locks List", "owner": "Administrator", "prepared_report": 0, diff --git a/press/press/report/mariadb_process_list/mariadb_process_list.json b/press/press/report/mariadb_process_list/mariadb_process_list.json index d7345bb9..421ac145 100644 --- a/press/press/report/mariadb_process_list/mariadb_process_list.json +++ b/press/press/report/mariadb_process_list/mariadb_process_list.json @@ -20,7 +20,7 @@ "is_standard": "Yes", "modified": "2022-11-08 17:10:07.815004", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "MariaDB Process List", "owner": "Administrator", "prepared_report": 0, diff --git a/press/press/report/mariadb_slow_queries/mariadb_slow_queries.json b/press/press/report/mariadb_slow_queries/mariadb_slow_queries.json index d32316c0..c7fd901c 100644 --- a/press/press/report/mariadb_slow_queries/mariadb_slow_queries.json +++ b/press/press/report/mariadb_slow_queries/mariadb_slow_queries.json @@ -11,7 +11,7 @@ "letterhead": null, "modified": "2024-12-23 11:36:40.301426", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "MariaDB Slow Queries", "owner": "Administrator", "prepared_report": 0, diff --git a/press/press/report/mariadb_slow_queries/mariadb_slow_queries.py b/press/press/report/mariadb_slow_queries/mariadb_slow_queries.py index f14f227f..6926c9a7 100644 --- a/press/press/report/mariadb_slow_queries/mariadb_slow_queries.py +++ b/press/press/report/mariadb_slow_queries/mariadb_slow_queries.py @@ -15,7 +15,7 @@ from jingrow.utils.password import get_decrypted_password def execute(filters=None): - jingrow.only_for(["System Manager", "Site Manager", "Press Admin", "Press Member"]) + jingrow.only_for(["System Manager", "Site Manager", "Jcloude Admin", "Jcloude Member"]) filters.database = jingrow.db.get_value("Site", filters.site, "database_name") make_access_log( @@ -108,7 +108,7 @@ def get_data(filters): def get_slow_query_logs(database, start_datetime, end_datetime, search_pattern, size): - log_server = jingrow.db.get_single_value("Press Settings", "log_server") + log_server = jingrow.db.get_single_value("Jcloude Settings", "log_server") if not log_server: return [] diff --git a/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json b/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json index 13193bd6..30354917 100644 --- a/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json +++ b/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.json @@ -11,7 +11,7 @@ "letterhead": null, "modified": "2025-01-21 20:53:27.388232", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Marketplace App Repository Visibility", "owner": "Administrator", "prepared_report": 1, @@ -24,7 +24,7 @@ "role": "System Manager" }, { - "role": "Press Admin" + "role": "Jcloude Admin" } ], "timeout": 3000 diff --git a/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.py b/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.py index 828f5f7a..fa487e90 100644 --- a/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.py +++ b/press/press/report/marketplace_app_repository_visibility/marketplace_app_repository_visibility.py @@ -98,7 +98,7 @@ def execute(filters=None): """, as_dict=True, ) - personal_access_token = jingrow.db.get_value("Press Settings", "None", "github_pat_token") + personal_access_token = jingrow.db.get_value("Jcloude Settings", "None", "github_pat_token") visibility_cache = {} for row in data: diff --git a/press/press/report/payment_partner/payment_partner.json b/press/press/report/payment_partner/payment_partner.json index 051dd7f3..5dce01e0 100644 --- a/press/press/report/payment_partner/payment_partner.json +++ b/press/press/report/payment_partner/payment_partner.json @@ -11,7 +11,7 @@ "letterhead": null, "modified": "2024-11-25 15:50:14.609170", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Payment Partner", "owner": "Administrator", "prepared_report": 0, diff --git a/press/press/report/press_endpoints_audit/press_endpoints_audit.js b/press/press/report/press_endpoints_audit/press_endpoints_audit.js index c3c7a6a1..c6a23d66 100644 --- a/press/press/report/press_endpoints_audit/press_endpoints_audit.js +++ b/press/press/report/press_endpoints_audit/press_endpoints_audit.js @@ -1,6 +1,6 @@ // Copyright (c) 2025, JINGROW // For license information, please see license.txt -jingrow.query_reports['Press Endpoints Audit'] = { +jingrow.query_reports['Jcloude Endpoints Audit'] = { filters: [], }; diff --git a/press/press/report/press_endpoints_audit/press_endpoints_audit.json b/press/press/report/press_endpoints_audit/press_endpoints_audit.json index 31b55981..11ecf740 100644 --- a/press/press/report/press_endpoints_audit/press_endpoints_audit.json +++ b/press/press/report/press_endpoints_audit/press_endpoints_audit.json @@ -12,12 +12,12 @@ "letterhead": null, "modified": "2025-08-29 19:46:33.884456", "modified_by": "Administrator", - "module": "Press", - "name": "Press Endpoints Audit", + "module": "Jcloude", + "name": "Jcloude Endpoints Audit", "owner": "Administrator", "prepared_report": 0, "ref_doctype": "Site", - "report_name": "Press Endpoints Audit", + "report_name": "Jcloude Endpoints Audit", "report_type": "Script Report", "roles": [ { diff --git a/press/press/report/server_stats/server_stats.json b/press/press/report/server_stats/server_stats.json index 3b758127..edcb4dfc 100644 --- a/press/press/report/server_stats/server_stats.json +++ b/press/press/report/server_stats/server_stats.json @@ -34,7 +34,7 @@ "is_standard": "Yes", "modified": "2023-05-17 18:33:39.554734", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Server Stats", "owner": "Administrator", "prepared_report": 0, @@ -46,10 +46,10 @@ "role": "System Manager" }, { - "role": "Press Member" + "role": "Jcloude Member" }, { - "role": "Press Admin" + "role": "Jcloude Admin" } ] } \ No newline at end of file diff --git a/press/press/report/shared_app_server_stats/shared_app_server_stats.json b/press/press/report/shared_app_server_stats/shared_app_server_stats.json index 9abe04f7..cf9d0146 100644 --- a/press/press/report/shared_app_server_stats/shared_app_server_stats.json +++ b/press/press/report/shared_app_server_stats/shared_app_server_stats.json @@ -11,7 +11,7 @@ "is_standard": "Yes", "modified": "2023-01-23 10:44:06.770366", "modified_by": "Administrator", - "module": "Press", + "module": "Jcloude", "name": "Shared App Server Stats", "owner": "Administrator", "prepared_report": 0, @@ -23,10 +23,10 @@ "role": "System Manager" }, { - "role": "Press Admin" + "role": "Jcloude Admin" }, { - "role": "Press Member" + "role": "Jcloude Member" } ] } \ No newline at end of file diff --git a/press/press/workspace/press/press.json b/press/press/workspace/press/press.json index b456b1ea..d8084495 100644 --- a/press/press/workspace/press/press.json +++ b/press/press/workspace/press/press.json @@ -1,6 +1,6 @@ { "charts": [], - "content": "[{\"id\":\"zYUVFJZX-t\",\"type\":\"header\",\"data\":{\"text\":\"Jingrow Cloud\",\"col\":12}},{\"id\":\"VFzeFzlnB5\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"iNJ8WoS9kD\",\"type\":\"header\",\"data\":{\"text\":\"Sites\",\"col\":12}},{\"id\":\"EYeJrbXv1P\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Active Sites\",\"col\":3}},{\"id\":\"7jAM0HBrde\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Broken Sites\",\"col\":3}},{\"id\":\"ttO5vXfzL_\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pending Sites\",\"col\":3}},{\"id\":\"nvLoQ_N15n\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Suspended Sites\",\"col\":3}},{\"id\":\"AVO8JCkksy\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"aLqo1uNPYu\",\"type\":\"header\",\"data\":{\"text\":\"Benches\",\"col\":12}},{\"id\":\"BcJPVEkRcy\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Active Benches\",\"col\":3}},{\"id\":\"PhHBf-f1ej\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Broken Benches\",\"col\":3}},{\"id\":\"JJB6cOEiXy\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"7a18ugroq8\",\"type\":\"header\",\"data\":{\"text\":\"Servers\",\"col\":12}},{\"id\":\"M3urSE6cor\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Application Server\",\"col\":3}},{\"id\":\"5qOJXl1CkE\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Database Server\",\"col\":3}},{\"id\":\"PWrCW7DruI\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Proxy Server\",\"col\":3}},{\"id\":\"_GVOmg7C_U\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Hybrid Servers\",\"col\":3}},{\"id\":\"XHWA0NCImO\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"X1dteEUHoR\",\"type\":\"header\",\"data\":{\"text\":\"Settings\",\"col\":12}},{\"id\":\"eeEbYjVj_n\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Press Settings\",\"col\":3}},{\"id\":\"EiWS2tWYwu\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Root Domain\",\"col\":3}},{\"id\":\"EoLO5YYzdR\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Tls Certificate\",\"col\":3}},{\"id\":\"-Jx1Irf-28\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Team\",\"col\":3}},{\"id\":\"n-T0ehr2ca\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"xZEclbenJQ\",\"type\":\"header\",\"data\":{\"text\":\"Masters\",\"col\":12}},{\"id\":\"P6nCUrJreH\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"App\",\"col\":3}},{\"id\":\"1kAyHtrIrJ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"App Source\",\"col\":3}},{\"id\":\"-N-Xb5MVPV\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"App Release\",\"col\":3}},{\"id\":\"ND9oElFB7R\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"0DYlbnEtOT\",\"type\":\"header\",\"data\":{\"text\":\"Subscription\",\"col\":12}},{\"id\":\"eddRzzqwSZ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Server Plan\",\"col\":3}},{\"id\":\"GYk3Frsy1L\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Site Plan\",\"col\":3}},{\"id\":\"o_aDSbQlPf\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Subscription\",\"col\":3}},{\"id\":\"VZSHmE1jzA\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Invoice\",\"col\":3}},{\"id\":\"B8T-3IZ8Qg\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"WDyzNHuOas\",\"type\":\"header\",\"data\":{\"text\":\"Operations\",\"col\":12}},{\"id\":\"Ziby8rOfsU\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Agent Job\",\"col\":3}},{\"id\":\"Vm4Tn0dxiD\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Ansible Play\",\"col\":3}},{\"id\":\"n6VE51hPkc\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Press Job\",\"col\":3}}]", + "content": "[{\"id\":\"zYUVFJZX-t\",\"type\":\"header\",\"data\":{\"text\":\"Jingrow Cloud\",\"col\":12}},{\"id\":\"VFzeFzlnB5\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"iNJ8WoS9kD\",\"type\":\"header\",\"data\":{\"text\":\"Sites\",\"col\":12}},{\"id\":\"EYeJrbXv1P\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Active Sites\",\"col\":3}},{\"id\":\"7jAM0HBrde\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Broken Sites\",\"col\":3}},{\"id\":\"ttO5vXfzL_\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Pending Sites\",\"col\":3}},{\"id\":\"nvLoQ_N15n\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Suspended Sites\",\"col\":3}},{\"id\":\"AVO8JCkksy\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"aLqo1uNPYu\",\"type\":\"header\",\"data\":{\"text\":\"Benches\",\"col\":12}},{\"id\":\"BcJPVEkRcy\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Active Benches\",\"col\":3}},{\"id\":\"PhHBf-f1ej\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Broken Benches\",\"col\":3}},{\"id\":\"JJB6cOEiXy\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"7a18ugroq8\",\"type\":\"header\",\"data\":{\"text\":\"Servers\",\"col\":12}},{\"id\":\"M3urSE6cor\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Application Server\",\"col\":3}},{\"id\":\"5qOJXl1CkE\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Database Server\",\"col\":3}},{\"id\":\"PWrCW7DruI\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Proxy Server\",\"col\":3}},{\"id\":\"_GVOmg7C_U\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Hybrid Servers\",\"col\":3}},{\"id\":\"XHWA0NCImO\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"X1dteEUHoR\",\"type\":\"header\",\"data\":{\"text\":\"Settings\",\"col\":12}},{\"id\":\"eeEbYjVj_n\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Jcloude Settings\",\"col\":3}},{\"id\":\"EiWS2tWYwu\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Root Domain\",\"col\":3}},{\"id\":\"EoLO5YYzdR\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Tls Certificate\",\"col\":3}},{\"id\":\"-Jx1Irf-28\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Team\",\"col\":3}},{\"id\":\"n-T0ehr2ca\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"xZEclbenJQ\",\"type\":\"header\",\"data\":{\"text\":\"Masters\",\"col\":12}},{\"id\":\"P6nCUrJreH\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"App\",\"col\":3}},{\"id\":\"1kAyHtrIrJ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"App Source\",\"col\":3}},{\"id\":\"-N-Xb5MVPV\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"App Release\",\"col\":3}},{\"id\":\"ND9oElFB7R\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"0DYlbnEtOT\",\"type\":\"header\",\"data\":{\"text\":\"Subscription\",\"col\":12}},{\"id\":\"eddRzzqwSZ\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Server Plan\",\"col\":3}},{\"id\":\"GYk3Frsy1L\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Site Plan\",\"col\":3}},{\"id\":\"o_aDSbQlPf\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Subscription\",\"col\":3}},{\"id\":\"VZSHmE1jzA\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Invoice\",\"col\":3}},{\"id\":\"B8T-3IZ8Qg\",\"type\":\"spacer\",\"data\":{\"col\":12}},{\"id\":\"WDyzNHuOas\",\"type\":\"header\",\"data\":{\"text\":\"Operations\",\"col\":12}},{\"id\":\"Ziby8rOfsU\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Agent Job\",\"col\":3}},{\"id\":\"Vm4Tn0dxiD\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Ansible Play\",\"col\":3}},{\"id\":\"n6VE51hPkc\",\"type\":\"shortcut\",\"data\":{\"shortcut_name\":\"Jcloude Job\",\"col\":3}}]", "creation": "2024-07-30 18:43:18.421196", "custom_blocks": [], "docstatus": 0, @@ -11,12 +11,12 @@ "idx": 0, "indicator_color": "", "is_hidden": 1, - "label": "Press", + "label": "Jcloude", "links": [], "modified": "2024-08-02 16:33:40.351403", "modified_by": "Administrator", - "module": "Press", - "name": "Press", + "module": "Jcloude", + "name": "Jcloude", "number_cards": [], "owner": "Administrator", "parent_page": "", @@ -68,8 +68,8 @@ { "color": "Grey", "pg_view": "List", - "label": "Press Job", - "link_to": "Press Job", + "label": "Jcloude Job", + "link_to": "Jcloude Job", "stats_filter": "[]", "type": "DocType" }, @@ -216,10 +216,10 @@ { "color": "Grey", "pg_view": "List", - "label": "Press Settings", - "link_to": "Press Settings", + "label": "Jcloude Settings", + "link_to": "Jcloude Settings", "type": "DocType" } ], - "title": "Press" + "title": "Jcloude" } \ No newline at end of file diff --git a/press/public/marketplace/js/call.js b/press/public/marketplace/js/call.js index bbcba069..7b822741 100644 --- a/press/public/marketplace/js/call.js +++ b/press/public/marketplace/js/call.js @@ -11,7 +11,7 @@ export default async function call(method, args) { let team = localStorage.getItem('current_team') || null; if (team) { - headers['X-Press-Team'] = team; + headers['X-Jcloude-Team'] = team; } if (window.csrf_token && window.csrf_token !== '{{ csrf_token }}') { diff --git a/press/saas/api/readme.md b/press/saas/api/readme.md index c80dd508..d2f8c028 100644 --- a/press/saas/api/readme.md +++ b/press/saas/api/readme.md @@ -1,4 +1,4 @@ -## Press SaaS API +## Jcloude SaaS API These APIs has been introduced with the release of SaaS v2. It will provide a interface to communicate back to Jingrow Cloud from deployed site. diff --git a/press/saas/doctype/product_trial_request/product_trial_request.json b/press/saas/doctype/product_trial_request/product_trial_request.json index c7c159a4..2e1228af 100644 --- a/press/saas/doctype/product_trial_request/product_trial_request.json +++ b/press/saas/doctype/product_trial_request/product_trial_request.json @@ -175,7 +175,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Admin", + "role": "Jcloude Admin", "share": 1, "write": 1 }, @@ -186,7 +186,7 @@ "print": 1, "read": 1, "report": 1, - "role": "Press Member", + "role": "Jcloude Member", "share": 1, "write": 1 } diff --git a/press/saas/doctype/saas_signup_generator/saas_signup_generator.py b/press/saas/doctype/saas_signup_generator/saas_signup_generator.py index 6211614a..21298d40 100644 --- a/press/saas/doctype/saas_signup_generator/saas_signup_generator.py +++ b/press/saas/doctype/saas_signup_generator/saas_signup_generator.py @@ -22,7 +22,7 @@ class SaasSignupGenerator(WebsiteGenerator): country_name if jingrow.db.exists("Country", country_name) else "" ) context.enable_google_oauth = jingrow.db.get_single_value( - "Press Settings", "enable_google_oauth" + "Jcloude Settings", "enable_google_oauth" ) return context diff --git a/press/scripts/migrate.py b/press/scripts/migrate.py index ab7c0701..90f8981b 100644 --- a/press/scripts/migrate.py +++ b/press/scripts/migrate.py @@ -454,7 +454,7 @@ def create_session(): if login_sc.ok: print("Authorization Successful! ✅") team = select_team(session) - session.headers.update({"X-Press-Team": team, "Connection": "keep-alive"}) + session.headers.update({"X-Jcloude-Team": team, "Connection": "keep-alive"}) return session else: handle_request_failure( diff --git a/press/scripts/registry.py b/press/scripts/registry.py index 00ccc225..f14ae81d 100644 --- a/press/scripts/registry.py +++ b/press/scripts/registry.py @@ -5,7 +5,7 @@ from tqdm import tqdm jingrow.init(site="jingrow.cloud") jingrow.connect() -settings = jingrow.get_single("Press Settings") +settings = jingrow.get_single("Jcloude Settings") REGISTRY_URL = settings.docker_registry_url diff --git a/press/telegram_utils.py b/press/telegram_utils.py index 8acda2c6..bea2829c 100644 --- a/press/telegram_utils.py +++ b/press/telegram_utils.py @@ -11,7 +11,7 @@ from jcloude.utils import log_error class Telegram: def __init__(self, topic: str | None = None, group: str | None = None): settings = jingrow.db.get_value( - "Press Settings", + "Jcloude Settings", None, ["telegram_bot_token", "telegram_alerts_chat_group"], as_dict=True, diff --git a/press/tests/before_test.py b/press/tests/before_test.py index 77f81aa2..a9ba3c50 100644 --- a/press/tests/before_test.py +++ b/press/tests/before_test.py @@ -30,7 +30,7 @@ def FrappeTestCase_setUp(self) -> None: def execute(): - settings = jingrow.get_single("Press Settings") + settings = jingrow.get_single("Jcloude Settings") if not (settings.stripe_secret_key and settings.stripe_publishable_key): create_test_stripe_credentials() import cssutils @@ -63,8 +63,8 @@ def create_test_stripe_credentials(): secret_key = os.environ.get("STRIPE_SECRET_KEY") if publishable_key and secret_key: - jingrow.db.set_single_value("Press Settings", "stripe_publishable_key", publishable_key) - jingrow.db.set_single_value("Press Settings", "stripe_secret_key", secret_key) + jingrow.db.set_single_value("Jcloude Settings", "stripe_publishable_key", publishable_key) + jingrow.db.set_single_value("Jcloude Settings", "stripe_secret_key", secret_key) @contextmanager diff --git a/press/utils/__init__.py b/press/utils/__init__.py index 386de4db..ee78036c 100644 --- a/press/utils/__init__.py +++ b/press/utils/__init__.py @@ -114,13 +114,13 @@ def get_current_team(get_pg=False): system_user = jingrow.session.data.user_type == "System User" # get team passed via request header - x_jcloude_team = jingrow.get_request_header("X-Press-Team") - # In case if X-Press-Team is not passed, check if `team_name` is available in jingrow.local + x_jcloude_team = jingrow.get_request_header("X-Jcloude-Team") + # In case if X-Jcloude-Team is not passed, check if `team_name` is available in jingrow.local # `team_name` getting injected by jcloude.saas.api.whitelist_saas_api decorator team = x_jcloude_team if x_jcloude_team else getattr(jingrow.local, "team_name", "") - if not team and has_role("Press Admin") and jingrow.db.exists("Team", {"user": jingrow.session.user}): - # if user has_role of Press Admin then just return current user as default team + if not team and has_role("Jcloude Admin") and jingrow.db.exists("Team", {"user": jingrow.session.user}): + # if user has_role of Jcloude Admin then just return current user as default team return ( jingrow.get_pg("Team", {"user": jingrow.session.user, "enabled": 1}) if get_pg @@ -427,7 +427,7 @@ class RemoteFrappeSite: @site_cache(ttl=5 * 60) def get_client_blacklisted_keys() -> list: - """Returns list of blacklisted Site Config Keys accessible to Press /dashboard users.""" + """Returns list of blacklisted Site Config Keys accessible to Jcloude /dashboard users.""" return list( set( [ @@ -529,16 +529,16 @@ def group_children_in_result(result, child_field_map): result = [ {'name': 'test1', 'full_name': 'Faris Ansari', role: 'System Manager'}, - {'name': 'test1', 'full_name': 'Faris Ansari', role: 'Press Admin'}, - {'name': 'test2', 'full_name': 'Aditya Hase', role: 'Press Admin'}, - {'name': 'test2', 'full_name': 'Aditya Hase', role: 'Press Member'}, + {'name': 'test1', 'full_name': 'Faris Ansari', role: 'Jcloude Admin'}, + {'name': 'test2', 'full_name': 'Aditya Hase', role: 'Jcloude Admin'}, + {'name': 'test2', 'full_name': 'Aditya Hase', role: 'Jcloude Member'}, ] out = group_children_in_result(result, {'role': 'roles'}) print(out) [ - {'name': 'test1', 'full_name': 'Faris Ansari', roles: ['System Manager', 'Press Admin']}, - {'name': 'test2', 'full_name': 'Aditya Hase', roles: ['Press Admin', 'Press Member']}, + {'name': 'test1', 'full_name': 'Faris Ansari', roles: ['System Manager', 'Jcloude Admin']}, + {'name': 'test2', 'full_name': 'Aditya Hase', roles: ['Jcloude Admin', 'Jcloude Member']}, ] """ out = {} @@ -939,7 +939,7 @@ def validate_subdomain(subdomain: str): @site_cache(ttl=120) def servers_using_alternative_port_for_communication() -> list: servers = jingrow.db.get_value( - "Press Settings", None, "servers_using_alternative_http_port_for_communication" + "Jcloude Settings", None, "servers_using_alternative_http_port_for_communication" ) if not servers: return [] diff --git a/press/utils/billing.py b/press/utils/billing.py index 8c1269b5..f937485c 100644 --- a/press/utils/billing.py +++ b/press/utils/billing.py @@ -58,11 +58,11 @@ def format_stripe_money(amount, currency): def get_erpnext_com_connection(): from jingrow.frappeclient import FrappeClient - jcloude_settings = jingrow.get_single("Press Settings") + jcloude_settings = jingrow.get_single("Jcloude Settings") erpnext_api_secret = jcloude_settings.get_password("erpnext_api_secret", raise_exception=False) if not (jcloude_settings.erpnext_api_key and jcloude_settings.erpnext_url and erpnext_api_secret): - jingrow.throw("ERPNext.com URL not set up in Press Settings", exc=CentralServerNotSet) + jingrow.throw("ERPNext.com URL not set up in Jcloude Settings", exc=CentralServerNotSet) return FrappeClient( jcloude_settings.erpnext_url, @@ -77,12 +77,12 @@ def get_jingrow_io_connection(): from jingrow.frappeclient import FrappeClient - jcloude_settings = jingrow.get_single("Press Settings") + jcloude_settings = jingrow.get_single("Jcloude Settings") jingrow_api_key = jcloude_settings.frappeio_api_key jingrow_api_secret = jcloude_settings.get_password("frappeio_api_secret", raise_exception=False) if not (jingrow_api_key and jingrow_api_secret and jcloude_settings.jingrow_url): - jingrow.throw("Jingrow.io URL not set up in Press Settings", exc=FrappeioServerNotSet) + jingrow.throw("Jingrow.io URL not set up in Jcloude Settings", exc=FrappeioServerNotSet) jingrow.local.jcloude_frappeio_conn = FrappeClient( jcloude_settings.jingrow_url, api_key=jingrow_api_key, api_secret=jingrow_api_secret @@ -92,7 +92,7 @@ def get_jingrow_io_connection(): def is_jingrow_auth_disabled(): - return jingrow.db.get_single_value("Press Settings", "disable_jingrow_auth", cache=True) + return jingrow.db.get_single_value("Jcloude Settings", "disable_jingrow_auth", cache=True) def make_formatted_pg(pg, fieldtypes=None): @@ -118,7 +118,7 @@ def clear_setup_intent(): def get_publishable_key(): - return jingrow.db.get_single_value("Press Settings", "stripe_publishable_key") + return jingrow.db.get_single_value("Jcloude Settings", "stripe_publishable_key") def get_setup_intent(team): @@ -159,14 +159,14 @@ def get_stripe(): if not hasattr(jingrow.local, "jcloude_stripe_object"): secret_key = get_decrypted_password( - "Press Settings", - "Press Settings", + "Jcloude Settings", + "Jcloude Settings", "stripe_secret_key", raise_exception=False, ) if not secret_key: - jingrow.throw("Setup stripe via Press Settings before using jcloude.api.billing.get_stripe") + jingrow.throw("Setup stripe via Jcloude Settings before using jcloude.api.billing.get_stripe") stripe.api_key = secret_key # Set the maximum number of retries for network requests @@ -203,14 +203,14 @@ def get_razorpay_client(): from jingrow.utils.password import get_decrypted_password if not hasattr(jingrow.local, "jcloude_razorpay_client_object"): - key_id = jingrow.db.get_single_value("Press Settings", "razorpay_key_id") + key_id = jingrow.db.get_single_value("Jcloude Settings", "razorpay_key_id") key_secret = get_decrypted_password( - "Press Settings", "Press Settings", "razorpay_key_secret", raise_exception=False + "Jcloude Settings", "Jcloude Settings", "razorpay_key_secret", raise_exception=False ) if not (key_id and key_secret): jingrow.throw( - "Setup razorpay via Press Settings before using jcloude.api.billing.get_razorpay_client" + "Setup razorpay via Jcloude Settings before using jcloude.api.billing.get_razorpay_client" ) jingrow.local.jcloude_razorpay_client_object = razorpay.Client(auth=(key_id, key_secret)) diff --git a/press/utils/webhook.py b/press/utils/webhook.py index 8e08faea..812c5227 100644 --- a/press/utils/webhook.py +++ b/press/utils/webhook.py @@ -13,8 +13,8 @@ from jingrow.model.document import Document def create_webhook_event(event: str, payload: dict | Document, team: str) -> bool: try: # Check if team has configured webhook against this event - PressWebhookSelectedEvent = jingrow.qb.DocType("Press Webhook Selected Event") - PressWebhook = jingrow.qb.DocType("Press Webhook") + PressWebhookSelectedEvent = jingrow.qb.DocType("Jcloude Webhook Selected Event") + PressWebhook = jingrow.qb.DocType("Jcloude Webhook") query = ( jingrow.qb.from_(PressWebhookSelectedEvent) @@ -50,7 +50,7 @@ def create_webhook_event(event: str, payload: dict | Document, team: str) -> boo # create webhook log jingrow.get_pg( { - "doctype": "Press Webhook Log", + "doctype": "Jcloude Webhook Log", "status": "Pending", "event": event, "team": team, diff --git a/press/www/dashboard.py b/press/www/dashboard.py index 6a7a6eb4..56c1888c 100644 --- a/press/www/dashboard.py +++ b/press/www/dashboard.py @@ -43,12 +43,12 @@ def get_boot(): valid_teams=get_valid_teams_for_user(jingrow.session.user), is_system_user=jingrow.session.data.user_type == "System User", verify_cards_with_micro_charge=jingrow.db.get_single_value( - "Press Settings", "verify_cards_with_micro_charge" + "Jcloude Settings", "verify_cards_with_micro_charge" ), **( jingrow.db.get_values( - "Press Settings", - "Press Settings", + "Jcloude Settings", + "Jcloude Settings", ["free_credits_inr", "free_credits_usd"], as_dict=True, )[0] diff --git a/press/www/github/authorize.py b/press/www/github/authorize.py index 1fd0492f..4ae48372 100644 --- a/press/www/github/authorize.py +++ b/press/www/github/authorize.py @@ -28,9 +28,9 @@ def get_context(context): def obtain_access_token(code, team): response = None try: - client_id = jingrow.db.get_single_value("Press Settings", "github_app_client_id") + client_id = jingrow.db.get_single_value("Jcloude Settings", "github_app_client_id") client_secret = jingrow.db.get_single_value( - "Press Settings", "github_app_client_secret" + "Jcloude Settings", "github_app_client_secret" ) data = {"client_id": client_id, "client_secret": client_secret, "code": code} headers = {"Accept": "application/json"} diff --git a/press/www/github/redirect.py b/press/www/github/redirect.py index 5cfc11aa..b74da00c 100644 --- a/press/www/github/redirect.py +++ b/press/www/github/redirect.py @@ -9,7 +9,7 @@ from jcloude.utils import log_error def get_context(context): - if not jingrow.db.get_single_value("Press Settings", "github_app_id"): + if not jingrow.db.get_single_value("Jcloude Settings", "github_app_id"): code = jingrow.form_dict.code response = None try: @@ -20,7 +20,7 @@ def get_context(context): ).json() ) - settings = jingrow.get_pg("Press Settings", "Press Settings") + settings = jingrow.get_pg("Jcloude Settings", "Jcloude Settings") settings.github_app_id = response.id settings.github_app_client_id = response.client_id settings.github_app_client_secret = response.client_secret @@ -32,6 +32,6 @@ def get_context(context): except Exception: log_error("GitHub App Creation Error", code=code, response=response) - redirect_url = jingrow.utils.get_url("/app#Form/Press Settings") + redirect_url = jingrow.utils.get_url("/app#Form/Jcloude Settings") jingrow.flags.redirect_location = redirect_url raise jingrow.Redirect