code
stringlengths 122
4.99k
| label
int64 0
14
|
|---|---|
diff --git a/assets/js/util/index.js b/assets/js/util/index.js @@ -907,6 +907,8 @@ export const showErrorNotification = ( ErrorComponent, props = {} ) => {
export const decodeHtmlEntity = ( str ) => {
const decoded = str.replace( /&#(\d+);/g, function( match, dec ) {
return String.fromCharCode( dec );
+ } ).replace( /(\\)/g, function( ) {
+ return '';
} );
return unescape( decoded );
| 14 |
diff --git a/app/shared/components/Producers/Proxies.js b/app/shared/components/Producers/Proxies.js @@ -3,14 +3,17 @@ import React, { Component } from 'react';
import { Header, Loader, Segment, Visibility } from 'semantic-ui-react';
import { translate } from 'react-i18next';
+import ProducersProxy from './Proxy';
import ProxiesTable from './Proxies/Table';
class Proxies extends Component<Props> {
constructor(props) {
super(props);
this.state = {
+ addProxy: false,
amount: 10,
- querying: false
+ querying: false,
+ removeProxy: false,
};
}
@@ -23,6 +26,25 @@ class Proxies extends Component<Props> {
clearInterval(this.interval);
}
+ addProxy = (proxyAccout) => {
+ this.setState({
+ addProxy: proxyAccout
+ });
+ }
+
+ removeProxy = () => {
+ this.setState({
+ removeProxy: true
+ });
+ }
+
+ onClose = () => {
+ this.setState({
+ addProxy: false,
+ removeProxy: false
+ });
+ }
+
loadMore = () => this.setState({ amount: this.state.amount + 10 });
resetDisplayAmount = () => this.setState({ amount: 10 });
@@ -46,18 +68,20 @@ class Proxies extends Component<Props> {
const {
accounts,
actions,
- addProxy,
+ allBlockExplorers,
+ connection,
globals,
keys,
- removeProxy,
settings,
system,
t,
tables
} = this.props;
const {
+ addProxy,
amount,
querying,
+ removeProxy,
} = this.state;
const account = accounts[settings.account];
@@ -75,10 +99,26 @@ class Proxies extends Component<Props> {
onBottomVisible={this.loadMore}
once={false}
>
- <ProxiesTable
+ <ProducersProxy
+ account={account}
accounts={accounts}
actions={actions}
addProxy={addProxy}
+ blockExplorers={allBlockExplorers[connection.chainKey]}
+ currentProxy={currentProxy}
+ keys={keys}
+ isProxying={isProxying}
+ isValidUser={isValidUser}
+ onClose={this.onClose}
+ removeProxy={removeProxy}
+ settings={settings}
+ system={system}
+ tables={tables}
+ />
+ <ProxiesTable
+ accounts={accounts}
+ actions={actions}
+ addProxy={this.addProxy}
amount={amount}
attached="top"
currentProxy={currentProxy}
@@ -87,7 +127,7 @@ class Proxies extends Component<Props> {
isQuerying={this.isQuerying}
isValidUser={isValidUser}
proxies={proxies}
- removeProxy={removeProxy}
+ removeProxy={this.removeProxy}
resetDisplayAmount={this.resetDisplayAmount}
settings={settings}
system={system}
| 11 |
diff --git a/vr-ui.js b/vr-ui.js @@ -1366,12 +1366,6 @@ const makeIconMesh = () => {
});
};
mesh.getAnchors = () => anchors;
- mesh.click = anchor => {
- const match = anchor.id.match(/^tile-([0-9]+)-([0-9]+)$/);
- const i = parseInt(match[1], 10);
- const j = parseInt(match[2], 10);
- onclick(tiles[i][j]);
- };
mesh.update();
return mesh;
| 2 |
diff --git a/generators/openapi-client/files.js b/generators/openapi-client/files.js @@ -54,7 +54,7 @@ function writeFiles() {
let command;
if (generatorName === 'spring') {
this.log(chalk.green(`\n\nGenerating java client code for client ${cliName} (${inputSpec})`));
- const cliPackage = `${this.packageName}.client.${_.snakeCase(cliName)}`;
+ const cliPackage = `${this.packageName}.client.${_.toLower(cliName)}`;
const clientPackageLocation = path.resolve('src', 'main', 'java', ...cliPackage.split('.'));
if (shelljs.test('-d', clientPackageLocation)) {
this.log(`cleanup generated java code for client ${cliName} in directory ${clientPackageLocation}`);
| 4 |
diff --git a/src/resources/views/crud/inc/datatables_logic.blade.php b/src/resources/views/crud/inc/datatables_logic.blade.php "url": "{!! url($crud->route.'/search').'?'.Request::getQueryString() !!}",
"type": "POST",
"data": {
- "unfilteredQueryCount": "{{$crud->getOperationSetting('unfilteredQueryCount') ?? false}}"
+ "totalEntryCount": "{{$crud->getOperationSetting('totalEntryCount') ?? false}}"
},
},
dom:
| 14 |
diff --git a/app-template/bitcoincom/appConfig.json b/app-template/bitcoincom/appConfig.json "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
"pushSenderId": "1036948132229",
"description": "A Secure Bitcoin Wallet",
- "version": "4.2.0",
- "androidVersion": "402000",
+ "version": "4.3.0",
+ "androidVersion": "403000",
"_extraCSS": "",
"_enabledExtensions": {
"coinbase": false,
| 3 |
diff --git a/contracts/oasisContracts/KyberOasisReserve.sol b/contracts/oasisContracts/KyberOasisReserve.sol @@ -14,7 +14,7 @@ contract OtcInterface {
}
-contract TokenInterface is ERC20 {
+contract WethInterface is ERC20 {
function deposit() public payable;
function withdraw(uint) public;
}
@@ -26,7 +26,7 @@ contract KyberOasisReserve is KyberReserveInterface, Withdrawable, Utils2 {
address public sanityRatesContract = 0;
address public kyberNetwork;
OtcInterface public otc;
- TokenInterface public wethToken;
+ WethInterface public wethToken;
mapping(address=>bool) public isTokenListed;
mapping(address=>uint) public tokenMinSrcAmount;
bool public tradeEnabled;
@@ -35,7 +35,7 @@ contract KyberOasisReserve is KyberReserveInterface, Withdrawable, Utils2 {
function KyberOasisReserve(
address _kyberNetwork,
OtcInterface _otc,
- TokenInterface _wethToken,
+ WethInterface _wethToken,
address _admin,
uint _feeBps
)
@@ -55,7 +55,7 @@ contract KyberOasisReserve is KyberReserveInterface, Withdrawable, Utils2 {
feeBps = _feeBps;
tradeEnabled = true;
- wethToken.approve(otc, 2**255);
+ require(wethToken.approve(otc, 2**255));
}
function() public payable {
@@ -67,7 +67,7 @@ contract KyberOasisReserve is KyberReserveInterface, Withdrawable, Utils2 {
require(!isTokenListed[token]);
require(getDecimals(token) == COMMON_DECIMALS);
- token.approve(otc, 2**255);
+ require(token.approve(otc, 2**255));
isTokenListed[token] = true;
tokenMinSrcAmount[token] = minSrcAmount;
}
@@ -75,7 +75,7 @@ contract KyberOasisReserve is KyberReserveInterface, Withdrawable, Utils2 {
function delistToken(ERC20 token) public onlyAdmin {
require(isTokenListed[token]);
- token.approve(otc, 0);
+ require(token.approve(otc, 0));
delete isTokenListed[token];
delete tokenMinSrcAmount[token];
}
@@ -157,8 +157,8 @@ contract KyberOasisReserve is KyberReserveInterface, Withdrawable, Utils2 {
function getConversionRate(ERC20 src, ERC20 dest, uint srcQty, uint blockNumber) public view returns(uint) {
uint rate;
uint actualSrcQty;
- ERC20 wrappedSrc;
- ERC20 wrappedDest;
+ ERC20 actualSrc;
+ ERC20 actualDest;
uint offerPayAmt;
uint offerBuyAmt;
@@ -168,12 +168,12 @@ contract KyberOasisReserve is KyberReserveInterface, Withdrawable, Utils2 {
if (!validTokens(src, dest)) return 0;
if (src == ETH_TOKEN_ADDRESS) {
- wrappedSrc = wethToken;
- wrappedDest = dest;
+ actualSrc = wethToken;
+ actualDest = dest;
actualSrcQty = srcQty;
} else if (dest == ETH_TOKEN_ADDRESS) {
- wrappedSrc = src;
- wrappedDest = wethToken;
+ actualSrc = src;
+ actualDest = wethToken;
if (srcQty < tokenMinSrcAmount[src]) {
/* remove rounding errors and present rate for 0 src amount. */
@@ -186,7 +186,7 @@ contract KyberOasisReserve is KyberReserveInterface, Withdrawable, Utils2 {
}
// otc's terminology is of offer maker, so their sellGem is the taker's dest token.
- (, offerPayAmt, offerBuyAmt) = getMatchingOffer(wrappedDest, wrappedSrc, actualSrcQty);
+ (, offerPayAmt, offerBuyAmt) = getMatchingOffer(actualDest, actualSrc, actualSrcQty);
// make sure to take only one level of order book to avoid gas inflation.
if (actualSrcQty > offerBuyAmt) return 0;
@@ -262,6 +262,9 @@ contract KyberOasisReserve is KyberReserveInterface, Withdrawable, Utils2 {
// otc's terminology is of offer maker, so their sellGem is our (the taker's) dest token.
(offerId, offerPayAmt, offerBuyAmt) = getMatchingOffer(destToken, srcToken, srcAmount);
+
+ require(srcAmount <= MAX_QTY);
+ require(offerPayAmt <= MAX_QTY);
actualDestAmount = srcAmount * offerPayAmt / offerBuyAmt;
require(uint128(actualDestAmount) == actualDestAmount);
| 9 |
diff --git a/src/home/index.html b/src/home/index.html <ul class="navigation">
<li class="item"><a href="/api">API Reference</a></li>
<li class="item"><a href="/events">Developer Events</a></li>
- <li class="item dashboard"><a href="/dashboard" data-navigo><i class="icon-layers"></i></a></li>
+ <li class="item dashboard"><a href="/dashboard" data-navigo><i class="icon-login"></i></a></li>
</ul>
</header>
<section class="content">
| 14 |
diff --git a/ui/component/cardMedia/view.jsx b/ui/component/cardMedia/view.jsx @@ -20,12 +20,12 @@ class CardMedia extends React.PureComponent<Props> {
let url;
// @if TARGET='web'
// Pass image urls through a compression proxy
- // url = thumbnail || Placeholder;
- url = thumbnail
- ? 'https://ext.thumbnails.lbry.com/400x,q55/' +
+ url = thumbnail || Placeholder;
+// url = thumbnail
+// ? 'https://ext.thumbnails.lbry.com/400x,q55/' +
// The image server will redirect if we don't remove the double slashes after http(s)
- thumbnail.replace('https://', 'https:/').replace('http://', 'http:/')
- : Placeholder;
+// thumbnail.replace('https://', 'https:/').replace('http://', 'http:/')
+// : Placeholder;
// @endif
// @if TARGET='app'
url = thumbnail || Placeholder;
| 13 |
diff --git a/app/views/shared/_activity_item_for_dashboard.html.erb b/app/views/shared/_activity_item_for_dashboard.html.erb elsif item.respond_to?(:user)
item.user
end
+ return unless user
edit_url = case item.class.name
when "Comment" then edit_comment_path(item)
when "Identification" then edit_identification_path(item)
| 1 |
diff --git a/src/lib/gundb/UserStorageClass.js b/src/lib/gundb/UserStorageClass.js @@ -676,7 +676,7 @@ export class UserStorage {
const cleanValue = UserStorage.cleanFieldForIndex(field, value)
if (!cleanValue) {
- logger.error('indexProfileField - value is empty', cleanValue)
+ logger.error(`indexProfileField - field ${field} value is empty (value: ${value})`, cleanValue)
return false
}
| 0 |
diff --git a/contracts/deploy/016_aave_strategy.js b/contracts/deploy/016_aave_strategy.js @@ -3,6 +3,7 @@ const {
isMainnet,
isRinkeby,
} = require("../test/helpers.js");
+const addresses = require("../utils/addresses.js");
const { getTxOpts } = require("../utils/tx");
const { utils } = require("ethers");
@@ -122,12 +123,10 @@ const aaveStrategyAnd3PoolUsdtUpgrade = async ({
);
const cVaultProxy = await ethers.getContract("VaultProxy");
- t = await cAaveStrategy
- .connect(sDeployer)
- .initialize(
+ t = await cAaveStrategy.connect(sDeployer).initialize(
assetAddresses.AAVE_ADDRESS_PROVIDER,
cVaultProxy.address,
- assetAddresses.AAVE,
+ addresses.zero, // No reward token
[assetAddresses.DAI],
[assetAddresses.aDAI],
await getTxOpts()
| 12 |
diff --git a/src/filter/rulecomponent.html b/src/filter/rulecomponent.html ng-switch-when="date|datetime"
ng-switch-when-separator="|">
<div ng-switch="$ctrl.clone.operator">
- <div ng-switch-when="..">
+ <div ng-switch-when="..|time_during" ng-switch-when-separator="|">
<ngeo-date-picker
time="$ctrl.timeRangeMode"
on-date-selected="$ctrl.onDateRangeSelected(time)">
ng-switch-when="date|datetime"
ng-switch-when-separator="|">
<div ng-switch="$ctrl.rule.operator">
- <div ng-switch-when="..">
+ <div ng-switch-when="..|time_during" ng-switch-when-separator="|">
<span translate>From </span>
<span>{{ $ctrl.timeToDate($ctrl.rule.lowerBoundary) }}</span>
<span translate> to </span>
<div ng-switch-default>
<div ng-switch="$ctrl.rule.operator">
- <div ng-switch-when="..">
+ <div ng-switch-when="..|time_during" ng-switch-when-separator="|">
<span translate>Between </span>
<span>{{ $ctrl.rule.lowerBoundary }}</span>
<span translate> and </span>
| 9 |
diff --git a/io-manager.js b/io-manager.js @@ -36,6 +36,8 @@ ioManager.keys = {
left: false,
right: false,
shift: false,
+ space: false,
+ ctrl: false,
};
const resetKeys = () => {
for (const k in ioManager.keys) {
@@ -180,6 +182,12 @@ const _updateIo = (timeDiff, frame) => {
if (ioManager.keys.down) {
direction.z += 1;
}
+ if (ioManager.keys.space) {
+ direction.y += 1;
+ }
+ if (ioManager.keys.ctrl) {
+ direction.y -= 1;
+ }
const flyState = physicsManager.getFlyState();
if (flyState) {
direction.applyQuaternion(camera.quaternion);
@@ -377,6 +385,7 @@ window.addEventListener('keydown', e => {
}
case 32: { // space
if (document.pointerLockElement) {
+ ioManager.keys.space = true;
if (!physicsManager.getJumpState()) {
physicsManager.jump();
} else {
@@ -385,6 +394,12 @@ window.addEventListener('keydown', e => {
}
break;
}
+ case 17: { // ctrl
+ if (document.pointerLockElement) {
+ ioManager.keys.ctrl = true;
+ }
+ break;
+ }
case 81: { // Q
weaponsManager.setWeaponWheel(true);
break;
@@ -459,6 +474,18 @@ window.addEventListener('keyup', e => {
}
break;
}
+ case 32: { // space
+ if (document.pointerLockElement) {
+ ioManager.keys.space = false;
+ }
+ break;
+ }
+ case 17: { // ctrl
+ if (document.pointerLockElement) {
+ ioManager.keys.ctrl = false;
+ }
+ break;
+ }
case 69: { // E
// pe.grabup('right');
if (document.pointerLockElement) {
| 0 |
diff --git a/packages/@uppy/box/package.json b/packages/@uppy/box/package.json {
"name": "@uppy/box",
"description": "Import files from Box, into Uppy.",
- "version": "1.0.0",
+ "version": "0.2.0",
"license": "MIT",
"main": "lib/index.js",
"types": "types/index.d.ts",
},
"peerDependencies": {
"@uppy/core": "^1.0.0"
+ },
+ "publishConfig": {
+ "access": "public"
}
}
| 0 |
diff --git a/js/huobi.js b/js/huobi.js @@ -2783,14 +2783,14 @@ module.exports = class huobi extends Exchange {
//
const data = this.safeValue (response, 'data', []);
const result = {};
- this.options['networkJunctionsByTitles'] = {};
- this.options['networkTitlesByJunctions'] = {};
+ this.options['networkChainIdsByNames'] = {};
+ this.options['networkNamesByChainIds'] = {};
for (let i = 0; i < data.length; i++) {
const entry = data[i];
const currencyId = this.safeString (entry, 'currency');
const code = this.safeCurrencyCode (currencyId);
- this.options['networkJunctionsByTitles'][code] = {};
- this.options['networkTitlesByJunctions'][code] = {};
+ this.options['networkChainIdsByNames'][code] = {};
+ this.options['networkNamesByChainIds'][code] = {};
const chains = this.safeValue (entry, 'chains', []);
const networks = {};
const instStatus = this.safeString (entry, 'instStatus');
@@ -2804,8 +2804,8 @@ module.exports = class huobi extends Exchange {
const chainEntry = chains[j];
const uniqueChainId = this.safeString (chainEntry, 'chain'); // i.e. usdterc20, trc20usdt ...
const title = this.safeString (chainEntry, 'displayName');
- this.options['networkJunctionsByTitles'][code][title] = uniqueChainId;
- this.options['networkTitlesByJunctions'][code][uniqueChainId] = title;
+ this.options['networkChainIdsByNames'][code][title] = uniqueChainId;
+ this.options['networkNamesByChainIds'][code][uniqueChainId] = title;
const networkCode = this.networkIdToCode (title, code);
minWithdraw = this.safeNumber (chainEntry, 'minWithdrawAmt');
maxWithdraw = this.safeNumber (chainEntry, 'maxWithdrawAmt');
@@ -2877,11 +2877,11 @@ module.exports = class huobi extends Exchange {
if (currencyCode === undefined) {
throw new ArgumentsRequired (this.id + ' networkIdToCode() requires a currencyCode argument');
}
- const keysLength = (Object.keys (this.options['networkTitlesByJunctions'])).length;
+ const keysLength = (Object.keys (this.options['networkNamesByChainIds'])).length;
if (keysLength === 0) {
throw new ExchangeError (this.id + ' networkIdToCode() - markets need to be loaded at first');
}
- const networkTitles = this.safeValue (this.options['networkTitlesByJunctions'], currencyCode, {});
+ const networkTitles = this.safeValue (this.options['networkNamesByChainIds'], currencyCode, {});
const networkTitle = this.safeValue (networkTitles, networkId, networkId);
return super.networkIdToCode (networkTitle);
}
@@ -2890,11 +2890,11 @@ module.exports = class huobi extends Exchange {
if (currencyCode === undefined) {
throw new ArgumentsRequired (this.id + ' networkCodeToId() requires a currencyCode argument');
}
- const keysLength = (Object.keys (this.options['networkJunctionsByTitles'])).length;
+ const keysLength = (Object.keys (this.options['networkChainIdsByNames'])).length;
if (keysLength === 0) {
throw new ExchangeError (this.id + ' networkCodeToId() - markets need to be loaded at first');
}
- const uniqueNetworkIds = this.safeValue (this.options['networkJunctionsByTitles'], currencyCode, {});
+ const uniqueNetworkIds = this.safeValue (this.options['networkChainIdsByNames'], currencyCode, {});
const networkTitle = super.networkCodeToId (networkCode);
return this.safeValue (uniqueNetworkIds, networkTitle, networkTitle);
}
| 10 |
diff --git a/gulpfile.js b/gulpfile.js @@ -141,6 +141,7 @@ gulp.task('build-angular', (cb) => {
'install-angular-dev-app',
'setup-spark-packages',
'setup-spark-angular-projects',
+ 'build-angular-dev-app-netlify',
cb,
);
});
@@ -151,6 +152,7 @@ gulp.task('build-react', (cb) => {
'install-react-dev-app',
'link-spark-to-react-dir',
'setup-spark-core-react',
+ 'build-react-dev-app-netlify',
cb,
);
});
| 3 |
diff --git a/components/chip/theme.css b/components/chip/theme.css width: var(--chip-remove-size);
}
-.delete:hover .deleteIcon {
- background: var(--chip-remove-background-hover);
-}
-
.deleteIcon {
background: var(--chip-remove-background);
border-radius: var(--chip-remove-size);
stroke-width: var(--chip-remove-stroke-width);
}
}
+
+.delete:hover .deleteIcon {
+ background: var(--chip-remove-background-hover);
+}
| 1 |
diff --git a/includes/Core/Assets/Assets.php b/includes/Core/Assets/Assets.php @@ -651,6 +651,22 @@ final class Assets {
'fallback' => true,
)
),
+ new Script(
+ 'react',
+ array(
+ 'src' => $base_url . 'vendor/react' . $react_suffix . '.js',
+ 'version' => '16.8.5',
+ 'fallback' => true,
+ )
+ ),
+ new Script(
+ 'react-dom',
+ array(
+ 'src' => $base_url . 'vendor/react-dom' . $react_suffix . '.js',
+ 'version' => '16.8.5',
+ 'fallback' => true,
+ )
+ ),
new Script(
'wp-polyfill',
array(
| 1 |
diff --git a/_includes/faq.html b/_includes/faq.html {{ item[1].answer }}
</div>
</div>
+</div>
{% capture counter %}{{ counter | plus: 1 }}{% endcapture %}
{% endfor %}
\ No newline at end of file
| 1 |
diff --git a/readme.md b/readme.md @@ -331,6 +331,8 @@ This makes processing patches easier. If you want to normalize to the official s
For a more in-depth study, see [Distributing patches and rebasing actions using Immer](https://medium.com/@mweststrate/distributing-state-changes-using-snapshots-patches-and-actions-part-2-2f50d8363988)
+Tip: Check this trick to [compress patches](https://medium.com/@david.b.edelstein/using-immer-to-compress-immer-patches-f382835b6c69) produced over time.
+
## Auto freezing
Immer automatically freezes any state trees that are modified using `produce`. This protects against accidental modifications of the state tree outside of a producer. This comes with a performance impact, so it is recommended to disable this option in production. It is by default enabled. By default it is turned on during local development, and turned off in production. Use `setAutoFreeze(true / false)` to explicitly turn this feature on or off.
| 0 |
diff --git a/lib/api/controllers/documentController.js b/lib/api/controllers/documentController.js @@ -30,7 +30,7 @@ const {
} = require('../../util/requestAssertions');
const extractFields = require('../../util/extractFields');
const { HttpStream } = require('../../types');
-const { PassThrough } = require('stream');
+const BufferedPassThrough = require('../../util/bufferedPassThrough');
const { dumpCollectionData } = require('../../util/dump-collection');
/**
* @class DocumentController
@@ -192,9 +192,9 @@ class DocumentController extends NativeController {
searchBody.query = await this.translateKoncorde(searchBody.query || {});
}
- const stream = new PassThrough();
+ const stream = new BufferedPassThrough({ highWaterMark: 16384 });
- await dumpCollectionData(
+ dumpCollectionData(
stream,
index,
collection,
| 4 |
diff --git a/readme.md b/readme.md @@ -10,6 +10,7 @@ npm start
```
to start a local testing instance of KiriMoto on port 8080
+access KiriMoto on the url http://localhost:8080/kiri
## Other Start Options
@@ -18,4 +19,4 @@ npm run-script start-web
```
serves code as obfuscated, compressed bundles. this is the mode used to run on a public
web site, so you can't use "localhost" to test. to accomodate this, alias "debug" to 127.0.0.1
-then access KiriMoto on http://debug:8080
+then access KiriMoto on http://debug:8080/kiri
| 3 |
diff --git a/test/Terminal/TerminalParser.test.js b/test/Terminal/TerminalParser.test.js @@ -8,9 +8,18 @@ import uAPI from '../../src';
import ParserUapi from '../../src/Request/uapi-parser';
import terminalParser from '../../src/Services/Terminal/TerminalParser';
+const TerminalError = uAPI.errors.Terminal;
+const RequestError = uAPI.errors.Request;
const xmlFolder = `${__dirname}/MockResponses`;
describe('#TerminalParser', () => {
+ describe('errorHandler()', () => {
+ it('should throw an error in case of SOAP:Fault', () => {
+ expect(terminalParser.TERMINAL_ERROR).to.throw(
+ TerminalError.TerminalRuntimeError
+ );
+ });
+ });
describe('createSession()', () => {
it('should throw an error when credentials are wrong', () => {
const uParser = new ParserUapi('terminal:CreateTerminalSessionRsp', 'v36_0', {});
@@ -18,7 +27,9 @@ describe('#TerminalParser', () => {
return uParser.parse(xml).then(() => {
throw new Error('Successfully parsed error result');
}).catch((err) => {
- expect(err).to.be.an.instanceof(uAPI.errors.Request.RequestSoapError.SoapParsingError);
+ expect(err).to.be.an.instanceof(
+ RequestError.RequestSoapError.SoapParsingError
+ );
});
});
it('should throw an error when no host token in response', () => {
@@ -30,7 +41,7 @@ describe('#TerminalParser', () => {
throw new Error('Successfully parsed error result');
}).catch((err) => {
expect(err).to.be.an.instanceof(
- uAPI.errors.Terminal.TerminalParsingError.TerminalSessionTokenMissing
+ TerminalError.TerminalParsingError.TerminalSessionTokenMissing
);
});
});
@@ -54,7 +65,7 @@ describe('#TerminalParser', () => {
throw new Error('Successfully parsed error result');
}).catch((err) => {
expect(err).to.be.an.instanceof(
- uAPI.errors.Terminal.TerminalParsingError.TerminalResponseMissing
+ TerminalError.TerminalParsingError.TerminalResponseMissing
);
});
});
@@ -67,7 +78,7 @@ describe('#TerminalParser', () => {
throw new Error('Successfully parsed error result');
}).catch((err) => {
expect(err).to.be.an.instanceof(
- uAPI.errors.Terminal.TerminalParsingError.TerminalResponseMissing
+ TerminalError.TerminalParsingError.TerminalResponseMissing
);
});
});
@@ -94,7 +105,7 @@ describe('#TerminalParser', () => {
throw new Error('Successfully parsed error result');
}).catch((err) => {
expect(err).to.be.an.instanceof(
- uAPI.errors.Terminal.TerminalRuntimeError.TerminalCloseSessionFailed
+ TerminalError.TerminalRuntimeError.TerminalCloseSessionFailed
);
});
});
@@ -107,7 +118,7 @@ describe('#TerminalParser', () => {
throw new Error('Successfully parsed error result');
}).catch((err) => {
expect(err).to.be.an.instanceof(
- uAPI.errors.Terminal.TerminalRuntimeError.TerminalCloseSessionFailed
+ TerminalError.TerminalRuntimeError.TerminalCloseSessionFailed
);
});
});
| 0 |
diff --git a/src/tests/structs/db/int_Base.databaseless.test.js b/src/tests/structs/db/int_Base.databaseless.test.js @@ -125,6 +125,6 @@ describe('Int::structs/db/Base Databaseless', function () {
await Promise.all(files.map(fileName => fsUnlink(path.join(folderPath, fileName))))
}
await fsRmdir(folderPath)
- await fsRmdir(config.database.uri)
+ await fsRmdir(config.get().database.uri)
})
})
| 1 |
diff --git a/userscript.user.js b/userscript.user.js @@ -52170,10 +52170,13 @@ var $$IMU_EXPORT$$;
// https://www.famitsu.com/images/000/124/494/l_5874c086779f9.jpg -- 640x360, y/z don't work
// https://www.famitsu.com/images/000/181/637/5d5a8379e4e00.jpg
// https://www.famitsu.com/images/000/181/637/z_5d5a8379e4e00.jpg
+ // thanks to fireattack on github: https://github.com/qsniyg/maxurl/issues/364
+ // https://www.famitsu.com/images/000/160/712/5b46f32b76a9a.jpg
+ // https://www.famitsu.com/images/000/160/712/z_5b46f32b76a9a.jpg
// others:
// https://www.famitsu.com/images/000/124/494/5874c0867b874.jpg -- 3000x4500
// https://www.famitsu.com/images/000/124/494/l_5874c0867b874.jpg -- 426x640
- regex = /(\/images\/+(?:[0-9]{3}\/+){3})[tly]_([0-9a-f]+\.[^/.]*)(?:[?#].*)?$/;
+ regex = /(\/images\/+(?:[0-9]{3}\/+){3})(?:[tly]_)?([0-9a-f]+\.[^/.]*)(?:[?#].*)?$/;
if (regex.test(src)) {
return [
src.replace(regex, "$1z_$2"),
| 7 |
diff --git a/test/jasmine/tests/histogram2d_test.js b/test/jasmine/tests/histogram2d_test.js +var Plotly = require('@lib/index');
var Plots = require('@src/plots/plots');
var Lib = require('@src/lib');
var supplyDefaults = require('@src/traces/histogram2d/defaults');
var calc = require('@src/traces/histogram2d/calc');
+var createGraphDiv = require('../assets/create_graph_div');
+var destroyGraphDiv = require('../assets/destroy_graph_div');
+var fail = require('../assets/fail_test');
describe('Test histogram2d', function() {
'use strict';
@@ -132,4 +136,26 @@ describe('Test histogram2d', function() {
]);
});
});
+
+ describe('relayout interaction', function() {
+
+ afterEach(destroyGraphDiv);
+
+ it('should update paths on zooms', function(done) {
+ var gd = createGraphDiv();
+
+ Plotly.newPlot(gd, [{
+ type: 'histogram2dcontour',
+ x: [1, 1, 2, 2, 3],
+ y: [0, 1, 1, 1, 3]
+ }])
+ .then(function() {
+ return Plotly.relayout(gd, 'xaxis.range', [0, 2]);
+ })
+ .catch(fail)
+ .then(done);
+ });
+
+ });
+
});
| 0 |
diff --git a/lib/types/embedded.js b/lib/types/embedded.js @@ -89,12 +89,16 @@ EmbeddedDocument.prototype.$setIndex = function(index) {
EmbeddedDocument.prototype.markModified = function(path) {
this.$__.activePaths.modify(path);
+ const parent = this.$__parent();
+ const fullPath = this.$__pathRelativeToParent(path);
- if (this.__parentArray == null) {
+ if (parent == null || fullPath == null) {
return;
}
- this.__parentArray._markModified(this, path);
+ if (!this.isNew) {
+ parent.markModified(fullPath, this);
+ }
};
/*!
| 1 |
diff --git a/edit.js b/edit.js @@ -4099,6 +4099,19 @@ function animate(timestamp, frame) {
});
}
}
+
+ for (const inputSource of session.inputSources) {
+ if (inputSource && inputSource.hand) {
+ for (let i = 0; i < inputSource.hand.length; i++) {
+ const joint = inputSource.hand[i];
+
+ const jointPose = joint && frame.getJointPose(joint, referenceSpace);
+ if (jointPose) {
+ console.log('got joint pose', jointPose);
+ }
+ }
+ }
+ }
}
/* if (planetAnimation) {
| 0 |
diff --git a/src/components/Tooltip/tooltip.js b/src/components/Tooltip/tooltip.js @@ -118,21 +118,24 @@ class Tooltip extends Component {
visible: false,
};
- triggerRef = React.createRef();
+ constructor(props) {
+ super(props);
+ this.triggerRef = React.createRef();
+ }
componentDidMount() {
- window.addEventListener('click', this.onWindowClick);
window.addEventListener('touchstart', this.onWindowClick);
}
componentWillUnmount() {
- window.removeEventListener('click', this.onWindowClick);
window.removeEventListener('touchstart', this.onWindowClick);
}
- onWindowClick = event => (
- event.target === this.triggerRef.current ? this.show() : this.show()
- )
+ onWindowClick = event => {
+ if (event.target !== this.triggerRef.current) {
+ this.hide();
+ }
+ }
show = () => this.setState({ visible: true });
@@ -145,8 +148,9 @@ class Tooltip extends Component {
return (
<WrapperComponent
- onMouseEnter={() => this.show()}
- onMouseLeave={() => this.hide()}
+ onClick={this.show}
+ onMouseEnter={this.show}
+ onMouseLeave={this.hide}
>
{Children.map(children, child => {
if (isComponentOfType(Tooltip.Trigger, child)) {
| 7 |
diff --git a/src/models/addon.js b/src/models/addon.js @@ -149,7 +149,7 @@ Addon.getByName = function(api, orgaId, addonName) {
return s_addons.flatMapLatest(function(addons) {
var filtered_addons = _.filter(addons, function(addon) {
- return addon.name === addonName;
+ return addon.name === addonName || addon.realId === addonName;
});
if(filtered_addons.length === 1) {
return Bacon.once(filtered_addons[0]);
| 11 |
diff --git a/project/src/ui/FileDialog.cpp b/project/src/ui/FileDialog.cpp @@ -10,7 +10,7 @@ namespace lime {
std::wstring* FileDialog::OpenDirectory (std::wstring* filter, std::wstring* defaultPath) {
- // TODO: Filters
+ // TODO: Filter?
#ifdef HX_WINDOWS
@@ -56,11 +56,12 @@ namespace lime {
std::wstring* FileDialog::OpenFile (std::wstring* filter, std::wstring* defaultPath) {
- // TODO: Filters
+ std::wstring temp (L"*.");
+ const wchar_t* filters[] = { filter ? (temp + *filter).c_str () : NULL };
#ifdef HX_WINDOWS
- const wchar_t* path = tinyfd_openFileDialogW (L"", defaultPath ? defaultPath->c_str () : 0, 0, NULL, NULL, 0);
+ const wchar_t* path = tinyfd_openFileDialogW (L"", defaultPath ? defaultPath->c_str () : 0, filter ? 1 : 0, filter ? filters : NULL, NULL, 0);
if (path) {
@@ -81,7 +82,7 @@ namespace lime {
}
- const char* path = tinyfd_openFileDialog ("", _defaultPath, 0, NULL, NULL, 0);
+ const char* path = tinyfd_openFileDialog ("", _defaultPath, filter ? 1 : 0, filter ? filters : NULL, NULL, 0);
if (_defaultPath) free (_defaultPath);
@@ -102,13 +103,14 @@ namespace lime {
void FileDialog::OpenFiles (std::vector<std::wstring*>* files, std::wstring* filter, std::wstring* defaultPath) {
- // TODO: Filters
+ std::wstring temp (L"*.");
+ const wchar_t* filters[] = { filter ? (temp + *filter).c_str () : NULL };
std::wstring* __paths = 0;
#ifdef HX_WINDOWS
- const wchar_t* paths = tinyfd_openFileDialogW (L"", defaultPath ? defaultPath->c_str () : 0, 0, NULL, NULL, 1);
+ const wchar_t* paths = tinyfd_openFileDialogW (L"", defaultPath ? defaultPath->c_str () : 0, filter ? 1 : 0, filter ? filters : NULL, NULL, 1);
if (paths) {
@@ -128,7 +130,7 @@ namespace lime {
}
- const char* paths = tinyfd_openFileDialog ("", _defaultPath, 0, NULL, NULL, 1);
+ const char* paths = tinyfd_openFileDialog ("", _defaultPath, filter ? 1 : 0, filter ? filters : NULL, NULL, 1);
if (_defaultPath) free (_defaultPath);
@@ -163,11 +165,11 @@ namespace lime {
std::wstring* FileDialog::SaveFile (std::wstring* filter, std::wstring* defaultPath) {
- #ifdef HX_WINDOWS
-
std::wstring temp (L"*.");
const wchar_t* filters[] = { filter ? (temp + *filter).c_str () : NULL };
+ #ifdef HX_WINDOWS
+
const wchar_t* path = tinyfd_saveFileDialogW (L"", defaultPath ? defaultPath->c_str () : 0, filter ? 1 : 0, filter ? filters : NULL, NULL);
if (path) {
@@ -179,8 +181,6 @@ namespace lime {
#else
- // TODO: Filters
-
char* _defaultPath = 0;
if (defaultPath) {
@@ -191,7 +191,7 @@ namespace lime {
}
- const char* path = tinyfd_saveFileDialog ("", _defaultPath, 0, NULL, NULL);
+ const char* path = tinyfd_saveFileDialog ("", _defaultPath, filter ? 1 : 0, filter ? filters : NULL, NULL);
if (_defaultPath) free (_defaultPath);
| 7 |
diff --git a/website/src/_posts/2017-07-golden-retriever.md b/website/src/_posts/2017-07-golden-retriever.md @@ -51,7 +51,7 @@ If you really want to know...
Because we cannot access the actual files that we were uploading from disk, we cache them inside the browser.
-It all started with a [a prototype](https://github.com/transloadit/uppy/issues/237) by [Richard Willars](https://github.com/richardwillars), which used a Service Worker to store files and states. Service Workers are great for when you close a tab, but when the browser dies, so does the Service Worker. Also: iOS does not support it. So, we looked at Local Storage, which is almost universally available and _can_ survive a browser crash, but can't be used to store blobs. We also considered IndexedDB, which _can_ store blobs, but is less available and has severe limits on how much you can or should store in it.
+It all started with [a prototype](https://github.com/transloadit/uppy/issues/237) by [Richard Willars](https://github.com/richardwillars), which used a Service Worker to store files and states. Service Workers are great for when you close a tab, but when the browser dies, so does the Service Worker. Also: iOS does not support it. So, we looked at Local Storage, which is almost universally available and _can_ survive a browser crash, but can't be used to store blobs. We also considered IndexedDB, which _can_ store blobs, but is less available and has severe limits on how much you can or should store in it.
Since all of these technologies came with specific drawbacks, which one should we pick?
| 2 |
diff --git a/components/bases-locales/validator/report/summary/issues-sumup.js b/components/bases-locales/validator/report/summary/issues-sumup.js import React from 'react'
import PropTypes from 'prop-types'
import {X, AlertTriangle} from 'react-feather'
+import {flattenDeep, groupBy} from 'lodash'
import theme from '@/styles/theme'
import IssueRows from './issue-rows'
+const isFloatNumber = value => {
+ return value % 1 !== 0
+}
+
function IssuesSumup({issues, issueType, totalRowsCount, handleSelect}) {
- const issuesCount = Object.keys(issues).length
+ const issuesRows = Object.keys(issues).map(issue => {
+ return issues[issue]
+ })
+
+ const issuesFlatten = flattenDeep(issuesRows)
+ const issuesRowsCount = issuesFlatten.length
+ const issuesGroupedByLine = groupBy(issuesFlatten, 'line')
+ const issuesCount = Object.keys(issuesGroupedByLine).length
+ const percentageIssues = (issuesCount * 100) / totalRowsCount
+ const percentageRounded = isFloatNumber(percentageIssues) ? percentageIssues.toFixed(2) : percentageIssues
return (
<div className='issues-container'>
<h4>
- {issuesCount} {issueType === 'error' ? 'Erreur' : 'Avertissement'}{issuesCount > 1 ? 's' : ''}
+ {issuesRowsCount} {issueType === 'error' ? 'Erreur' : 'Avertissement'}{issuesRowsCount > 1 ? 's' : ''}
+ ({issuesCount} ligne{issuesCount > 1 ? 's' : ''}) - {percentageRounded} %
<div className={`summary-icon ${issueType}`}>
{issueType === 'error' ? (
<X style={{verticalAlign: 'bottom'}} />
| 0 |
diff --git a/aleph/index/entities.py b/aleph/index/entities.py @@ -5,6 +5,7 @@ from banal import ensure_list
from followthemoney import model
from followthemoney.types import registry
from elasticsearch.helpers import scan
+from elasticsearch.exceptions import NotFoundError
from aleph.core import es, cache
from aleph.model import Entity
@@ -63,7 +64,7 @@ def iter_entities(authz=None, collection_id=None, schemata=None,
'_source': _source_spec(includes, excludes)
}
index = entities_read_index(schema=schemata)
- for res in scan(es, index=index, query=query, scroll='1410m'):
+ for res in scan(es, index=index, query=query, scroll='1410m', raise_on_error=False): # noqa
entity = unpack_result(res)
if entity is not None:
if cached:
@@ -201,7 +202,16 @@ def delete_entity(entity_id, exclude=None, sync=False):
index = entity.get('_index')
if index == exclude:
continue
+ try:
es.delete(index=index, id=entity_id,
refresh=refresh_sync(sync))
q = {'term': {'entities': entity_id}}
query_delete(entities_read_index(), q, sync=sync)
+ except NotFoundError:
+ # This is expected in some cases. For example, when 2 Things are
+ # connected by an Interval and all the 3 entities get deleted
+ # simultaneously, Aleph tries to delete the Interval thrice due to
+ # recursive deletion of adjacent entities. ElasticSearch throws a
+ # 404 in that case.
+ log.warning("Delete failed for entity %s - not found", entity_id)
+ continue
| 9 |
diff --git a/src/webhook/index.js b/src/webhook/index.js @@ -82,10 +82,16 @@ const singleUserHandler = async (
// Handle follow/unfollow event
if (type === 'follow') {
+ await UserSettings.setAllowNewReplyUpdate(userId, true);
+
+ if (process.env.RUMORS_LINE_BOT_URL) {
const data = { sessionId: Date.now() };
result = {
context: { data: data },
- replies: [createGreetingMessage(), createTutorialMessage(data.sessionId)],
+ replies: [
+ createGreetingMessage(),
+ createTutorialMessage(data.sessionId),
+ ],
};
const visitor = ga(userId, 'TUTORIAL');
@@ -95,8 +101,10 @@ const singleUserHandler = async (
el: 'ON_BOARDING',
});
visitor.send();
-
- await UserSettings.setAllowNewReplyUpdate(userId, true);
+ } else {
+ clearTimeout(timerId);
+ return;
+ }
} else if (type === 'unfollow') {
await UserSettings.setAllowNewReplyUpdate(userId, false);
clearTimeout(timerId);
| 9 |
diff --git a/lib/utils.js b/lib/utils.js @@ -72,7 +72,7 @@ function hasAlreadyProcessedMessage(msg, ID=null, key=null) {
return false;
}
-const defaultPrecision = {temperature: 2, humidity: 2, pressure: 1};
+const defaultPrecision = {temperature: 2, humidity: 2, pressure: 1, pm25: 2};
function calibrateAndPrecisionRoundOptions(number, options, type) {
// Calibrate
const calibrateKey = `${type}_calibration`;
| 12 |
diff --git a/apps/hourstrike/app.js b/apps/hourstrike/app.js @@ -23,50 +23,24 @@ if (!settings) resetSettings();
function showMainMenu() {
var mode_txt = ['Off','1 min','5 min','10 min','1/4 h','1/2 h','1 h'];
var mode_interval = [-1,60,300,600,900,1800,3600];
- const mainmenu = {
- '': { 'title': 'Hour Strike' },
- 'Notify every': {
+ const mainmenu = {'': { 'title': 'Hour Strike' }};
+ mainmenu['Next strike at '+settings.next_hour+':'+settings.next_minute] = function(){};
+ mainmenu['Notify every'] = {
value: mode_interval.indexOf(settings.interval),
- min: 0, max: 6,
- format: v => mode_txt[v],
+ min: 0, max: 6, format: v => mode_txt[v],
onchange: v => {
settings.interval = mode_interval[v];
- if (v===0) {
- settings.next_hour = -1;
- settings.next_minute = -1;
- }
- updateSettings();
- }
- },
- 'Start': {
- value: settings.start,
- min: 0, max: 23,
- format: v=>v+':00',
- onchange: v=> {
- settings.start = v;
- updateSettings();
- }
- },
- 'End': {
- value: settings.end,
- min: 0, max: 23,
- format: v=>v+':59',
- onchange: v=> {
- settings.end = v;
- updateSettings();
- }
- },
- 'Strength': {
- value: settings.vlevel*10,
- min: 1, max: 10,
- format: v=>v/10,
- onchange: v=> {
- settings.vlevel = v/10;
- updateSettings();
- }
- }
- };
- mainmenu['Next strike '+settings.next_hour+':'+settings.next_minute] = function(){};
+ if (v===0) {settings.next_hour = -1; settings.next_minute = -1;}
+ updateSettings();}};
+ mainmenu.Start = {
+ value: settings.start, min: 0, max: 23, format: v=>v+':00',
+ onchange: v=> {settings.start = v; updateSettings();}};
+ mainmenu.End = {
+ value: settings.end, min: 0, max: 23, format: v=>v+':59',
+ onchange: v=> {settings.end = v; updateSettings();}};
+ mainmenu.Strength = {
+ value: settings.vlevel*10, min: 1, max: 10, format: v=>v/10,
+ onchange: v=> {settings.vlevel = v/10; updateSettings();}};
mainmenu['< Back'] = ()=>load();
return E.showMenu(mainmenu);
}
| 3 |
diff --git a/src/frontend/packages/semantic-data-provider/src/dataProvider/utils/buildSparqlQuery.js b/src/frontend/packages/semantic-data-provider/src/dataProvider/utils/buildSparqlQuery.js @@ -70,6 +70,14 @@ const buildSparqlQuery = ({ containers, params: { filter }, dereference, ontolog
type: 'bgp',
triples: [triple(variable('s1'), variable('p1'), variable('o1'))]
},
+ {
+ type: 'filter',
+ expression: {
+ type: 'operation',
+ operator: 'isliteral',
+ args: [variable('o1')]
+ }
+ },
{
type: 'filter',
expression: {
@@ -90,25 +98,6 @@ const buildSparqlQuery = ({ containers, params: { filter }, dereference, ontolog
literal(filter.q.toLowerCase(), '', namedNode('http://www.w3.org/2001/XMLSchema#string'))
]
}
- },
- {
- type: 'filter',
- expression: {
- type: 'operation',
- operator: 'notexists',
- args: [
- {
- type: 'bgp',
- triples: [
- triple(
- variable('s1'),
- namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'),
- variable('o1')
- )
- ]
- }
- ]
- }
}
],
type: 'query'
| 7 |
diff --git a/views/tabarea.es b/views/tabarea.es @@ -383,6 +383,7 @@ export default connect(
minimumWidth={{ px: 0, percent: this.props.doubleTabbed ? 10 : 100 }}
defaultWidth={{ px: 0, percent: 50 }}
initWidth={this.props.mainPanelWidth}
+ minimumHeight={{ px: 0, height: 100 }}
initHeight={{ px: 0, percent: 100 }}
parentContainer={this.state.resizeContainer}
disable={{ width: !this.props.doubleTabbed || !this.props.editable, height: true }}
| 12 |
diff --git a/src/inner-slider.js b/src/inner-slider.js @@ -369,12 +369,13 @@ export class InnerSlider extends React.Component {
slideHandler = (index, dontAnimate = false) => {
const {
asNavFor,
- currentSlide,
beforeChange,
onLazyLoad,
speed,
afterChange
} = this.props;
+ // capture currentslide before state is updated
+ const currentSlide = this.state.currentSlide;
let { state, nextState } = slideHandler({
index,
...this.props,
| 12 |
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css @@ -70,6 +70,12 @@ footer {
/*
* Custom styles
*/
+.label-icon {
+ position: absolute;
+ border: 1px solid black;
+ border-radius: 100%;
+ outline: 0.5px solid white;
+}
.icon-outline {
border: 1px solid black;
@@ -1284,13 +1290,6 @@ kbd {
border-bottom-width: 0;
}
-.label-icon {
- position: absolute;
- border: 1px solid black;
- border-radius: 100%;
- outline: 0.5px solid white;
-}
-
.gif-container {
position: relative;
text-align: left;
| 5 |
diff --git a/content/tutorials/marketplace-introduction.md b/content/tutorials/marketplace-introduction.md @@ -15,4 +15,4 @@ https://v4.market.oceanprotocol.com/
2. Consumers can purchase access to data, algorithms, compute services.
-3. Liquidity providers can stake their Ocean tokens to earn interest on the transactions going through the Liqiuidy pool.
+3. Liquidity providers can add their OCEAN tokens to liquidity pools and earn interest on the transactions.
| 14 |
diff --git a/example/src/Demo.jsx b/example/src/Demo.jsx @@ -5,7 +5,7 @@ const extensions = require('../../packages/oas-extensions/');
const withSpecFetching = require('./SpecFetcher');
-const ApiExplorer = require('../../packages/api-explorer/src');
+const ApiExplorer = require('../../packages/api-explorer');
const Logs = require('../../packages/api-logs');
const ApiList = require('./ApiList');
| 4 |
diff --git a/scenes/SceneArchive.js b/scenes/SceneArchive.js @@ -14,7 +14,6 @@ import ScenePageHeader from "~/components/core/ScenePageHeader";
import SceneSettings from "~/scenes/SceneSettings";
import SceneDeals from "~/scenes/SceneDeals";
import SceneWallet from "~/scenes/SceneWallet";
-import SceneSentinel from "~/scenes/SceneSentinel";
import SceneMiners from "~/scenes/SceneMiners";
const STYLES_SPINNER_CONTAINER = css`
@@ -130,7 +129,6 @@ export default class SceneArchive extends React.Component {
tabs={[
{ title: "Archive Settings", value: { tab: "archive" } },
{ title: "Wallet", value: { tab: "wallet" } },
- { title: "API", value: { tab: "api" } },
{ title: "Miners", value: { tab: "miners" } },
]}
value={tab}
@@ -146,10 +144,10 @@ export default class SceneArchive extends React.Component {
deal. You must have at last 100MB stored to make an archive storage deal.
</ScenePageHeader>
- <System.P1 style={{ marginTop: 24 }}>
+ <System.P style={{ marginTop: 24 }}>
Archive all of your data onto the Filecoin Network with a storage deal using
your default settings.
- </System.P1>
+ </System.P>
<br />
<System.ButtonPrimary
onClick={() =>
@@ -226,18 +224,6 @@ export default class SceneArchive extends React.Component {
</React.Fragment>
) : null}
- {tab === "api" ? (
- <React.Fragment>
- {this.state.routes ? (
- <SceneSentinel routes={this.state.routes} />
- ) : (
- <div css={STYLES_SPINNER_CONTAINER}>
- <LoaderSpinner style={{ height: 32, width: 32 }} />
- </div>
- )}
- </React.Fragment>
- ) : null}
-
{tab === "miners" ? (
<React.Fragment>
{this.state.miners ? (
| 2 |
diff --git a/package.json b/package.json "type": "git",
"url": "git://github.com/11ty/eleventy.git"
},
+ "bugs": "https://github.com/11ty/eleventy/issues",
+ "homepage": "https://www.11ty.dev/",
"ava": {
"files": [
"./test/*.js"
| 0 |
diff --git a/token-metadata/0x55648De19836338549130B1af587F16beA46F66B/metadata.json b/token-metadata/0x55648De19836338549130B1af587F16beA46F66B/metadata.json "symbol": "PBL",
"address": "0x55648De19836338549130B1af587F16beA46F66B",
"decimals": 18,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js var previousType = this.typeMap[this.propertyType];
previousValue = this.input.val();
- if (this.typeChanged) {
+ if (previousType && this.typeChanged) {
if (this.options.debug) { console.log(this.identifier,"typeChanged",{previousType,previousValue}) }
if (previousType.options && opt.hasValue !== true) {
this.oldValues[previousType.value] = previousValue;
| 9 |
diff --git a/setup.cfg b/setup.cfg [flake8]
-exclude = node_modules, docs/components_page/components/collapse.py, docs/components_page/components/buttons/usage.py, docs/components_page/components/popover.py, docs/components_page/components/fade.py
+exclude = node_modules, docs/components_page/components/collapse.py, docs/components_page/components/buttons/usage.py, docs/components_page/components/popover.py, docs/components_page/components/fade.py, docs/components_page/components/progress.py
ignore = E203, W503
[isort]
| 8 |
diff --git a/server/game/cards/13.6-LMHR/CityOfWealth.js b/server/game/cards/13.6-LMHR/CityOfWealth.js @@ -13,7 +13,7 @@ class CityOfWealth extends PlotCard {
}
numOfCityPlots() {
- this.controller.getNumberOfUsedPlotsByTrait('City');
+ return this.controller.getNumberOfUsedPlotsByTrait('City');
}
}
| 1 |
diff --git a/fileserver/server.js b/fileserver/server.js @@ -142,8 +142,8 @@ class FileServer {
onetimePasswordCounter+=1;
let token = hotp.generate(secret, onetimePasswordCounter);
if (abbrv===0) {
- console.log('++++ BioImage Suite Web FileServer Initialized');
- console.log('++++ \t I am listening for incoming connections, using the following one time info.');
+ console.log('++++ BioImage Suite Web FileServer Initialized\n++++');
+ console.log('++++ \t The websocket server is listening for incoming connections,\n++++\t using the following one time info.\n++++');
console.log(`++++ \t\t hostname: ${globalHostname}:${globalPortNumber}`);
} else if (abbrv===1) {
console.log('++++\n++++ Create New Password ... try again.');
@@ -260,7 +260,7 @@ class FileServer {
//start the server listening for new connections if it's on the control port
if (port === globalPortNumber) {
- newServer.listen(globalPortNumber, 'localhost');
+ newServer.listen(globalPortNumber, globalHostname);
self.createPassword();
}
}
@@ -584,7 +584,9 @@ class FileServer {
//spawn a new server to handle the data transfer
let tserver=new FileServer();
// globalDataPortNumber+=1; // get me the next available port
- tserver.startServer('localhost', globalDataPortNumber,false, () => {
+ globalDataPortNumber+=1;
+ console.log('Starting tserver',globalHostname,globalDataPortNumber);
+ tserver.startServer(globalHostname, globalDataPortNumber,false, () => {
tserver.createFileInProgress(upload);
socket.write(formatPacket('uploadmessage', {
'name' : 'datasocketready',
@@ -919,9 +921,10 @@ class FileServer {
program
.option('-v, --verbose', 'Whether or not to display messages written by the server')
.option('-p, --port <n>', 'Which port to start the server on')
- .option('--read-only', 'Whether or not the server should accept requests to write files')
+ .option('--readonly', 'Whether or not the server should accept requests to write files')
.option('--insecure', 'USE WITH EXTREME CARE -- if true no password')
.option('--verbose', ' print extra statements')
+ .option('--nolocalhost', ' allow remote connections')
.parse(process.argv);
@@ -930,17 +933,37 @@ let portno=8081;
if (program.port)
portno=parseInt(program.port);
-READONLYFLAG = program.readOnly ? program.readOnly : false;
+let nolocalhost=false;
+
+READONLYFLAG = program.readonly ? program.readonly : false;
insecure = program.insecure ? program.insecure : false;
verbose = program.verbose ? program.verbose : false;
+nolocalhost = program.nolocalhost ? program.nolocalhost : false;
+
+//if (insecure)
+// nolocalhost=false;
+
let server=new FileServer();
-server.startServer('localhost', portno, true, () => {
- console.log('Server started ',portno);
+require('dns').lookup(require('os').hostname(), function (err, add, fam) {
+
+ let ipaddr='localhost';
+ if (nolocalhost)
+ ipaddr=`${add}`;
+ console.log('__________________________________________________________________________________');
+ server.startServer(ipaddr, portno, true, () => {
if (insecure) {
- console.log("+++++ IN INSECURE MODE");
+ console.log("++++\t IN INSECURE MODE");
}
+ if (nolocalhost)
+ console.log("----\t Allowing remote connections");
+ else
+ console.log("----\t Allowing only local connections");
+ if (READONLYFLAG)
+ console.log("----\t Running in 'read-only' mode");
+ console.log('__________________________________________________________________________________');
+ });
});
| 11 |
diff --git a/README.md b/README.md @@ -176,6 +176,19 @@ functions:
handler: handler.createUser
```
+supported definitions:
+
+item | support
+---|---
+simple | :white_check_mark:
+|
+cors | :white_check_mark:
+method | :white_check_mark:
+path | :white_check_mark:
+private | :white_check_mark:
+
+_incomplete list: more supported and unsupported config items coming soon_
+
### schedule (Cloudwatch)
docs: https://serverless.com/framework/docs/providers/aws/events/schedule/
| 0 |
diff --git a/sox.features.js b/sox.features.js userid = sox.helpers.getIDFromAnchor(this);
username = this.innerText;
- if (userid !== 0) postAuthors[userid] = username;
+ if (userid > 0) postAuthors[userid] = username;
} else {
sox.loginfo('Could not find user user link for: ', this);
}
| 8 |
diff --git a/src/ApiGateway.js b/src/ApiGateway.js @@ -546,8 +546,7 @@ module.exports = class ApiGateway {
debugLog('event:', event);
- return new Promise(async (resolve) => {
- const callback = (err, data) => {
+ const processResponse = (err, data) => {
if (this.options.showDuration) {
performance.mark(`${requestId}-end`);
performance.measure(
@@ -576,12 +575,10 @@ module.exports = class ApiGateway {
// it here and reply in the same way that we would have above when
// we lazy-load the non-IPC handler function.
if (this.options.useSeparateProcesses && err.ipcException) {
- return resolve(
- this._reply500(
+ return this._reply500(
response,
`Error while loading ${functionName}`,
err,
- ),
);
}
@@ -727,8 +724,7 @@ module.exports = class ApiGateway {
if (responseTemplatesKeys.length) {
// BAD IMPLEMENTATION: first key in responseTemplates
- const responseTemplate =
- responseTemplates[responseContentType];
+ const responseTemplate = responseTemplates[responseContentType];
if (responseTemplate && responseTemplate !== '\n') {
debugLog('_____ RESPONSE TEMPLATE PROCCESSING _____');
@@ -791,8 +787,7 @@ module.exports = class ApiGateway {
} else if (integration === 'lambda-proxy') {
/* LAMBDA PROXY INTEGRATION HAPIJS RESPONSE CONFIGURATION */
- response.statusCode = statusCode =
- (result || {}).statusCode || 200;
+ response.statusCode = statusCode = (result || {}).statusCode || 200;
const headers = {};
if (result && result.headers) {
@@ -847,11 +842,7 @@ module.exports = class ApiGateway {
response.source = Buffer.from(result.body, 'base64');
response.variety = 'buffer';
} else {
- if (
- result &&
- result.body &&
- typeof result.body !== 'string'
- ) {
+ if (result && result.body && typeof result.body !== 'string') {
return this._reply500(
response,
'According to the API Gateway specs, the body content must be stringified. Check your Lambda response and make sure you are invoking JSON.stringify(YOUR_CONTENT) on your body object',
@@ -873,18 +864,20 @@ module.exports = class ApiGateway {
} finally {
if (this.options.printOutput)
this.log(
- err
- ? `Replying ${statusCode}`
- : `[${statusCode}] ${whatToLog}`,
+ err ? `Replying ${statusCode}` : `[${statusCode}] ${whatToLog}`,
);
debugLog('requestId:', requestId);
}
// Bon voyage!
- resolve(response);
+ return response;
+ };
+
+ return new Promise(async (resolve) => {
+ const callback = (err, data) => {
+ resolve(processResponse(err, data));
};
- // We create the context, its callback (context.done/succeed/fail) will send the HTTP response
const lambdaContext = new LambdaContext({
callback,
lambdaName: functionObj.name,
| 0 |
diff --git a/website/javascript/templates/EditUserProfile.vue b/website/javascript/templates/EditUserProfile.vue @@ -276,9 +276,7 @@ export default {
'organization_id': this === 'NONE' ? null : this.organization
}
- if(this.level === 'High School')
- {
-
+ if(this.level === 'High School'){
request['organization_id'] = this.selected_highSchool.id
}
| 1 |
diff --git a/lib/classes/Variables.test.js b/lib/classes/Variables.test.js 'use strict';
+/* eslint-disable no-unused-expressions */
+
const path = require('path');
const proxyquire = require('proxyquire');
const YAML = require('js-yaml');
@@ -646,8 +648,8 @@ describe('Variables', () => {
return serverless.variables.getValueFromFile('file(./non-existing.yml)')
.then(valueToPopulate => {
- expect(realpathSync.calledOnce).to.be.equal(false);
- expect(existsSync.calledOnce).to.be.equal(true);
+ expect(realpathSync).to.not.have.been.called;
+ expect(existsSync).to.have.been.calledOnce;
expect(valueToPopulate).to.be.equal(undefined);
realpathSync.restore();
existsSync.restore();
| 7 |
diff --git a/lib/ring.js b/lib/ring.js @@ -34,6 +34,7 @@ class RingMqtt {
this.client = false
this.mqttConnected = false
this.republishCount = 6 // Republish config/state this many times after startup or HA start/restart
+ this.refreshToken = undefined
// Configure event listeners
utils.event.on('mqtt_state', async (state) => {
@@ -68,11 +69,36 @@ class RingMqtt {
}
}
})
+
+ // Check for invalid refreshToken after connection was successfully made
+ // This usually indicates a Ring service outage impacting authentication
+ setInterval(() => {
+ if (this.client && !this.client.restClient.refreshToken) {
+ debug(colors.yellow('Possible Ring service outage detected, forcing use of refresh token from latest state'))
+ this.client.restClient.refreshToken = this.refreshToken
+ this.client.restClient._authPromise = undefined
+ }
+ }, 60000)
}
async init(state, generatedToken) {
+ this.refreshToken = generatedToken ? generatedToken : state.data.ring_token
+
+ if (this.client) {
+ try {
+ debug('A new refresh token was generated, attempting to establish re-establish connection to Ring API')
+ this.client.restClient.refreshToken = this.refreshToken
+ this.client.restClient._authPromise = undefined
+ await this.client.getProfile()
+ debug(`Successfully re-established connection to Ring API using generated refresh token`)
+ } catch (error) {
+ debug(colors.brightYellow(error.message))
+ debug(colors.brightYellow(`Failed to re-establish connection to Ring API using generated refresh token`))
+
+ }
+ } else {
const ringAuth = {
- refreshToken: generatedToken ? generatedToken : state.data.ring_token,
+ refreshToken: this.refreshToken,
systemId: state.data.systemId,
controlCenterDisplayName: (process.env.RUNMODE === 'addon') ? 'ring-mqtt-addon' : 'ring-mqtt',
...utils.config.enable_cameras ? { cameraStatusPollingSeconds: 20 } : {},
@@ -93,6 +119,7 @@ class RingMqtt {
return
}
debug('Received updated refresh token')
+ this.refreshToken = newRefreshToken
state.updateToken(newRefreshToken)
})
} catch(error) {
@@ -100,6 +127,8 @@ class RingMqtt {
debug(colors.brightYellow(error.message))
debug(colors.brightYellow(`Failed to establish connection to Ring API using ${generatedToken ? 'generated' : 'saved'} refresh token`))
}
+ }
+
return this.client
}
@@ -154,17 +183,16 @@ class RingMqtt {
const locations = await this.client.getLocations()
debug(colors.green('-'.repeat(90)))
- debug(colors.white('Starting Device Discovery...'))
- debug(' '.repeat(90))
debug(colors.white('This account has access to the following locations:'))
locations.map(function(location) {
debug(' '+colors.green(location.name)+colors.cyan(` (${location.id})`))
})
debug(' '.repeat(90))
debug(colors.brightYellow('IMPORTANT: ')+colors.white('If *ANY* alarm or smart lighting hubs at these locations are *OFFLINE* '))
- debug(colors.white(' the discovery process below will hang and no devices will be published!'))
+ debug(colors.white(' the device discovery process below will hang and no devices will be '))
+ debug(colors.white(' published! '))
debug(' '.repeat(90))
- debug(colors.white(' If the message "Device Discovery Complete" is not logged below, please '))
+ debug(colors.white(' If the message "Device Discovery Complete!" is not logged below, please'))
debug(colors.white(' carefully check the Ring app for any hubs or smart lighting devices '))
debug(colors.white(' that are in offline state and either remove them from the location or '))
debug(colors.white(' bring them back online prior to restarting ring-mqtt. '))
@@ -186,6 +214,9 @@ class RingMqtt {
*/
debug(colors.green('-'.repeat(90)))
+ debug(colors.white('Starting Device Discovery...'))
+ debug(' '.repeat(90))
+
// If new location, set custom properties and add to location list
if (this.locations.find(l => l.locationId == location.locationId)) {
debug(colors.white('Existing location: ')+colors.green(location.name)+colors.cyan(` (${location.id})`))
@@ -261,6 +292,7 @@ class RingMqtt {
debug(colors.yellow(` Unsupported device: ${deviceType}`))
})
}
+ debug(' '.repeat(90))
debug(colors.white('Device Discovery Complete!'))
debug(colors.green('-'.repeat(90)))
await utils.sleep(2)
| 7 |
diff --git a/example2/src/App.svelte b/example2/src/App.svelte <script>
import { setContext } from 'svelte'
- import { Router } from '@sveltech/routify'
+ import { Router, basepath } from '@sveltech/routify'
import { routes } from '@sveltech/routify/tmp/routes'
import { writable } from 'svelte/store'
import ServiceWorker from './ServiceWorker.svelte'
+
+ const params = new URLSearchParams(location.search)
+ const bp = params.get('basepath')
+ if (bp) $basepath = bp
</script>
<Router {routes} />
| 11 |
diff --git a/lib/taiko.js b/lib/taiko.js @@ -236,7 +236,8 @@ module.exports.goto = async (url, options = { timeout: 30000 }) => {
let func = addPromiseToWait(promises);
xhrEvent.addListener('xhrEvent', func);
if (options.headers) await network.setExtraHTTPHeaders({ headers: options.headers });
- await page.navigate({ url: url });
+ const res = await page.navigate({ url: url });
+ if(res.errorText) throw new Error(`Navigation to url ${url} failed.\n REASON: ${res.errorText}`);
await waitForNavigation(options.timeout, promises).catch(handleTimeout(func, options.timeout));
xhrEvent.removeListener('xhrEvent', func);
return { description: `Navigated to url "${url}"`, url: url };
| 9 |
diff --git a/src/geo/ui/legends/base/img-loader-view.js b/src/geo/ui/legends/base/img-loader-view.js @@ -30,7 +30,7 @@ module.exports = Backbone.View.extend({
var svg = content.cloneNode(true);
var $svg = $(svg);
$svg = $svg.removeAttr('xmlns:a');
- $svg.attr('class', self._imageClass + ' is-svg js-image');
+ $svg.attr('class', self._imageClass + ' js-image');
self.$el.empty().append($svg);
| 13 |
diff --git a/src/utility/index.jsx b/src/utility/index.jsx @@ -18,8 +18,9 @@ import subTextStyle from 'components/Visualizations/Table/subText.css';
import findLast from 'lodash.findlast';
import _ from 'lodash/fp';
import util from 'util';
-// import FontIcon from 'material-ui/FontIcon';
+// import SvgIcon from 'material-ui/SvgIcon';
import SocialPeople from 'material-ui/svg-icons/social/people';
+import SocialPerson from 'material-ui/svg-icons/social/person';
const iconStyles = {
marginBottom: -5,
@@ -274,14 +275,18 @@ export const transformations = {
game_mode: (row, col, field) => (strings[`game_mode_${field}`]),
match_id_and_game_mode: (row, col, field) => {
const partySize = (partySize) => {
- if (partySize > 1) {
+ if (partySize === 1) {
return [
- <SocialPeople color="rgb(179, 179, 179)" style={iconStyles} />,
- ` x${row.party_size}`,
+ <SocialPerson color="rgb(179, 179, 179)" style={iconStyles} />,
];
+ } else if (partySize === null) {
+ return null;
}
- return null;
+ return [
+ <SocialPeople color="rgb(179, 179, 179)" style={iconStyles} />,
+ ` x${row.party_size}`,
+ ];
};
return (
<div>
| 9 |
diff --git a/definitions/npm/axios_v0.16.x/flow_v0.25.x-/axios_v0.16.x.js b/definitions/npm/axios_v0.16.x/flow_v0.25.x-/axios_v0.16.x.js @@ -62,7 +62,7 @@ declare module 'axios' {
statusText: string,
request: http$ClientRequest | XMLHttpRequest
}
- declare type $AxiosXHR<T> = $AxiosXHR<T>;
+ declare type $AxiosXHR<T> = AxiosXHR<T>;
declare class AxiosInterceptorIdent extends String {}
declare class AxiosRequestInterceptor<T> {
use(
| 1 |
diff --git a/buildspec.yml b/buildspec.yml @@ -12,7 +12,15 @@ phases:
- echo Building the Docker image...
- echo Logging in to Docker Hub...
- echo "${DOCKERHUB_PASSWORD}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin
- - docker build -t $REPOSITORY_URI:latest .
+ - echo "${CODEBUILD_BUILD_ARN}"
+ - |
+ if expr "${CODEBUILD_BUILD_ARN}" : ".*CodeBuildProject-app-TestHarness-" >/dev/null; then
+ docker build -t $REPOSITORY_URI:latest ./tests/loading/Dockerfile
+ fi
+ - |
+ if expr "${CODEBUILD_BUILD_ARN}" : ".*CodeBuildProject-app-" >/dev/null; then
+ docker build -t $REPOSITORY_URI:latest .
+ fi
- docker tag $REPOSITORY_URI:latest $REPOSITORY_URI:$IMAGE_TAG
post_build:
commands:
| 0 |
diff --git a/src/traces/streamtube/calc.js b/src/traces/streamtube/calc.js @@ -107,14 +107,14 @@ function processGrid(trace) {
var firstY, lastY;
var firstZ, lastZ;
if(len) {
- firstX = +x[0];
- firstY = +y[0];
- firstZ = +z[0];
+ firstX = x[0];
+ firstY = y[0];
+ firstZ = z[0];
}
if(len > 1) {
- lastX = +x[len - 1];
- lastY = +y[len - 1];
- lastZ = +z[len - 1];
+ lastX = x[len - 1];
+ lastY = y[len - 1];
+ lastZ = z[len - 1];
}
for(i = 0; i < len; i++) {
@@ -127,15 +127,15 @@ function processGrid(trace) {
zMax = Math.max(zMax, z[i]);
zMin = Math.min(zMin, z[i]);
- if(!filledX && (+x[i]) !== firstX) {
+ if(!filledX && x[i] !== firstX) {
filledX = true;
gridFill += 'x';
}
- if(!filledY && (+y[i]) !== firstY) {
+ if(!filledY && y[i] !== firstY) {
filledY = true;
gridFill += 'y';
}
- if(!filledZ && (+z[i]) !== firstZ) {
+ if(!filledZ && z[i] !== firstZ) {
filledZ = true;
gridFill += 'z';
}
| 2 |
diff --git a/src/menelaus_web_buckets.erl b/src/menelaus_web_buckets.erl @@ -204,7 +204,10 @@ build_auto_compaction_info(BucketConfig, couchstore) ->
menelaus_web:build_bucket_auto_compaction_settings(ACSettings)}]
end;
build_auto_compaction_info(_BucketConfig, ephemeral) ->
- [].
+ [];
+build_auto_compaction_info(_BucketConfig, undefined) ->
+ %% When the bucket type is memcached.
+ [{autoCompactionSettings, false}].
build_purge_interval_info(BucketConfig, couchstore) ->
case proplists:get_value(autocompaction, BucketConfig, false) of
@@ -218,7 +221,10 @@ build_purge_interval_info(BucketConfig, couchstore) ->
[{purgeInterval, PInterval}]
end;
build_purge_interval_info(BucketConfig, ephemeral) ->
- [{purgeInterval, proplists:get_value(purge_interval, BucketConfig)}].
+ [{purgeInterval, proplists:get_value(purge_interval, BucketConfig)}];
+build_purge_interval_info(_BucketConfig, undefined) ->
+ %% When the bucket type is memcached.
+ [].
build_eviction_policy(BucketConfig) ->
case ns_bucket:eviction_policy(BucketConfig) of
| 9 |
diff --git a/webdriver-ts/src/benchmarkRunner.ts b/webdriver-ts/src/benchmarkRunner.ts @@ -194,7 +194,7 @@ async function computeResultsStartup(driver: WebDriver): Promise<number> {
let paints = R.filter(type_eq('paint'))(eventsAfterNavigationStart);
if (paints.length == 0) {
- console.log("at least one paint event is expected after the navigationStart event", eventsAfterNavigationStart);
+ console.log("at least one paint event is expected after the navigationStart event", asString(filteredEvents));
throw "at least one paint event is expected after the navigationStart event";
}
let lastPaint = R.last(paints);
| 7 |
diff --git a/src/angular/projects/spark-core-angular/src/lib/components/sprk-accordion-item/sprk-accordion-item.component.spec.ts b/src/angular/projects/spark-core-angular/src/lib/components/sprk-accordion-item/sprk-accordion-item.component.spec.ts @@ -100,4 +100,12 @@ describe('SparkAccordionItemComponent', () => {
fixture.detectChanges();
expect(accordionItemElement.getAttribute('data-id')).toBeNull();
});
+
+ it('should set the active class if isActive is true', () => {
+ component.isActive = true;
+ fixture.detectChanges();
+ expect(
+ accordionItemElement.classList.contains('sprk-c-Accordion__item--active')
+ ).toEqual(true);
+ });
});
| 3 |
diff --git a/services/ChoresService.php b/services/ChoresService.php @@ -133,7 +133,7 @@ class ChoresService extends BaseService
$chore = $this->getDatabase()->chores($choreId);
$choreLastTrackedTime = $this->getDatabase()->chores_log()->where('chore_id = :1 AND undone = 0', $choreId)->max('tracked_time');
- $lastChoreLogRow = $this->getDatabase()->chores_log()->where('chore_id = :1 AND tracked_time = :2 AND undone = 0', $choreId, $choreLastTrackedTime)->fetch();
+ $lastChoreLogRow = $this->getDatabase()->chores_log()->where('chore_id = :1 AND tracked_time = :2 AND undone = 0', $choreId, $choreLastTrackedTime)->orderBy('row_created_timestamp', 'DESC')->fetch();
$lastDoneByUserId = $lastChoreLogRow->done_by_user_id;
$users = $this->getUsersService()->GetUsersAsDto();
| 4 |
diff --git a/spec/models/carto/user_table_spec.rb b/spec/models/carto/user_table_spec.rb @@ -37,7 +37,6 @@ describe Carto::UserTable do
it 'supports values larger than 2^31-1' do
column = Carto::UserTable.columns.find{|c| c.name=='table_id'}
expect { column.type_cast_for_database(2164557046) }.to_not raise_error
- column.type_cast_for_database(2164557046)
end
end
| 2 |
diff --git a/server/tests/classes/client.test.js b/server/tests/classes/client.test.js @@ -29,9 +29,6 @@ describe("Client", () => {
expect(c.caches).toEqual([]);
expect(c.mobile).toBe(false);
expect(c.cards).toEqual([]);
-
- expect(c.sentPing).toBeNull();
- expect(c.ping).toBeNull();
});
test("should create a Scanner", () => {
| 2 |
diff --git a/token-metadata/0x2cAd4991f62fc6Fcd8EC219f37E7DE52B688B75A/metadata.json b/token-metadata/0x2cAd4991f62fc6Fcd8EC219f37E7DE52B688B75A/metadata.json "symbol": "SCHA",
"address": "0x2cAd4991f62fc6Fcd8EC219f37E7DE52B688B75A",
"decimals": 0,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/token-metadata/0x86642d169dB9F57A02C65052049CbbbfB3E3b08c/metadata.json b/token-metadata/0x86642d169dB9F57A02C65052049CbbbfB3E3b08c/metadata.json "symbol": "DRAY",
"address": "0x86642d169dB9F57A02C65052049CbbbfB3E3b08c",
"decimals": 4,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/core/server/api/shared/validators/input/all.js b/core/server/api/shared/validators/input/all.js const debug = require('@tryghost/debug')('api:shared:validators:input:all');
const _ = require('lodash');
const Promise = require('bluebird');
-const i18n = require('../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
const {BadRequestError, ValidationError} = require('@tryghost/errors');
const validator = require('@tryghost/validator');
+const messages = {
+ validationFailed: 'Validation ({validationName}) failed for {key}',
+ noRootKeyProvided: 'No root key (\'{docName}\') provided.',
+ invalidIdProvided: 'Invalid id provided.'
+};
+
const GLOBAL_VALIDATORS = {
id: {matches: /^[a-f\d]{24}$|^1$|me/i},
page: {matches: /^\d+$/},
@@ -31,7 +37,7 @@ const validate = (config, attrs) => {
_.each(config, (value, key) => {
if (value.required && !attrs[key]) {
errors.push(new ValidationError({
- message: i18n.t('notices.data.validation.index.validationFailed', {
+ message: tpl(messages.validationFailed, {
validationName: 'FieldIsRequired',
key: key
})
@@ -71,7 +77,7 @@ const validate = (config, attrs) => {
}
errors.push(new ValidationError({
- message: i18n.t('notices.data.validation.index.validationFailed', {
+ message: tpl(messages.validationFailed, {
validationName: 'AllowedValues',
key: key
})
@@ -124,7 +130,7 @@ module.exports = {
if (!['posts', 'tags'].includes(apiConfig.docName)) {
if (_.isEmpty(frame.data) || _.isEmpty(frame.data[apiConfig.docName]) || _.isEmpty(frame.data[apiConfig.docName][0])) {
return Promise.reject(new BadRequestError({
- message: i18n.t('errors.api.utils.noRootKeyProvided', {docName: apiConfig.docName})
+ message: tpl(messages.noRootKeyProvided, {docName: apiConfig.docName})
}));
}
}
@@ -145,7 +151,7 @@ module.exports = {
if (missedDataProperties.length) {
return Promise.reject(new ValidationError({
- message: i18n.t('notices.data.validation.index.validationFailed', {
+ message: tpl(messages.validationFailed, {
validationName: 'FieldIsRequired',
key: JSON.stringify(missedDataProperties)
})
@@ -154,7 +160,7 @@ module.exports = {
if (nilDataProperties.length) {
return Promise.reject(new ValidationError({
- message: i18n.t('notices.data.validation.index.validationFailed', {
+ message: tpl(messages.validationFailed, {
validationName: 'FieldIsInvalid',
key: JSON.stringify(nilDataProperties)
})
@@ -179,7 +185,7 @@ module.exports = {
if (frame.options.id && frame.data[apiConfig.docName][0].id
&& frame.options.id !== frame.data[apiConfig.docName][0].id) {
return Promise.reject(new BadRequestError({
- message: i18n.t('errors.api.utils.invalidIdProvided')
+ message: tpl(messages.invalidIdProvided)
}));
}
}
| 14 |
diff --git a/src/editor/commands/InsertInlineNodeCommand.js b/src/editor/commands/InsertInlineNodeCommand.js @@ -40,6 +40,7 @@ class InsertInlineNodeCommand extends SubstanceInsertInlineNodeCommand {
editorSession.transaction((tx) => {
let node = this.createNode(tx, params)
tx.insertInlineNode(node)
+ this.setSelection(tx, node)
})
}
@@ -47,6 +48,17 @@ class InsertInlineNodeCommand extends SubstanceInsertInlineNodeCommand {
throw new Error('This method is abstract')
}
+ setSelection(tx, node) {
+ if(node.isPropertyAnnotation()) {
+ tx.selection = {
+ type: 'property',
+ path: node.getPath(),
+ startOffset: node.startOffset,
+ endOffset: node.endOffset
+ }
+ }
+ }
+
}
export default InsertInlineNodeCommand
| 7 |
diff --git a/packages/build/src/error/info.js b/packages/build/src/error/info.js // Add information related to an error without colliding with existing properties
const addErrorInfo = function(error, info) {
+ if (!canHaveErrorInfo(error)) {
+ return
+ }
+
error[INFO_SYM] = { ...error[INFO_SYM], ...info }
}
const getErrorInfo = function(error) {
- return error[INFO_SYM] || {}
+ if (!isBuildError(error)) {
+ return {}
+ }
+
+ return error[INFO_SYM]
}
const isBuildError = function(error) {
- return error instanceof Error && error[INFO_SYM] !== undefined
+ return canHaveErrorInfo(error) && error[INFO_SYM] !== undefined
+}
+
+// Exceptions that are not objects (including `Error` instances) cannot have an
+// `INFO_SYM` property
+const canHaveErrorInfo = function(error) {
+ return error != null
}
const INFO_SYM = Symbol('info')
| 7 |
diff --git a/components/Table.jsx b/components/Table.jsx @@ -101,7 +101,7 @@ export default function Table ({ data, filter, setFilter, reportFound }) {
return (
<div className={styles.container}>
- <table className={styles.table} {...getTableProps()} border='0' cellspacing='0' cellpadding='0'>
+ <table className={styles.table} {...getTableProps()} border='0' cellSpacing='0' cellPadding='0'>
<thead>
{headerGroups.map(headerGroup => (
<tr {...headerGroup.getHeaderGroupProps()}>
| 1 |
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js @@ -48,6 +48,7 @@ class CompanyStep extends React.Component {
this.submit = this.submit.bind(this);
this.clearErrorAndSetValue = this.clearErrorAndSetValue.bind(this);
this.clearError = inputKey => ReimbursementAccountUtils.clearError(this.props, inputKey);
+ this.clearErrors = inputKeys => ReimbursementAccountUtils.clearErrors(this.props, inputKeys);
this.getErrors = () => ReimbursementAccountUtils.getErrors(this.props);
this.getErrorText = inputKey => ReimbursementAccountUtils.getErrorText(this.props, this.errorTranslationKeys, inputKey);
@@ -229,10 +230,14 @@ class CompanyStep extends React.Component {
city: 'addressCity',
zipCode: 'addressZipCode',
};
+ const renamedValues = {};
_.each(values, (value, inputKey) => {
const renamedInputKey = lodashGet(renamedFields, inputKey, inputKey);
- this.clearErrorAndSetValue(renamedInputKey, value);
+ renamedValues[renamedInputKey] = value;
});
+ this.setState(renamedValues);
+ this.clearErrors(_.keys(renamedValues));
+ ReimbursementAccount.updateReimbursementAccountDraft(renamedValues);
}}
/>
<TextInput
| 13 |
diff --git a/src/encoded/docs/updating_ontologies.md b/src/encoded/docs/updating_ontologies.md @@ -38,8 +38,8 @@ How to update the ontology versions
6. Update the following information
- Site release version: 52
- ontology.json file: ontology-2017-01-25.json
+ Site release version: 53
+ ontology.json file: ontology-2017-02-07.json
UBERON release date: 2016-10-23
OBI release date: 2016-10-11
EFO release date: 2017-01-16
| 3 |
diff --git a/token-metadata/0x459086F2376525BdCebA5bDDA135e4E9d3FeF5bf/metadata.json b/token-metadata/0x459086F2376525BdCebA5bDDA135e4E9d3FeF5bf/metadata.json "symbol": "RENBCH",
"address": "0x459086F2376525BdCebA5bDDA135e4E9d3FeF5bf",
"decimals": 8,
- "dharmaVerificationStatus": {
"dharmaVerificationStatus": "VERIFIED"
}
\ No newline at end of file
-}
\ No newline at end of file
| 3 |
diff --git a/components/bases-locales/charte/partners-searchbar.js b/components/bases-locales/charte/partners-searchbar.js @@ -20,8 +20,9 @@ function PartnersSearchbar() {
const [isLoading, setIsLoading] = useState(false)
const [error, setError] = useState(null)
+ const communePartners = filteredPartners.filter(partner => partner.echelon === 0)
const companyPartners = filteredPartners.filter(partner => partner.isCompany)
- const organizationPartners = filteredPartners.filter(partner => !partner.isCompany)
+ const organizationPartners = filteredPartners.filter(partner => !partner.isCompany && partner.echelon !== 0)
const handleSelectedTags = tag => {
setSelectedTags(prevTags => {
@@ -32,7 +33,7 @@ function PartnersSearchbar() {
}
const getAvailablePartners = useCallback((communeCodeDepartement, tags) => {
- const filteredByPerimeter = [...partners.companies, ...partners.epci].filter(({codeDepartement, isPerimeterFrance}) => (codeDepartement.includes(communeCodeDepartement) || isPerimeterFrance))
+ const filteredByPerimeter = [...partners.companies, ...partners.epci, ...partners.communes].filter(({codeDepartement, isPerimeterFrance}) => (codeDepartement.includes(communeCodeDepartement) || isPerimeterFrance))
const filteredByTags = filteredByPerimeter.filter(({services}) => intersection(tags, services).length === tags.length)
return filteredByTags.sort((a, b) => {
@@ -99,7 +100,7 @@ function PartnersSearchbar() {
onSelectTags={handleSelectedTags}
selectedTags={selectedTags}
filteredPartners={filteredPartners}
- allPartners={[...partners.epci, ...partners.companies]}
+ allPartners={[...partners.epci, ...partners.companies, ...partners.communes]}
/>
)}
@@ -115,6 +116,7 @@ function PartnersSearchbar() {
</div>
<div className='organizations'>
+ <div><b>{communePartners.length}</b> {`${communePartners.length > 1 ? 'communes' : 'commune'} de mutualisation`}</div>
<div><b>{organizationPartners.length}</b> {`${organizationPartners.length > 1 ? 'organismes' : 'organisme'} de mutualisation`}</div>
<div><b>{companyPartners.length}</b> {companyPartners.length > 1 ? 'entreprises' : 'entreprises'}</div>
</div>
@@ -125,7 +127,7 @@ function PartnersSearchbar() {
{error ? (
<div className='error'>{error}</div>
) : (
- filteredPartners.length > 0 && <SearchPartnersResults companies={companyPartners} organizations={organizationPartners} />
+ filteredPartners.length > 0 && <SearchPartnersResults companies={companyPartners} organizations={organizationPartners} communes={communePartners} />
)}
<style jsx>{`
| 0 |
diff --git a/packages/idyll-components/src/scroller.js b/packages/idyll-components/src/scroller.js const React = require('react');
const { filterChildren, mapChildren } = require('idyll-component-children');
-import TextContainer from './text-container';
+import TextContainer from './default/text-container';
const d3 = require('d3-selection');
-
const styles = {
SCROLL_GRAPHIC: {
- position: 'absolute',
+ position: '-webkit-sticky',
+ position: 'sticky',
top: 0,
left: 0,
right: 0,
@@ -16,13 +16,6 @@ const styles = {
transform: `translate3d(0, 0, 0)`,
zIndex: -1
},
- SCROLL_GRAPHIC_FIXED: {
- position: 'fixed'
- },
- SCROLL_GRAPHIC_BOTTOM: {
- bottom: 0,
- top: 'auto'
- },
SCROLL_GRAPHIC_INNER: {
position: 'absolute',
@@ -41,8 +34,6 @@ class Scroller extends React.Component {
super(props);
this.id = id++;
this.state = {
- isFixed: false,
- isBottom: false,
graphicHeight: 0,
graphicWidth: 0
};
@@ -51,7 +42,6 @@ class Scroller extends React.Component {
this.SCROLL_NAME_MAP = {};
}
-
componentDidMount() {
require('intersection-observer');
const scrollama = require('scrollama');
@@ -69,7 +59,7 @@ class Scroller extends React.Component {
.onStepEnter(this.handleStepEnter.bind(this))
// .onStepExit(handleStepExit)
.onContainerEnter(this.handleContainerEnter.bind(this))
- .onContainerExit(this.handleContainerExit.bind(this));
+ //.onContainerExit(this.handleContainerExit.bind(this));
// setup resize event
@@ -94,15 +84,11 @@ class Scroller extends React.Component {
graphicWidth: window.innerWidth + 'px',
});
}
+
handleContainerEnter(response) {
if (this.props.disableScroll && (!this.props.currentStep || this.props.currentStep < Object.keys(this.SCROLL_STEP_MAP).length - 1)) {
d3.select('body').style('overflow', 'hidden');
}
- this.setState({ isFixed: true, isBottom: false });
- }
-
- handleContainerExit(response) {
- this.setState({ isFixed: false, isBottom: response.direction === 'down'});
}
componentWillReceiveProps(nextProps) {
@@ -130,15 +116,13 @@ class Scroller extends React.Component {
render() {
const { hasError, updateProps, idyll, children, ...props } = this.props;
- const { isFixed, isBottom, graphicHeight, graphicWidth } = this.state;
+ const { graphicHeight, graphicWidth } = this.state;
+ const leftMarginAdjust = -this.props.idyll.layout.marginLeft; // for adjusting graphic to match outer div
return (
- <div ref={(ref) => this.ref = ref} className="idyll-scroll" id={`idyll-scroll-${this.id}`} style={{position: 'relative'}}>
+ <div ref={(ref) => this.ref = ref} className="idyll-scroll" id={`idyll-scroll-${this.id}`}
+ style={Object.assign({ position: 'relative' }, { marginLeft: leftMarginAdjust})}>
<div className="idyll-scroll-graphic"
- style={Object.assign({ height: graphicHeight },
- styles.SCROLL_GRAPHIC,
- isFixed ? styles.SCROLL_GRAPHIC_FIXED : {},
- isBottom ? styles.SCROLL_GRAPHIC_BOTTOM : {})} >
-
+ style={Object.assign({ height: graphicHeight }, styles.SCROLL_GRAPHIC)} >
<div style={Object.assign({ width: graphicWidth }, styles.SCROLL_GRAPHIC_INNER)}>
{filterChildren(
children,
| 3 |
diff --git a/components/system/components/Buttons.js b/components/system/components/Buttons.js @@ -169,7 +169,9 @@ export const ButtonSecondary = (props) => {
? STYLES_BUTTON_SECONDARY_TRANSPARENT
: STYLES_BUTTON_SECONDARY
}
- {...props}
+ onMouseUp={props.onClick}
+ onTouchEnd={props.onClick}
+ children={props.children}
style={{ ...props.style, width: props.full ? "100%" : "auto" }}
/>
);
@@ -206,7 +208,11 @@ export const ButtonDisabled = (props) => {
? STYLES_BUTTON_DISABLED_TRANSPARENT
: STYLES_BUTTON_DISABLED
}
- {...props}
+ onMouseUp={props.onClick}
+ onTouchEnd={props.onClick}
+ children={props.children}
+ type={props.label}
+ htmlFor={props.htmlFor}
style={{ ...props.style, width: props.full ? "100%" : "auto" }}
/>
);
| 2 |
diff --git a/publish/src/Deployer.js b/publish/src/Deployer.js @@ -59,7 +59,8 @@ class Deployer {
this.provider.web3 = new Web3(new Web3.providers.HttpProvider(providerUrl));
this.provider.ethers.provider = new ethers.providers.JsonRpcProvider(providerUrl);
- if (useFork || (!privateKey && network === 'local')) {
+ // use the default owner when in a fork or in local mode and no private key supplied
+ if ((useFork || network === 'local') && !privateKey) {
this.provider.web3.eth.defaultAccount = getUsers({ network, user: 'owner' }).address; // protocolDAO
this.provider.ethers.defaultAccount = getUsers({ network, user: 'owner' }).address; // protocolDAO
| 11 |
diff --git a/src/content/developers/docs/apis/json-rpc/index.md b/src/content/developers/docs/apis/json-rpc/index.md @@ -5,11 +5,11 @@ lang: en
sidebar: true
---
-In order for a software application to interact with the Ethereum blockchain (by reading blockchain data and/or sending transactions to the network), it must connect to an Ethereum node.
+In order for a software application to interact with the Ethereum blockchain - either by reading blockchain data or sending transactions to the network - it must connect to an Ethereum node.
-For this purpose, every [Ethereum client](/developers/docs/nodes-and-clients/#execution-clients) implements a [JSON-RPC specification](http://www.jsonrpc.org/specification), so there are a uniform set of methods that applications can rely on.
+For this purpose, every [Ethereum client](/developers/docs/nodes-and-clients/#execution-clients) implements a [JSON-RPC specification](https://github.com/ethereum/execution-apis), so there are a uniform set of methods that applications can rely on regardless of the specific node or client implementation.
-JSON-RPC is a stateless, light-weight remote procedure call (RPC) protocol. It defines several data structures and the rules around their processing. It is transport agnostic in that the concepts can be used within the same process, over sockets, over HTTP, or in many various message passing environments. It uses JSON (RFC 4627) as data format.
+[JSON-RPC](https://www.jsonrpc.org/specification) is a stateless, light-weight remote procedure call (RPC) protocol. It defines several data structures and the rules around their processing. It is transport agnostic in that the concepts can be used within the same process, over sockets, over HTTP, or in many various message passing environments. It uses JSON (RFC 4627) as data format.
## Client implementations {#client-implementations}
| 14 |
diff --git a/src/pages/ReportSettingsPage.js b/src/pages/ReportSettingsPage.js @@ -150,36 +150,12 @@ class ReportSettingsPage extends Component {
<Text style={[styles.formLabel]} numberOfLines={1}>
{this.props.translate('newRoomPage.roomName')}
</Text>
- <View style={[styles.flexRow]}>
- <View style={[styles.flex3]}>
- <TextInputWithPrefix
- prefixCharacter="#"
- placeholder={this.props.translate('newRoomPage.social')}
- onChangeText={(roomName) => { this.setState({newRoomName: this.checkAndModifyRoomName(roomName)}); }}
- value={this.state.newRoomName.substring(1)}
- errorText={this.state.error}
- autoCapitalize="none"
- disabled={shouldDisableRename}
- />
- </View>
- <Button
- success={!shouldDisableRename}
- text={this.props.translate('common.save')}
- onPress={() => {
- // When renaming is built, this will use that API command
- }}
- style={[styles.ml2]}
- textStyles={[styles.label]}
- buttonStyles={[styles.reportSettingsChangeNameButton]}
- isDisabled={shouldDisableRename || this.state.newRoomName === this.props.report.reportName}
- />
- </View>
<View style={[styles.flexRow]}>
<View style={[styles.flex3]}>
<RoomNameInput
- onChangeText={(roomName) => { this.setState({newRoomName: roomName})}}
- initialValue={this.state.newRoomName.substring(1)}
- disabled={shouldDisableRename}
+ onChangeText={(roomName) => { this.setState({newRoomName: roomName}); }}
+ initialValue={this.state.newRoomName}
+ isDisabled={shouldDisableRename}
/>
</View>
<Button
| 4 |
diff --git a/src/client/js/components/Admin/SlackIntegration/CustomBotWithProxySettings.jsx b/src/client/js/components/Admin/SlackIntegration/CustomBotWithProxySettings.jsx @@ -51,9 +51,9 @@ const CustomBotWithProxySettings = (props) => {
}
};
- const generateTokenHandler = async() => {
+ const generateTokenHandler = async(tokenGtoP, tokenPtoG) => {
try {
- await appContainer.apiv3.put('/slack-integration-settings/access-tokens');
+ await appContainer.apiv3.put('/slack-integration-settings/access-tokens', { tokenGtoP, tokenPtoG });
}
catch (err) {
toastError(err);
@@ -142,7 +142,7 @@ const CustomBotWithProxySettings = (props) => {
<WithProxyAccordions
botType="customBotWithProxy"
discardTokenHandler={() => discardTokenHandler(tokenGtoP, tokenPtoG)}
- generateTokenHandler={generateTokenHandler}
+ onClickRegenerateTokens={generateTokenHandler(tokenGtoP, tokenPtoG)}
tokenGtoP={tokenGtoP}
tokenPtoG={tokenPtoG}
/>
| 10 |
diff --git a/articles/appliance/infrastructure/virtual-machines.md b/articles/appliance/infrastructure/virtual-machines.md @@ -41,7 +41,7 @@ For multi-node clusters, Auth0 recommends deploying the PSaaS Appliance virtual
## For AWS Users
-* The *recommended* [instance type](https://aws.amazon.com/ec2/instance-types/) is **M4.2xlarge** (minimum).
+* The *recommended* [instance type](https://aws.amazon.com/ec2/instance-types/) is **m5.2xlarge** (minimum).
* Auth0 will need the following pieces of information to share the AMI with you:
* AWS account number;
* AWS region name. The region should have at least three [availability zones](https://aws.amazon.com/about-aws/global-infrastructure) for your Production cluster.
| 3 |
diff --git a/README.md b/README.md @@ -754,12 +754,12 @@ Like this:
In addition to the standard HTML input formats, JSON Editor can also integrate with several 3rd party specialized editors. These libraries are not included in JSON Editor and you must load them on the page yourself.
-__SCEditor__ provides WYSIWYG editing of HTML and BBCode. To use it, set the format to `html` or `bbcode` and set the `wysiwyg` option to `true`:
+__SCEditor__ provides WYSIWYG editing of HTML and BBCode. To use it, set the format to `xhtml` or `bbcode` and set the `wysiwyg` option to `true`:
```json
{
"type": "string",
- "format": "html",
+ "format": "xhtml",
"options": {
"wysiwyg": true
}
| 1 |
diff --git a/.travis.yml b/.travis.yml @@ -51,10 +51,6 @@ before_install:
curl -s http://api.wordpress.org/core/version-check/1.7/ > /tmp/wp-latest.json
WP_VERSION=$(grep -o '"version":"[^"]*' /tmp/wp-latest.json | sed 's/"version":"//')
fi
- - |
- if [[ "$PHP" == "1" ]]; then
- tests/bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
- fi
script:
- |
@@ -68,10 +64,6 @@ script:
npm run test:js || exit 1 # JS unit tests
npm run test || exit 1 # Bundle size test
fi
- - |
- if [[ "$PHP" == "1" ]]; then
- composer test || exit 1
- fi
- |
if [[ "$E2E" == "1" ]]; then
npm run build:test || exit 1 # Build for tests.
@@ -82,25 +74,10 @@ script:
jobs:
fast_finish: true
- allow_failures:
- - env: PHP=1 WP_VERSION=nightly
- - env: E2E=1 WP_VERSION=nightly
include:
- name: Lint
php: 7.4
env: SNIFF=1 WP_VERSION=4.7 PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
- - name: PHP Tests (PHP 5.6, WordPress 4.7)
- php: 5.6
- env: PHP=1 WP_VERSION=4.7
- - name: PHP Tests (PHP 7.4, WordPress latest)
- php: 7.4
- env: PHP=1 WP_VERSION=latest
- - name: PHP Tests (PHP 7.4, WordPress Multisite latest)
- php: 7.4
- env: PHP=1 WP_VERSION=latest WP_MULTISITE=1
- - name: PHP Tests (PHP 7.4, WordPress nightly)
- php: 7.4
- env: PHP=1 WP_VERSION=nightly
- name: JS Tests
php: 7.4
env: JS=1 WP_VERSION=latest PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
| 2 |
diff --git a/test/jasmine/tests/select_test.js b/test/jasmine/tests/select_test.js @@ -889,7 +889,7 @@ describe('Test select box and lasso per trace:', function() {
[[350, 200], [400, 250]],
function() {
assertPoints([['GBR', 26.507354205352502], ['IRL', 86.4125147625692]]);
- assertSelectedPoints({0: [54, 68]});
+ assertSelectedPoints({0: [43, 54]});
assertRanges([[-19.11, 63.06], [7.31, 53.72]]);
},
[280, 190],
@@ -904,7 +904,7 @@ describe('Test select box and lasso per trace:', function() {
[[350, 200], [400, 200], [400, 250], [350, 250], [350, 200]],
function() {
assertPoints([['GBR', 26.507354205352502], ['IRL', 86.4125147625692]]);
- assertSelectedPoints({0: [54, 68]});
+ assertSelectedPoints({0: [43, 54]});
assertLassoPoints([
[-19.11, 63.06], [5.50, 65.25], [7.31, 53.72], [-12.90, 51.70], [-19.11, 63.06]
]);
| 3 |
diff --git a/packages/app/src/components/Common/Dropdown/PageItemControl.tsx b/packages/app/src/components/Common/Dropdown/PageItemControl.tsx @@ -8,6 +8,7 @@ import {
import {
IPageInfoAll, isIPageInfoForOperation,
} from '~/interfaces/page';
+import { IPageOperationProcessInfo } from '~/interfaces/page-operation';
import { useSWRxPageInfo } from '~/stores/page';
import loggerFactory from '~/utils/logger';
@@ -48,6 +49,7 @@ type CommonProps = {
type DropdownMenuProps = CommonProps & {
pageId: string,
isLoading?: boolean,
+ operationProcessInfo?: IPageOperationProcessInfo,
}
const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.Element => {
@@ -55,7 +57,7 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
const {
pageId, isLoading,
- pageInfo, isEnableActions, forceHideMenuItems,
+ pageInfo, isEnableActions, forceHideMenuItems, operationProcessInfo,
onClickBookmarkMenuItem, onClickRenameMenuItem, onClickDuplicateMenuItem, onClickDeleteMenuItem, onClickRevertMenuItem, onClickPathRecoveryMenuItem,
additionalMenuItemRenderer: AdditionalMenuItems, isInstantRename,
} = props;
@@ -195,7 +197,7 @@ const PageItemControlDropdownMenu = React.memo((props: DropdownMenuProps): JSX.E
) }
{/* PathRecovery */}
- { !forceHideMenuItems?.includes(MenuItemType.PATH_RECOVERY) && isEnableActions && (
+ { !forceHideMenuItems?.includes(MenuItemType.PATH_RECOVERY) && isEnableActions && operationProcessInfo?.Rename != null && (
<DropdownItem
onClick={pathRecoveryItemClickedHandler}
className="grw-page-control-dropdown-item"
@@ -237,6 +239,7 @@ type PageItemControlSubstanceProps = CommonProps & {
pageId: string,
fetchOnInit?: boolean,
children?: React.ReactNode,
+ operationProcessInfo?: IPageOperationProcessInfo,
}
export const PageItemControlSubstance = (props: PageItemControlSubstanceProps): JSX.Element => {
@@ -322,6 +325,7 @@ export const PageItemControlSubstance = (props: PageItemControlSubstanceProps):
type PageItemControlProps = CommonProps & {
pageId?: string,
children?: React.ReactNode,
+ operationProcessInfo?: IPageOperationProcessInfo,
}
export const PageItemControl = (props: PageItemControlProps): JSX.Element => {
| 4 |
diff --git a/js/node/bis_fileservertestutils.js b/js/node/bis_fileservertestutils.js @@ -35,7 +35,7 @@ let terminateReject=null;
const createTestingServer=function(wsmode=false,timeout=500) {
- serverpath=serverpath || path.join(__dirname,'../bin');
+ const serverpath= path.join(__dirname,'../bin');
let servername=path.resolve(serverpath,"bisfileserver.js");
| 11 |
diff --git a/src/CONST.js b/src/CONST.js @@ -14,7 +14,7 @@ const CONST = {
API_ATTACHMENT_VALIDATIONS: {
// Same as the PHP layer allows
- ALLOWED_EXTENSIONS: ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'html', 'txt', 'rtf', 'doc', 'docx', 'htm', 'tiff', 'tif', 'xml'],
+ ALLOWED_EXTENSIONS: ['jpg', 'jpeg', 'png', 'gif', 'pdf', 'html', 'txt', 'rtf', 'doc', 'docx', 'htm', 'tiff', 'tif', 'xml', 'mp3', 'mp4', 'mov'],
// 50 megabytes in bytes
MAX_SIZE: 52428800,
| 11 |
diff --git a/src/addons/presenter.js b/src/addons/presenter.js @@ -49,10 +49,10 @@ class Presenter extends React.PureComponent {
this.defaultRender = passChildren
}
- // We need to wrap the children of this presenter in a mediator
- // "sock". This is so that we can pass along context in browsers
- // that do not support static inheritence (IE10) and allow overriding
- // of lifecycle methods
+ // We need to wrap the children of this presenter in a
+ // PresenterMediator component. This ensures that we can pass along
+ // context in browsers that do not support static inheritence (IE10)
+ // and allow overriding of lifecycle methods
this.render = renderMediator
// Autobind send so that context is maintained when passing send to children
| 4 |
diff --git a/src/struct/databases/SQLiteHandler.js b/src/struct/databases/SQLiteHandler.js @@ -163,7 +163,7 @@ class SQLiteHandler extends DatabaseHandler {
let copy = {};
Object.keys(config).forEach(key => {
- if (config[key] === undefined) return copy[key] = this.sanitize(this.defaultConfig[key]);
+ if (config[key] == undefined) return copy[key] = this.defaultConfig[key];
copy[key] = this.desanitize(config[key]);
});
| 1 |
diff --git a/components/Notifications/enhancers.js b/components/Notifications/enhancers.js @@ -208,7 +208,7 @@ export const myUserSubscriptions = gql`
const notificationCountQuery = gql`
query getNotificationCount {
- notifications {
+ notifications(onlyUnread: true) {
nodes {
...notificationInfo
}
| 4 |
diff --git a/config/redirects.js b/config/redirects.js @@ -2615,10 +2615,9 @@ module.exports = [
{
from: [
'/integrations/sso-integrations',
- '/sso/current/integrations',
- '/integrations/sso'
+ '/sso/current/integrations'
],
- to: 'https://marketplace.auth0.com/features/sso-integrations'
+ to: '/integrations/sso'
},
{
from: [
| 2 |
diff --git a/src/main/resources/public/scss/modals/load-bug.scss b/src/main/resources/public/scss/modals/load-bug.scss width: 350px;
margin-left: 21px;
}
+
+ .dropdown-menu {
+ width: 350px;
+ margin-left: 118px;
+ }
}
.bts-description {
| 1 |
diff --git a/app-manager.js b/app-manager.js @@ -59,6 +59,14 @@ class AppManager extends EventTarget {
setPushingLocalUpdates(pushingLocalUpdates) {
this.pushingLocalUpdates = pushingLocalUpdates;
}
+ getPeerOwnerAppManager(instanceId) {
+ for (const appManager of appManagers) {
+ if (appManager !== this && appManager.state === this.state && appManager.hasTrackedApp(instanceId)) {
+ return appManager;
+ }
+ }
+ return null;
+ }
bindState(state) {
const apps = state.getArray(this.prefix);
let lastApps = [];
| 0 |
diff --git a/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs b/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs @@ -40,9 +40,6 @@ import <%= packageName %>.domain.<%= asEntity(entityClass) %>;
import <%= packageName %>.domain.enumeration.<%= element %>;
<%_ }); _%>
import <%= packageName %>.service.ColumnConverter;
-<%_ regularEagerRelations.forEach(function(rel) { _%>
-import <%= packageName %>.domain.<%= rel.otherEntityNameCapitalized %>;
-<%_ }); _%>
import io.r2dbc.spi.Row;
@@ -75,7 +72,7 @@ public class <%= entityClass %>RowMapper implements BiFunction<Row, String, <%=
entity.set<%= field.fieldInJavaBeanMethod %>(converter.fromRow(row, prefix + "_<%= field.fieldNameAsDatabaseColumn %>", <%= fieldType %>.class));
<%_ }); _%>
<%_ regularEagerRelations.forEach(function(rel) { _%>
- entity.add<%= rel.relationshipNameCapitalized %>(converter.fromRow(row, prefix + "_<%= getColumnName(rel.relationshipName) %>_id", <%= rel.otherEntityNameCapitalized %>.class));
+ entity.set<%= rel.relationshipNameCapitalized %>Id(converter.fromRow(row, prefix + "_<%= getColumnName(rel.relationshipName) %>_id", Long.class));
<%_ }); _%>
return entity;
}
| 13 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.