add remove all certificates action

Trusted-eSign · Oct 13, 2017 · df871d9 · df871d9
1 parent f8aad80
commit df871d9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/app/AC/index.ts b/app/AC/index.ts
@@ -4,7 +4,7 @@ import {
   CHANGE_ENCRYPT_OUTFOLDER, CHANGE_LOCALE, CHANGE_SEARCH_VALUE,
   CHANGE_SIGNATURE_DETACHED, CHANGE_SIGNATURE_ENCODING, CHANGE_SIGNATURE_OUTFOLDER,
   CHANGE_SIGNATURE_TIMESTAMP,  DELETE_FILE, DELETE_RECIPIENT_CERTIFICATE,
-  FAIL, LOAD_ALL_CERTIFICATES, SELECT_FILE,
+  FAIL, LOAD_ALL_CERTIFICATES, REMOVE_ALL_CERTIFICATES, SELECT_FILE,
   SELECT_SIGNER_CERTIFICATE, START, SUCCESS,
   VERIFY_CERTIFICATE, VERIFY_SIGNATURE,
 } from "../constants";
@@ -50,6 +50,12 @@ export function loadAllCertificates() {
   };
 }
 
+export function removeAllCertificates() {
+  return {
+    type: REMOVE_ALL_CERTIFICATES,
+  };
+}
+
 export function changeSearchValue(searchValue) {
   return {
     payload: { searchValue },

diff --git a/app/components/CertWindow.tsx b/app/components/CertWindow.tsx
@@ -1,7 +1,7 @@
 import * as events from "events";
 import * as React from "react";
 import { connect } from "react-redux";
-import { loadAllCertificates } from "../AC";
+import { loadAllCertificates, removeAllCertificates } from "../AC";
 import { PROVIDER_CRYPTOPRO, PROVIDER_MICROSOFT, PROVIDER_SYSTEM } from "../constants";
 import * as native from "../native";
 import { filteredCertificatesSelector } from "../selectors";
@@ -53,7 +53,7 @@ class CertWindow extends React.Component<any, any> {
 
   handleCertificateImport = (event: any) => {
     const { localize, locale } = this.context;
-    const { isLoading, loadAllCertificates } = this.props;
+    const { isLoading, loadAllCertificates, removeAllCertificates } = this.props;
     const path = event[0].path;
     const format: trusted.DataFormat = getFileCoding(path);
     const OS_TYPE = native.os.type();
@@ -80,6 +80,8 @@ class CertWindow extends React.Component<any, any> {
       if (err) {
         Materialize.toast(localize("Certificate.cert_import_failed", locale), 2000, "toast-cert_import_error");
       } else {
+        removeAllCertificates();
+
         if (!isLoading) {
           loadAllCertificates();
         }
@@ -363,4 +365,4 @@ export default connect((state) => {
     certificates: filteredCertificatesSelector(state, { operation: "certificate" }),
     isLoading: state.certificates.loading,
   };
-}, { loadAllCertificates })(CertWindow);
+}, { loadAllCertificates, removeAllCertificates })(CertWindow);
diff --git a/app/constants.ts b/app/constants.ts
@@ -1,6 +1,7 @@
 export const CHANGE_SEARCH_VALUE = "CHANGE_SEARCH_VALUE";
 
 export const LOAD_ALL_CERTIFICATES = "LOAD_ALL_CERTIFICATES";
+export const REMOVE_ALL_CERTIFICATES = "REMOVE_ALL_CERTIFICATES";
 export const VERIFY_CERTIFICATE = "VERIFY_CERTIFICATE";
 export const SELECT_SIGNER_CERTIFICATE = "SELECT_SIGNER_CERTIFICATE";
 

diff --git a/app/reducer/certificates.ts b/app/reducer/certificates.ts
@@ -1,5 +1,6 @@
 import { Map, OrderedMap, Record } from "immutable";
-import { LOAD_ALL_CERTIFICATES, START, SUCCESS, VERIFY_CERTIFICATE } from "../constants";
+import { LOAD_ALL_CERTIFICATES, REMOVE_ALL_CERTIFICATES,
+  START, SUCCESS, VERIFY_CERTIFICATE } from "../constants";
 import { arrayToMap } from "../utils";
 
 const CertificateModel = Record({
@@ -48,6 +49,9 @@ export default (certificates = new DefaultReducerState(), action) => {
       return certificates
         .setIn(["entities", payload.certificateId, "status"], payload.certificateStatus)
         .setIn(["entities", payload.certificateId, "verified"], true);
+
+    case REMOVE_ALL_CERTIFICATES:
+      return certificates = new DefaultReducerState();
   }
 
   return certificates;