[SDC-29] Amdocs OnBoard 1707 initial commit.

[sdc.git] / openecomp-ui / src / nfvo-components / panel / versionController / VersionControllerUtils.js

diff --git a/openecomp-ui/src/nfvo-components/panel/versionController/VersionControllerUtils.js b/openecomp-ui/src/nfvo-components/panel/versionController/VersionControllerUtils.js
index de99144..e8c12ab 100644 (file)
--- a/openecomp-ui/src/nfvo-components/panel/versionController/VersionControllerUtils.js
+++ b/openecomp-ui/src/nfvo-components/panel/versionController/VersionControllerUtils.js
@@ -1,23 +1,18 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
  * Copyright (C) 2017 AT&T Intellectual Property. 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
- * 
+ *
+ * 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.
- * ============LICENSE_END=========================================================
+ * 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 Configuration from 'sdc-app/config/Configuration.js';
 import {statusEnum} from './VersionControllerConstants.js';
 
@@ -25,24 +20,32 @@ import {statusEnum} from './VersionControllerConstants.js';
 const VersionControllerUtils = {
 
        getCheckOutStatusKindByUserID(status, lockingUser) {
-               let currentLoginUserID = Configuration.get('ATTUserID');
-               let isCheckedOut = currentLoginUserID === lockingUser;
+               let returnStatus;
+               let isCheckedOut;
+               let currentLoginUserID = Configuration.get('UserID');
+               if (lockingUser) {
+                       isCheckedOut = currentLoginUserID === lockingUser;
+                       returnStatus = isCheckedOut ? status : statusEnum.LOCK_STATUS;
+               } else {
+                       isCheckedOut = false;
+                       returnStatus = status;
+               }
 
                return {
-                       status: isCheckedOut ? status : statusEnum.LOCK_STATUS,
+                       status: returnStatus,
                        isCheckedOut
                };
        },
 
        isCheckedOutByCurrentUser(resource) {
-               let currentLoginUserID = Configuration.get('ATTUserID');
+               let currentLoginUserID = Configuration.get('UserID');
                return resource.lockingUser !== undefined && resource.lockingUser === currentLoginUserID;
        },
 
        isReadOnly(resource) {
                const {version, viewableVersions = []} = resource;
                const latestVersion = viewableVersions[viewableVersions.length - 1];
-               return version !== latestVersion || !VersionControllerUtils.isCheckedOutByCurrentUser(resource);
+               return version.id !== latestVersion.id || !VersionControllerUtils.isCheckedOutByCurrentUser(resource);
        }
 };