conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
const { linkTitle, linkTarget, linkTargetOption } = this.state;
onChange('add', linkTitle, linkTarget, linkTargetOption);
=======
const { linkTitle, linkTarget } = this.state;
onChange('link', linkTitle, linkTarget);
>>>>>>>
const { linkTitle, linkTarget, linkTargetOption } = this.state;
onChange('link', linkTitle, linkTarget, linkTargetOption); |
<<<<<<<
=======
import classNames from 'classnames';
>>>>>>>
<<<<<<<
=======
stopPropagation: Function = (event: Object): void => {
event.preventDefault();
event.stopPropagation();
};
renderModal: Function = (): Object => {
const { config: { popupClassName, colors }, translations } = this.props;
const { currentColor, currentBgColor, currentStyle } = this.state;
const currentSelectedColor = (currentStyle === 'color') ? currentColor : currentBgColor;
return (
<div
className={classNames('rdw-colorpicker-modal', popupClassName)}
onClick={this.stopPropagation}
>
<span className="rdw-colorpicker-modal-header">
<span
className={classNames(
'rdw-colorpicker-modal-style-label',
{ 'rdw-colorpicker-modal-style-label-active': currentStyle === 'color' }
)}
onClick={this.setCurrentStyleColor}
>
{translations['components.controls.colorpicker.text']}
</span>
<span
className={classNames(
'rdw-colorpicker-modal-style-label',
{ 'rdw-colorpicker-modal-style-label-active': currentStyle === 'bgcolor' }
)}
onClick={this.setCurrentStyleBgcolor}
>
{translations['components.controls.colorpicker.background']}
</span>
</span>
<span className="rdw-colorpicker-modal-options">
{
colors.map((color, index) =>
<Option
value={color}
key={index}
className="rdw-colorpicker-option"
activeClassName="rdw-colorpicker-option-active"
active={currentSelectedColor === `${currentStyle}-${color}`}
onClick={this.toggleColor}
>
<span
style={{ backgroundColor: color }}
className="rdw-colorpicker-cube"
/>
</Option>)
}
</span>
</div>
);
};
>>>>>>> |
<<<<<<<
grunt.registerTask("test", function() {
var eachfile = Array.prototype.slice.apply(arguments);
if(eachfile.length) {
eachfile = eachfile.map(function(v, i, a) {
return "test/" + v + ".test.html";
}, this);
} else {
eachfile.push("test/*.test.html");
}
grunt.config.set("qunit.each", eachfile);
grunt.log.oklns(grunt.config.get("qunit.each"));
grunt.task.run("qunit:each");
});
=======
>>>>>>>
grunt.registerTask("test", function() {
var eachfile = Array.prototype.slice.apply(arguments);
if(eachfile.length) {
eachfile = eachfile.map(function(v, i, a) {
return "test/" + v + ".test.html";
}, this);
} else {
eachfile.push("test/*.test.html");
}
grunt.config.set("qunit.each", eachfile);
grunt.log.oklns(grunt.config.get("qunit.each"));
grunt.task.run("qunit:each");
});
<<<<<<<
grunt.registerTask("build", ["jshint", "concat", "uglify", "copy:lib", "jsdoc"]);
=======
grunt.registerTask("test", ["jshint", "qunit"]);
grunt.registerTask("build", ["concat", "uglify", "copy:lib", "docBuild"]);
>>>>>>>
grunt.registerTask("build", ["concat", "uglify", "copy:lib", "docBuild"]); |
<<<<<<<
import zh_tw from './zh_tw';
=======
import pl from './pl';
>>>>>>>
import zh_tw from './zh_tw';
import pl from './pl';
<<<<<<<
da,
zh_tw,
=======
da,
pl
>>>>>>>
da,
zh_tw,
pl |
<<<<<<<
var CLIENT_ACCESS = {};
=======
var USERS = {};
USERS['[email protected]'] = {
email: '[email protected]',
password: '123456',
subscriber: true
};
function cookieJoin(req, clientAuth) {
//retrieve the cookie. If it's not null, add a reference to the user on CLIENT_ACCESS[readerId]
var email = req.cookies.email;
console.log("email: " + email);
if (email && USERS[email]) {
clientAuth.user = USERS[email];
}
}
function getOrCreateClientAuth(readerId) {
var clientAuth = CLIENT_ACCESS[readerId];
if (!clientAuth) {
clientAuth = {
viewedUrls: {}
};
CLIENT_ACCESS[readerId] = clientAuth;
}
return clientAuth;
}
app.get('/c/test.html', function(req, res) {
host = req.get('host')
protocol = host.startsWith('localhost') ? 'http' : 'https';
res.locals = { 'host': protocol + '://' + req.get('host') }
res.render('index', {
});
});
>>>>>>>
var CLIENT_ACCESS = {};
var USERS = {};
USERS['[email protected]'] = {
email: '[email protected]',
password: '123456',
subscriber: true
};
function cookieJoin(req, clientAuth) {
//retrieve the cookie. If it's not null, add a reference to the user on CLIENT_ACCESS[readerId]
var email = req.cookies.email;
console.log("email: " + email);
if (email && USERS[email]) {
clientAuth.user = USERS[email];
}
}
function getOrCreateClientAuth(readerId) {
var clientAuth = CLIENT_ACCESS[readerId];
if (!clientAuth) {
clientAuth = {
viewedUrls: {}
};
CLIENT_ACCESS[readerId] = clientAuth;
}
return clientAuth;
} |
<<<<<<<
if(type == 'requestUsername') {
var username = this.refs.username.getDOMNode().value;
var privateDefaultKey = this.refs.defaultKey.getDOMNode().value;
var privateAdminKey = this.refs.adminKey.getDOMNode().value;
var privateRootKey = this.refs.rootKey.getDOMNode().value;
var keys = Puffball.buildKeyObject(privateDefaultKey, privateAdminKey, privateRootKey);
// PuffUsers.requestUsername(username, keys)
return events.pub('ui/puff-packer/request-username', {});
}
if(type == 'generateUsername') {
var resultNode = this.refs.result.getDOMNode();
resultNode.value = Math.random();
/*
var callback = function() {};
PuffUsers.addAnonUser(callback);
*/
/*
If we want to be able to generate anonymous users with pre-defined keys I can add a keys param
to PuffUsers.addAnonUser -- that has all the key generation and checking functionality in it already.
In general all the network calls should be done through PuffNet -- if you find yourself
reaching for $.ajax somewhere else we should probably move that use case into PuffNet,
at least eventually.
*/
return events.pub('ui/puff-packer/generate-username', {});
}
=======
>>>>>>>
if(type == 'requestUsername') {
var username = this.refs.username.getDOMNode().value;
var privateDefaultKey = this.refs.defaultKey.getDOMNode().value;
var privateAdminKey = this.refs.adminKey.getDOMNode().value;
var privateRootKey = this.refs.rootKey.getDOMNode().value;
var keys = Puffball.buildKeyObject(privateDefaultKey, privateAdminKey, privateRootKey);
// PuffUsers.requestUsername(username, keys)
return events.pub('ui/puff-packer/request-username', {});
}
if(type == 'generateUsername') {
var resultNode = this.refs.result.getDOMNode();
resultNode.value = Math.random();
/*
var callback = function() {};
PuffUsers.addAnonUser(callback);
*/
/*
If we want to be able to generate anonymous users with pre-defined keys I can add a keys param
to PuffUsers.addAnonUser -- that has all the key generation and checking functionality in it already.
In general all the network calls should be done through PuffNet -- if you find yourself
reaching for $.ajax somewhere else we should probably move that use case into PuffNet,
at least eventually.
*/
return events.pub('ui/puff-packer/generate-username', {});
}
<<<<<<<
var puff = Puffball.createPuff(user.username, user.keys.admin.private, zones, type, content, payload);
=======
>>>>>>>
var puff = Puffball.createPuff(user.username, user.keys.admin.private, zones, type, content, payload); |
<<<<<<<
=======
updateUI()
>>>>>>> |
<<<<<<<
var keys = Puffball.buildKeyObject(0, CONFIG.anon.privateKeyAdmin, 0);
PuffUsers.addUserReally('anon', keys);
PuffUsers.setCurrentUser('anon');
return events.pub('ui/puff-packer/set-identity-to-anon', {});
=======
var prom = PuffWardrobe.storePrivateKeys('anon', 0, CONFIG.anon.privateKeyAdmin, 0);
prom.then(function() {
PuffWardrobe.switchCurrent('anon');
events.pub('ui/puff-packer/set-to-anon', {});
})
// var keys = Puffball.buildKeyObject(0, CONFIG.anon.privateKeyAdmin, 0);
// PuffWardrobe.addUserReally('anon', keys);
},
formatForDisplay: function(obj, style) {
if(style == 'formatted') {
return JSON.stringify(obj, null, 2)
.replace(/[{}",\[\]]/g, '')
.replace(/^\n/, '')
.replace(/\n$/, '');
}
>>>>>>>
var prom = PuffWardrobe.storePrivateKeys('anon', 0, CONFIG.anon.privateKeyAdmin, 0);
prom.then(function() {
PuffWardrobe.switchCurrent('anon');
events.pub('ui/puff-packer/set-identity-to-anon', {});
})
// var keys = Puffball.buildKeyObject(0, CONFIG.anon.privateKeyAdmin, 0);
// PuffWardrobe.addUserReally('anon', keys);
},
formatForDisplay: function(obj, style) {
if(style == 'formatted') {
return JSON.stringify(obj, null, 2)
.replace(/[{}",\[\]]/g, '')
.replace(/^\n/, '')
.replace(/\n$/, '');
} |
<<<<<<<
getInitialState: function() {
return {showMain: true};
},
handleShowMore: function() {
this.setState({showMain: !this.state.showMain});
},
=======
>>>>>>>
getInitialState: function() {
return {showMain: true};
},
handleShowMore: function() {
this.setState({showMain: !this.state.showMain});
}, |
<<<<<<<
const bucketsObject = await bucketConfig(process.env.system_bucket, process.env.stackName);
// URLs are for public and protected files
const bucketKeys = Object.keys(bucketsObject);
=======
>>>>>>>
<<<<<<<
// post meta file to CMR
if (published) {
const creds = getCreds();
const cmrFileObject = {
filename: cmrFile.filename,
metadata: xml,
granuleId: granuleId
};
await publishECHO10XML2CMR(
cmrFileObject,
creds,
process.env.system_bucket,
process.env.stackName
);
}
return postS3Object({ bucket: cmrFile.bucket, key: cmrFile.filepath, body: xml });
};
=======
const tags = await aws.s3GetObjectTagging(cmrFile.bucket, cmrFile.filepath);
const tagsQueryString = aws.s3TagSetToQueryString(tags.TagSet);
await aws.promiseS3Upload({
Bucket: cmrFile.bucket, Key: cmrFile.filepath, Body: xml, Tagging: tagsQueryString
});
return metadataObject;
}
>>>>>>>
const tags = await aws.s3GetObjectTagging(cmrFile.bucket, cmrFile.filepath);
const tagsQueryString = aws.s3TagSetToQueryString(tags.TagSet);
await aws.promiseS3Upload({
Bucket: cmrFile.bucket, Key: cmrFile.filepath, Body: xml, Tagging: tagsQueryString
});
return metadataObject;
} |
<<<<<<<
if(type == 'requestUsername') {
var username = this.refs.username.getDOMNode().value;
var privateDefaultKey = this.refs.defaultKey.getDOMNode().value;
var privateAdminKey = this.refs.adminKey.getDOMNode().value;
var privateRootKey = this.refs.rootKey.getDOMNode().value;
var keys = Puffball.buildKeyObject(privateDefaultKey, privateAdminKey, privateRootKey);
// PuffUsers.requestUsername(username, keys)
return events.pub('ui/puff-packer/request-username', {});
}
if(type == 'generateUsername') {
var resultNode = this.refs.result.getDOMNode();
resultNode.value = Math.random();
/*
var callback = function() {};
PuffUsers.addAnonUser(callback);
*/
/*
If we want to be able to generate anonymous users with pre-defined keys I can add a keys param
to PuffUsers.addAnonUser -- that has all the key generation and checking functionality in it already.
In general all the network calls should be done through PuffNet -- if you find yourself
reaching for $.ajax somewhere else we should probably move that use case into PuffNet,
at least eventually.
*/
return events.pub('ui/puff-packer/generate-username', {});
}
=======
>>>>>>>
if(type == 'requestUsername') {
var username = this.refs.username.getDOMNode().value;
var privateDefaultKey = this.refs.defaultKey.getDOMNode().value;
var privateAdminKey = this.refs.adminKey.getDOMNode().value;
var privateRootKey = this.refs.rootKey.getDOMNode().value;
var keys = Puffball.buildKeyObject(privateDefaultKey, privateAdminKey, privateRootKey);
// PuffUsers.requestUsername(username, keys)
return events.pub('ui/puff-packer/request-username', {});
}
if(type == 'generateUsername') {
var resultNode = this.refs.result.getDOMNode();
resultNode.value = Math.random();
/*
var callback = function() {};
PuffUsers.addAnonUser(callback);
*/
/*
If we want to be able to generate anonymous users with pre-defined keys I can add a keys param
to PuffUsers.addAnonUser -- that has all the key generation and checking functionality in it already.
In general all the network calls should be done through PuffNet -- if you find yourself
reaching for $.ajax somewhere else we should probably move that use case into PuffNet,
at least eventually.
*/
return events.pub('ui/puff-packer/generate-username', {});
}
<<<<<<<
var puff = Puffball.createPuff(user.username, user.keys.admin.private, zones, type, content, payload);
=======
>>>>>>>
var puff = Puffball.createPuff(user.username, user.keys.admin.private, zones, type, content, payload); |
<<<<<<<
Puff.Blockchain.BLOCKS = JSON.parse(localStorage.getItem("blocks"))
if(Puff.Blockchain.BLOCKS === null)
Puff.Blockchain.BLOCKS = {}
=======
Puff.actualP2P = new Puff.P2P()
>>>>>>>
Puff.Blockchain.BLOCKS = JSON.parse(localStorage.getItem("blocks"))
if(Puff.Blockchain.BLOCKS === null)
Puff.Blockchain.BLOCKS = {}
Puff.actualP2P = new Puff.P2P() |
<<<<<<<
this.props.importNetwork = params['network'];
PuffWardrobe.switchCurrent('anon');
events.pub('ui/set-current/anon', {});
=======
// PuffWardrobe.switchCurrent('anon');
// events.pub('ui/set-current/anon', {});
>>>>>>>
this.props.importNetwork = params['network']; |
<<<<<<<
getInitialState: function() {
return {showMain: true};
},
handleShowMore: function() {
this.setState({showMain: !this.state.showMain});
},
=======
>>>>>>>
getInitialState: function() {
return {showMain: true};
},
handleShowMore: function() {
this.setState({showMain: !this.state.showMain});
}, |
<<<<<<<
PuffJson( {puff:puff} ),
=======
canViewRaw ? PuffViewRaw( {sig:puff.sig} ) : '',
>>>>>>>
canViewRaw ? PuffViewRaw( {sig:puff.sig} ) : '',
PuffJson( {puff:puff} ),
<<<<<<<
var PuffJson = React.createClass({displayName: 'PuffJson',
handleClick: function() {
var jsonstring = JSON.stringify(this.props.puff);
var jswin = window.open("");
jswin.document.write(jsonstring);
},
render: function() {
return (
React.DOM.span( {className: "icon", onClick:this.handleClick}, React.DOM.a(null, React.DOM.i( {className:"fa fa-circle-thin"})))
)
}
});
=======
>>>>>>>
var PuffJson = React.createClass({displayName: 'PuffJson',
handleClick: function() {
var jsonstring = JSON.stringify(this.props.puff);
var jswin = window.open("");
jswin.document.write(jsonstring);
},
render: function() {
return (
React.DOM.span( {className: "icon", onClick:this.handleClick}, React.DOM.a(null, React.DOM.i( {className:"fa fa-circle-thin"})))
)
}
}); |
<<<<<<<
<PuffJson puff={puff} />
=======
{canViewRaw ? <PuffViewRaw sig={puff.sig} /> : ''}
>>>>>>>
{canViewRaw ? <PuffViewRaw sig={puff.sig} /> : ''}
<PuffJson puff={puff} />
<<<<<<<
var PuffJson = React.createClass({
handleClick: function() {
var jsonstring = JSON.stringify(this.props.puff);
var jswin = window.open("");
jswin.document.write(jsonstring);
},
render: function() {
return (
<span className ="icon" onClick={this.handleClick}><a><i className="fa fa-circle-thin"></i></a></span>
)
}
});
=======
>>>>>>>
var PuffJson = React.createClass({
handleClick: function() {
var jsonstring = JSON.stringify(this.props.puff);
var jswin = window.open("");
jswin.document.write(jsonstring);
},
render: function() {
return (
<span className ="icon" onClick={this.handleClick}><a><i className="fa fa-circle-thin"></i></a></span>
)
}
}); |
<<<<<<<
Puff.Blockchain.BLOCKS = JSON.parse(localStorage.getItem("blocks"))
if(Puff.Blockchain.BLOCKS === null)
Puff.Blockchain.BLOCKS = {}
=======
Puff.actualP2P = new Puff.P2P()
>>>>>>>
Puff.Blockchain.BLOCKS = JSON.parse(localStorage.getItem("blocks"))
if(Puff.Blockchain.BLOCKS === null)
Puff.Blockchain.BLOCKS = {}
Puff.actualP2P = new Puff.P2P() |
<<<<<<<
getInitialState: function() {
return {showMain: true};
},
handleShowMore: function() {
this.setState({showMain: !this.state.showMain});
},
=======
>>>>>>>
getInitialState: function() {
return {showMain: true};
},
handleShowMore: function() {
this.setState({showMain: !this.state.showMain});
}, |
<<<<<<<
const parser = require("solidity-parser-antlr");
=======
const mkdirp = require('mkdirp');
const SolidityParser = require("solidity-parser");
>>>>>>>
const parser = require("solidity-parser-antlr");
const mkdirp = require('mkdirp');
<<<<<<<
try {
let ast = parser.parse(fileContents)
let imports = [];
parser.visit(ast, {
ImportDirective: function(node) {
imports.push(getNormalizedDependencyPath(node.path, filePath))
}
})
return imports
} catch (error) {
throw new Error(
"Could not parse " + filePath + " for extracting its imports."
);
}
=======
try {
return SolidityParser.parse(fileContents, "imports").map(dependency =>
getNormalizedDependencyPath(dependency, filePath)
);
} catch (error) {
throw new Error(
"Could not parse " + filePath + " for extracting its imports."
);
}
>>>>>>>
try {
let ast = parser.parse(fileContents)
let imports = [];
parser.visit(ast, {
ImportDirective: function(node) {
imports.push(getNormalizedDependencyPath(node.path, filePath))
}
})
return imports
} catch (error) {
throw new Error(
"Could not parse " + filePath + " for extracting its imports."
);
} |
<<<<<<<
import {
createCompiledCatalog,
getCatalogs,
getCatalogForFile
} from "@lingui/cli/api"
=======
import { createCompiledCatalog, configureCatalog } from "@lingui/cli/api"
import loaderUtils from "loader-utils"
>>>>>>>
import {
createCompiledCatalog,
getCatalogs,
getCatalogForFile
} from "@lingui/cli/api"
import loaderUtils from "loader-utils"
<<<<<<<
const config = getConfig({
cwd: path.dirname(this.resourcePath)
})
const { locale, catalog } = getCatalogForFile(
path.relative(config.rootDir, this.resourcePath),
getCatalogs(config)
)
=======
const config = getConfig({
configPath: options.config,
cwd: path.dirname(this.resourcePath)
})
const catalog = configureCatalog(config)
const locale = catalog.getLocale(this.resourcePath)
>>>>>>>
const config = getConfig({
configPath: options.config,
cwd: path.dirname(this.resourcePath)
})
const { locale, catalog } = getCatalogForFile(
path.relative(config.rootDir, this.resourcePath),
getCatalogs(config)
)
<<<<<<<
return createCompiledCatalog(locale, messages, { strict })
=======
return createCompiledCatalog(
locale,
messages,
strict,
config.compileNamespace,
config.pseudoLocale
)
>>>>>>>
return createCompiledCatalog(locale, messages, {
strict,
namespace: config.compileNamespace,
pseudoLocale: config.pseudoLocale
}) |
<<<<<<<
setCatch(funcback,[config.$error]) ;
=======
funcback.setProperties({wasAsync:true}) ;
setCatch(funcback,config.$error) ;
>>>>>>>
funcback.setProperties({wasAsync:true}) ;
setCatch(funcback,[config.$error]) ; |
<<<<<<<
// generatedy by JSX compiler 0.9.72 (2014-01-17 10:58:41 +0900; 868dbae0e68730a8d02f4226fe2685b7a4a365dd)
=======
// generatedy by JSX compiler 0.9.75 (2014-02-03 18:17:21 +0900; 8c807402af2781b4947762f22e74b874234d0558)
>>>>>>>
// generatedy by JSX compiler 0.9.76 (2014-01-27 18:56:39 +0900; 7d1893d04ab5bc00217e13b736eecdba88e70a27)
<<<<<<<
=======
_FusedAssignmentExpressionEmitter.prototype._emitDivAssignToInt$N = function (outerOpPrecedence) {
var $this = this;
var firstExpr;
var secondExpr;
var propertyExpr;
var name;
var classDef;
firstExpr = this._expr.getFirstExpr$();
secondExpr = this._expr.getSecondExpr$();
if (Util$lhsHasSideEffects$LExpression$(firstExpr)) {
this._emitter._emit$SLToken$("$__jsx_div_assign(", this._expr.getToken$());
if (firstExpr instanceof PropertyExpression) {
propertyExpr = firstExpr;
this._emitter._getExpressionEmitterFor$LExpression$(propertyExpr.getExpr$()).emit$N(0);
this._emitter._emit$SLToken$(", ", this._expr.getToken$());
if (propertyExpr.getExpr$().isClassSpecifier$()) {
classDef = propertyExpr.getHolderType$().getClassDef$();
name = this._emitter.getNamer$().getNameOfStaticVariable$LClassDefinition$S(classDef, propertyExpr.getIdentifierToken$().getValue$());
} else {
name = this._emitter.getNamer$().getNameOfProperty$LClassDefinition$S(propertyExpr.getHolderType$().getClassDef$(), propertyExpr.getIdentifierToken$().getValue$());
}
this._emitter._emit$SLToken$(Util$encodeStringLiteral$S(name), propertyExpr.getIdentifierToken$());
} else {
this._emitter._getExpressionEmitterFor$LExpression$(firstExpr.getFirstExpr$()).emit$N(0);
this._emitter._emit$SLToken$(", ", this._expr.getToken$());
this._emitter._getExpressionEmitterFor$LExpression$(firstExpr.getSecondExpr$()).emit$N(0);
}
this._emitter._emit$SLToken$(", ", this._expr.getToken$());
this._emitter._emitWithNullableGuard$LExpression$N(secondExpr, 0);
this._emitter._emit$SLToken$(")", this._expr.getToken$());
} else {
this.emitWithPrecedence$NNF$V$(outerOpPrecedence, _AssignmentExpressionEmitter._operatorPrecedence["="], (function () {
$this._emitter._getExpressionEmitterFor$LExpression$(firstExpr).emit$N(_AssignmentExpressionEmitter._operatorPrecedence["="]);
$this._emitter._emit$SLToken$(" = (", $this._expr.getToken$());
$this._emitter._emitWithNullableGuard$LExpression$N(firstExpr, _BinaryNumberExpressionEmitter._operatorPrecedence["/"]);
$this._emitter._emit$SLToken$(" / ", $this._expr.getToken$());
$this._emitter._emitWithNullableGuard$LExpression$N(secondExpr, _BinaryNumberExpressionEmitter._operatorPrecedence["/"] - 1);
$this._emitter._emit$SLToken$(") | 0", $this._expr.getToken$());
}));
}
};
>>>>>>>
<<<<<<<
expectedType = this._type.getTypeArguments$()[0].toNullableType$();
for (i = 0; i < this._elements.length; ++i) {
=======
expectedType = this._type.getTypeArguments$()[0].toNullableType$();
for (i = 0; i < this._elements.length; ++ i) {
>>>>>>>
expectedType = this._type.getTypeArguments$()[0].toNullableType$();
for (i = 0; i < this._elements.length; ++i) {
<<<<<<<
for (i = 0; i < this._parsers.length; ++i) {
if (! this.parseFile$ALCompileError$LParser$(errors, this._parsers[i])) {
=======
for (i = 0; i < this._parsers.length; ++ i) {
if (! this._parseFile$ALCompileError$N(errors, i)) {
>>>>>>>
for (i = 0; i < this._parsers.length; ++i) {
if (! this._parseFile$ALCompileError$N(errors, i)) {
<<<<<<<
Meta.VERSION_STRING = "0.9.72";
Meta.VERSION_NUMBER = 0.009072;
Meta.LAST_COMMIT_HASH = "868dbae0e68730a8d02f4226fe2685b7a4a365dd";
Meta.LAST_COMMIT_DATE = "2014-01-17 10:58:41 +0900";
=======
Meta.VERSION_STRING = "0.9.75";
Meta.VERSION_NUMBER = 0.009075;
Meta.LAST_COMMIT_HASH = "8c807402af2781b4947762f22e74b874234d0558";
Meta.LAST_COMMIT_DATE = "2014-02-03 18:17:21 +0900";
>>>>>>>
Meta.VERSION_STRING = "0.9.76";
Meta.VERSION_NUMBER = 0.009076;
Meta.LAST_COMMIT_HASH = "7d1893d04ab5bc00217e13b736eecdba88e70a27";
Meta.LAST_COMMIT_DATE = "2014-01-27 18:56:39 +0900"; |
<<<<<<<
"{", "var", ";", "if", "do", "while", "for", "continue", "break", "return", "switch", "throw", "try", "assert", "log", "delete", "debugger", "function"
=======
"{", "var", ";", "if", "do", "while", "for", "continue", "break", "return", "switch", "throw", "try", "assert", "log", "delete", "debugger", "void"
>>>>>>>
"{", "var", ";", "if", "do", "while", "for", "continue", "break", "return", "switch", "throw", "try", "assert", "log", "delete", "debugger", "function", "void"
<<<<<<<
case "function":
if(this._functionStatement(token)) { return true; }
this._restoreState(state);
// maybe function expression
break;
=======
case "void":
// void is simply skipped
break;
>>>>>>>
case "function":
if(this._functionStatement(token)) { return true; }
this._restoreState(state);
// maybe function expression
break;
case "void":
// void is simply skipped
break; |
<<<<<<<
const { addProviders, addCollections, addRules } = require('@cumulus/integration-tests');
=======
'use strict';
const path = require('path');
const { addProviders, addCollections } = require('@cumulus/integration-tests');
const { s3 } = require('@cumulus/common/aws');
>>>>>>>
'use strict';
const path = require('path');
const { addProviders, addCollections, addRules } = require('@cumulus/integration-tests');
const { s3 } = require('@cumulus/common/aws');
<<<<<<<
describe('Populating providers, collections and rules to database', () => {
=======
const s3data = [
'@cumulus/test-data/pdrs/MOD09GQ_1granule_v3.PDR',
'@cumulus/test-data/granules/MOD09GQ.A2016358.h13v04.006.2016360104606.hdf.met',
'@cumulus/test-data/granules/MOD09GQ.A2016358.h13v04.006.2016360104606.hdf',
'@cumulus/test-data/granules/MOD09GQ.A2016358.h13v04.006.2016360104606_ndvi.jpg'
];
/**
* Upload a file from the test-data package to the S3 test data
*
* @param {string} file - filename of data to upload
* @param {string} bucket - bucket to upload to
* @returns {Promise<Object>} - promise returned from S3 PUT
*/
function uploadTestDataToS3(file, bucket) {
const data = fs.readFileSync(require.resolve(file), 'utf8');
const key = path.basename(file);
return s3().putObject({
Bucket: bucket,
Key: `cumulus-test-data/pdrs/${key}`,
Body: data
}).promise();
}
/**
* For the given bucket, upload all the test data files to S3
*
* @param {string} bucket - S3 bucket
* @returns {Array<Promise>} - responses from S3 upload
*/
function uploadTestDataToBucket(bucket) {
return Promise.all(s3data.map((file) => uploadTestDataToS3(file, bucket)));
}
describe('Populating providers and collections to database', () => {
>>>>>>>
const s3data = [
'@cumulus/test-data/pdrs/MOD09GQ_1granule_v3.PDR',
'@cumulus/test-data/granules/MOD09GQ.A2016358.h13v04.006.2016360104606.hdf.met',
'@cumulus/test-data/granules/MOD09GQ.A2016358.h13v04.006.2016360104606.hdf',
'@cumulus/test-data/granules/MOD09GQ.A2016358.h13v04.006.2016360104606_ndvi.jpg'
];
/**
* Upload a file from the test-data package to the S3 test data
*
* @param {string} file - filename of data to upload
* @param {string} bucket - bucket to upload to
* @returns {Promise<Object>} - promise returned from S3 PUT
*/
function uploadTestDataToS3(file, bucket) {
const data = fs.readFileSync(require.resolve(file), 'utf8');
const key = path.basename(file);
return s3().putObject({
Bucket: bucket,
Key: `cumulus-test-data/pdrs/${key}`,
Body: data
}).promise();
}
/**
* For the given bucket, upload all the test data files to S3
*
* @param {string} bucket - S3 bucket
* @returns {Array<Promise>} - responses from S3 upload
*/
function uploadTestDataToBucket(bucket) {
return Promise.all(s3data.map((file) => uploadTestDataToS3(file, bucket)));
}
describe('Populating providers, collections and rules to database', () => {
<<<<<<<
providers = await addProviders(stackName, bucketName, providersDirectory);
collections = await addCollections(stackName, bucketName, collectionsDirectory);
rules = await addRules(config, rulesDirectory);
=======
collections = await addCollections(config.stackName, config.bucket, collectionsDirectory);
providers = await addProviders(config.stackName, config.bucket, providersDirectory, config.bucket);
console.log(`Uploading test data to S3 bucket: ${config.bucket}`);
await uploadTestDataToBucket(config.bucket);
>>>>>>>
collections = await addCollections(config.stackName, config.bucket, collectionsDirectory);
providers = await addProviders(config.stackName, config.bucket, providersDirectory, config.bucket);
// Needs matched.
rules = await addRules(config, rulesDirectory);
console.log(`Uploading test data to S3 bucket: ${config.bucket}`);
await uploadTestDataToBucket(config.bucket); |
<<<<<<<
import { collectDataset, setByPath, getByPath } from '../../helper/utils'
=======
import { is } from '../../helper/env'
import { collectDataset, setByPath } from '../../helper/utils'
>>>>>>>
import { collectDataset, setByPath } from '../../helper/utils' |
<<<<<<<
options.transWebMode = options.transWebMode || 'simple'
=======
options.enableAutoScope = options.enableAutoScope || false
>>>>>>>
options.transWebMode = options.transWebMode || 'simple'
options.enableAutoScope = options.enableAutoScope || false |
<<<<<<<
import _ from 'lodash'
import checkBox from './components/checkBox/'
import datePicker from './components/datePicker/'
import dateTimePicker from './components/dateTimePicker/'
import dateRangePicker from './components/dateRangePicker/'
import dateTimeRangePicker from './components/dateTimeRangePicker/'
import inputWithLabel from './components/inputWithLabel/'
import button from './components/button/'
import input from './components/input/'
import radio from './components/radio/'
import form from './components/form/'
import table from './components/table/'
import inlineBox from './components/inlineBox/'
const CloneDeep = _.cloneDeep
const Merge = _.mergeWith
=======
let cloneDeep = require('lodash').cloneDeep
import breadCrumb from './components/breadCrumb'
import button from './components/button'
import checkBox from './components/checkBox'
import datePicker from './components/datePicker'
import dateRangePicker from './components/dateRangePicker'
import dateTimePicker from './components/dateTimePicker'
import dateTimeRangePicker from './components/dateTimeRangePicker'
import form from './components/form'
import inlineBox from './components/inlineBox'
import input from './components/input'
import inputWithLabel from './components/inputWithLabel'
import radio from './components/radio'
import select from './components/select'
import upload from './components/upload'
import table from './components/table'
>>>>>>>
import _ from 'lodash'
import breadCrumb from './components/breadCrumb'
import button from './components/button'
import checkBox from './components/checkBox'
import datePicker from './components/datePicker'
import dateRangePicker from './components/dateRangePicker'
import dateTimePicker from './components/dateTimePicker'
import dateTimeRangePicker from './components/dateTimeRangePicker'
import form from './components/form'
import inlineBox from './components/inlineBox'
import input from './components/input'
import inputWithLabel from './components/inputWithLabel'
import radio from './components/radio'
import select from './components/select'
import upload from './components/upload'
import table from './components/table'
const CloneDeep = _.cloneDeep
const Merge = _.mergeWith |
<<<<<<<
import ListingContract from '../../contracts/build/contracts/Listing.json'
=======
import UserRegistryContract from '../../contracts/build/contracts/UserRegistry.json'
>>>>>>>
import ListingContract from '../../contracts/build/contracts/Listing.json'
import UserRegistryContract from '../../contracts/build/contracts/UserRegistry.json'
<<<<<<<
this.listingContract = contract(ListingContract)
=======
this.userRegistryContract = contract(UserRegistryContract)
>>>>>>>
this.listingContract = contract(ListingContract)
this.userRegistryContract = contract(UserRegistryContract)
<<<<<<<
async waitTransactionFinished(transactionReceipt, pollIntervalMilliseconds=1000) {
console.log("Waiting for transaction")
console.log(transactionReceipt)
=======
async setUser(ipfsUser) {
const result = await new Promise((resolve, reject) => {
this.userRegistryContract.setProvider(window.web3.currentProvider)
window.web3.eth.getAccounts((error, accounts) => {
this.userRegistryContract.deployed().then((instance) => {
return instance.set(
this.getBytes32FromIpfsHash(ipfsUser),
{from: accounts[0]})
}).then((result) => {
resolve(result)
}).catch((error) => {
console.error('Error submitting to the Ethereum blockchain: ' + error)
reject(error)
})
})
})
return result
}
async getUser(userAddress) {
const ipfsUser = await new Promise((resolve, reject) => {
this.userRegistryContract.setProvider(window.web3.currentProvider)
this.userRegistryContract.deployed().then((instance) => {
instance.users(userAddress)
.then(([ipfsHash, isSet]) => {
resolve(this.getIpfsHashFromBytes32(ipfsHash))
})
.catch((error) => {
console.log(`Error fetching userId: ${userId}`)
reject(error)
})
})
})
return ipfsUser
}
async waitTransactionFinished(transactionHash, pollIntervalMilliseconds=1000) {
>>>>>>>
async waitTransactionFinished(transactionReceipt, pollIntervalMilliseconds=1000) {
console.log("Waiting for transaction")
console.log(transactionReceipt) |
<<<<<<<
export function theSecondPassphraseIsProvidedViaStdIn() {
const { passphrase, secondPassphrase } = this.test.ctx;
inputUtils.getStdIn.resolves({ passphrase, data: secondPassphrase });
inputUtils.getPassphrase.onSecondCall().resolves(secondPassphrase);
}
export function thePassphraseAndTheSecondPassphraseAreProvidedViaStdIn() {
const { passphrase, secondPassphrase } = this.test.ctx;
inputUtils.getStdIn.resolves({ passphrase, data: secondPassphrase });
inputUtils.getPassphrase.onFirstCall().resolves(passphrase);
inputUtils.getPassphrase.onSecondCall().resolves(secondPassphrase);
}
=======
export function thePassphraseAndThePasswordAreProvidedViaStdIn() {
const { passphrase, password } = this.test.ctx;
inputUtils.getStdIn.resolves({ passphrase, data: password });
inputUtils.getPassphrase.onFirstCall().resolves(passphrase);
inputUtils.getPassphrase.onSecondCall().resolves(password);
}
export function thePasswordIsProvidedViaStdIn() {
const { password } = this.test.ctx;
inputUtils.getStdIn.resolves({ data: password });
}
>>>>>>>
export function theSecondPassphraseIsProvidedViaStdIn() {
const { passphrase, secondPassphrase } = this.test.ctx;
inputUtils.getStdIn.resolves({ passphrase, data: secondPassphrase });
inputUtils.getPassphrase.onSecondCall().resolves(secondPassphrase);
}
export function thePassphraseAndTheSecondPassphraseAreProvidedViaStdIn() {
const { passphrase, secondPassphrase } = this.test.ctx;
inputUtils.getStdIn.resolves({ passphrase, data: secondPassphrase });
inputUtils.getPassphrase.onFirstCall().resolves(passphrase);
inputUtils.getPassphrase.onSecondCall().resolves(secondPassphrase);
}
export function thePassphraseAndThePasswordAreProvidedViaStdIn() {
const { passphrase, password } = this.test.ctx;
inputUtils.getStdIn.resolves({ passphrase, data: password });
inputUtils.getPassphrase.onFirstCall().resolves(passphrase);
inputUtils.getPassphrase.onSecondCall().resolves(password);
}
export function thePasswordIsProvidedViaStdIn() {
const { password } = this.test.ctx;
inputUtils.getStdIn.resolves({ data: password });
}
<<<<<<<
export function anOptionsObjectWithPassphraseSetToAndSecondPassphraseSetTo() {
const { secondPassphrase, passphrase } = this.test.ctx;
const [passphraseSource, secondPassphraseSource] = getQuotedStrings(this.test.parent.title);
if (typeof inputUtils.getPassphrase.resolves === 'function') {
inputUtils.getPassphrase.onFirstCall().resolves(passphrase);
inputUtils.getPassphrase.onSecondCall().resolves(secondPassphrase);
}
this.test.ctx.options = { passphrase: passphraseSource, 'second-passphrase': secondPassphraseSource };
}
=======
export function anOptionsObjectWithOutputPublicKeySetToBoolean() {
const outputPublicKey = getFirstBoolean(this.test.parent.title);
this.test.ctx.options = { 'output-public-key': outputPublicKey };
}
export function anOptionsObjectWithPassphraseSetToAndPasswordSetTo() {
const [passphrase, password] = getQuotedStrings(this.test.parent.title);
this.test.ctx.options = { passphrase, password };
}
export function anOptionsObjectWithPasswordSetTo() {
const { password } = this.test.ctx;
const passwordSource = getFirstQuotedString(this.test.parent.title);
if (typeof inputUtils.getPassphrase.resolves === 'function') {
inputUtils.getPassphrase.onSecondCall().resolves(password);
}
this.test.ctx.options = { password: passwordSource };
}
export function anOptionsObjectWithPasswordSetToUnknownSource() {
const password = getFirstQuotedString(this.test.parent.title);
if (typeof inputUtils.getPassphrase.resolves === 'function') {
inputUtils.getPassphrase.onSecondCall().rejects(new Error('Unknown data source type. Must be one of `file`, or `stdin`.'));
}
this.test.ctx.options = { password };
}
>>>>>>>
export function anOptionsObjectWithPassphraseSetToAndSecondPassphraseSetTo() {
const { secondPassphrase, passphrase } = this.test.ctx;
const [passphraseSource, secondPassphraseSource] = getQuotedStrings(this.test.parent.title);
if (typeof inputUtils.getPassphrase.resolves === 'function') {
inputUtils.getPassphrase.onFirstCall().resolves(passphrase);
inputUtils.getPassphrase.onSecondCall().resolves(secondPassphrase);
}
this.test.ctx.options = { passphrase: passphraseSource, 'second-passphrase': secondPassphraseSource };
}
export function anOptionsObjectWithOutputPublicKeySetToBoolean() {
const outputPublicKey = getFirstBoolean(this.test.parent.title);
this.test.ctx.options = { 'output-public-key': outputPublicKey };
}
export function anOptionsObjectWithPassphraseSetToAndPasswordSetTo() {
const [passphrase, password] = getQuotedStrings(this.test.parent.title);
this.test.ctx.options = { passphrase, password };
}
export function anOptionsObjectWithPasswordSetTo() {
const { password } = this.test.ctx;
const passwordSource = getFirstQuotedString(this.test.parent.title);
if (typeof inputUtils.getPassphrase.resolves === 'function') {
inputUtils.getPassphrase.onSecondCall().resolves(password);
}
this.test.ctx.options = { password: passwordSource };
}
export function anOptionsObjectWithPasswordSetToUnknownSource() {
const password = getFirstQuotedString(this.test.parent.title);
if (typeof inputUtils.getPassphrase.resolves === 'function') {
inputUtils.getPassphrase.onSecondCall().rejects(new Error('Unknown data source type. Must be one of `file`, or `stdin`.'));
}
this.test.ctx.options = { password };
}
<<<<<<<
inputUtils.getPassphrase.rejects(new Error('Unknown passphrase source type. Must be one of `file`, or `stdin`.'));
=======
inputUtils.getPassphrase.onFirstCall().rejects(new Error('Unknown data source type. Must be one of `file`, or `stdin`.'));
>>>>>>>
inputUtils.getPassphrase.onFirstCall().rejects(new Error('Unknown passphrase source type. Must be one of `file`, or `stdin`.')); |
<<<<<<<
import {
createVText,
createVPlaceholder,
createVList
} from '../core/shapes';
import { unmountVList } from './unmounting';
=======
import { createVText, createVPlaceholder, createVList } from '../core/shapes';
>>>>>>>
import { unmountVList } from './unmounting';
import { createVText, createVPlaceholder, createVList } from '../core/shapes'; |
<<<<<<<
instance.componentWillUnmount && instance.componentWillUnmount();
=======
options.beforeUnmount && options.beforeUnmount(vNode);
instance.componentWillUnmount();
>>>>>>>
instance.componentWillUnmount && instance.componentWillUnmount();
options.beforeUnmount && options.beforeUnmount(vNode);
<<<<<<<
if (!isUndefined(instance.componentDidMount)) {
=======
var cDM = instance.componentDidMount;
var afterMount = options.afterMount;
if (!isNull(cDM) || !isNull(afterMount)) {
>>>>>>>
var cDM = instance.componentDidMount;
var afterMount = options.afterMount;
if (!isUndefined(cDM) || !isNull(afterMount)) { |
<<<<<<<
// import Component from './../component/index';
=======
import Component from './../component/index';
>>>>>>>
<<<<<<<
return obj.prototype.render !== undefined;
=======
return Component.isPrototypeOf(obj);
>>>>>>>
return obj.prototype.render !== undefined;
<<<<<<<
/*
=======
>>>>>>>
<<<<<<<
return typeof obj === 'object' && obj !== null;
}
*/
=======
return typeof obj === 'object' && obj !== null;
}
>>>>>>>
return typeof obj === 'object' && obj !== null;
} |
<<<<<<<
} else if ( typeof value === 'object' && value.domTree ) {
return ValueTypes.FRAGMENT;
} else if ( typeof value === 'object' && Object.keys( value ).length === 0 ) {
=======
}
if ( typeof value === 'object' && Object.keys( value ).length === 0 ) {
>>>>>>>
}
if ( typeof value === 'object' && value.domTree ) {
return ValueTypes.FRAGMENT;
}
if ( typeof value === 'object' && Object.keys( value ).length === 0 ) { |
<<<<<<<
const sftpMixin = require('./sftp');
=======
const aws = require('@cumulus/common/aws');
>>>>>>>
const sftpMixin = require('./sftp');
const aws = require('@cumulus/common/aws'); |
<<<<<<<
'inferno-hydrate': resolve('inferno-hydrate'),
=======
'inferno-extras': resolve('inferno-extras'),
>>>>>>>
'inferno-hydrate': resolve('inferno-hydrate'),
'inferno-extras': resolve('inferno-extras'), |
<<<<<<<
const PooledStaking = artifacts.require('PooledStakingMock');
const {toHex} = require('../test/utils/ethTools');
=======
const OwnedUpgradeabilityProxy = artifacts.require('OwnedUpgradeabilityProxy');
>>>>>>>
const OwnedUpgradeabilityProxy = artifacts.require('OwnedUpgradeabilityProxy');
const PooledStaking = artifacts.require('PooledStakingMock');
const {toHex} = require('../test/utils/ethTools');
<<<<<<<
=======
await nxms.initiateMaster(tk.address);
>>>>>>>
await nxms.initiateMaster(tk.address);
<<<<<<<
// reduntant action of setting contract address
await nxms.setContractAddress(toHex('PS'), pooledStaking.address);
=======
await proxyMaster.transferProxyOwnership(
await nxms.getLatestAddress('0x4756')
);
>>>>>>>
// reduntant action of setting contract address
await nxms.setContractAddress(toHex('PS'), pooledStaking.address);
await proxyMaster.transferProxyOwnership(
await nxms.getLatestAddress('0x4756')
); |
<<<<<<<
=======
// internal method for transforming short uris to long uris.
var mapAttributeNS = function (attr, ns) {
var a = attr;
if (ns.isUri (attr) || attr.indexOf('@') === 0) {
// ignore attributes starting with @
} else if (ns.isCurie(attr)) {
a = ns.uri(attr);
} else if (!ns.isUri(attr)) {
if (attr.indexOf(":") === -1) {
a = '<' + ns.base() + attr + '>';
} else {
a = '<' + attr + '>';
}
}
return a;
};
>>>>>>>
<<<<<<<
setOrAdd: function (arg1, arg2, option) {
=======
// **`.setOrAdd(arg1, arg2)`** similar to `.set(..)`, `.setOrAdd(..)` can
// be used for setting one or more attributes of an entity, but in
// this case it's a collection of values, not just one. That means, if the
// entity already has the attribute set, make the value to a VIE Collection
// and use the collection as value. The collection can contain entities
// or literals, but not both at the same time.
setOrAdd: function (arg1, arg2) {
>>>>>>>
// **`.setOrAdd(arg1, arg2)`** similar to `.set(..)`, `.setOrAdd(..)` can
// be used for setting one or more attributes of an entity, but in
// this case it's a collection of values, not just one. That means, if the
// entity already has the attribute set, make the value to a VIE Collection
// and use the collection as value. The collection can contain entities
// or literals, but not both at the same time.
setOrAdd: function (arg1, arg2, option) {
<<<<<<<
_setOrAddOne: function (attr, value, options) {
=======
// TODO describe in more detail
_setOrAddOne: function (attr, value) {
>>>>>>>
_setOrAddOne: function (attr, value, options) { |
<<<<<<<
indexModel(esClient, tables.collectionsTable, esIndex, indexer.indexCollection),
indexModel(esClient, tables.executionsTable, esIndex, indexer.indexExecution),
indexModel(esClient, tables.asyncOperationsTable, esIndex, indexer.indexAsyncOperation),
indexModel(esClient, tables.granulesTable, esIndex, indexer.indexGranule),
indexModel(esClient, tables.pdrsTable, esIndex, indexer.indexPdr),
indexModel(esClient, tables.providersTable, esIndex, indexer.indexProvider),
indexModel(esClient, tables.reconciliationReportsTable, esIndex,
indexer.indexReconciliationReport),
indexModel(esClient, tables.rulesTable, esIndex, indexer.indexRule)
=======
indexModel({
esClient,
tableName: tables.collectionsTable,
esIndex,
indexFn: indexer.indexCollection,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.executionsTable,
esIndex,
indexFn: indexer.indexExecution,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.asyncOperationsTable,
esIndex,
indexFn: indexer.indexAsyncOperation,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.granulesTable,
esIndex,
indexFn: indexer.indexGranule,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.pdrsTable,
esIndex,
indexFn: indexer.indexPdr,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.providersTable,
esIndex,
indexFn: indexer.indexProvider,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.rulesTable,
esIndex,
indexFn: indexer.indexRule,
limitEsRequests
})
>>>>>>>
indexModel({
esClient,
tableName: tables.collectionsTable,
esIndex,
indexFn: indexer.indexCollection,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.executionsTable,
esIndex,
indexFn: indexer.indexExecution,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.asyncOperationsTable,
esIndex,
indexFn: indexer.indexAsyncOperation,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.granulesTable,
esIndex,
indexFn: indexer.indexGranule,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.pdrsTable,
esIndex,
indexFn: indexer.indexPdr,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.providersTable,
esIndex,
indexFn: indexer.indexProvider,
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.reconciliationReportsTable,
esIndex,
indexFn: indexer.indexReconciliationReport),
limitEsRequests
}),
indexModel({
esClient,
tableName: tables.rulesTable,
esIndex,
indexFn: indexer.indexRule,
limitEsRequests
}) |
<<<<<<<
var wrapArray = false;
var wrapArrayItem = "item";
var callFunctions = true;
var useCDATA = false;
var convertMap = {};
=======
"use strict";
var callMemberFunctions = true;
>>>>>>>
"use strict";
var wrapArray = false;
var wrapArrayItem = "item";
var callFunctions = true;
var useCDATA = false;
var convertMap = {};
<<<<<<<
=======
if (excludedTypes[typeof data])
return "";
>>>>>>> |
<<<<<<<
changed: function (idx) {
return
},
created: function () {
return
},
move: null,
=======
changed: null,
created: null,
dragEnd: null,
dragStart: null,
>>>>>>>
changed: null,
created: null,
dragEnd: null,
dragStart: null,
initialSlide: 0,
loop: true,
move: null,
moveDuration: 500,
moveEasing: function (t) {
return --t * t * t + 1
},
selectorSlide: '.keen-slider__slide',
selectorTrack: '.keen-slider__track',
<<<<<<<
if (options.virtualSlide) return
=======
updateItems()
>>>>>>>
if (options.virtualSlide) return
updateItems() |
<<<<<<<
clampedText = truncate(getLastChild(element), height);
}
return {
'original': originalText,
'clamped': clampedText
=======
if (height <= element.clientHeight) {
truncate(getLastChild(element), height);
}
>>>>>>>
if (height <= element.clientHeight) {
clampedText = truncate(getLastChild(element), height);
}
}
return {
'original': originalText,
'clamped': clampedText |
<<<<<<<
focus: function(){
this.refs.typeahead.focus();
},
=======
getSelectedTokens: function(){
return this.state.selected;
},
>>>>>>>
focus: function(){
this.refs.typeahead.focus();
},
getSelectedTokens: function(){
return this.state.selected;
}, |
<<<<<<<
var results = this.props.options.map(function(result, i) {
var displayString = this.props.getDisplayString(result);
return (
<TypeaheadOption ref={displayString} key={displayString}
hover={this.state.selectionIndex === i}
=======
var results = [];
// CustomValue should be added to top of results list with different class name
if (this.props.customValue !== null) {
results.push(
<TypeaheadOption ref={this.props.customValue} key={this.props.customValue}
hover={this.state.selectionIndex === results.length}
customClasses={this.props.customClasses}
customValue={this.props.customValue}
onClick={this._onClick.bind(this, this.props.customValue)}>
{ this.props.customValue }
</TypeaheadOption>);
}
this.props.options.map(function(result, i) {
results.push (
<TypeaheadOption ref={result} key={result}
hover={this.state.selectionIndex === results.length}
>>>>>>>
var results = [];
// CustomValue should be added to top of results list with different class name
if (this.props.customValue !== null) {
results.push(
<TypeaheadOption ref={this.props.customValue} key={this.props.customValue}
hover={this.state.selectionIndex === results.length}
customClasses={this.props.customClasses}
customValue={this.props.customValue}
onClick={this._onClick.bind(this, this.props.customValue)}>
{ this.props.customValue }
</TypeaheadOption>);
}
this.props.options.map(function(result, i) {
var displayString = this.props.getDisplayString(result);
results.push (
<TypeaheadOption ref={displayString} key={displayString}
hover={this.state.selectionIndex === results.length} |
<<<<<<<
context('inputProps', function() {
it('should forward props to the input element', function() {
var component = TestUtils.renderIntoDocument(<Typeahead
options={ BEATLES }
inputProps={{ autoCorrect: 'off' }}
/>);
var input = component.refs.entry;
assert.equal(input.props.autoCorrect, 'off');
});
});
});
=======
>>>>>>>
context('inputProps', function() {
it('should forward props to the input element', function() {
var component = TestUtils.renderIntoDocument(<Typeahead
options={ BEATLES }
inputProps={{ autoCorrect: 'off' }}
/>);
var input = component.refs.entry;
assert.equal(input.props.autoCorrect, 'off');
});
}); |
<<<<<<<
import { ThemeProvider } from 'styled-components';
import ApolloClient from 'apollo-boost';
=======
import { ThemeProvider, injectGlobal } from 'styled-components';
>>>>>>>
import { ThemeProvider } from 'styled-components';
<<<<<<<
import GlobalStyle from './GlobalStyle';
import '../both/api';
=======
import apolloClient from './apollo';
>>>>>>>
import apolloClient from './apollo';
import GlobalStyle from './GlobalStyle';
<<<<<<<
=======
injectGlobal`
:root {
--primary: #337ab7;
--success: #5cb85c;
--info: #5bc0de;
--warning: #f0ad4e;
--danger: #d9534f;
--gray-darker: #222;
--gray-dark: #333;
--gray: #555;
--gray-light: #777;
--gray-lighter: #eee;
--facebook: #3b5998;
--google: #ea4335;
--github: var(--gray-dark);
--cb-blue: #4285F4;
--cb-green: #00D490;
--cb-yellow: #FFCF50;
--cb-red: #DA5847;
}
html {
position: relative;
min-height: 100%;
}
body {
margin-bottom: 80px;
margin: 0;
padding: 0;
font-size: 14px;
line-height: 20px;
}
.navbar {
border-radius: 0;
border-left: none;
border-right: none;
border-top: none;
}
form label {
display: block;
}
form .control-label {
display: block;
margin-bottom: 7px;
}
form label.error {
display: block;
margin-top: 8px;
font-size: 13px;
font-weight: normal;
color: var(--danger);
}
.page-header {
margin-top: 0;
}
.table tr td {
vertical-align: middle !important;
}
/* Removes unnecessary bottom padding on .container */
body > #react-root > div > .container {
padding-bottom: 0;
}
@media screen and (min-width: 768px) {
body.isViewDocument {
padding-top: 40px;
}
.page-header {
margin-top: 20px;
}
}
`;
>>>>>>> |
<<<<<<<
(function(global, ns, jQueryName) {
"use strict";
=======
(function(jQueryName, ns, global) {
>>>>>>>
(function(jQueryName, ns, global) {
"use strict"; |
<<<<<<<
import { initUserLogin } from './utils';
=======
import mediaBreakpoints from '../../../breakpoints';
import LoginModal from './LoginModal';
const { smallAndMedium, small } = mediaBreakpoints;
>>>>>>>
import { initUserLogin } from './utils';
import mediaBreakpoints from '../../../breakpoints';
import LoginModal from './LoginModal';
const { smallAndMedium, small } = mediaBreakpoints;
<<<<<<<
const initiateLogin = () => {
initUserLogin()
.then((res) => {
// eslint-disable-next-line no-console
console.log(res);
// eslint-disable-next-line no-debugger
debugger;
window.location = res.data.auth_url;
// window.location = 'localhost:3000/safe';
})
// eslint-disable-next-line no-console
.catch((e) => console.log(e));
};
=======
const [openModal, setOpenModal] = useState(false);
const isMobileScreen = useMediaQuery(small);
const handleClose = () => {
setOpenModal(false);
};
const onDashboardClicked = () => {
setOpenModal(true);
};
>>>>>>>
const [openModal, setOpenModal] = useState(false);
const isMobileScreen = useMediaQuery(small);
const handleClose = () => {
setOpenModal(false);
};
const onDashboardClicked = () => {
setOpenModal(true);
initUserLogin()
.then((res) => {
// eslint-disable-next-line no-console
console.log(res);
// eslint-disable-next-line no-debugger
debugger;
window.location = res.data.auth_url;
// window.location = 'localhost:3000/safe';
})
// eslint-disable-next-line no-console
.catch((e) => console.log(e));
};
<<<<<<<
<Container>
<MainContainer Union={Union}>
<HeaderWrap>
<SpeakerText>
<SpeakerWrap src={Speaker} />
<LoginHeaderTextWrap LoginHeaderText={LoginHeaderText} />
</SpeakerText>
</HeaderWrap>
<FirstRow rowCommonCss={rowCommonCss}>
<LeftColumn>
<Title>Welcome to T-Vault</Title>
<Description>{Strings.Resources.tvaultDescription}</Description>
<ButtonWrap>
<ButtonComponent
label="Go to Dashboard"
color="secondary"
onClick={initiateLogin}
/>
<SignUp
href="https://access.t-mobile.com/manage"
target="_blank"
rel="noopener noreferrer"
>
Sign Up
</SignUp>
</ButtonWrap>
</LeftColumn>
<RightColumn AllGroups={AllGroups} />
</FirstRow>
<SecondRow Frame={Frame}>
<CardWrapper rowCommonCss={rowCommonCss}>
<Tile>
<Image src={Store} alt="store" />
<Heading>Store</Heading>
<Details>{Strings.Resources.storeDescription}</Details>
</Tile>
<Tile>
<Image src={Access} alt="access" />
<Heading>Access</Heading>
<Details>{Strings.Resources.accessDescription}</Details>
</Tile>
<Tile>
<Image src={Distribute} alt="distribute" />
<Heading>Distribute</Heading>
<Details>{Strings.Resources.distributeDescription}</Details>
</Tile>
</CardWrapper>
<Instruction>
<strong>Note: </strong>
{Strings.Resources.loginNotes}
</Instruction>
</SecondRow>
<ThirdRow>
Developed by Cloud TeamContact us on{' '}
<a
target="_blank"
rel="noopener noreferrer"
href="https://t-mobile.enterprise.slack.com/?redir=%2Fr-t2678170234%3Fredir%3D%252Fmessages%252FCA5SB94HY"
=======
<>
<LoginModal open={openModal} handleClose={() => handleClose()} />
<Container
Rectangle={Rectangle}
IpadRectangle={IpadRectangle}
MobRectangle={MobRectangle}
>
<MainContainer Union={Union}>
<HeaderWrap>
<SpeakerText>
<SpeakerWrap src={Speaker} />
<LoginHeaderTextWrap LoginHeaderText={LoginHeaderText} />
</SpeakerText>
</HeaderWrap>
<FirstRow rowCommonCss={rowCommonCss}>
<LeftColumn>
<Title>Welcome to T-Vault</Title>
<Description>{Strings.Resources.tvaultDescription}</Description>
<ButtonWrap>
<ButtonComponent
label="Go to Dashboard"
color="secondary"
onClick={() => onDashboardClicked()}
width={isMobileScreen ? '100%' : ''}
/>
<SignUp
href="https://access.t-mobile.com/manage"
target="_blank"
rel="noopener noreferrer"
>
Sign Up
</SignUp>
</ButtonWrap>
</LeftColumn>
<RightColumn AllGroups={AllGroups} />
</FirstRow>
<SecondRow
IpadBackground={IpadBackground}
MobBackground={MobBackground}
>>>>>>>
<>
<LoginModal open={openModal} handleClose={() => handleClose()} />
<Container
Rectangle={Rectangle}
IpadRectangle={IpadRectangle}
MobRectangle={MobRectangle}
>
<MainContainer Union={Union}>
<HeaderWrap>
<SpeakerText>
<SpeakerWrap src={Speaker} />
<LoginHeaderTextWrap LoginHeaderText={LoginHeaderText} />
</SpeakerText>
</HeaderWrap>
<FirstRow rowCommonCss={rowCommonCss}>
<LeftColumn>
<Title>Welcome to T-Vault</Title>
<Description>{Strings.Resources.tvaultDescription}</Description>
<ButtonWrap>
<ButtonComponent
label="Go to Dashboard"
color="secondary"
onClick={() => onDashboardClicked()}
width={isMobileScreen ? '100%' : ''}
/>
<SignUp
href="https://access.t-mobile.com/manage"
target="_blank"
rel="noopener noreferrer"
>
Sign Up
</SignUp>
</ButtonWrap>
</LeftColumn>
<RightColumn AllGroups={AllGroups} />
</FirstRow>
<SecondRow
IpadBackground={IpadBackground}
MobBackground={MobBackground} |
<<<<<<<
const onChangeAppilcationName = (value) => {
setApplicationName(value);
};
=======
const getName = (displayName) => {
if (displayName?.match(/(.*)\[(.*)\]/)) {
const lastFirstName = displayName?.match(/(.*)\[(.*)\]/)[1].split(', ');
const finalName = `${lastFirstName[1]} ${lastFirstName[0]}`;
const optionalDetail = displayName?.match(/(.*)\[(.*)\]/)[2];
return `${finalName}, ${optionalDetail}`;
}
const lastFirstName = displayName?.split(', ');
const finalName = `${lastFirstName[1]} ${lastFirstName[0]}`;
return finalName;
};
>>>>>>>
const onChangeAppilcationName = (value) => {
setApplicationName(value);
};
const getName = (displayName) => {
if (displayName?.match(/(.*)\[(.*)\]/)) {
const lastFirstName = displayName?.match(/(.*)\[(.*)\]/)[1].split(', ');
const finalName = `${lastFirstName[1]} ${lastFirstName[0]}`;
const optionalDetail = displayName?.match(/(.*)\[(.*)\]/)[2];
return `${finalName}, ${optionalDetail}`;
}
const lastFirstName = displayName?.split(', ');
const finalName = `${lastFirstName[1]} ${lastFirstName[0]}`;
return finalName;
}; |
<<<<<<<
/* eslint-disable no-nested-ternary */
/* eslint-disable import/no-unresolved */
/* eslint-disable react/forbid-prop-types */
/* eslint-disable react/require-default-props */
// eslint-disable-next-line react/forbid-prop-types
// eslint-disable-next-line react/require-default-props
=======
>>>>>>>
/* eslint-disable no-nested-ternary */
/* eslint-disable import/no-unresolved */
/* eslint-disable react/forbid-prop-types */
/* eslint-disable react/require-default-props */
// eslint-disable-next-line react/forbid-prop-types
// eslint-disable-next-line react/require-default-props
<<<<<<<
import Error from 'components/Error';
import Loader from 'components/Loader';
=======
import ButtonComponent from '../../../../../components/FormFields/ActionButton';
import ComponentError from '../../../../../errorBoundaries/ComponentError/component-error';
import addFolderPlus from '../../../../../assets/folder-plus.svg';
import NoSecretsIcon from '../../../../../assets/no-data-secrets.svg';
import NamedButton from '../../../../../components/NamedButton';
import NoData from '../../../../../components/NoData';
import mediaBreakpoints from '../../../../../breakpoints';
>>>>>>>
import Error from 'components/Error';
import Loader from 'components/Loader';
import ButtonComponent from '../../../../../components/FormFields/ActionButton';
import ComponentError from '../../../../../errorBoundaries/ComponentError/component-error';
import addFolderPlus from '../../../../../assets/folder-plus.svg';
import NoSecretsIcon from '../../../../../assets/no-data-secrets.svg';
import NamedButton from '../../../../../components/NamedButton';
import NoData from '../../../../../components/NoData';
import mediaBreakpoints from '../../../../../breakpoints'; |
<<<<<<<
const {
aws: { s3 },
testUtils: { randomId },
BucketsConfig
} = require('@cumulus/common');
const { serveDistributionApi } = require('@cumulus/api/bin/serve');
=======
const { aws: { s3 }, testUtils: { randomId } } = require('@cumulus/common');
>>>>>>>
const {
aws: { s3 },
testUtils: { randomId },
BucketsConfig
} = require('@cumulus/common');
<<<<<<<
=======
const protectedBucket = config.buckets.protected.name;
process.env.stackName = config.stackName;
>>>>>>>
const protectedBucket = config.buckets.protected.name;
process.env.stackName = config.stackName;
<<<<<<<
beforeAll(async (done) => {
await Promise.all([
s3().putObject({ Bucket: protectedBucketName, Key: testFileKey, Body: 'test' }).promise(),
s3().putObject({ Bucket: publicBucketName, Key: testFileKey, Body: 'test' }).promise()
]);
=======
beforeAll(async () => {
await s3().putObject({ Bucket: protectedBucket, Key: testFileKey, Body: 'test' }).promise();
>>>>>>>
beforeAll(async () => {
await Promise.all([
s3().putObject({ Bucket: protectedBucketName, Key: testFileKey, Body: 'test' }).promise(),
s3().putObject({ Bucket: publicBucketName, Key: testFileKey, Body: 'test' }).promise()
]);
<<<<<<<
afterAll(async (done) => {
try {
await Promise.all([
s3().deleteObject({ Bucket: protectedBucketName, Key: testFileKey }).promise(),
s3().deleteObject({ Bucket: publicBucketName, Key: testFileKey }).promise(),
accessTokensModel.delete({ accessToken })
]);
}
finally {
stopDistributionApi(server, done);
}
=======
afterAll(async () => {
await Promise.all([
s3().deleteObject({ Bucket: protectedBucket, Key: testFileKey }).promise(),
accessTokensModel.delete({ accessToken })
]);
});
describe('an unauthenticated request', () => {
it('redirects to Earthdata login for requests on /s3credentials endpoint.', async () => {
const response = await invokeApiDistributionLambda('/s3credentials');
const authorizeUrl = new URL(response.headers.location);
expect(authorizeUrl.origin).toEqual(process.env.EARTHDATA_BASE_URL);
expect(authorizeUrl.searchParams.get('state')).toEqual('/s3credentials');
expect(authorizeUrl.pathname).toEqual('/oauth/authorize');
});
>>>>>>>
afterAll(async () => {
await Promise.all([
s3().deleteObject({ Bucket: protectedBucketName, Key: testFileKey }).promise(),
s3().deleteObject({ Bucket: publicBucketName, Key: testFileKey }).promise(),
accessTokensModel.delete({ accessToken })
]);
});
describe('an unauthenticated request', () => {
it('redirects to Earthdata login for requests on /s3credentials endpoint.', async () => {
const response = await invokeApiDistributionLambda('/s3credentials');
const authorizeUrl = new URL(response.headers.location);
expect(authorizeUrl.origin).toEqual(process.env.EARTHDATA_BASE_URL);
expect(authorizeUrl.searchParams.get('state')).toEqual('/s3credentials');
expect(authorizeUrl.pathname).toEqual('/oauth/authorize');
}); |
<<<<<<<
rel="noopener noreferrer"
=======
decoration="none"
>>>>>>>
rel="noopener noreferrer"
decoration="none" |
<<<<<<<
const {
createQueue,
s3,
sqs,
recursivelyDeleteS3Bucket
} = require('@cumulus/common/aws');
=======
const {
createQueue, s3, sqs, recursivelyDeleteS3Bucket
} = require('@cumulus/common/aws');
>>>>>>>
const {
createQueue,
s3,
sqs,
recursivelyDeleteS3Bucket
} = require('@cumulus/common/aws');
<<<<<<<
test('The correct output is returned when granules are queued', async (t) => {
const dataType = `data-type-${randomString().slice(0, 6)}`;
const collectionConfig = { foo: 'bar' };
await t.context.collectionConfigStore.put(dataType, collectionConfig);
const event = t.context.event;
=======
test('The correct output is returned when granules are queued without a PDR', async (t) => {
const { event } = t.context;
event.input.granules = [
{ granuleId: randomString(), files: [] },
{ granuleId: randomString(), files: [] }
];
await validateConfig(t, event.config);
await validateInput(t, event.input);
const output = await queueGranules(event);
await validateOutput(t, output);
t.is(output.running.length, 2);
t.falsy(output.pdr);
});
test('The correct output is returned when granules are queued with a PDR', async (t) => {
const { event } = t.context;
>>>>>>>
test('The correct output is returned when granules are queued without a PDR', async (t) => {
const dataType = `data-type-${randomString().slice(0, 6)}`;
const collectionConfig = { foo: 'bar' };
await t.context.collectionConfigStore.put(dataType, collectionConfig);
const { event } = t.context;
event.input.granules = [
{ dataType, granuleId: randomString(), files: [] },
{ dataType, granuleId: randomString(), files: [] }
];
await validateConfig(t, event.config);
await validateInput(t, event.input);
const output = await queueGranules(event);
await validateOutput(t, output);
t.is(output.running.length, 2);
t.falsy(output.pdr);
});
test('The correct output is returned when granules are queued with a PDR', async (t) => {
const dataType = `data-type-${randomString().slice(0, 6)}`;
const collectionConfig = { foo: 'bar' };
await t.context.collectionConfigStore.put(dataType, collectionConfig);
const { event } = t.context;
<<<<<<<
const dataType = `data-type-${randomString().slice(0, 6)}`;
const collectionConfig = { foo: 'bar' };
await t.context.collectionConfigStore.put(dataType, collectionConfig);
const event = t.context.event;
=======
const { event } = t.context;
>>>>>>>
const dataType = `data-type-${randomString().slice(0, 6)}`;
const collectionConfig = { foo: 'bar' };
await t.context.collectionConfigStore.put(dataType, collectionConfig);
const { event } = t.context;
<<<<<<<
// Get messages from the queue
const receiveMessageResponse = await sqs().receiveMessage({
QueueUrl: t.context.event.config.queueUrl,
MaxNumberOfMessages: 10,
WaitTimeSeconds: 1
}).promise();
const messages = receiveMessageResponse.Messages.map((message) => JSON.parse(message.Body));
t.is(messages.length, 1);
t.deepEqual(messages[0], expectedMessage);
=======
const message = JSON.parse(messages[0].Body);
t.truthy(message.cumulus_meta.execution_name);
expectedMessage.cumulus_meta.execution_name = message.cumulus_meta.execution_name;
t.deepEqual(message, expectedMessage);
>>>>>>>
});
test.afterEach(async (t) => {
await Promise.all([
recursivelyDeleteS3Bucket(t.context.internalBucket),
recursivelyDeleteS3Bucket(t.context.templateBucket),
sqs().deleteQueue({ QueueUrl: t.context.event.config.queueUrl }).promise()
]);
});
test('The correct output is returned when granules are queued without a PDR', async (t) => {
const dataType = `data-type-${randomString().slice(0, 6)}`;
const collectionConfig = { foo: 'bar' };
await t.context.collectionConfigStore.put(dataType, collectionConfig);
const { event } = t.context;
event.input.granules = [
{ dataType, granuleId: randomString(), files: [] },
{ dataType, granuleId: randomString(), files: [] }
];
await validateConfig(t, event.config);
await validateInput(t, event.input);
const output = await queueGranules(event);
await validateOutput(t, output);
t.is(output.running.length, 2);
t.falsy(output.pdr);
});
test('The correct output is returned when granules are queued with a PDR', async (t) => {
const dataType = `data-type-${randomString().slice(0, 6)}`;
const collectionConfig = { foo: 'bar' };
await t.context.collectionConfigStore.put(dataType, collectionConfig);
const { event } = t.context;
event.input.granules = [
{ dataType, granuleId: randomString(), files: [] },
{ dataType, granuleId: randomString(), files: [] }
];
event.input.pdr = { name: randomString(), path: randomString() };
await validateConfig(t, event.config);
await validateInput(t, event.input);
const output = await queueGranules(event);
await validateOutput(t, output);
t.is(output.running.length, 2);
t.deepEqual(output.pdr, event.input.pdr);
});
test('The correct output is returned when no granules are queued', async (t) => {
const dataType = `data-type-${randomString().slice(0, 6)}`;
const collectionConfig = { foo: 'bar' };
await t.context.collectionConfigStore.put(dataType, collectionConfig);
const { event } = t.context;
event.input.granules = [];
await validateConfig(t, event.config);
await validateInput(t, event.input);
const output = await queueGranules(event);
await validateOutput(t, output);
t.is(output.running.length, 0);
});
test('Granules are added to the queue', async (t) => {
const dataType = `data-type-${randomString().slice(0, 6)}`;
const collectionConfig = { foo: 'bar' };
await t.context.collectionConfigStore.put(dataType, collectionConfig);
const { event } = t.context;
event.input.granules = [
{ dataType, granuleId: randomString(), files: [] },
{ dataType, granuleId: randomString(), files: [] }
];
await validateConfig(t, event.config);
await validateInput(t, event.input);
const output = await queueGranules(event);
await validateOutput(t, output);
// Get messages from the queue
const receiveMessageResponse = await sqs().receiveMessage({
QueueUrl: t.context.event.config.queueUrl,
MaxNumberOfMessages: 10,
WaitTimeSeconds: 1
}).promise();
const messages = receiveMessageResponse.Messages;
t.is(messages.length, 2);
});
test('The correct message is enqueued without a PDR', async (t) => {
const event = t.context.event;
const granule1 = {
dataType: `data-type-${randomString().slice(0, 6)}`,
granuleId: `granule-${randomString().slice(0, 6)}`,
files: [{ name: `file-${randomString().slice(0, 6)}` }]
};
const collectionConfig1 = { name: `collection-config-${randomString().slice(0, 6)}` };
const granule2 = {
dataType: `data-type-${randomString().slice(0, 6)}`,
granuleId: `granule-${randomString().slice(0, 6)}`,
files: [{ name: `file-${randomString().slice(0, 6)}` }]
};
const collectionConfig2 = { name: `collection-config-${randomString().slice(0, 6)}` };
event.input.granules = [granule1, granule2];
await Promise.all([
t.context.collectionConfigStore.put(granule1.dataType, collectionConfig1),
t.context.collectionConfigStore.put(granule2.dataType, collectionConfig2)
]);
await validateConfig(t, event.config);
await validateInput(t, event.input);
const output = await queueGranules(event);
await validateOutput(t, output);
// Get messages from the queue
const receiveMessageResponse = await sqs().receiveMessage({
QueueUrl: t.context.event.config.queueUrl,
MaxNumberOfMessages: 10,
WaitTimeSeconds: 1
}).promise();
const messages = receiveMessageResponse.Messages.map((message) => JSON.parse(message.Body));
t.is(messages.length, 2);
const message1 = messages.find((message) =>
message.payload.granules[0].granuleId === granule1.granuleId);
t.truthy(message1);
t.deepEqual(
message1,
{
cumulus_meta: {
// The execution name is randomly generated, so we don't care what the value is here
execution_name: message1.cumulus_meta.execution_name,
state_machine: t.context.stateMachineArn
},
meta: {
collection: collectionConfig1,
provider: { name: 'provider-name' }
},
payload: {
granules: [
{
granuleId: granule1.granuleId,
files: granule1.files
}
]
}
}
);
const message2 = messages.find((message) =>
message.payload.granules[0].granuleId === granule2.granuleId);
t.truthy(message2);
t.deepEqual(
message2,
{
cumulus_meta: {
// The execution name is randomly generated, so we don't care what the value is here
execution_name: message2.cumulus_meta.execution_name,
state_machine: t.context.stateMachineArn
},
meta: {
collection: collectionConfig2,
provider: { name: 'provider-name' }
},
payload: {
granules: [
{
granuleId: granule2.granuleId,
files: granule2.files
}
]
}
}
);
});
test('The correct message is enqueued with a PDR', async (t) => {
const event = t.context.event;
const pdrName = `pdr-name-${randomString()}`;
const pdrPath = `pdr-path-${randomString()}`;
event.input.pdr = { name: pdrName, path: pdrPath };
const granule1 = {
dataType: `data-type-${randomString().slice(0, 6)}`,
granuleId: `granule-${randomString().slice(0, 6)}`,
files: [{ name: `file-${randomString().slice(0, 6)}` }]
};
const collectionConfig1 = { name: `collection-config-${randomString().slice(0, 6)}` };
const granule2 = {
dataType: `data-type-${randomString().slice(0, 6)}`,
granuleId: `granule-${randomString().slice(0, 6)}`,
files: [{ name: `file-${randomString().slice(0, 6)}` }]
};
const collectionConfig2 = { name: `collection-config-${randomString().slice(0, 6)}` };
event.input.granules = [granule1, granule2];
await Promise.all([
t.context.collectionConfigStore.put(granule1.dataType, collectionConfig1),
t.context.collectionConfigStore.put(granule2.dataType, collectionConfig2)
]);
await validateConfig(t, event.config);
await validateInput(t, event.input);
const output = await queueGranules(event);
await validateOutput(t, output);
// Get messages from the queue
const receiveMessageResponse = await sqs().receiveMessage({
QueueUrl: t.context.event.config.queueUrl,
MaxNumberOfMessages: 10,
WaitTimeSeconds: 1
}).promise();
const messages = receiveMessageResponse.Messages.map((message) => JSON.parse(message.Body));
t.is(messages.length, 2);
const message1 = messages.find((message) =>
message.payload.granules[0].granuleId === granule1.granuleId);
t.truthy(message1);
t.deepEqual(
message1,
{
cumulus_meta: {
// The execution name is randomly generated, so we don't care what the value is here
execution_name: message1.cumulus_meta.execution_name,
state_machine: t.context.stateMachineArn
},
meta: {
pdr: event.input.pdr,
collection: collectionConfig1,
provider: { name: 'provider-name' }
},
payload: {
granules: [
{
granuleId: granule1.granuleId,
files: granule1.files
}
]
}
}
);
const message2 = messages.find((message) =>
message.payload.granules[0].granuleId === granule2.granuleId);
t.truthy(message2);
t.deepEqual(
message2,
{
cumulus_meta: {
// The execution name is randomly generated, so we don't care what the value is here
execution_name: message2.cumulus_meta.execution_name,
state_machine: t.context.stateMachineArn
},
meta: {
pdr: event.input.pdr,
collection: collectionConfig2,
provider: { name: 'provider-name' }
},
payload: {
granules: [
{
granuleId: granule2.granuleId,
files: granule2.files
}
]
}
}
); |
<<<<<<<
const onServiceAccountEdit = () => {};
const onTransferOwnerClicked = (name) => {
setTransferSvcAccountConfirmation(true);
setTransferName(name);
};
const onTransferOwnerCancelClicked = () => {
setTransferSvcAccountConfirmation(false);
setTransferResponse(false);
};
const onTranferConfirmationClicked = () => {
setTransferSvcAccountConfirmation(false);
apiService
.transferOwner(transferName)
.then(async (res) => {
setTransferResponse(true);
setTransferSvcAccountConfirmation(true);
if (res?.data?.messages && res.data.messages[0]) {
setTransferResponseDesc(res.data.messages[0]);
}
await fetchData();
})
.catch(() => {
setToast(-1);
});
};
=======
>>>>>>>
/**
* @function onTransferOwnerClicked
* @description function open transfer owner modal.
*/
const onTransferOwnerClicked = (name) => {
setTransferSvcAccountConfirmation(true);
setTransferName(name);
};
/**
* @function onTransferOwnerCancelClicked
* @description function to handle the close of transfer owner modal.
*/
const onTransferOwnerCancelClicked = () => {
setTransferSvcAccountConfirmation(false);
setTransferResponse(false);
};
const onTranferConfirmationClicked = () => {
setStatus({ status: 'loading' });
setTransferSvcAccountConfirmation(false);
apiService
.transferOwner(transferName)
.then(async (res) => {
setTransferResponse(true);
setTransferSvcAccountConfirmation(true);
if (res?.data?.messages && res.data.messages[0]) {
setTransferResponseDesc(res.data.messages[0]);
}
await fetchData();
})
.catch(() => {
setToast(-1);
});
};
<<<<<<<
onDeleteClicked={() => onDeleteClicked()}
onEditClicked={() => onServiceAccountEdit()}
admin={contextObj.isAdmin}
onTransferOwnerClicked={() =>
onTransferOwnerClicked(account.name)
}
=======
onDeleteClicked={() => onDeleteClicked(account.name)}
onEditClicked={() => onServiceAccountEdit(account.name)}
>>>>>>>
onDeleteClicked={() => onDeleteClicked(account.name)}
onEditClicked={() => onServiceAccountEdit(account.name)}
admin={contextObj.isAdmin}
onTransferOwnerClicked={() =>
onTransferOwnerClicked(account.name)
} |
<<<<<<<
import ComponentError from 'errorBoundaries/ComponentError/component-error';
=======
import AutoCompleteComponent from 'components/FormFields/AutoComplete';
import apiService from '../../apiService';
import data from './__mock__/data';
>>>>>>>
import ComponentError from 'errorBoundaries/ComponentError/component-error';
import AutoCompleteComponent from 'components/FormFields/AutoComplete';
import apiService from '../../apiService';
import data from './__mock__/data';
<<<<<<<
<ComponentError>
<PermissionWrapper>
<UserHeader>Add User</UserHeader>
<InputRadioWrapper>
<InputWrapper>
<InputLabel>User Email</InputLabel>
<Autocomplete
id="combo-box-demo"
options={data}
getOptionLabel={(option) => option.title}
renderInput={(params) => (
<TextField
// eslint-disable-next-line react/jsx-props-no-spreading
{...params}
onChange={(e) => setSearchValue(e.target.value)}
/>
)}
/>
</InputWrapper>
<FormControl component="fieldset">
<RadioGroup
row
aria-label="permissions"
name="permissions1"
value={value}
onChange={handleChange}
>
<FormControlLabel
value="read"
control={<Radio color="default" />}
label="Read"
/>
<FormControlLabel
value="write"
control={<Radio color="default" />}
label="Write"
/>
</RadioGroup>
</FormControl>
</InputRadioWrapper>
<CancelSaveWrapper>
<CancelButton>
<ButtonComponent label="Cancel" buttonType="containedPrimary" />
</CancelButton>
<ButtonComponent
label="Create"
icon="add"
buttonType="containedSecondary"
/>
</CancelSaveWrapper>
</PermissionWrapper>
</ComponentError>
=======
<PermissionWrapper>
<HeaderWrapper>
<Typography variant="h5">Add User</Typography>
<div>
<RequiredCircle />
<RequiredText>Required</RequiredText>
</div>
</HeaderWrapper>
<InputWrapper>
<InputLabel>
User Email
<RequiredCircle margin="0.5rem" />
</InputLabel>
<AutoCompleteComponent
options={options}
icon="search"
classes={classes}
searchValue={searchValue}
onSelected={(e, val) => onSelected(e, val)}
onChange={(e) => onSearchChange(e)}
/>
<InstructionText>
Search the T-Mobile system to add users
</InstructionText>
</InputWrapper>
<RadioButtonWrapper>
<FormControl component="fieldset">
<RadioGroup
row
aria-label="permissions"
name="permissions1"
value={radioValue}
onChange={handleChange}
>
<FormControlLabel
value="read"
control={<Radio color="default" />}
label="Read"
/>
<FormControlLabel
value="write"
control={<Radio color="default" />}
label="Write"
/>
</RadioGroup>
</FormControl>
<CancelSaveWrapper>
<CancelButton>
<ButtonComponent label="Cancel" color="primary" />
</CancelButton>
<ButtonComponent
label="Save"
color="secondary"
disabled={disabledSave}
/>
</CancelSaveWrapper>
</RadioButtonWrapper>
</PermissionWrapper>
>>>>>>>
<ComponentError>
<PermissionWrapper>
<HeaderWrapper>
<Typography variant="h5">Add User</Typography>
<div>
<RequiredCircle />
<RequiredText>Required</RequiredText>
</div>
</HeaderWrapper>
<InputWrapper>
<InputLabel>
User Email
<RequiredCircle margin="0.5rem" />
</InputLabel>
<AutoCompleteComponent
options={options}
icon="search"
classes={classes}
searchValue={searchValue}
onSelected={(e, val) => onSelected(e, val)}
onChange={(e) => onSearchChange(e)}
/>
<InstructionText>
Search the T-Mobile system to add users
</InstructionText>
</InputWrapper>
<RadioButtonWrapper>
<FormControl component="fieldset">
<RadioGroup
row
aria-label="permissions"
name="permissions1"
value={radioValue}
onChange={handleChange}
>
<FormControlLabel
value="read"
control={<Radio color="default" />}
label="Read"
/>
<FormControlLabel
value="write"
control={<Radio color="default" />}
label="Write"
/>
</RadioGroup>
</FormControl>
<CancelSaveWrapper>
<CancelButton>
<ButtonComponent label="Cancel" color="primary" />
</CancelButton>
<ButtonComponent
label="Save"
color="secondary"
disabled={disabledSave}
/>
</CancelSaveWrapper>
</RadioButtonWrapper>
</PermissionWrapper>
</ComponentError> |
<<<<<<<
const updateCert = (payload) => api.put('/sslcert/', payload);
=======
const onOnboardcertificate = (payload) =>
api.post('/sslcert/onboardSSLcertificate', payload);
>>>>>>>
const updateCert = (payload) => api.put('/sslcert/', payload);
const onOnboardcertificate = (payload) =>
api.post('/sslcert/onboardSSLcertificate', payload);
<<<<<<<
updateCert,
=======
onOnboardcertificate,
>>>>>>>
updateCert,
onOnboardcertificate, |
<<<<<<<
appRoles:
'AppRoles operate a lot like safes, but they put the aplication as the logical unit for sharing. Additional Accersor ID and Secret ID pairs can easily be created through T-Vault, Secret IDs can only be accessed when downloaded',
=======
appRoles: '',
certificateDesc:
'Create both internal and external certificates, External certificates do require approval from an admin before activating, this may take some time. Try to limit your use of external certificates unless completely nessary.',
>>>>>>>
appRoles:
'AppRoles operate a lot like safes, but they put the aplication as the logical unit for sharing. Additional Accersor ID and Secret ID pairs can easily be created through T-Vault, Secret IDs can only be accessed when downloaded',
certificateDesc:
'Create both internal and external certificates, External certificates do require approval from an admin before activating, this may take some time. Try to limit your use of external certificates unless completely nessary.', |
<<<<<<<
Button,
=======
StyledButton,
Subheading,
>>>>>>>
Button,
<<<<<<<
=======
import useSiteMetadata from '../lib/useSiteMetadata';
import { contentLeftPadding, contentRightPadding } from '../screens/DocsScreen/DocsScreen';
import buildPathWithFramework from '../../util/build-path-with-framework';
import { FrameworkSelector } from '../screens/DocsScreen/FrameworkSelector';
import stylizeFramework from '../../util/stylize-framework';
>>>>>>>
import useSiteMetadata from '../lib/useSiteMetadata';
import buildPathWithFramework from '../../util/build-path-with-framework';
import { FrameworkSelector } from '../screens/DocsScreen/FrameworkSelector';
import stylizeFramework from '../../util/stylize-framework'; |
<<<<<<<
docsToc {
title
prefix
pages
}
=======
contributorCount
>>>>>>>
docsToc {
title
prefix
pages
}
contributorCount |
<<<<<<<
docsToc,
=======
contributorCount: 1035,
>>>>>>>
docsToc,
contributorCount: 1035, |
<<<<<<<
=======
const s3Mixin = require('./s3').s3Mixin;
const aws = require('@cumulus/common/aws');
const { S3 } = require('./aws');
const queue = require('./queue');
>>>>>>>
<<<<<<<
=======
* This is a base class for discovering PDRs
* It must be mixed with a FTP, HTTP or S3 mixing to work
*
* @class
* @abstract
*/
class DiscoverAndQueue extends Discover {
async findNewPdrs(pdrs) {
let newPdrs = await super.findNewPdrs(pdrs);
if (this.limit) newPdrs = newPdrs.slice(0, this.limit);
return Promise.all(newPdrs.map((p) => queue.queuePdr(
this.queueUrl,
this.templateUri,
this.provider,
this.collection,
p
)));
}
}
/**
>>>>>>>
<<<<<<<
=======
* This is a base class for discovering PDRs
* It must be mixed with a FTP, HTTP or S3 mixing to work
*
* @class
* @abstract
*/
class ParseAndQueue extends Parse {
async ingest() {
const payload = await super.ingest();
const collections = {};
//payload.granules = payload.granules.slice(0, 10);
// make sure all parsed granules have the correct collection
for (const g of payload.granules) {
if (!collections[g.dataType]) {
// if the collection is not provided in the payload
// get it from S3
if (g.dataType !== this.collection.name) {
const bucket = this.bucket;
const key = `${this.stack}` +
`/collections/${g.dataType}.json`;
let file;
try {
file = await S3.get(bucket, key);
}
catch (e) {
throw new MismatchPdrCollection(
`${g.dataType} dataType in ${this.pdr.name} doesn't match ${this.collection.name}`
);
}
collections[g.dataType] = JSON.parse(file.Body.toString());
}
else {
collections[g.dataType] = this.collection;
}
}
g.granuleId = this.extractGranuleId(
g.files[0].name,
collections[g.dataType].granuleIdExtraction
);
}
log.info(`Queueing ${payload.granules.length} granules to be processed`);
const names = await Promise.all(
payload.granules.map((g) => queue.queueGranule(
g,
this.queueUrl,
this.templateUri,
this.provider,
collections[g.dataType],
this.pdr,
this.stack,
this.bucket
))
);
let isFinished = false;
const running = names.filter((n) => n[0] === 'running').map((n) => n[1]);
const completed = names.filter((n) => n[0] === 'completed').map((n) => n[1]);
const failed = names.filter((n) => n[0] === 'failed').map((n) => n[1]);
if (running.length === 0) {
isFinished = true;
}
return { running, completed, failed, isFinished };
}
}
/**
>>>>>>>
<<<<<<<
=======
* Discover PDRs from a S3 endpoint.
*
* @class
*/
class S3Discover extends s3Mixin(Discover) {}
/**
* Discover and Queue PDRs from a FTP endpoint.
*
* @class
*/
class FtpDiscoverAndQueue extends ftpMixin(baseProtocol(DiscoverAndQueue)) {}
/**
* Discover and Queue PDRs from a HTTP endpoint.
*
* @class
*/
class HttpDiscoverAndQueue extends httpMixin(baseProtocol(DiscoverAndQueue)) {}
/**
* Discover and Queue PDRs from a SFTP endpoint.
*
* @class
*/
class SftpDiscoverAndQueue extends sftpMixin(baseProtocol(DiscoverAndQueue)) {}
/**
* Discover and Queue PDRs from a S3 endpoint.
*
* @class
*/
class S3DiscoverAndQueue extends s3Mixin(DiscoverAndQueue) {}
/**
>>>>>>>
* Discover PDRs from a S3 endpoint.
*
* @class
*/
class S3Discover extends s3Mixin(baseProtocol(Discover)) {}
/**
<<<<<<<
=======
* Parse PDRs downloaded from a S3 endpoint.
*
* @class
*/
class S3Parse extends s3Mixin(Parse) {}
/**
* Parse and Queue PDRs downloaded from a FTP endpoint.
*
* @class
*/
class FtpParseAndQueue extends ftpMixin(baseProtocol(ParseAndQueue)) {}
/**
* Parse and Queue PDRs downloaded from a HTTP endpoint.
*
* @class
*/
class HttpParseAndQueue extends httpMixin(baseProtocol(ParseAndQueue)) {}
/**
* Parse and Queue PDRs downloaded from a SFTP endpoint.
*
* @classc
*/
class SftpParseAndQueue extends sftpMixin(baseProtocol(ParseAndQueue)) {}
/**
* Parse and Queue PDRs downloaded from a S3 endpoint.
*
* @classc
*/
class S3ParseAndQueue extends s3Mixin(ParseAndQueue) {}
/**
>>>>>>>
* Parse PDRs downloaded from a S3 endpoint.
*
* @class
*/
class S3Parse extends s3Mixin(baseProtocol(Parse)) {}
/**
<<<<<<<
* @param {string} protocol - `sftp`, `ftp`, or `http`
=======
* @param {string} protocol - `sftp`, `ftp`, `http` or 's3'
* @param {boolean} q - set to `true` to queue pdrs
>>>>>>>
* @param {string} protocol - `sftp`, `ftp`, `http` or 's3'
<<<<<<<
return SftpDiscover;
=======
return q ? SftpDiscoverAndQueue : SftpDiscover;
case 's3':
return q ? S3DiscoverAndQueue : S3Discover;
>>>>>>>
return SftpDiscover;
case 's3':
return S3Discover;
<<<<<<<
return SftpParse;
=======
return q ? SftpParseAndQueue : SftpParse;
case 's3':
return q ? S3ParseAndQueue : S3Parse;
>>>>>>>
return SftpParse;
case 's3':
return S3Parse;
<<<<<<<
module.exports.SftpDiscover = SftpDiscover;
=======
module.exports.SftpDiscover = SftpDiscover;
module.exports.S3Discover = S3Discover;
module.exports.FtpDiscoverAndQueue = FtpDiscoverAndQueue;
module.exports.HttpDiscoverAndQueue = HttpDiscoverAndQueue;
module.exports.SftpDiscoverAndQueue = SftpDiscoverAndQueue;
module.exports.S3DiscoverAndQueue = S3DiscoverAndQueue;
>>>>>>>
module.exports.HttpParse = HttpParse;
module.exports.S3Discover = S3Discover;
module.exports.S3Parse = S3Parse;
module.exports.SftpDiscover = SftpDiscover;
module.exports.SftpParse = SftpParse; |
<<<<<<<
},
/**
* Overrides base "remove" function to forget about the underlying
* model and collection and to propagate the request to the encapsulated
* view.
*
* Note that the view is not operational anymore after a call to "remove".
*
* @function
*/
remove: function () {
logger.log(this.logid, 'remove');
UIElement.prototype.remove.call(this);
this.model = null;
this.collection = null;
this.viewFactory = null;
this.needsUpdate = null;
if (this.view) {
this.view.remove();
this.view = null;
}
=======
},
scrollTop: function() {
this.view.scrollTop();
>>>>>>>
},
/**
* Overrides base "remove" function to forget about the underlying
* model and collection and to propagate the request to the encapsulated
* view.
*
* Note that the view is not operational anymore after a call to "remove".
*
* @function
*/
remove: function () {
logger.log(this.logid, 'remove');
UIElement.prototype.remove.call(this);
this.model = null;
this.collection = null;
this.viewFactory = null;
this.needsUpdate = null;
if (this.view) {
this.view.remove();
this.view = null;
}
},
scrollTop: function() {
this.view.scrollTop(); |
<<<<<<<
options = options || {};
// Initialize the instance ID for logging purpose as needed
this.initializeLogId(options);
logger.log(this.logid, 'initialize');
if (options.template) {
=======
if (typeof options.template === 'string') {
>>>>>>>
options = options || {};
// Initialize the instance ID for logging purpose as needed
this.initializeLogId(options);
logger.log(this.logid, 'initialize');
if (typeof options.template === 'string') { |
<<<<<<<
},
/**
* Overrides base "remove" function to propagate the request to the
* view's children.
*
* Note that the view is not operational anymore after a call to "remove".
*
* @function
*/
remove: function () {
UIElement.prototype.remove.call(this);
_.each(this.children, function (child) {
this.stopListening(child);
child.remove();
}, this);
this.children = null;
=======
},
/**
* Scrolls to top and asks its children to do the same
*/
scrollTop: function() {
UIElement.prototype.scrollTop.call(this);
this.scrollTopChildren();
},
scrollTopChildren: function() {
if (this.children) {
_.each(this.children, function(child) {
child.scrollTop();
});
}
>>>>>>>
},
/**
* Overrides base "remove" function to propagate the request to the
* view's children.
*
* Note that the view is not operational anymore after a call to "remove".
*
* @function
*/
remove: function () {
UIElement.prototype.remove.call(this);
_.each(this.children, function (child) {
this.stopListening(child);
child.remove();
}, this);
this.children = null;
},
/**
* Scrolls to top and asks its children to do the same
*/
scrollTop: function() {
UIElement.prototype.scrollTop.call(this);
this.scrollTopChildren();
},
scrollTopChildren: function() {
if (this.children) {
_.each(this.children, function(child) {
child.scrollTop();
});
} |
<<<<<<<
!function(t){function e(o){if(i[o])return i[o].exports;var n=i[o]={exports:{},id:o,loaded:!1};return t[o].call(n.exports,n,n.exports,e),n.loaded=!0,n.exports}var i={};return e.m=t,e.c=i,e.p="",e(0)}([function(t,e,i){i(3),i(1),t.exports=i(4)},function(t,e,i){"use strict";function o(t){return t&&t.__esModule?t:{"default":t}}var n=i(2),s=o(n);(0,s["default"])()},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e["default"]=function(){var t=document.getElementById("icon-bars"),e=document.getElementById("sidebar"),i=document.getElementById("close-menu");t&&t.addEventListener("click",function(t){t.preventDefault(),e.classList.add("active")}),i&&i.addEventListener("click",function(t){t.preventDefault(),e.classList.remove("active")})},t.exports=e["default"]},function(t,e){/*!
=======
!function(t){function e(o){if(i[o])return i[o].exports;var n=i[o]={exports:{},id:o,loaded:!1};return t[o].call(n.exports,n,n.exports,e),n.loaded=!0,n.exports}var i={};return e.m=t,e.c=i,e.p="",e(0)}([function(t,e,i){i(3),i(4),i(1),t.exports=i(5)},function(t,e,i){"use strict";function o(t){return t&&t.__esModule?t:{"default":t}}var n=i(2),s=o(n);(0,s["default"])()},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e["default"]=function(){var t=document.getElementById("icon-bars"),e=document.getElementById("sidebar"),i=document.getElementById("close-menu"),o=document.body;t&&t.addEventListener("click",function(t){t.preventDefault(),e.classList.add("active"),o.classList.add("menu-open")}),i&&i.addEventListener("click",function(t){t.preventDefault(),e.classList.remove("active"),o.classList.remove("menu-open")})},t.exports=e["default"]},function(t,e){/*!
>>>>>>>
!function(t){function e(o){if(i[o])return i[o].exports;var n=i[o]={exports:{},id:o,loaded:!1};return t[o].call(n.exports,n,n.exports,e),n.loaded=!0,n.exports}var i={};return e.m=t,e.c=i,e.p="",e(0)}([function(t,e,i){i(3),i(1),t.exports=i(4)},function(t,e,i){"use strict";function o(t){return t&&t.__esModule?t:{"default":t}}var n=i(2),s=o(n);(0,s["default"])()},function(t,e){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e["default"]=function(){var t=document.getElementById("icon-bars"),e=document.getElementById("sidebar"),i=document.getElementById("close-menu"),o=document.body;t&&t.addEventListener("click",function(t){t.preventDefault(),e.classList.add("active"),o.classList.add("menu-open")}),i&&i.addEventListener("click",function(t){t.preventDefault(),e.classList.remove("active"),o.classList.remove("menu-open")})},t.exports=e["default"]},function(t,e){/*! |
<<<<<<<
const Hydra = require('./../index.js')
=======
//const Hydra = require('./../src/index.js')
const Hydra = require('./../')
const Analyzer = require('web-audio-analyser')
const getUserMedia = require('getusermedia')
>>>>>>>
const Hydra = require('./../index.js')
<<<<<<<
const canvas = document.createElement('canvas')
canvas.style.backgroundColor = "#000"
canvas.width = 800
canvas.height = 200
canvas.style.width = '100%'
canvas.style.height = '100%'
// var ctx = canvas.getContext('2d')
// ctx.moveTo(0, 0);
// ctx.lineTo(200, 100);
// ctx.stroke();
document.body.appendChild(canvas)
=======
>>>>>>>
const canvas = document.createElement('canvas')
canvas.style.backgroundColor = "#000"
canvas.width = 800
canvas.height = 200
canvas.style.width = '100%'
canvas.style.height = '100%'
// var ctx = canvas.getContext('2d')
// ctx.moveTo(0, 0);
// ctx.lineTo(200, 100);
// ctx.stroke();
document.body.appendChild(canvas)
<<<<<<<
// autoLoad: false
canvas: canvas,
=======
// autoLoad: false
>>>>>>>
// autoLoad: false
canvas: canvas,
<<<<<<<
=======
// set bpm
bpm(30)
>>>>>>>
// set bpm
bpm(30)
<<<<<<<
x++
// ctx.moveTo(x, 0);
// ctx.lineTo(200, 100);
// ctx.stroke();
// ctx.fillStyle = 'green';
// ctx.fillRect(10, 10, 100, 100);
=======
>>>>>>> |
<<<<<<<
self.video = response.video
self.src = self.video
self.tex = self.regl.texture(self.video)
=======
self.src = response.video
self.tex = self.regl.texture(self.src)
>>>>>>>
self.src = response.video
self.tex = self.regl.texture(self.src)
<<<<<<<
this.pb.initSource(streamName, function(stream){
console.log("GOT STREAM", stream)
const video = document.createElement('video')
// video.src = URL.createObjectURL(localStream)
video.srcObject = stream
video.addEventListener('loadedmetadata', () => {
self.video = video
self.tex = self.regl.texture(self.video)
})
self.video = video
self.src = self.video
})
// console.log("STREAM", opts.stream)
=======
var self = this
this.pb.initSource(streamName)
pb.on('got video', function(id, video){
self.src = video
self.tex = self.regl.texture(self.src)
})
>>>>>>>
this.pb.initSource(streamName, function(stream){
console.log("GOT STREAM", stream)
const video = document.createElement('video')
// video.src = URL.createObjectURL(localStream)
video.srcObject = stream
video.addEventListener('loadedmetadata', () => {
self.video = video
self.tex = self.regl.texture(self.video)
self.src = self.video
})
})
// console.log("STREAM", opts.stream)
<<<<<<<
self.video = response.video
self.src = self.video
self.tex = self.regl.texture(self.video)
=======
self.src = response.video
self.tex = self.regl.texture(self.src)
>>>>>>>
self.src = response.video
self.tex = self.regl.texture(self.src) |
<<<<<<<
const GeneratorFactory = require('./src/GeneratorFactory.js')
const mouse = require('mouse-change')()
const Audio = require('./src/audio.js')
const VidRecorder = require('./src/video-recorder.js')
=======
//const GeneratorFactory = require('./src/GeneratorFactory.js')
//const RenderPasses = require('./RenderPasses.js')
const Mouse = require('mouse-change')()
const Audio = require('./src/lib/audio.js')
const VidRecorder = require('./src/lib/video-recorder.js')
const ArrayUtils = require('./src/lib/array-utils.js')
const Synth = require('./src/create-synth.js')
>>>>>>>
const Mouse = require('mouse-change')()
const Audio = require('./src/lib/audio.js')
const VidRecorder = require('./src/lib/video-recorder.js')
const ArrayUtils = require('./src/lib/array-utils.js')
const Synth = require('./src/create-synth.js')
<<<<<<<
canvas,
precision = 'mediump'
=======
extendTransforms = {},
canvas
>>>>>>>
canvas,
precision = 'mediump',
extendTransforms = {} // add your own functions on init
<<<<<<<
// only allow valid precision options
let precisionOptions = ['lowp','mediump','highp']
let precisionValid = precisionOptions.includes(precision.toLowerCase())
this.precision = precisionValid ? precision.toLowerCase() : 'mediump'
if(!precisionValid){
console.warn('[hydra-synth warning]\nConstructor was provided an invalid floating point precision value of "' + precision + '". Using default value of "mediump" instead.')
}
=======
this.extendTransforms = extendTransforms
>>>>>>>
// only allow valid precision options
let precisionOptions = ['lowp','mediump','highp']
let precisionValid = precisionOptions.includes(precision.toLowerCase())
this.precision = precisionValid ? precision.toLowerCase() : 'mediump'
if(!precisionValid){
console.warn('[hydra-synth warning]\nConstructor was provided an invalid floating point precision value of "' + precision + '". Using default value of "mediump" instead.')
}
this.extendTransforms = extendTransforms
<<<<<<<
var o = new Output({
regl: this.regl,
width: this.width,
height: this.height,
precision: this.precision
})
o.render()
=======
var o = new Output({regl: this.regl, width: this.width, height: this.height})
// o.render()
>>>>>>>
var o = new Output({
regl: this.regl,
width: this.width,
height: this.height,
precision: this.precision
})
// o.render()
<<<<<<<
const self = this
const gen = new GeneratorFactory(this.o[0], this.precision)
window.generator = gen
Object.keys(gen.functions).forEach((key)=>{
self[key] = gen.functions[key]
if(self.makeGlobal === true) {
window[key] = gen.functions[key]
=======
// const self = this
// const gen = new GeneratorFactory(this.o[0])
// window.generator = gen
// Object.keys(gen.functions).forEach((key)=>{
// self[key] = gen.functions[key]
// if(self.makeGlobal === true) {
// window[key] = gen.functions[key]
// }
// })
this.synth = new Synth(this.o[0], this.extendTransforms, ({type, method, synth}) => {
if (this.makeGlobal) {
if (type === 'add') {
window[method] = synth.generators[method]
} else if (type === 'remove') {
delete window[method]
}
>>>>>>>
this.synth = new Synth(this.o[0], this.extendTransforms, ({type, method, synth}) => {
if (this.makeGlobal) {
if (type === 'add') {
window[method] = synth.generators[method]
} else if (type === 'remove') {
delete window[method]
} |
<<<<<<<
const logger = require('@cumulus/ingest/log');
const local = require('@cumulus/common/local-helpers');
const log = logger.child({ file: 'sync-granule/index.js' });
=======
const log = require('@cumulus/common/log');
>>>>>>>
const local = require('@cumulus/common/local-helpers');
const log = require('@cumulus/common/log'); |
<<<<<<<
return output.indexOf("GET http://localhost:1337/underscore/-/underscore-1.3.1.tgz") > -1
=======
return output.indexOf("http GET " + common.registry + "/underscore/-/underscore-1.3.1.tgz") > -1
>>>>>>>
return output.indexOf("GET " + common.registry + "/underscore/-/underscore-1.3.1.tgz") > -1 |
<<<<<<<
console.log
( ["\nUsage: " + npm.name + " <command>"
=======
console.log(
[ "\nUsage: npm <command>"
>>>>>>>
console.log(
[ "\nUsage: " + npm.name + " <command>" |
<<<<<<<
m = m.split(')').shift()
var literal = m.match(/^('[^']+'|"[^"]+")$/)
=======
m = m.split(")").shift()
var literal = m.match(/^['"].+['"]$/)
>>>>>>>
m = m.split(")").shift()
var literal = m.match(/^('[^']+'|"[^"]+")$/) |
<<<<<<<
=======
if (section === "help" && num === 1) {
section = !npm.config.get("usage") && "npm"
}
>>>>>>>
<<<<<<<
var sectionPath = path.resolve(__dirname, "..", "man1", section+".1")
, htmlPath = path.resolve( __dirname, "..", "html"
, "doc", section+".html" )
=======
var section_path = path.join( __dirname, "../man/man"
+ num + "/" + section + "." + num)
>>>>>>>
var sectionPath = path.join( __dirname, "..", "man", "man" + num
, section + "." + num)
, htmlPath = path.resolve( __dirname, "..", "html"
, num === 3 ? "api" : "doc"
, section+".html" ) |
<<<<<<<
, semver = require("semver")
, jju = require("jju")
, RegClient = require("npm-registry-client")
=======
, CachingRegClient = require("./cache/caching-client.js")
>>>>>>>
, semver = require("semver")
, jju = require("jju")
, RegClient = require("npm-registry-client")
, CachingRegClient = require("./cache/caching-client.js") |
<<<<<<<
const lambda = require('./lambda');
=======
const granule = require('./granule.js');
>>>>>>>
const lambda = require('./lambda');
const granule = require('./granule.js');
<<<<<<<
getWorkflowArn,
getLambdaVersions: lambda.getLambdaVersions,
getLambdaAliases: lambda.getLambdaAliases
=======
getWorkflowArn,
waitForConceptExistsOutcome: cmr.waitForConceptExistsOutcome,
waitUntilGranuleStatusIs: granule.waitUntilGranuleStatusIs
>>>>>>>
getWorkflowArn,
getLambdaVersions: lambda.getLambdaVersions,
getLambdaAliases: lambda.getLambdaAliases,
waitForConceptExistsOutcome: cmr.waitForConceptExistsOutcome,
waitUntilGranuleStatusIs: granule.waitUntilGranuleStatusIs |
<<<<<<<
, yapm_progress = require("yapm-progress")
=======
, crypto = require("crypto")
>>>>>>>
, yapm_progress = require("yapm-progress")
, crypto = require("crypto")
<<<<<<<
, ca: remote.host === regHost ? npm.config.get("ca") : undefined
, headers: header}
=======
, ca: ca
, headers:
{ "user-agent": npm.config.get("user-agent")
, "npm-session": sessionToken
, referer: npm.registry.refer
}
}
>>>>>>>
, ca: ca
, headers: headers
} |
<<<<<<<
, haveProcessExitCode = typeof(process.exitCode) !== 'undefined'
=======
, rollbacks = npm.rollbacks
, chain = require("slide").chain
, writeStream = require("fs-write-stream-atomic")
>>>>>>>
, haveProcessExitCode = typeof(process.exitCode) !== 'undefined'
, rollbacks = npm.rollbacks
, chain = require("slide").chain
, writeStream = require("fs-write-stream-atomic")
<<<<<<<
=======
// just a line break
if (log.levels[log.level] <= log.levels.error) console.error("")
log.error("",
["Please include the following file with any support request:"
," " + path.resolve("npm-debug.log")
].join("\n"))
>>>>>>>
<<<<<<<
log.error("", er.stack || er.message || er)
printStack = false
=======
log.error("", er.message || er)
log.error("", ["", "If you need help, you may report this error at:"
," <http://github.com/npm/npm/issues>"
].join("\n"))
>>>>>>>
log.error("", er.stack || er.message || er)
printStack = false
<<<<<<<
var os = require("os")
// just a line break
/* removed in visionmedia/npm for clarity
if (log.levels[log.level] <= log.levels.error) console.error("")
log.error("System", os.type() + " " + os.release())
log.error("command", process.argv
.map(JSON.stringify).join(" "))
log.error("cwd", process.cwd())
log.error("node -v", process.version)
log.error("npm -v", npm.version)
*/
; [ "file"
, "path"
, "type"
, "syscall"
, "fstream_path"
, "fstream_unc_path"
, "fstream_type"
, "fstream_class"
, "fstream_finish_call"
, "fstream_linkpath"
, "code"
, "errno"
, "stack"
, "fstream_stack"
].forEach(function (k) {
var v = er[k]
if (k === "stack") {
if (!printStack) return
if (!v) v = er.message
}
if (!v) return
if (k === "fstream_stack") v = v.join("\n")
log.error(k, v)
})
=======
>>>>>>>
var os = require("os")
// just a line break
/* removed in visionmedia/npm for clarity
if (log.levels[log.level] <= log.levels.error) console.error("")
log.error("System", os.type() + " " + os.release())
log.error("command", process.argv
.map(JSON.stringify).join(" "))
log.error("cwd", process.cwd())
log.error("node -v", process.version)
log.error("npm -v", npm.version)
*/
; [ "file"
, "path"
, "type"
, "syscall"
, "fstream_path"
, "fstream_unc_path"
, "fstream_type"
, "fstream_class"
, "fstream_finish_call"
, "fstream_linkpath"
, "code"
, "errno"
, "stack"
, "fstream_stack"
].forEach(function (k) {
var v = er[k]
if (k === "stack") {
if (!printStack) return
if (!v) v = er.message
}
if (!v) return
if (k === "fstream_stack") v = v.join("\n")
log.error(k, v)
}) |
<<<<<<<
config = require('./config'),
expressValidator = require("express-validator");
=======
assetmanager = require('assetmanager'),
config = require('./config');
>>>>>>>
config = require('./config'),
expressValidator = require("express-validator");
assetmanager = require('assetmanager'),
<<<<<<<
// cache=memory or swig dies in NODE_ENV=production
app.locals.cache = 'memory';
=======
// cache=memory or swig dies in NODE_ENV=production
app.locals.cache = 'memory';
>>>>>>>
// cache=memory or swig dies in NODE_ENV=production
app.locals.cache = 'memory'; |
<<<<<<<
var connect = require('connect');
var path = require('path');
var modRewrite = require('connect-modrewrite');
var serveStatic = require('serve-static');
var serveStaticFile = require('connect-static-file');
var compression = require('compression');
var app = connect();
=======
let connect = require('connect')
let modRewrite = require('connect-modrewrite')
let serveStatic = require('serve-static')
let compression = require('compression')
let app = connect()
>>>>>>>
var connect = require('connect')
var path = require('path')
var serveStatic = require('serve-static')
var serveStaticFile = require('connect-static-file')
var compression = require('compression')
var app = connect()
<<<<<<<
app.use(compression());
=======
app.use(modRewrite([
'!\\.html|\\.js|\\.json|\\.ico|\\.csv|\\.css|\\.less|\\.png|\\.svg' +
'|\\.eot|\\.otf|\\.ttf|\\.woff|\\.woff2|\\.appcache|\\.jpg|\\.jpeg' +
'|\\.gif|\\.webp|\\.mp4|\\.txt|\\.map|\\.webm ' + file + ' [L]'
]))
app.use(compression())
>>>>>>>
app.use(compression()) |
<<<<<<<
markItemsAsUninstallable = data => {
let muts = [];
if (this.props.preferences) {
muts = this.props.preferences.mutations.map(m => m.name);
}
console.log(muts);
data.objects = data.objects.map(obj => {
// If we've already got this mutation, then let the user uninstall it
if (muts.includes(obj.package.name)) {
obj.package.installState = UNINSTALL;
}
return obj;
});
return data;
};
=======
markItemsAsUninstallable = data => {
const muts = Object.keys(this.props.preferences);
console.log(this.props.preferences);
return data.objects.map(obj => {
// If we've already got this mutation, then let the user uninstall it
if (muts.includes(obj.package.name)) {
obj.pacakge.installState = UNINSTALL;
}
return obj;
});
};
>>>>>>>
markItemsAsUninstallable = data => {
let muts = [];
if (this.props.preferences) {
muts = this.props.preferences.mutations.map(m => m.name);
}
data.objects = data.objects.map(obj => {
// If we've already got this mutation, then let the user uninstall it
if (muts.includes(obj.package.name)) {
obj.package.installState = UNINSTALL;
}
return obj;
});
return data;
}; |
<<<<<<<
}
export function setToast(message, toastType = null) {
return { type: SET_TOAST, message, toastType };
=======
}
export function setPreferences(preferences) {
return { type: SET_PREFERENCES, preferences };
>>>>>>>
}
export function setToast(message, toastType = null) {
return { type: SET_TOAST, message, toastType };
export function setPreferences(preferences) {
return { type: SET_PREFERENCES, preferences }; |
<<<<<<<
, function(){ return 'expected ' + this.inspect + ' to equal ' + should.inspect(val) + (desc ? " | " + desc : "") }
, function(){ return 'expected ' + this.inspect + ' to not equal ' + should.inspect(val) + (desc ? " | " + desc : "") }
=======
, function(){ return 'expected ' + this.inspect + ' to equal ' + i(val) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not equal ' + i(val) + (description ? " | " + description : "") }
>>>>>>>
, function(){ return 'expected ' + this.inspect + ' to equal ' + should.inspect(val) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not equal ' + should.inspect(val) + (description ? " | " + description : "") }
<<<<<<<
, function(){ return 'expected ' + this.inspect + ' to equal ' + should.inspect(val) + (desc ? " | " + desc : "") }
, function(){ return 'expected ' + this.inspect + ' to not equal ' + should.inspect(val) + (desc ? " | " + desc : "") }
, val);
=======
, function(){ return 'expected ' + this.inspect + ' to equal ' + i(val) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not equal ' + i(val) + (description ? " | " + description : "") }
, val
, void 0
, description);
>>>>>>>
, function(){ return 'expected ' + this.inspect + ' to equal ' + should.inspect(val) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not equal ' + should.inspect(val) + (description ? " | " + description : "") }
, val
, void 0
, description);
<<<<<<<
, function(){ return 'expected ' + this.inspect + ' to have type ' + type + (desc ? " | " + desc : "") }
, function(){ return 'expected ' + this.inspect + ' not to have type ' + type + (desc ? " | " + desc : "") })
=======
, function(){ return 'expected ' + this.inspect + ' to be a ' + type + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' not to be a ' + type + (description ? " | " + description : "") }
, void 0
, void 0
, description);
>>>>>>>
, function(){ return 'expected ' + this.inspect + ' to have type ' + type + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' not to have type ' + type + (description ? " | " + description : "") }
, void 0
, void 0
, description);
<<<<<<<
throw new Error(this.inspect + ' has no property ' + should.inspect(name) + (desc ? " | " + desc : ""));
=======
throw new Error(this.inspect + ' has no property ' + i(name) + (description ? " | " + description : ""));
>>>>>>>
throw new Error(this.inspect + ' has no property ' + should.inspect(name) + (description ? " | " + description : ""));
<<<<<<<
, function(){ return 'expected ' + this.inspect + ' to have a property ' + should.inspect(name) + (desc ? " | " + desc : "") }
, function(){ return 'expected ' + this.inspect + ' to not have a property ' + should.inspect(name) + (desc ? " | " + desc : "") });
=======
, function(){ return 'expected ' + this.inspect + ' to have a property ' + i(name) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not have a property ' + i(name) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
>>>>>>>
, function(){ return 'expected ' + this.inspect + ' to have a property ' + should.inspect(name) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not have a property ' + should.inspect(name) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
<<<<<<<
, function(){ return 'expected ' + this.inspect + ' to have a property ' + should.inspect(name)
+ ' of ' + should.inspect(val) + ', but got ' + should.inspect(this.obj[name]) + (desc ? " | " + desc : "") }
, function(){ return 'expected ' + this.inspect + ' to not have a property ' + should.inspect(name) + ' of ' + should.inspect(val) + (desc ? " | " + desc : "") });
=======
, function(){ return 'expected ' + this.inspect + ' to have a property ' + i(name)
+ ' of ' + i(val) + ', but got ' + i(this.obj[name]) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not have a property ' + i(name) + ' of ' + i(val) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
>>>>>>>
, function(){ return 'expected ' + this.inspect + ' to have a property ' + should.inspect(name)
+ ' of ' + should.inspect(val) + ', but got ' + should.inspect(this.obj[name]) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not have a property ' + should.inspect(name) + ' of ' + should.inspect(val) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
<<<<<<<
hasOwnProperty.call(this.obj, name)
, function(){ return 'expected ' + this.inspect + ' to have own property ' + should.inspect(name) + (desc ? " | " + desc : "") }
, function(){ return 'expected ' + this.inspect + ' to not have own property ' + should.inspect(name) + (desc ? " | " + desc : "") });
=======
this.obj.hasOwnProperty(name)
, function(){ return 'expected ' + this.inspect + ' to have own property ' + i(name) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not have own property ' + i(name) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
>>>>>>>
hasOwnProperty.call(this.obj, name)
, function(){ return 'expected ' + this.inspect + ' to have own property ' + should.inspect(name) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not have own property ' + should.inspect(name) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
<<<<<<<
, function() { return 'expected ' + this.inspect + ' to start with ' + should.inspect(str) + (desc ? " | " + desc : "") }
, function() { return 'expected ' + this.inspect + ' to not start with ' + should.inspect(str) + (desc ? " | " + desc : "") });
=======
, function() { return 'expected ' + this.inspect + ' to start with ' + i(str) + (description ? " | " + description : "") }
, function() { return 'expected ' + this.inspect + ' to not start with ' + i(str) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
>>>>>>>
, function() { return 'expected ' + this.inspect + ' to start with ' + should.inspect(str) + (description ? " | " + description : "") }
, function() { return 'expected ' + this.inspect + ' to not start with ' + should.inspect(str) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
<<<<<<<
, function() { return 'expected ' + this.inspect + ' to end with ' + should.inspect(str) + (desc ? " | " + desc : "") }
, function() { return 'expected ' + this.inspect + ' to not end with ' + should.inspect(str) + (desc ? " | " + desc : "") });
=======
, function() { return 'expected ' + this.inspect + ' to end with ' + i(str) + (description ? " | " + description : "") }
, function() { return 'expected ' + this.inspect + ' to not end with ' + i(str) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
>>>>>>>
, function() { return 'expected ' + this.inspect + ' to end with ' + should.inspect(str) + (description ? " | " + description : "") }
, function() { return 'expected ' + this.inspect + ' to not end with ' + should.inspect(str) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
<<<<<<<
, function(){ return 'expected ' + this.inspect + ' to include an object equal to ' + should.inspect(obj) + (desc ? " | " + desc : "") }
, function(){ return 'expected ' + this.inspect + ' to not include an object equal to ' + should.inspect(obj) + (desc ? " | " + desc : "") });
=======
, function(){ return 'expected ' + this.inspect + ' to include an object equal to ' + i(obj) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not include an object equal to ' + i(obj) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
>>>>>>>
, function(){ return 'expected ' + this.inspect + ' to include an object equal to ' + should.inspect(obj) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not include an object equal to ' + should.inspect(obj) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
<<<<<<<
, function(){ return 'expected ' + this.inspect + ' to include ' + should.inspect(obj) + (desc ? " | " + desc : "") }
, function(){ return 'expected ' + this.inspect + ' to not include ' + should.inspect(obj) + (desc ? " | " + desc : "") });
=======
, function(){ return 'expected ' + this.inspect + ' to include ' + i(obj) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not include ' + i(obj) + (description ? " | " + description : "") }
, void 0
, void 0
, description);
>>>>>>>
, function(){ return 'expected ' + this.inspect + ' to include ' + should.inspect(obj) + (description ? " | " + description : "") }
, function(){ return 'expected ' + this.inspect + ' to not include ' + should.inspect(obj) + (description ? " | " + description : "") }
, void 0
, void 0
, description); |
<<<<<<<
=======
function onBeforePushSync() {
if (beforePushSyncListener && typeof beforePushSyncListener.onBeforePushSync === "function") {
beforePushSyncListener.onBeforePushSync();
}
}
function onAfterPushSync() {
if (afterPushSyncListener && typeof afterPushSyncListener.onAfterPushSync === "function") {
afterPushSyncListener.onAfterPushSync();
}
}
function isUsingDirectoryConfig() {
return process.argv[2].trim() === "-dc";
}
>>>>>>>
function onBeforePushSync() {
if (beforePushSyncListener && typeof beforePushSyncListener.onBeforePushSync === "function") {
beforePushSyncListener.onBeforePushSync();
}
}
function onAfterPushSync() {
if (afterPushSyncListener && typeof afterPushSyncListener.onAfterPushSync === "function") {
afterPushSyncListener.onAfterPushSync();
}
}
function isUsingDirectoryConfig() {
return process.argv[2].trim() === "-dc";
}
<<<<<<<
[ "couchapp -- utility for creating couchapps"
, ""
, "Usage:"
, " couchapp <command> app.js http://localhost:5984/dbname [opts]"
, ""
, "Commands:"
, " push : Push app once to server."
, " sync : Push app then watch local files for changes."
, " boiler : Create a boiler project."
, " serve : Serve couchapp from development webserver"
, " you can specify some options "
, " -p port : list on port portNum [default=3000]"
, " -d dir : attachments directory [default='attachments']"
, " -l : log rewrites to couchdb [default='false']"
=======
[ "couchapp -- utility for creating couchapps"
, ""
, "Usage:"
, "(backwardly compatible without switch - single app file)"
, " couchapp <command> app.js http://localhost:5984/dbname"
, "(directory based config specified by switch - multiple app files and pre- and post-processing capability)"
, " couchapp -dc <command> <appconfigdirectory> http://localhost:5984/dbname"
, ""
, "Commands:"
, " push : Push app once to server."
, " sync : Push app then watch local files for changes."
, " boiler : Create a boiler project."
>>>>>>>
[ "couchapp -- utility for creating couchapps"
, ""
, "Usage:"
, "(backwardly compatible without switch - single app file)"
, " couchapp <command> app.js http://localhost:5984/dbname [opts]"
, "(directory based config specified by switch - multiple app files and pre- and post-processing capability)"
, " couchapp -dc <command> <appconfigdirectory> http://localhost:5984/dbname"
, ""
, "Commands:"
, " push : Push app once to server."
, " sync : Push app then watch local files for changes."
, " boiler : Create a boiler project."
, " serve : Serve couchapp from development webserver"
, " you can specify some options "
, " -p port : list on port portNum [default=3000]"
, " -d dir : attachments directory [default='attachments']"
, " -l : log rewrites to couchdb [default='false']" |
<<<<<<<
const {get, find} = require('lodash');
=======
const { get } = require('lodash');
>>>>>>>
const {get, find} = require('lodash');
<<<<<<<
const { LOAD_FEATURE_INFO, ERROR_FEATURE_INFO, GET_VECTOR_INFO, FEATURE_INFO_CLICK, CLOSE_IDENTIFY, featureInfoClick, updateCenterToMarker, purgeMapInfoResults,
=======
const { LOAD_FEATURE_INFO, ERROR_FEATURE_INFO, GET_VECTOR_INFO, FEATURE_INFO_CLICK, CLOSE_IDENTIFY, TOGGLE_HIGHLIGHT_FEATURE, featureInfoClick, updateCenterToMarker, purgeMapInfoResults,
>>>>>>>
const { LOAD_FEATURE_INFO, ERROR_FEATURE_INFO, GET_VECTOR_INFO, FEATURE_INFO_CLICK, CLOSE_IDENTIFY, TOGGLE_HIGHLIGHT_FEATURE, featureInfoClick, updateCenterToMarker, purgeMapInfoResults,
<<<<<<<
const { stopGetFeatureInfoSelector, queryableLayersSelector, identifyOptionsSelector } = require('../selectors/mapinfo');
const { centerToMarkerSelector } = require('../selectors/layers');
const { mapSelector, projectionDefsSelector, projectionSelector } = require('../selectors/map');
=======
const { stopGetFeatureInfoSelector, identifyOptionsSelector, clickPointSelector, clickLayerSelector } = require('../selectors/mapInfo');
const { centerToMarkerSelector, queryableLayersSelector } = require('../selectors/layers');
const { modeSelector } = require('../selectors/featuregrid');
const { mapSelector } = require('../selectors/map');
>>>>>>>
const { stopGetFeatureInfoSelector, identifyOptionsSelector, clickPointSelector, clickLayerSelector } = require('../selectors/mapInfo');
const { centerToMarkerSelector, queryableLayersSelector } = require('../selectors/layers');
const { modeSelector } = require('../selectors/featuregrid');
const { mapSelector, projectionDefsSelector, projectionSelector } = require('../selectors/map');
<<<<<<<
const { centerToVisibleArea, isInsideVisibleArea, isPointInsideExtent, reprojectBbox } = require('../utils/CoordinatesUtils');
=======
const { isHighlightEnabledSelector } = require('../selectors/mapInfo');
const { centerToVisibleArea, isInsideVisibleArea } = require('../utils/CoordinatesUtils');
>>>>>>>
const { centerToVisibleArea, isInsideVisibleArea, isPointInsideExtent, reprojectBbox } = require('../utils/CoordinatesUtils');
const { isHighlightEnabledSelector } = require('../selectors/mapInfo'); |
<<<<<<<
function saveMapConfiguration(currentMap, currentLayers, currentGroups, textSearchConfig) {
const map = {
center: currentMap.center,
maxExtent: currentMap.maxExtent,
projection: currentMap.projection,
units: currentMap.units,
zoom: currentMap.zoom
};
const layers = currentLayers.map((layer) => {
return LayersUtils.saveLayer(layer);
});
// filter groups with title as object
// title object contains translations
const groups = currentGroups
.filter((group) => isObject(group.title))
.map((group) => { return {id: group.id, title: group.title}; });
return {
version: 2,
// layers are defined inside the map object
map: assign({}, map, {layers, groups, text_serch_config: textSearchConfig})
};
}
=======
function isSimpleGeomType(geomType) {
switch (geomType) {
case "MultiPoint": case "MultiLineString": case "MultiPolygon": return false;
case "Point": case "LineString": case "Polygon": case "Circle": default: return true;
}
}
function getSimpleGeomType(geomType = "Point") {
switch (geomType) {
case "Point": case "LineString": case "Polygon": case "Circle": return geomType;
case "MultiPoint": return "Point";
case "MultiLineString": return "LineString";
case "MultiPolygon": return "Polygon";
default: return geomType;
}
}
>>>>>>>
function saveMapConfiguration(currentMap, currentLayers, currentGroups, textSearchConfig) {
const map = {
center: currentMap.center,
maxExtent: currentMap.maxExtent,
projection: currentMap.projection,
units: currentMap.units,
zoom: currentMap.zoom
};
const layers = currentLayers.map((layer) => {
return LayersUtils.saveLayer(layer);
});
// filter groups with title as object
// title object contains translations
const groups = currentGroups
.filter((group) => isObject(group.title))
.map((group) => { return {id: group.id, title: group.title}; });
return {
version: 2,
// layers are defined inside the map object
map: assign({}, map, {layers, groups, text_serch_config: textSearchConfig})
};
}
function isSimpleGeomType(geomType) {
switch (geomType) {
case "MultiPoint": case "MultiLineString": case "MultiPolygon": return false;
case "Point": case "LineString": case "Polygon": case "Circle": default: return true;
}
}
function getSimpleGeomType(geomType = "Point") {
switch (geomType) {
case "Point": case "LineString": case "Polygon": case "Circle": return geomType;
case "MultiPoint": return "Point";
case "MultiLineString": return "LineString";
case "MultiPolygon": return "Polygon";
default: return geomType;
}
}
<<<<<<<
transformExtent,
saveMapConfiguration
=======
transformExtent,
isSimpleGeomType,
getSimpleGeomType
>>>>>>>
transformExtent,
saveMapConfiguration,
isSimpleGeomType,
getSimpleGeomType |
<<<<<<<
sprite.prototype.update = function (opt) {
if (!opt) return;
for (var i in opt) {
if (typeof opt[i] === 'object') {
for (var j in opt[i]) {
this[i][j] = opt[i][j];
}
} else {
this[i] = opt[i];
}
}
}
=======
sprite.prototype.rect = function () {
return this.$cache;
};
sprite.prototype.self = function () {
let res = {};
for (let key in this.style) {
res[key] = utils.funcOrValue(this.style[key], this);
}
return res;
};
>>>>>>>
sprite.prototype.update = function (opt) {
if (!opt) return;
for (var i in opt) {
if (typeof opt[i] === 'object') {
for (var j in opt[i]) {
this[i][j] = opt[i][j];
}
} else {
this[i] = opt[i];
}
}
}
sprite.prototype.rect = function () {
return this.$cache;
};
sprite.prototype.self = function () {
let res = {};
for (let key in this.style) {
res[key] = utils.funcOrValue(this.style[key], this);
}
return res;
}; |
<<<<<<<
sprite.prototype.update = function (opt) {
if (!opt) return;
for (var i in opt) {
if (typeof opt[i] === 'object') {
for (var j in opt[i]) {
this[i][j] = opt[i][j];
}
} else {
this[i] = opt[i];
}
}
}
=======
sprite.prototype.rect = function () {
return this.$cache;
};
sprite.prototype.self = function () {
let res = {};
for (let key in this.style) {
res[key] = utils.funcOrValue(this.style[key], this);
}
return res;
};
>>>>>>>
sprite.prototype.update = function (opt) {
if (!opt) return;
for (var i in opt) {
if (typeof opt[i] === 'object') {
for (var j in opt[i]) {
this[i][j] = opt[i][j];
}
} else {
this[i] = opt[i];
}
}
}
sprite.prototype.rect = function () {
return this.$cache;
};
sprite.prototype.self = function () {
let res = {};
for (let key in this.style) {
res[key] = utils.funcOrValue(this.style[key], this);
}
return res;
}; |
<<<<<<<
'use strict';
var gulp = require('gulp');
var sass = require('gulp-sass');
var watch = require('gulp-watch');
var batch = require('gulp-batch');
var plumber = require('gulp-plumber');
var jetpack = require('fs-jetpack');
var bundle = require('./bundle');
var utils = require('./utils');
var projectDir = jetpack;
var srcDir = jetpack.cwd('./src');
var destDir = jetpack.cwd('./app');
gulp.task('bundle', function () {
return Promise.all([
bundle(srcDir.path('background.js'), destDir.path('background.js')),
bundle(srcDir.path('sidebar.js'), destDir.path('sidebar.js')),
=======
const gulp = require('gulp');
const less = require('gulp-less');
const watch = require('gulp-watch');
const batch = require('gulp-batch');
const plumber = require('gulp-plumber');
const jetpack = require('fs-jetpack');
const bundle = require('./bundle');
const utils = require('./utils');
const projectDir = jetpack;
const srcDir = jetpack.cwd('./src');
const destDir = jetpack.cwd('./app');
gulp.task('bundle', () => {
return Promise.all([
bundle(srcDir.path('background.js'), destDir.path('background.js')),
>>>>>>>
const gulp = require('gulp');
const less = require('gulp-sass');
const watch = require('gulp-watch');
const batch = require('gulp-batch');
const plumber = require('gulp-plumber');
const jetpack = require('fs-jetpack');
const bundle = require('./bundle');
const utils = require('./utils');
const projectDir = jetpack;
const srcDir = jetpack.cwd('./src');
const destDir = jetpack.cwd('./app');
gulp.task('bundle', () => {
return Promise.all([
bundle(srcDir.path('background.js'), destDir.path('background.js')),
<<<<<<<
gulp.task('sass', function () {
return gulp.src(srcDir.path('stylesheets/*.scss'))
.pipe(plumber())
.pipe(sass({
includePaths: ['node_modules']
}))
.pipe(gulp.dest(destDir.path('stylesheets')));
=======
gulp.task('less', () => {
return gulp.src(srcDir.path('stylesheets/main.less'))
.pipe(plumber())
.pipe(less())
.pipe(gulp.dest(destDir.path('stylesheets')));
>>>>>>>
gulp.task('sass', () => {
return gulp.src(srcDir.path('stylesheets/main.scss'))
.pipe(plumber())
.pipe(less())
.pipe(gulp.dest(destDir.path('stylesheets')));
<<<<<<<
watch('src/**/*.js', batch(function (events, done) {
gulp.start('bundle', beepOnError(done));
}));
watch('src/**/*.scss', batch(function (events, done) {
gulp.start('sass', beepOnError(done));
}));
=======
};
watch('src/**/*.js', batch((events, done) => {
gulp.start('bundle', beepOnError(done));
}));
watch('src/**/*.less', batch((events, done) => {
gulp.start('less', beepOnError(done));
}));
>>>>>>>
};
watch('src/**/*.js', batch((events, done) => {
gulp.start('bundle', beepOnError(done));
}));
watch('src/**/*.scss', batch((events, done) => {
gulp.start('sass', beepOnError(done));
})); |
<<<<<<<
const pageManifest = glob.sync("./pages/**/*.+(js|jsx|ts|tsx)");
=======
// Note: This buildId does NOT match that which is running in webpack.worker.config.js.
// This is merely used as a client cache-busting mechanism for items that absolutely change
// between deploys, e.g. build manifests.
const buildId = dev ? "dev" : nanoid();
const pageManifest = glob.sync("./pages/**/*.js");
>>>>>>>
// Note: This buildId does NOT match that which is running in webpack.worker.config.js.
// This is merely used as a client cache-busting mechanism for items that absolutely change
// between deploys, e.g. build manifests.
const buildId = dev ? "dev" : nanoid();
const pageManifest = glob.sync("./pages/**/*.+(js|jsx|ts|tsx)"); |
<<<<<<<
},
SET_USER(state, user) {
state.user = user;
=======
},
UPDATE_PREVIEW_APIS(state, data) {
state.previewApis = data;
>>>>>>>
},
SET_USER(state, user) {
state.user = user;
},
UPDATE_PREVIEW_APIS(state, data) {
state.previewApis = data; |
<<<<<<<
sync: {minute: 0}
}
=======
bootstrap: {minute: 1},
cdnjs: {minute: 1},
google: {minute: 1},
jsdelivr: {minute: 1},
jquery: {minute: 1}
},
maxcdn: {
alias: 'replace this',
key: 'replace this',
secret: 'replace this',
zoneId: 0 // replace with some zone id
},
github: '' // replace with github token
>>>>>>>
sync: {minute: 0}
},
maxcdn: {
alias: 'replace this',
key: 'replace this',
secret: 'replace this',
zoneId: 0 // replace with some zone id
},
github: '' // replace with github token |
<<<<<<<
"vmhd", "smhd", "hmhd", // full boxes not yet parsed
"idat", "meco",
"udta", "strk",
"free", "skip",
"clap", "pasp", "colr"
=======
"clap", "pasp"
>>>>>>>
"vmhd", "smhd", "hmhd", // full boxes not yet parsed
"idat", "meco",
"udta", "strk",
"free", "skip",
"clap", "pasp", "colr"
<<<<<<<
{ prefix: "Audio", types: [ "mp4a", "ac-3", "alac", "dra1", "dtsc", "dtse", ,"dtsh", "dtsl", "ec-3", "enca", "g719", "g726", "m4ae", "mlpa", "raw ", "samr", "sawb", "sawp", "sevc", "sqcp", "ssmv", "twos", ".mp3", "fLaC" ] },
=======
{ prefix: "Audio", types: [ "mp4a", "ac-3", "alac", "dra1", "dtsc", "dtse", "dtsh", "dtsl", "ec-3", "enca", "g719", "g726", "m4ae", "mlpa", "raw ", "samr", "sawb", "sawp", "sevc", "sqcp", "ssmv", "twos", ".mp3" ] },
>>>>>>>
{ prefix: "Audio", types: [ "mp4a", "ac-3", "alac", "dra1", "dtsc", "dtse", "dtsh", "dtsl", "ec-3", "enca", "g719", "g726", "m4ae", "mlpa", "raw ", "samr", "sawb", "sawp", "sevc", "sqcp", "ssmv", "twos", ".mp3", "fLaC" ] }, |
<<<<<<<
export * from './button/index.jsx';
=======
export * from './chart/Chart.jsx';
export { default as Chart } from './chart/Chart.jsx';
>>>>>>>
export * from './button/index.jsx';
export * from './chart/Chart.jsx';
export { default as Chart } from './chart/Chart.jsx'; |
<<<<<<<
import ModalExample from '../../views/modal/ModalExample.jsx';
=======
import TextExample from '../../views/text/TextExample.jsx';
>>>>>>>
import TextExample from '../../views/text/TextExample.jsx';
<<<<<<<
name: 'Modal',
component: ModalExample,
}, {
=======
name: 'Text',
component: TextExample,
}, {
>>>>>>>
name: 'Modal',
component: ModalExample,
}, {
name: 'Text',
component: TextExample,
}, { |
<<<<<<<
export { default as Entity } from './services/Entity';
export * from './services/FilterOption';
export { default as FilterOption } from './services/FilterOption';
export * from './services/FilterableItems';
export { default as FilterableItems } from './services/FilterableItems';
=======
export { default as Entity } from './services/Entity';
export * from './services/ThrottledEventDispatcher';
export { default as ThrottledEventDispatcher } from './services/ThrottledEventDispatcher';
>>>>>>>
export { default as Entity } from './services/Entity';
export * from './services/FilterOption';
export { default as FilterOption } from './services/FilterOption';
export * from './services/FilterableItems';
export { default as FilterableItems } from './services/FilterableItems';
export * from './services/ThrottledEventDispatcher';
export { default as ThrottledEventDispatcher } from './services/ThrottledEventDispatcher'; |
<<<<<<<
'lint',
'lint:scss',
=======
>>>>>>>
<<<<<<<
], [
'lint',
'scripts'
]);
=======
], ['scripts']);
>>>>>>>
], ['scripts']);
<<<<<<<
'lint',
'lint:scss',
=======
>>>>>>> |
<<<<<<<
exports.http = require('./http');
exports.log = require('./log');
=======
>>>>>>> |
<<<<<<<
commonAncestor = range.commonAncestorContainer,
lastSelectable, prevContainer;
=======
commonAncestor = range.commonAncestorContainer;
>>>>>>>
commonAncestor = range.commonAncestorContainer,
lastSelectable, prevContainer;
<<<<<<<
// Firefox finds an ice node wrapped around an image instead of the image itself sometimes, so we make sure to look at the image instead.
if (ice.dom.is(prevContainer, '.' + this._getIceNodeClass('insertType') + ', .' + this._getIceNodeClass('deleteType')) && prevContainer.childNodes.length > 0 && prevContainer.lastChild) {
=======
// Firefox finds an ice node wrapped around an image instead of the image itself some times, so we make sure to look at the image instead.
if (ice.dom.is(prevContainer, '.' + this._getIceNodeClass('insertType') + ', .' + this._getIceNodeClass('deleteType')) && prevContainer.childNodes.length > 0) {
>>>>>>>
// Firefox finds an ice node wrapped around an image instead of the image itself some times, so we make sure to look at the image instead.
if (ice.dom.is(prevContainer, '.' + this._getIceNodeClass('insertType') + ', .' + this._getIceNodeClass('deleteType')) && prevContainer.childNodes.length > 0) {
<<<<<<<
// If the previous container is non-editable, look at the parent element instead.
=======
// If the previous container is a text node, look at the parent node instead.
if (prevContainer.nodeType === ice.dom.TEXT_NODE) {
prevContainer = prevContainer.parentNode;
}
// If the previous container is non-editable, enclose it with a delete ice node and add an empty text node before it to position the caret.
>>>>>>>
// If the previous container is a text node, look at the parent node instead.
if (prevContainer.nodeType === ice.dom.TEXT_NODE) {
prevContainer = prevContainer.parentNode;
}
// If the previous container is non-editable, enclose it with a delete ice node and add an empty text node before it to position the caret.
<<<<<<<
if (this._handleVoidEl(prevContainer, range)) return false;
// If the caret was placed directly after a stub element or an element that is not editable, enclose the element with a delete ice node.
=======
// If the caret was placed directly after a stub element, enclose the element with a delete ice node.
>>>>>>>
if (this._handleVoidEl(prevContainer, range)) return false;
// If the caret was placed directly after a stub element, enclose the element with a delete ice node. |
<<<<<<<
import '../error_url_overflow';
=======
import 'ui/watch_multi';
>>>>>>>
import '../error_url_overflow';
import 'ui/watch_multi'; |
<<<<<<<
import AggResponseHierarchicalBuildSplitProvider from 'ui/agg_response/hierarchical/_build_split';
import AggResponseHierarchicalHierarchicalTooltipFormatterProvider from 'ui/agg_response/hierarchical/_hierarchical_tooltip_formatter';
export default function buildHierarchicalDataProvider(Private, createNotifier) {
=======
import { AggResponseHierarchicalBuildSplitProvider } from 'ui/agg_response/hierarchical/_build_split';
import { HierarchicalTooltipFormatterProvider } from 'ui/agg_response/hierarchical/_hierarchical_tooltip_formatter';
export function BuildHierarchicalDataProvider(Private, Notifier) {
>>>>>>>
import { AggResponseHierarchicalBuildSplitProvider } from 'ui/agg_response/hierarchical/_build_split';
import { HierarchicalTooltipFormatterProvider } from 'ui/agg_response/hierarchical/_hierarchical_tooltip_formatter';
export function BuildHierarchicalDataProvider(Private, createNotifier) { |
<<<<<<<
(function () {
var expect = require('expect.js');
(function () {
bdd.describe('initial state', function () {
bdd.before(function () {
// delete .kibana index and then wait for Kibana to re-create it
return esClient.deleteAndUpdateConfigDoc()
.then(function () {
return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
});
});
=======
var expect = require('expect.js');
bdd.describe('initial state', function () {
bdd.before(function () {
// delete .kibana index and then wait for Kibana to re-create it
return esClient.deleteAndUpdateConfigDoc()
.then(function () {
return settingsPage.navigateTo();
});
});
>>>>>>>
var expect = require('expect.js');
bdd.describe('initial state', function () {
bdd.before(function () {
// delete .kibana index and then wait for Kibana to re-create it
return esClient.deleteAndUpdateConfigDoc()
.then(function () {
return settingsPage.navigateTo().then(settingsPage.clickExistingIndicesAddDataLink);
});
}); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.