2 files changed, 24 insertions, 7 deletions
diff --git a/catalog-ui/src/app/models/componentsInstances/componentInstance.ts b/catalog-ui/src/app/models/componentsInstances/componentInstance.ts
index e91fcc9663..2e0c1a59c8 100644
--- a/catalog-ui/src/app/models/componentsInstances/componentInstance.ts
+++ b/catalog-ui/src/app/models/componentsInstances/componentInstance.ts
@@ -34,7 +34,6 @@ import {
 import {ResourceType, ComponentType} from "../../utils/constants";
 import {Capability} from "../capability";
 import {Requirement} from "../requirement";
-import {DirectivesEnum} from "../../ng2/components/logic/service-dependencies/directive-option";
 
 export interface IComponentInstance {
 
@@ -237,12 +236,8 @@ export class ComponentInstance implements IComponentInstance{
        return Array.isArray(this.directives) && this.directives.length > 0;
     }
 
-    public markAsSelect = () : void => {
-        this.directives.push(DirectivesEnum.SELECT);
-    }
-
-    public markAsSubstitute = () : void => {
-        this.directives.push(DirectivesEnum.SUBSTITUTE);
+    public setDirectiveValue = (selectedDirective: string) : void => {
+        this.directives.push(selectedDirective);
     }
 
     public unmarkAsDependent = (actualDirectiveValue: string) : void => {
diff --git a/catalog-ui/src/app/models/directives.ts b/catalog-ui/src/app/models/directives.ts
new file mode 100644
index 0000000000..5293e1f5df
--- /dev/null
+++ b/catalog-ui/src/app/models/directives.ts
@@ -0,0 +1,22 @@
+/*
+* ============LICENSE_START=======================================================
+*  Copyright (C) 2020 Nordix Foundation. 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.
+*
+*  SPDX-License-Identifier: Apache-2.0
+*  ============LICENSE_END=========================================================
+*/
+
+interface ListDirectiveResponse {
+  directives: string[];
+}