projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Styling of job list card for loads of data
[osm/UI.git]
/
skyquake
/
plugins
/
launchpad
/
src
/
ssh_keys
/
sshKeyStore.js
diff --git
a/skyquake/plugins/launchpad/src/ssh_keys/sshKeyStore.js
b/skyquake/plugins/launchpad/src/ssh_keys/sshKeyStore.js
index
400c096
..
c62a1b4
100644
(file)
--- a/
skyquake/plugins/launchpad/src/ssh_keys/sshKeyStore.js
+++ b/
skyquake/plugins/launchpad/src/ssh_keys/sshKeyStore.js
@@
-1,5
+1,5
@@
/*
/*
- *
+ *
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-20,7
+20,8
@@
import SshKeySource from './sshKeySource.js';
import GUID from 'utils/guid.js';
import AppHeaderActions from 'widgets/header/headerActions.js';
import Alt from '../alt';
import GUID from 'utils/guid.js';
import AppHeaderActions from 'widgets/header/headerActions.js';
import Alt from '../alt';
-import _ from 'lodash';
+import _cloneDeep from 'lodash/cloneDeep';
+import _merge from 'lodash/merge';
export default class SshKeyStore {
export default class SshKeyStore {
@@
-29,7
+30,7
@@
export default class SshKeyStore {
keys: [],
entities: {}
};
keys: [],
entities: {}
};
- this.dataCache = _
.
cloneDeep(this.data);
+ this.dataCache = _cloneDeep(this.data);
this.newKey = {
name: '',
key: ''
this.newKey = {
name: '',
key: ''
@@
-67,7
+68,7
@@
export default class SshKeyStore {
cancelEditSshKeyPair = (k) => {
let self = this;
return function(e) {
cancelEditSshKeyPair = (k) => {
let self = this;
return function(e) {
- let data = _
.
cloneDeep(self.data);
+ let data = _cloneDeep(self.data);
data.entities[k].key = self.dataCache.entities[k].key;
data.entities[k].isEditable = false;
self.setState({data:data});
data.entities[k].key = self.dataCache.entities[k].key;
data.entities[k].isEditable = false;
self.setState({data:data});
@@
-106,7
+107,7
@@
export default class SshKeyStore {
isEditable: false
};
this.setState({
isEditable: false
};
this.setState({
- dataCache: _
.
cloneDeep(keys),
+ dataCache: _cloneDeep(keys),
data: keys,
newKey: {
name: '',
data: keys,
newKey: {
name: '',
@@
-122,7
+123,7
@@
export default class SshKeyStore {
isEditable: false
};
this.setState({
isEditable: false
};
this.setState({
- dataCache: _
.
cloneDeep(keys),
+ dataCache: _cloneDeep(keys),
data: keys,
newKey: {
name: '',
data: keys,
newKey: {
name: '',
@@
-135,7
+136,7
@@
export default class SshKeyStore {
keys.keys.splice(keys.keys.indexOf(data.name), 1);
delete keys.entities[data.name];
this.setState({
keys.keys.splice(keys.keys.indexOf(data.name), 1);
delete keys.entities[data.name];
this.setState({
- dataCache: _
.
cloneDeep(keys),
+ dataCache: _cloneDeep(keys),
data: keys
})
}
data: keys
})
}
@@
-146,7
+147,7
@@
export default class SshKeyStore {
let flattened = this.flattenKeys(data);
this.setState({
data: flattened,
let flattened = this.flattenKeys(data);
this.setState({
data: flattened,
- dataCache: _
.
cloneDeep(flattened)
+ dataCache: _cloneDeep(flattened)
})
}
updateSshKeyPair = (k, field) => {
})
}
updateSshKeyPair = (k, field) => {
@@
-166,7
+167,7
@@
export default class SshKeyStore {
};
data && data.map(function(d){
fd.keys.push(d.name);
};
data && data.map(function(d){
fd.keys.push(d.name);
- fd.entities[d.name] = _
.
merge({isEditable: false}, d)
+ fd.entities[d.name] = _merge({isEditable: false}, d)
});
return fd;
}
});
return fd;
}
@@
-174,10
+175,8
@@
export default class SshKeyStore {
return {key: payload.key, name: payload.name};
}
validate(data) {
return {key: payload.key, name: payload.name};
}
validate(data) {
- for (let k in data) {
- if((data[k].trim() == '') || ((/[^\w _-]/).test(data[k]))) {
- return false;
- }
+ if((data['name'].trim() == '') || ((/[^\w _-]/).test(data['name']))) {
+ return false;
}
return true;
}
}
return true;
}