Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
900756d
feat(helm): add Redis auth support with password bootstrap
sebastianiv21 Jun 4, 2026
3b44511
Merge branch 'release' into claude/strange-colden-2a0830
sebastianiv21 Jun 4, 2026
86564b9
Merge branch 'release' into claude/strange-colden-2a0830
sebastianiv21 Jun 4, 2026
964a971
chore: bump helm chart version to v3.8.2
sebastianiv21 Jun 9, 2026
812db5c
chore(client): batch resolution upgrades to fix 22 Dependabot alerts …
subrata71 Jun 5, 2026
a1dfc27
chore(plugins): upgrade mssql-jdbc to fix Dependabot alert (#41880)
subrata71 Jun 8, 2026
f334e14
chore(widgets): upgrade tinymce from 6.8.5 to 7.9.3 to fix 8 XSS aler…
subrata71 Jun 9, 2026
b649f1d
chore(client): add shell-quote 1.8.4 resolution to fix critical alert…
subrata71 Jun 9, 2026
dfca3cd
chore(helm): replace README with helm-docs generated file to keep val…
sebastianiv21 Jun 9, 2026
2c81821
chore(deps): bump golang from 1.26.3-alpine to 1.26.4-alpine in /depl…
dependabot[bot] Jun 9, 2026
ff71415
feat(helm): add Redis auth support with password bootstrap
sebastianiv21 Jun 9, 2026
58ffcdc
Merge branch 'release' into claude/strange-colden-2a0830
sebastianiv21 Jun 9, 2026
7788231
chore: generate README
sebastianiv21 Jun 9, 2026
4e79144
chore: add documentation comments for Redis auth parameters
sebastianiv21 Jun 9, 2026
ddf0389
fix(helm): guard against unsupported redis.auth.password configurations
wyattwalter Jun 24, 2026
319b4c7
fix(helm): skip redis-init-container REDISCLI_AUTH on self-managed pa…
wyattwalter Jun 24, 2026
d279bea
docs(helm): record redis.auth.password self-managed-path invariants i…
wyattwalter Jun 24, 2026
f175f91
Revert "docs(helm): record redis.auth.password self-managed-path inva…
wyattwalter Jun 25, 2026
cf9fa0d
Merge pull request #41924 from appsmithorg/fm/redis-pw-guard-v3
wyattwalter Jun 25, 2026
c659b7b
fix(helm): derive redis master host from subchart fullname + tests
sebastianiv21 Jun 26, 2026
c354051
fix(helm): make redisMasterHost self-contained so unittest CI passes
sebastianiv21 Jun 26, 2026
bc002b8
Revert "fix(helm): make redisMasterHost self-contained so unittest CI…
sebastianiv21 Jun 26, 2026
9921ef3
Merge branch 'release' into claude/strange-colden-2a0830
sebastianiv21 Jun 26, 2026
134bc41
Merge branch 'release' into claude/strange-colden-2a0830
wyattwalter Jul 6, 2026
8ae0b13
chore(helm): bump chart version to 3.9.0
sebastianiv21 Jul 6, 2026
5b16282
test(helm): update snapshot for chart version 3.9.0
sebastianiv21 Jul 6, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ updates:
directory: "/app/client"
schedule:
interval: "weekly"
ignore:
- dependency-name: "tinymce"
versions: ["6.8.3"]
open-pull-requests-limit: 5
labels:
- "dependencies"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Helm Values Schema
name: Helm Docs

on:
pull_request:
Expand All @@ -7,7 +7,9 @@ on:
paths:
- "deploy/helm/values.yaml"
- "deploy/helm/values.schema.json"
- ".github/workflows/helm-schema.yml"
- "deploy/helm/README.md"
- "deploy/helm/README.md.gotmpl"
- ".github/workflows/helm-docs.yml"
workflow_dispatch:

jobs:
Expand All @@ -21,10 +23,10 @@ jobs:

steps:
- name: Checkout the code
uses: actions/checkout@v4
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1

- name: Install Helm
uses: azure/setup-helm@v4
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
with:
# Helm 4 — pinned so we don't silently track future major bumps.
version: v4.1.4
Expand All @@ -34,18 +36,38 @@ jobs:
# (the plugin source doesn't ship verification metadata).
run: helm plugin install --verify=false https://github.com/losisin/helm-values-schema-json.git

- name: Regenerate schema from values.yaml
- name: Install helm-docs
run: |
HELM_DOCS_VERSION=1.14.2
BASE_URL="https://github.com/norwoodj/helm-docs/releases/download/v${HELM_DOCS_VERSION}"
TARBALL="helm-docs_${HELM_DOCS_VERSION}_Linux_x86_64.tar.gz"
curl -sSL "${BASE_URL}/checksums.txt" -o checksums.txt
curl -sSL "${BASE_URL}/${TARBALL}" -o "${TARBALL}"
sha256sum --check --ignore-missing checksums.txt
tar xzf "${TARBALL}" helm-docs
sudo mv helm-docs /usr/local/bin/

- name: Check values schema
run: |
helm schema \
--schema-root.title "Appsmith Helm chart values" \
--schema-root.id "https://helm.appsmith.com/values.schema.json" \
-o values.schema.json.regenerated

- name: Fail if committed schema is out of date
run: |
if ! diff -u values.schema.json values.schema.json.regenerated; then
echo ""
echo "::error::values.schema.json is out of date. Regenerate locally with:"
echo "::error:: cd deploy/helm && helm schema --schema-root.title 'Appsmith Helm chart values' --schema-root.id 'https://helm.appsmith.com/values.schema.json' -o values.schema.json"
exit 1
fi

- name: Check README
run: |
helm-docs --sort-values-order file --dry-run > README.md.regenerated

if ! diff -u README.md README.md.regenerated; then
echo ""
echo "::error::README.md is out of date. Regenerate locally with:"
echo "::error:: cd deploy/helm && helm-docs --sort-values-order file"
exit 1
fi
5 changes: 3 additions & 2 deletions app/client/cypress/support/Objects/CommonLocators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,12 @@ export class CommonLocators {
_fileUploadAddMore = ".uppy-DashboardContent-addMore";
_buttonText = ".bp3-button-text";
_richText_TitleBlock = "[aria-label='Block Paragraph']";
_richText_Heading = "[title='Heading 1']";
_richText_Heading = "[aria-label='Heading 1']";
_richText_Label_Text = ".tox-tbtn__select-label";
_richText_Text_Color = (color: string) =>
`[aria-label="Text color ${color}"] .tox-split-button__chevron`;
_richText_color = (value: string) => `[title="${value}"]`;
_richText_color = (value: string) =>
`.tox-swatch[aria-label="${value}"], .tox-collection__item[aria-label="${value}"], [data-mce-tooltip="${value}"]`;
_richText_line = "#tinymce p span";
_treeSelectedContent = ".rc-tree-select-selection-item-content";
_switcherIcon = ".switcher-icon";
Expand Down
25 changes: 21 additions & 4 deletions app/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"@shared/dsl": "workspace:^",
"@svgr/webpack": "^5.5.0",
"@tanstack/virtual-core": "^3.0.0-beta.18",
"@tinymce/tinymce-react": "^6.0.0",
"@tinymce/tinymce-react": "^6.3.0",
"@types/babel__standalone": "^7.1.7",
"@types/d3-geo": "^3.1.0",
"@types/google.maps": "^3.51.0",
Expand Down Expand Up @@ -158,7 +158,7 @@
"lodash-es": "4.17.21",
"loglevel": "^1.7.1",
"lottie-web": "^5.7.4",
"mammoth": "^1.5.1",
"mammoth": "^1.11.0",
"memoize-one": "^6.0.0",
"micro-memoize": "^4.0.10",
"microdiff": "^1.4.0",
Expand Down Expand Up @@ -235,7 +235,7 @@
"tailwindcss": "^3.3.3",
"tern": "^0.21.0",
"tinycolor2": "^1.4.2",
"tinymce": "6.8.5",
"tinymce": "7.9.3",
"toposort": "^2.0.2",
"tslib": "^2.3.1",
"typescript": "^5.5.4",
Expand Down Expand Up @@ -459,6 +459,23 @@
"immutable": "4.3.8",
"js-cookie": "3.0.7",
"simple-git": "3.36.0",
"@protobufjs/utf8": "1.1.1"
"@protobufjs/utf8": "1.1.1",
"tar": "7.5.11",
"vite": "6.4.2",
"js-yaml": "3.14.2",
"mdast-util-to-hast": "13.2.1",
"ajv@^6.12.2": "6.14.0",
"ajv@^6.12.4": "6.14.0",
"ajv@^6.12.5": "6.14.0",
"@babel/plugin-transform-modules-systemjs": "7.29.4",
"rollup@^4.34.8": "4.59.0",
"rollup@^4.34.9": "4.59.0",
"yaml@^1.10.0": "1.10.3",
"yaml@^2.3.4": "2.8.3",
"yaml@2.3.1": "2.8.3",
"glob@^10.3.10": "10.5.0",
"glob@^10.3.7": "10.5.0",
"glob@^11.0.0": "11.1.0",
"shell-quote": "1.8.4"
}
}
2 changes: 1 addition & 1 deletion app/client/packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"fast-glob": "^3.3.2",
"figmagic": "^4.5.13",
"fs-extra": "^11.2.0",
"svgo": "^3.2.0"
"svgo": "^3.3.3"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ function RichtextEditorComponent(props: RichtextEditorComponentProps) {
const initialRender = useRef(true);

const toolbarConfig =
"insertfile undo redo | blocks | bold italic underline backcolor forecolor | lineheight | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | removeformat | table | print preview media | emoticons | code | help";
"insertfile undo redo | blocks | bold italic underline backcolor forecolor | lineheight | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | removeformat | table | preview media | emoticons | code | help";

const handleEditorChange = useCallback(
// TODO: Fix this the next time the file is edited
Expand Down Expand Up @@ -431,6 +431,7 @@ function RichtextEditorComponent(props: RichtextEditorComponentProps) {
resize: false,
browser_spellcheck: true,
convert_unsafe_embeds: true,
sandbox_iframes: true,
content_style: `
${cssVariables}
${
Expand Down Expand Up @@ -495,6 +496,7 @@ function RichtextEditorComponent(props: RichtextEditorComponentProps) {
},
}}
key={`editor_${props.isToolbarHidden}_${props.isDisabled}`}
licenseKey="gpl"
onEditorChange={handleEditorChange}
toolbar={props.isToolbarHidden ? false : toolbarConfig}
value={editorValue}
Expand Down
Loading