Skip to content

Commit ff49fcb

Browse files
vjystvasrivastvrismehta
authored and
dhrsharm
committed
FORMS-19758: Addition of fragmentPath to the CRISPR JSON in Author View (#1593)
* Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * updating crispr spec version in dialog * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * RTC Updated AdaptiveFormVersion * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Adding Default specVersionfor formcontainerv2 test * Added fragment path in Crispr json for Author view * RTC Adding Default specVersionfor formcontainerv2 test * RTC updating test baseline * updated baseline * updating baseline * Added test cases and addressed review comments * RTC Removed duplicate function * RTC Updated AdaptiveFormVersion * RTC Updated AdaptiveFormVersion or rest-submission * RTC Updated AdaptiveFormVersion or rest-submission * RTC Updated AdaptiveFormVersion in formcontainerv2 * RTC Updated AdaptiveFormVersion in formcontainerv2WithAutoSave * Fixing code formatting --------- Co-authored-by: srivastv <[email protected]> Co-authored-by: Rishi Mehta <[email protected]>
1 parent ff844e6 commit ff49fcb

File tree

39 files changed

+5034
-11
lines changed

39 files changed

+5034
-11
lines changed

‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FragmentImpl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import com.adobe.cq.forms.core.components.models.form.FormContainer;
4646
import com.adobe.cq.forms.core.components.models.form.Fragment;
4747
import com.adobe.cq.forms.core.components.util.ComponentUtils;
48+
import com.adobe.cq.forms.core.components.views.Views;
4849
import com.fasterxml.jackson.annotation.JsonIgnore;
4950
import com.fasterxml.jackson.annotation.JsonView;
5051

@@ -93,7 +94,7 @@ private String getFragmentPathBasedOnChannel(String fragmentPath) {
9394
return fragmentPath;
9495
}
9596

96-
@JsonIgnore
97+
@JsonView(Views.Author.class)
9798
public String getFragmentPath() {
9899
return fragmentPath;
99100
}

‎bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/FormContainer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public interface FormContainer extends Container {
6464
*/
6565
String PN_CLIENT_LIB_REF = GuideConstants.CLIENT_LIB_REF;
6666

67-
String DEFAULT_FORMS_SPEC_VERSION = "0.14.2";
67+
String DEFAULT_FORMS_SPEC_VERSION = "0.15.2";
6868

6969
/**
7070
* Returns form metadata {@link FormMetaData}

‎bundles/af-core/src/test/java/com/adobe/cq/forms/core/Utils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,14 @@ public static void testSchemaValidation(@NotNull Object model) {
140140
// create an instance of the JsonSchemaFactory using version flag
141141
JsonSchemaFactory schemaFactory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7);
142142
try {
143-
InputStream schemaStream = Utils.class.getResourceAsStream("/schema/0.14.2/adaptive-form.schema.json");
143+
InputStream schemaStream = Utils.class.getResourceAsStream("/schema/0.15.2/adaptive-form.schema.json");
144144
JsonSchema schema = schemaFactory.getSchema(schemaStream);
145145
// read data from the stream and store it into JsonNode
146146
JsonNode json = objectMapper.readTree(jsonStream);
147147
// if there is a version bump of schema, then it needs to be validated against its corresponding sling model here
148148
// by explicitly checking the model implementation
149149
if (!(model instanceof FormContainerImpl)) {
150-
InputStream formContainerTemplate = Utils.class.getResourceAsStream("/schema/0.14.2/form.json");
150+
InputStream formContainerTemplate = Utils.class.getResourceAsStream("/schema/0.15.2/form.json");
151151
JsonNode formContainerTemplateNode = objectMapper.readTree(formContainerTemplate);
152152
((ObjectNode) formContainerTemplateNode).putArray("items").add(json);
153153
json = formContainerTemplateNode;

‎bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImplTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ void testGetAdaptiveFormCustomVersion() throws Exception {
197197
void testGetAdaptiveFormDefaultVersion() throws Exception {
198198
FormContainer formContainer = Utils.getComponentUnderTest(PATH_FORM_1, FormContainer.class, context);
199199
assertNotNull(formContainer.getAdaptiveFormVersion());
200-
assertEquals("0.14.2", formContainer.getAdaptiveFormVersion());
200+
assertEquals("0.15.2", formContainer.getAdaptiveFormVersion());
201201
}
202202

203203
@Test

‎bundles/af-core/src/test/resources/form/formcontainer/exporter-formContainer-cc-form-rest-submission.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
"grammar": "json-formula-1.0.0",
5353
"version": "1.0.0"
5454
},
55-
"adaptiveform": "0.14.2",
55+
"adaptiveform": "0.15.2",
5656
":type": "fd/components/form/v1/form"
5757
}

‎bundles/af-core/src/test/resources/form/formcontainer/exporter-formContainer-cc-form-spreadsheet-submission.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
"grammar": "json-formula-1.0.0",
5353
"version": "1.0.0"
5454
},
55-
"adaptiveform": "0.14.2",
55+
"adaptiveform": "0.15.2",
5656
":type": "fd/components/form/v1/form"
5757
}

‎bundles/af-core/src/test/resources/form/formcontainer/exporter-formContainer-ue-form-rest-submission.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
"version": "1.0.0",
5353
"grammar": "json-formula-1.0.0"
5454
},
55-
"adaptiveform": "0.14.2",
55+
"adaptiveform": "0.15.2",
5656
":type": "fd/franklin/components/form/v1/form"
5757
}

‎bundles/af-core/src/test/resources/form/formcontainer/exporter-formContainer-ue-form-spreadsheet-submission.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@
5252
"version": "1.0.0",
5353
"grammar": "json-formula-1.0.0"
5454
},
55-
"adaptiveform": "0.14.2",
55+
"adaptiveform": "0.15.2",
5656
":type": "fd/franklin/components/form/v1/form"
5757
}

‎bundles/af-core/src/test/resources/form/formcontainer/exporter-formcontainerv2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
":itemsOrder": [
2626
"textinput"
2727
],
28-
"adaptiveform": "0.14.2",
28+
"adaptiveform": "0.15.2",
2929
"metadata": {
3030
"version": "1.0.0",
3131
"grammar": "json-formula-1.0.0"

‎bundles/af-core/src/test/resources/form/formcontainer/exporter-formcontainerv2WithAutoSave.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
":itemsOrder": [
2727
"textinput"
2828
],
29-
"adaptiveform": "0.14.2",
29+
"adaptiveform": "0.15.2",
3030
"metadata": {
3131
"grammar": "json-formula-1.0.0",
3232
"version": "1.0.0"

0 commit comments

Comments
 (0)