Merge pull request tmobile#68 from oscarbrooksdev9/azure-master

updated UI to allow for platform sorting, fixed advanced tab for function in azure
edwardmedia · Mar 12, 2019 · eef463a · eef463a
2 parents eb8f18f + 2415a68
commit eef463a
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/core/jazz_ui/src/app/pages/service-detail/service-detail.component.ts b/core/jazz_ui/src/app/pages/service-detail/service-detail.component.ts
@@ -122,9 +122,15 @@ export class ServiceDetailComponent implements OnInit {
         returnObject["create_cloudfront_url"] = service.metadata.create_cloudfront_url;
         returnObject["eventScheduleRate"] = service.metadata.eventScheduleRate;
         if(service.metadata.event_source){
+          if(service.platform === 'azure'){
+            service.metadata.event_source = 'documentdb';
+          }
           returnObject["event_source"] = service.metadata.event_source;
         }
         if(service.metadata.event_source_dynamodb){
+          if(service.platform === 'azure'){
+            service.metadata.event_source_dynamodb = service.metadata.event_source_dynamodb.split('/')[1];
+          }
           returnObject["event_source_arn"] = service.metadata.event_source_dynamodb;
         }
         if(service.metadata.event_source_kinesis){

diff --git a/core/jazz_ui/src/app/pages/services-list/service-list.ts b/core/jazz_ui/src/app/pages/services-list/service-list.ts
@@ -3,6 +3,7 @@ export class ServiceList {
 	type:String;
 	domain:String;
 	lastModified: Date;
+	platform:String;
 	health:Number;
 	status:String;
-}
+}
diff --git a/core/jazz_ui/src/app/pages/services-list/services-list.component.html b/core/jazz_ui/src/app/pages/services-list/services-list.component.html
@@ -46,6 +46,7 @@
             <div class="table-row pointer" [class.hide]="serviceListEmpty" *ngFor="let row of serviceList; let i = index" (click)="onRowClicked(row, i)" [class.deletingRow]="row.id==deletedServiceId || row.status=='deletion started'">
                 <div class="column">{{row.name}}</div>
                 <div class="column">{{row.type}}</div>
+                <div class="column">{{row.platform}}</div>
                 <div class="column">{{row.domain}}</div>
                 <div class="column">{{row.lastModified}}</div>
                 <!-- <div class="column">{{row.lastModified | amDateFormat: 'YYYY-MM-DD HH:mm:ss'}}</div> -->

diff --git a/core/jazz_ui/src/app/pages/services-list/services-list.component.scss b/core/jazz_ui/src/app/pages/services-list/services-list.component.scss
@@ -113,7 +113,7 @@
           th {
             &:nth-child(1) {
               width: 250px; //fallback
-              width: calc(100% - 650px);
+              width: calc(100% - 700px);
             }
             &:nth-child(2) {
               width: 100px;
@@ -154,7 +154,7 @@
         padding-left: 15px;
       }
       @media (min-width: $screen-lg) {
-        width: calc(100% - 650px);
+        width: calc(100% - 700px);
       }
     }
     &:nth-child(2) {

diff --git a/core/jazz_ui/src/app/pages/services-list/services-list.component.ts b/core/jazz_ui/src/app/pages/services-list/services-list.component.ts
@@ -89,7 +89,16 @@ export class ServicesListComponent implements OnInit {
       filter: {
         type: ''
       }
-    },{
+    },
+    {
+      label: 'Platform',
+      key: 'platform',
+      sort: true,
+      filter: {
+        type: 'input'
+      }
+    },
+    {
       label: 'Namespace',
       key: 'domain',
       sort: true,
@@ -159,6 +168,7 @@ export class ServicesListComponent implements OnInit {
       let serviceRow = {
         name: service.service,
         type: service.type,
+        platform: service.platform,
         domain: service.domain,
         health: 2,
         status: service.status.replace('_',' '),

diff --git a/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.ts b/core/jazz_ui/src/app/secondary-components/create-service/oss/create-service.component.ts
@@ -552,7 +552,7 @@ export class CreateServiceComponent implements OnInit {
     if(this.rateExpression.error != undefined && this.typeOfService == 'function' && this.rateExpression.type != 'none'){
         return true
     }
-    if(this.eventExpression.type == 'awsEventsNone' && this.typeOfService == 'function'){
+    if(this.eventExpression.type == 'awsEventsNone' && this.typeOfService == 'function' && this.rateExpression.type == 'none'){
       return true;
     }
     if(this.eventExpression.type == 'dynamodb' && this.eventExpression.dynamoTable == undefined){