Merge branch 'SmarterJB-feature/use_anchorId_from_taxonomyfield_in_dynamicform' into dev

Author: AJIXuMuK

src/controls/dynamicForm/DynamicForm.tsx

@@ -376,6 +376,7 @@ export class DynamicForm extends React.Component<IDynamicFormProps, IDynamicForm
           field.order = order;
           let hiddenName = "";
           let termSetId = "";
+          let anchorId = "";
           let lookupListId = "";
           let lookupField = "";
           const choices: IDropdownOption[] = [];
@@ -386,83 +387,74 @@ export class DynamicForm extends React.Component<IDynamicFormProps, IDynamicForm
           let principalType = "";
           if (item !== null) {
             defaultValue = item[field.EntityPropertyName];
-          }
-          else {
+          } else {
             defaultValue = field.DefaultValue;
           }
           if (fieldType === 'Choice' || fieldType === 'MultiChoice') {
             field.Choices.forEach(element => {
-              choices.push({ key: element, text: element });
+              choices.push({key: element, text: element});
             });
-          }
-          else if (fieldType === "Note") {
+          } else if (fieldType === "Note") {
             richText = field.RichText;
-          }
-          else if (fieldType === "Lookup") {
+          } else if (fieldType === "Lookup") {
             lookupListId = field.LookupList;
             lookupField = field.LookupField;
             if (item !== null) {
               defaultValue = await this._spService.getLookupValue(listId, listItemId, field.EntityPropertyName, lookupField, this.webURL);
-            }
-            else {
+            } else {
               defaultValue = [];
             }
 
-          }
-          else if (fieldType === "LookupMulti") {
+          } else if (fieldType === "LookupMulti") {
             lookupListId = field.LookupList;
             lookupField = field.LookupField;
             if (item !== null) {
               defaultValue = await this._spService.getLookupValues(listId, listItemId, field.EntityPropertyName, lookupField, this.webURL);
-            }
-            else {
+            } else {
               defaultValue = [];
             }
-          }
-          else if (fieldType === "TaxonomyFieldTypeMulti") {
+          } else if (fieldType === "TaxonomyFieldTypeMulti") {
             const response = await this._spService.getTaxonomyFieldInternalName(this.props.listId, field.InternalName, this.webURL);
             hiddenName = response.value;
             termSetId = field.TermSetId;
+            anchorId = field.AnchorId;
             if (item !== null) {
               item[field.InternalName].forEach(element => {
-                selectedTags.push({ key: element.TermGuid, name: element.Label });
+                selectedTags.push({key: element.TermGuid, name: element.Label});
               });
 
               defaultValue = selectedTags;
-            }
-            else {
+            } else {
               if (defaultValue !== "") {
                 defaultValue.split(/#|;/).forEach(element => {
                   if (element.indexOf('|') !== -1)
-                    selectedTags.push({ key: element.split('|')[1], name: element.split('|')[0] });
+                    selectedTags.push({key: element.split('|')[1], name: element.split('|')[0]});
                 });
 
                 defaultValue = selectedTags;
               }
             }
             if (defaultValue === "")
               defaultValue = null;
-          }
-          else if (fieldType === "TaxonomyFieldType") {
+          } else if (fieldType === "TaxonomyFieldType") {
 
             termSetId = field.TermSetId;
+            anchorId = field.AnchorId;
             if (item !== null) {
               const response = await this._spService.getSingleManagedMtadataLabel(listId, listItemId, field.InternalName);
               if (response) {
-                selectedTags.push({ key: response.TermID, name: response.Label });
+                selectedTags.push({key: response.TermID, name: response.Label});
                 defaultValue = selectedTags;
               }
-            }
-            else {
+            } else {
               if (defaultValue !== "") {
-                selectedTags.push({ key: defaultValue.split('|')[1], name: defaultValue.split('|')[0].split('#')[1] });
+                selectedTags.push({key: defaultValue.split('|')[1], name: defaultValue.split('|')[0].split('#')[1]});
                 defaultValue = selectedTags;
               }
             }
             if (defaultValue === "")
               defaultValue = null;
-          }
-          else if (fieldType === "DateTime") {
+          } else if (fieldType === "DateTime") {
             if (item !== null && item[field.InternalName])
               defaultValue = new Date(item[field.InternalName]);
             else if (defaultValue === '[today]') {
@@ -482,34 +474,30 @@ export class DynamicForm extends React.Component<IDynamicFormProps, IDynamicForm
             }
             principalType = field.SchemaXml.split('UserSelectionMode="')[1];
             principalType = principalType.substring(0, principalType.indexOf('"'));
-          }
-          else if (fieldType === "Thumbnail") {
+          } else if (fieldType === "Thumbnail") {
             if (defaultValue !== null) {
               defaultValue = this.webURL.split('/sites/')[0] + JSON.parse(defaultValue).serverRelativeUrl;
             }
-          }
-          else if (fieldType === "User") {
+          } else if (fieldType === "User") {
             if (item !== null) {
               const userEmails: string[] = [];
               userEmails.push(await this._spService.getUserUPNFromFieldValue(listId, listItemId, field.InternalName, this.webURL) + '');
               defaultValue = userEmails;
-            }
-            else {
+            } else {
               defaultValue = [];
             }
             principalType = field.SchemaXml.split('UserSelectionMode="')[1];
             principalType = principalType.substring(0, principalType.indexOf('"'));
-          }
-          else if (fieldType === "Location") {
+          } else if (fieldType === "Location") {
             defaultValue = JSON.parse(defaultValue);
-          }
-          else if (fieldType === "Boolean") {
+          } else if (fieldType === "Boolean") {
             defaultValue = Boolean(Number(defaultValue));
           }
 
           tempFields.push({
             newValue: null,
             fieldTermSetId: termSetId,
+            fieldAnchorId: anchorId,
             options: choices,
             lookupListID: lookupListId,
             lookupField: lookupField,

src/controls/dynamicForm/dynamicField/DynamicField.tsx

@@ -59,6 +59,7 @@ export class DynamicField extends React.Component<IDynamicFieldProps, IDynamicFi
     const {
       options,
       fieldTermSetId,
+      fieldAnchorId,
       lookupListID,
       lookupField,
       fieldType,
@@ -473,6 +474,7 @@ export class DynamicField extends React.Component<IDynamicFieldProps, IDynamicFi
               placeholder={placeholder}
               allowMultipleSelections={true}
               termsetNameOrID={fieldTermSetId}
+              anchorId={fieldAnchorId}
               panelTitle={strings.DynamicFormTermPanelTitle}
               context={context}
               onChange={(newValue?: IPickerTerms) => { this.onChange(newValue); }}
@@ -497,6 +499,7 @@ export class DynamicField extends React.Component<IDynamicFieldProps, IDynamicFi
               placeholder={placeholder}
               allowMultipleSelections={false}
               termsetNameOrID={fieldTermSetId}
+              anchorId={fieldAnchorId}
               panelTitle={strings.DynamicFormTermPanelTitle}
               context={context}
               onChange={(newValue?: IPickerTerms) => { this.onChange(newValue); }}

src/controls/dynamicForm/dynamicField/IDynamicFieldProps.ts

@@ -22,6 +22,7 @@ export interface IDynamicFieldProps {
   fieldDefaultValue: any; // eslint-disable-line @typescript-eslint/no-explicit-any
   options?: IDropdownOption[];
   fieldTermSetId?: string;
+  fieldAnchorId?: string;
   lookupListID?: string;
   lookupField?: string;
   changedValue: any; // eslint-disable-line @typescript-eslint/no-explicit-any

src/loc/de-de.ts

@@ -359,7 +359,7 @@ define([], () => {
   "DynamicFormLoading": "Laden...",
   "DynamicFormPleaseWait": "Bitte warten...",
   "DynamicFormRequiredErrorMessage": "Sie können dieses Feld nicht leer lassen.",
-  "DynamicFormTermPanelTitle": "Laufzeit auswählen",
+  "DynamicFormTermPanelTitle": "Knoten auswählen",
   "DynamicFormEnterURLPlaceholder": "Geben Sie eine URL ein",
   "DynamicFormEnterDescriptionPlaceholder": "Alternativtext",
   "customDisplayName": "Verwenden Sie diesen Speicherort:",

src/services/SPTermStorePickerService.ts

@@ -29,7 +29,7 @@ export default class SPTermStorePickerService {
    */
   constructor(private props: ITaxonomyPickerProps, private context: BaseComponentContext) {
     this.clientServiceUrl = this.context.pageContext.web.absoluteUrl + '/_vti_bin/client.svc/ProcessQuery';
-    this.suggestionServiceUrl = this.context.pageContext.web.absoluteUrl + "/_vti_bin/TaxonomyInternalService.json/GetSuggestions";
+    this.suggestionServiceUrl = this.context.pageContext.web.absoluteUrl + '/_vti_bin/TaxonomyInternalService.json/GetSuggestions';
   }
 
   public async getTermLabels(termId: string): Promise<string[]> {