Cleaned up Unused objects and interfaces

Author: spdavid

src/controls/taxonomyPicker/ITaxonomyPicker.ts

@@ -53,12 +53,10 @@ export interface ITaxonomyPickerProps  {
    *
    */
   onGetErrorMessage?: (value: IPickerTerms) => string | Promise<string>;
+
   /**
-   * Custom Field will start to validate after users stop typing for `deferredValidationTime` milliseconds.
-   * Default value is 200.
+   * onChange Event
    */
-  deferredValidationTime?: number;
-
   onChange?: (newValue?: IPickerTerms) => void;
 }
 

src/controls/taxonomyPicker/ITermPicker.ts

@@ -15,52 +15,6 @@ export interface IPickerTerm  {
 
 export interface IPickerTerms extends Array<IPickerTerm> { }
 
-/**
- * Generic Term Object (abstract interface)
- */
-export interface ISPTermObject {
-  Name: string;
-  Guid: string;
-  Identity: string;
-  leaf: boolean;
-  children?: ISPTermObject[];
-  collapsed?: boolean;
-  type: string;
-}
-
-/**
- * Defines a SharePoint Term Store
- */
-export interface ISPTermStore extends ISPTermObject {
-  IsOnline: boolean;
-  WorkingLanguage: string;
-  DefaultLanguage: string;
-  Languages: string[];
-}
-
-/**
- * Defines an array of Term Stores
- */
-export interface ISPTermStores extends Array<ISPTermStore> {
-}
-
-/**
- * Defines a Term Store Group of term sets
- */
-export interface ISPTermGroup extends ISPTermObject {
-  IsSiteCollectionGroup: boolean;
-  IsSystemGroup: boolean;
-  CreatedDate: string;
-  LastModifiedDate: string;
-}
-
-/**
- * Array of Term Groups
- */
-export interface ISPTermGroups extends Array<ISPTermGroup> {
-}
-
-
 /**
  * Public properties of the PropertyFieldTermPicker custom field
  */
@@ -134,19 +88,6 @@ export interface IPropertyFieldTermPickerProps {
    * Default value is 200.
    */
   deferredValidationTime?: number;
-  /**
-   * Specifies if you want to show or hide the term store name from the panel
-   */
-  hideTermStoreName?: boolean;
+  
 }
 
-/**
- * Private properties of the PropertyFieldTermPicker custom field.
- * We separate public & private properties to include onRender & onDispose method waited
- * by the PropertyFieldCustom, witout asking to the developer to add it when he's using
- * the PropertyFieldTermPicker.
- */
-// export interface IPropertyFieldTermPickerPropsInternal extends IPropertyFieldTermPickerProps {
-// //   // onRender(elem: HTMLElement): void;
-// //   // onDispose(elem: HTMLElement): void;
-//  }

src/controls/taxonomyPicker/TaxonomyPicker.tsx

@@ -15,8 +15,8 @@ import { ITaxonomyPickerProps, ITaxonomyPickerState, ITermGroupProps, ITermGroup
 import SPTermStorePickerService from './../../services/SPTermStorePickerService';
 import { ITermSet, IGroup, ITerm } from './../../services/ISPTermStorePickerService';
 import styles from './TaxonomyPicker.module.scss';
-import { sortBy, uniqBy } from '@microsoft/sp-lodash-subset';
-import TermSet from './TermSet';
+import { sortBy, uniqBy, cloneDeep } from '@microsoft/sp-lodash-subset';
+import TermParent from './TermParent';
 import FieldErrorMessage from './ErrorMessage';
 import * as appInsights from '../../common/appInsights';
 
@@ -71,10 +71,8 @@ export class TaxonomyPicker extends React.Component<ITaxonomyPickerProps, ITaxon
   private loadTermStores(): void {
     this.termsService = new SPTermStorePickerService(this.props, this.props.context);
     this.termsService.getAllTerms(this.props.termsetNameOrID).then((response: ITermSet) => {
-      console.log(response);
       // Check if a response was retrieved
       if (response !== null) {
-        console.log(response);
         this.setState({
           termSetAndTerms: response,
           loaded: true
@@ -97,7 +95,7 @@ export class TaxonomyPicker extends React.Component<ITaxonomyPickerProps, ITaxon
     }
 
     // Store the current code value
-    this.previousValues = this.state.activeNodes;
+    this.previousValues = cloneDeep(this.state.activeNodes);
     this.cancel = true;
 
     this.loadTermStores();
@@ -264,18 +262,12 @@ export class TaxonomyPicker extends React.Component<ITaxonomyPickerProps, ITaxon
             /* Show spinner in the panel while retrieving terms */
             this.state.loaded === false ? <Spinner type={SpinnerType.normal} /> : ''
           }
-
-
-
           {this.state.loaded === true &&
 
-
-
             <div key={this.state.termSetAndTerms.Id} >
 
                 <h3>{this.state.termSetAndTerms.Name}</h3> 
-                {/* <TermSet termset={this.state.termSetAndTerms} activeNodes={this.state.activeNodes} changedCallback={this.termsChanged} multiSelection={this.props.allowMultipleSelections} /> */}
-                <TermSet anchorId={this.props.ancoreId} autoExpand={null} termset={this.state.termSetAndTerms} activeNodes={this.state.activeNodes} changedCallback={this.termsChanged} multiSelection={this.props.allowMultipleSelections} />
+                <TermParent anchorId={this.props.ancoreId} autoExpand={null} termset={this.state.termSetAndTerms} activeNodes={this.state.activeNodes} changedCallback={this.termsChanged} multiSelection={this.props.allowMultipleSelections} />
             </div>
 
 

src/controls/taxonomyPicker/Term.tsx

@@ -27,7 +27,6 @@ export default class Term extends React.Component<ITermProps, ITermState> {
    * Handle the checkbox change trigger
    */
   private _handleChange(ev: React.FormEvent<HTMLElement>, isChecked: boolean) {
-    console.log("handling change");
     this.setState({
       selected: isChecked
     });

src/controls/taxonomyPicker/TermGroup.tsx

@@ -8,9 +8,9 @@ import Term from './Term';
 import styles from './TaxonomyPicker.module.scss';
 
 /**
- * Term set component
+ * Term Parent component, represents termset or term if anchorId
  */
-export default class TermSet extends React.Component<ITermSetProps, ITermSetState> {
+export default class TermParent extends React.Component<ITermSetProps, ITermSetState> {
 
   private _terms : ITerm[];
   private _anchorName : string;
@@ -22,24 +22,10 @@ export default class TermSet extends React.Component<ITermSetProps, ITermSetStat
       loaded: true,
       expanded: true
     };
-
-    // Check if the termset has to be automatically opened
-    const selectedTermsInSet = this.props.activeNodes.filter(node => node.termSet === this.props.termset.Id);
-    if (selectedTermsInSet.length > 0) {
-      this._autoLoadTerms();
-    }
-
     this._handleClick = this._handleClick.bind(this);
-    this._loadTerms = this._loadTerms.bind(this);
   }
 
-  /**
-   * Autoload the terms of the term set
-   */
-  private _autoLoadTerms() {
-  //  this.props.autoExpand();
-    this._loadTerms(true);
-  }
+  
 
   /**
    * Handle the click event: collapse or expand
@@ -48,62 +34,31 @@ export default class TermSet extends React.Component<ITermSetProps, ITermSetStat
     this.setState({
       expanded: !this.state.expanded
     });
-
-    if (!this.state.expanded) {
-      this._loadTerms();
-    }
   }
 
-
-  /**
-   * Load the terms for the current term set
+  
+ /**
+   * componentWillMount
    */
-  private async _loadTerms(autoExpand?: boolean) {
-    // Check if there are already terms loaded
-    if (!this.state.loaded) {
-      // Receive all the terms for the current term set
-      // const termSet: ITermSet = await this.props.termsService.getAllTerms(this.props.termset._ObjectIdentity_);
-      // if (termSet.Terms !== null) {
-      //   this.setState({
-      //     terms: termSet.Terms,
-      //     loaded: true,
-      //     expanded: typeof autoExpand !== 'undefined' ? autoExpand : this.state.expanded
-      //   });
-      // } else {
-      //   this.setState({
-      //     terms: [],
-      //     loaded: true
-      //   });
-      // }
-    }
-  }
-
   public componentWillMount()
   {
-
-
     // fix term depth if anchroid for rendering
     if (this.props.anchorId)
     {
       const anchorTerm = this._terms.filter(t => t.Id.toLowerCase() === this.props.anchorId.toLowerCase()).shift();
-      console.log(anchorTerm)
       if (anchorTerm)
       {
         const anchorDepth = anchorTerm.PathDepth;
         this._anchorName = anchorTerm.Name;
         var anchorTerms : ITerm[] = this._terms.filter(t => t.PathOfTerm.substring(0, anchorTerm.PathOfTerm.length) === anchorTerm.PathOfTerm && t.Id !== anchorTerm.Id);
 
         anchorTerms = anchorTerms.map(term => {
-          console.log(term.PathDepth);
           term.PathDepth = term.PathDepth - anchorTerm.PathDepth;
-          console.log(term.PathDepth);
 
           return term;
         });
 
-        console.log(anchorTerms);
         this._terms = anchorTerms;
-        console.log(this._terms);
       }
     }
   }