From ed64b5edff15e702493df21aa3230b81593e6133 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Fri, 9 Jun 2017 03:19:04 +0300 Subject: [SDC-29] catalog 1707 rebase commit. Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando --- .../activity-log/activity-log-view.html | 16 -- .../activity-log/activity-log-view.less | 18 -- .../component-viewer-view-model.ts | 211 --------------------- .../component-viewer/component-viewer.html | 55 ------ .../component-viewer/component-viewer.less | 148 --------------- .../properties/product-properties-view.html | 76 -------- .../properties/properties-view.less | 128 ------------- .../properties/resource-properties-view.html | 169 ----------------- .../properties/service-properties-view.html | 167 ---------------- 9 files changed, 988 deletions(-) delete mode 100644 catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.html delete mode 100644 catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.less delete mode 100644 catalog-ui/app/scripts/view-models/component-viewer/component-viewer-view-model.ts delete mode 100644 catalog-ui/app/scripts/view-models/component-viewer/component-viewer.html delete mode 100644 catalog-ui/app/scripts/view-models/component-viewer/component-viewer.less delete mode 100644 catalog-ui/app/scripts/view-models/component-viewer/properties/product-properties-view.html delete mode 100644 catalog-ui/app/scripts/view-models/component-viewer/properties/properties-view.less delete mode 100644 catalog-ui/app/scripts/view-models/component-viewer/properties/resource-properties-view.html delete mode 100644 catalog-ui/app/scripts/view-models/component-viewer/properties/service-properties-view.html (limited to 'catalog-ui/app/scripts/view-models/component-viewer') diff --git a/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.html b/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.html deleted file mode 100644 index ac51e9014c..0000000000 --- a/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.html +++ /dev/null @@ -1,16 +0,0 @@ -
-
{{activityDate | date: 'longDate'}}
-
-
{{activity.TIMESTAMP.replace(" UTC", '') | stringToDateFilter | date: 'mediumTime':'UTC'}}
-
{{"Action: " + parseAction(activity.ACTION) + " Performed by: " + activity.MODIFIER + " Status: " + activity.STATUS}}
-
-
- - - - - - - - - diff --git a/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.less b/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.less deleted file mode 100644 index 4a7676b6e2..0000000000 --- a/catalog-ui/app/scripts/view-models/component-viewer/activity-log/activity-log-view.less +++ /dev/null @@ -1,18 +0,0 @@ -.w-sdc-component-viewer-right-activity-log{ - - .w-sdc-component-viewer-right-activity-log-date{ - .backgroundColor.n; - .font-color.g; - padding: 4px 11px - } - .w-sdc-component-viewer-right-activity-log-time{ - .g_3; - padding: 12px 0px 0px 11px; - } - - .w-sdc-component-viewer-right-activity-log-content{ - .g_1; - padding: 0px 0px 12px 11px; - border-bottom: 1px solid rgba(0, 0, 0, 0.17); - } -} diff --git a/catalog-ui/app/scripts/view-models/component-viewer/component-viewer-view-model.ts b/catalog-ui/app/scripts/view-models/component-viewer/component-viewer-view-model.ts deleted file mode 100644 index 3ae8ad70fb..0000000000 --- a/catalog-ui/app/scripts/view-models/component-viewer/component-viewer-view-model.ts +++ /dev/null @@ -1,211 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ -/// - -module Sdc.ViewModels { - 'use strict'; - - interface IComponentViewerViewModelScope extends ng.IScope { - component: Models.Components.Component; - additionalInformations: Array; - activityLog: any; - activityDateArray: Array; //this is in order to sort the dates - inputs: Array; - isLoading: boolean; - templateUrl: string; - currentTab:string; - preVersion:string; - sdcMenu:Models.IAppMenu; - versionsList:Array; - close(): void; - hasItems(obj:any): boolean; - onVersionChanged(version:any) : void; - moveToTab(tab:string):void; - isSelected(tab:string):boolean; - getActivityLog(uniqueId:string):void; - parseAction(action:string):string; - } - - export class ComponentViewerViewModel { - - static '$inject' = [ - '$scope', - '$modalInstance', - 'component', - 'Sdc.Services.ActivityLogService', - 'sdcMenu', - 'ComponentFactory' - ]; - - constructor(private $scope:IComponentViewerViewModelScope, - private $modalInstance:ng.ui.bootstrap.IModalServiceInstance, - private component:Models.Components.Component, - private activityLogService:Services.ActivityLogService, - private sdcMenu:Models.IAppMenu, - private ComponentFactory: Utils.ComponentFactory) { - this.initScope(component); - } - - //creating objects for versions - private initVersionObject:Function = ():void => { - this.$scope.versionsList = []; - for (let version in this.$scope.component.allVersions) { - this.$scope.versionsList.push({ - versionNumber: version, - versioning: this.versioning(version), - versionId: this.$scope.component.allVersions[version] - }); - } - - }; - - private versioning:Function = (versionNumber:string):string => { - let version:Array = versionNumber.split('.'); - return '00000000'.slice(version[0].length) + version[0] + '.' + '00000000'.slice(version[1].length) + version[1]; - }; - - private showComponentInformationView:Function = ():void => { - if (this.$scope.component.isResource()) { - this.$scope.templateUrl = '/app/scripts/view-models/component-viewer/properties/resource-properties-view.html'; - } else if(this.$scope.component.isService()) { - this.$scope.templateUrl = '/app/scripts/view-models/component-viewer/properties/service-properties-view.html'; - } else { - this.$scope.templateUrl = '/app/scripts/view-models/component-viewer/properties/product-properties-view.html'; - } - }; - - private showActivityLogView:Function = ():void => { - this.$scope.templateUrl = '/app/scripts/view-models/component-viewer/activity-log/activity-log-view.html'; - }; - - private initComponent = (component:Models.Components.Component):void => { - this.$scope.component = component; - this.$scope.additionalInformations = component.getAdditionalInformation(); - this.initVersionObject(); - this.$scope.isLoading = false; - }; - - private initScope = (component:Models.Components.Component):void => { - this.$scope.isLoading = false; - this.initComponent(component); - this.$scope.currentTab = 'PROPERTIES'; - this.$scope.preVersion = component.version; - this.$scope.sdcMenu = this.sdcMenu; - this.showComponentInformationView(); - //service inputs - if (component.isService()) { - let inputs:Array = []; - - for (let group in component.componentInstancesProperties) { - if (component.componentInstancesProperties[group]) { - component.componentInstancesProperties[group].forEach((property:Models.PropertyModel):void => { - if (!property.value) { - property.value = property.defaultValue; - } - inputs.push({ - name: property.name, - value: property.value, - type: property.type - }); - }); - } - } - this.$scope.inputs = inputs; - } - - this.$scope.hasItems = (obj:any):boolean => { - return Object.keys(obj).length > 0; - }; - - this.$scope.close = ():void => { - this.$modalInstance.dismiss(); - }; - - this.$scope.onVersionChanged = (version:any):void => { - if (version.versionNumber != this.$scope.component.version) { - this.$scope.isLoading = true; - this.ComponentFactory.getComponentFromServer(this.component.componentType, version.versionId).then((component: Models.Components.Component):void => { - this.initComponent(component); - }); - if (this.$scope.currentTab === 'ACTIVITY_LOG') { - this.$scope.getActivityLog(version.versionId); - } - - } - }; - - this.$scope.getActivityLog = (uniqueId:any):void => { - - let onError = (response) => { - this.$scope.isLoading = false; - console.info('onFaild', response); - - }; - let onSuccess = (response:Array) => { - this.$scope.activityLog = _.groupBy(response, function (activity:Models.Activity) { //group by date only - let dateTime:Date = new Date(activity.TIMESTAMP.replace(" UTC", '').replace(" ", 'T')); - // let date:Date = new Date(dateTime.getFullYear(), dateTime.getMonth(), dateTime.getDate()); - return dateTime.getTime(); - }); - /*this is in order to sort the jsonObject by date*/ - this.$scope.activityDateArray = Object.keys(this.$scope.activityLog); - this.$scope.activityDateArray.sort().reverse(); - this.$scope.isLoading = false; - }; - - this.$scope.isLoading = true; - if (this.$scope.component.isResource()) { - this.activityLogService.getActivityLogService('resources', uniqueId).then(onSuccess, onError); - } - if (this.$scope.component.isService()) { - this.activityLogService.getActivityLogService('services', uniqueId).then(onSuccess, onError); - } - - }; - - this.$scope.moveToTab = (tab:string):void => { - if (tab === this.$scope.currentTab) { - return; - } else if (tab === 'PROPERTIES') { - this.showComponentInformationView(); - this.$scope.preVersion = this.$scope.component.version; - } else if (tab === 'ACTIVITY_LOG') { - if (!this.$scope.activityLog || this.$scope.preVersion != this.$scope.component.version) { - this.$scope.activityLog = this.$scope.getActivityLog(this.$scope.component.uniqueId); - } - this.showActivityLogView(); - } else { - console.error("Tab " + tab + " not found!"); - return; - } - this.$scope.currentTab = tab; - }; - - this.$scope.isSelected = (tab:string):boolean => { - return tab === this.$scope.currentTab; - }; - - this.$scope.parseAction = (action:string) => { - return action ? action.split(/(?=[A-Z])/).join(' ') : ''; - }; - - } - } -} diff --git a/catalog-ui/app/scripts/view-models/component-viewer/component-viewer.html b/catalog-ui/app/scripts/view-models/component-viewer/component-viewer.html deleted file mode 100644 index 6f244b048e..0000000000 --- a/catalog-ui/app/scripts/view-models/component-viewer/component-viewer.html +++ /dev/null @@ -1,55 +0,0 @@ -
- -
X
-
-
-

-
- {{component.name | resourceName}} -
- v{{component.version}} -

-

- UUID: {{component.uuid}} -

-
-
Version History
- -
-
- {{ version.versionNumber }} -
-
- -
- -
-
Composition
- - - -
-
- -
- - - - - - - -
-
-
-
diff --git a/catalog-ui/app/scripts/view-models/component-viewer/component-viewer.less b/catalog-ui/app/scripts/view-models/component-viewer/component-viewer.less deleted file mode 100644 index 2fe5676d62..0000000000 --- a/catalog-ui/app/scripts/view-models/component-viewer/component-viewer.less +++ /dev/null @@ -1,148 +0,0 @@ -html .modal-component-viewer{ - width: 1084px; -} - -.w-sdc-resource-viewer { - .b_7; - .w-sdc-resource-viewer-modal-close{ - z-index: 2; - text-indent: -100px; - overflow: hidden; - top: 19px; - } - .w-sdc-resource-viewer-content { - position: relative; - overflow: hidden; - - .w-sdc-resource-viewer-left { - - .bg_j; - display: table-cell; - width: 282px; - - .w-sdc-resource-viewer-left-title { - margin: 0; - display: block; - height: 100px; - padding: 20px 0; - } - - .w-sdc-resource-viewer-left-title-icon { - margin: 0 15px; - vertical-align: middle; - float: left; - } - - .w-sdc-resource-viewer-left-title-name { - .g_7; - max-width: 160px; - overflow: hidden; - display: inline-block; - text-overflow: ellipsis; - vertical-align: middle; - line-height: 23px; - padding-top: 10px; - font-weight: bold; - white-space: nowrap; - } - - .w-sdc-resource-viewer-left-title-version { - .g_13; - float: left; - } - - .w-sdc-resource-viewer-left-title-uuid { - .g_14; - text-align: center; - border-top: 1px solid rgba(120, 136, 148, 0.26); - width: 95%; - margin: auto; - padding: 7px 0; - } - - .w-sdc-resource-viewer-leftbar-section { - font-family: omnes-medium, sans-serif; - } - - .w-sdc-resource-viewer-leftbar-section-title { - .bg_o; - color: #fff; - font-size: 14px; - padding: 12px 20px; - text-transform: uppercase; - } - - .w-sdc-resource-viewer-leftbar-section-structure{ - .perfect-scrollbar; - max-height: 525px; - } - .w-sdc-resource-viewer-version { - font-weight: bold; - .perfect-scrollbar; - } - - .i-sdc-resource-viewer-version-container { - padding: 13px 0px 13px 13px; - max-height: 218px; - - .i-sdc-resource-viewer-version-item { - - &.active { - .a_7; - } - &:hover { - cursor: pointer; - } - } - - } - } - - .w-sdc-resource-viewer-right { - .bg_c; - display: table-cell; - vertical-align: top; - padding: 0; // for the scroller to be on all width - width: 716px; - padding: 25px 0px 0px 35px; - - .w-sdc-resource-viewer-right-content { - padding: 0 52px 0 0px; - margin-bottom: 25px; - height: 700px; - overflow: hidden; - position: relative; - - } - - .w-sdc-resource-viewer-right-tab { - .b_6; - - .hand; - background-color: transparent; - position: relative; - font-weight: 500; - line-height: 30px; - border: none; - border-bottom: solid 1px @color_c; - vertical-align: middle; - padding: 0px 30px 20px 0px; - - - &:focus, - &:active { - outline: none; - - } - &.selected { - outline: none; - font-weight: 700; - .font-color.a; - } - } - - - } - - } -} diff --git a/catalog-ui/app/scripts/view-models/component-viewer/properties/product-properties-view.html b/catalog-ui/app/scripts/view-models/component-viewer/properties/product-properties-view.html deleted file mode 100644 index 8aeda603f8..0000000000 --- a/catalog-ui/app/scripts/view-models/component-viewer/properties/product-properties-view.html +++ /dev/null @@ -1,76 +0,0 @@ -
- -

General Information

-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- Life Cycle Status: - - {{sdcMenu.LifeCycleStatuses[component.lifecycleState].text}} - -
-
- Distribution Status: - - {{sdcMenu.DistributionStatuses[component.distributionStatus].text}} - -
-
-
-
- - -
-
- - - {{tagName}}{{$last ? '' : ','}} - -
-
-
-

Additional Information

- -
- - - - - - - - - - - -
KeyValue
{{additionalInformation.key}}{{additionalInformation.value}}
-
-
diff --git a/catalog-ui/app/scripts/view-models/component-viewer/properties/properties-view.less b/catalog-ui/app/scripts/view-models/component-viewer/properties/properties-view.less deleted file mode 100644 index c0beed338f..0000000000 --- a/catalog-ui/app/scripts/view-models/component-viewer/properties/properties-view.less +++ /dev/null @@ -1,128 +0,0 @@ -.w-sdc-component-viewer-right-properties { - .w-sdc-resource-viewer-tabs { - height: 42px; - } - - .w-sdc-resource-viewer-right-content-section { - margin: 0 0 20px 16px; - } - - .sdc-resource-viewer-sidebar-section-content-column-1, - .sdc-resource-viewer-sidebar-section-content-column-2 { - display: table-cell; - width: 50%; - } - .sdc-resource-viewer-sidebar-section-content-item { - .b_7; - margin-bottom: 5px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - width: 305px; - } - .sdc-resource-viewer-sidebar-section-content-item-label { - .bold; - .g_9; - } - .w-sdc-resource-viewer-right .sdc-resource-viewer-sidebar-section-content-column-1 { - .sdc-resource-viewer-sidebar-section-content-item { - width: 390px; - } - } - .sdc-resource-viewer-sidebar-section-content-item.description { - margin: 0; - - .sdc-resource-viewer-sidebar-section-content-item-value { - word-wrap: break-word; - white-space: normal; - display: block; - - } - .sdc-resource-viewer-sidebar-section-content-tags { - word-wrap: break-word; - white-space: pre-wrap; - display: inline-block; - max-width: 167px; - - } - } - - .w-sdc-resource-viewer-right-title { - .g_1; - .bg_n; - padding: 7px 15px; - margin: 0px 0 25px; - font-weight: bold; - } - - .w-sdc-resource-viewer-right-table-head-cell { - .g_9; - text-align: left; - } - - .cols-1 { - width: 100%; - } - .cols-2 { - width: 50%; - } - .cols-3 { - width: 33%; - } - - .sdc-properties-container table tbody td.label { - .bold; - } - - .w-sdc-designer-sidebar-section-content, - .w-sdc-resource-viewer-right-table { - display: table; - width: 100%; - .b_9; - word-break: break-all; - - tbody td { - padding: 4px 20px 0 0; - - .ellipsis-directive-more-less { - display: none; - } - - .ellipsis-cols2 { - .sdc-ellipsis; - max-width: 340px; - } - .ellipsis-cols3 { - .sdc-ellipsis; - max-width: 200px; - } - } - - } - - .i-sdc-designer-sidebar-section-content-column-1 { - display: table-cell; - width: 50%; - } - - .i-sdc-designer-sidebar-section-content-column-2 { - display: table-cell; - width: 50%; - } - - .i-sdc-resource-viewer-artifacts-item-action, - .sdc-information-artifacts-icon { - .sprite; - display: inline-block; - width: 20px; - height: 20px; - cursor: pointer; - vertical-align: middle; - &.download { - .sprite.e-sdc-small-download; - } - &.preview { - .e-sdc-small-icon-eye; - } - } -} diff --git a/catalog-ui/app/scripts/view-models/component-viewer/properties/resource-properties-view.html b/catalog-ui/app/scripts/view-models/component-viewer/properties/resource-properties-view.html deleted file mode 100644 index c02e7aba7e..0000000000 --- a/catalog-ui/app/scripts/view-models/component-viewer/properties/resource-properties-view.html +++ /dev/null @@ -1,169 +0,0 @@ -
- -

General Information

-
-
-
- - Resource -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- Life Cycle Status: - - {{sdcMenu.LifeCycleStatuses[component.lifecycleState].text}} - -
-
- System Name: - -
-
- - -
-
-
-
- - -
-
- - {{tagName}}{{$last ? '' : ','}} -
-
-
- -

Additional Information

- -
- - - - - - - - - - - -
KeyValue
{{additionalInformation.key}}{{additionalInformation.value}}
-
- -

Properties

-
- - - - - - - - - - - - - -
NameType (Constraints)Default Value
{{property.name}}{{property.type}}{{property.defaultValue}}
-
- -

Requirements

-
- - - - - - - - - -
Type
{{value[0].name}}
-
- - -

Deployment Artifacts

- -
- - - - - - - - - - - - - - - -
NameFileVersion
{{artifact.artifactDisplayName}}{{artifact.artifactName}}{{artifact.artifactVersion}} - - -
-
- -

Information Artifacts

-
- - - - - - - - - - - - - - - -
NameFileVersion
{{artifact.artifactDisplayName}}{{artifact.artifactName}}{{artifact.artifactVersion}} - - -
-
-
diff --git a/catalog-ui/app/scripts/view-models/component-viewer/properties/service-properties-view.html b/catalog-ui/app/scripts/view-models/component-viewer/properties/service-properties-view.html deleted file mode 100644 index 01f872c13c..0000000000 --- a/catalog-ui/app/scripts/view-models/component-viewer/properties/service-properties-view.html +++ /dev/null @@ -1,167 +0,0 @@ -
- -

General Information

-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- Life Cycle Status: - {{sdcMenu.LifeCycleStatuses[component.lifecycleState].text}} -
-
- Distribution Status: - {{sdcMenu.DistributionStatuses[component.distributionStatus].text}} -
- -
- System Name: - -
-
-
-
- - -
-
- - {{tagName}}{{$last ? '' : ','}} -
-
-
-

Additional Information

- -
- - - - - - - - - - - -
KeyValue
{{additionalInformation.key}}{{additionalInformation.value}}
-
- -

Inputs

- -
- - - - - - - - - - - - - -
NameType (Constraints)Default Value
{{input.name}}{{input.type}}{{input.value}}
-
- -

API Artifacts

- -
- - - - - - - - - - - - - - - -
NameFileVersion
{{artifact.artifactDisplayName}}{{artifact.artifactName}}{{artifact.artifactVersion}} - - -
-
- -

Deployment Artifacts

- -
- - - - - - - - - - - - - - - -
NameFileVersion
{{artifact.artifactDisplayName}}{{artifact.artifactName}}{{artifact.artifactVersion}} - - -
-
- - -

Information Artifacts

- -
- - - - - - - - - - - - - - - -
NameFileVersion
{{artifact.artifactDisplayName}}{{artifact.artifactName}}{{artifact.artifactVersion}} - - -
-
-
-- cgit 1.2.3-korg