re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>

4 files changed, 53 insertions, 27 deletions

diff --git a/catalog-ui/src/app/modules/directive-module.ts b/catalog-ui/src/app/modules/directive-module.ts
index 3b3a71609b..7892d5b43f 100644
--- a/catalog-ui/src/app/modules/directive-module.ts
+++ b/catalog-ui/src/app/modules/directive-module.ts
@@ -64,7 +64,7 @@ import {LinksFactory} from "../models/graph/graph-links/links-factory";
 import {ImageCreatorService} from "../directives/graphs-v2/image-creator/image-creator.service";
 import {Palette} from "../directives/graphs-v2/palette/palette.directive";
 import {CompositionGraph} from "../directives/graphs-v2/composition-graph/composition-graph.directive";
-import {RelationMenuDirective} from "../directives/graphs-v2/relation-menu/relation-menu";
+// import {RelationMenuDirective} from "../directives/graphs-v2/relation-menu/relation-menu";
 import {DeploymentGraph} from "../directives/graphs-v2/deployment-graph/deployment-graph.directive";
 import {CommonGraphUtils} from "../directives/graphs-v2/common/common-graph-utils";
 import {CompositionGraphNodesUtils} from "../directives/graphs-v2/composition-graph/utils/composition-graph-nodes-utils";
@@ -77,7 +77,7 @@ import {MatchCapabilitiesRequirementsUtils} from "../directives/graphs-v2/compos
 import {CapabilitiesListDirective} from "../directives/capabilities-and-requirements/capability/capabilities-list-directive";
 import {RequirementsListDirective} from "../directives/capabilities-and-requirements/requirement/requirements-list-directive";
 import {ServicePathGraphUtils} from "../directives/graphs-v2/composition-graph/utils/composition-graph-service-path-utils";
-import {PaletteAnimationComponent} from './../ng2/components/ui/palette-animation/palette-animation.component';
+import {PreventDoubleClickDirective} from "../directives/prevent-double-click/prevent-double-click";
 
 let moduleName:string = 'Sdc.Directives';
 let directiveModule:ng.IModule = angular.module(moduleName, []);
@@ -91,7 +91,7 @@ directiveModule.directive('fileType', FileTypeDirective.factory);
 directiveModule.directive('invalidCharacters', InvalidCharactersDirective.factory);
 directiveModule.directive('perfectScrollbar', PerfectScrollerDirective.factory);
 directiveModule.directive('expandCollapse', ExpandCollapseDirective.factory);
-directiveModule.directive('sdcModal', SdcModalDirective.factory);
+directiveModule.directive('ng1Modal', SdcModalDirective.factory);
 directiveModule.directive('fileOpener', FileOpenerDirective.factory);
 directiveModule.directive('fileUpload', FileUploadDirective.factory);
 directiveModule.directive('structureTree', StructureTreeDirective.factory);
@@ -113,17 +113,19 @@ directiveModule.directive('selectTypeMap', SelectTypeMapDirective.factory);
 directiveModule.directive('selectTypeList', SelectTypeListDirective.factory);
 directiveModule.directive('infoTooltip', InfoTooltipDirective.factory);
 directiveModule.directive('validationOnLoad', ValidationOnLoadDirective.factory);
-directiveModule.directive('sdcTabs', SdcTabsDirective.factory);
+directiveModule.directive('ng1Tabs', SdcTabsDirective.factory);
 directiveModule.directive('sdcSingleTab', SdcSingleTabDirective.factory);
 directiveModule.directive('innerSdcSingleTab', InnerSdcSingleTabDirective.factory);
 directiveModule.directive('jsonExportExcel', JsonExportExcelDirective.factory);
 directiveModule.directive('expandCollapseListHeader', ExpandCollapseListHeaderDirective.factory);
+directiveModule.directive('preventDoubleClick', PreventDoubleClickDirective.factory);
+//
 //
 // // Layouts
 directiveModule.directive('topProgress', TopProgressDirective.factory);
 //
 // // Elements
-directiveModule.directive('sdcCheckbox', CheckboxElementDirective.factory);
+directiveModule.directive('ng1Checkbox', CheckboxElementDirective.factory);
 directiveModule.directive('sdcRadioButton', RadiobuttonElementDirective.factory);
 //
 // // Events
@@ -144,7 +146,7 @@ directiveModule.service('ImageCreatorService', ImageCreatorService);
 // //composition
 directiveModule.directive('palette', Palette.factory);
 directiveModule.directive('compositionGraph', CompositionGraph.factory);
-directiveModule.directive('relationMenu', RelationMenuDirective.factory);
+// directiveModule.directive('relationMenu', RelationMenuDirective.factory);
     //directiveModule.directive('assetPopover', AssetPopoverDirective.factory);
 //
 // //deployment
@@ -178,13 +180,18 @@ import { MenuListNg2Component } from "../ng2/components/downgrade-wrappers/menu-
 import { TopNavComponent } from "../ng2/components/layout/top-nav/top-nav.component";
 import { ZoneContainerComponent } from "../ng2/components/ui/canvas-zone/zone-container.component";
 import { ZoneInstanceComponent } from "../ng2/components/ui/canvas-zone/zone-instance/zone-instance.component";
+import { CompositionPanelComponent } from 'app/ng2/pages/composition/panel/panel.component';
+import { CompositionPanelHeaderComponent } from 'app/ng2/pages/composition/panel/panel-header/panel-header.component';
 import { PropertiesAssignmentComponent } from "../ng2/pages/properties-assignment/properties-assignment.page.component";
 import { SearchWithAutoCompleteComponent } from "../ng2/components/ui/search-with-autocomplete/search-with-autocomplete.component";
 import { PalettePopupPanelComponent } from "../ng2/components/ui/palette-popup-panel/palette-popup-panel.component";
 import { ServicePathComponent } from '../ng2/components/logic/service-path/service-path.component';
 import { ServicePathSelectorComponent } from '../ng2/components/logic/service-path-selector/service-path-selector.component';
+import { MultilineEllipsisComponent } from "../ng2/shared/multiline-ellipsis/multiline-ellipsis.component";
 import { InterfaceOperationComponent } from '../ng2/pages/interface-operation/interface-operation.page.component';
 import { PluginFrameComponent } from "../ng2/components/ui/plugin/plugin-frame.component";
+import { TileComponent } from "../ng2/components/ui/tile/tile.component";
+
 
 directiveModule.directive('menuListNg2', downgradeComponent({
     component: MenuListNg2Component,
@@ -193,20 +200,25 @@ directiveModule.directive('menuListNg2', downgradeComponent({
 
 directiveModule.directive('topNav', downgradeComponent({
     component: TopNavComponent,
-    inputs: ['version', 'menuModel', 'topLvlSelectedIndex', 'hideSearch', 'searchTerm', 'notificationIconCallback'],
+    inputs: ['version', 'menuModel', 'topLvlSelectedIndex', 'hideSearch', 'searchTerm', 'notificationIconCallback', 'unsavedChanges', 'unsavedChangesCallback'],
     outputs: ['searchTermChange']
 }) as ng.IDirectiveFactory);
 
 directiveModule.directive('ng2ZoneContainer', downgradeComponent({
     component: ZoneContainerComponent,
-        inputs: ['title', 'count', 'class', 'showZone', 'minifyZone'],
-    outputs: []
+        inputs: ['title', 'count', 'type', 'visible', 'minimized'],
+    outputs: ['minimize', 'backgroundClick']
 }) as angular.IDirectiveFactory);
 
 directiveModule.directive('ng2ZoneInstance', downgradeComponent({
-    component: ZoneInstanceComponent,
-    inputs: ['config', 'isActive', 'activeInstanceMode', 'defaultIconText'],
-    outputs: ['modeChange']
+        component: ZoneInstanceComponent,
+        inputs: ['zoneInstance', 'isActive', 'activeInstanceMode', 'defaultIconText', 'isViewOnly', 'hidden', 'forceSave'],
+        outputs: ['modeChange', 'tagHandleClick', 'assignmentSaveStart', 'assignmentSaveComplete']
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('ng2CompositionPanel', downgradeComponent({
+    component: CompositionPanelComponent,
+    inputs: ['isViewOnly', 'isLoading', 'isCertified', 'selectedZoneInstanceId', 'selectedZoneInstanceType', 'selectedZoneInstanceName', 'topologyTemplate'],
 }) as angular.IDirectiveFactory);
 
 directiveModule.directive('propertiesAssignment', downgradeComponent({
@@ -219,12 +231,6 @@ directiveModule.directive('ng2SearchWithAutocomplete', downgradeComponent({
     outputs: ['searchChanged', 'searchButtonClicked']
 }) as angular.IDirectiveFactory);
 
-directiveModule.directive('ng2PaletteAnimation', downgradeComponent({
-        component: PaletteAnimationComponent,
-        inputs: ['from', 'to', 'icon' ],
-        outputs: []
-    }) as angular.IDirectiveFactory);
-
 directiveModule.directive('ng2PalettePopupPanel', downgradeComponent({
     component: PalettePopupPanelComponent,
     inputs: [],
@@ -233,7 +239,7 @@ directiveModule.directive('ng2PalettePopupPanel', downgradeComponent({
 
 directiveModule.directive('ng2ServicePath', downgradeComponent({
     component: ServicePathComponent,
-    inputs: ['onCreate', 'service'],
+    inputs: ['onCreate', 'service', 'isViewOnly'],
     outputs: []
 }) as angular.IDirectiveFactory);
 
@@ -249,6 +255,18 @@ directiveModule.directive('ng2InterfaceOperation', downgradeComponent({
     outputs: []
 }) as angular.IDirectiveFactory);
 
+directiveModule.directive('ng2MultilineEllipsis', downgradeComponent({
+    component: MultilineEllipsisComponent,
+    inputs: ['lines', 'lineHeight', 'className'],
+    outputs: ['hasEllipsisChanged']
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('ng2UiTile', downgradeComponent({
+    component: TileComponent,
+    inputs: ['component'],
+    outputs: ['onTileClick']
+}) as angular.IDirectiveFactory);
+
 directiveModule.directive('pluginFrame', downgradeComponent( {
     component: PluginFrameComponent,
     inputs: ['plugin', 'queryParams'],
diff --git a/catalog-ui/src/app/modules/filters.ts b/catalog-ui/src/app/modules/filters.ts
index 95fe583a04..fdce1e3e11 100644
--- a/catalog-ui/src/app/modules/filters.ts
+++ b/catalog-ui/src/app/modules/filters.ts
@@ -23,7 +23,6 @@ import {TrimFilter} from "../filters/trim-filter";
 import {ResourceTypeFilter} from "../filters/resource-type-filter";
 import {StringToDateFilter} from "../filters/string-to-date-filter";
 import {CategoryTypeFilter} from "../filters/category-type-filter";
-import {CatalogStatusFilter} from "../filters/catalog-status-filter";
 import {TruncateFilter} from "../filters/truncate-filter";
 import {EntityFilter} from "../filters/entity-filter";
 import {GraphResourceNameFilter} from "../filters/graph-resource-name-filter";
@@ -37,7 +36,6 @@ filterModule.filter("resourceName", ResourceNameFilter);
 filterModule.filter("graphResourceName", GraphResourceNameFilter);
 filterModule.filter("entityFilter", EntityFilter);
 filterModule.filter("truncate", TruncateFilter);
-filterModule.filter("catalogStatusFilter", CatalogStatusFilter);
 filterModule.filter("categoryTypeFilter", CategoryTypeFilter);
 filterModule.filter("stringToDateFilter", StringToDateFilter);
 filterModule.filter("resourceTypeName", ResourceTypeFilter);
diff --git a/catalog-ui/src/app/modules/service-module.ts b/catalog-ui/src/app/modules/service-module.ts
index c934b630c8..f4350a39d4 100644
--- a/catalog-ui/src/app/modules/service-module.ts
+++ b/catalog-ui/src/app/modules/service-module.ts
@@ -46,22 +46,28 @@ import {LoaderService} from "../services/loader-service";
 import {CategoryResourceService} from "../services/category-resource-service";
 import {downgradeInjectable} from "@angular/upgrade/static";
 import {ModalService} from "../ng2/services/modal.service";
+import {SdcUiComponents} from "sdc-ui/lib/angular";
 import {ComponentServiceNg2} from "../ng2/services/component-services/component.service";
 import {ServiceServiceNg2} from "../ng2/services/component-services/service.service";
 import {ComponentServiceFactoryNg2} from "../ng2/services/component-services/component.service.factory";
 import {ConnectionWizardService} from "../ng2/pages/connection-wizard/connection-wizard.service";
 import {ComponentInstanceServiceNg2} from "../ng2/services/component-instance-services/component-instance.service";
 import {UserService as UserServiceNg2} from "../ng2/services/user.service";
+import {PoliciesService as PoliciesServiceNg2} from "../ng2/services/policies.service";
+import {GroupsService as GroupsServiceNg2} from "../ng2/services/groups.service";
 import {PluginsService} from "../ng2/services/plugins.service";
 import {EventBusService} from "../ng2/services/event-bus.service";
-import {PoliciesService as PoliciesServiceNg2} from "../ng2/services/policies.service";
 import {DynamicComponentService} from "app/ng2/services/dynamic-component.service";
+import {AutomatedUpgradeService} from "../ng2/pages/automated-upgrade/automated-upgrade.service";
+import {ArchiveService as ArchiveServiceNg2} from "app/ng2/services/archive.service";
+import {ComponentFactory} from "app/utils/component-factory";
 
 let moduleName:string = 'Sdc.Services';
 let serviceModule:ng.IModule = angular.module(moduleName, []);
 
 serviceModule.service('Sdc.Services.ConfigurationUiService', ConfigurationUiService);
 serviceModule.service('Sdc.Services.CookieService', CookieService);
+serviceModule.service('Sdc.Services.ComponentFactory', ComponentFactory); // Why you need to declare it again, already done in utils.ts
 serviceModule.service('Sdc.Services.EntityService', EntityService);
 serviceModule.service('Sdc.Services.AvailableIconsService', AvailableIconsService);
 serviceModule.service('Sdc.Services.UrlToBase64Service', UrlToBase64Service);
@@ -98,10 +104,14 @@ serviceModule.factory('ComponentServiceNg2', downgradeInjectable(ComponentServic
 serviceModule.factory('ComponentServiceFactoryNg2', downgradeInjectable(ComponentServiceFactoryNg2));
 serviceModule.factory('ServiceServiceNg2', downgradeInjectable(ServiceServiceNg2));
 serviceModule.factory('ModalServiceNg2', downgradeInjectable(ModalService));
+serviceModule.factory('ModalServiceSdcUI', downgradeInjectable(SdcUiComponents.ModalService));
 serviceModule.factory('ConnectionWizardServiceNg2', downgradeInjectable(ConnectionWizardService));
 serviceModule.factory('ComponentInstanceServiceNg2', downgradeInjectable(ComponentInstanceServiceNg2));
 serviceModule.factory('UserServiceNg2', downgradeInjectable(UserServiceNg2));
+serviceModule.factory('PoliciesServiceNg2', downgradeInjectable(PoliciesServiceNg2));
+serviceModule.factory('GroupsServiceNg2', downgradeInjectable(GroupsServiceNg2));
 serviceModule.factory('PluginsService', downgradeInjectable(PluginsService));
 serviceModule.factory('EventBusService', downgradeInjectable(EventBusService));
-serviceModule.factory('PoliciesServiceNg2', downgradeInjectable(PoliciesServiceNg2));
 serviceModule.factory('DynamicComponentService', downgradeInjectable(DynamicComponentService));
+serviceModule.factory('ArchiveServiceNg2', downgradeInjectable(ArchiveServiceNg2));
+serviceModule.factory('AutomatedUpgradeService', downgradeInjectable(AutomatedUpgradeService));
diff --git a/catalog-ui/src/app/modules/view-model-module.ts b/catalog-ui/src/app/modules/view-model-module.ts
index de7d6d8a5d..b732be7eb0 100644
--- a/catalog-ui/src/app/modules/view-model-module.ts
+++ b/catalog-ui/src/app/modules/view-model-module.ts
@@ -67,8 +67,8 @@ import {ManagementWorkflowViewModel} from "../view-models/workspace/tabs/managem
 import {InterfaceOperationViewModel} from "../view-models/workspace/tabs/interface-operation/interface-operation-view-model";
 import {NetworkCallFlowViewModel} from "../view-models/workspace/tabs/network-call-flow/network-call-flow-view-model";
 import {DeploymentViewModel} from "../view-models/workspace/tabs/deployment/deployment-view-model";
-import {ResourceInputsViewModel} from "../view-models/workspace/tabs/inputs/resource-input/resource-inputs-view-model";
-import {ServiceInputsViewModel} from "../view-models/workspace/tabs/inputs/service-input/service-inputs-view-model";
+// import {ResourceInputsViewModel} from "../view-models/workspace/tabs/inputs/resource-input/resource-inputs-view-model";
+// import {ServiceInputsViewModel} from "../view-models/workspace/tabs/inputs/service-input/service-inputs-view-model";
 import {ReqAndCapabilitiesViewModel} from "../view-models/workspace/tabs/req-and-capabilities/req-and-capabilities-view-model";
 import {InputFormViewModel} from "../view-models/forms/input-form/input-form-view-modal";
 import {HierarchyViewModel} from "../view-models/tabs/hierarchy/hierarchy-view-model";
@@ -135,8 +135,8 @@ viewModelModule
   .controller(moduleName + '.InterfaceOperationViewModel', InterfaceOperationViewModel)
   .controller(moduleName + '.NetworkCallFlowViewModel', NetworkCallFlowViewModel)
   .controller(moduleName + '.DeploymentViewModel', DeploymentViewModel)
-  .controller(moduleName + '.ResourceInputsViewModel', ResourceInputsViewModel)
-  .controller(moduleName + '.ServiceInputsViewModel', ServiceInputsViewModel)
+  // .controller(moduleName + '.ResourceInputsViewModel', ResourceInputsViewModel)
+  // .controller(moduleName + '.ServiceInputsViewModel', ServiceInputsViewModel)
   .controller(moduleName + '.ReqAndCapabilitiesViewModel', ReqAndCapabilitiesViewModel)
   .controller(moduleName + '.InputFormViewModel', InputFormViewModel)
   .controller(moduleName + '.PluginsTabViewModel', PluginsTabViewModel)