aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-ui/src/sdc-app/onboarding/onboard/workspace
diff options
context:
space:
mode:
authorsvishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>2018-07-02 14:05:17 +0300
committerEinav Keidar <einavw@amdocs.com>2018-07-03 07:44:48 +0000
commit8ae8f7eba59880eb81b985e98d87961e631013c7 (patch)
tree036a293b92bb8e45e4fef455cdde0f3c0fd8e0c4 /openecomp-ui/src/sdc-app/onboarding/onboard/workspace
parent4cc66168639fc4448023b73c9e42363823dd4788 (diff)
archive fix & archive/filter toggle removed
Issue-ID: SDC-1383 Change-Id: I38548e5e0b5cce224e0d1324a97f9edce6dc0cfb Signed-off-by: svishnev <shlomo-stanisla.vishnevetskiy@amdocs.com>
Diffstat (limited to 'openecomp-ui/src/sdc-app/onboarding/onboard/workspace')
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceView.jsx39
-rw-r--r--openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceViewWithFilter.jsx67
2 files changed, 24 insertions, 82 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceView.jsx b/openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceView.jsx
index 2f17867af1..bef88df14d 100644
--- a/openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceView.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceView.jsx
@@ -1,34 +1,35 @@
-/*!
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+/*
+ * Copyright © 2016-2018 European Support Limited
*
* 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
- *
+ *
+ * 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.
+ * 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.
*/
import React from 'react';
import DetailsCatalogView from '../DetailsCatalogView.jsx';
import i18n from 'nfvo-utils/i18n/i18n.js';
import { tabsMapping } from 'sdc-app/onboarding/onboard/OnboardConstants.js';
+import { tabsMapping as catalogTabsMappping } from '../onboardingCatalog/OnboardingCatalogConstants.js';
const WorkspaceView = props => {
let {
- licenseModelList,
- softwareProductList,
onAddLicenseModelClick,
users,
onAddSoftwareProductClick,
onSelectLicenseModel,
onSelectSoftwareProduct,
searchValue,
- onMigrate
+ onMigrate,
+ catalogActiveTab,
+ filteredItems: { vspList, vlmList }
} = props;
return (
@@ -37,11 +38,19 @@ const WorkspaceView = props => {
{i18n('WORKSPACE')}
</div>
<DetailsCatalogView
- VLMList={licenseModelList}
- VSPList={softwareProductList}
+ VLMList={vlmList}
+ VSPList={vspList}
users={users}
- onAddVLM={onAddLicenseModelClick}
- onAddVSP={onAddSoftwareProductClick}
+ onAddVLM={
+ catalogActiveTab === catalogTabsMappping.ACTIVE
+ ? onAddLicenseModelClick
+ : undefined
+ }
+ onAddVSP={
+ catalogActiveTab === catalogTabsMappping.ACTIVE
+ ? onAddSoftwareProductClick
+ : undefined
+ }
onSelectVLM={(item, users) =>
onSelectLicenseModel(item, users, tabsMapping.WORKSPACE)
}
diff --git a/openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceViewWithFilter.jsx b/openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceViewWithFilter.jsx
deleted file mode 100644
index bef88df14d..0000000000
--- a/openecomp-ui/src/sdc-app/onboarding/onboard/workspace/WorkspaceViewWithFilter.jsx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright © 2016-2018 European Support Limited
- *
- * 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.
- */
-import React from 'react';
-import DetailsCatalogView from '../DetailsCatalogView.jsx';
-import i18n from 'nfvo-utils/i18n/i18n.js';
-import { tabsMapping } from 'sdc-app/onboarding/onboard/OnboardConstants.js';
-import { tabsMapping as catalogTabsMappping } from '../onboardingCatalog/OnboardingCatalogConstants.js';
-
-const WorkspaceView = props => {
- let {
- onAddLicenseModelClick,
- users,
- onAddSoftwareProductClick,
- onSelectLicenseModel,
- onSelectSoftwareProduct,
- searchValue,
- onMigrate,
- catalogActiveTab,
- filteredItems: { vspList, vlmList }
- } = props;
-
- return (
- <div className="catalog-wrapper workspace-view">
- <div className="catalog-header workspace-header">
- {i18n('WORKSPACE')}
- </div>
- <DetailsCatalogView
- VLMList={vlmList}
- VSPList={vspList}
- users={users}
- onAddVLM={
- catalogActiveTab === catalogTabsMappping.ACTIVE
- ? onAddLicenseModelClick
- : undefined
- }
- onAddVSP={
- catalogActiveTab === catalogTabsMappping.ACTIVE
- ? onAddSoftwareProductClick
- : undefined
- }
- onSelectVLM={(item, users) =>
- onSelectLicenseModel(item, users, tabsMapping.WORKSPACE)
- }
- onSelectVSP={(item, users) =>
- onSelectSoftwareProduct(item, users, tabsMapping.WORKSPACE)
- }
- onMigrate={onMigrate}
- filter={searchValue}
- />
- </div>
- );
-};
-
-export default WorkspaceView;