Fixes

app/assets/javascripts/directives/views/challengeModal.ts

@@ -1,169 +0,0 @@
-import { WebDirective } from './../../types';
-import { WebApplication } from '@/ui_models/application';
-import template from '%/directives/challenge-modal.pug';
-import {
-  ChallengeType,
-  ChallengeValue,
-  removeFromArray,
-  Challenge,
-  ChallengeOrchestrator
-} from 'snjs';
-import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl';
-
-type InputValue = {
-  value: string
-  invalid: boolean
-}
-type ChallengeModalScope = {
-  application: WebApplication
-  challenge: Challenge
-  orchestrator: ChallengeOrchestrator
-}
-
-type Values = Record<ChallengeType, InputValue>
-
-type ChallengeModalState = {
-  types: ChallengeType[]
-  values: Partial<Values>
-  processing: boolean
-}
-
-class ChallengeModalCtrl extends PureViewCtrl implements ChallengeModalScope {
-  private $element: JQLite
-  private processingTypes: ChallengeType[] = []
-  application!: WebApplication
-  challenge!: Challenge
-  orchestrator!: ChallengeOrchestrator
-
-  /* @ngInject */
-  constructor(
-    $element: JQLite,
-    $timeout: ng.ITimeoutService
-  ) {
-    super($timeout);
-    this.$element = $element;
-  }
-
-  getState() {
-    return this.state as ChallengeModalState;
-  }
-
-  $onInit() {
-    super.$onInit();
-    const values = {} as Values;
-    const types = this.challenge.types;
-    for (const type of types) {
-      values[type] = {
-        value: '',
-        invalid: false
-      };
-    }
-    this.setState({
-      types: types,
-      values: values,
-      processing: false
-    });
-    this.orchestrator.setCallbacks(
-      (value) => {
-        this.getState().values[value.type]!.invalid = false;
-        removeFromArray(this.processingTypes, value.type);
-        this.reloadProcessingStatus();
-      },
-      (value) => {
-        this.getState().values[value.type]!.invalid = true;
-        removeFromArray(this.processingTypes, value.type);
-        this.reloadProcessingStatus();
-      },
-      () => {
-        this.dismiss();
-      },
-    );
-  }
-
-  deinit() {
-    (this.application as any) = undefined;
-    (this.orchestrator as any) = undefined;
-    (this.challenge as any) = undefined;
-    super.deinit();
-  }
-
-  reloadProcessingStatus() {
-    this.setState({
-      processing: this.processingTypes.length > 0
-    });
-  }
-
-  promptForChallenge(challenge: ChallengeType) {
-    if (challenge === ChallengeType.LocalPasscode) {
-      return 'Enter your application passcode';
-    } else {
-      return 'Enter your account password';
-    }
-  }
-
-  cancel() {
-    // if (!this.cancelable) {
-    //   return;
-    // }
-    this.dismiss();
-  }
-
-  onTextValueChange(challenge: ChallengeType) {
-    const values = this.getState().values;
-    values[challenge]!.invalid = false;
-    this.setState({ values });
-  }
-
-  validate() {
-    const failed = [];
-    for (const type of this.getState().types) {
-      const value = this.getState().values[type];
-      if (!value || value.value.length === 0) {
-        this.getState().values[type]!.invalid = true;
-      }
-    }
-    return failed.length === 0;
-  }
-
-  async submit() {
-    if (!this.validate()) {
-      return;
-    }
-    this.setState({ processing: true });
-    const values = [];
-    for (const key of Object.keys(this.getState().values)) {
-      const type = Number(key) as ChallengeType;
-      if (!this.getState().values[type]!.invalid) {
-        continue;
-      }
-      const rawValue = this.getState().values[type]!.value;
-      const value = new ChallengeValue(type, rawValue);
-      values.push(value);
-    }
-    this.processingTypes = values.map((v) => v.type);
-    this.orchestrator.submitValues(values);
-  }
-
-  dismiss() {
-    const elem = this.$element;
-    const scope = elem.scope();
-    scope.$destroy();
-    elem.remove();
-  }
-}
-
-export class ChallengeModal extends WebDirective {
-  constructor() {
-    super();
-    this.restrict = 'E';
-    this.template = template;
-    this.controller = ChallengeModalCtrl;
-    this.controllerAs = 'ctrl';
-    this.bindToController = true;
-    this.scope = {
-      challenge: '=',
-      orchestrator: '=',
-      application: '='
-    };
-  }
-}

app/assets/javascripts/directives/views/componentModal.ts

@@ -5,16 +5,14 @@ import template from '%/directives/component-modal.pug';
 
 export type ComponentModalScope = {
   componentUuid: string
-  callback: () => void
-  onDismiss: (component: SNComponent) => void
+  onDismiss: () => void
   application: WebApplication
 }
 
 export class ComponentModalCtrl implements ComponentModalScope {
   $element: JQLite
   componentUuid!: string
-  callback!: () => void
-  onDismiss!: (component: SNComponent) => void
+  onDismiss!: () => void
   application!: WebApplication
   liveComponent!: LiveItem<SNComponent>
   component!: SNComponent
@@ -41,8 +39,7 @@ export class ComponentModalCtrl implements ComponentModalScope {
   }
 
   dismiss() {
-    this.onDismiss && this.onDismiss(this.component);
-    this.callback && this.callback();
+    this.onDismiss && this.onDismiss();
     const elem = this.$element;
     const scope = elem.scope();
     scope.$destroy();
@@ -60,7 +57,6 @@ export class ComponentModal extends WebDirective {
     this.bindToController = true;
     this.scope = {
       componentUuid: '=',
-      callback: '=',
       onDismiss: '&',
       application: '='
     };

app/assets/javascripts/directives/views/componentView.ts

@@ -226,6 +226,7 @@ class ComponentViewCtrl implements ComponentViewScope {
     }, avoidFlickerTimeout);
   }
 
+  /** @template */
   public getUrl() {
     const url = this.application.componentManager!.urlForComponent(this.component);
     return url;

app/assets/javascripts/directives/views/index.ts

@@ -1,6 +1,5 @@
 export { AccountMenu } from './accountMenu';
 export { ActionsMenu } from './actionsMenu';
-export { ChallengeModal } from './challengeModal';
 export { ComponentModal } from './componentModal';
 export { ComponentView } from './componentView';
 export { EditorMenu } from './editorMenu';