From 7aee22bdfe0c9539998557b2845d9441ffc38aab Mon Sep 17 00:00:00 2001
From: suvarnakale <suvarna.kale@tekditechnologies.com>
Date: Fri, 27 Oct 2023 13:50:44 +0530
Subject: [PATCH 1/2] #846 - Redirection of certicificate icons to preview -
 Done

---
 .../add-template/add-template.component.html  |  6 +-
 .../add-template/add-template.component.ts    | 86 +++++++++++--------
 .../configurations.component.html             |  4 +-
 .../configurations.component.ts               | 15 +++-
 4 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/src/app/admin/add-template/add-template.component.html b/src/app/admin/add-template/add-template.component.html
index 06c6eb6..5f4e385 100644
--- a/src/app/admin/add-template/add-template.component.html
+++ b/src/app/admin/add-template/add-template.component.html
@@ -16,7 +16,7 @@
         </form> -->
 
         <div class="row d-flex">
-            <div class="col-12 col-sm-4 card h-card " *ngIf="!fromEdit">
+            <div class="col-12 col-sm-4 card h-card " *ngIf="!fromEdit &&  !fromPreview">
                 <!-- <form [formGroup]="form2" (ngSubmit)="submit()" *ngIf="fields">
                             <formly-form [model]="model" [fields]="fields" [options]="options" [form]="form2"></formly-form>
                         </form> -->
@@ -90,11 +90,11 @@
              
 
             </div>
-            <div class=" col-12 col-sm-8 p-sm-0" *ngIf="userHtml" [ngClass]="{'col-sm-12': fromEdit}">
+            <div class=" col-12 col-sm-8 p-sm-0" *ngIf="userHtml" [ngClass]="{'col-sm-12': fromEdit || fromPreview}">
                 <div class="card">
                     <div class="d-flex justify-content-between card-body px-4 py-2">
                         <div class="heading-2">{{'PREVIEW' | translate}}</div>
-                        <div>
+                        <div *ngIf="fromEdit">
                             <button class="float-end heading-3 btn bg-color-secondary  color-sec fw-bold submit-button" data-toggle="modal" data-target="#deleteDocument" *ngIf="fromEdit"><i
                                 class="fa fa-trash" aria-hidden="true"></i> {{'DELETE_TEMPLATE' | translate}}</button> &nbsp;
 
diff --git a/src/app/admin/add-template/add-template.component.ts b/src/app/admin/add-template/add-template.component.ts
index c8f061c..ff700b5 100644
--- a/src/app/admin/add-template/add-template.component.ts
+++ b/src/app/admin/add-template/add-template.component.ts
@@ -62,6 +62,10 @@ export class AddTemplateComponent implements OnInit {
   certificateTitle: any;
   schemaOsid: any;
   vcStep: string;
+  fromPreview: boolean;
+  credTemp: any[];
+  flag: boolean;
+  certificateName: any;
   constructor(public schemaService: SchemaService,
     public toastMsg: ToastMessageService,
     private route: ActivatedRoute,
@@ -72,21 +76,18 @@ export class AddTemplateComponent implements OnInit {
     public translate: TranslateService,
     public router: Router) { }
 
-  ngOnInit(): void {
+  async ngOnInit() {
 
     this.getDocument();
     this.route.queryParams.subscribe(params => {
       this.fromEdit = params['fromEdit'] === 'true';
       this.certificateIndex = +params['certificateIndex'];
-
+      this.fromPreview = params['fromPreview'] === 'true';
+      this.certificateName = params['certificateName'];
     });
     if (this.fromEdit) {
       this.previewScreen();
     }
-    // this.generalService.getData('/Issuer').subscribe((res) => {
-    //   console.log(res);
-    //   this.issuerOsid = res[0].osid;
-    // });
 
     this.activeRoute.params.subscribe(params => {
       this.params = params;
@@ -98,16 +99,45 @@ export class AddTemplateComponent implements OnInit {
       }
       this.schemaService.getEntitySchemaJSON().subscribe((data) => {
         let allSteps = data['usecase'][this.usecase]['steps'];
-        for(let i=0; i<allSteps.length; i++){
-          if(allSteps[i]['key'] === 'create-vc'){
+        for (let i = 0; i < allSteps.length; i++) {
+          if (allSteps[i]['key'] === 'create-vc') {
             this.vcStep = i.toString();
           }
         }
       })
     });
 
+    if (this.fromPreview) {
+      await this.getCertTemplate();
+      await this.previewScreen();
+    }
   }
 
+  async getCertTemplate() {
+    this.credTemp = [];
+  
+    const res = await this.generalService.getData('/Schema').toPromise(); 
+    for (let i = 0; i < res.length; i++) {
+      if (res[i]["name"] === this.entityName) {
+        const data = JSON.parse(res[i]['schema']);
+        const certificateTemplate = data["_osConfig"]["certificateTemplates"];
+  
+        for (const k of Object.keys(certificateTemplate)) {
+          const CertTitle = k;
+          const certVal = certificateTemplate[k];
+          const c = certVal.toString();
+          const d = c.split("Schema/");
+  
+          const getHtml = await this.generalService.getText('/Schema/' + d[1]).toPromise();
+  
+          this.credTemp.push({
+            "title": CertTitle,
+            "html": getHtml,
+          });
+        }
+      }
+    }
+  }
 
   dataChange() {
     window.location.reload();
@@ -119,37 +149,21 @@ export class AddTemplateComponent implements OnInit {
   }
 
   previewScreen() {
-    // console.log({ doc });
-    // this.sampleData = doc;
-
-
-    // fetch(doc.schemaUrl)
-    //   .then(response => response.text())
-    //   .then(data => {
-    //     this.schemaContent = data;
-    //     this.userJson = data;
-    //     // Do something with your data
-    //     console.log(this.userJson);
-    //   });
-
-    // fetch(doc.certificateUrl)
-    //   .then(response => response.text())
-    //   .then(data => {
-    //     this.certificateContent = data;
-    //     this.userHtml = data;
-    //     this.injectHTML();
-    //   });
-
-    //  this.isPreview = true;
-    //  localStorage.setItem('isPreview', 'yes');
-
-    if (this.fromEdit && this.certificateIndex !== undefined) {
+    if (this.fromEdit || this.fromPreview && this.certificateIndex !== undefined) {
       const credTemp = this.generalService.getCertificateData();
-      const certificateData = credTemp[this.certificateIndex]['html'];
-      this.certificateTitle = credTemp[this.certificateIndex]['title'];
+      if(this.certificateName){
+        for(let i=0; i < this.credTemp.length; i++){
+          if(this.credTemp[i].title == this.certificateName){
+            this.certificateIndex = i;
+            break;
+          }
+        }
+      }
+      const certificateData = credTemp ? credTemp[this.certificateIndex]['html'] : this.credTemp[this.certificateIndex]['html'];
+      this.certificateTitle = credTemp ? credTemp[this.certificateIndex]['title'] : this.credTemp[this.certificateIndex]['title'];
       this.userHtml = certificateData;
     }
-    if (!this.fromEdit) {
+    if (!this.fromEdit && !this.fromPreview) {
       this.userHtml = `<html lang="en">
     <head>
       <style>
diff --git a/src/app/admin/configurations/configurations.component.html b/src/app/admin/configurations/configurations.component.html
index 29058ea..734cca4 100644
--- a/src/app/admin/configurations/configurations.component.html
+++ b/src/app/admin/configurations/configurations.component.html
@@ -74,8 +74,8 @@ <h3 class="pl-3 h2 text-color">{{'SCHEMA' | translate}}</h3>
             
               <p class="fs-16 fw-bold">{{ item?.name }}</p>
               <div class="d-flex align-items-center" *ngFor="let certName of item?.schema?._osConfig?.certificateTemplates | keyvalue">
-               
-                <img src="{{imgUrl}}" type="button" class="float-left mr-2  img16" alt="" (click)="addVC(item?.name)">
+                <a id="previewLink" [routerLink]="['/add-template', usecase, item?.name]" [queryParams]="{ fromPreview: true, certificateName: certName.key }"class="ml-1">
+                <img src="{{imgUrl}}" type="button" class="float-left mr-2  img16" alt="" ></a>
                 <span class="fs-14 fw-bold" >
                   {{certName.key}}
                 </span>
diff --git a/src/app/admin/configurations/configurations.component.ts b/src/app/admin/configurations/configurations.component.ts
index 74931e4..72e463d 100644
--- a/src/app/admin/configurations/configurations.component.ts
+++ b/src/app/admin/configurations/configurations.component.ts
@@ -75,10 +75,10 @@ export class ConfigurationsComponent implements OnInit {
     if(schemaName == ''){
     this.router.navigateByUrl('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey);
     }
-    if(schemaName !== ''){
-      this.entityKey = schemaName;
-      this.router.navigateByUrl('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey);
-      }
+    // if(schemaName !== ''){
+    //   this.entityKey = schemaName;
+    //   this.router.navigateByUrl('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey);
+    //   }
 
   }
     
@@ -90,6 +90,13 @@ export class ConfigurationsComponent implements OnInit {
         this.router.navigateByUrl('/create/0' + '/' + this.usecase + '/' + this.entityKey);
       }
     }
+
+    previewCertificate(){
+      const anchorTag = document.getElementById('previewLink');
+      if (anchorTag) {
+        anchorTag.click();
+      }
+    }
   }
   
 

From d9b0d534a785a9c5f1827475825b5530067df0fd Mon Sep 17 00:00:00 2001
From: suvarnakale <suvarna.kale@tekditechnologies.com>
Date: Fri, 27 Oct 2023 13:57:54 +0530
Subject: [PATCH 2/2] unused code removed

---
 src/app/admin/add-template/add-template.component.ts     | 1 -
 src/app/admin/configurations/configurations.component.ts | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/admin/add-template/add-template.component.ts b/src/app/admin/add-template/add-template.component.ts
index ff700b5..00deda7 100644
--- a/src/app/admin/add-template/add-template.component.ts
+++ b/src/app/admin/add-template/add-template.component.ts
@@ -64,7 +64,6 @@ export class AddTemplateComponent implements OnInit {
   vcStep: string;
   fromPreview: boolean;
   credTemp: any[];
-  flag: boolean;
   certificateName: any;
   constructor(public schemaService: SchemaService,
     public toastMsg: ToastMessageService,
diff --git a/src/app/admin/configurations/configurations.component.ts b/src/app/admin/configurations/configurations.component.ts
index 72e463d..49343cd 100644
--- a/src/app/admin/configurations/configurations.component.ts
+++ b/src/app/admin/configurations/configurations.component.ts
@@ -75,10 +75,10 @@ export class ConfigurationsComponent implements OnInit {
     if(schemaName == ''){
     this.router.navigateByUrl('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey);
     }
-    // if(schemaName !== ''){
-    //   this.entityKey = schemaName;
-    //   this.router.navigateByUrl('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey);
-    //   }
+    if(schemaName !== ''){
+      this.entityKey = schemaName;
+      this.router.navigateByUrl('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey);
+      }
 
   }
     
@@ -99,4 +99,3 @@ export class ConfigurationsComponent implements OnInit {
     }
   }
   
-