Add secret characteristic blocks in the lifecycle rules editor

João Capuchorequested to merge
osl-secrets into develop

There are a lot of empty line changes because of my editor's formatting, if this is a concern I can try to remove them.

Depends on !42 (merged) Fixes #48 (closed)

Edited by João Capucho

Merge request reports

src/app/p_services/admin/lifeCycleManagement/service-rule-design/service-rule-design.component.ts

+3 −1
Changes for src/app/p_services/admin/lifeCycleManagement/service-rule-design/service-rule-design.component.ts: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ export class ServiceRuleDesignComponent implements OnInit { 
  charsListText: ServiceSpecCharacteristic[];

  charsListLongText: ServiceSpecCharacteristic[];

  charsListTimestamp: ServiceSpecCharacteristic[];

  charsListSecret: ServiceSpecCharacteristic[];

  serviceSpecRel: ServiceSpecRelationship[];

  resourceserviceSpecRef: ResourceSpecificationRef[];
@@ -227,6 +228,7 @@ export class ServiceRuleDesignComponent implements OnInit { 
          this.charsListText= this.spec.serviceSpecCharacteristic.filter(specCharacteristic => specCharacteristic.valueType == 'TEXT');

          this.charsListLongText= this.spec.serviceSpecCharacteristic.filter(specCharacteristic => specCharacteristic.valueType == 'LONGTEXT');

          this.charsListTimestamp= this.spec.serviceSpecCharacteristic.filter(specCharacteristic => specCharacteristic.valueType == 'TIMESTAMP');

          this.charsListSecret = this.spec.serviceSpecCharacteristic.filter(specCharacteristic => specCharacteristic.valueType == 'SECRET');



          this.serviceSpecRel= this.spec.serviceSpecRelationship;

          this.workspace.serviceSpecRel = this.serviceSpecRel;
@@ -238,6 +240,7 @@ export class ServiceRuleDesignComponent implements OnInit { 


          this.workspace.charsListText = this.charsListText;

          this.workspace.charsListText = this.workspace.charsListText.concat( this.charsListLongText );

          this.workspace.charsListText = this.workspace.charsListText.concat( this.charsListSecret );



          this.workspace.charsListNumber = this.charsListSmallint;

          this.workspace.charsListNumber = this.workspace.charsListNumber.concat( this.charsListEnum );
@@ -1438,7 +1441,6 @@ export class ServiceRuleDesignComponent implements OnInit { 
    return  [code, Blockly.Java.ORDER_ATOMIC];

  };





  Blockly.Java['createServiceOrderJson'] = function(block: any) {

    // Variable getter.

        console.log('createServiceOrderJson')