diff --git a/.flake8 b/.flake8
index 56c9b9a369..4b852abd7c 100644
--- a/.flake8
+++ b/.flake8
@@ -28,6 +28,10 @@ ignore =
B007,
B950,
W191,
+ E124, # closing bracket, irritating while writing QB code
+ E131, # continuation line unaligned for hanging indent
+ E123, # closing bracket does not match indentation of opening bracket's line
+ E101, # ensured by use of black
max-line-length = 200
exclude=.github/helper/semgrep_rules
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..5ace4600a1
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "weekly"
diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py
index f68ef5046f..b859b87047 100644
--- a/.github/helper/roulette.py
+++ b/.github/helper/roulette.py
@@ -5,8 +5,10 @@ import shlex
import subprocess
import sys
import urllib.request
+from functools import cache
+@cache
def fetch_pr_data(pr_number, repo, endpoint):
api_url = f"https://api.github.com/repos/{repo}/pulls/{pr_number}"
@@ -26,7 +28,16 @@ def get_output(command, shell=True):
return subprocess.check_output(command, shell=shell, encoding="utf8").strip()
def has_skip_ci_label(pr_number, repo="frappe/frappe"):
- return any([label["name"] for label in fetch_pr_data(pr_number, repo, "")["labels"] if label["name"] == "Skip CI"])
+ return has_label(pr_number, "Skip CI", repo)
+
+def has_run_server_tests_label(pr_number, repo="frappe/frappe"):
+ return has_label(pr_number, "Run Server Tests", repo)
+
+def has_run_ui_tests_label(pr_number, repo="frappe/frappe"):
+ return has_label(pr_number, "Run UI Tests", repo)
+
+def has_label(pr_number, label, repo="frappe/frappe"):
+ return any([label["name"] for label in fetch_pr_data(pr_number, repo, "")["labels"] if label["name"] == label])
def is_py(file):
return file.endswith("py")
@@ -66,22 +77,22 @@ if __name__ == "__main__":
updated_py_file_count = len(list(filter(is_py, files_list)))
only_py_changed = updated_py_file_count == len(files_list)
- if ci_files_changed:
- print("CI related files were updated, running all build processes.")
-
- elif has_skip_ci_label(pr_number, repo):
+ if has_skip_ci_label(pr_number, repo):
print("Found `Skip CI` label on pr, stopping build process.")
sys.exit(0)
+ elif ci_files_changed:
+ print("CI related files were updated, running all build processes.")
+
elif only_docs_changed:
print("Only docs were updated, stopping build process.")
sys.exit(0)
- elif only_frontend_code_changed and build_type == "server":
+ elif only_frontend_code_changed and build_type == "server" and not has_run_server_tests_label(pr_number, repo):
print("Only Frontend code was updated; Stopping Python build process.")
sys.exit(0)
- elif build_type == "ui" and only_py_changed:
+ elif build_type == "ui" and only_py_changed and not has_run_ui_tests_label(pr_number, repo):
print("Only Python code was updated, stopping Cypress build process.")
sys.exit(0)
diff --git a/.github/workflows/deps-checker.yml b/.github/workflows/deps-checker.yml
new file mode 100644
index 0000000000..3f81b5c633
--- /dev/null
+++ b/.github/workflows/deps-checker.yml
@@ -0,0 +1,22 @@
+name: 'Python Dependency Check'
+on:
+ pull_request:
+ workflow_dispatch:
+ push:
+ branches: [ develop ]
+
+permissions:
+ contents: read
+
+jobs:
+ deps-vulnerable-check:
+ name: 'Vulnerable Dependency'
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/setup-python@v4
+ with:
+ python-version: 3.8
+ - uses: actions/checkout@v3
+ - run: pip install pip-audit
+ - run: pip-audit ${GITHUB_WORKSPACE}
diff --git a/.github/workflows/docs-checker.yml b/.github/workflows/docs-checker.yml
index a0f77b43fd..dade810b64 100644
--- a/.github/workflows/docs-checker.yml
+++ b/.github/workflows/docs-checker.yml
@@ -13,12 +13,12 @@ jobs:
steps:
- name: 'Setup Environment'
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: 3.8
- name: 'Clone repo'
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Validate Docs
env:
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index 443ee45bf7..6d1029d51d 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -9,23 +9,21 @@ jobs:
name: Frappe Linter
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- - name: Set up Python 3.8
- uses: actions/setup-python@v2
+ - name: Set up Python
+ uses: actions/setup-python@v4
with:
- python-version: 3.8
+ python-version: '3.10'
- name: Install and Run Pre-commit
- uses: pre-commit/action@v2.0.3
+ uses: pre-commit/action@v3.0.0
- name: Download Semgrep rules
run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
- - uses: returntocorp/semgrep-action@v1
- env:
- SEMGREP_TIMEOUT: 120
- with:
- config: >-
- r/python.lang.correctness
- ./frappe-semgrep-rules/rules
+ - name: Download semgrep
+ run: pip install semgrep==0.97.0
+
+ - name: Run Semgrep rules
+ run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness
diff --git a/.github/workflows/patch-mariadb-tests.yml b/.github/workflows/patch-mariadb-tests.yml
index 224e380925..60d0ce60af 100644
--- a/.github/workflows/patch-mariadb-tests.yml
+++ b/.github/workflows/patch-mariadb-tests.yml
@@ -28,15 +28,15 @@ jobs:
steps:
- name: Clone
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Setup Python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: '3.9'
- name: Setup Node
- uses: actions/setup-node@v2
+ uses: actions/setup-node@v3
with:
node-version: 14
check-latest: true
@@ -56,17 +56,17 @@ jobs:
- name: Cache pip
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+ key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Cache node modules
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
- uses: actions/cache@v2
+ uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
@@ -82,7 +82,7 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- - uses: actions/cache@v2
+ - uses: actions/cache@v3
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
id: yarn-cache
with:
@@ -124,7 +124,7 @@ jobs:
git fetch --depth 1 upstream $branch_name:$branch_name
git checkout -q -f $branch_name
- pip install -q -r requirements.txt
+ bench setup requirements --python
bench --site test_site migrate
done
diff --git a/.github/workflows/publish-assets-develop.yml b/.github/workflows/publish-assets-develop.yml
index f56d1460b5..037c8c26eb 100644
--- a/.github/workflows/publish-assets-develop.yml
+++ b/.github/workflows/publish-assets-develop.yml
@@ -10,13 +10,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
path: 'frappe'
- - uses: actions/setup-node@v1
+ - uses: actions/setup-node@v3
with:
node-version: 14
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v4
with:
python-version: '3.9'
- name: Set up bench and build assets
diff --git a/.github/workflows/publish-assets-releases.yml b/.github/workflows/publish-assets-releases.yml
index 2582632fa0..594229a156 100644
--- a/.github/workflows/publish-assets-releases.yml
+++ b/.github/workflows/publish-assets-releases.yml
@@ -13,13 +13,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
path: 'frappe'
- - uses: actions/setup-node@v1
+ - uses: actions/setup-node@v3
with:
python-version: '12.x'
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v4
with:
python-version: '3.9'
- name: Set up bench and build assets
@@ -36,7 +36,7 @@ jobs:
- name: Get release
id: get_release
- uses: bruceadams/get-release@v1.2.0
+ uses: bruceadams/get-release@v1.2.3
- name: Upload built Assets to Release
uses: actions/upload-release-asset@v1.0.2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e9936482b0..f73bed09c7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,12 +12,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Entire Repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
fetch-depth: 0
persist-credentials: false
- name: Setup Node.js v14
- uses: actions/setup-node@v2
+ uses: actions/setup-node@v3
with:
node-version: 14
- name: Setup dependencies
diff --git a/.github/workflows/server-mariadb-tests.yml b/.github/workflows/server-mariadb-tests.yml
index 48104b8f16..51d379d5db 100644
--- a/.github/workflows/server-mariadb-tests.yml
+++ b/.github/workflows/server-mariadb-tests.yml
@@ -37,10 +37,10 @@ jobs:
steps:
- name: Clone
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Setup Python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: '3.9'
@@ -53,7 +53,7 @@ jobs:
PR_NUMBER: ${{ github.event.number }}
REPO_NAME: ${{ github.repository }}
- - uses: actions/setup-node@v2
+ - uses: actions/setup-node@v3
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
with:
node-version: 14
@@ -67,17 +67,17 @@ jobs:
- name: Cache pip
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+ key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Cache node modules
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
- uses: actions/cache@v2
+ uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
@@ -93,7 +93,7 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- - uses: actions/cache@v2
+ - uses: actions/cache@v3
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
id: yarn-cache
with:
@@ -126,7 +126,7 @@ jobs:
- name: Upload coverage data
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
- uses: codecov/codecov-action@v2
+ uses: codecov/codecov-action@v3
with:
name: MariaDB
fail_ci_if_error: true
diff --git a/.github/workflows/server-postgres-tests.yml b/.github/workflows/server-postgres-tests.yml
index 241b7ddf96..d93edad0ec 100644
--- a/.github/workflows/server-postgres-tests.yml
+++ b/.github/workflows/server-postgres-tests.yml
@@ -40,10 +40,10 @@ jobs:
steps:
- name: Clone
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Setup Python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: '3.9'
@@ -56,7 +56,7 @@ jobs:
PR_NUMBER: ${{ github.event.number }}
REPO_NAME: ${{ github.repository }}
- - uses: actions/setup-node@v2
+ - uses: actions/setup-node@v3
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
with:
node-version: '14'
@@ -70,17 +70,17 @@ jobs:
- name: Cache pip
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+ key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Cache node modules
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
- uses: actions/cache@v2
+ uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
@@ -96,7 +96,7 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- - uses: actions/cache@v2
+ - uses: actions/cache@v3
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
id: yarn-cache
with:
@@ -129,7 +129,7 @@ jobs:
- name: Upload coverage data
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
- uses: codecov/codecov-action@v2
+ uses: codecov/codecov-action@v3
with:
name: Postgres
fail_ci_if_error: true
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index 06ad921a6a..09b2a3caf8 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- containers: [1, 2]
+ containers: [1, 2, 3]
name: UI Tests (Cypress)
@@ -36,10 +36,10 @@ jobs:
steps:
- name: Clone
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Setup Python
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
with:
python-version: '3.9'
@@ -52,7 +52,7 @@ jobs:
PR_NUMBER: ${{ github.event.number }}
REPO_NAME: ${{ github.repository }}
- - uses: actions/setup-node@v2
+ - uses: actions/setup-node@v3
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
with:
node-version: 14
@@ -66,17 +66,17 @@ jobs:
- name: Cache pip
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+ key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
- name: Cache node modules
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
- uses: actions/cache@v2
+ uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
@@ -92,7 +92,7 @@ jobs:
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- - uses: actions/cache@v2
+ - uses: actions/cache@v3
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
id: yarn-cache
with:
@@ -103,7 +103,7 @@ jobs:
- name: Cache cypress binary
if: ${{ steps.check-build.outputs.build == 'strawberry' }}
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.cache
key: ${{ runner.os }}-cypress-
@@ -158,7 +158,7 @@ jobs:
- name: Upload Coverage Data
if: ${{ steps.check-build.outputs.build == 'strawberry' && steps.check_coverage.outputs.files_exists == 'true' }}
- uses: codecov/codecov-action@v2
+ uses: codecov/codecov-action@v3
with:
name: Cypress
fail_ci_if_error: true
@@ -168,7 +168,7 @@ jobs:
- name: Upload Server Coverage Data
if: ${{ steps.check-build.outputs.build-server == 'strawberry' }}
- uses: codecov/codecov-action@v2
+ uses: codecov/codecov-action@v3
with:
name: MariaDB
fail_ci_if_error: true
diff --git a/.mergify.yml b/.mergify.yml
index f1333362a8..d9896df921 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -7,6 +7,7 @@ pull_request_rules:
- author!=gavindsouza
- author!=deepeshgarg007
- author!=ankush
+ - author!=mergify[bot]
- or:
- base=version-13
- base=version-12
@@ -20,13 +21,13 @@ pull_request_rules:
- name: Automatic merge on CI success and review
conditions:
- status-success=Sider
- - status-success=Semantic Pull Request
- status-success=Python Unit Tests (MariaDB) (1)
- status-success=Python Unit Tests (MariaDB) (2)
- status-success=Python Unit Tests (Postgres) (1)
- status-success=Python Unit Tests (Postgres) (2)
- status-success=UI Tests (Cypress) (1)
- status-success=UI Tests (Cypress) (2)
+ - status-success=UI Tests (Cypress) (3)
- status-success=security/snyk (frappe)
- label!=dont-merge
- label!=squash
@@ -43,6 +44,7 @@ pull_request_rules:
- status-success=Python Unit Tests (Postgres) (2)
- status-success=UI Tests (Cypress) (1)
- status-success=UI Tests (Cypress) (2)
+ - status-success=UI Tests (Cypress) (3)
- status-success=security/snyk (frappe)
- label!=dont-merge
- label=squash
diff --git a/CODEOWNERS b/CODEOWNERS
index 170334a4b4..59832e8636 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -12,7 +12,7 @@ data_import* @netchampfaris
core/ @surajshetty3416
database @gavindsouza
model @gavindsouza
-requirements.txt @gavindsouza
+pyproject.toml @gavindsouza
query_builder/ @gavindsouza
commands/ @gavindsouza
workspace @shariquerik
diff --git a/cypress/integration/awesome_bar.js b/cypress/integration/awesome_bar.js
index e62ba6bec5..938034a34a 100644
--- a/cypress/integration/awesome_bar.js
+++ b/cypress/integration/awesome_bar.js
@@ -28,6 +28,7 @@ context('Awesome Bar', () => {
cy.findByPlaceholderText('ID')
.should('have.value', '%test%');
+ cy.clear_filters();
});
it('navigates to new form', () => {
diff --git a/cypress/integration/control_date_range.js b/cypress/integration/control_date_range.js
new file mode 100644
index 0000000000..6f26b35f84
--- /dev/null
+++ b/cypress/integration/control_date_range.js
@@ -0,0 +1,42 @@
+context('Date Range Control', () => {
+ before(() => {
+ cy.login();
+ cy.visit('/app');
+ });
+
+ function get_dialog() {
+ return cy.dialog({
+ title: 'Date Range',
+ fields: [{
+ "label": "Date Range",
+ "fieldname": "date_range",
+ "fieldtype": "Date Range",
+ }]
+ });
+ }
+
+ it('Selecting a date range from the datepicker', () => {
+ cy.clear_dialogs();
+ cy.clear_datepickers();
+
+ get_dialog().as('dialog');
+ cy.get_field('date_range', 'Date Range').click();
+ cy.get('.datepicker--nav-title').click();
+ cy.get('.datepicker--nav-title').click({force: true});
+
+ //Inputing date range values in the date range field
+ cy.get('.datepicker--years > .datepicker--cells > .datepicker--cell[data-year=2020]').click();
+ cy.get('.datepicker--months > .datepicker--cells > .datepicker--cell[data-month=0]').click();
+ cy.get('.datepicker--cell[data-date=1]:first').click({force: true});
+ cy.get('.datepicker--cell[data-date=15]:first').click({force: true});
+
+ // Verify if the selected date range values is set in the date range field
+ cy.window()
+ .its('cur_dialog')
+ .then(dialog => {
+ let date_range = dialog.get_value("date_range");
+ expect(date_range[0]).to.equal('2020-01-01');
+ expect(date_range[1]).to.equal('2020-01-15');
+ });
+ });
+});
\ No newline at end of file
diff --git a/cypress/integration/custom_buttons.js b/cypress/integration/custom_buttons.js
index e2f02668e9..6045d009c2 100644
--- a/cypress/integration/custom_buttons.js
+++ b/cypress/integration/custom_buttons.js
@@ -4,6 +4,7 @@ const test_button_names = [
"Porcupine Tree (the GOAT)",
"AC / DC",
`Electronic Dance "music"`,
+ "l'imperatrice",
];
const add_button = (label, group = "TestGroup") => {
diff --git a/cypress/integration/form.js b/cypress/integration/form.js
index 99a4336bcb..4d50a5f66a 100644
--- a/cypress/integration/form.js
+++ b/cypress/integration/form.js
@@ -78,4 +78,20 @@ context('Form', () => {
cy.get('@row2').click();
cy.get('@email_input2').should('not.have.class', 'invalid');
});
+
+ it('Shows version conflict warning', { scrollBehavior: false }, () => {
+ cy.visit('/app/todo');
+
+ cy.insert_doc("ToDo", {"description": "old"}).then(doc => {
+ cy.visit(`/app/todo/${doc.name}`);
+ // make form dirty
+ cy.fill_field("status", "Cancelled", "Select");
+
+ // update doc using api - simulating parallel change by another user
+ cy.update_doc("ToDo", doc.name, {"status": "Closed"}).then(() => {
+ cy.findByRole("button", {name: "Refresh"}).click();
+ cy.get_field("status", "Select").should("have.value", "Closed");
+ })
+ })
+ });
});
diff --git a/cypress/integration/routing.js b/cypress/integration/routing.js
new file mode 100644
index 0000000000..0822dd9b7d
--- /dev/null
+++ b/cypress/integration/routing.js
@@ -0,0 +1,40 @@
+const list_view = "/app/todo";
+
+// test round trip with filter types
+
+const test_queries = [
+ "?status=Open",
+ `?date=%5B"Between"%2C%5B"2022-06-01"%2C"2022-06-30"%5D%5D`,
+ `?date=%5B">"%2C"2022-06-01"%5D`,
+ `?name=%5B"like"%2C"%2542%25"%5D`,
+ `?status=%5B"not%20in"%2C%5B"Open"%2C"Closed"%5D%5D`,
+];
+
+describe("SPA Routing", { scrollBehavior: false }, () => {
+ before(() => {
+ cy.login();
+ cy.go_to_list("ToDo");
+ });
+
+ after(() => {
+ cy.clear_filters(); // avoid flake in future tests
+ });
+
+ it("should apply filter on list view from route", () => {
+ test_queries.forEach((query) => {
+ const full_url = `${list_view}${query}`;
+ cy.visit(full_url);
+ cy.findByTitle("To Do").should("exist");
+
+ const expected = new URLSearchParams(query);
+ cy.location().then((loc) => {
+ const actual = new URLSearchParams(loc.search);
+ // This might appear like a dumb test checking visited URL to itself
+ // but it's actually doing a round trip
+ // URL with params -> parsed filters -> new URL
+ // if it's same that means everything worked in between.
+ expect(actual.toString()).to.eq(expected.toString());
+ });
+ });
+ });
+});
diff --git a/cypress/integration/timeline_email.js b/cypress/integration/timeline_email.js
index f2a239401d..993847bcb8 100644
--- a/cypress/integration/timeline_email.js
+++ b/cypress/integration/timeline_email.js
@@ -7,7 +7,7 @@ context('Timeline Email', () => {
it('Adding new ToDo', () => {
cy.click_listview_primary_button('Add ToDo');
- cy.get('.custom-actions:visible > .btn').contains("Edit in full page").click({delay: 500});
+ cy.get('.custom-actions:visible > .btn').contains("Edit Full Form").click({delay: 500});
cy.fill_field("description", "Test ToDo", "Text Editor");
cy.wait(500);
cy.get('.primary-action').contains('Save').click({force: true});
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index c64f0bf469..5ee26348e2 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -271,10 +271,9 @@ Cypress.Commands.add('save', () => {
cy.get(`button[data-label="Save"]:visible`).click({scrollBehavior: false, force: true});
cy.wait('@api');
});
-
Cypress.Commands.add('hide_dialog', () => {
- cy.wait(400);
- cy.get('.btn-modal-close:visible').click({force: true});
+ cy.wait(300);
+ cy.get_open_dialog().focus().find('.btn-modal-close').click();
cy.get('.modal:visible').should('not.exist');
});
@@ -292,7 +291,11 @@ Cypress.Commands.add('clear_datepickers', () => {
cy.get('.datepicker').should('not.exist');
});
+
Cypress.Commands.add('insert_doc', (doctype, args, ignore_duplicate) => {
+ if (!args.doctype) {
+ args.doctype = doctype;
+ }
return cy
.window()
.its('frappe.csrf_token')
@@ -314,12 +317,41 @@ Cypress.Commands.add('insert_doc', (doctype, args, ignore_duplicate) => {
if (ignore_duplicate) {
status_codes.push(409);
}
- expect(res.status).to.be.oneOf(status_codes);
+
+ let message = null;
+ if (ignore_duplicate && !status_codes.includes(res.status)) {
+ message = `Document insert failed, response: ${JSON.stringify(res, null, '\t')}`;
+ }
+ expect(res.status).to.be.oneOf(status_codes, message);
return res.body.data;
});
});
});
+Cypress.Commands.add('update_doc', (doctype, docname, args) => {
+ return cy
+ .window()
+ .its('frappe.csrf_token')
+ .then(csrf_token => {
+ return cy
+ .request({
+ method: 'PUT',
+ url: `/api/resource/${doctype}/${docname}`,
+ body: args,
+ headers: {
+ Accept: 'application/json',
+ 'Content-Type': 'application/json',
+ 'X-Frappe-CSRF-Token': csrf_token
+ },
+ })
+ .then(res => {
+ expect(res.status).to.eq(200);
+ return res.body.data;
+ });
+ });
+});
+
+
Cypress.Commands.add('open_list_filter', () => {
cy.get('.filter-section .filter-button').click();
cy.wait(300);
diff --git a/dev-requirements.txt b/dev-requirements.txt
index f4045c6bed..b67e915a16 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,4 +1,4 @@
coverage==5.5
-Faker~=8.1.0
+Faker~=13.12.1
pyngrok~=5.0.5
unittest-xml-reporting~=3.0.4
diff --git a/frappe/__init__.py b/frappe/__init__.py
index d36a13b3a3..0f55854535 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -15,8 +15,9 @@ import importlib
import inspect
import json
import os
+import re
import warnings
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Union
import click
from werkzeug.local import Local, release_local
@@ -49,6 +50,11 @@ local = Local()
STANDARD_USERS = ("Guest", "Administrator")
_dev_server = int(sbool(os.environ.get("DEV_SERVER", False)))
+_qb_patched = {}
+re._MAXCACHE = (
+ 50 # reduced from default 512 given we are already maintaining this on parent worker
+)
+
if _dev_server:
warnings.simplefilter("always", DeprecationWarning)
@@ -77,7 +83,7 @@ class _dict(dict):
return _dict(self)
-def _(msg, lang=None, context=None):
+def _(msg, lang=None, context=None) -> str:
"""Returns translated string in current lang, if exists.
Usage:
_('Change')
@@ -241,8 +247,10 @@ def init(site, sites_path=None, new_site=False):
local.qb = get_query_builder(local.conf.db_type or "mariadb")
local.qb.engine = get_qb_engine()
setup_module_map()
- patch_query_execute()
- patch_query_aggregation()
+
+ if not _qb_patched.get(local.conf.db_type):
+ patch_query_execute()
+ patch_query_aggregation()
local.initialised = True
@@ -429,9 +437,6 @@ def msgprint(
def _raise_exception():
if raise_exception:
- if flags.rollback_on_exception:
- db.rollback()
-
if inspect.isclass(raise_exception) and issubclass(raise_exception, Exception):
raise raise_exception(msg)
else:
@@ -873,6 +878,10 @@ def clear_cache(user=None, doctype=None):
local.role_permissions = {}
if hasattr(local, "request_cache"):
local.request_cache.clear()
+ if hasattr(local, "system_settings"):
+ del local.system_settings
+ if hasattr(local, "website_settings"):
+ del local.website_settings
def only_has_select_perm(doctype, user=None, ignore_permissions=False):
@@ -919,7 +928,7 @@ def has_permission(
if throw and not out:
# mimics frappe.throw
- document_label = f"{doc.doctype} {doc.name}" if doc else doctype
+ document_label = f"{_(doc.doctype)} {doc.name}" if doc else _(doctype)
msgprint(
_("No permission for {0}").format(document_label),
raise_exception=ValidationError,
@@ -1096,6 +1105,10 @@ def clear_document_cache(doctype, name):
if key in local.document_cache:
del local.document_cache[key]
cache().hdel("document_cache", key)
+ if doctype == "System Settings" and hasattr(local, "system_settings"):
+ delattr(local, "system_settings")
+ if doctype == "Website Settings" and hasattr(local, "website_settings"):
+ delattr(local, "website_settings")
def get_cached_value(doctype, name, fieldname="name", as_dict=False):
@@ -1540,7 +1553,15 @@ def call(fn, *args, **kwargs):
return fn(*args, **newargs)
-def get_newargs(fn, kwargs):
+def get_newargs(fn: Callable, kwargs: Dict[str, Any]) -> Dict[str, Any]:
+ """Remove any kwargs that are not supported by the function.
+
+ Example:
+ >>> def fn(a=1, b=2): pass
+
+ >>> get_newargs(fn, {"a": 2, "c": 1})
+ {"a": 2}
+ """
# if function has any **kwargs parameter that capture arbitrary keyword arguments
# Ref: https://docs.python.org/3/library/inspect.html#inspect.Parameter.kind
@@ -2208,8 +2229,18 @@ def safe_eval(code, eval_globals=None, eval_locals=None):
return eval(code, eval_globals, eval_locals)
+def get_website_settings(key):
+ if not hasattr(local, "website_settings"):
+ local.website_settings = db.get_singles_dict("Website Settings", cast=True)
+
+ return local.website_settings.get(key)
+
+
def get_system_settings(key):
- return db.get_single_value("System Settings", key, cache=True)
+ if not hasattr(local, "system_settings"):
+ local.system_settings = db.get_singles_dict("System Settings", cast=True)
+
+ return local.system_settings.get(key)
def get_active_domains():
diff --git a/frappe/client.py b/frappe/client.py
index 3b7e0c397d..d5dc890f56 100644
--- a/frappe/client.py
+++ b/frappe/client.py
@@ -100,8 +100,8 @@ def get_value(doctype, fieldname, filters=None, as_dict=True, debug=False, paren
if frappe.is_table(doctype):
check_parent_permission(parent, doctype)
- if not frappe.has_permission(doctype):
- frappe.throw(_("No permission for {0}").format(doctype), frappe.PermissionError)
+ if not frappe.has_permission(doctype, parent_doctype=parent):
+ frappe.throw(_("No permission for {0}").format(_(doctype)), frappe.PermissionError)
filters = get_safe_filters(filters)
if isinstance(filters, str):
@@ -143,7 +143,7 @@ def get_value(doctype, fieldname, filters=None, as_dict=True, debug=False, paren
@frappe.whitelist()
def get_single_value(doctype, field):
if not frappe.has_permission(doctype):
- frappe.throw(_("No permission for {0}").format(doctype), frappe.PermissionError)
+ frappe.throw(_("No permission for {0}").format(_(doctype)), frappe.PermissionError)
value = frappe.db.get_single_value(doctype, field)
return value
@@ -281,12 +281,6 @@ def set_default(key, value, parent=None):
frappe.clear_cache(user=frappe.session.user)
-@frappe.whitelist()
-def get_default(key, parent=None):
- """set a user default value"""
- return frappe.db.get_default(key, parent)
-
-
@frappe.whitelist(methods=["POST", "PUT"])
def make_width_property_setter(doc):
"""Set width Property Setter
diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 70b48e1f0d..a8667d6595 100644
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -9,6 +9,7 @@ import click
# imports - module imports
import frappe
from frappe.commands import get_site, pass_context
+from frappe.core.doctype.log_settings.log_settings import LOG_DOCTYPES
from frappe.exceptions import SiteNotSpecifiedError
@@ -1088,6 +1089,51 @@ def build_search_index(context):
frappe.destroy()
+@click.command("clear-log-table")
+@click.option("--doctype", default="text", type=click.Choice(LOG_DOCTYPES), help="Log DocType")
+@click.option("--days", type=int, help="Keep records for days")
+@click.option("--no-backup", is_flag=True, default=False, help="Do not backup the table")
+@pass_context
+def clear_log_table(context, doctype, days, no_backup):
+ """If any logtype table grows too large then clearing it with DELETE query
+ is not feasible in reasonable time. This command copies recent data to new
+ table and replaces current table with new smaller table.
+
+
+ ref: https://mariadb.com/kb/en/big-deletes/#deleting-more-than-half-a-table
+ """
+ from frappe.core.doctype.log_settings.log_settings import clear_log_table as clear_logs
+ from frappe.utils.backups import scheduled_backup
+
+ if not context.sites:
+ raise SiteNotSpecifiedError
+
+ if doctype not in LOG_DOCTYPES:
+ raise frappe.ValidationError(f"Unsupported logging DocType: {doctype}")
+
+ for site in context.sites:
+ frappe.init(site=site)
+ frappe.connect()
+
+ if not no_backup:
+ scheduled_backup(
+ ignore_conf=False,
+ include_doctypes=doctype,
+ ignore_files=True,
+ force=True,
+ )
+ click.echo(f"Backed up {doctype}")
+
+ try:
+ click.echo(f"Copying {doctype} records from last {days} days to temporary table.")
+ clear_logs(doctype, days=days)
+ except Exception as e:
+ click.echo(f"Log cleanup for {doctype} failed:\n{e}")
+ sys.exit(1)
+ else:
+ click.secho(f"Cleared {doctype} records older than {days} days", fg="green")
+
+
@click.command("trim-database")
@click.option("--dry-run", is_flag=True, default=False, help="Show what would be deleted")
@click.option(
@@ -1260,4 +1306,5 @@ commands = [
partial_restore,
trim_tables,
trim_database,
+ clear_log_table,
]
diff --git a/frappe/commands/translate.py b/frappe/commands/translate.py
index 0b14e03002..69970d8d97 100644
--- a/frappe/commands/translate.py
+++ b/frappe/commands/translate.py
@@ -48,11 +48,12 @@ def new_language(context, lang_code, app):
@click.command("get-untranslated")
+@click.option("--app", default="_ALL_APPS")
@click.argument("lang")
@click.argument("untranslated_file")
@click.option("--all", default=False, is_flag=True, help="Get all message strings")
@pass_context
-def get_untranslated(context, lang, untranslated_file, all=None):
+def get_untranslated(context, lang, untranslated_file, app="_ALL_APPS", all=None):
"Get untranslated strings for language"
import frappe.translate
@@ -60,17 +61,18 @@ def get_untranslated(context, lang, untranslated_file, all=None):
try:
frappe.init(site=site)
frappe.connect()
- frappe.translate.get_untranslated(lang, untranslated_file, get_all=all)
+ frappe.translate.get_untranslated(lang, untranslated_file, get_all=all, app=app)
finally:
frappe.destroy()
@click.command("update-translations")
+@click.option("--app", default="_ALL_APPS")
@click.argument("lang")
@click.argument("untranslated_file")
@click.argument("translated-file")
@pass_context
-def update_translations(context, lang, untranslated_file, translated_file):
+def update_translations(context, lang, untranslated_file, translated_file, app="_ALL_APPS"):
"Update translated strings"
import frappe.translate
@@ -78,7 +80,7 @@ def update_translations(context, lang, untranslated_file, translated_file):
try:
frappe.init(site=site)
frappe.connect()
- frappe.translate.update_translations(lang, untranslated_file, translated_file)
+ frappe.translate.update_translations(lang, untranslated_file, translated_file, app=app)
finally:
frappe.destroy()
diff --git a/frappe/contacts/address_and_contact.py b/frappe/contacts/address_and_contact.py
index 036594926e..1c5803ffea 100644
--- a/frappe/contacts/address_and_contact.py
+++ b/frappe/contacts/address_and_contact.py
@@ -3,6 +3,7 @@
import functools
import re
+from typing import Dict, List
import frappe
from frappe import _
@@ -169,29 +170,35 @@ def delete_contact_and_address(doctype, docname):
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
-def filter_dynamic_link_doctypes(doctype, txt, searchfield, start, page_len, filters):
- if not txt:
- txt = ""
+def filter_dynamic_link_doctypes(
+ doctype, txt: str, searchfield, start, page_len, filters: Dict
+) -> List[List[str]]:
+ from frappe.permissions import get_doctypes_with_read
- doctypes = frappe.db.get_all(
- "DocField", filters=filters, fields=["parent"], distinct=True, as_list=True
+ txt = txt or ""
+ filters = filters or {}
+
+ _doctypes_from_df = frappe.get_all(
+ "DocField",
+ filters=filters,
+ pluck="parent",
+ distinct=True,
+ order_by=None,
)
+ doctypes_from_df = {d for d in _doctypes_from_df if txt.lower() in _(d).lower()}
- doctypes = tuple(d for d in doctypes if re.search(txt + ".*", _(d[0]), re.IGNORECASE))
+ filters.update({"dt": ("not in", doctypes_from_df)})
+ _doctypes_from_cdf = frappe.get_all(
+ "Custom Field", filters=filters, pluck="dt", distinct=True, order_by=None
+ )
+ doctypes_from_cdf = {d for d in _doctypes_from_cdf if txt.lower() in _(d).lower()}
- filters.update({"dt": ("not in", [d[0] for d in doctypes])})
+ all_doctypes = doctypes_from_df.union(doctypes_from_cdf)
+ allowed_doctypes = set(get_doctypes_with_read())
- _doctypes = frappe.db.get_all("Custom Field", filters=filters, fields=["dt"], as_list=True)
+ valid_doctypes = sorted(all_doctypes.intersection(allowed_doctypes))
- _doctypes = tuple([d for d in _doctypes if re.search(txt + ".*", _(d[0]), re.IGNORECASE)])
-
- all_doctypes = [d[0] for d in doctypes + _doctypes]
- allowed_doctypes = frappe.permissions.get_doctypes_with_read()
-
- valid_doctypes = sorted(set(all_doctypes).intersection(set(allowed_doctypes)))
- valid_doctypes = [[doctype] for doctype in valid_doctypes]
-
- return valid_doctypes
+ return [[doctype] for doctype in valid_doctypes]
def set_link_title(doc):
diff --git a/frappe/core/doctype/access_log/access_log.json b/frappe/core/doctype/access_log/access_log.json
index c5f1030266..69803ef05a 100644
--- a/frappe/core/doctype/access_log/access_log.json
+++ b/frappe/core/doctype/access_log/access_log.json
@@ -36,6 +36,7 @@
"fieldname": "user",
"fieldtype": "Link",
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "User ",
"options": "User",
"read_only": 1
@@ -51,6 +52,7 @@
"fieldname": "reference_document",
"fieldtype": "Data",
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Reference Document",
"read_only": 1
},
@@ -129,7 +131,7 @@
}
],
"links": [],
- "modified": "2022-05-03 09:34:19.337551",
+ "modified": "2022-06-13 05:59:26.866004",
"modified_by": "Administrator",
"module": "Core",
"name": "Access Log",
diff --git a/frappe/core/doctype/activity_log/activity_log.py b/frappe/core/doctype/activity_log/activity_log.py
index 61dedd7bc0..468b7f4473 100644
--- a/frappe/core/doctype/activity_log/activity_log.py
+++ b/frappe/core/doctype/activity_log/activity_log.py
@@ -25,6 +25,13 @@ class ActivityLog(Document):
if self.reference_doctype and self.reference_name:
self.status = "Linked"
+ @staticmethod
+ def clear_old_logs(days=None):
+ if not days:
+ days = 90
+ doctype = DocType("Activity Log")
+ frappe.db.delete(doctype, filters=(doctype.modified < (Now() - Interval(days=days))))
+
def on_doctype_update():
"""Add indexes in `tabActivity Log`"""
@@ -43,12 +50,3 @@ def add_authentication_log(subject, user, operation="Login", status="Success"):
"operation": operation,
}
).insert(ignore_permissions=True, ignore_links=True)
-
-
-def clear_activity_logs(days=None):
- """clear 90 day old authentication logs or configured in log settings"""
-
- if not days:
- days = 90
- doctype = DocType("Activity Log")
- frappe.db.delete(doctype, filters=(doctype.creation < (Now() - Interval(days=days))))
diff --git a/frappe/core/doctype/activity_log/activity_log_list.js b/frappe/core/doctype/activity_log/activity_log_list.js
index 111a230827..e3a75a1941 100644
--- a/frappe/core/doctype/activity_log/activity_log_list.js
+++ b/frappe/core/doctype/activity_log/activity_log_list.js
@@ -4,5 +4,10 @@ frappe.listview_settings['Activity Log'] = {
return [__(doc.status), "green"];
else if(doc.operation == "Login" && doc.status == "Failed")
return [__(doc.status), "red"];
- }
-};
\ No newline at end of file
+ },
+ onload: function(listview) {
+ frappe.require("logtypes.bundle.js", () => {
+ frappe.utils.logtypes.show_log_retention_message(cur_list.doctype);
+ })
+ },
+};
diff --git a/frappe/core/doctype/deleted_document/deleted_document.json b/frappe/core/doctype/deleted_document/deleted_document.json
index 1a612c7411..6b95a523c1 100644
--- a/frappe/core/doctype/deleted_document/deleted_document.json
+++ b/frappe/core/doctype/deleted_document/deleted_document.json
@@ -1,256 +1,81 @@
{
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2016-12-29 12:59:48.638970",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "actions": [],
+ "creation": "2016-12-29 12:59:48.638970",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "deleted_name",
+ "deleted_doctype",
+ "column_break_3",
+ "restored",
+ "new_name",
+ "section_break_6",
+ "data"
+ ],
"fields": [
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "deleted_name",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Deleted Name",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "deleted_name",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Deleted Name",
+ "read_only": 1
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "deleted_doctype",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Deleted DocType",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "deleted_doctype",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Deleted DocType",
+ "read_only": 1
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "restored",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Restored",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "restored",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Restored",
+ "read_only": 1
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "new_name",
- "fieldtype": "Read Only",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "New Name",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "new_name",
+ "fieldtype": "Read Only",
+ "label": "New Name"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_6",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "section_break_6",
+ "fieldtype": "Section Break"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "data",
- "fieldtype": "Code",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Data",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
+ "fieldname": "data",
+ "fieldtype": "Code",
+ "label": "Data",
+ "read_only": 1
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 1,
-
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2016-12-29 14:39:45.724494",
- "modified_by": "Administrator",
- "module": "Core",
- "name": "Deleted Document",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "in_create": 1,
+ "links": [],
+ "modified": "2022-06-13 05:50:58.314908",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "Deleted Document",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 1,
- "email": 0,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
+ "delete": 1,
+ "export": 1,
+ "read": 1,
+ "role": "System Manager"
}
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "deleted_name",
- "track_changes": 1,
- "track_seen": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "deleted_name",
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 3e58146ae7..e56803acb7 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -8,6 +8,7 @@ import os
# imports - standard imports
import re
import shutil
+from typing import TYPE_CHECKING, Union
# imports - module imports
import frappe
@@ -35,6 +36,9 @@ from frappe.query_builder.functions import Concat
from frappe.utils import cint
from frappe.website.utils import clear_cache
+if TYPE_CHECKING:
+ from frappe.custom.doctype.customize_form.customize_form import CustomizeForm
+
DEPENDS_ON_PATTERN = re.compile(r'[\w\.:_]+\s*={1}\s*[\w\.@\'"]+')
ILLEGAL_FIELDNAME_PATTERN = re.compile("""['",./%@()<>{}]""")
WHITESPACE_PADDING_PATTERN = re.compile(r"^[ \t\n\r]+|[ \t\n\r]+$", flags=re.ASCII)
@@ -167,7 +171,7 @@ class DocType(Document):
if docfield.fieldname in method_set:
conflict_type = "controller method"
- if docfield.fieldname in property_set:
+ if docfield.fieldname in property_set and not docfield.is_virtual:
conflict_type = "class property"
if conflict_type:
@@ -814,7 +818,7 @@ class DocType(Document):
self.nsm_parent_field = parent_field_name
def validate_child_table(self):
- if not self.get("istable") or self.is_new():
+ if not self.get("istable") or self.is_new() or self.get("is_virtual"):
# if the doctype is not a child table then return
# if the doctype is a new doctype and also a child table then
# don't move forward as it will be handled via schema
@@ -916,11 +920,11 @@ def validate_series(dt, autoname=None, name=None):
frappe.throw(_("Series {0} already used in {1}").format(prefix, used_in[0][0]))
-def validate_autoincrement_autoname(dt: DocType) -> bool:
+def validate_autoincrement_autoname(dt: Union[DocType, "CustomizeForm"]) -> bool:
"""Checks if can doctype can change to/from autoincrement autoname"""
- def get_autoname_before_save(dt: DocType) -> str:
- if dt.name == "Customize Form":
+ def get_autoname_before_save(dt: Union[DocType, "CustomizeForm"]) -> str:
+ if dt.doctype == "Customize Form":
property_value = frappe.db.get_value(
"Property Setter", {"doc_type": dt.doc_type, "property": "autoname"}, "value"
)
@@ -943,10 +947,10 @@ def validate_autoincrement_autoname(dt: DocType) -> bool:
or (not is_autoname_autoincrement and autoname_before_save == "autoincrement")
):
- if frappe.get_meta(dt.name).issingle:
- if dt.name == "Customize Form":
- frappe.throw(_("Cannot change to/from autoincrement autoname in Customize Form"))
+ if dt.doctype == "Customize Form":
+ frappe.throw(_("Cannot change to/from autoincrement autoname in Customize Form"))
+ if frappe.get_meta(dt.name).issingle:
return False
if not frappe.get_all(dt.name, limit=1):
diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py
index 0bcd972c68..569cf9af2f 100644
--- a/frappe/core/doctype/doctype/test_doctype.py
+++ b/frappe/core/doctype/doctype/test_doctype.py
@@ -564,6 +564,46 @@ class TestDocType(unittest.TestCase):
self.assertEqual(doc.is_virtual, 1)
self.assertFalse(frappe.db.table_exists("Test Virtual Doctype"))
+ def test_create_virtual_doctype_as_child_table(self):
+ """Test virtual DocType as Child Table below a normal DocType."""
+ frappe.delete_doc_if_exists("DocType", "Test Parent Virtual DocType", force=1)
+ frappe.delete_doc_if_exists("DocType", "Test Virtual DocType as Child Table", force=1)
+
+ virtual_doc = new_doctype("Test Virtual DocType as Child Table")
+ virtual_doc.is_virtual = 1
+ virtual_doc.istable = 1
+ virtual_doc.insert(ignore_permissions=True)
+
+ doc = frappe.get_doc("DocType", "Test Virtual DocType as Child Table")
+
+ self.assertEqual(doc.is_virtual, 1)
+ self.assertEqual(doc.istable, 1)
+ self.assertFalse(frappe.db.table_exists("Test Virtual DocType as Child Table"))
+
+ parent_doc = new_doctype("Test Parent Virtual DocType")
+ parent_doc.append(
+ "fields",
+ {
+ "fieldname": "virtual_child_table",
+ "fieldtype": "Table",
+ "options": "Test Virtual DocType as Child Table",
+ },
+ )
+ parent_doc.insert(ignore_permissions=True)
+
+ # create entry for parent doctype
+ parent_doc_entry = frappe.get_doc(
+ {"doctype": "Test Parent Virtual DocType", "some_fieldname": "Test"}
+ )
+ parent_doc_entry.insert(ignore_permissions=True)
+
+ # update the parent doc (should not abort because of any DB query to a virtual child table, as there is none)
+ parent_doc_entry.some_fieldname = "Test update"
+ parent_doc_entry.save(ignore_permissions=True)
+
+ # delete the parent doc (should not abort because of any DB query to a virtual child table, as there is none)
+ parent_doc_entry.delete()
+
def test_default_fieldname(self):
fields = [
{"label": "title", "fieldname": "title", "fieldtype": "Data", "default": "{some_fieldname}"}
diff --git a/frappe/core/doctype/error_log/error_log.js b/frappe/core/doctype/error_log/error_log.js
index 4fe8fde5d6..1262002b04 100644
--- a/frappe/core/doctype/error_log/error_log.js
+++ b/frappe/core/doctype/error_log/error_log.js
@@ -1,8 +1,17 @@
-// Copyright (c) 2016, Frappe Technologies and contributors
+// Copyright (c) 2022, Frappe Technologies and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Error Log', {
+frappe.ui.form.on("Error Log", {
refresh: function(frm) {
+ frm.disable_save();
- }
+ if (frm.doc.reference_doctype && frm.doc.reference_name) {
+ frm.add_custom_button(__("Show Related Errors"), function() {
+ frappe.set_route("List", "Error Log", {
+ reference_doctype: frm.doc.reference_doctype,
+ reference_name: frm.doc.reference_name,
+ });
+ });
+ }
+ },
});
diff --git a/frappe/core/doctype/error_log/error_log.json b/frappe/core/doctype/error_log/error_log.json
index e0ce109595..2ee86bd118 100644
--- a/frappe/core/doctype/error_log/error_log.json
+++ b/frappe/core/doctype/error_log/error_log.json
@@ -6,10 +6,12 @@
"engine": "MyISAM",
"field_order": [
"seen",
- "method",
- "error",
"reference_doctype",
- "reference_name"
+ "column_break_3",
+ "reference_name",
+ "section_break_5",
+ "method",
+ "error"
],
"fields": [
{
@@ -47,12 +49,21 @@
"fieldtype": "Data",
"label": "Reference Name",
"read_only": 1
+ },
+ {
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "section_break_5",
+ "fieldtype": "Section Break"
}
],
"icon": "fa fa-warning-sign",
"idx": 1,
+ "in_create": 1,
"links": [],
- "modified": "2022-05-19 05:32:16.026684",
+ "modified": "2022-06-13 06:34:05.158606",
"modified_by": "Administrator",
"module": "Core",
"name": "Error Log",
@@ -70,7 +81,6 @@
"write": 1
}
],
- "quick_entry": 1,
"sort_field": "modified",
"sort_order": "ASC",
"states": [],
diff --git a/frappe/core/doctype/error_log/error_log.py b/frappe/core/doctype/error_log/error_log.py
index d93029179c..224a5673a7 100644
--- a/frappe/core/doctype/error_log/error_log.py
+++ b/frappe/core/doctype/error_log/error_log.py
@@ -4,6 +4,8 @@
import frappe
from frappe.model.document import Document
+from frappe.query_builder import Interval
+from frappe.query_builder.functions import Now
class ErrorLog(Document):
@@ -12,13 +14,10 @@ class ErrorLog(Document):
self.db_set("seen", 1, update_modified=0)
frappe.db.commit()
-
-def set_old_logs_as_seen():
- # set logs as seen
- frappe.db.sql(
- """UPDATE `tabError Log` SET `seen`=1
- WHERE `seen`=0 AND `creation` < (NOW() - INTERVAL '7' DAY)"""
- )
+ @staticmethod
+ def clear_old_logs(days=30):
+ table = frappe.qb.DocType("Error Log")
+ frappe.db.delete(table, filters=(table.modified < (Now() - Interval(days=days))))
@frappe.whitelist()
diff --git a/frappe/core/doctype/error_log/error_log_list.js b/frappe/core/doctype/error_log/error_log_list.js
index 91e69452ff..e92773a9de 100644
--- a/frappe/core/doctype/error_log/error_log_list.js
+++ b/frappe/core/doctype/error_log/error_log_list.js
@@ -1,7 +1,7 @@
-frappe.listview_settings['Error Log'] = {
+frappe.listview_settings["Error Log"] = {
add_fields: ["seen"],
get_indicator: function(doc) {
- if(cint(doc.seen)) {
+ if (cint(doc.seen)) {
return [__("Seen"), "green", "seen,=,1"];
} else {
return [__("Not Seen"), "red", "seen,=,0"];
@@ -11,11 +11,15 @@ frappe.listview_settings['Error Log'] = {
onload: function(listview) {
listview.page.add_menu_item(__("Clear Error Logs"), function() {
frappe.call({
- method:'frappe.core.doctype.error_log.error_log.clear_error_logs',
+ method: "frappe.core.doctype.error_log.error_log.clear_error_logs",
callback: function() {
listview.refresh();
- }
+ },
});
});
- }
+
+ frappe.require("logtypes.bundle.js", () => {
+ frappe.utils.logtypes.show_log_retention_message(cur_list.doctype);
+ })
+ },
};
diff --git a/frappe/core/doctype/error_snapshot/error_snapshot.py b/frappe/core/doctype/error_snapshot/error_snapshot.py
index 82f189217f..6e13b7a654 100644
--- a/frappe/core/doctype/error_snapshot/error_snapshot.py
+++ b/frappe/core/doctype/error_snapshot/error_snapshot.py
@@ -4,6 +4,8 @@
import frappe
from frappe.model.document import Document
+from frappe.query_builder import Interval
+from frappe.query_builder.functions import Now
class ErrorSnapshot(Document):
@@ -32,3 +34,8 @@ class ErrorSnapshot(Document):
frappe.db.set_value("Error Snapshot", parent["name"], "relapses", parent["relapses"] + 1)
if parent["seen"]:
frappe.db.set_value("Error Snapshot", parent["name"], "seen", False)
+
+ @staticmethod
+ def clear_old_logs(days=30):
+ table = frappe.qb.DocType("Error Snapshot")
+ frappe.db.delete(table, filters=(table.modified < (Now() - Interval(days=days))))
diff --git a/frappe/core/doctype/error_snapshot/error_snapshot_list.js b/frappe/core/doctype/error_snapshot/error_snapshot_list.js
index 1ba3e344ae..553495beb1 100644
--- a/frappe/core/doctype/error_snapshot/error_snapshot_list.js
+++ b/frappe/core/doctype/error_snapshot/error_snapshot_list.js
@@ -10,5 +10,10 @@ frappe.listview_settings["Error Snapshot"] = {
} else {
return [__("First Level"), !doc.seen ? "red" : "green", "parent_error_snapshot,=,"];
}
- }
+ },
+ onload: function(listview) {
+ frappe.require("logtypes.bundle.js", () => {
+ frappe.utils.logtypes.show_log_retention_message(cur_list.doctype);
+ })
+ },
}
diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index 1bcbaf161a..bb4b441680 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -16,7 +16,7 @@ from requests.exceptions import HTTPError, SSLError
import frappe
from frappe import _
from frappe.model.document import Document
-from frappe.utils import call_hook_method, cint, get_files_path, get_hook_method
+from frappe.utils import call_hook_method, cint, get_files_path, get_hook_method, get_url
from frappe.utils.file_manager import is_safe_path
from frappe.utils.image import optimize_image, strip_exif_data
@@ -61,7 +61,12 @@ class File(Document):
self.set_file_name()
self.validate_attachment_limit()
- if not self.is_folder and not self.is_remote_file:
+ if self.is_folder:
+ return
+
+ if self.is_remote_file:
+ self.validate_remote_file()
+ else:
self.save_file(content=self.get_content())
self.flags.new_file = True
frappe.local.rollback_observers.append(self)
@@ -255,6 +260,12 @@ class File(Document):
title=_("Attachment Limit Reached"),
)
+ def validate_remote_file(self):
+ """Validates if file uploaded using URL already exist"""
+ site_url = get_url()
+ if "/files/" in self.file_url and self.file_url.startswith(site_url):
+ self.file_url = self.file_url.split(site_url, 1)[1]
+
def set_folder_name(self):
"""Make parent folders if not exists based on reference doctype and name"""
if self.folder:
@@ -341,9 +352,9 @@ class File(Document):
size = width, height
if crop:
- image = ImageOps.fit(image, size, Image.ANTIALIAS)
+ image = ImageOps.fit(image, size, Image.Resampling.LANCZOS)
else:
- image.thumbnail(size, Image.ANTIALIAS)
+ image.thumbnail(size, Image.Resampling.LANCZOS)
thumbnail_url = f"{filename}_{suffix}.{extn}"
path = os.path.abspath(frappe.get_site_path("public", thumbnail_url.lstrip("/")))
@@ -445,6 +456,10 @@ class File(Document):
file_path = self.file_url or self.file_name
+ site_url = get_url()
+ if "/files/" in file_path and file_path.startswith(site_url):
+ file_path = file_path.split(site_url, 1)[1]
+
if "/" not in file_path:
if self.is_private:
file_path = f"/private/files/{file_path}"
diff --git a/frappe/core/doctype/log_settings/log_settings.js b/frappe/core/doctype/log_settings/log_settings.js
index 09a2086a1d..dc7cc7eac2 100644
--- a/frappe/core/doctype/log_settings/log_settings.js
+++ b/frappe/core/doctype/log_settings/log_settings.js
@@ -1,8 +1,16 @@
// Copyright (c) 2020, Frappe Technologies and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Log Settings', {
- // refresh: function(frm) {
-
- // }
+frappe.ui.form.on("Log Settings", {
+ refresh: (frm) => {
+ frm.set_query("ref_doctype", "logs_to_clear", () => {
+ const added_doctypes = frm.doc.logs_to_clear.map((r) => r.ref_doctype);
+ return {
+ query: "frappe.core.doctype.log_settings.log_settings.get_log_doctypes",
+ filters: [
+ ["name", "not in", added_doctypes],
+ ],
+ };
+ });
+ },
});
diff --git a/frappe/core/doctype/log_settings/log_settings.json b/frappe/core/doctype/log_settings/log_settings.json
index f06d14f16b..5a9dd159cc 100644
--- a/frappe/core/doctype/log_settings/log_settings.json
+++ b/frappe/core/doctype/log_settings/log_settings.json
@@ -5,61 +5,20 @@
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
- "error_log_notification_section",
- "users_to_notify",
- "log_cleanup_section",
- "clear_error_log_after",
- "clear_activity_log_after",
- "column_break_4",
- "clear_email_queue_after"
+ "logs_to_clear"
],
"fields": [
{
- "fieldname": "log_cleanup_section",
- "fieldtype": "Section Break",
- "label": "Log Cleanup"
- },
- {
- "fieldname": "column_break_4",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "error_log_notification_section",
- "fieldtype": "Section Break",
- "label": "Error Log Notification"
- },
- {
- "fieldname": "users_to_notify",
- "fieldtype": "Table MultiSelect",
- "label": "Users To Notify",
- "options": "Log Setting User"
- },
- {
- "default": "90",
- "description": "In Days",
- "fieldname": "clear_error_log_after",
- "fieldtype": "Int",
- "label": "Clear Error log After"
- },
- {
- "default": "90",
- "description": "In Days",
- "fieldname": "clear_activity_log_after",
- "fieldtype": "Int",
- "label": "Clear Activity Log After"
- },
- {
- "default": "30",
- "description": "In Days",
- "fieldname": "clear_email_queue_after",
- "fieldtype": "Int",
- "label": "Clear Email Queue After"
+ "fieldname": "logs_to_clear",
+ "fieldtype": "Table",
+ "label": "Logs to Clear",
+ "options": "Logs To Clear"
}
],
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
- "modified": "2020-10-13 12:18:48.649038",
+ "modified": "2022-06-11 02:17:30.803721",
"modified_by": "Administrator",
"module": "Core",
"name": "Log Settings",
@@ -79,5 +38,6 @@
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
+ "states": [],
"track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/log_settings/log_settings.py b/frappe/core/doctype/log_settings/log_settings.py
index 5632f05a36..1a7ce532cd 100644
--- a/frappe/core/doctype/log_settings/log_settings.py
+++ b/frappe/core/doctype/log_settings/log_settings.py
@@ -2,49 +2,119 @@
# Copyright (c) 2020, Frappe Technologies and contributors
# License: MIT. See LICENSE
+from typing import Protocol, runtime_checkable
+
import frappe
from frappe import _
+from frappe.model.base_document import get_controller
from frappe.model.document import Document
-from frappe.query_builder import DocType, Interval
-from frappe.query_builder.functions import Now
+from frappe.utils import cint
+from frappe.utils.caching import site_cache
+
+DEFAULT_LOGTYPES_RETENTION = {
+ "Error Log": 30,
+ "Activity Log": 90,
+ "Email Queue": 30,
+ "Error Snapshot": 30,
+ "Scheduled Job Log": 90,
+}
+
+
+@runtime_checkable
+class LogType(Protocol):
+ """Interface requirement for doctypes that can be cleared using log settings."""
+
+ @staticmethod
+ def clear_old_logs(days: int) -> None:
+ ...
+
+
+@site_cache
+def _supports_log_clearing(doctype: str) -> bool:
+ try:
+ controller = get_controller(doctype)
+ return issubclass(controller, LogType)
+ except Exception:
+ return False
class LogSettings(Document):
- def clear_logs(self, commit=False):
- self.clear_email_queue()
- if commit:
- # Since since deleting many logs can take significant amount of time, commit is required to relase locks.
- # Error log table doesn't require commit - myisam
- # activity logs are deleted last so background job finishes and commits.
+ def validate(self):
+ self.validate_supported_doctypes()
+ self.validate_duplicates()
+ self.add_default_logtypes()
+
+ def validate_supported_doctypes(self):
+ for entry in self.logs_to_clear:
+ if _supports_log_clearing(entry.ref_doctype):
+ continue
+
+ msg = _("{} does not support automated log clearing.").format(frappe.bold(entry.ref_doctype))
+ if frappe.conf.developer_mode:
+ msg += "{0} """.format(
- unsubscribe_message
- )
- else:
- unsubscribe_link = """{0} """.format(
- _("Unsubscribe")
- )
- unsubscribe_html = _("{0} to stop receiving emails of this type").format(unsubscribe_link)
-
- html = """
+def get_unsubscribe_message(
+ unsubscribe_message: str, expose_recipients: str
+) -> frappe._dict[str, str]:
+ unsubscribe_message = unsubscribe_message or _("Unsubscribe")
+ unsubscribe_link = f'
{unsubscribe_message} '
+ unsubscribe_html = _("{0} to stop receiving emails of this type").format(unsubscribe_link)
+ html = f"""
- {0}
+ {unsubscribe_html}
-
""".format(
- unsubscribe_html
- )
+
-
-
+
+
diff --git a/frappe/printing/page/print_format_builder/print_format_builder_field.html b/frappe/printing/page/print_format_builder/print_format_builder_field.html
index 0e207222a5..beb9de2f5a 100644
--- a/frappe/printing/page/print_format_builder/print_format_builder_field.html
+++ b/frappe/printing/page/print_format_builder/print_format_builder_field.html
@@ -13,11 +13,11 @@
{% if !in_list(["Table", "HTML", "Custom HTML"], field.fieldtype) %}
-
-
{% endif %}
{% if(field.fieldtype==="Custom HTML") { %}
@@ -32,7 +32,7 @@
{% } else { %}
{% if(field.fieldtype==="Table") { %}
-
{{ __(field.label) }}
({%= __("Table") %})
diff --git a/frappe/printing/page/print_format_builder/print_format_builder_layout.html b/frappe/printing/page/print_format_builder/print_format_builder_layout.html
index f45a760cbc..cc78ddceb8 100644
--- a/frappe/printing/page/print_format_builder/print_format_builder_layout.html
+++ b/frappe/printing/page/print_format_builder/print_format_builder_layout.html
@@ -7,7 +7,7 @@
{%= __("Edit Heading") %}
-
@@ -23,7 +23,7 @@
-
{%= __("Add a new section") %}
diff --git a/frappe/printing/page/print_format_builder/print_format_builder_section.html b/frappe/printing/page/print_format_builder/print_format_builder_section.html
index 70a97a15f0..108e5ff01c 100644
--- a/frappe/printing/page/print_format_builder/print_format_builder_section.html
+++ b/frappe/printing/page/print_format_builder/print_format_builder_section.html
@@ -1,10 +1,10 @@
diff --git a/frappe/public/icons/social/fair.svg b/frappe/public/icons/social/fair.svg
index 4cfc77a71f..60c00dc7af 100644
--- a/frappe/public/icons/social/fair.svg
+++ b/frappe/public/icons/social/fair.svg
@@ -4,11 +4,11 @@
-
-
diff --git a/frappe/public/icons/social/office_365.svg b/frappe/public/icons/social/office_365.svg
index d93167741d..77c3559408 100644
--- a/frappe/public/icons/social/office_365.svg
+++ b/frappe/public/icons/social/office_365.svg
@@ -35,11 +35,11 @@
-
-
diff --git a/frappe/public/images/leaflet/spritesheet.svg b/frappe/public/images/leaflet/spritesheet.svg
index 3c00f30314..05feda62df 100644
--- a/frappe/public/images/leaflet/spritesheet.svg
+++ b/frappe/public/images/leaflet/spritesheet.svg
@@ -134,14 +134,14 @@
transform="translate(120,0)"
style="fill:#bbbbbb">
{
- if (
- window.cordova &&
- window.cordova.plugins &&
- window.cordova.plugins.barcodeScanner
- ) {
- window.cordova.plugins.barcodeScanner.scan(result => {
- if (!result.cancelled) {
- resolve(result.text);
- }
- }, reject);
- } else {
- frappe.require('barcode_scanner.bundle.js', () => {
- frappe.barcode.get_barcode().then(barcode => {
- resolve(barcode);
- });
- });
- }
- });
-};
diff --git a/frappe/public/js/frappe/barcode_scanner/quagga.js b/frappe/public/js/frappe/barcode_scanner/quagga.js
deleted file mode 100644
index fcab3b4dbe..0000000000
--- a/frappe/public/js/frappe/barcode_scanner/quagga.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import Quagga from 'quagga/dist/quagga';
-frappe.provide('frappe.barcode');
-
-Quagga.onProcessed(function(result) {
- let drawingCtx = Quagga.canvas.ctx.overlay,
- drawingCanvas = Quagga.canvas.dom.overlay;
-
- if (result) {
- if (result.boxes) {
- drawingCtx.clearRect(
- 0,
- 0,
- parseInt(drawingCanvas.getAttribute('width')),
- parseInt(drawingCanvas.getAttribute('height'))
- );
- result.boxes
- .filter(function(box) {
- return box !== result.box;
- })
- .forEach(function(box) {
- Quagga.ImageDebug.drawPath(box, { x: 0, y: 1 }, drawingCtx, {
- color: 'green',
- lineWidth: 2
- });
- });
- }
-
- if (result.box) {
- Quagga.ImageDebug.drawPath(result.box, { x: 0, y: 1 }, drawingCtx, {
- color: '#00F',
- lineWidth: 2
- });
- }
-
- if (result.codeResult && result.codeResult.code) {
- Quagga.ImageDebug.drawPath(result.line, { x: 'x', y: 'y' }, drawingCtx, {
- color: 'red',
- lineWidth: 3
- });
- }
- }
-});
-
-frappe.barcode.get_barcode = function() {
- return new Promise(resolve => {
- let d = new frappe.ui.Dialog({
- title: __('Scan Barcode'),
- fields: [
- {
- fieldtype: 'HTML',
- fieldname: 'scan_area'
- }
- ],
- on_page_show() {
- let $scan_area = d.get_field('scan_area').$wrapper;
- $scan_area.addClass('barcode-scanner');
-
- Quagga.init(
- {
- inputStream: {
- name: 'Live',
- type: 'LiveStream',
- target: $scan_area.get(0)
- },
- decoder: {
- readers: ['code_128_reader']
- }
- },
- function(err) {
- if (err) {
- // eslint-disable-next-line
- console.log(err);
- return;
- }
- // eslint-disable-next-line
- console.log('Initialization finished. Ready to start');
- Quagga.start();
- }
- );
-
- Quagga.onDetected(function(result) {
- let code = result.codeResult.code;
- if (code) {
- Quagga.stop();
- d.hide();
- resolve(code);
- }
- });
- }
- });
-
- d.show();
- });
-};
diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue
index b940d8d773..fa722ff3af 100644
--- a/frappe/public/js/frappe/file_uploader/FileUploader.vue
+++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue
@@ -65,7 +65,7 @@
-
{{ __('Google Drive') }}
diff --git a/frappe/public/js/frappe/form/controls/base_control.js b/frappe/public/js/frappe/form/controls/base_control.js
index e22235f60f..f491fb1427 100644
--- a/frappe/public/js/frappe/form/controls/base_control.js
+++ b/frappe/public/js/frappe/form/controls/base_control.js
@@ -72,9 +72,12 @@ frappe.ui.form.Control = class BaseControl {
status = "Read";
}
+ let value = this.value || this.get_model_value();
+ value = this.get_parsed_value(value);
+
if (
status === "Read" &&
- is_null(this.value) &&
+ is_null(value) &&
!in_list(["HTML", "Image", "Button"], this.df.fieldtype)
) status = "None";
@@ -93,9 +96,12 @@ frappe.ui.form.Control = class BaseControl {
}
}
+ let value = frappe.model.get_value(this.doctype, this.docname, this.df.fieldname);
+ value = this.get_parsed_value(value);
+
// hide if no value
if (this.doctype && status==="Read" && !this.only_input
- && is_null(frappe.model.get_value(this.doctype, this.docname, this.df.fieldname))
+ && is_null(value)
&& !in_list(["HTML", "Image", "Button"], this.df.fieldtype)) {
// eslint-disable-next-line
@@ -159,14 +165,18 @@ frappe.ui.form.Control = class BaseControl {
return this.doc[this.df.fieldname];
}
}
+ get_parsed_value(value) {
+ if (this.parse) {
+ value = this.parse(value);
+ }
+ return value;
+ }
set_value(value, force_set_value=false) {
return this.validate_and_set_in_model(value, null, force_set_value);
}
parse_validate_and_set_in_model(value, e) {
- if(this.parse) {
- value = this.parse(value);
- }
+ value = this.get_parsed_value(value);
return this.validate_and_set_in_model(value, e);
}
validate_and_set_in_model(value, e, force_set_value=false) {
diff --git a/frappe/public/js/frappe/form/controls/date.js b/frappe/public/js/frappe/form/controls/date.js
index a8b82604c9..09517e742b 100644
--- a/frappe/public/js/frappe/form/controls/date.js
+++ b/frappe/public/js/frappe/form/controls/date.js
@@ -140,6 +140,9 @@ frappe.ui.form.ControlDate = class ControlDate extends frappe.ui.form.ControlDat
}
parse(value) {
if (value) {
+ if (value == "Invalid date") {
+ return "";
+ }
return frappe.datetime.user_to_str(value, false, true);
}
}
diff --git a/frappe/public/js/frappe/form/controls/date_range.js b/frappe/public/js/frappe/form/controls/date_range.js
index 170404f575..a1e796604f 100644
--- a/frappe/public/js/frappe/form/controls/date_range.js
+++ b/frappe/public/js/frappe/form/controls/date_range.js
@@ -41,9 +41,11 @@ frappe.ui.form.ControlDateRange = class ControlDateRange extends frappe.ui.form.
this.set_mandatory && this.set_mandatory(value);
}
parse(value) {
+ if (value == undefined || typeof value == 'object') return value;
+
// replace the separator (which can be in user language) with comma
const to = __('{0} to {1}').replace('{0}', '').replace('{1}', '');
- value = value.replace(to, ',');
+ value = value && value.replace(to, ',');
if(value && value.includes(',')) {
var vals = value.split(',');
diff --git a/frappe/public/js/frappe/form/controls/datetime.js b/frappe/public/js/frappe/form/controls/datetime.js
index 9b10465d7b..43873b3b1e 100644
--- a/frappe/public/js/frappe/form/controls/datetime.js
+++ b/frappe/public/js/frappe/form/controls/datetime.js
@@ -40,8 +40,11 @@ frappe.ui.form.ControlDatetime = class ControlDatetime extends frappe.ui.form.Co
value = frappe.datetime.convert_to_system_tz(value, true);
}
- return value;
+ if (value == "Invalid date") {
+ value = "";
+ }
}
+ return value;
}
format_for_input(value) {
if (!value) return "";
diff --git a/frappe/public/js/frappe/form/controls/duration.js b/frappe/public/js/frappe/form/controls/duration.js
index 361d10982e..940ad9d58a 100644
--- a/frappe/public/js/frappe/form/controls/duration.js
+++ b/frappe/public/js/frappe/form/controls/duration.js
@@ -109,6 +109,10 @@ frappe.ui.form.ControlDuration = class ControlDuration extends frappe.ui.form.Co
return cint(this.value);
}
+ parse(value) {
+ return !value ? "" : value;
+ }
+
refresh_input() {
super.refresh_input();
this.set_duration_options();
diff --git a/frappe/public/js/frappe/form/controls/multiselect_pills.js b/frappe/public/js/frappe/form/controls/multiselect_pills.js
index bf93ac0dd8..3f3e204039 100644
--- a/frappe/public/js/frappe/form/controls/multiselect_pills.js
+++ b/frappe/public/js/frappe/form/controls/multiselect_pills.js
@@ -38,6 +38,10 @@ frappe.ui.form.ControlMultiSelectPills = class ControlMultiSelectPills extends f
}
parse(value) {
+ if (typeof value == "object" || !this.rows) {
+ return value;
+ }
+
if (value) {
this.rows.push(value);
}
diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js
index e106d8eed6..14bc0e297c 100644
--- a/frappe/public/js/frappe/form/controls/table_multiselect.js
+++ b/frappe/public/js/frappe/form/controls/table_multiselect.js
@@ -50,6 +50,10 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f
this.$input_area.find('.link-btn').remove();
}
parse(value, label) {
+ if (typeof value == "object" || !this.rows) {
+ return value;
+ }
+
const link_field = this.get_link_field();
if (value) {
diff --git a/frappe/public/js/frappe/form/controls/time.js b/frappe/public/js/frappe/form/controls/time.js
index f7fcc4c618..bbdec69cf8 100644
--- a/frappe/public/js/frappe/form/controls/time.js
+++ b/frappe/public/js/frappe/form/controls/time.js
@@ -82,6 +82,9 @@ frappe.ui.form.ControlTime = class ControlTime extends frappe.ui.form.ControlDat
}
parse(value) {
if (value) {
+ if (value == "Invalid date") {
+ value = "";
+ }
return frappe.datetime.user_to_str(value, true);
}
}
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index b8fa42fa94..148ec7ca86 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -506,8 +506,6 @@ frappe.ui.form.Form = class FrappeForm {
}
initialize_new_doc() {
- // moved this call to refresh function
- // this.check_doctype_conflict(docname);
var me = this;
// hide any open grid
@@ -575,8 +573,6 @@ frappe.ui.form.Form = class FrappeForm {
this.$wrapper.trigger('render_complete');
- this.cscript.is_onload && this.set_first_tab_as_active();
-
if(!this.hidden) {
this.layout.show_empty_form_message();
}
@@ -592,11 +588,6 @@ frappe.ui.form.Form = class FrappeForm {
this.setup_image_autocompletions_in_markdown();
}
- set_first_tab_as_active() {
- this.layout.tabs[0]
- && this.layout.tabs[0].set_active();
- }
-
focus_on_first_input() {
let first = this.form_wrapper.find('.form-layout :input:visible:first');
if (!in_list(["Date", "Datetime"], first.attr("data-fieldtype"))) {
@@ -1031,8 +1022,8 @@ frappe.ui.form.Form = class FrappeForm {
if(this.doc.__unsaved) {
this.dashboard.clear_headline();
this.dashboard.set_headline_alert(__("This form has been modified after you have loaded it")
- + ''
- + __("Refresh") + ' ', "alert-warning");
+ + ''
+ + __("Refresh") + ' ', "alert-warning");
} else {
this.reload_doc();
}
@@ -1847,6 +1838,15 @@ frappe.ui.form.Form = class FrappeForm {
});
});
}
+ set_active_tab(tab) {
+ if (!this.active_tab_map) {
+ this.active_tab_map = {};
+ }
+ this.active_tab_map[this.docname] = tab;
+ }
+ get_active_tab() {
+ return this.active_tab_map && this.active_tab_map[this.docname];
+ }
};
frappe.validated = 0;
diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index 403abf0981..add9ce7b8b 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -122,7 +122,8 @@ frappe.ui.form.Layout = class Layout {
}
if (this.is_tabbed_layout()) {
- let default_tab = {label: __('Details'), fieldname: 'details', fieldtype: "Tab Break"};
+ // add a tab without `fieldname` to avoid conflicts
+ let default_tab = {label: __('Details'), fieldtype: "Tab Break", fieldname: "__details"};
let first_tab = this.fields[1].fieldtype === "Tab Break" ? this.fields[1] : null;
if (!first_tab) {
this.fields.splice(1, 0, default_tab);
@@ -292,9 +293,6 @@ frappe.ui.form.Layout = class Layout {
// refresh sections
this.refresh_sections();
- // refresh tabs
- this.tabbed_layout && this.refresh_tabs();
-
if (this.frm) {
// collapse sections
this.refresh_section_collapse();
@@ -324,29 +322,32 @@ frappe.ui.form.Layout = class Layout {
section.addClass("empty-section");
}
});
+
+ // refresh tabs
+ this.is_tabbed_layout() && this.refresh_tabs();
}
refresh_tabs() {
- this.tabs.forEach(tab => {
- if (!tab.wrapper.hasClass('hide') || !tab.parent.hasClass('hide')) {
- tab.parent.removeClass('show hide');
- tab.wrapper.removeClass('show hide');
- if (
- tab.wrapper.find(
- ".form-section:not(.hide-control, .empty-section), .form-dashboard-section:not(.hide-control, .empty-section)"
- ).length
- ) {
- tab.toggle(true);
- } else {
- tab.toggle(false);
- }
- }
- });
+ for (let tab of this.tabs) {
+ tab.refresh();
+ }
const visible_tabs = this.tabs.filter(tab => !tab.hidden);
if (visible_tabs && visible_tabs.length == 1) {
visible_tabs[0].parent.toggleClass('hide show');
}
+ this.set_tab_as_active();
+ }
+
+ set_tab_as_active() {
+ let frm_active_tab = this?.frm.get_active_tab?.();
+ if (frm_active_tab) {
+ frm_active_tab.set_active();
+ } else if (this.tabs.length) {
+ // set first tab as active when opening for first time, or new doc
+ let first_visible_tab = this.tabs.find(tab => !tab.is_hidden());
+ first_visible_tab && first_visible_tab.set_active();
+ }
}
refresh_fields(fields) {
diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js
index 86523d7088..f55f7139c9 100644
--- a/frappe/public/js/frappe/form/quick_entry.js
+++ b/frappe/public/js/frappe/form/quick_entry.js
@@ -267,7 +267,7 @@ frappe.ui.form.QuickEntryForm = class QuickEntryForm {
render_edit_in_full_page_link() {
var me = this;
this.dialog.add_custom_action(
- `${__("Edit in full page")}`,
+ `${__("Edit Full Form")}`,
() => me.open_doc(true)
);
}
diff --git a/frappe/public/js/frappe/form/sidebar/user_image.js b/frappe/public/js/frappe/form/sidebar/user_image.js
index f657cbca02..d08e17bced 100644
--- a/frappe/public/js/frappe/form/sidebar/user_image.js
+++ b/frappe/public/js/frappe/form/sidebar/user_image.js
@@ -65,15 +65,17 @@ frappe.ui.form.setup_user_image_event = function(frm) {
});
}
- frm.sidebar.image_wrapper.on('click', ':not(.sidebar-image-actions)', (e) => {
- let $target = $(e.currentTarget);
- if ($target.is('a.dropdown-toggle, .dropdown')) {
- return;
- }
- let dropdown = frm.sidebar.image_wrapper.find('.sidebar-image-actions .dropdown');
- dropdown.toggleClass('open');
- e.stopPropagation();
- });
+ if (frm.meta.image_field && !frm.fields_dict[frm.meta.image_field].df.read_only) {
+ frm.sidebar.image_wrapper.on('click', ':not(.sidebar-image-actions)', (e) => {
+ let $target = $(e.currentTarget);
+ if ($target.is('a.dropdown-toggle, .dropdown')) {
+ return;
+ }
+ let dropdown = frm.sidebar.image_wrapper.find('.sidebar-image-actions .dropdown');
+ dropdown.toggleClass('open');
+ e.stopPropagation();
+ });
+ }
// bind click on image_wrapper
frm.sidebar.image_wrapper.on('click', '.sidebar-image-change, .sidebar-image-remove', function(e) {
diff --git a/frappe/public/js/frappe/form/tab.js b/frappe/public/js/frappe/form/tab.js
index 3fad807f06..324d0c50c8 100644
--- a/frappe/public/js/frappe/form/tab.js
+++ b/frappe/public/js/frappe/form/tab.js
@@ -10,6 +10,7 @@ export default class Tab {
this.fields_list = [];
this.fields_dict = {};
this.make();
+ this.setup_listeners();
this.refresh();
}
@@ -36,10 +37,27 @@ export default class Tab {
// hide if explicitly hidden
let hide = this.df.hidden || this.df.hidden_due_to_dependency;
+
+ // hide if dashboard and not saved
+ if (!hide && this.df.show_dashboard && this.frm.is_new() && !this.fields_list.length) {
+ hide = true;
+ }
+
+ // hide if no read permission
if (!hide && this.frm && !this.frm.get_perm(this.df.permlevel || 0, "read")) {
hide = true;
}
+ if (!hide && !this.df.show_dashboard) {
+ // show only if there is at least one visibe section or control
+ hide = true;
+ if (this.wrapper.find(
+ ".form-section:not(.hide-control, .empty-section), .form-dashboard-section:not(.hide-control, .empty-section)"
+ ).length) {
+ hide = false;
+ }
+ }
+
this.toggle(!hide);
}
@@ -61,7 +79,7 @@ export default class Tab {
set_active() {
this.parent.find('.nav-link').tab('show');
- this.wrapper.addClass('show');
+ this.wrapper.addClass('active');
}
is_active() {
@@ -69,7 +87,12 @@ export default class Tab {
}
is_hidden() {
- this.wrapper.hasClass('hide')
- && this.parent.hasClass('hide');
+ return this.wrapper.hasClass('hide');
+ }
+
+ setup_listeners() {
+ this.parent.find('.nav-link').on('shown.bs.tab', () => {
+ this?.frm.set_active_tab?.(this);
+ });
}
}
diff --git a/frappe/public/js/frappe/form/templates/print_layout.html b/frappe/public/js/frappe/form/templates/print_layout.html
index 366a771218..f65eb86bd4 100644
--- a/frappe/public/js/frappe/form/templates/print_layout.html
+++ b/frappe/public/js/frappe/form/templates/print_layout.html
@@ -25,7 +25,7 @@
{%= __("Settings") %}
-
diff --git a/frappe/public/js/frappe/form/templates/timeline_message_box.html b/frappe/public/js/frappe/form/templates/timeline_message_box.html
index a38e36c7b5..ad7ddc37e5 100644
--- a/frappe/public/js/frappe/form/templates/timeline_message_box.html
+++ b/frappe/public/js/frappe/form/templates/timeline_message_box.html
@@ -68,7 +68,7 @@
-