Merge branch 'v2' into rps-feature

Author: kitttang

model/src/components/component-types.ts

@@ -235,4 +235,13 @@ export const ComponentTypes: ComponentDef[] = [
     options: {},
     schema: {},
   },
+  {
+    name: "DisplayAddress",
+    type: "DisplayAddress",
+    title: "Display address",
+    subType: "content",
+    content: "",
+    options: {},
+    schema: {},
+  },
 ];

model/src/components/types.ts

@@ -26,6 +26,7 @@ export enum ComponentTypeEnum {
   List = "List",
   ContextComponent = "ContextComponent",
   ContentWithState = "ContentWithState",
+  DisplayAddress = "DisplayAddress",
 }
 
 export type ComponentType =
@@ -56,7 +57,8 @@ export type ComponentType =
   | "List"
   | "WebsiteField"
   | "ContextComponent"
-  | "ContentWithState";
+  | "ContentWithState"
+  | "DisplayAddress";
 
 export type ComponentSubType = "field" | "content";
 
@@ -89,6 +91,10 @@ interface TextFieldBase {
     exposeToContext?: boolean;
     disableChangingFromSummary?: boolean;
     customValidationMessages?: Record<string, string>;
+    format?: {
+      trim?: boolean;
+      case?: "upper" | "lower";
+    };
   };
   schema: {
     max?: number;
@@ -301,6 +307,10 @@ export interface InsetTextComponent extends ContentFieldBase {
   type: "InsetText";
 }
 
+export interface DisplayAddressComponent extends ContentFieldBase {
+  type: "DisplayAddress";
+}
+
 // List Fields
 export interface ListComponent extends ListFieldBase {
   type: "List";
@@ -365,7 +375,8 @@ export type ComponentDef =
   | YesNoFieldComponent
   | WebsiteFieldComponent
   | ContextComponent
-  | ContentWithStateComponent;
+  | ContentWithStateComponent
+  | DisplayAddressComponent;
 
 // Components that render inputs.
 export type InputFieldsComponentsDef =
@@ -392,7 +403,8 @@ export type ContentComponentsDef =
   | InsetTextComponent
   | ListComponent
   | FlashCardComponent
-  | ContentWithStateComponent;
+  | ContentWithStateComponent
+  | DisplayAddressComponent;
 
 // Components that render Lists
 export type ListComponentsDef =

model/src/data-model/types.ts

@@ -209,6 +209,12 @@ export interface SecureFormSubmissionConfig extends MsalAuthorizerConfig {
   useAwsWafUserAgentWorkaround?: boolean;
 }
 
+export interface AddressLookupConfig extends MsalAuthorizerConfig {
+  apimBaseUrl: string;
+  callingApplication: string;
+  subscriptionKey?: string;
+}
+
 /**
  * `FormDefinition` is a typescript representation of `Schema`
  */
@@ -246,6 +252,6 @@ export type FormDefinition = {
   serviceName?: string | undefined;
   confirmationSessionTimeout: number | undefined;
   returnTo?: boolean | undefined;
-  secureFormSubmissionConfig: SecureFormSubmissionConfig;
   error500ContactEmail?: string | undefined;
+  addressLookupConfig?: AddressLookupConfig;
 };

model/src/schema/schema.ts

@@ -337,6 +337,14 @@ const secureFormSubmissionConfig = msalAuthorizeConfigSchema.concat(
   })
 );
 
+const addressLookupConfigSchema = msalAuthorizeConfigSchema.concat(
+  joi.object().keys({
+    apimBaseUrl: joi.string(),
+    callingApplication: joi.string(),
+    subscriptionKey: joi.string().optional(),
+  })
+);
+
 export const Schema = joi
   .object()
   .required()
@@ -383,6 +391,7 @@ export const Schema = joi
     returnTo: joi.boolean().optional(),
     secureFormSubmissionConfig: secureFormSubmissionConfig.optional(),
     error500ContactEmail: joi.string().optional(),
+    addressLookupConfig: addressLookupConfigSchema.optional(),
   });
 
 /**