From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 4 Mar 2018 14:53:33 +0200 Subject: Sync Integ to Master Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) --- catalog-ui/src/app/modules/directive-module.ts | 67 ++++++++++++++++++++++++-- catalog-ui/src/app/modules/service-module.ts | 10 +++- 2 files changed, 71 insertions(+), 6 deletions(-) (limited to 'catalog-ui/src/app/modules') diff --git a/catalog-ui/src/app/modules/directive-module.ts b/catalog-ui/src/app/modules/directive-module.ts index 4039a7683a..1babeefbdb 100644 --- a/catalog-ui/src/app/modules/directive-module.ts +++ b/catalog-ui/src/app/modules/directive-module.ts @@ -72,11 +72,12 @@ import {CompositionGraphGeneralUtils} from "../directives/graphs-v2/composition- import {CompositionGraphLinkUtils} from "../directives/graphs-v2/composition-graph/utils/composition-graph-links-utils"; import {DeploymentGraphGeneralUtils} from "../directives/graphs-v2/deployment-graph/deployment-utils/deployment-graph-general-utils"; import {CompositionGraphPaletteUtils} from "../directives/graphs-v2/composition-graph/utils/composition-graph-palette-utils"; +import {CompositionGraphZoneUtils} from "../directives/graphs-v2/composition-graph/utils/composition-graph-zone-utils"; import {MatchCapabilitiesRequirementsUtils} from "../directives/graphs-v2/composition-graph/utils/match-capability-requierment-utils"; -import {AssetPopoverDirective} from "../directives/graphs-v2/asset-popover/asset-popover"; -import {downgradeComponent} from "@angular/upgrade/static"; 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'; let moduleName:string = 'Sdc.Directives'; let directiveModule:ng.IModule = angular.module(moduleName, []); @@ -157,7 +158,10 @@ directiveModule.service('CompositionGraphNodesUtils', CompositionGraphNodesUtils directiveModule.service('CompositionGraphGeneralUtils', CompositionGraphGeneralUtils); directiveModule.service('CompositionGraphLinkUtils', CompositionGraphLinkUtils); directiveModule.service('CompositionGraphPaletteUtils', CompositionGraphPaletteUtils); +directiveModule.service('CompositionGraphZoneUtils', CompositionGraphZoneUtils); directiveModule.service('MatchCapabilitiesRequirementsUtils', MatchCapabilitiesRequirementsUtils); +directiveModule.service('ServicePathGraphUtils', ServicePathGraphUtils); + // // //Deployment Graph Utils directiveModule.service('DeploymentGraphGeneralUtils', DeploymentGraphGeneralUtils); @@ -169,15 +173,70 @@ directiveModule.directive('requirementsList', RequirementsListDirective.factory) // *** NG2 Components (downgraded) *** // -import {MenuListNg2Component} from "../ng2/components/downgrade-wrappers/menu-list-ng2/menu-list-ng2.component"; -import {TopNavComponent} from "../ng2/components/layout/top-nav/top-nav.component"; +import { downgradeComponent } from "@angular/upgrade/static"; +import { MenuListNg2Component } from "../ng2/components/downgrade-wrappers/menu-list-ng2/menu-list-ng2.component"; +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 { 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'; directiveModule.directive('menuListNg2', downgradeComponent({ component: MenuListNg2Component, inputs: ['props'] }) as angular.IDirectiveFactory); + directiveModule.directive('topNav', downgradeComponent({ component: TopNavComponent, inputs: ['version', 'menuModel', 'topLvlSelectedIndex', 'hideSearch', 'searchTerm', 'notificationIconCallback'], outputs: ['searchTermChange'] }) as ng.IDirectiveFactory); + +directiveModule.directive('ng2ZoneContainer', downgradeComponent({ + component: ZoneContainerComponent, + inputs: ['title', 'count', 'class', 'showZone', 'minifyZone'], + outputs: [] +}) as angular.IDirectiveFactory); + +directiveModule.directive('ng2ZoneInstance', downgradeComponent({ + component: ZoneInstanceComponent, + inputs: ['config', 'isActive', 'activeInstanceMode', 'defaultIconText'], + outputs: ['modeChange'] +}) as angular.IDirectiveFactory); + +directiveModule.directive('propertiesAssignment', downgradeComponent({ + component: PropertiesAssignmentComponent +}) as angular.IDirectiveFactory); + +directiveModule.directive('ng2SearchWithAutocomplete', downgradeComponent({ + component: SearchWithAutoCompleteComponent, + inputs: ['searchPlaceholder', 'searchBarClass', 'autoCompleteValues'], + 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: [], + outputs: [] +}) as angular.IDirectiveFactory); + +directiveModule.directive('ng2ServicePath', downgradeComponent({ + component: ServicePathComponent, + inputs: ['onCreate', 'service'], + outputs: [] +}) as angular.IDirectiveFactory); + +directiveModule.directive('ng2ServicePathSelector', downgradeComponent({ + component: ServicePathSelectorComponent, + inputs: ['drawPath', 'deletePaths', 'service', 'selectedPathId'], + outputs: [] +}) as angular.IDirectiveFactory); diff --git a/catalog-ui/src/app/modules/service-module.ts b/catalog-ui/src/app/modules/service-module.ts index 387332cae5..c934b630c8 100644 --- a/catalog-ui/src/app/modules/service-module.ts +++ b/catalog-ui/src/app/modules/service-module.ts @@ -7,9 +7,9 @@ * 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. @@ -48,11 +48,14 @@ import {downgradeInjectable} from "@angular/upgrade/static"; import {ModalService} from "../ng2/services/modal.service"; 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 {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"; let moduleName:string = 'Sdc.Services'; let serviceModule:ng.IModule = angular.module(moduleName, []); @@ -92,6 +95,7 @@ serviceModule.factory('Sdc.Services.CategoryResourceService', CategoryResourceSe // Angular2 upgraded services - This is in order to use the service in angular1 till we finish remove all angular1 code serviceModule.factory('ComponentServiceNg2', downgradeInjectable(ComponentServiceNg2)); +serviceModule.factory('ComponentServiceFactoryNg2', downgradeInjectable(ComponentServiceFactoryNg2)); serviceModule.factory('ServiceServiceNg2', downgradeInjectable(ServiceServiceNg2)); serviceModule.factory('ModalServiceNg2', downgradeInjectable(ModalService)); serviceModule.factory('ConnectionWizardServiceNg2', downgradeInjectable(ConnectionWizardService)); @@ -99,3 +103,5 @@ serviceModule.factory('ComponentInstanceServiceNg2', downgradeInjectable(Compone serviceModule.factory('UserServiceNg2', downgradeInjectable(UserServiceNg2)); serviceModule.factory('PluginsService', downgradeInjectable(PluginsService)); serviceModule.factory('EventBusService', downgradeInjectable(EventBusService)); +serviceModule.factory('PoliciesServiceNg2', downgradeInjectable(PoliciesServiceNg2)); +serviceModule.factory('DynamicComponentService', downgradeInjectable(DynamicComponentService)); -- cgit 1.2.3-korg