Task #1 : Issue fixes

Sunbird-RC · Dec 6, 2022 · 3eabc2b · 3eabc2b
1 parent f0c6ef4
commit 3eabc2b
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 90 deletions.
diff --git a/src/app/admin/config-workflow/config-workflow.component.html b/src/app/admin/config-workflow/config-workflow.component.html
@@ -51,6 +51,7 @@ <h4>{{ entityName }}</h4>
             <div class="col-sm-3">
               <select
                 #mySelect
+                class="custom-dropdown-attester-w-auto"
                 class="custom-dropdown-attester"
                 (change)="onSelect(mySelect.value)"
               >

diff --git a/src/app/admin/config-workflow/config-workflow.component.ts b/src/app/admin/config-workflow/config-workflow.component.ts
@@ -1,15 +1,15 @@
-import { Component, OnInit, Input } from "@angular/core";
+import { Component, OnInit, Input, SimpleChanges } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { GeneralService } from "src/app/services/general/general.service";
-import { SchemaService } from "src/app/services/data/schema.service";
-import CommonData from "src/assets/schemas/education/Common.json";
 import { TranslateService } from '@ngx-translate/core'; 
+
 @Component({
   selector: "config-workflow",
   templateUrl: "./config-workflow.component.html",
   styleUrls: ["./config-workflow.component.scss"],
 })
 export class ConfigWorkflowComponent implements OnInit {
+  @Input() usecaseSchema;
   entityName: any;
   schemaName = [];
   schemaName_data = [];
@@ -27,18 +27,25 @@ export class ConfigWorkflowComponent implements OnInit {
 
   constructor(
     private route: ActivatedRoute,
+    private router: Router,
     public translate: TranslateService,
     public generalService: GeneralService
   ) {
     this.entityName = this.route.snapshot.params.entity;
   }
 
   ngOnInit(): void {
+
     let selectedMenuList: any;
     this.generalService.getData("/Schema").subscribe((res) => {
       for (let i = 0; i < res.length; i++) {
         this.schemaName.push(JSON.parse(res[i]["schema"]));
-        this.entityList.push(this.schemaName[i]["title"]);
+
+        if(!this.schemaName[i].hasOwnProperty('isRefSchema') && !this.schemaName[i]['isRefSchema'])
+        {
+          this.entityList.push(this.schemaName[i]["title"]);
+        }
+
         this.fieldList.push(this.schemaName[i]["definitions"]);
         selectedMenuList = this.fieldList.find((e) => e[this.entityName]);
       }
@@ -47,6 +54,17 @@ export class ConfigWorkflowComponent implements OnInit {
     });
   }
 
+
+  ngOnChanges(changes: SimpleChanges): void {
+    const latestRequest = changes['usecaseSchema'];
+    if (latestRequest.currentValue) {
+      this.entityName = latestRequest.currentValue;
+       this.global_properties_student = [];
+
+      this.onChangeSelect(this.entityName);
+    }
+  }
+
   onChangeSelect(item: any) {
     let arr = [];
     this.studentFieldList = [];
@@ -60,6 +78,7 @@ export class ConfigWorkflowComponent implements OnInit {
     this.getPropertiesNameStudent(item, "", Object.keys(main_item), 0);
     return this.global_properties_student;
   }
+
   getPropertiesNameStudent(
     item: any,
     key_name: any,
@@ -95,6 +114,7 @@ export class ConfigWorkflowComponent implements OnInit {
   onSelect(item: any) {
     let arr = [];
     this.feildNameList = [];
+    this.global_properties = [];
     const attest = this.fieldList.find((e) => e[item]);
     arr = this.getProperties(attest?.[item], attest);
 

diff --git a/src/app/admin/create-entity/create-entity.component.html b/src/app/admin/create-entity/create-entity.component.html
@@ -52,13 +52,13 @@
                     <ul class="list-unstyled components">
                         <ng-template ngFor let-menuItem [ngForOf]="usecaseSchema" let-i="index">
                             <li class="menu" *ngIf="!menuItem['isRefSchema']" (click)="openEntity(i, menuItem?.title)">
-                                <a class="a-menu"> {{menuItem?.title}}
+                                <a class="a-menu" [class.selected]=" menuItem?.title === usecaseSchema[i].title" (click)="onSelect(menuItem?.title);"> {{menuItem?.title}} 
                                     <div *ngIf="isActive == 'createSchema' && menuItem['status'] != 'PUBLISHED'"
                                         class="dropdown p14 float-end">
                                         <i class="fa fa-ellipsis-h text-grey-color" aria-hidden="true"></i>
                                         <div class="dropdown-content dropdown-content-margin">
                                             <a data-toggle="modal" data-target="#addEntity"
-                                                (click)="openEntityModal('edit', i)" class="ml-0">{{'EDIT' | translate}}</a>
+                                           (click)="openEntityModal('edit', i)" class="ml-0">{{'EDIT' | translate}}</a>
                                             <a data-toggle="modal" data-target="#deleteEntity" (click)="deleteEntity(i, '')" class="ml-0">{{'DELETE' | translate}}</a>
                                         </div>
                                     </div>
@@ -381,13 +381,13 @@ <h3>{{usecaseSchema[activeMenuNo]?.title}}</h3>
                 </div>
             </div>
             <div *ngIf="isActive == 'configurations'">
-                <config-workflow></config-workflow>
+                <config-workflow [usecaseSchema]="usecaseSchemaData"></config-workflow>
             </div>
 
 
 
             <div *ngIf="isActive =='create-vc'">
-                <create-vc-template></create-vc-template>
+                <create-vc-template [usecaseSchema]="usecaseSchemaData"></create-vc-template>
             </div>
 
             <div *ngIf="isActive == 'ownership'">

diff --git a/src/app/admin/create-entity/create-entity.component.ts b/src/app/admin/create-entity/create-entity.component.ts
@@ -104,6 +104,7 @@ export class CreateEntityComponent implements OnInit {
   commonSchemaField: any;
   deleteingOsid: any;
   index: any;
+  usecaseSchemaData: any;
   constructor(
     private activeRoute: ActivatedRoute,
     public router: Router,
@@ -898,7 +899,7 @@ export class CreateEntityComponent implements OnInit {
 
   nextStep() {
     this.saveData();
-    if (this.currentTab < 4) {
+    if (this.currentTab < this.steps.length) {
       this.steps[this.currentTab].classList.remove("activeTab");
       this.currentTab += 1;
       this.steps[this.currentTab].classList.add("activeTab")
@@ -908,12 +909,19 @@ export class CreateEntityComponent implements OnInit {
       this['active' + (this.currentTab - 1)] = false;
 
       this.location.replaceState('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey);
+
     } else {
       this.location.replaceState('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey);
+
     }
 
   }
 
+
+  onSelect(userSchema) {
+    this.usecaseSchemaData = userSchema;
+  }
+
   backStep() {
     if (this.currentTab >= 1 && this.currentTab < 4) {
       this.steps[this.currentTab].classList.remove("activeTab");
@@ -1600,9 +1608,6 @@ export class CreateEntityComponent implements OnInit {
         if (this.isNew) {
           this.generalService.postData('/Schema', payload).subscribe((res) => {
 
-
-
-
             // let schemaParams = {
             //   'title': this.usecase,
             //   'schema': this.usecaseSchema,

diff --git a/src/app/admin/create-vc-template/create-vc-template.component.html b/src/app/admin/create-vc-template/create-vc-template.component.html
@@ -14,7 +14,7 @@
         <div class="img-hold">
           <div class="thmbCol" *ngFor="let item of credTemp" >           
             <div class="wrap">
-              <iframe id="iframe1"   class="iframe-container embed-responsive-item"></iframe>
+              <iframe id="iframe1" class="iframe-container embed-responsive-item"></iframe>
             </div>
             <div class="l12 fw-bold">{{item?.title}}</div>  
           </div> 
@@ -27,10 +27,10 @@
                      <i class="fa fa-plus text-secondary-color pt-c" aria-hidden="true"></i>
                   </a>
                 </div>
-                <div class="ft-12">
+                <div class="fs-12">
                   <b>{{'ADD_TEMPLATE' | translate}}</b>
                 </div>
-                <div class="ft-10 thmbCol2">
+                <div class="fs-10 thmbCol2">
                   <div>
                     {{'ANY_EDIT_IN_QR_CODE' | translate}}
                   </div>