summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app/modules
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-ui/src/app/modules')
-rw-r--r--catalog-ui/src/app/modules/directive-module.ts188
-rw-r--r--catalog-ui/src/app/modules/service-module.ts136
-rw-r--r--catalog-ui/src/app/modules/view-model-module.ts86
3 files changed, 181 insertions, 229 deletions
diff --git a/catalog-ui/src/app/modules/directive-module.ts b/catalog-ui/src/app/modules/directive-module.ts
index 720d29f8ce..23dc3cff48 100644
--- a/catalog-ui/src/app/modules/directive-module.ts
+++ b/catalog-ui/src/app/modules/directive-module.ts
@@ -3,7 +3,6 @@
* SDC
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nokia. 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.
@@ -50,7 +49,10 @@ import {SelectTypeListDirective} from "../directives/select-property-types/selec
import {ValidationOnLoadDirective} from "../directives/utils/validation-on-load/validation-on-load";
import {InfoTooltipDirective} from "../directives/info-tooltip/info-tooltip";
import {SdcTabsDirective} from "../directives/sdc-tabs/sdc-tabs-directive";
-import {SdcSingleTabDirective, InnerSdcSingleTabDirective} from "../directives/sdc-tabs/sdc-single-tab/sdc-single-tab-directive";
+import {
+ SdcSingleTabDirective,
+ InnerSdcSingleTabDirective
+} from "../directives/sdc-tabs/sdc-single-tab/sdc-single-tab-directive";
import {ExpandCollapseListHeaderDirective} from "../directives/utils/expand-collapse-list-header/expand-collapse-list-header";
import {JsonExportExcelDirective} from "../directives/export-json-to-excel/export-json-to-excel";
import {TopProgressDirective} from "../directives/layout/top-progress/top-progress";
@@ -61,21 +63,8 @@ import {InputRowDirective} from "../directives/inputs-and-properties/inputs/inpu
import {PropertyRowDirective} from "../directives/inputs-and-properties/properties/property-row-directive";
import {NodesFactory} from "../models/graph/nodes/nodes-factory";
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 {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";
-import {CompositionGraphGeneralUtils} from "../directives/graphs-v2/composition-graph/utils/composition-graph-general-utils";
-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 {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 {PreventDoubleClickDirective} from "../directives/prevent-double-click/prevent-double-click";
let moduleName:string = 'Sdc.Directives';
@@ -139,31 +128,6 @@ directiveModule.directive('propertyRow', PropertyRowDirective.factory);
// //Util service for Graph
directiveModule.service('NodesFactory', NodesFactory);
directiveModule.service('LinksFactory', LinksFactory);
-directiveModule.service('ImageCreatorService', ImageCreatorService);
-//
-// //composition
-directiveModule.directive('palette', Palette.factory);
-directiveModule.directive('compositionGraph', CompositionGraph.factory);
-
-//
-// //deployment
-directiveModule.directive('deploymentGraph', DeploymentGraph.factory);
-//
-// //Graph Utils - Common
-directiveModule.service('CommonGraphUtils', CommonGraphUtils);
-//
-// //Composition Graph Utils
-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);
//Compoisiton right tab directives
@@ -172,24 +136,34 @@ directiveModule.directive('requirementsList', RequirementsListDirective.factory)
// *** NG2 Components (downgraded) *** //
-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 { CompositionPanelComponent } from 'app/ng2/pages/composition/panel/panel.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 { ServiceConsumptionComponent } from '../ng2/components/logic/service-consumption/service-consumption.component';
-import { ServiceDependenciesComponent } from '../ng2/components/logic/service-dependencies/service-dependencies.component';
-import { MultilineEllipsisComponent } from "../ng2/shared/multiline-ellipsis/multiline-ellipsis.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/pages/composition/graph/canvas-zone/zone-container.component";
+import {ZoneInstanceComponent} from "../ng2/pages/composition/graph/canvas-zone/zone-instance/zone-instance.component";
+import {CompositionPanelComponent} from 'app/ng2/pages/composition/panel/composition-panel.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/pages/composition/palette/palette-popup-panel/palette-popup-panel.component";
+import {ServicePathSelectorComponent} from '../ng2/pages/composition/graph/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";
-
+import {TileComponent} from "../ng2/components/ui/tile/tile.component";
+import {CompositionPageComponent} from "../ng2/pages/composition/composition-page.component";
+import {CatalogComponent} from "../ng2/pages/catalog/catalog.component";
+import {HomeComponent} from "../ng2/pages/home/home.component";
+import {PluginContextViewPageComponent} from "../ng2/pages/plugins/plugin-context-view/plugin-context-view.page.component";
+import {PluginTabViewPageComponent} from "../ng2/pages/plugins/plugin-tab-view/plugin-tab-view.page.component";
+import {CompositionGraphComponent} from "../ng2/pages/composition/graph/composition-graph.component";
+import {DeploymentPageComponent} from "../ng2/pages/workspace/deployment/deployment-page.component";
+import {ActivityLogComponent} from "../ng2/pages/workspace/activity-log/activity-log.component";
+import {ToscaArtifactPageComponent} from "../ng2/pages/workspace/tosca-artifacts/tosca-artifact-page.component";
+import {InformationArtifactPageComponent} from "../ng2/pages/workspace/information-artifact/information-artifact-page.component";
+import {AttributesComponent} from "../ng2/pages/workspace/attributes/attributes.component";
+import {DeploymentArtifactsPageComponent} from "../ng2/pages/workspace/deployment-artifacts/deployment-artifacts-page.component";
+import { ReqAndCapabilitiesComponent } from "../ng2/pages/workspace/req-and-capabilities/req-and-capabilities.component";
+import { DistributionComponent } from '../ng2/pages/workspace/disribution/distribution.component';
directiveModule.directive('menuListNg2', downgradeComponent({
component: MenuListNg2Component,
@@ -204,14 +178,14 @@ directiveModule.directive('topNav', downgradeComponent({
directiveModule.directive('ng2ZoneContainer', downgradeComponent({
component: ZoneContainerComponent,
- inputs: ['title', 'count', 'type', 'visible', 'minimized'],
+ inputs: ['title', 'count', 'type', 'visible', 'minimized'],
outputs: ['minimize', 'backgroundClick']
}) as angular.IDirectiveFactory);
directiveModule.directive('ng2ZoneInstance', downgradeComponent({
- component: ZoneInstanceComponent,
- inputs: ['zoneInstance', 'isActive', 'activeInstanceMode', 'defaultIconText', 'isViewOnly', 'hidden', 'forceSave'],
- outputs: ['modeChange', 'tagHandleClick', 'assignmentSaveStart', 'assignmentSaveComplete']
+ component: ZoneInstanceComponent,
+ inputs: ['zoneInstance', 'isActive', 'activeInstanceMode', 'defaultIconText', 'isViewOnly', 'hidden', 'forceSave'],
+ outputs: ['modeChange', 'tagHandleClick', 'assignmentSaveStart', 'assignmentSaveComplete']
}) as angular.IDirectiveFactory);
directiveModule.directive('ng2CompositionPanel', downgradeComponent({
@@ -223,6 +197,26 @@ directiveModule.directive('propertiesAssignment', downgradeComponent({
component: PropertiesAssignmentComponent
}) as angular.IDirectiveFactory);
+directiveModule.directive('compositionPage', downgradeComponent({
+ component: CompositionPageComponent
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('activityLog', downgradeComponent({
+ component: ActivityLogComponent
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('distribution', downgradeComponent({
+ component: DistributionComponent
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('attributes', downgradeComponent({
+ component: AttributesComponent
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('reqAndCapabilities', downgradeComponent({
+ component: ReqAndCapabilitiesComponent
+}) as angular.IDirectiveFactory);
+
directiveModule.directive('ng2SearchWithAutocomplete', downgradeComponent({
component: SearchWithAutoCompleteComponent,
inputs: ['searchPlaceholder', 'searchBarClass', 'autoCompleteValues'],
@@ -235,31 +229,13 @@ directiveModule.directive('ng2PalettePopupPanel', downgradeComponent({
outputs: []
}) as angular.IDirectiveFactory);
-directiveModule.directive('ng2ServicePath', downgradeComponent({
- component: ServicePathComponent,
- inputs: ['onCreate', 'service', 'isViewOnly'],
- outputs: []
-}) as angular.IDirectiveFactory);
-
directiveModule.directive('ng2ServicePathSelector', downgradeComponent({
component: ServicePathSelectorComponent,
inputs: ['drawPath', 'deletePaths', 'service', 'selectedPathId'],
outputs: []
}) as angular.IDirectiveFactory);
-directiveModule.directive('ng2ServiceConsumption', downgradeComponent({
- component: ServiceConsumptionComponent,
- inputs: ['parentService', 'selectedService', 'selectedServiceInstanceId', 'instancesMappedList', 'parentServiceInputs', 'instancesCapabilitiesMap', 'readonly'],
- outputs: []
-}) as angular.IDirectiveFactory);
-
-directiveModule.directive('ng2ServiceDependencies', downgradeComponent({
- component: ServiceDependenciesComponent,
- inputs: ['compositeService', 'currentServiceInstance', 'selectedInstanceProperties', 'selectedInstanceSiblings', 'selectedInstanceConstraints', 'readonly'],
- outputs: ['updateRulesListEvent', 'loadRulesListEvent','dependencyStatus']
-}) as angular.IDirectiveFactory);
-
-directiveModule.directive('interfaceOperation', downgradeComponent({
+directiveModule.directive('ng2InterfaceOperation', downgradeComponent({
component: InterfaceOperationComponent,
inputs: ['component', 'readonly'],
outputs: []
@@ -277,8 +253,60 @@ directiveModule.directive('ng2UiTile', downgradeComponent({
outputs: ['onTileClick']
}) as angular.IDirectiveFactory);
-directiveModule.directive('pluginFrame', downgradeComponent( {
+directiveModule.directive('pluginFrame', downgradeComponent({
component: PluginFrameComponent,
inputs: ['plugin', 'queryParams'],
outputs: ['onLoadingDone']
}) as angular.IDirectiveFactory);
+
+directiveModule.directive('catalogPage', downgradeComponent({
+ component: CatalogComponent,
+ inputs: [],
+ outputs: []
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('homePage', downgradeComponent({
+ component: HomeComponent,
+ inputs: [],
+ outputs: []
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('pluginContextView', downgradeComponent({
+ component: PluginContextViewPageComponent,
+ inputs: [],
+ outputs: []
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('pluginTabView', downgradeComponent({
+ component: PluginTabViewPageComponent,
+ inputs: [],
+ outputs: []
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('compositionGraph', downgradeComponent({
+ component: CompositionGraphComponent,
+ inputs: ['topologyTemplate', 'isViewOnly'],
+ outputs: []
+}) as angular.IDirectiveFactory);
+directiveModule.directive('toscaArtifactPage', downgradeComponent({
+ component: ToscaArtifactPageComponent,
+ inputs: [],
+ outputs: []
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('deploymentPage', downgradeComponent({
+ component: DeploymentPageComponent,
+ inputs: [],
+ outputs: []
+}) as angular.IDirectiveFactory);
+
+directiveModule.directive('informationArtifactPage', downgradeComponent({
+ component: InformationArtifactPageComponent,
+ inputs: [],
+ outputs: []
+}) as angular.IDirectiveFactory);
+directiveModule.directive('deploymentArtifactPage', downgradeComponent({
+ component: DeploymentArtifactsPageComponent,
+ inputs: [],
+ outputs: []
+}) as angular.IDirectiveFactory); \ No newline at end of file
diff --git a/catalog-ui/src/app/modules/service-module.ts b/catalog-ui/src/app/modules/service-module.ts
index 7240682ae9..e2f4f1654a 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.
@@ -18,104 +18,112 @@
* ============LICENSE_END=========================================================
*/
-import {ConfigurationUiService} from "../services/configuration-ui-service";
-import {CookieService} from "../services/cookie-service";
-import {EntityService} from "../services/entity-service";
-import {AvailableIconsService} from "../services/available-icons-service";
-import {UrlToBase64Service} from "../services/url-tobase64-service";
-import {CacheService} from "../services/cache-service";
-import {HeaderInterceptor} from "../services/header-interceptor";
-import {HttpErrorInterceptor} from "../services/http-error-interceptor";
-import {SharingService} from "../services/sharing-service";
-import {SdcVersionService} from "../services/sdc-version-service";
-import {ActivityLogService} from "../services/activity-log-service";
-import {OnboardingService} from "../services/onboarding-service";
-import {EcompHeaderService} from "../services/ecomp-service";
-import {DataTypesService} from "../services/data-types-service";
-import {ComponentService} from "../services/components/component-service";
-import {ServiceService} from "../services/components/service-service";
-import {ResourceService} from "../services/components/resource-service";
-import {LeftPaletteLoaderService} from "../services/components/utils/composition-left-palette-service";
-import {EventListenerService} from "../services/event-listener-service";
-import {ProgressService} from "../services/progress-service";
-import {ArtifactsUtils} from "../utils/artifacts-utils";
-import {FileUtils} from "../utils/file-utils";
-import {ValidationUtils} from "../utils/validation-utils";
-import {AngularJSBridge} from "../services/angular-js-bridge-service";
-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 {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 { downgradeInjectable } from '@angular/upgrade/static';
+import { CompositionService } from 'app/ng2/pages/composition/composition.service';
+import { CatalogService } from 'app/ng2/services/catalog.service';
+import { TopologyTemplateService } from 'app/ng2/services/component-services/topology-template.service';
+import { DynamicComponentService } from 'app/ng2/services/dynamic-component.service';
import {GabService as GabServiceNg2} from "app/ng2/services/gab.service";
-import {ComponentFactory} from "app/utils/component-factory";
-import {ToscaTypesServiceNg2} from "app/ng2/services/tosca-types.service";
+import { ComponentFactory } from 'app/utils/component-factory';
+import { SdcUiServices } from 'onap-ui-angular';
+import { NodesFactory } from '../models/graph/nodes/nodes-factory';
+import { ImportVSPService } from '../ng2/components/modals/onboarding-modal/import-vsp.service';
+import { AutomatedUpgradeService } from '../ng2/pages/automated-upgrade/automated-upgrade.service';
+import { ConnectionWizardService } from '../ng2/pages/composition/graph/connection-wizard/connection-wizard.service';
+import { WorkspaceNg1BridgeService } from '../ng2/pages/workspace/workspace-ng1-bridge-service';
+import { WorkspaceService } from '../ng2/pages/workspace/workspace.service';
+import { AuthenticationService as AuthenticationServiceNg2 } from '../ng2/services/authentication.service';
+import { CacheService } from '../ng2/services/cache.service';
+import { ComponentInstanceServiceNg2 } from '../ng2/services/component-instance-services/component-instance.service';
+import { ComponentServiceNg2 } from '../ng2/services/component-services/component.service';
+import { ComponentServiceFactoryNg2 } from '../ng2/services/component-services/component.service.factory';
+import { ServiceServiceNg2 } from '../ng2/services/component-services/service.service';
+import { EventBusService } from '../ng2/services/event-bus.service';
+import { GroupsService as GroupsServiceNg2 } from '../ng2/services/groups.service';
+import { HomeService } from '../ng2/services/home.service';
+import { ModalService } from '../ng2/services/modal.service';
+import { OnboardingService } from '../ng2/services/onboarding.service';
+import { PluginsService } from '../ng2/services/plugins.service';
+import { PoliciesService as PoliciesServiceNg2 } from '../ng2/services/policies.service';
+import { SharingService } from '../ng2/services/sharing.service';
+import { ToscaTypesServiceNg2 } from '../ng2/services/tosca-types.service';
+import { UserService as UserServiceNg2 } from '../ng2/services/user.service';
+import { AngularJSBridge } from '../services/angular-js-bridge-service';
+import { AvailableIconsService } from '../services/available-icons-service';
+import { CategoryResourceService } from '../services/category-resource-service';
+import { ComponentService } from '../services/components/component-service';
+import { ResourceService } from '../services/components/resource-service';
+import { ServiceService } from '../services/components/service-service';
+import { LeftPaletteLoaderService } from '../services/components/utils/composition-left-palette-service';
+import { ConfigurationUiService } from '../services/configuration-ui-service';
+import { CookieService } from '../services/cookie-service';
+import { DataTypesService } from '../services/data-types-service';
+import { EcompHeaderService } from '../services/ecomp-service';
+import { EventListenerService } from '../services/event-listener-service';
+import { HeaderInterceptor } from '../services/header-interceptor';
+import { LoaderService } from '../services/loader-service';
+import { ProgressService } from '../services/progress-service';
+import { SdcVersionService } from '../services/sdc-version-service';
+import { UrlToBase64Service } from '../services/url-tobase64-service';
+import { FileUtils } from '../utils/file-utils';
+import { ValidationUtils } from '../utils/validation-utils';
+import {ReqAndCapabilitiesService} from "../ng2/pages/workspace/req-and-capabilities/req-and-capabilities.service";
-let moduleName:string = 'Sdc.Services';
-let serviceModule:ng.IModule = angular.module(moduleName, []);
+const moduleName: string = 'Sdc.Services';
+const 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);
-serviceModule.service('Sdc.Services.CacheService', CacheService);
serviceModule.service('Sdc.Services.HeaderInterceptor', HeaderInterceptor);
-serviceModule.service('Sdc.Services.HttpErrorInterceptor', HttpErrorInterceptor);
-serviceModule.service('Sdc.Services.SharingService', SharingService);
serviceModule.service('Sdc.Services.SdcVersionService', SdcVersionService);
-serviceModule.service('Sdc.Services.ActivityLogService', ActivityLogService);
-serviceModule.service('Sdc.Services.OnboardingService', OnboardingService);
serviceModule.service('Sdc.Services.EcompHeaderService', EcompHeaderService);
serviceModule.service('Sdc.Services.DataTypesService', DataTypesService);
-//Components Services
+// Components Services
serviceModule.service('Sdc.Services.Components.ComponentService', ComponentService);
-serviceModule.service('Sdc.Services.Components.ServiceService',ServiceService);
+serviceModule.service('Sdc.Services.Components.ServiceService', ServiceService);
serviceModule.service('Sdc.Services.Components.ResourceService', ResourceService);
serviceModule.service('LeftPaletteLoaderService', LeftPaletteLoaderService);
-serviceModule.service('EventListenerService', EventListenerService);
serviceModule.service('Sdc.Services.ProgressService', ProgressService);
-//Utils
-serviceModule.service('ArtifactsUtils', ArtifactsUtils);
+// Utils
serviceModule.service('FileUtils', FileUtils);
serviceModule.service('ValidationUtils', ValidationUtils);
-
-serviceModule.service('AngularJSBridge',AngularJSBridge);
+serviceModule.service('AngularJSBridge', AngularJSBridge);
serviceModule.service('LoaderService', LoaderService);
-
serviceModule.factory('Sdc.Services.CategoryResourceService', CategoryResourceService.getResource);
// Angular2 upgraded services - This is in order to use the service in angular1 till we finish remove all angular1 code
+serviceModule.service('Sdc.Services.SharingService', downgradeInjectable(SharingService));
+serviceModule.service('Sdc.Services.CacheService', downgradeInjectable(CacheService));
serviceModule.factory('ComponentServiceNg2', downgradeInjectable(ComponentServiceNg2));
+serviceModule.factory('TopologyTemplateService', downgradeInjectable(TopologyTemplateService));
+serviceModule.factory('WorkspaceNg1BridgeService', downgradeInjectable(WorkspaceNg1BridgeService));
+serviceModule.factory('workspaceService', downgradeInjectable(WorkspaceService));
serviceModule.factory('ComponentServiceFactoryNg2', downgradeInjectable(ComponentServiceFactoryNg2));
serviceModule.factory('ServiceServiceNg2', downgradeInjectable(ServiceServiceNg2));
serviceModule.factory('ModalServiceNg2', downgradeInjectable(ModalService));
-serviceModule.factory('ModalServiceSdcUI', downgradeInjectable(SdcUiComponents.ModalService));
+serviceModule.factory('ModalServiceSdcUI', downgradeInjectable(SdcUiServices.ModalService));
serviceModule.factory('ConnectionWizardServiceNg2', downgradeInjectable(ConnectionWizardService));
serviceModule.factory('ComponentInstanceServiceNg2', downgradeInjectable(ComponentInstanceServiceNg2));
serviceModule.factory('UserServiceNg2', downgradeInjectable(UserServiceNg2));
+serviceModule.factory('AuthenticationServiceNg2', downgradeInjectable(AuthenticationServiceNg2));
serviceModule.factory('PoliciesServiceNg2', downgradeInjectable(PoliciesServiceNg2));
serviceModule.factory('GroupsServiceNg2', downgradeInjectable(GroupsServiceNg2));
serviceModule.factory('PluginsService', downgradeInjectable(PluginsService));
serviceModule.factory('EventBusService', downgradeInjectable(EventBusService));
serviceModule.factory('DynamicComponentService', downgradeInjectable(DynamicComponentService));
-serviceModule.factory('ArchiveServiceNg2', downgradeInjectable(ArchiveServiceNg2));
+serviceModule.factory('HomeService', downgradeInjectable(HomeService));
+serviceModule.factory('CatalogService', downgradeInjectable(CatalogService));
serviceModule.factory('GabServiceNg2', downgradeInjectable(GabServiceNg2));
serviceModule.factory('AutomatedUpgradeService', downgradeInjectable(AutomatedUpgradeService));
serviceModule.factory('ToscaTypesServiceNg2', downgradeInjectable(ToscaTypesServiceNg2));
+serviceModule.factory('EventListenerService', downgradeInjectable(EventListenerService));
+serviceModule.factory('CompositionService', downgradeInjectable(CompositionService));
+serviceModule.factory('ReqAndCapabilitiesService', downgradeInjectable(ReqAndCapabilitiesService));
+serviceModule.factory('NodesFactory', downgradeInjectable(NodesFactory));
+serviceModule.service('OnboardingService', downgradeInjectable(OnboardingService));
+serviceModule.service('ImportVSPService', downgradeInjectable(ImportVSPService));
diff --git a/catalog-ui/src/app/modules/view-model-module.ts b/catalog-ui/src/app/modules/view-model-module.ts
index c633201673..5b8fc5944a 100644
--- a/catalog-ui/src/app/modules/view-model-module.ts
+++ b/catalog-ui/src/app/modules/view-model-module.ts
@@ -3,7 +3,6 @@
* SDC
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nokia. 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.
@@ -20,127 +19,44 @@
*/
import {AddCategoryModalViewModel} from "../view-models/admin-dashboard/add-category-modal/add-category-modal-view-model";
-import {DashboardViewModel} from "../view-models/dashboard/dashboard-view-model";
import {WorkspaceViewModel} from "../view-models/workspace/workspace-view-model";
-import {CompositionViewModel} from "../view-models/workspace/tabs/composition/composition-view-model";
-import {DetailsViewModel} from "../view-models/workspace/tabs/composition/tabs/details/details-view-model";
-import {ResourceArtifactsViewModel} from "../view-models/workspace/tabs/composition/tabs/artifacts/artifacts-view-model";
-import {ServiceConsumptionViewModel} from "../view-models/workspace/tabs/composition/tabs/service-consumption/service-consumption-view-model";
-import {ServiceDependenciesViewModel} from "../view-models/workspace/tabs/composition/tabs/service-dependencies/service-dependencies-view-model";
import {PropertyFormBaseView} from "../view-models/forms/property-forms/base-property-form/property-form-base-model";
import {PropertyFormViewModel} from "../view-models/forms/property-forms/component-property-form/property-form-view-model";
import {ModulePropertyView} from "../view-models/forms/property-forms/module-property-modal/module-property-model";
-import {ArtifactResourceFormViewModel} from "../view-models/forms/artifact-form/artifact-form-view-model";
import {SelectDataTypeViewModel} from "../view-models/forms/property-forms/select-datatype-modal/select-datatype-modal-view-model";
-import {AttributeFormViewModel} from "../view-models/forms/attribute-form/attribute-from-view-model";
-import {ResourcePropertiesViewModel} from "../view-models/workspace/tabs/composition/tabs/properties-and-attributes/properties-view-model";
-import {CatalogViewModel} from "../view-models/catalog/catalog-view-model";
import {OnboardVendorViewModel} from "../view-models/onboard-vendor/onboard-vendor-view-model";
-import {DistributionViewModel} from "../view-models/workspace/tabs/distribution/distribution-view-model";
-import {SupportViewModel} from "../view-models/support/support-view-model";
-import {ConfirmationModalViewModel} from "../view-models/modals/confirmation-modal/confirmation-modal-view-model";
-import {EmailModalViewModel} from "../view-models/modals/email-modal/email-modal-view-model";
-import {MessageModalViewModel} from "../view-models/modals/message-modal/message-base-modal-model";
-import {ServerMessageModalViewModel} from "../view-models/modals/message-modal/message-server-modal/server-message-modal-view-model";
-import {ClientMessageModalViewModel} from "../view-models/modals/message-modal/message-client-modal/client-message-modal-view-model";
import {ErrorViewModel} from "../view-models/modals/error-modal/error-view-model";
-import {RelationsViewModel} from "../view-models/workspace/tabs/composition/tabs/relations/relations-view-model";
-import {ResourceInstanceNameViewModel} from "../view-models/forms/resource-instance-name-form/resource-instance-name-model";
-import {WelcomeViewModel} from "../view-models/welcome/welcome-view";
-import {PreLoadingViewModel} from "../view-models/preloading/preloading-view";
-import {TutorialEndViewModel} from "../view-models/tutorial-end/tutorial-end";
import {AdminDashboardViewModel} from "../view-models/admin-dashboard/admin-dashboard-view-model";
-import {EnvParametersFormViewModel} from "../view-models/forms/env-parameters-form/env-parameters-form";
-import {StructureViewModel} from "../view-models/workspace/tabs/composition/tabs/structure/structure-view";
import {UserManagementViewModel} from "../view-models/admin-dashboard/user-management/user-management-view-model";
import {CategoryManagementViewModel} from "../view-models/admin-dashboard/category-management/category-management-view-model";
-
-import {OnboardingModalViewModel} from "../view-models/modals/onboarding-modal/onboarding-modal-view-model";
-import {DistributionStatusModalViewModel} from "../view-models/workspace/tabs/distribution/disribution-status-modal/disribution-status-modal-view-model";
import {DcaeAppViewModel} from "../view-models/dcae-app/dcae-app-view-model";
import {GeneralViewModel} from "../view-models/workspace/tabs/general/general-view-model";
import {IconsModalViewModel} from "../view-models/modals/icons-modal/icons-modal-view";
-import {DeploymentArtifactsViewModel} from "../view-models/workspace/tabs/deployment-artifacts/deployment-artifacts-view-model";
-import {InformationArtifactsViewModel} from "../view-models/workspace/tabs/information-artifacts/information-artifacts-view-model";
-import {ToscaArtifactsViewModel} from "../view-models/workspace/tabs/tosca-artifacts/tosca-artifacts-view-model";
import {PropertiesViewModel} from "../view-models/workspace/tabs/properties/properties-view-model";
-import {AttributesViewModel} from "../view-models/workspace/tabs/attributes/attributes-view-model";
-import {ActivityLogViewModel} from "../view-models/workspace/tabs/activity-log/activity-log";
import {ManagementWorkflowViewModel} from "../view-models/workspace/tabs/management-workflow/management-workflow-view-model";
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 {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";
-import {ConformanceLevelModalViewModel} from "../view-models/modals/conformance-level-modal/conformance-level-modal-view-model";
-import {PluginsTabViewModel} from "../view-models/plugins/plugins-tab-view-model";
-import {PluginsContextViewModel} from "../view-models/workspace/tabs/plugins/plugins-context-view-model";
let moduleName:string = 'Sdc.ViewModels';
let viewModelModule:ng.IModule = angular.module(moduleName, []);
viewModelModule
- .controller(moduleName + '.DashboardViewModel', DashboardViewModel)
-
- .controller(moduleName + '.DetailsViewModel', DetailsViewModel)
- .controller(moduleName + '.ResourceArtifactsViewModel', ResourceArtifactsViewModel)
- .controller(moduleName + '.ServiceConsumptionViewModel', ServiceConsumptionViewModel)
- .controller(moduleName + '.ServiceDependenciesViewModel', ServiceDependenciesViewModel)
.controller(moduleName + '.PropertyFormBaseView', PropertyFormBaseView)
.controller(moduleName + '.PropertyFormViewModel', PropertyFormViewModel)
.controller(moduleName + '.ModulePropertyView', ModulePropertyView)
.controller(moduleName + '.SelectDataTypeViewModel', SelectDataTypeViewModel)
- .controller(moduleName + '.ArtifactResourceFormViewModel', ArtifactResourceFormViewModel)
- .controller(moduleName + '.AttributeFormViewModel', AttributeFormViewModel)
- .controller(moduleName + '.ResourcePropertiesViewModel', ResourcePropertiesViewModel)
- .controller(moduleName + '.CatalogViewModel', CatalogViewModel)
.controller(moduleName + '.OnboardVendorViewModel', OnboardVendorViewModel)
- .controller(moduleName + '.DistributionViewModel', DistributionViewModel)
- .controller(moduleName + '.SupportViewModel', SupportViewModel)
- .controller(moduleName + '.ConfirmationModalViewModel', ConfirmationModalViewModel)
- .controller(moduleName + '.EmailModalViewModel', EmailModalViewModel)
- .controller(moduleName + '.MessageModalViewModel', MessageModalViewModel)
- .controller(moduleName + '.ServerMessageModalViewModel', ServerMessageModalViewModel)
- .controller(moduleName + '.ClientMessageModalViewModel', ClientMessageModalViewModel)
.controller(moduleName + '.ErrorViewModel', ErrorViewModel)
- .controller(moduleName + '.RelationsViewModel', RelationsViewModel)
- .controller(moduleName + '.ResourceInstanceNameViewModel', ResourceInstanceNameViewModel)
- .controller(moduleName + '.WelcomeViewModel', WelcomeViewModel)
- .controller(moduleName + '.PreLoadingViewModel', PreLoadingViewModel)
- .controller(moduleName + '.TutorialEndViewModel', TutorialEndViewModel)
.controller(moduleName + '.AdminDashboardViewModel', AdminDashboardViewModel)
- .controller(moduleName + '.EnvParametersFormViewModel', EnvParametersFormViewModel)
- .controller(moduleName + '.StructureViewModel', StructureViewModel)
.controller(moduleName + '.AddCategoryModalViewModel', AddCategoryModalViewModel)
.controller(moduleName + '.UserManagementViewModel', UserManagementViewModel)
.controller(moduleName + '.CategoryManagementViewModel', CategoryManagementViewModel)
- .controller(moduleName + '.OnboardingModalViewModel', OnboardingModalViewModel)
.controller(moduleName + '.IconsModalViewModel', IconsModalViewModel)
- .controller(moduleName + '.DistributionStatusModalViewModel', DistributionStatusModalViewModel)
.controller(moduleName + '.DcaeAppViewModel', DcaeAppViewModel)
//
// //NEW
.controller(moduleName + '.WorkspaceViewModel', WorkspaceViewModel)
- .controller(moduleName + '.ConformanceLevelModalViewModel', ConformanceLevelModalViewModel)
- .controller(moduleName + '.CompositionViewModel', CompositionViewModel)
.controller(moduleName + '.GeneralViewModel', GeneralViewModel)
- .controller(moduleName + '.DeploymentArtifactsViewModel', DeploymentArtifactsViewModel)
- .controller(moduleName + '.InformationArtifactsViewModel', InformationArtifactsViewModel)
- .controller(moduleName + '.ToscaArtifactsViewModel', ToscaArtifactsViewModel)
.controller(moduleName + '.PropertiesViewModel', PropertiesViewModel)
- .controller(moduleName + '.AttributesViewModel', AttributesViewModel)
- .controller(moduleName + '.ActivityLogViewModel', ActivityLogViewModel)
.controller(moduleName + '.ManagementWorkflowViewModel', ManagementWorkflowViewModel)
.controller(moduleName + '.InterfaceOperationViewModel', InterfaceOperationViewModel)
- .controller(moduleName + '.NetworkCallFlowViewModel', NetworkCallFlowViewModel)
- .controller(moduleName + '.DeploymentViewModel', DeploymentViewModel)
- .controller(moduleName + '.ReqAndCapabilitiesViewModel', ReqAndCapabilitiesViewModel)
- .controller(moduleName + '.InputFormViewModel', InputFormViewModel)
- .controller(moduleName + '.PluginsTabViewModel', PluginsTabViewModel)
- .controller(moduleName + '.PluginsContextViewModel', PluginsContextViewModel)
- //
- // //TABS
- .controller(moduleName + '.HierarchyViewModel', HierarchyViewModel);
-
-// NG2
-//.controller(moduleName + '.NG2Example', downgradeComponent({component: NG2Example2Component}) );
+ .controller(moduleName + '.NetworkCallFlowViewModel', NetworkCallFlowViewModel);