Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public String[] getLinkedPanels() {
}

public String getEditModeAction() {
return editModeAction;
return editModeAction != null ? editModeAction : "field";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@
fd:editModeAction="field"
fieldType="plain-text"
hideTitle="false"
fd:linkedPanels="tab1_id"
fd:linkedPanels="panelcontainer1724402234656"
name="review1724402878089"/>
<submit
jcr:created="{Date}2024-08-23T14:18:03.480+05:30"
Expand Down
9 changes: 5 additions & 4 deletions ui.af.apps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -336,16 +336,17 @@
<replace file="target/jcr_root/libs/core/fd/components/form/fileinput/v3/fileinput/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/title/v2/title/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/wizard/v2/wizard/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/switch/v1/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/switch/v1/switch/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/hcaptcha/v1/hcaptcha/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/review/v1/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/toggleablelink/v1/toggleablelink/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/turnstile/v1/turnstile/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/fileinput/v4/fileinput/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/datetime/v1/datetime/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/scribble/v1/scribble/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />

<!-- <replace file="target/jcr_root/libs/core/fd/components/form/imagechoice/v1/imagechoice/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" /> -->
<replace file="target/jcr_root/libs/core/fd/components/form/table/v1/table/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/review/v1/review/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />
<replace file="target/jcr_root/libs/core/fd/components/form/imagechoice/v1/imagechoice/.content.xml" token=".core-adaptiveform" value="Core Adaptive Form" />

</target>
</configuration>
<goals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@
"clearSign": "Unterschrift löschen",
"brushSize": "Pinselgröße: ",
"geoLocationError": "Fehler beim Aufrufen des geografischen Standorts",
"geoLocationFetch": "Geografischer Standort wird abgerufen …"
"geoLocationFetch": "Geografischer Standort wird abgerufen …",
"edit": "Bearbeiten"
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,6 @@
"clearSign": "Clear Signature",
"brushSize": "Brush Size: ",
"geoLocationError": "Error fetching geolocation",
"geoLocationFetch": "Fetching Geo Location..."
"geoLocationFetch": "Fetching Geo Location...",
"edit": "Edit"
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@
"clearSign": "Borrar firma",
"brushSize": "Tamaño de pincel: ",
"geoLocationError": "Error al obtener la localización geográfica",
"geoLocationFetch": "Obteniendo localización geográfica…"
"geoLocationFetch": "Obteniendo localización geográfica…",
"edit": "Editar"
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@
"clearSign": "Effacer la signature",
"brushSize": "Épaisseur du pinceau : ",
"geoLocationError": "Erreur lors de la récupération de la géolocalisation",
"geoLocationFetch": "Récupération de la géolocalisation..."
"geoLocationFetch": "Récupération de la géolocalisation...",
"edit": "Modifier"
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@
"clearSign": "Cancella firma",
"brushSize": "Dimensione pennello: ",
"geoLocationError": "Errore nel recupero della geolocalizzazione",
"geoLocationFetch": "Recupero geolocalizzazione in corso..."
"geoLocationFetch": "Recupero geolocalizzazione in corso...",
"edit": "Modifica"
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@
"clearSign": "署名をクリア",
"brushSize": "ブラシサイズ :",
"geoLocationError": "位置情報の取得中にエラーが発生しました",
"geoLocationFetch": "位置情報を取得しています..."
"geoLocationFetch": "位置情報を取得しています...",
"edit": "編集"
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@
"clearSign": "서명 지우기",
"brushSize": "브러시 크기: ",
"geoLocationError": "지리적 위치 가져오기 중 오류 발생",
"geoLocationFetch": "지리적 위치 가져오는 중..."
"geoLocationFetch": "지리적 위치 가져오는 중...",
"edit": "편집"
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@
"clearSign": "Limpar assinatura",
"brushSize": "Tamanho do pincel: ",
"geoLocationError": "Erro ao obter geolocalização",
"geoLocationFetch": "Obtendo geolocalização..."
"geoLocationFetch": "Obtendo geolocalização...",
"edit": "Editar"
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@
"clearSign": "清晰的签名",
"brushSize": "画笔大小:",
"geoLocationError": "获取地理位置时出错",
"geoLocationFetch": "正在获取地理位置..."
"geoLocationFetch": "正在获取地理位置...",
"edit": "编辑"
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@
"clearSign": "清除簽名",
"brushSize": "筆刷大小:",
"geoLocationError": "擷取地理位置時出錯",
"geoLocationFetch": "正在擷取地理位置…"
"geoLocationFetch": "正在擷取地理位置…",
"edit": "編輯"
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@
sling:resourceType="granite/ui/components/coral/foundation/form/select"
granite:class="cmp-adaptiveform-review__editaction"
fieldLabel="Enable edit mode actions for"
name="./fd:editModeAction"
value="field">
name="./fd:editModeAction">
<items jcr:primaryType="nt:unstructured">
<field
jcr:primaryType="nt:unstructured"
text="Field"
value="field" />
value="field"
selected="{Boolean}true" />
<panel
jcr:primaryType="nt:unstructured"
text="Panel"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,8 @@
if (editButton) {
editButton.setAttribute(Review.selectors.fieldId, item.id);
const currentItemLabel = item?.label?.value;
editButton.setAttribute('aria-label', Granite.I18n.get('Edit') + (currentItemLabel ? " " + currentItemLabel : ""));
const editLabel = FormView.LanguageUtils.getTranslatedString(this.formContainer.getLang(), 'edit') || 'Edit';
editButton.setAttribute('aria-label', editLabel + (currentItemLabel ? " " + currentItemLabel : ""));
if (item.enabled === false) {
editButton.setAttribute('disabled', true);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
const sitesSelectors = require('../../libs/commons/sitesSelectors'),
afConstants = require('../../libs/commons/formsConstants');

describe.only('Page - Authoring', function () {
describe('Page - Authoring', function () {

const dropComponent = function (responsiveGridDropZoneSelector, componentTitle, componentType) {
cy.selectLayer("Edit");
Expand Down Expand Up @@ -86,8 +86,8 @@ describe.only('Page - Authoring', function () {
cy.get("[name='./jcr:title']").should("exist");
cy.get("[name='./fd:editModeAction']").should("exist");
cy.get("[name='./fd:editModeAction'] coral-select-item").should("have.length", 4);
cy.get("[name='./linkedPanels']").should("exist");
cy.get("[name='./linkedPanels'] coral-select-item").should("have.length", 2);
cy.get("[name='./fd:linkedPanels']").should("exist");
cy.get("[name='./fd:linkedPanels'] coral-select-item").should("have.length", 2);
cy.deleteComponentByPath(tabsPath);
})
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,23 @@ describe("Form with Review component with repeatablity", () => {
});
});
}
// Verify the second panel
// Verify the second panel ("All addres" tab panel, which wraps the repeatable "Address" panel)
const checkSecondPanel = () => {
cy.get(`.${bemBlock}__container .${bemBlock}__panel`).eq(1).within(() => {
cy.get(`.${bemBlock}__content`).should('exist').within(() => {
cy.get(`.${bemBlock}__label-container`).should('exist');
cy.get(`.${bemBlock}__label`).contains('All addres');
cy.get(`.${bemBlock}__edit-button`)
.should('have.attr', 'data-cmp-visible', 'true')
.should('have.attr', 'aria-label')
.and('contain', 'All addres');

// this wrapper panel's own content wrapper (direct child only, via cy.root(), since the
// nested repeatable "Address" panel rendered inside it has its own separate .content
// one level deeper — a plain cy.get('.content') here would ambiguously match both)
cy.root().children(`.${bemBlock}__content`).should('exist');

// the repeatable "Address" panel is rendered nested inside this wrapper panel's own content
cy.get(`.${bemBlock}__panel--repeatable`).eq(0).within(() => {
cy.get(`.${bemBlock}__label-container`).should('exist');
cy.get(`.${bemBlock}__label`).contains('Address');
cy.get(`.${bemBlock}__edit-button`)
Expand Down