code,label
"diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -102,4 +102,6 @@ Main contributors will review your code and possibly ask for changes before your
If you have any questions feel free to post them to
[github.com/OpenZeppelin/zeppelin-solidity/issues](https://github.com/OpenZeppelin/zeppelin-solidity/issues).
+Finally, if you're looking to collaborate and want to find easy tasks to start, [look at the issues we marked as easy](https://github.com/OpenZeppelin/zeppelin-solidity/labels/easy).
+
Thanks for your time and code!
",0
"diff --git a/contracts/token/TransferableToken.sol b/contracts/token/TransferableToken.sol @@ -2,20 +2,47 @@ pragma solidity ^0.4.8;
import ""./ERC20.sol"";
+/*
+
+TransferableToken defines the generic interface and the implementation
+to limit token transferability for different events.
+
+It is intended to be used as a base class for other token contracts.
+
+Over-writting transferableTokens(address holder, uint64 time) is the way to provide
+the specific logic for limitting token transferability for a holder over time.
+
+TransferableToken has been designed to allow for different limitting factors,
+this can be achieved by recursively calling super.transferableTokens() until the
+base class is hit. For example:
+
+function transferableTokens(address holder, uint64 time) constant public returns (uint256) {
+ return min256(unlockedTokens, super.transferableTokens(holder, time));
+}
+
+A working example is VestedToken.sol:
+https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/contracts/token/VestedToken.sol
+
+*/
+
contract TransferableToken is ERC20 {
+ // Checks whether it can transfer or otherwise throws.
modifier canTransfer(address _sender, uint _value) {
if (_value > transferableTokens(_sender, uint64(now))) throw;
_;
}
+ // Checks modifier and allows transfer if tokens are not locked.
function transfer(address _to, uint _value) canTransfer(msg.sender, _value) returns (bool success) {
return super.transfer(_to, _value);
}
+ // Checks modifier and allows transfer if tokens are not locked.
function transferFrom(address _from, address _to, uint _value) canTransfer(_from, _value) returns (bool success) {
return super.transferFrom(_from, _to, _value);
}
+ // Default transferable tokens function returns all tokens for a holder (no limit).
function transferableTokens(address holder, uint64 time) constant public returns (uint256) {
return balanceOf(holder);
}
",0
"diff --git a/contracts/token/MintableToken.sol b/contracts/token/MintableToken.sol @@ -18,6 +18,7 @@ import '../ownership/Ownable.sol';
contract MintableToken is StandardToken, Ownable {
event Mint(address indexed to, uint value);
+ event MintFinished();
bool public mintingFinished = false;
uint public totalSupply = 0;
@@ -36,6 +37,7 @@ contract MintableToken is StandardToken, Ownable {
function finishMinting() onlyOwner returns (bool) {
mintingFinished = true;
+ MintFinished();
return true;
}
}
",0
"diff --git a/contracts/token/StandardToken.sol b/contracts/token/StandardToken.sol @@ -29,6 +29,13 @@ contract StandardToken is BasicToken, ERC20 {
}
function approve(address _spender, uint _value) {
+
+ // To change the approve amount you first have to reduce the addresses`
+ // allowance to zero by calling `approve(_spender,0)` if it is not
+ // already 0 to mitigate the race condition described here:
+ // https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729
+ if ((_amount!=0) && (allowed[msg.sender][_spender] !=0)) throw;
+
allowed[msg.sender][_spender] = _value;
Approval(msg.sender, _spender, _value);
}
",0
"diff --git a/test/VestedToken.js b/test/VestedToken.js @@ -96,4 +96,61 @@ contract('VestedToken', function(accounts) {
assert.equal(await token.balanceOf(accounts[7]), tokenAmount);
})
})
+
+ describe('getting a non-revokable token grant', async () => {
+ const cliff = 10000
+ const vesting = 20000 // seconds
+
+ beforeEach(async () => {
+ await token.grantVestedTokens(receiver, tokenAmount, now, now + cliff, now + vesting, false, false, { from: granter })
+ })
+
+ it('tokens are received', async () => {
+ assert.equal(await token.balanceOf(receiver), tokenAmount);
+ })
+
+ it('throws when granter attempts to revoke', async () => {
+ try {
+ await token.revokeTokenGrant(receiver, 0, { from: granter });
+ } catch(error) {
+ return assertJump(error);
+ }
+ assert.fail('should have thrown before');
+ })
+ })
+
+ describe('getting a revokable/burnable token grant', async () => {
+ const cliff = 100000
+ const vesting = 200000 // seconds
+ const burnAddress = '0x000000000000000000000000000000000000dead'
+
+ beforeEach(async () => {
+ await token.grantVestedTokens(receiver, tokenAmount, now, now + cliff, now + vesting, true, true, { from: granter })
+ })
+
+ it('tokens are received', async () => {
+ assert.equal(await token.balanceOf(receiver), tokenAmount);
+ })
+
+ it('can be revoked by granter and tokens are burned', async () => {
+ await token.revokeTokenGrant(receiver, 0, { from: granter });
+ assert.equal(await token.balanceOf(receiver), 0);
+ assert.equal(await token.balanceOf(burnAddress), tokenAmount);
+ })
+
+ it('cannot be revoked by non granter', async () => {
+ try {
+ await token.revokeTokenGrant(receiver, 0, { from: accounts[3] });
+ } catch(error) {
+ return assertJump(error);
+ }
+ assert.fail('should have thrown before');
+ })
+
+ it('can be revoked by granter and non vested tokens are returned', async () => {
+ await timer(cliff);
+ await token.revokeTokenGrant(receiver, 0, { from: granter });
+ assert.equal(await token.balanceOf(burnAddress), tokenAmount * cliff / vesting);
+ })
+ })
});
",0
"diff --git a/contracts/token/VestedToken.sol b/contracts/token/VestedToken.sol @@ -6,8 +6,7 @@ import ""./LimitedTransferToken.sol"";
/**
* @title Vested token
-* @dev This tokens can be granted to a specific address after a determined
-amount of time.
+* @dev Tokens that can be vested for a group of addresses.
*/
contract VestedToken is StandardToken, LimitedTransferToken {
@@ -25,9 +24,9 @@ contract VestedToken is StandardToken, LimitedTransferToken {
* @dev Grant tokens to a specified address
* @param _to address The address which the tokens will be granted to.
* @param _value uint256 The amount of tokens to be granted.
- * @param _start uint 64 The time of the begining of the grant.
- * @param _cliff uint64 The time before the grant is enforceble.
- * @param _vesting uint64 The time in which the tokens will be vested.
+ * @param _start uint64 Represents time of the begining of the grant.
+ * @param _cliff uint64 Represents the cliff period.
+ * @param _vesting uint64 Represents the vesting period.
*/
function grantVestedTokens(
address _to,
@@ -80,16 +79,18 @@ contract VestedToken is StandardToken, LimitedTransferToken {
/**
* @dev Check the amount of grants that an address has.
* @param _holder address The holder of the grants.
- * @return A uint representing the index of the grant.
+ * @return A uint representing the total amount of grants.
*/
function tokenGrantsCount(address _holder) constant returns (uint index) {
return grants[_holder].length;
}
/**
- * @dev
+ * @dev Get all information about a specifc grant.
* @param _holder address The address which will have its tokens revoked.
* @param _grantId uint The id of the token grant.
+ * @return Returns all the values that represent a TokenGrant(address, value,
+ start, cliff and vesting) plus the vested value at the current time.
*/
function tokenGrant(address _holder, uint _grantId) constant returns (address granter, uint256 value, uint256 vested, uint64 start, uint64 cliff, uint64 vesting) {
TokenGrant grant = grants[_holder][_grantId];
@@ -103,6 +104,13 @@ contract VestedToken is StandardToken, LimitedTransferToken {
vested = vestedTokens(grant, uint64(now));
}
+ /**
+ * @dev Get the amount of vested tokens at a specifc time.
+ * @param grant TokenGrant The grant to be checked.
+ * @param time uint64 The time to be checked
+ * @return An uint representing the amount of vested tokens of a specifc grant
+ on specifc time.
+ */
function vestedTokens(TokenGrant grant, uint64 time) private constant returns (uint256) {
return calculateVestedTokens(
grant.value,
@@ -113,6 +121,15 @@ contract VestedToken is StandardToken, LimitedTransferToken {
);
}
+ /**
+ * @dev Calculate amount of vested tokens at a specifc time.
+ * @param tokens uint256 The amount of tokens grantted.
+ * @param time uint64 The time to be checked
+ * @param start uint64 A time representing the begining of the grant
+ * @param _cliff uint64 Represents the cliff period.
+ * @param _vesting uint64 Represents the vesting period.
+ * @return An uint representing the amount of vested tokensof a specif grant.
+ */
function calculateVestedTokens(
uint256 tokens,
uint256 time,
@@ -136,10 +153,22 @@ contract VestedToken is StandardToken, LimitedTransferToken {
vestedTokens = vestedTokens.add(vestingTokens.mul(time.sub(cliff)).div(vesting.sub(cliff)));
}
+ /**
+ * @dev Calculate the amount of non vested tokens at a specific time.
+ * @param grant TokenGrant The grant to be checked.
+ * @param time uint64 The time to be checked
+ * @return An uint representing the amount of non vested tokens of a specifc grant
+ on the passed time frame.
+ */
function nonVestedTokens(TokenGrant grant, uint64 time) private constant returns (uint256) {
return grant.value.sub(vestedTokens(grant, time));
}
+ /**
+ * @dev Calculate the date when the holder can trasfer all its tokens
+ * @param holder address The address of the holder
+ * @return An uint representing the date of the last transferable tokens.
+ */
function lastTokenIsTransferableDate(address holder) constant public returns (uint64 date) {
date = uint64(now);
uint256 grantIndex = grants[holder].length;
@@ -148,6 +177,12 @@ contract VestedToken is StandardToken, LimitedTransferToken {
}
}
+ /**
+ * @dev Calculate the total amount of transferable tokens of a holder at a given time
+ * @param holder address The address of the holder
+ * @param time uint64 The specific time.
+ * @return An uint representing a holder's total amount of transferable tokens.
+ */
function transferableTokens(address holder, uint64 time) constant public returns (uint256 nonVested) {
uint256 grantIndex = grants[holder].length;
for (uint256 i = 0; i < grantIndex; i++) {
",0
"diff --git a/contracts/MultisigWallet.sol b/contracts/MultisigWallet.sol @@ -6,9 +6,9 @@ import ""./ownership/Shareable.sol"";
import ""./DayLimit.sol"";
-/*
+/**
* MultisigWallet
- * usage:
+ * Usage:
* bytes32 h = Wallet(w).from(oneOwner).execute(to, value, data);
* Wallet(w).from(anotherOwner).confirm(h);
*/
@@ -20,26 +20,41 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
bytes data;
}
+ /**
+ * Constructor, sets the owners addresses, number of approvals required, and daily spending limit
+ * @param _owners A list of owners.
+ * @param _required The amount required for a transaction to be approved.
+ */
function MultisigWallet(address[] _owners, uint _required, uint _daylimit)
Shareable(_owners, _required)
DayLimit(_daylimit) { }
- // destroys the contract sending everything to `_to`.
+ /**
+ * @dev destroys the contract sending everything to `_to`.
+ */
function destroy(address _to) onlymanyowners(keccak256(msg.data)) external {
selfdestruct(_to);
}
- // gets called when no other function matches
+ /**
+ * @dev Fallback function, receives value and emits a deposit event.
+ */
function() payable {
// just being sent some cash?
if (msg.value > 0)
Deposit(msg.sender, msg.value);
}
- // Outside-visible transact entry point. Executes transaction immediately if below daily spend limit.
- // If not, goes into multisig process. We provide a hash on return to allow the sender to provide
- // shortcuts for the other confirmations (allowing them to avoid replicating the _to, _value
- // and _data arguments). They still get the option of using them if they want, anyways.
+ /**
+ * @dev Outside-visible transaction entry point. Executes transaction immediately if below daily
+ * spending limit. If not, goes into multisig process. We provide a hash on return to allow the
+ * sender to provide shortcuts for the other confirmations (allowing them to avoid replicating
+ * the _to, _value, and _data arguments). They still get the option of using them if they want,
+ * anyways.
+ * @param _to The receiver address
+ * @param _value The value to send
+ * @param _data The data part of the transaction
+ */
function execute(address _to, uint _value, bytes _data) external onlyOwner returns (bytes32 _r) {
// first, take the opportunity to check that we're under the daily limit.
if (underLimit(_value)) {
@@ -60,8 +75,11 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
}
}
- // confirm a transaction through just the hash. we use the previous transactions map, txs, in order
- // to determine the body of the transaction from the hash provided.
+ /**
+ * @dev Confirm a transaction by providing just the hash. We use the previous transactions map,
+ * txs, in order to determine the body of the transaction from the hash provided.
+ * @param _h The transaction hash to approve.
+ */
function confirm(bytes32 _h) onlymanyowners(_h) returns (bool) {
if (txs[_h].to != 0) {
if (!txs[_h].to.call.value(txs[_h].value)(txs[_h].data)) {
@@ -73,17 +91,27 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
}
}
+ /**
+ * @dev Updates the daily limit value.
+ * @param _newLimit
+ */
function setDailyLimit(uint _newLimit) onlymanyowners(keccak256(msg.data)) external {
_setDailyLimit(_newLimit);
}
+ /**
+ * @dev Resets the value spent to enable more spending
+ * @param _newLimit
+ */
function resetSpentToday() onlymanyowners(keccak256(msg.data)) external {
_resetSpentToday();
}
// INTERNAL METHODS
-
+ /**
+ * @dev Clears the list of transactions pending approval.
+ */
function clearPending() internal {
uint length = pendingsIndex.length;
for (uint i = 0; i < length; ++i) {
",0
"diff --git a/test/DayLimit.js b/test/DayLimit.js 'use strict';
const assertJump = require('./helpers/assertJump');
+const timer = require('./helpers/timer');
-var DayLimitMock = artifacts.require('helpers/DayLimitMock.sol');
+var DayLimitMock = artifacts.require('./helpers/DayLimitMock.sol');
contract('DayLimit', function(accounts) {
+ const day = 60 * 60 * 24;
it('should construct with the passed daily limit', async function() {
let initLimit = 10;
@@ -84,4 +86,27 @@ contract('DayLimit', function(accounts) {
assert.equal(spentToday, 3);
});
+ it('should allow spending if daily limit is reached and then the next has come', async function() {
+ let limit = 10;
+ let dayLimit = await DayLimitMock.new(limit);
+
+ await dayLimit.attemptSpend(8);
+ let spentToday = await dayLimit.spentToday();
+ assert.equal(spentToday, 8);
+
+ try {
+ await dayLimit.attemptSpend(3);
+ } catch(error) {
+ assertJump(error);
+ }
+ spentToday = await dayLimit.spentToday();
+ assert.equal(spentToday, 8);
+
+ await timer(day);
+
+ await dayLimit.attemptSpend(3);
+ spentToday = await dayLimit.spentToday();
+ assert.equal(spentToday, 3);
+ });
+
});
",0
"diff --git a/contracts/ECRecovery.sol b/contracts/ECRecovery.sol @@ -2,12 +2,20 @@ pragma solidity ^0.4.11;
/**
-* Eliptic curve signature operations
-* Based on https://gist.github.com/axic/5b33912c6f61ae6fd96d6c4a47afde6d
+ * @title Eliptic curve signature operations
+ *
+ * @dev Based on https://gist.github.com/axic/5b33912c6f61ae6fd96d6c4a47afde6d
*/
+
library ECRecovery {
- // Duplicate Solidity's ecrecover, but catching the CALL return value
+ /**
+ * @dev Duplicate Solidity's ecrecover, but catching the CALL return value
+ * @param hash bytes32 messahe hash from which the signature will be recovered
+ * @param v uint8 signature version
+ * @param r bytes32 signature r value
+ * @param s bytes32 signature s value
+ */
function safeRecover(bytes32 hash, uint8 v, bytes32 r, bytes32 s) constant returns (bool, address) {
// We do our own memory management here. Solidity uses memory offset
// 0x40 to store the current end of memory. We write past it (as
@@ -34,6 +42,11 @@ library ECRecovery {
return (ret, addr);
}
+ /**
+ * @dev Recover signer address from a message by using his signature
+ * @param hash bytes32 messahe hash from which the signature will be recovered
+ * @param sig bytes signature
+ */
function recover(bytes32 hash, bytes sig) constant returns (address) {
bytes32 r;
bytes32 s;
",0
"diff --git a/test/Ownable.js b/test/Ownable.js @@ -38,6 +38,7 @@ contract('Ownable', function(accounts) {
let originalOwner = await ownable.owner();
try {
await ownable.transferOwnership(null, {from: originalOwner});
+ assert.fail()
} catch(error) {
assertJump(error);
}
",0
"diff --git a/test/Ownable.js b/test/Ownable.js @@ -38,7 +38,7 @@ contract('Ownable', function(accounts) {
let originalOwner = await ownable.owner();
try {
await ownable.transferOwnership(null, {from: originalOwner});
- assert.fail()
+ assert.fail();
} catch(error) {
assertJump(error);
}
",0
"diff --git a/scripts/test.sh b/scripts/test.sh trap cleanup EXIT
cleanup() {
- # Kill the testrpc instance that we started (if we started one).
- if [ -n ""$testrpc_pid"" ]; then
+ # Kill the testrpc instance that we started (if we started one and if it's still running).
+ if [ -n ""$testrpc_pid"" ] && ps -p $testrpc_pid > /dev/null; then
kill -9 $testrpc_pid
fi
}
",0
"diff --git a/contracts/examples/SimpleToken.sol b/contracts/examples/SimpleToken.sol pragma solidity ^0.4.11;
-import ""./StandardToken.sol"";
+import ""../token/StandardToken.sol"";
/**
@@ -12,10 +12,11 @@ import ""./StandardToken.sol"";
*/
contract SimpleToken is StandardToken {
- string public name = ""SimpleToken"";
- string public symbol = ""SIM"";
- uint256 public decimals = 18;
- uint256 public INITIAL_SUPPLY = 10000;
+ string public constant name = ""SimpleToken"";
+ string public constant symbol = ""SIM"";
+ uint256 public constant decimals = 18;
+
+ uint256 public constant INITIAL_SUPPLY = 10000;
/**
* @dev Contructor that gives msg.sender all of existing tokens.
",0
"diff --git a/contracts/lifecycle/Pausable.sol b/contracts/lifecycle/Pausable.sol @@ -26,7 +26,7 @@ contract Pausable is Ownable {
/**
* @dev modifier to allow actions only when the contract IS NOT paused
*/
- modifier whenPaused {
+ modifier whenPaused() {
require(paused);
_;
}
",0
"diff --git a/test/MintableToken.js b/test/MintableToken.js 'use strict';
-const assertJump = require('./helpers/assertJump');
+import expectThrow from './helpers/expectThrow';
var MintableToken = artifacts.require('../contracts/Tokens/MintableToken.sol');
contract('Mintable', function(accounts) {
@@ -37,4 +37,10 @@ contract('Mintable', function(accounts) {
assert(totalSupply, 100);
})
+ it('should fail to mint after call to finishMinting', async function () {
+ await token.finishMinting();
+ assert.equal(await token.mintingFinished(), true);
+ await expectThrow(token.mint(accounts[0], 100));
+ })
+
});
",0
"diff --git a/contracts/token/BasicToken.sol b/contracts/token/BasicToken.sol @@ -22,6 +22,7 @@ contract BasicToken is ERC20Basic {
function transfer(address _to, uint256 _value) returns (bool) {
require(_to != address(0));
+ // SafeMath.sub will throw if there is not enough balance.
balances[msg.sender] = balances[msg.sender].sub(_value);
balances[_to] = balances[_to].add(_value);
Transfer(msg.sender, _to, _value);
",0
"diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol @@ -10,7 +10,7 @@ contract Ownable {
address public owner;
- event OwnershipTransferred(address indexed newOwner);
+ event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
/**
",0
"diff --git a/contracts/token/PausableToken.sol b/contracts/token/PausableToken.sol @@ -11,11 +11,23 @@ import '../lifecycle/Pausable.sol';
contract PausableToken is StandardToken, Pausable {
- function transfer(address _to, uint256 _value) whenNotPaused public returns (bool) {
+ function transfer(address _to, uint256 _value) public whenNotPaused returns (bool) {
return super.transfer(_to, _value);
}
- function transferFrom(address _from, address _to, uint256 _value) whenNotPaused public returns (bool) {
+ function transferFrom(address _from, address _to, uint256 _value) public whenNotPaused returns (bool) {
return super.transferFrom(_from, _to, _value);
}
+
+ function approve(address _spender, uint256 _value) public whenNotPaused returns (bool) {
+ return super.approve(_spender, _value);
+ }
+
+ function increaseApproval(address _spender, uint _addedValue) public whenNotPaused returns (bool success) {
+ return super.increaseApproval(_spender, _addedValue);
+ }
+
+ function decreaseApproval(address _spender, uint _subtractedValue) public whenNotPaused returns (bool success) {
+ return super.decreaseApproval(_spender, _subtractedValue);
+ }
}
",0
"diff --git a/contracts/token/StandardToken.sol b/contracts/token/StandardToken.sol @@ -14,7 +14,7 @@ import './ERC20.sol';
*/
contract StandardToken is ERC20, BasicToken {
- mapping (address => mapping (address => uint256)) allowed;
+ mapping (address => mapping (address => uint256)) internal allowed;
/**
@@ -70,15 +70,13 @@ contract StandardToken is ERC20, BasicToken {
* the first transaction is mined)
* From MonolithDAO Token.sol
*/
- function increaseApproval (address _spender, uint _addedValue)
- returns (bool success) {
+ function increaseApproval (address _spender, uint _addedValue) public returns (bool success) {
allowed[msg.sender][_spender] = allowed[msg.sender][_spender].add(_addedValue);
Approval(msg.sender, _spender, allowed[msg.sender][_spender]);
return true;
}
- function decreaseApproval (address _spender, uint _subtractedValue)
- returns (bool success) {
+ function decreaseApproval (address _spender, uint _subtractedValue) public returns (bool success) {
uint oldValue = allowed[msg.sender][_spender];
if (_subtractedValue > oldValue) {
allowed[msg.sender][_spender] = 0;
",0
"diff --git a/test/StandardToken.js b/test/StandardToken.js 'use strict';
const assertJump = require('./helpers/assertJump');
+const expectThrow = require('./helpers/expectThrow');
var StandardTokenMock = artifacts.require('./helpers/StandardTokenMock.sol');
contract('StandardToken', function(accounts) {
@@ -70,6 +71,17 @@ contract('StandardToken', function(accounts) {
}
});
+ it('should throw an error when trying to transferFrom more than _from has', async function() {
+ let balance0 = await token.balanceOf(accounts[0]);
+ await token.approve(accounts[1], 99);
+ try {
+ await token.transferFrom(accounts[0], accounts[2], balance0+1, {from: accounts[1]});
+ assert.fail('should have thrown before');
+ } catch (error) {
+ assertJump(error);
+ }
+ });
+
describe('validating allowance updates to spender', function() {
let preApproved;
@@ -88,6 +100,13 @@ contract('StandardToken', function(accounts) {
})
});
+ it('should increase by 50 then set to 0 when decreasing by more than 50', async function() {
+ await token.approve(accounts[1], 50);
+ await token.decreaseApproval(accounts[1], 60);
+ let postDecrease = await token.allowance(accounts[0], accounts[1]);
+ postDecrease.should.be.bignumber.equal(0);
+});
+
it('should throw an error when trying to transfer to 0x0', async function() {
let token = await StandardTokenMock.new(accounts[0], 100);
try {
",0
"diff --git a/docs/source/bounty.rst b/docs/source/bounty.rst @@ -14,7 +14,7 @@ To create a bounty for your contract, inherit from the base `Bounty` contract an
Next, implement invariant logic into your smart contract.
-Your main contract should inherit from the Target class and implement the checkInvariant method. This is a function that should check everything your contract assumes to be true all the time. If this function returns false, it means your contract was broken in some way and is in an inconsistent state. This is what security researchers will try to acomplish when trying to get the bounty.
+Your main contract should inherit from the `Target` class and implement the ```checkInvariant()``` method. This is a function that should check everything your contract assumes to be true all the time. If this function returns false, it means your contract was broken in some way and is in an inconsistent state. This is what security researchers will try to acomplish when trying to get the bounty.
At contracts/YourContract.sol::
@@ -35,7 +35,7 @@ At ```migrations/2_deploy_contracts.js```::
deployer.deploy(YourBounty);
};
-Next, add a reward to the bounty contract
+Next, add a reward to the bounty contract.
After deploying the contract, send reward funds into the bounty contract.
",0
"diff --git a/contracts/token/TokenVesting.sol b/contracts/token/TokenVesting.sol @@ -70,6 +70,8 @@ contract TokenVesting is Ownable {
function vestedAmount(ERC20Basic token) constant returns (uint256) {
if (now < cliff) {
return 0;
+ } else if (now >= end) {
+ return token.balanceOf(this);
} else {
uint256 currentBalance = token.balanceOf(this);
uint256 totalBalance = currentBalance.add(released[token]);
",0
"diff --git a/contracts/token/TokenVesting.sol b/contracts/token/TokenVesting.sol @@ -31,6 +31,10 @@ contract TokenVesting is Ownable {
* @param _end timestamp of the moment when all balance will have been vested
*/
function TokenVesting(address _beneficiary, uint256 _cliff, uint256 _end) {
+ require(_beneficiary != 0x0);
+ require(_cliff > now);
+ require(_end > _cliff);
+
beneficiary = _beneficiary;
cliff = _cliff;
end = _end;
",0
"diff --git a/test/TokenVesting.js b/test/TokenVesting.js @@ -48,6 +48,8 @@ contract('TokenVesting', function ([_, owner, beneficiary]) {
balance.should.bignumber.equal(amount.mul(releaseTime - this.start).div(this.end - this.start).floor());
});
+ it('should linearly release tokens during vesting period');
+
it('should have released all after end', async function () {
await increaseTimeTo(this.end);
await this.vesting.release(this.token.address);
@@ -55,4 +57,8 @@ contract('TokenVesting', function ([_, owner, beneficiary]) {
balance.should.bignumber.equal(amount);
});
+ it('should fail to be revoked by owner if revocable not set');
+
+ it('should be emptied when revoked by owner');
+
});
",0
"diff --git a/contracts/crowdsale/Crowdsale.sol b/contracts/crowdsale/Crowdsale.sol @@ -59,12 +59,16 @@ contract Crowdsale {
return new MintableToken();
}
-
// fallback function can be used to buy tokens
function () external payable {
buyTokens(msg.sender);
}
+ // Override this function to create logic for periodization
+ function getTokenAmount(uint256 weiAmount) internal constant returns(uint256) {
+ return weiAmount.mul(rate);
+ }
+
// low level token purchase function
function buyTokens(address beneficiary) public payable {
require(beneficiary != address(0));
",0
"diff --git a/test/ECRecovery.test.js b/test/ECRecovery.test.js @@ -5,7 +5,7 @@ var hashMessage = require('./helpers/hashMessage.js');
contract('ECRecovery', function (accounts) {
let ecrecovery;
- const TEST_MESSAGE = 'OpenZeppelin'
+ const TEST_MESSAGE = 'OpenZeppelin';
before(async function () {
const ecRecoveryLib = await ECRecoveryLib.new();
",0
"diff --git a/contracts/math/SafeMath.sol b/contracts/math/SafeMath.sol @@ -6,6 +6,10 @@ pragma solidity ^0.4.18;
* @dev Math operations with safety checks that throw on error
*/
library SafeMath {
+
+ /**
+ * @dev Multiplies two numbers, throws on overflow.
+ */
function mul(uint256 a, uint256 b) internal pure returns (uint256) {
if (a == 0) {
return 0;
@@ -15,6 +19,9 @@ library SafeMath {
return c;
}
+ /**
+ * @dev Integer division of two numbers, truncating the quotient.
+ */
function div(uint256 a, uint256 b) internal pure returns (uint256) {
// assert(b > 0); // Solidity automatically throws when dividing by 0
uint256 c = a / b;
@@ -22,11 +29,17 @@ library SafeMath {
return c;
}
+ /**
+ * @dev Substracts two numbers, throws if subtrahend is greater than minuend.
+ */
function sub(uint256 a, uint256 b) internal pure returns (uint256) {
assert(b <= a);
return a - b;
}
+ /**
+ * @dev Adds two numbers, throws on overflow.
+ */
function add(uint256 a, uint256 b) internal pure returns (uint256) {
uint256 c = a + b;
assert(c >= a);
",0
"diff --git a/test/SimpleSavingsWallet.js b/test/SimpleSavingsWallet.js 'use strict'
+import assertJump from './helpers/assertJump'
const SimpleSavingsWallet = artifacts.require('../contracts/examples/SimpleSavingsWallet.sol')
@@ -6,11 +7,46 @@ contract('SimpleSavingsWallet', function(accounts) {
let savingsWallet
let owner
+ const paymentAmount = 4242
+
beforeEach(async function() {
savingsWallet = await SimpleSavingsWallet.new(4141)
- owner = await inheritable.owner()
+ owner = await savingsWallet.owner()
})
it('should receive funds', async function() {
- await web3.eth.sendTransaction({from: owner, to: this.contract.address, value: amount})
+ await web3.eth.sendTransaction({from: owner, to: savingsWallet.address, value: paymentAmount})
+ assert.isTrue(
+ (new web3.BigNumber(paymentAmount)).equals(web3.eth.getBalance(savingsWallet.address))
+ )
+ })
+
+ it('owner can send funds', async function() {
+ // Receive payment so we have some money to spend.
+ await web3.eth.sendTransaction({from: accounts[9], to: savingsWallet.address, value: 1000000})
+ try {
+ await savingsWallet.sendTo(0, paymentAmount, {from: owner})
+ assert.fail('should have thrown before')
+ } catch(error) {
+ assertJump(error)
+ }
+ try {
+ await savingsWallet.sendTo(savingsWallet.address, paymentAmount, {from: owner})
+ assert.fail('should have thrown before')
+ } catch(error) {
+ assertJump(error)
+ }
+ try {
+ await savingsWallet.sendTo(accounts[1], 0, {from: owner})
+ assert.fail('should have thrown before')
+ } catch(error) {
+ assertJump(error)
+ }
+
+ const balance = web3.eth.getBalance(accounts[1])
+ await savingsWallet.sendTo(accounts[1], paymentAmount, {from: owner})
+ assert.isTrue(
+ balance.plus(paymentAmount).equals(web3.eth.getBalance(accounts[1]))
+ )
+ })
})
",0
"diff --git a/README.md b/README.md @@ -23,10 +23,12 @@ truffle init
To install the OpenZeppelin library, run the following in your Solidity project root directory:
```sh
-npm init
-npm install zeppelin-solidity
+npm init -y
+npm install -E zeppelin-solidity
```
+**Note that OpenZeppelin does not currently follow semantic versioning.** You may encounter breaking changes upon a minor version bump. We recommend pinning the version of OpenZeppelin you use, as done by the `-E` (`--save-exact`) option.
+
After that, you'll get all the library's contracts in the `node_modules/zeppelin-solidity/contracts` folder. You can use the contracts in the library like so:
```js
",0
"diff --git a/test/crowdsale/IndividuallyCappedCrowdsale.test.js b/test/crowdsale/IndividuallyCappedCrowdsale.test.js @@ -23,8 +23,8 @@ contract('IndividuallyCappedCrowdsale', function ([_, wallet, alice, bob, charli
beforeEach(async function () {
this.token = await SimpleToken.new();
this.crowdsale = await CappedCrowdsale.new(rate, wallet, this.token.address);
- this.crowdsale.setUserCap(alice, capAlice);
- this.crowdsale.setUserCap(bob, capBob);
+ await this.crowdsale.setUserCap(alice, capAlice);
+ await this.crowdsale.setUserCap(bob, capBob);
await this.token.transfer(this.crowdsale.address, tokenSupply);
});
",0
"diff --git a/contracts/token/ERC20/StandardToken.sol b/contracts/token/ERC20/StandardToken.sol @@ -86,7 +86,7 @@ contract StandardToken is ERC20, BasicToken {
*/
function increaseApproval(
address _spender,
- uint _addedValue
+ uint256 _addedValue
)
public
returns (bool)
@@ -109,12 +109,12 @@ contract StandardToken is ERC20, BasicToken {
*/
function decreaseApproval(
address _spender,
- uint _subtractedValue
+ uint256 _subtractedValue
)
public
returns (bool)
{
- uint oldValue = allowed[msg.sender][_spender];
+ uint256 oldValue = allowed[msg.sender][_spender];
if (_subtractedValue > oldValue) {
allowed[msg.sender][_spender] = 0;
} else {
",0
"diff --git a/RELEASING.md b/RELEASING.md @@ -34,10 +34,10 @@ git push upstream vX.Y.Z-rc.R
Draft the release notes in our [GitHub releases](https://github.com/OpenZeppelin/openzeppelin-solidity/releases). Make sure to mark it as a pre-release! Try to be consistent with our previous release notes in the title and format of the text. Release candidates don't need a detailed changelog, but make sure to include a link to GitHub's compare page.
-Once the CI run for the new tag is green, publish on npm.
+Once the CI run for the new tag is green, publish on npm under the `next` tag.
```
-npm publish
+npm publish --tag next
```
Publish the release notes on GitHub and ask our community manager to announce the release candidate on at least Slack and Twitter.
@@ -67,6 +67,12 @@ npm publish
Publish the release notes on GitHub and ask our community manager to announce the release!
+Delete the `next` tag in the npm package as there is no longer a release candidate.
+
+```
+npm dist-tag rm --otp $2FA_CODE openzeppelin-solidity next
+```
+
## Merging the release branch
After the final release, the release branch should be merged back into `master`. This merge must not be squashed, because it would lose the tagged release commit, so it should be merged locally and pushed.
",0
"diff --git a/test/lifecycle/Pausable.test.js b/test/lifecycle/Pausable.test.js const { assertRevert } = require('../helpers/assertRevert');
+const expectEvent = require('../helpers/expectEvent');
const PausableMock = artifacts.require('PausableMock');
const BigNumber = web3.BigNumber;
@@ -53,4 +54,12 @@ contract('Pausable', function () {
(await this.Pausable.drasticMeasureTaken()).should.equal(false);
});
+
+ it('should log Pause and Unpause events appropriately', async function () {
+ const setPauseLogs = (await this.Pausable.pause()).logs;
+ expectEvent.inLogs(setPauseLogs, 'Pause');
+
+ const setUnPauseLogs = (await this.Pausable.unpause()).logs;
+ expectEvent.inLogs(setUnPauseLogs, 'Unpause');
+ });
});
",0
"diff --git a/README.md b/README.md npm install openzeppelin-solidity
```
+If you're interested in trying out a preview of OpenZeppelin 2.0, install `openzeppelin-solidity@next`, check out the [release notes](https://github.com/OpenZeppelin/openzeppelin-solidity/releases/tag/v2.0.0-rc.1), and let us know what you think!
+
## Usage
To write your custom contracts, import ours and extend them through inheritance.
",0
"diff --git a/contracts/drafts/TokenVesting.sol b/contracts/drafts/TokenVesting.sol @@ -161,7 +161,7 @@ contract TokenVesting is Ownable {
* @param token ERC20 token which is being vested
*/
function _vestedAmount(IERC20 token) private view returns (uint256) {
- uint256 currentBalance = token.balanceOf(this);
+ uint256 currentBalance = token.balanceOf(address(this));
uint256 totalBalance = currentBalance.add(_released[token]);
if (block.timestamp < _cliff) {
",0
"diff --git a/RELEASING.md b/RELEASING.md @@ -36,7 +36,7 @@ Draft the release notes in our [GitHub releases](https://github.com/OpenZeppelin
Before publishing on npm you need to generate the build artifacts. This is not done automatically at the moment because of a bug in Truffle. Since some of the contracts should not be included in the package, this is a _hairy_ process that you need to do with care.
-1. Delete the `contracts/mocks` and `contracts/examples` directories.
+1. Delete the `contracts/mocks`, `contracts/examples` and `build` directories.
2. Run `truffle compile`. (Note that the Truffle process may never exit and you will have to interrupt it.)
3. Recover the directories using `git checkout`. It doesn't matter if you do this now or later.
@@ -70,7 +70,7 @@ Draft the release notes in GitHub releases. Try to be consistent with our previo
Before publishing on npm you need to generate the build artifacts. This is not done automatically at the moment because of a bug in Truffle. Since some of the contracts should not be included in the package, this is a _hairy_ process that you need to do with care.
-1. Delete the `contracts/mocks` and `contracts/examples` directories.
+1. Delete the `contracts/mocks`, `contracts/examples` and `build` directories.
2. Run `truffle compile`. (Note that the Truffle process may never exit and you will have to interrupt it.)
3. Recover the directories using `git checkout`. It doesn't matter if you do this now or later.
",0
"diff --git a/test/behavior/access/roles/PublicRole.behavior.js b/test/behavior/access/roles/PublicRole.behavior.js @@ -5,6 +5,21 @@ function capitalize (str) {
return str.replace(/\b\w/g, l => l.toUpperCase());
}
+// Tests that a role complies with the standard role interface, that is:
+// * an onlyRole modifier
+// * an isRole function
+// * an addRole function, accessible to role havers
+// * a renounceRole function
+// * roleAdded and roleRemoved events
+// Both the modifier and an additional internal remove function are tested through a mock contract that exposes them.
+// This mock contract should be stored in this.contract.
+//
+// @param authorized an account that has the role
+// @param otherAuthorized another account that also has the role
+// @param anyone an account that doesn't have the role, passed inside an array for ergonomics
+// @param rolename a string with the name of the role
+// @param manager undefined for regular roles, or a manager account for managed roles. In these, only the manager
+// account can create and remove new role bearers.
function shouldBehaveLikePublicRole (authorized, otherAuthorized, [anyone], rolename, manager) {
rolename = capitalize(rolename);
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md ## 2.2.0 (unreleased)
+## 2.1.2 (2019-17-01)
+ * Removed most of the test suite from the npm package, except `PublicRole.behavior.js`, which may be useful to users testing their own `Roles`.
+
## 2.1.1 (2019-04-01)
* Version bump to avoid conflict in the npm registry.
",0
"diff --git a/contracts/drafts/ERC20Snapshot.sol b/contracts/drafts/ERC20Snapshot.sol @@ -7,7 +7,8 @@ import ""../token/ERC20/ERC20.sol"";
/**
* @title ERC20 token with snapshots.
- * inspired by Jordi Baylina's MiniMeToken to record historical balances
+ * Inspired by Jordi Baylina's MiniMeToken to record historical balances:
+ * https://github.com/Giveth/minime/blob/ea04d950eea153a04c51fa510b068b9dded390cb/contracts/MiniMeToken.sol
* Snapshots store a value at the time a snapshot is taken (and a new snapshot id created), and the corresponding
* snapshot id. Each account has individual snapshots taken on demand, as does the token's total supply.
* @author Validity Labs AG <info@validitylabs.org>
",0
"diff --git a/contracts/drafts/ERC20Snapshot.sol b/contracts/drafts/ERC20Snapshot.sol @@ -7,7 +7,7 @@ import ""../token/ERC20/ERC20.sol"";
/**
* @title ERC20 token with snapshots.
- * Inspired by Jordi Baylina's MiniMeToken to record historical balances:
+ * @dev Inspired by Jordi Baylina's MiniMeToken to record historical balances:
* https://github.com/Giveth/minime/blob/ea04d950eea153a04c51fa510b068b9dded390cb/contracts/MiniMeToken.sol
* Snapshots store a value at the time a snapshot is taken (and a new snapshot id created), and the corresponding
* snapshot id. Each account has individual snapshots taken on demand, as does the token's total supply.
",0
"diff --git a/contracts/drafts/ERC20Snapshot.sol b/contracts/drafts/ERC20Snapshot.sol @@ -11,6 +11,11 @@ import ""../token/ERC20/ERC20.sol"";
* https://github.com/Giveth/minime/blob/ea04d950eea153a04c51fa510b068b9dded390cb/contracts/MiniMeToken.sol
* When a snapshot is made, the balances and totalSupply at the time of the snapshot are recorded for later
* access.
+ *
+ * To make a snapshot, call the `snapshot` function, which will emit the `Snapshot` event and return a snapshot id.
+ * To get the total supply from a snapshot, call the function `totalSupplyAt` with the snapshot id.
+ * To get the balance of an account from a snapshot, call the `balanceOfAt` function with the snapshot id and the
+ * account address.
* @author Validity Labs AG <info@validitylabs.org>
*/
contract ERC20Snapshot is ERC20 {
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md ## 2.2.0 (unreleased)
### New features:
- * `ERC20`: added internal `_approve(address owner, address spender, uint256 value)`, allowing derived contracts to set the allowance of arbitrary accounts.
- * `ERC20Metadata`: added internal `_setTokenURI(string memory tokenURI)`.
- * `ERC20Snapshot`: create snapshots on demand of the token balances and total supply, to later retrieve and e.g. calculate dividends at a past time.
+ * `ERC20`: added internal `_approve(address owner, address spender, uint256 value)`, allowing derived contracts to set the allowance of arbitrary accounts. ([#1609](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1609))
+ * `ERC20Metadata`: added internal `_setTokenURI(string memory tokenURI)`. ([#1618](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1618))
+ * `ERC20Snapshot`: create snapshots on demand of the token balances and total supply, to later retrieve and e.g. calculate dividends at a past time. ([#1617](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1617))
### Improvements:
- * Upgraded the minimum compiler version to v0.5.2: this removes many Solidity warnings that were false positives.
- * `Counter`'s API has been improved, and is now used by `ERC721` (though it is still in `drafts`).
- * `ERC721`'s transfers are now more gas efficient due to removal of unnecessary `SafeMath` calls.
- * Fixed variable shadowing issues.
+ * Upgraded the minimum compiler version to v0.5.2: this removes many Solidity warnings that were false positives. ([#1606](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1606))
+ * `Counter`'s API has been improved, and is now used by `ERC721` (though it is still in `drafts`). ([#1610](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1610))
+ * `ERC721`'s transfers are now more gas efficient due to removal of unnecessary `SafeMath` calls. ([#1610](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1610))
+ * Fixed variable shadowing issues. ([#1606](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1606))
### Bugfixes:
### Breaking changes:
- * `TokenMetadata` (in drafts) has been renamed to `ERC20Metadata`.
+ * `TokenMetadata` (in drafts) has been renamed to `ERC20Metadata`. ([#1618](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1618))
## 2.1.2 (2019-17-01)
* Removed most of the test suite from the npm package, except `PublicRole.behavior.js`, which may be useful to users testing their own `Roles`.
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md * Fixed variable shadowing issues. ([#1606](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1606))
### Bugfixes:
+ * (minor) `SafeERC20`: `safeApprove` wasn't properly checking for a zero allowance when attempting to set a non-zero allowance. ([#1647](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1647))
### Breaking changes:
* `TokenMetadata` (in drafts) has been renamed to `ERC20Metadata`. ([#1618](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1618))
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md ## 2.2.0 (unreleased)
+## 2.1.3 (2019-26-02)
+ * Backported `SafeERC20.safeApprove` bugfix. ([#1647](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1647))
+
## 2.1.2 (2019-17-01)
* Removed most of the test suite from the npm package, except `PublicRole.behavior.js`, which may be useful to users testing their own `Roles`.
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
-## 2.2.0 (unreleased)
+## 2.2.0 (2019-03-14)
### New features:
* `ERC20Snapshot`: create snapshots on demand of the token balances and total supply, to later retrieve and e.g. calculate dividends at a past time. ([#1617](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1617))
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md * Upgraded the minimum compiler version to v0.5.2: this removes many Solidity warnings that were false positives. ([#1606](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1606))
* `ECDSA`: `recover` no longer accepts malleable signatures (those using upper-range values for `s`, or 0/1 for `v`). ([#1622](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1622))
* `ERC721`'s transfers are now more gas efficient due to removal of unnecessary `SafeMath` calls. ([#1610](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1610))
- * `Counter`'s API has been improved, and is now used by `ERC721` (though it is still in `drafts`). ([#1610](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1610))
* Fixed variable shadowing issues. ([#1606](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1606))
### Bugfixes:
* (minor) `SafeERC20`: `safeApprove` wasn't properly checking for a zero allowance when attempting to set a non-zero allowance. ([#1647](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1647))
-### Breaking changes:
- * `TokenMetadata` (in drafts) has been renamed to `ERC20Metadata`. ([#1618](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1618))
+### Breaking changes in drafts:
+ * `TokenMetadata` has been renamed to `ERC20Metadata`. ([#1618](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1618))
+ * The library `Counter` has been renamed to `Counters` and its API has been improved. See an example in `ERC721`, lines [17](https://github.com/OpenZeppelin/openzeppelin-solidity/blob/3cb4a00fce1da76196ac0ac3a0ae9702b99642b5/contracts/token/ERC721/ERC721.sol#L17) and [204](https://github.com/OpenZeppelin/openzeppelin-solidity/blob/3cb4a00fce1da76196ac0ac3a0ae9702b99642b5/contracts/token/ERC721/ERC721.sol#L204). ([#1610](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1610))
## 2.1.3 (2019-02-26)
* Backported `SafeERC20.safeApprove` bugfix. ([#1647](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1647))
",0
"diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -8,6 +8,14 @@ aliases:
docker:
- image: circleci/node:8
+ - &npm_install_if_necessary
+ run:
+ name: Install npm dependencies
+ command: |
+ if [ ! -d node_modules ]; then
+ npm ci
+ fi
+
- &cache_key_node_modules
key: v1-node_modules-{{ checksum ""package-lock.json"" }}
@@ -18,12 +26,7 @@ jobs:
- checkout
- restore_cache:
<<: *cache_key_node_modules
- - run:
- name: Install npm dependencies
- command: |
- if [ ! -d node_modules ]; then
- npm ci
- fi
+ - *npm_install_if_necessary
- save_cache:
paths:
- node_modules
@@ -35,6 +38,7 @@ jobs:
- checkout
- restore_cache:
<<: *cache_key_node_modules
+ - *npm_install_if_necessary
- run:
name: Linter
command: npm run lint
@@ -44,6 +48,7 @@ jobs:
- checkout
- restore_cache:
<<: *cache_key_node_modules
+ - *npm_install_if_necessary
- run:
name: Unit tests
command: npm run test
@@ -54,6 +59,7 @@ jobs:
- checkout
- restore_cache:
<<: *cache_key_node_modules
+ - *npm_install_if_necessary
- run:
name: Unit tests with coverage report
command: npm run test
",0
"diff --git a/scripts/release/release.sh b/scripts/release/release.sh @@ -81,7 +81,10 @@ environment_check() {
environment_check
-if [[ ""$*"" == ""start minor"" ]]; then
+if [[ ""$*"" == ""push"" ]]; then
+ push_and_publish next
+
+elif [[ ""$*"" == ""start minor"" ]]; then
log ""Creating new minor pre-release""
assert_current_branch master
",0
"diff --git a/contracts/token/ERC721/ERC721.sol b/contracts/token/ERC721/ERC721.sol @@ -317,7 +317,7 @@ contract ERC721 is Context, ERC165, IERC721 {
* @dev Internal function to invoke {IERC721Receiver-onERC721Received} on a target address.
* The call is not executed if the target address is not a contract.
*
- * This function is deprecated.
+ * This is an internal detail of the `ERC721` contract and its use is deprecated.
* @param from address representing the previous owner of the given token ID
* @param to target address that will receive the tokens
* @param tokenId uint256 ID of the token to be transferred
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
-## 3.1.1 (Unreleased)
+## 3.2.0 (unreleased)
+
+### New features
+ * Proxies: added the proxy contracts from OpenZeppelin SDK. ([#2335](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2335))
### Improvements
* `Address.isContract`: switched from `extcodehash` to `extcodesize` for less gas usage. ([#2311](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2311))
+### Breaking changes
+ * `ERC20Snapshot`: switched to using `_beforeTokenTransfer` hook instead of overriding ERC20 operations. ([#2312](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2312))
+
+This small change in the way we implemented `ERC20Snapshot` may affect users who are combining this contract with
+other ERC20 flavors, since it no longer overrides `_transfer`, `_mint`, and `_burn`. This can result in having to remove Solidity `override(...)` specifiers in derived contracts for these functions, and to instead have to add it for `_beforeTokenTransfer`. See [Using Hooks](https://docs.openzeppelin.com/contracts/3.x/extending-contracts#using-hooks) in the documentation.
+
## 3.1.0 (2020-06-23)
### New features
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
+## 3.2.1-solc-0.7 (unreleased)
+
+* `ERC777`: Remove a warning about function state visibility in Solidity 0.7. ([#2327](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2327))
+
## 3.2.0 (2020-09-10)
### New features
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md ## 3.3.0 (unreleased)
* `Address`: added `functionStaticCall` and `functionDelegateCall`, similar to the existing `functionCall`. ([#2333](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2333))
+ * `TimelockController`: added a contract to augment access control schemes with a delay. ([#2364](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2364))
## 3.2.0 (2020-09-10)
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
+## Unreleased
+
+ * Add beacon proxy. ([#2411](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2411))
+
## Unreleased
* Now supports both Solidity 0.6 and 0.7. Compiling with solc 0.7 will result in warnings. Install the `solc-0.7` tag to compile without warnings.
",0
"diff --git a/contracts/math/SafeMath.sol b/contracts/math/SafeMath.sol pragma solidity ^0.8.0;
+// CAUTION
+// This version of SafeMath should only be used with Solidity 0.8 or later,
+// because it relies on the compiler's built in overflow checks.
+
/**
* @dev Wrappers over Solidity's arithmetic operations.
*/
",0
"diff --git a/contracts/utils/structs/EnumerableSet.sol b/contracts/utils/structs/EnumerableSet.sol @@ -89,7 +89,7 @@ library EnumerableSet {
// Move the last value to the index where the value to delete is
set._values[toDeleteIndex] = lastvalue;
// Update the index for the moved value
- set._indexes[lastvalue] = toDeleteIndex + 1; // All indexes are 1-based
+ set._indexes[lastvalue] = valueIndex; // Replace lastvalue's index to valueIndex
// Delete the slot where the moved value was stored
set._values.pop();
",0
"diff --git a/docs/modules/ROOT/pages/upgradeable.adoc b/docs/modules/ROOT/pages/upgradeable.adoc @@ -6,6 +6,8 @@ This variant is available as a separate package called `@openzeppelin/contracts-
It follows all of the rules for xref:upgrades-plugins::writing-upgradeable.adoc[Writing Upgradeable Contracts]: constructors are replaced by initializer functions, state variables are initialized in initializer functions, and we additionally check for storage incompatibilities across minor versions.
+TIP: OpenZeppelin provides a full suite of tools for deploying and securing upgradeable smart contracts. xref:openzeppelin::upgrades.adoc[Check out the full list of resources].
+
== Overview
=== Installation
",0
"diff --git a/contracts/utils/cryptography/ECDSA.sol b/contracts/utils/cryptography/ECDSA.sol @@ -28,15 +28,13 @@ library ECDSA {
* - with https://docs.ethers.io/v5/api/signer/#Signer-signMessage[ethers]
*/
function recover(bytes32 hash, bytes memory signature) internal pure returns (address) {
- // Divide the signature in r, s and v variables
- bytes32 r;
- bytes32 s;
- uint8 v;
-
// Check the signature length
// - case 65: r,s,v signature (standard)
// - case 64: r,vs signature (cf https://eips.ethereum.org/EIPS/eip-2098) _Available since v4.1._
if (signature.length == 65) {
+ bytes32 r;
+ bytes32 s;
+ uint8 v;
// ecrecover takes the signature parameters, and the only way to get them
// currently is to use assembly.
assembly {
@@ -44,25 +42,45 @@ library ECDSA {
s := mload(add(signature, 0x40))
v := byte(0, mload(add(signature, 0x60)))
}
+ return recover(hash, v, r, s);
} else if (signature.length == 64) {
+ bytes32 r;
+ bytes32 vs;
// ecrecover takes the signature parameters, and the only way to get them
// currently is to use assembly.
assembly {
- let vs := mload(add(signature, 0x40))
r := mload(add(signature, 0x20))
- s := and(vs, 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
- v := add(shr(255, vs), 27)
+ vs := mload(add(signature, 0x40))
}
+ return recover(hash, r, vs);
} else {
revert(""ECDSA: invalid signature length"");
}
+ }
+ /**
+ * @dev Overload of {ECDSA-recover} that receives the `r` and `vs` short-signature fields separately.
+ *
+ * See https://eips.ethereum.org/EIPS/eip-2098[EIP-2098 short signatures]
+ *
+ * _Available since v4.2._
+ */
+ function recover(
+ bytes32 hash,
+ bytes32 r,
+ bytes32 vs
+ ) internal pure returns (address) {
+ bytes32 s;
+ uint8 v;
+ assembly {
+ s := and(vs, 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+ v := add(shr(255, vs), 27)
+ }
return recover(hash, v, r, s);
}
/**
- * @dev Overload of {ECDSA-recover} that receives the `v`,
- * `r` and `s` signature fields separately.
+ * @dev Overload of {ECDSA-recover} that receives the `v`, `r` and `s` signature fields separately.
*/
function recover(
bytes32 hash,
",0
"diff --git a/contracts/governance/compatibility/GovernorCompatibilityBravo.sol b/contracts/governance/compatibility/GovernorCompatibilityBravo.sol @@ -15,6 +15,8 @@ import ""./IGovernorCompatibilityBravo.sol"";
* This compatibility layer includes a voting system and requires a {IGovernorTimelock} compatible module to be added
* through inheritance. It does not include token bindings, not does it include any variable upgrade patterns.
*
+ * NOTE: When using this module, you may need to enable the Solidity optimizer to avoid hitting the contract size limit.
+ *
* _Available since v4.3._
*/
abstract contract GovernorCompatibilityBravo is
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -95,6 +95,10 @@ Make sure you're using git or another version control system to be able to recov
Some further changes have been done between the different beta iterations. Transitions made during this period are configured in the `migrate-imports` script. Consequently, you can upgrade from any previous 4.0-beta.x version using the same script as described in the *How to upgrade from 3.x* section.
+## 3.4.1 (2021-03-03)
+
+ * `ERC721`: made `_approve` an internal function (was private).
+
## 3.4.0 (2021-02-02)
* `BeaconProxy`: added new kind of proxy that allows simultaneous atomic upgrades. ([#2411](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2411))
",0
"diff --git a/contracts/proxy/utils/Initializable.sol b/contracts/proxy/utils/Initializable.sol @@ -13,6 +13,22 @@ pragma solidity ^0.8.0;
*
* CAUTION: When used with inheritance, manual care must be taken to not invoke a parent initializer twice, or to ensure
* that all initializers are idempotent. This is not verified automatically as constructors are by Solidity.
+ *
+ * [CAUTION]
+ * ====
+ * Avoid leaving a contract uninitialized.
+ *
+ * An uninitialized contract can be used in certain kinds of exploits since it may allow an attacker to take control of
+ * the contract. This includes the implementation contract behind a proxy. You can either invoke the initializer
+ * manually, independently of initialization of the proxy, or you can include a constructor to automatically mark it as
+ * initialized when it is deployed:
+ *
+ * [.hljs-theme-light.nopadding]
+ * ```
+ * /// @custom:oz-upgrades-unsafe-allow constructor
+ * constructor() initializer {}
+ * ```
+ * ====
*/
abstract contract Initializable {
/**
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md * `PaymentSplitter`: now supports ERC20 assets in addition to Ether. ([#2858](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2858))
* `ECDSA`: add a variant of `toEthSignedMessageHash` for arbitrary length message hashing. ([#2865](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2865))
* `MerkleProof`: add a `processProof` function that returns the rebuilt root hash given a leaf and a proof. ([#2841](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2841))
- * `VestingWallet`: new contract that handles the vesting of Ether and ERC20 tokens following a customizable vesting schedule. ([#2748](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2748))
+ * `VestingWallet`: new contract that handles the vesting of Ether and ERC20 tokens following a customizable vesting schedule. ([#2748](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2748))
+ * `Governor`: enable receiving Ether when a Timelock contract is not used. ([#2748](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2748))
+ * `GovernorTimelockCompound`: fix ability to use Ether stored in the Timelock contract. ([#2748](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2748))
## 4.3.2 (2021-09-14)
",0
"diff --git a/SECURITY.md b/SECURITY.md @@ -11,6 +11,8 @@ The recommendation is to use the latest version available.
| 2.5 | :white_check_mark: |
| < 2.0 | :x: |
+Note that the Solidity language itself only guarantees security updates for the latest release.
+
## Reporting a Vulnerability
Please report any security issues you find to security@openzeppelin.org.
",0
"diff --git a/docs/modules/ROOT/pages/governance.adoc b/docs/modules/ROOT/pages/governance.adoc @@ -134,6 +134,7 @@ For 3) we will use GovernorCountingSimple, a module that offers 3 options to vot
Besides these modules, Governor itself has some parameters we must set.
votingDelay: How long after a proposal is created should voting power be fixed. A large voting delay gives users time to unstake tokens if necessary.
+
votingPeriod: How long does a proposal remain open to votes.
These parameters are specified in number of blocks. Assuming block time of around 13.14 seconds, we will set votingDelay = 1 day = 6570 blocks, and votingPeriod = 1 week = 45992 blocks.
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md * `GovernorTimelockControl`: improve the `state()` function to have it reflect cases where a proposal has been canceled directly on the timelock. ([#2977](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2977))
* `Math`: add a `abs(int256)` method that returns the unsigned absolute value of a signed value. ([#2984](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2984))
+* Preset contracts are now deprecated in favor of [Contracts Wizard](https://wizard.openzeppelin.com). ([#2986](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2986))
## Unreleased
",0
"diff --git a/docs/modules/ROOT/pages/erc721.adoc b/docs/modules/ROOT/pages/erc721.adoc @@ -16,10 +16,11 @@ Here's what a contract for tokenized items might look like:
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.0;
+import ""@openzeppelin/contracts/token/ERC721/ERC721.sol"";
import ""@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol"";
import ""@openzeppelin/contracts/utils/Counters.sol"";
-contract GameItem is ERC721URIStorage {
+contract GameItem is ERC721, ERC721URIStorage {
using Counters for Counters.Counter;
Counters.Counter private _tokenIds;
",0
"diff --git a/contracts/governance/extensions/GovernorTimelockControl.sol b/contracts/governance/extensions/GovernorTimelockControl.sol @@ -10,7 +10,7 @@ import ""../TimelockController.sol"";
/**
* @dev Extension of {Governor} that binds the execution process to an instance of {TimelockController}. This adds a
* delay, enforced by the {TimelockController} to all successful proposal (in addition to the voting duration). The
- * {Governor} needs the proposer (an ideally the executor) roles for the {Governor} to work properly.
+ * {Governor} needs the proposer (and ideally the executor) roles for the {Governor} to work properly.
*
* Using this model means the proposal will be operated by the {TimelockController} and not by the {Governor}. Thus,
* the assets and permissions must be attached to the {TimelockController}. Any asset sent to the {Governor} will be
",0
"diff --git a/contracts/governance/extensions/GovernorTimelockControl.sol b/contracts/governance/extensions/GovernorTimelockControl.sol @@ -16,6 +16,10 @@ import ""../TimelockController.sol"";
* the assets and permissions must be attached to the {TimelockController}. Any asset sent to the {Governor} will be
* inaccessible.
*
+ * WARNING: Setting up the TimelockController to have additional proposers besides the governor introduces the risk that
+ * approved governance proposals could be blocked by the other proposers, effectively executing a Denial of Service attack,
+ * and therefore blocking access to governance-controlled assets.
+ *
* _Available since v4.3._
*/
abstract contract GovernorTimelockControl is IGovernorTimelock, Governor {
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md * `Votes`: Added a base contract for vote tracking with delegation. ([#2944](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2944))
* `ERC721Votes`: Added an extension of ERC721 enabled with vote tracking and delegation. ([#2944](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2944))
* `ERC2771Context`: use immutable storage to store the forwarder address, no longer an issue since Solidity >=0.8.8 allows reading immutable variables in the constructor. ([#2917](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2917))
- * `Base64`: add a library to parse bytes into base64 strings using `encode(bytes memory)` function, and provide examples to show how to use to build URL-safe `tokenURIs` ([#2884](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2884))
- * `ERC20`: reduce allowance before triggering transfer.
+ * `Base64`: add a library to parse bytes into base64 strings using `encode(bytes memory)` function, and provide examples to show how to use to build URL-safe `tokenURIs`. ([#2884](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2884))
+ * `ERC20`: reduce allowance before triggering transfer. ([#3056](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#3056))
## 4.4.1 (2021-12-14)
",0
"diff --git a/contracts/token/ERC20/utils/TokenTimelock.sol b/contracts/token/ERC20/utils/TokenTimelock.sol @@ -24,6 +24,11 @@ contract TokenTimelock {
// timestamp when token release is enabled
uint256 private immutable _releaseTime;
+ /**
+ * @dev Deploys a timelock instance that is able to hold the token specified, and will only release it to
+ * `beneficiary_` when {release} is invoked after `releaseTime_`. The release time is specified as a Unix timestamp
+ * (in seconds).
+ */
constructor(
IERC20 token_,
address beneficiary_,
@@ -36,28 +41,29 @@ contract TokenTimelock {
}
/**
- * @return the token being held.
+ * @dev Returns the token being held.
*/
function token() public view virtual returns (IERC20) {
return _token;
}
/**
- * @return the beneficiary of the tokens.
+ * @dev Returns the beneficiary that will receive the tokens.
*/
function beneficiary() public view virtual returns (address) {
return _beneficiary;
}
/**
- * @return the time when the tokens are released.
+ * @dev Returns the time when the tokens are released in seconds since Unix epoch (i.e. Unix timestamp).
*/
function releaseTime() public view virtual returns (uint256) {
return _releaseTime;
}
/**
- * @notice Transfers tokens held by timelock to beneficiary.
+ * @dev Transfers tokens held by the timelock to the beneficiary. Will only succeed if invoked after the release
+ * time.
*/
function release() public virtual {
require(block.timestamp >= releaseTime(), ""TokenTimelock: current time is before release time"");
",0
"diff --git a/contracts/utils/cryptography/SignatureChecker.sol b/contracts/utils/cryptography/SignatureChecker.sol @@ -8,16 +8,20 @@ import ""../Address.sol"";
import ""../../interfaces/IERC1271.sol"";
/**
- * @dev Signature verification helper: Provide a single mechanism to verify both private-key (EOA) ECDSA signature and
- * ERC1271 contract signatures. Using this instead of ECDSA.recover in your contract will make them compatible with
- * smart contract wallets such as Argent and Gnosis.
- *
- * Note: unlike ECDSA signatures, contract signature's are revocable, and the outcome of this function can thus change
- * through time. It could return true at block N and false at block N+1 (or the opposite).
+ * @dev Signature verification helper that can be used instead of `ECDSA.recover` to seamlessly support both ECDSA
+ * signatures from externally owned accounts (EOAs) as well as ERC1271 signatures from smart contract wallets like
+ * Argent and Gnosis Safe.
*
* _Available since v4.1._
*/
library SignatureChecker {
+ /**
+ * @dev Checks if a signature is valid for a given signer and data hash. If the signer is a smart contract, the
+ * signature is validated against that smart contract using ERC1271, otherwise it's validated using `ECDSA.recover`.
+ *
+ * NOTE: Unlike ECDSA signatures, contract signatures are revocable, and the outcome of this function can thus
+ * change through time. It could return true at block N and false at block N+1 (or the opposite).
+ */
function isValidSignatureNow(
address signer,
bytes32 hash,
",0
"diff --git a/contracts/token/ERC1155/extensions/ERC1155Supply.sol b/contracts/token/ERC1155/extensions/ERC1155Supply.sol @@ -51,7 +51,13 @@ abstract contract ERC1155Supply is ERC1155 {
if (to == address(0)) {
for (uint256 i = 0; i < ids.length; ++i) {
- _totalSupply[ids[i]] -= amounts[i];
+ uint256 id = ids[i];
+ uint256 amount = amounts[i];
+ uint256 supply = _totalSupply[id];
+ require(supply >= amount, ""ERC1155: burn amount exceeds totalSupply"");
+ unchecked {
+ _totalSupply[id] = supply - amount;
+ }
}
}
}
",0
"diff --git a/contracts/utils/structs/DoubleEndedQueue.sol b/contracts/utils/structs/DoubleEndedQueue.sol @@ -102,6 +102,8 @@ library DoubleEndedQueue {
/**
* @dev Returns the item at the beginning of the queue.
+ *
+ * Reverts with `Empty` if the queue is empty.
*/
function front(Bytes32Deque storage deque) internal view returns (bytes32 value) {
if (empty(deque)) revert Empty();
@@ -111,6 +113,8 @@ library DoubleEndedQueue {
/**
* @dev Returns the item at the end of the queue.
+ *
+ * Reverts with `Empty` if the queue is empty.
*/
function back(Bytes32Deque storage deque) internal view returns (bytes32 value) {
if (empty(deque)) revert Empty();
",0
"diff --git a/README.md b/README.md @@ -22,6 +22,8 @@ $ npm install @openzeppelin/contracts
OpenZeppelin Contracts features a [stable API](https://docs.openzeppelin.com/contracts/releases-stability#api-stability), which means your contracts won't break unexpectedly when upgrading to a newer minor version.
+An alternative to npm is to use the GitHub repository `openzeppelin/openzeppelin-contracts` to retrieve the contracts. When doing this, make sure to specify the tag for a release such as `v4.5.0`, instead of using the `master` branch.
+
### Usage
Once installed, you can use the contracts in the library by importing them:
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md * `DoubleEndedQueue`: a new data structure that supports efficient push and pop to both front and back, useful for FIFO and LIFO queues. ([#3153](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3153))
* `Governor`: improved security of `onlyGovernance` modifier when using an external executor contract (e.g. a timelock) that can operate without necessarily going through the governance protocol. ([#3147](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3147))
* `ERC20FlashMint`: support infinite allowance when paying back a flash loan. ([#3226](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3226))
- * `Governor`: Add a way to parameterize votes. This can be used to implement voting systems such as fractionalized voting, ERC721 based voting, or any number of other systems. The `params` argument added to `_countVote` method, and included in the newly added `_getVotes` method, can be used by counting and voting modules respectively for such purposes.
+ * `Governor`: Add a way to parameterize votes. This can be used to implement voting systems such as fractionalized voting, ERC721 based voting, or any number of other systems. The `params` argument added to `_countVote` method, and included in the newly added `_getVotes` method, can be used by counting and voting modules respectively for such purposes. ([#3043](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3043))
* `TimelockController`: Add a separate canceller role for the ability to cancel. ([#3165](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3165))
* `draft-ERC20Permit`: replace `immutable` with `constant` for `_PERMIT_TYPEHASH` since the `keccak256` of string literals is treated specially and the hash is evaluated at compile time. ([#3196](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3196))
* `ERC20Wrapper`: the `decimals()` function now tries to fetch the value from the underlying token instance. If that calls revert, then the default value is used. ([#3259](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3259))
",0
"diff --git a/contracts/mocks/crosschain/receivers.sol b/contracts/mocks/crosschain/receivers.sol @@ -19,6 +19,7 @@ abstract contract Receiver is Ownable, CrossChainEnabled {
* AMB
*/
contract CrossChainEnabledAMBMock is Receiver, CrossChainEnabledAMB {
+ /// @custom:oz-upgrades-unsafe-allow constructor
constructor(address bridge) CrossChainEnabledAMB(bridge) {}
}
@@ -26,6 +27,7 @@ contract CrossChainEnabledAMBMock is Receiver, CrossChainEnabledAMB {
* Arbitrum
*/
contract CrossChainEnabledArbitrumL1Mock is Receiver, CrossChainEnabledArbitrumL1 {
+ /// @custom:oz-upgrades-unsafe-allow constructor
constructor(address bridge) CrossChainEnabledArbitrumL1(bridge) {}
}
@@ -35,6 +37,7 @@ contract CrossChainEnabledArbitrumL2Mock is Receiver, CrossChainEnabledArbitrumL
* Optimism
*/
contract CrossChainEnabledOptimismMock is Receiver, CrossChainEnabledOptimism {
+ /// @custom:oz-upgrades-unsafe-allow constructor
constructor(address bridge) CrossChainEnabledOptimism(bridge) {}
}
@@ -42,5 +45,6 @@ contract CrossChainEnabledOptimismMock is Receiver, CrossChainEnabledOptimism {
* Polygon
*/
contract CrossChainEnabledPolygonChildMock is Receiver, CrossChainEnabledPolygonChild {
+ /// @custom:oz-upgrades-unsafe-allow constructor
constructor(address bridge) CrossChainEnabledPolygonChild(bridge) {}
}
",0
"diff --git a/CHANGELOG.md b/CHANGELOG.md * `Initializable`: add an Initialized event that tracks initialized version numbers. ([#3294](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3294))
* `ERC2981`: make `royaltyInfo` public to allow super call in overrides. ([#3305](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3305))
+### Upgradeability notice
+
+* `TimelockController`: **(Action needed)** The upgrade from <4.6 to >=4.6 introduces a new `CANCELLER_ROLE` that requires set up to be assignable. After the upgrade, only addresses with this role will have the ability to cancel. Proposers will no longer be able to cancel. Assigning cancellers can be done by an admin (including the timelock itself) once the role admin is set up. To do this, we recommend upgrading to the `TimelockControllerWith46MigrationUpgradeable` contract and then calling the `migrateTo46` function.
+
### Breaking changes
* `Governor`: Adds internal virtual `_getVotes` method that must be implemented; this is a breaking change for existing concrete extensions to `Governor`. To fix this on an existing voting module extension, rename `getVotes` to `_getVotes` and add a `bytes memory` argument. ([#3043](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3043))
",0
"diff --git a/contracts/access/AccessControl.sol b/contracts/access/AccessControl.sol @@ -138,6 +138,8 @@ abstract contract AccessControl is Context, IAccessControl, ERC165 {
* Requirements:
*
* - the caller must have ``role``'s admin role.
+ *
+ * May emit a {RoleGranted} event.
*/
function grantRole(bytes32 role, address account) public virtual override onlyRole(getRoleAdmin(role)) {
_grantRole(role, account);
@@ -151,6 +153,8 @@ abstract contract AccessControl is Context, IAccessControl, ERC165 {
* Requirements:
*
* - the caller must have ``role``'s admin role.
+ *
+ * May emit a {RoleRevoked} event.
*/
function revokeRole(bytes32 role, address account) public virtual override onlyRole(getRoleAdmin(role)) {
_revokeRole(role, account);
@@ -169,6 +173,8 @@ abstract contract AccessControl is Context, IAccessControl, ERC165 {
* Requirements:
*
* - the caller must be `account`.
+ *
+ * May emit a {RoleRevoked} event.
*/
function renounceRole(bytes32 role, address account) public virtual override {
require(account == _msgSender(), ""AccessControl: can only renounce roles for self"");
@@ -183,6 +189,8 @@ abstract contract AccessControl is Context, IAccessControl, ERC165 {
* event. Note that unlike {grantRole}, this function doesn't perform any
* checks on the calling account.
*
+ * May emit a {RoleGranted} event.
+ *
* [WARNING]
* ====
* This function should only be called from the constructor when setting
@@ -213,6 +221,8 @@ abstract contract AccessControl is Context, IAccessControl, ERC165 {
* @dev Grants `role` to `account`.
*
* Internal function without access restriction.
+ *
+ * May emit a {RoleGranted} event.
*/
function _grantRole(bytes32 role, address account) internal virtual {
if (!hasRole(role, account)) {
@@ -225,6 +235,8 @@ abstract contract AccessControl is Context, IAccessControl, ERC165 {
* @dev Revokes `role` from `account`.
*
* Internal function without access restriction.
+ *
+ * May emit a {RoleRevoked} event.
*/
function _revokeRole(bytes32 role, address account) internal virtual {
if (hasRole(role, account)) {
",0
"diff --git a/contracts/token/ERC20/extensions/ERC4626.sol b/contracts/token/ERC20/extensions/ERC4626.sol @@ -16,6 +16,10 @@ import ""../../../utils/math/Math.sol"";
* the ERC20 standard. Any additional extensions included along it would affect the ""shares"" token represented by this
* contract and not the ""assets"" token which is an independent contract.
*
+ * CAUTION: Deposits and withdrawals may incur unexpected slippage. Users should verify that the amount received of
+ * shares or assets is as expected. EOAs should operate through a wrapper that performs these checks such as
+ * https://github.com/fei-protocol/ERC4626#erc4626router-and-base[ERC4626Router].
+ *
* _Available since v4.7._
*/
abstract contract ERC4626 is ERC20, IERC4626 {
",0
"diff --git a/README.md b/README.md [![Docs](https://img.shields.io/badge/docs-%F0%9F%93%84-blue)](https://docs.openzeppelin.com/contracts)
[![NPM Package](https://img.shields.io/npm/v/@openzeppelin/contracts.svg)](https://www.npmjs.org/package/@openzeppelin/contracts)
[![Coverage Status](https://codecov.io/gh/OpenZeppelin/openzeppelin-contracts/graph/badge.svg)](https://codecov.io/gh/OpenZeppelin/openzeppelin-contracts)
+[![gitpoap badge](https://public-api.gitpoap.io/v1/repo/OpenZeppelin/openzeppelin-contracts/badge)](https://www.gitpoap.io/gh/OpenZeppelin/openzeppelin-contracts)
**A library for secure smart contract development.** Build on a solid foundation of community-vetted code.
",0
"diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml @@ -13,6 +13,19 @@ concurrency:
cancel-in-progress: true
jobs:
+ changelog:
+ if: github.event_name == 'pull_request' && github.repository != 'OpenZeppelin/openzeppelin-contracts-upgradeable'
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - name: Check diff
+ run: |
+ git fetch origin ${{ github.base_ref }} --depth=1
+ if git diff --exit-code origin/${{ github.base_ref }} -- CHANGELOG.md ; then
+ echo 'Missing changelog entry'
+ exit 1
+ fi
+
lint:
if: github.repository != 'OpenZeppelin/openzeppelin-contracts-upgradeable'
runs-on: ubuntu-latest
",0
"diff --git a/docs/modules/ROOT/pages/extending-contracts.adoc b/docs/modules/ROOT/pages/extending-contracts.adoc @@ -129,3 +129,8 @@ contract MyToken is ERC20 {
```
That's it! Enjoy simpler code using hooks!
+== Security
+
+The maintainers of OpenZeppelin Contracts are mainly concerned with the correctness and security of the code as published in the library, and the combinations of base contracts with the official extensions from the library.
+
+Custom overrides, and those of hooks in particular, may break some important assumptions and introduce vulnerabilities in otherwise secure code. While we try to ensure the contracts remain secure in the face of a wide range of potential customizations, this is done in a best-effort manner. Similarly, while we try to document all important assumptions, this should not be relied upon. Custom overrides should be carefully reviewed and checked against the source code of the contract they are customizing so as to fully understand their impact and guarantee their security.
",0
"diff --git a/contracts/utils/Arrays.sol b/contracts/utils/Arrays.sol @@ -56,6 +56,9 @@ library Arrays {
*/
function unsafeAccess(address[] storage arr, uint256 pos) internal pure returns (StorageSlot.AddressSlot storage) {
bytes32 slot;
+ // We use assembly to calculate the storage slot of the element at index `pos` of the dynamic array `arr`
+ // following https://docs.soliditylang.org/en/v0.8.17/internals/layout_in_storage.html#mappings-and-dynamic-arrays.
+
/// @solidity memory-safe-assembly
assembly {
mstore(0, arr.slot)
@@ -71,6 +74,9 @@ library Arrays {
*/
function unsafeAccess(bytes32[] storage arr, uint256 pos) internal pure returns (StorageSlot.Bytes32Slot storage) {
bytes32 slot;
+ // We use assembly to calculate the storage slot of the element at index `pos` of the dynamic array `arr`
+ // following https://docs.soliditylang.org/en/v0.8.17/internals/layout_in_storage.html#mappings-and-dynamic-arrays.
+
/// @solidity memory-safe-assembly
assembly {
mstore(0, arr.slot)
@@ -86,6 +92,9 @@ library Arrays {
*/
function unsafeAccess(uint256[] storage arr, uint256 pos) internal pure returns (StorageSlot.Uint256Slot storage) {
bytes32 slot;
+ // We use assembly to calculate the storage slot of the element at index `pos` of the dynamic array `arr`
+ // following https://docs.soliditylang.org/en/v0.8.17/internals/layout_in_storage.html#mappings-and-dynamic-arrays.
+
/// @solidity memory-safe-assembly
assembly {
mstore(0, arr.slot)
",0
"diff --git a/test/token/ERC1155/extensions/ERC1155URIStorage.test.js b/test/token/ERC1155/extensions/ERC1155URIStorage.test.js @@ -17,7 +17,7 @@ contract(['ERC1155URIStorage'], function (accounts) {
describe('with base uri set', function () {
beforeEach(async function () {
this.token = await ERC1155URIStorageMock.new(erc1155Uri);
- this.token.setBaseURI(baseUri);
+ await this.token.setBaseURI(baseUri);
await this.token.mint(holder, tokenId, amount, '0x');
});
",0
"diff --git a/test/token/ERC20/extensions/ERC4626.t.sol b/test/token/ERC20/extensions/ERC4626.t.sol @@ -3,6 +3,7 @@ pragma solidity ^0.8.0;
import ""erc4626-tests/ERC4626.test.sol"";
+import {SafeCast} from ""../../../../contracts/utils/math/SafeCast.sol"";
import {ERC20Mock} from ""../../../../contracts/mocks/ERC20Mock.sol"";
import {ERC4626Mock, IERC20Metadata} from ""../../../../contracts/mocks/ERC4626Mock.sol"";
@@ -14,4 +15,22 @@ contract ERC4626StdTest is ERC4626Test {
_vaultMayBeEmpty = false;
_unlimitedAmount = true;
}
+
+ // solhint-disable-next-line func-name-mixedcase
+ function test_RT_mint_withdraw(ERC4626Test.Init memory init, uint256 shares) public override {
+ // There is an edge case where we currently behave different than the property tests,
+ // when all assets are lost to negative yield.
+
+ // Sum all initially deposited assets.
+ int256 initAssets = 0;
+ for (uint256 i = 0; i < init.share.length; i++) {
+ vm.assume(init.share[i] <= uint256(type(int256).max - initAssets));
+ initAssets += SafeCast.toInt256(init.share[i]);
+ }
+
+ // Reject tests where the yield loses all assets from the vault.
+ vm.assume(init.yield > -initAssets);
+
+ super.test_RT_mint_withdraw(init, shares);
+ }
}
",0
"diff --git a/contracts/utils/Address.sol b/contracts/utils/Address.sol @@ -22,6 +22,10 @@ library Address {
* - a contract in construction
* - an address where a contract will be created
* - an address where a contract lived, but was destroyed
+ *
+ * Furthermore, `isContract` will also return true if the target contract within
+ * the same transaction is already scheduled for destruction by `SELFDESTRUCT`,
+ * which only has an effect at the end of a transaction.
* ====
*
* [IMPORTANT]
",0
"diff --git a/renovate.json b/renovate.json {
- ""extends"": [
- ""github>OpenZeppelin/configs""
- ],
- ""packageRules"": [
- {
- ""extends"": [""packages:eslint""],
- ""enabled"": false
- }
- ]
+ ""extends"": [""github>OpenZeppelin/configs""],
+ ""labels"": [""ignore-changelog""]
}
",0
"diff --git a/docs/modules/ROOT/pages/extending-contracts.adoc b/docs/modules/ROOT/pages/extending-contracts.adoc @@ -126,4 +126,6 @@ That's it! Enjoy simpler code using hooks!
The maintainers of OpenZeppelin Contracts are mainly concerned with the correctness and security of the code as published in the library, and the combinations of base contracts with the official extensions from the library.
-Custom overrides, and those of hooks in particular, may break some important assumptions and introduce vulnerabilities in otherwise secure code. While we try to ensure the contracts remain secure in the face of a wide range of potential customizations, this is done in a best-effort manner. Similarly, while we try to document all important assumptions, this should not be relied upon. Custom overrides should be carefully reviewed and checked against the source code of the contract they are customizing so as to fully understand their impact and guarantee their security.
+Custom overrides, and those of hooks in particular, may break some important assumptions and introduce vulnerabilities in otherwise secure code. While we try to ensure the contracts remain secure in the face of a wide range of potential customizations, this is done in a best-effort manner. While we try to document all important assumptions, this should not be relied upon. Custom overrides should be carefully reviewed and checked against the source code of the contract they are customizing so as to fully understand their impact and guarantee their security.
+
+The way functions interact internally should not be assumed to stay stable across releases of the library. For example, a function that is used in one context in a particular release may not be used in the same context in the next release. Contracts that override functions should revalidate their assumptions when updating the version of OpenZeppelin Contracts they are built on.
",0
"diff --git a/GUIDELINES.md b/GUIDELINES.md @@ -62,6 +62,20 @@ Some other examples of automation are:
- Looking for common security vulnerabilities or errors in our code (eg. reentrancy analysis).
- Keeping dependencies up to date and monitoring for vulnerable dependencies.
+## Pull requests
+
+Pull requests are squash-merged to keep the `master` branch history clean. The title of the pull request becomes the commit message, so it should be written in a consistent format:
+
+1) Begin with a capital letter.
+2) Do not end with a period.
+3) Write in the imperative: ""Add feature X"" and not ""Adds feature X"" or ""Added feature X"".
+
+This repository does not follow conventional commits, so do not prefix the title with ""fix:"" or ""feat:"".
+
+Work in progress pull requests should be submitted as Drafts and should not be prefixed with ""WIP:"".
+
+Branch names don't matter, and commit messages within a pull request mostly don't matter either, although they can help the review process.
+
# Solidity Conventions
In addition to the official Solidity Style Guide we have a number of other conventions that must be followed.
",0
"diff --git a/src/fetch/fetch.js b/src/fetch/fetch.js @@ -115,3 +115,18 @@ export function syncCatalog(catalogId) {
if (!catalogId) return Promise.reject(new Error('catalogId is required'))
return superRequest(`https://inspire.data.gouv.fr/api/geogw/services/${catalogId}/sync`, 'POST')
}
+
+export function dissociateProducer(producerId, organizationId) {
+ if (!producerId && organizationId) return Promise.reject(new Error('producerId and organizationId is required'))
+ const url = `https://inspire.data.gouv.fr/dgv/api/organizations/${organizationId}/producers/${producerId}`
+
+ return superRequest(url, 'DELETE')
+}
+
+export function associateProducer(producerId, organizationId) {
+ if (!producerId && organizationId) return Promise.reject(new Error('producerId and organizationId is required'))
+ const url = `https://inspire.data.gouv.fr/dgv/api/organizations/${organizationId}/producers`
+ const params = { '_id': producerId, 'associatedTo': organizationId }
+
+ return superRequest(url, 'POST', params)
+}
",0
"diff --git a/src/modules/Datasets/components/DatasetTable/DatasetTable.css b/src/modules/Datasets/components/DatasetTable/DatasetTable.css +@import ""../../../../theme/colors"";
+
.table table {
margin: 10px;
}
.table th, .table td {
text-align: center;
- padding: 5px;
+ padding: 7px;
}
/* PAGINATION */
.table a {
padding: 10px;
- background-color: #fff;
- margin: 8px;
}
.table a.reactable-current-page {
- background-color: #d0ebf5;
+ color: #fff;
+ background-color: var(--blue);
+}
+
+.table a:hover {
+ color: #fff;
+ background-color: var(--blue);
}
",0
"diff --git a/src/modules/Datasets/components/Datasets/Datasets.js b/src/modules/Datasets/components/Datasets/Datasets.js @@ -77,6 +77,8 @@ class Datasets extends Component {
const page = (offset / limit) + 1
const changes = { page, offset }
+ window.scrollTo(0, 0);
+
this.setState(changes, () => {
this.search(changes)
})
",0
"diff --git a/src/modules/Publication/components/Layout/Layout.js b/src/modules/Publication/components/Layout/Layout.js @@ -9,6 +9,7 @@ import styles from './Layout.css'
function Layout({ user, organization, pageTitle, title, children }) {
if (!user) return null
+ const organizationLogo = !organization.logo ? organization.logo : 'https://upload.wikimedia.org/wikipedia/commons/thumb/e/e6/Pas_d\'image_disponible.svg/200px-Pas_d\'image_disponible.svg.png'
return (
<DocumentTitle title={pageTitle}>
@@ -16,7 +17,7 @@ function Layout({ user, organization, pageTitle, title, children }) {
<User user={user}/>
{organization ?
<Link to={`/publication/${organization.id}`}>
- <img className={styles.organizationLogo} alt=""organization logo"" src={organization.logo}></img>
+ <img className={styles.organizationLogo} alt=""organization logo"" src={organizationLogo}></img>
</Link> :
null
}
",0
"diff --git a/src/modules/Datasets/components/DatasetSection/__test__/DatasetSection.test.js b/src/modules/Datasets/components/DatasetSection/__test__/DatasetSection.test.js @@ -35,6 +35,10 @@ describe('<DatasetSection />', () => {
it('should display lineage', () => {
expect(wrapper.contains(datasetMock.metadata.lineage)).to.be.true
})
+
+ it('should display purpose', () => {
+ expect(wrapper.contains(datasetMock.metadata.purpose)).to.be.true
+ })
})
describe('When metadata are undefined', () => {
",0
"diff --git a/src/modules/Events/pages/Events/Events.js b/src/modules/Events/pages/Events/Events.js @@ -8,9 +8,9 @@ import PastEvent from '../../../../components/Event/PastEvent'
import { events, eventsList, pastEventsList } from './Events.css'
const pastEvents = [
- {name: 'Atelier #1', date: '06/10/2016', link: 'https://github.com/sgmap/inspire/files/838072/1489399578890.pdf'},
- {name: 'Atelier #3', date: '09/02/2017', link: 'https://github.com/sgmap/inspire/files/838076/Synthese.atelier.3.pdf'},
- {name: 'Atelier #4', date: '09/03/2017', link: ''},
+ {name: 'Atelier #1', date: '06/10/2016', link: '/assets/ateliers/synthese_atelier_1.pdf'},
+ {name: 'Atelier #3', date: '09/02/2017', link: '/assets/ateliers/synthese_atelier_3.pdf'},
+ {name: 'Atelier #4', date: '09/03/2017', link: '/assets/ateliers/synthese_atelier_4.pdf'},
]
const Events = () => {
",0
"diff --git a/src/routes/Search/components/SearchPage/SearchPage.js b/src/routes/Search/components/SearchPage/SearchPage.js import React from 'react'
+import PropTypes from 'prop-types'
import DocumentTitle from 'react-document-title'
import { unionWith, isEqual } from 'lodash'
@@ -11,7 +12,28 @@ import SearchResults from '../SearchResults'
import styles from './SearchPage.scss'
-class SearchPage extends React.Component {
+class SearchPage extends React.PureComponent {
+ static propTypes = {
+ query: PropTypes.shape({
+ textInput: PropTypes.string,
+ page: PropTypes.number.isRequired,
+ filters: PropTypes.array.isRequired
+ }).isRequired,
+
+ search: PropTypes.shape({
+ pending: PropTypes.bool.isRequired,
+ error: PropTypes.oneOfType([
+ PropTypes.object,
+ PropTypes.bool
+ ]).isRequired,
+ query: PropTypes.object.isRequired,
+ results: PropTypes.array.isRequired,
+ facets: PropTypes.object.isRequired
+ }).isRequired,
+
+ update: PropTypes.func.isRequired
+ }
+
addFilter = filter => {
const { update, query } = this.props
",0
"diff --git a/src/routes/Dataset/components/DatasetView/DatasetView.js b/src/routes/Dataset/components/DatasetView/DatasetView.js @@ -102,6 +102,14 @@ class DatasetView extends React.PureComponent {
<DatasetBlock title='Contacts'>
<DatasetContactList contacts={dataset.metadata.contacts} />
</DatasetBlock>
+
+ {dataset.metadata.credit && (
+ <DatasetBlock title='Contributions'>
+ <div>
+ {dataset.metadata.credit}
+ </div>
+ </DatasetBlock>
+ )}
</div>
</div>
</div>
",0
"diff --git a/build/webpack.config.js b/build/webpack.config.js @@ -224,7 +224,13 @@ if (!__TEST__) {
bundles.unshift('vendor')
config.entry.vendor = project.vendors
}
+
config.plugins.push(new webpack.optimize.CommonsChunkPlugin({ names: bundles }))
+ config.plugins.push(new webpack.optimize.CommonsChunkPlugin({
+ name: 'app',
+ async: 'common',
+ minChunks: 2
+ }))
}
// Production Optimizations
",0
"diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -80,6 +80,7 @@ jobs:
path: reports/tests/
- store_artifacts:
+ name: Store coverage artifacts
path: coverage/
- run:
@@ -109,6 +110,7 @@ jobs:
- reports/
- store_artifacts:
+ name: Store build report artifacts
path: reports/
- persist_to_workspace:
",0
"diff --git a/package.json b/package.json ""compile"": ""node build/scripts/compile"",
""build"": ""npm run clean && cross-env NODE_ENV=production npm run compile"",
""test"": ""cross-env NODE_ENV=test mocha -r build/tests/bootstrap.js -r ignore-styles src/**/*.test.js"",
- ""test:ci"": ""cross-env NODE_ENV=test MOCHA_FILE=reports/tests/results.xml nyc mocha -r build/tests/bootstrap.js -r ignore-styles --reporter mocha-circleci-reporter src/**/*.test.js"",
+ ""test:ci"": ""cross-env NODE_ENV=test MOCHA_FILE=reports/tests/geodatagouv/results.xml nyc mocha -r build/tests/bootstrap.js -r ignore-styles --reporter mocha-circleci-reporter src/**/*.test.js"",
""codecov"": ""codecov -f coverage/coverage-final.json"",
""deploy"": ""gh-pages -d dist"",
""lint"": ""npm run lint:scripts && npm run lint:styles"",
",0
"diff --git a/src/routes/Dataset/components/DatasetDownloadList/DatasetDownloadList.js b/src/routes/Dataset/components/DatasetDownloadList/DatasetDownloadList.js @@ -19,6 +19,8 @@ class DatasetDownloadList extends React.PureComponent {
t: PropTypes.func.isRequired
}
+ state = {}
+
setPreview = ({ distribution, link }) => {
const { fetchGeoJson } = this.props
",0
"diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -140,6 +140,14 @@ jobs:
name: Setup SSH to GitHub
command: mkdir ~/.ssh && ssh-keyscan github.com > ~/.ssh/known_hosts
+ - run:
+ name: Set SSH user email
+ command: git config --global user.email ""infra@beta.gouv.fr""
+
+ - run:
+ name: Set SSH user name
+ command: git config --global user.name ""Deployment Bot""
+
- deploy:
name: Deploy to gh-pages branch on GitHub
command: yarn deploy
",0
"diff --git a/.gitignore b/.gitignore @@ -8,6 +8,7 @@ pids
logs
*.log
npm-debug.log*
+CHANGELOG.md
# Mac
*.DS_Store
",0
"diff --git a/pages/_error.js b/pages/_error.js @@ -30,7 +30,7 @@ class ErrorPage extends React.Component {
<Page>
<Meta title={t('errors.title', { code: statusCode })} description={message} />
- <Content>
+ <Content clouds>
<div>
{statusCode ? <h1>{statusCode}</h1> : null}
<h2>{message}</h2>
@@ -43,7 +43,7 @@ class ErrorPage extends React.Component {
flex: 1;
align-items: center;
justify-content: center;
- margin: 5em 0 3em;
+ margin: 7em 0 2em;
}
h1 {
",0
"diff --git a/components/catalog-preview.js b/components/catalog-preview.js import React from 'react'
import PropTypes from 'prop-types'
+import moment from 'moment'
import { translate } from 'react-i18next'
import { get } from 'lodash'
@@ -8,7 +9,11 @@ import HarvestStatus from './harvest-status'
import Counter from './counter'
import Percent from './percent'
-// import ObsoleteWarning from './ObsoleteWarning'
+const isObsolete = (catalog) => {
+ const revisionDate = get(catalog, 'metrics.mostRecentRevisionDate')
+
+ return revisionDate && moment().subtract(6, 'months').isAfter(revisionDate)
+}
export const CatalogPreview = ({ catalog, t }) => {
let metrics = catalog.metrics
@@ -18,11 +23,20 @@ export const CatalogPreview = ({ catalog, t }) => {
return (
<Link href={`/catalog?id=${catalog._id}`} as={`/catalogs/${catalog._id}`}>
<a>
- <div className='title' title={catalog.name}>
+ <div className='title'>
+ {isObsolete(catalog) && (
+ <img
+ src='/static/images/icons/warning.svg'
+ title={t('components.ObsoleteWarning.obsoleteCatalog')}
+ alt={t('components.ObsoleteWarning.obsoleteCatalog')}
+ />
+ )}
+
+ <span title={catalog.name}>
{catalog.name}
+ </span>
</div>
<HarvestStatus harvest={catalog.service.sync} />
- {/* <ObsoleteWarning catalog={catalog} /> */}
<div className='metrics'>
{!metrics ? <div>{t('components.CatalogPreview.noData')}</div> : (
@@ -52,7 +66,7 @@ export const CatalogPreview = ({ catalog, t }) => {
a {
display: block;
- padding: 1.4em 2em;
+ padding: 16px 22px;
text-align: left;
position: relative;
width: 360px;
@@ -67,6 +81,13 @@ export const CatalogPreview = ({ catalog, t }) => {
}
}
+ img {
+ height: 23px;
+ display: inline-block;
+ vertical-align: bottom;
+ margin-right: 5px;
+ }
+
.title {
font-size: 1.4em;
line-height: 1.2em;
",0
"diff --git a/pages/_error.js b/pages/_error.js @@ -9,7 +9,7 @@ import Content from '../components/content'
class ErrorPage extends React.Component {
static propTypes = {
- statusCode: PropTypes.number.isRequired,
+ code: PropTypes.number,
i18n: PropTypes.shape({
exists: PropTypes.func.isRequired
}).isRequired,
@@ -17,22 +17,23 @@ class ErrorPage extends React.Component {
}
static getInitialProps ({ res, err }) {
- const statusCode = res ? res.statusCode : (err ? err.statusCode : null)
- return { statusCode }
+ const code = res ? res.statusCode : (err ? err.statusCode : null)
+
+ return { code }
}
render() {
- const { statusCode, i18n, t } = this.props
+ const { code, i18n, t } = this.props
- const message = i18n.exists(`errors.${statusCode}`) ? t(`errors.${statusCode}`) : t('errors.unknown')
+ const message = i18n.exists(`errors.${code}`) ? t(`errors.${code}`) : t('errors.unknown')
return (
<Page>
- <Meta title={t('errors.title', { code: statusCode })} description={message} />
+ <Meta title={t('errors.title', { code })} description={message} />
<Content clouds>
<div>
- {statusCode ? <h1>{statusCode}</h1> : null}
+ <h1>{t('errors.title', { code })}</h1>
<h2>{message}</h2>
</div>
</Content>
",0
"diff --git a/components/facet.js b/components/facet.js @@ -9,10 +9,10 @@ const Facet = ({ facet, count, detailed, remove, onClick, t, i18n }) => {
return (
<div className='container'>
<div className={`facet ${remove && 'remove'}`} onClick={onClick && (() => onClick(facet))}>
- {detailed && <span className='title'>{title}</span>}
- <span>{value}</span>
+ {detailed && <div className='title'>{title}</div>}
+ <div className='value'>{value}</div>
</div>
- {count && <span className='number'>&times; {count}</span>}
+ {count && <div className='number'>&times; {count}</div>}
<style jsx>{`
@import 'colors';
@@ -22,6 +22,7 @@ const Facet = ({ facet, count, detailed, remove, onClick, t, i18n }) => {
}
.facet {
+ display: flex;
flex: 1;
background: $lightgrey;
border-radius: 3px 0 0 3px;
@@ -75,7 +76,6 @@ const Facet = ({ facet, count, detailed, remove, onClick, t, i18n }) => {
}
.title {
- display: inline-block;
line-height: 26px;
height: 26px;
margin-right: 7px;
@@ -84,11 +84,21 @@ const Facet = ({ facet, count, detailed, remove, onClick, t, i18n }) => {
font-variant: small-caps;
}
+ .value {
+ max-width: 240px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+
+ .title + .value {
+ max-width: 160px;
+ }
+
.number {
- display: inline-block;
line-height: 26px;
height: 26px;
- margin-left: 6px;
+ margin-left: 5px;
}
`}</style>
</div>
",0
"diff --git a/pages/search.js b/pages/search.js @@ -65,7 +65,7 @@ class SearchPage extends React.Component {
<Content>
<Container fluid>
<div className='main'>
- <div>
+ <div className='search'>
<SearchInput hasButton />
<ActiveFacets facets={query.facets} />
<Count count={count} />
@@ -84,6 +84,10 @@ class SearchPage extends React.Component {
display: flex;
}
+ .search {
+ flex: 1;
+ }
+
.facets {
margin-left: 2em;
flex-basis: 300px;
",0
"diff --git a/components/search/facets.js b/components/search/facets.js @@ -84,7 +84,7 @@ class Facets extends React.Component {
right: 0;
background: #fff;
box-shadow: -2px 0 2px rgba(0, 0, 0, 0.2);
- padding: 1em 1em 1em 1.5em;
+ padding: 2em 1em 2em 1.5em;
}
}
",0
"diff --git a/components/catalog/statistics.js b/components/catalog/statistics.js @@ -26,24 +26,6 @@ const Statistics = ({ metrics, t }) => {
/>
</div>
- <div className='block'>
- <h3>
- {t('details.statistics.recordTypeChart')}
- </h3>
- <div>
- <Chart data={metrics.records.partitions.recordType} />
- </div>
- </div>
-
- <div className='block'>
- <h3>
- {t('details.statistics.metadataTypeChart')}
- </h3>
- <div>
- <Chart data={metrics.records.partitions.metadataType} />
- </div>
- </div>
-
<div className='block'>
<h3>
{t('details.statistics.openDataPercent')}
@@ -66,6 +48,24 @@ const Statistics = ({ metrics, t }) => {
/>
</div>
+ <div className='block'>
+ <h3>
+ {t('details.statistics.recordTypeChart')}
+ </h3>
+ <div>
+ <Chart data={metrics.records.partitions.recordType} />
+ </div>
+ </div>
+
+ <div className='block'>
+ <h3>
+ {t('details.statistics.metadataTypeChart')}
+ </h3>
+ <div>
+ <Chart data={metrics.records.partitions.metadataType} />
+ </div>
+ </div>
+
<div className='block'>
<h3>
{t('details.statistics.dataTypeChart')}
@@ -82,10 +82,6 @@ const Statistics = ({ metrics, t }) => {
display: flex;
flex-wrap: wrap;
margin: 1em -0.6em 0 -0.6em;
-
- @media (max-width: 551px) {
- flex-direction: column;
- }
}
.block {
@@ -94,13 +90,21 @@ const Statistics = ({ metrics, t }) => {
justify-content: center;
flex-direction: column;
height: 200px;
- border: 1px solid $lightgrey;
padding: 2em;
+ border: 1px solid $lightgrey;
border-radius: 2px;
margin: 0 0.6em 1em 0.6em;
- flex: 1 1 31%;
text-align: center;
max-width: calc(100% - 1.2em);
+ width: calc(33.33% - 1.2em);
+
+ @media (max-width: 960px) {
+ width: calc(50% - 1.2em);
+ }
+
+ @media (max-width: 768px) {
+ width: calc(100% - 1.2em);
+ }
div {
display: flex;
",0
"diff --git a/components/catalog/harvests/table.js b/components/catalog/harvests/table.js @@ -75,7 +75,12 @@ Table.propTypes = {
})).isRequired,
catalog: PropTypes.shape({
- _id: PropTypes.string.isRequired
+ _id: PropTypes.string.isRequired,
+ service: PropTypes.shape({
+ sync: PropTypes.shape({
+ pending: PropTypes.bool.isRequired
+ }).isRequired
+ }).isRequired
}).isRequired,
t: PropTypes.func.isRequired
",0
"diff --git a/pages/_error.js b/pages/_error.js @@ -6,6 +6,7 @@ import withI18n from '../components/hoc/with-i18n'
import Page from '../components/page'
import Meta from '../components/meta'
import Content from '../components/content'
+import Box from '../components/box'
class ErrorPage extends React.Component {
static propTypes = {
@@ -33,8 +34,12 @@ class ErrorPage extends React.Component {
<Content clouds>
<div>
+ <Box>
+ <section>
<h1>{t('errors.title', { code })}</h1>
<h2>{message}</h2>
+ </section>
+ </Box>
</div>
</Content>
@@ -51,6 +56,15 @@ class ErrorPage extends React.Component {
}
}
+ section {
+ padding: 10px;
+
+ @media (min-width: 552px) {
+ display: flex;
+ align-items: center;
+ }
+ }
+
h1 {
font-size: 24px;
fontWeight: 500;
",0
"diff --git a/components/page/footer/index.js b/components/page/footer/index.js @@ -11,7 +11,7 @@ const Footer = ({ t }) => (
<Container>
<div className='content'>
<div>
- <img src='/static/images/etalab.png' />
+ <img src='/static/images/etalab.png' alt='Etalab' />
<Social />
</div>
<Sitemap />
",0
"diff --git a/components/dataset/downloads/dataset-download.js b/components/dataset/downloads/dataset-download.js @@ -5,6 +5,7 @@ import strRightBack from 'underscore.string/strRightBack'
import DownloadIcon from 'react-icons/lib/fa/download'
import PreviewIcon from 'react-icons/lib/fa/eye'
+import FailIcon from 'react-icons/lib/fa/close'
import formats from '../../../lib/formats'
@@ -27,54 +28,89 @@ export const DatasetDownload = ({ distribution, t }) => {
const name = layerName || distribution.typeName
return (
- <div className='container'>
- <h5>{name}</h5>
+ <div>
{distribution.available ? (
- <div className='distributions'>
+ <div className='container'>
+ <div className='main'>
+ <div className='download-icon'>
+ <DownloadIcon />
+ </div>
+ <div>
+ <b>{name}</b>
{formats.map(format => (
- <div key={format.label}>
+ <div key={format.label} className='download'>
<Button href={`${link}?format=${format.format}&projection=${format.projection}`} download>
- <DownloadIcon /> {format.label}
+ {format.label}
</Button>
</div>
))}
-
+ </div>
+ </div>
<div className='preview'>
<Button>
<PreviewIcon style={{ verticalAlign: -2 }} /> {t('downloads.openPreview')}
</Button>
</div>
</div>
- ) : t('downloads.unavailable')}
+ ) : (
+ <div className='container'>
+ <div className='fail-icon'>
+ <FailIcon />
+ </div>
+ <div>
+ <b>{name}</b>
+ {t('downloads.unavailable')}
+ </div>
+ </div>
+ )}
<style jsx>{`
@import 'colors';
.container {
- border-left: 2px solid $blue;
- padding-left: 0.5em;
+ display: flex;
+ flex-wrap: wrap;
}
- h5 {
- margin: 0;
+ .main {
+ display: flex;
}
- .distributions {
- display: flex;
- flex-wrap: wrap;
+ .download-icon {
+ font-size: 4.51em;
+ color: $blue;
+ opacity: 0.2;
+ margin-right: 10px;
+ }
- div {
+ .fail-icon {
+ font-size: 4.51em;
+ color: $red;
+ opacity: 0.2;
+ margin-right: 10px;
+ margin-top: -12px;
+ }
+
+ b {
+ display: block;
+ margin-bottom: 2px;
+ overflow-wrap: break-word;
+ word-wrap: break-word;
+ word-break: break-word;
+ }
+
+ .download {
+ display: inline-block;
margin: 5px 5px 0 0;
}
.preview {
margin: 5px 0 0 auto;
- @media (max-width: 768px) {
+ @media (max-width: 1180px) {
flex: 1 1 100%;
}
}
- }
`}</style>
</div>
)
",0
"diff --git a/locales/en/common.json b/locales/en/common.json ""enums"": {
""dataTypes"": {
- ""dataset"": ""dataset""
+ ""dataset"": ""dataset"",
+ ""nonGeographicDataset"": ""non-geographic dataset""
},
""frequencies"": {
",0
"diff --git a/components/content.js b/components/content.js @@ -2,7 +2,7 @@ import React from 'react'
import PropTypes from 'prop-types'
const Content = ({ children, clouds }) => (
- <main>
+ <main className={clouds ? 'clouds' : ''}>
{children}
<style jsx>{`
@@ -14,12 +14,12 @@ const Content = ({ children, clouds }) => (
display: flex;
flex-direction: column;
flex: 1;
+ }
- ${clouds && (`
+ .clouds {
background: url('/static/images/clouds.svg') bottom -69px left 0, linear-gradient(to top, #41dcd7, #3083b2);
background-repeat: no-repeat;
background-size: 1920px;
- `)}
}
`}</style>
</main>
",0
"diff --git a/components/dataset/downloads/preview.js b/components/dataset/downloads/preview.js @@ -3,9 +3,13 @@ import PropTypes from 'prop-types'
import dynamic from 'next/dynamic'
import { translate } from 'react-i18next'
+import MapIcon from 'react-icons/lib/fa/map'
+import TableIcon from 'react-icons/lib/fa/table'
+
import { _get } from '../../../lib/fetch'
import Modal from '../../modal'
+import Button from '../../button'
const CenteredMap = dynamic(import('../../centered-map'), {
ssr: false,
@@ -22,7 +26,8 @@ class Preview extends React.Component {
state = {
loading: true,
- data: null
+ data: null,
+ view: 'map'
}
async componentDidMount() {
@@ -36,15 +41,38 @@ class Preview extends React.Component {
}))
}
+ changeView = view => () => {
+ this.setState(() => ({
+ view
+ }))
+ }
+
render() {
const { onClose, t } = this.props
- const { loading, data } = this.state
+ const { loading, data, view } = this.state
return (
<Modal fluid onClose={onClose}>
{loading ? t('common:loading') : (
<div className='preview'>
+ <div className='actions'>
+ <Button
+ size='large'
+ color={view === 'map' ? 'blue' : 'white'}
+ onClick={this.changeView('map')}
+ >
+ <MapIcon />
+ </Button>
+ <Button
+ size='large'
+ color={view === 'table' ? 'blue' : 'white'}
+ onClick={this.changeView('table')}
+ >
+ <TableIcon />
+ </Button>
+ </div>
<div className='map-wrapper'>
+ {view === 'map' ? (
<div className='map'>
<CenteredMap
vectors={data}
@@ -53,6 +81,9 @@ class Preview extends React.Component {
zoom={5.5}
/>
</div>
+ ) : (
+ 'table'
+ )}
</div>
</div>
)}
@@ -74,6 +105,13 @@ class Preview extends React.Component {
height: 100%;
width: 100%;
}
+
+ .actions {
+ :global(button) {
+ margin-right: 7px;
+ margin-bottom: 10px;
+ }
+ }
`}</style>
</Modal>
)
",0
"diff --git a/pages/dataset.js b/pages/dataset.js @@ -35,7 +35,9 @@ class DatasetPage extends React.Component {
metadata: PropTypes.shape({
id: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
- thumbnails: PropTypes.array,
+ thumbnails: PropTypes.arrayOf(PropTypes.shape({
+ originalUrlHash: PropTypes.string.isRequired
+ })),
spatialExtent: PropTypes.object,
equivalentScaleDenominator: PropTypes.number,
spatialResolution: PropTypes.object,
@@ -109,7 +111,13 @@ class DatasetPage extends React.Component {
return (
<Page>
- <Meta title={metadata.title} />
+ <Meta
+ title={metadata.title}
+ description={metadata.description}
+ images={hasThumbnails && metadata.thumbnails.map(
+ thumbnail => `${GEODATA_API_URL}/records/${recordId}/thumbnails/${thumbnail.originalUrlHash}`
+ )}
+ />
<Content clouds>
<Container fluid>
",0
"diff --git a/components/dataset/downloads/preview.js b/components/dataset/downloads/preview.js @@ -38,12 +38,19 @@ class Preview extends React.Component {
async componentDidMount() {
const { link } = this.props
+ try {
const data = await _get(`${link}?format=GeoJSON&projection=WGS84`)
- this.setState(() => ({
+ this.setState({
loading: false,
data
- }))
+ })
+ } catch (error) {
+ this.setState({
+ loading: false,
+ error
+ })
+ }
}
changeView = view => () => {
@@ -54,7 +61,7 @@ class Preview extends React.Component {
render() {
const { onClose, t } = this.props
- const { loading, data, view } = this.state
+ const { loading, data, view, error } = this.state
return (
<Modal fluid onClose={onClose}>
@@ -76,6 +83,8 @@ class Preview extends React.Component {
<TableIcon />
</Button>
</div>
+
+ {error ? <span className='error'>{t('preview.errors.download')}</span> : (
<div className='map-wrapper'>
{view === 'map' ? (
<div className='map'>
@@ -90,16 +99,23 @@ class Preview extends React.Component {
<PreviewTable data={data} />
)}
</div>
+ )}
</div>
)}
<style jsx>{`
+ @import 'colors';
+
.preview {
flex: 1;
display: flex;
flex-direction: column;
}
+ .error {
+ color: $red;
+ }
+
.map-wrapper {
flex: 1;
position: relative;
",0
"diff --git a/server/routes.js b/server/routes.js @@ -25,12 +25,33 @@ module.exports = app => {
})
})
- router.get('/publication/*', (req, res) => {
+ router.get('/publication', (req, res) => {
app.render(req, res, '/publication', {
...req.query
})
})
+ router.get('/publication/:oid/datasets', (req, res) => {
+ app.render(req, res, '/publication/datasets', {
+ ...req.query,
+ oid: req.params.oid
+ })
+ })
+
+ router.get('/publication/:oid/producers', (req, res) => {
+ app.render(req, res, '/publication/producers', {
+ ...req.query,
+ oid: req.params.oid
+ })
+ })
+
+ router.get('/publication/:oid', (req, res) => {
+ app.render(req, res, '/publication/organization', {
+ ...req.query,
+ oid: req.params.oid
+ })
+ })
+
router.get('*', (req, res) => {
app.render(req, res, req.params[0], req.query)
})
",0
"diff --git a/components/publication/header.js b/components/publication/header.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
import Link from '../link'
-const Header = ({ user }) => (
+const Header = ({ user, organization }) => (
<div className='container'>
<Link href='/publication'>
<a className='avatar'>
@@ -11,20 +11,36 @@ const Header = ({ user }) => (
</a>
</Link>
+ {organization && (
+ <Link href={`/publication/organization?oid=${organization.id}`} as={`/publication/${organization.id}`}>
+ <a className='organization'>
+ <img
+ src={organization.logo_thumbnail || '/static/images/no-img.png'}
+ alt={organization.name}
+ title={organization.name}
+ />
+ </a>
+ </Link>
+ )}
+
<div className='infos'>
+ <div>
<b>{user.first_name} {user.last_name}</b>
- <br />
+ </div>
+ <div>
{user.email}
</div>
+ </div>
<style jsx>{`
@import 'colors';
.container {
- padding: 1em;
+ padding: 1em 1.2em;
background-color: $lightgrey;
display: flex;
align-items: center;
border-radius: 2px;
+ position: relative;
}
a {
@@ -38,7 +54,27 @@ const Header = ({ user }) => (
justify-content: center;
overflow: hidden;
border-radius: 50%;
- border: 2px solid $white;
+ background-color: $white;
+ border: 2px solid transparent;
+
+ img {
+ height: 100%;
+ }
+ }
+
+ .organization {
+ position: absolute;
+ left: calc(1.2em + 70px);
+ bottom: 1em;
+ width: 50px;
+ height: 50px;
+ display: flex;
+ justify-content: center;
+ overflow: hidden;
+ border-radius: 50%;
+ background-color: $white;
+ border: 1px solid $darkblue;
+ box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.25);
img {
height: 100%;
@@ -46,7 +82,7 @@ const Header = ({ user }) => (
}
.infos {
- margin-left: 1em;
+ margin-left: 1.2em;
}
`}</style>
</div>
@@ -58,7 +94,13 @@ Header.propTypes = {
first_name: PropTypes.string.isRequired,
last_name: PropTypes.string.isRequired,
email: PropTypes.string.isRequired
- }).isRequired
+ }).isRequired,
+
+ organization:PropTypes.shape({
+ id: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired,
+ logo_thumbnail: PropTypes.string
+ })
}
export default Header
",0
"diff --git a/pages/publication/organization.js b/pages/publication/organization.js @@ -71,11 +71,11 @@ class PublicationPage extends React.Component {
<style jsx>{`
.dashboard {
display: grid;
- grid-template-columns: repeat(3, 1fr);
- grid-gap: 4em;
+ grid-template-columns: repeat(auto-fill, minmax(360px, 1fr));
+ grid-gap: 4em 5em;
@media (max-width: 1280px) {
- grid-gap: 2em;
+ grid-gap: 1em 2em;
}
@media (max-width: 768px) {
",0
"diff --git a/components/button.js b/components/button.js @@ -74,6 +74,17 @@ const Button = ({ children, type, size, color, href, disabled, block, ...props }
}
}
+ .red {
+ background-color: $red;
+ border-color: $red;
+ color: $white;
+
+ &:hover {
+ background-color: darken($red, 10%);
+ border-color: darken($red, 10%);
+ }
+ }
+
.white {
background-color: $white;
border-color: $blue;
@@ -99,6 +110,7 @@ Button.propTypes = {
]),
color: PropTypes.oneOf([
'blue',
+ 'red',
'white'
])
}
",0
"diff --git a/components/button.js b/components/button.js @@ -56,9 +56,8 @@ const Button = ({ children, type, size, color, href, disabled, block, ...props }
padding: 12px 16px;
a {
- display: block;
- margin: -12px -16px;
- padding: 12px 16px;
+ margin: -13px -17px;
+ padding: 13px 17px;
}
}
",0
"diff --git a/pages/publication/organization.js b/pages/publication/organization.js @@ -136,6 +136,8 @@ class PublicationPage extends React.Component {
render() {
return (
<Page>
+ <Meta title='Publication' />
+
<Content>
<Container fluid>
<RequireAuth
",0
"diff --git a/components/publication/organization/source-producers.js b/components/publication/organization/source-producers.js @@ -16,7 +16,7 @@ const SourceProducers = ({ organization }) => (
</ul>
</div>
- <Link href={`/publication/producers?oid=${organization._id}`} as={`/publication/producers?oid=${organization._id}`}>
+ <Link href={`/publication/producers?oid=${organization._id}`} as={`/publication/${organization._id}/producers`}>
<a>
Associer des producteurs
</a>
",0
"diff --git a/pages/publication/organization.js b/pages/publication/organization.js @@ -19,6 +19,7 @@ import Box from '../../components/box'
import Link from '../../components/link'
import Header from '../../components/publication/header'
+import Breadcrumbs from '../../components/publication/breadcrumbs'
import SourceCatalogs from '../../components/publication/organization/source-catalogs'
import SourceProducers from '../../components/publication/organization//source-producers'
import DatasetMetrics from '../../components/publication/organization//dataset-metrics'
@@ -87,7 +88,7 @@ class PublicationPage extends React.Component {
<Meta title={`${organization.name} | Publication`} />
<Header user={user} organization={organization} />
- <h3>{organization.name}</h3>
+ <Breadcrumbs organization={organization} />
<div className='dashboard'>
<Box title='Catalogues source' color='blue'>
<SourceCatalogs
@@ -108,15 +109,13 @@ class PublicationPage extends React.Component {
</Box>
</div>
- <div className='back'>
- <Link href='/publication'>
- <a>
- <IconBack style={{ marginRight: 5 }} /> Retour aux organisations
- </a>
- </Link>
- </div>
-
<style jsx>{`
+ h2 {
+ font-size: 1.5em;
+ font-weight: normal;
+ margin-bottom: 1.6em;
+ }
+
.dashboard {
display: grid;
grid-template-columns: repeat(auto-fill, 430px);
@@ -134,10 +133,6 @@ class PublicationPage extends React.Component {
display: block;
}
}
-
- .back {
- margin-top: 2.5em;
- }
`}</style>
</div>
)
",0
"diff --git a/pages/publication/producers.js b/pages/publication/producers.js @@ -16,7 +16,6 @@ import RequireAuth from '../../components/require-auth'
import Header from '../../components/publication/header'
import Breadcrumbs from '../../components/publication/breadcrumbs'
-
import Producers from '../../components/publication/producers'
import { PUBLICATION_BASE_URL } from '@env'
",0
"diff --git a/pages/_document.js b/pages/_document.js @@ -15,7 +15,7 @@ export default class MyDocument extends Document {
<Head />
<body>
<Main />
- <script src='https://cdn.polyfill.io/v2/polyfill.min.js?features=default,es7' />
+ <script src='https://cdn.polyfill.io/v2/polyfill.min.js?features=default,es6,es7' />
<NextScript />
</body>
</html>
",0
"diff --git a/server/index.js b/server/index.js @@ -74,6 +74,10 @@ i18n
const lngs = languages.join('|')
server.use(`/:lng(${lngs})`, createRoutes(app))
+ server.use('/static', express.static(path.join(__dirname, '../static'), {
+ maxAge: '15d'
+ }))
+
server.get('*', (req, res) => {
if (!app.isInternalUrl(req)) {
return res.redirect(`/${req.i18n.languages[0]}${req.url}`)
",0
"diff --git a/components/page/index.js b/components/page/index.js @@ -32,8 +32,16 @@ export const Page = ({ children }) => (
<style jsx global>{`
@import 'colors';
+ body {
+ font-size: 14px;
+ line-height: 1.5;
+ min-width: 320px;
+ background-color: $white;
+ }
+
a {
color: $blue;
+ text-decoration: none;
&:hover {
color: darken($blue, 10%);
",0
"diff --git a/tests/lib/catalog.test.js b/tests/lib/catalog.test.js -import { isObsolete } from '../../lib/catalog'
+import { isObsolete, findCandidates } from '../../lib/catalog'
-test('isObsolete should return false if catalog is not defined', () => {
+describe('isObsolete', () => {
+ test('return false if catalog is not defined', () => {
expect(isObsolete()).toBe(false)
})
-test('isObsolete should return false if mostRecentRevisionDate is not defined', () => {
+ test('return false if mostRecentRevisionDate is not defined', () => {
expect(isObsolete({
metrics: {}
})).toBe(false)
})
-test('isObsolete should return false if mostRecentRevisionDate is invalid', () => {
+ test('return false if mostRecentRevisionDate is invalid', () => {
expect(isObsolete({
metrics: {
mostRecentRevisionDate: 'not a valid date'
@@ -18,7 +19,7 @@ test('isObsolete should return false if mostRecentRevisionDate is invalid', () =
})).toBe(false)
})
-test('isObsolete should return true if mostRecentRevisionDate is too old', () => {
+ test('return true if mostRecentRevisionDate is too old', () => {
expect(isObsolete({
metrics: {
mostRecentRevisionDate: new Date(2000, 0, 1)
@@ -26,7 +27,7 @@ test('isObsolete should return true if mostRecentRevisionDate is too old', () =>
})).toBe(true)
})
-test('isObsolete should return false if mostRecentRevisionDate is recent', () => {
+ test('return false if mostRecentRevisionDate is recent', () => {
expect(isObsolete({
metrics: {
mostRecentRevisionDate: new Date()
@@ -34,10 +35,86 @@ test('isObsolete should return false if mostRecentRevisionDate is recent', () =>
})).toBe(false)
})
-test('isObsolete should also work with strings', () => {
+ test('work with strings', () => {
expect(isObsolete({
metrics: {
mostRecentRevisionDate: new Date().toISOString()
}
})).toBe(false)
})
+})
+
+describe('findCandidates', () => {
+ test('ignore catalogs without open or download data', () => {
+ const catalogs = [{}, {}, {}]
+
+ expect(findCandidates(catalogs).length).toBe(0)
+ })
+
+ test('excludes catalogs with just open data', () => {
+ const catalogs = [{}, {
+ metrics: {
+ datasets: {
+ partitions: { openness: { yes: 1 } }
+ }
+ }
+ }, {}]
+
+ expect(findCandidates(catalogs).length).toBe(0)
+ })
+
+ test('excludes catalogs with just download data', () => {
+ const catalogs = [{}, {
+ metrics: {
+ datasets: {
+ partitions: { download: { yes: 1 } }
+ }
+ }
+ }, {}]
+
+ expect(findCandidates(catalogs).length).toBe(0)
+ })
+
+ test('include catalogs with download and open data', () => {
+ const catalogs = [{}, {
+ metrics: {
+ datasets: {
+ partitions: {
+ openness: { yes: 1 },
+ download: { yes: 1 }
+ }
+ }
+ }
+ }, {}]
+
+ expect(findCandidates(catalogs).length).toBe(1)
+ })
+
+ test('exclude blacklisted catalogs', () => {
+ const catalogs = [{
+ id: 1,
+ metrics: {
+ datasets: {
+ partitions: {
+ openness: { yes: 1 },
+ download: { yes: 1 }
+ }
+ }
+ }
+ }, {
+ id: 2,
+ metrics: {
+ datasets: {
+ partitions: {
+ openness: { yes: 1 },
+ download: { yes: 1 }
+ }
+ }
+ }
+ }, {}]
+
+ const candidates = findCandidates(catalogs, [1])
+ expect(candidates.length).toBe(1)
+ expect(candidates[0].id).toBe(2)
+ })
+})
",0
"diff --git a/tests/lib/catalog.test.js b/tests/lib/catalog.test.js -import { isObsolete, findCandidates } from '../../lib/catalog'
+import moment from 'moment'
+
+import { isObsolete, findCandidates, computeScore } from '../../lib/catalog'
describe('isObsolete', () => {
test('return false if catalog is not defined', () => {
@@ -118,3 +120,108 @@ describe('findCandidates', () => {
expect(candidates[0].id).toBe(2)
})
})
+
+describe('computeScore', () => {
+ test('return 0 for a catalog with no metrics', () => {
+ expect(computeScore({})).toBe(0)
+ })
+
+ test('return 0 for a catalog with no data', () => {
+ const catalog = {
+ metrics: {
+ datasets: {
+ partitions: {
+ openness: { yes: 1 },
+ download: { yes: 1 }
+ }
+ }
+ }
+ }
+
+ expect(computeScore(catalog)).toBe(0)
+ })
+
+ test('return score for a perfect but old catalog', () => {
+ const catalog = {
+ metrics: {
+ datasets: {
+ totalCount: 42,
+ partitions: {
+ openness: { yes: 42 },
+ download: { yes: 42 }
+ }
+ }
+ }
+ }
+
+ expect(computeScore(catalog)).toBe(100 * 100 * 100)
+ })
+
+ test('return score for a perfect catalog that was updated in the last 6 months', () => {
+ const catalog = {
+ metrics: {
+ mostRecentRevisionDate: moment().subtract(2, 'months').toDate(),
+ datasets: {
+ totalCount: 42,
+ partitions: {
+ openness: { yes: 42 },
+ download: { yes: 42 }
+ }
+ }
+ }
+ }
+
+ expect(computeScore(catalog)).toBe(100 * 100 * 100 * 10)
+ })
+
+ test('return score for a perfect catalog that was updated in the last month', () => {
+ const catalog = {
+ metrics: {
+ mostRecentRevisionDate: moment().subtract(10, 'days').toDate(),
+ datasets: {
+ totalCount: 42,
+ partitions: {
+ openness: { yes: 42 },
+ download: { yes: 42 }
+ }
+ }
+ }
+ }
+
+ expect(computeScore(catalog)).toBe(100 * 100 * 100 * 100)
+ })
+
+ test('return score for a catalog that is not completely open', () => {
+ const catalog = {
+ metrics: {
+ mostRecentRevisionDate: moment().subtract(10, 'days').toDate(),
+ datasets: {
+ totalCount: 10,
+ partitions: {
+ openness: { yes: 5 },
+ download: { yes: 10 }
+ }
+ }
+ }
+ }
+
+ expect(computeScore(catalog)).toBe(50 * 100 * 100 * 100)
+ })
+
+ test('return score for a catalog that is not completely downloadable', () => {
+ const catalog = {
+ metrics: {
+ mostRecentRevisionDate: moment().subtract(10, 'days').toDate(),
+ datasets: {
+ totalCount: 10,
+ partitions: {
+ openness: { yes: 10 },
+ download: { yes: 5 }
+ }
+ }
+ }
+ }
+
+ expect(computeScore(catalog)).toBe(100 * 50 * 50 * 100)
+ })
+})
",0
"diff --git a/lerna.json b/lerna.json ""repo"": ""etalab/geo.data.gouv.fr"",
""labels"": {
""bug"": "":bug: Bug Fix"",
+ ""security"": "":policeman: Security"",
""enhancement"": "":rocket: Enhancement"",
""build-process"": "":building_construction: Build Process"",
""i18n"": "":earth_africa: Internationalization"",
",0
"diff --git a/lerna.json b/lerna.json ""i18n"": "":earth_africa: Internationalization"",
""performance"": "":racehorse: Performance"",
""design"": "":rainbow: Design"",
- ""cleanup"": "":shower: Cleanup""
+ ""cleanup"": "":shower: Cleanup"",
+ ""documentation"": "":memo: Documentation""
},
""cacheDir"": "".changelog""
}
",0
"diff --git a/lerna.json b/lerna.json {
""changelog"": {
- ""repo"": ""etalab/geo.data.gouv.fr"",
+ ""cacheDir"": "".changelog"",
""labels"": {
+ ""analytics"": "":bar_chart: Analytics"",
""bug"": "":bug: Bug Fix"",
- ""security"": "":policeman: Security"",
- ""enhancement"": "":rocket: Enhancement"",
""build-process"": "":building_construction: Build Process"",
+ ""cleanup"": "":shower: Cleanup"",
+ ""design"": "":rainbow: Design"",
+ ""documentation"": "":memo: Documentation"",
+ ""enhancement"": "":rocket: Enhancement"",
""i18n"": "":earth_africa: Internationalization"",
""performance"": "":racehorse: Performance"",
- ""design"": "":rainbow: Design"",
- ""cleanup"": "":shower: Cleanup"",
- ""documentation"": "":memo: Documentation""
+ ""security"": "":policeman: Security""
},
- ""cacheDir"": "".changelog""
+ ""repo"": ""etalab/geo.data.gouv.fr""
}
}
",0
"diff --git a/components/event.js b/components/event.js @@ -5,6 +5,8 @@ import {translate} from 'react-i18next'
import CalendarIcon from 'react-icons/lib/fa/calendar-check-o'
+import Button from './button'
+
const Event = ({event, t}) => (
<div className='event'>
<div className='icon'>
@@ -13,7 +15,11 @@ const Event = ({event, t}) => (
<div>
<h3>{event.name}</h3>
<div>{moment(event.date).format('LL')}</div>
- {event.link ? (
+ {event.subscribe ?
+ <Button href={event.subscribe}>
+ Inscription
+ </Button> :
+ event.link ? (
<div>
<a href={event.link} download>{t('event.download')}</a>
</div>
@@ -24,7 +30,8 @@ const Event = ({event, t}) => (
t('event.noReport')
}
</div>
- )}
+ )
+ }
</div>
<style jsx>{`
@@ -64,6 +71,7 @@ Event.propTypes = {
name: PropTypes.string.isRequired,
date: PropTypes.instanceOf(Date),
link: PropTypes.string,
+ subscribe: PropTypes.string,
linkComingSoon: PropTypes.bool
}).isRequired,
",0
"diff --git a/pages/events.js b/pages/events.js @@ -12,13 +12,10 @@ import Container from '../components/container'
import Box from '../components/box'
import Event from '../components/event'
-const nextEvent = {
- name: 'Atelier #9',
- date: new Date(2018, 6, 12),
- register: 'https://www.eventbrite.fr/e/billets-atelier-geo-8-46883052472'
-}
+const nextEvent = null
const pastEvents = [
+ {name: 'Atelier #9', date: new Date(2018, 6, 12)},
{name: 'Atelier #8', date: new Date(2018, 4, 22)},
{name: 'Atelier #7', date: new Date(2017, 11, 12)},
{name: 'Atelier #6', date: new Date(2017, 4, 18)},
",0
"diff --git a/components/catalog/harvests/index.js b/components/catalog/harvests/index.js @@ -110,6 +110,7 @@ class Harvests extends React.Component {
.graph {
display: flex;
flex-direction: column;
+ overflow: hidden;
flex: 1 1;
div {
",0
"diff --git a/package.json b/package.json ""enhancement"": "":rocket: Enhancement"",
""i18n"": "":earth_africa: Internationalization"",
""performance"": "":racehorse: Performance"",
- ""security"": "":policeman: Security""
+ ""security"": "":policeman: Security"",
+ ""dependencies"": "":arrow_up: Dependencies""
},
""repo"": ""etalab/geo.data.gouv.fr""
}
",0
"diff --git a/MaterialSkin/HTML/material/css/style.css b/MaterialSkin/HTML/material/css/style.css @@ -279,6 +279,11 @@ a {
opacity:0.75;
}
+.dialog--fullscreen > .card {
+ padding-left:8px !important;
+ padding-right:8px !important;
+}
+
.settings-list {
max-width:600px;
margin: auto;
",0
"diff --git a/MaterialSkin/Plugin.pm b/MaterialSkin/Plugin.pm @@ -3,30 +3,27 @@ package Plugins::MaterialSkin::Plugin;
use File::Basename;
use File::Spec::Functions qw(catfile catdir);
-use constant FONT_DIR => 'HTML/material/font';
-
# this plugin registers the helper files (fonts, manifest) as raw downloads
# this will allow Logitech Media Server to serve those files without a patch
sub initPlugin {
my $baseDir = dirname($INC{'Plugins/MaterialSkin/Plugin.pm'});
- my $fontDir = catdir($baseDir, FONT_DIR);
-
- opendir(DIR, $fontDir) || do {
- Slim::Utils::Log::logError('MaterialSkin: failed to read base folder with fonts');
- return;
- };
-
- my @entries = readdir(DIR);
+ my @dirs = ('HTML/material/', 'HTML/material/font', 'HTML/material/lang');
- close(DIR);
+ foreach $d (@dirs) {
+ my $path = catdir($baseDir, $d);
+ if opendir(dir, $path) {
+ my @entries = readdir(dir);
+ close(dir);
for my $file (@entries) {
# extend the list of file extensions if needed
if ($file =~ /\.(?:eot|svg|woff2?|ttf|json)$/) {
- $file = catfile($fontDir, $file);
+ $file = catfile($path, $file);
Slim::Web::Pages->addRawDownload(basename($file), $file, Slim::Music::Info::typeFromSuffix($file));
}
}
}
+ }
+}
1;
",0
"diff --git a/TODO b/TODO - Scrolling browse and queue lists actually scrolls the whole page. This causes scrolling in
one to affect the other. A (slightly) hacky-ish work-around is in place, where the page
position is saved/restored on route change. Would be better to scroll just the list.
+ Can probably use --vh setting (as per no playing details) to set list size/pos
- Drag'n'drop
- Not working on Android Firefox
- - Not working on iOS
+ - Not working on iOS - github.com/Bernardo-Castilho/gragdroptouch
- Desktop firefox has drag thumbnail much higher than item being dragged.
- Queue not always drawn completely with iOS, dragging up/down causes items to be shown.
+ - Does not work if set as default, can't find files
+ - YouTube cover did not show on now-playing, until refresh?
- Browse
- Random Mix
- Favorites images
- Replace ... menu with a play button/long press menu?
+ - Apps:
+ Band's Campout
+ - Covers?
+ - Navigation is a bit odd
- Now Playing
- Drag time slider?
- Set butons to disabled when appropriate
+ - If durayion is 0, don't show progress
- PlayQueue
- Only update whilst visible?
- Misc
+ - Minify JS into 1 minified file, and minify css
+ devlopers.google.com/closure/compiler - for JS. Need to pass JS files in order that they
+ appear in index.html
+ yuicompressor.jar for css
- Complete WebApp support
- Handle back button (navigate back in browse)
+ - Virtual libraries
+ - Get list via: ["""",[""libraries"", 0, 100]]
+ - Add selection (if any present) to settings dialog, and set vuex/cookie with id
+ - Replace ""My Music"" with library name
- Group management
- Add create/delete/edit/list to JSON API in Groups plugin itself.
[""groupmac"", [""playergroup"", 0, 100]] lists group details
[""groupmac"", [""playerpref"", ""playername"", ""X""]] sets group name
[""groupmac"", [""playerpref"", ""plugin.groups:members"", [""maca"", ""macb""]]] sets group members
+ - Add 'About dialog'
+ - Server version
+ - Skin Version
+ - Artist, Album, Track count (in virtual library?)
- Add 'Manage all' to players/settings menu
- Manage all volumes
- Power on/off
",0
"diff --git a/MaterialSkin/HTML/material/html/js/manage-players.js b/MaterialSkin/HTML/material/html/js/manage-players.js @@ -28,11 +28,21 @@ Vue.component('lms-manage-players', {
<v-list-tile-title>{{player.name}}</v-list-tile-title>
<v-list-tile-sub-title>{{player.track}}</v-list-tile-sub-title>
</v-list-tile-content>
- <v-list-tile-action v-if=""player.playIcon"" @click.stop=""playPause(index)"">
+ <v-list-tile-action v-if=""player.playIcon"" @click=""prevTrack(index)"">
+ <v-btn icon>
+ <v-icon>skip_previous</v-icon>
+ </v-btn>
+ </v-list-tile-action>
+ <v-list-tile-action v-if=""player.playIcon"" @click=""playPause(index)"">
<v-btn icon>
<v-icon>{{player.playIcon}}</v-icon>
</v-btn>
</v-list-tile-action>
+ <v-list-tile-action v-if=""player.playIcon"" @click=""nextTrack(index)"">
+ <v-btn icon>
+ <v-icon>skip_next</v-icon>
+ </v-btn>
+ </v-list-tile-action>
</v-list-tile>
</v-list>
</v-flex xs12>
@@ -155,6 +165,22 @@ Vue.component('lms-manage-players', {
updatePlayer(index);
});
},
+ prevTrack(index) {
+ if (!this.show) {
+ return;
+ }
+ lmsCommand(this.players[index].id, ['button', 'jump_rew']).then(({data}) => {
+ updatePlayer(index);
+ });
+ },
+ nextTrack(index) {
+ if (!this.show) {
+ return;
+ }
+ lmsCommand(this.players[index].id, ['playlist', 'index', '+1']).then(({data}) => {
+ updatePlayer(index);
+ });
+ },
updateAll() {
for (var i=0; i<this.players.length; ++i) {
if (!this.players[i].updating && (undefined==this.players[i].lastUpdate || ((new Date())-this.players[i].lastUpdate)>500)) {
",0
"diff --git a/TODO b/TODO - at start of song, and near end poll every (e.g.) 0.5 seconds
- Create timer to advance song progress - re-adjust on each poll
- or use [""time"", ""?""] to just obtain time position every second?
- - Desktop UI - expand the 3 pages into 1.
+ - Desktop UI
+ - Slim top toolbar (as no need for current playing)
+ - Browse / splitter/ Queue
+ - Bottom toolbar with cover, controls, and current playing track
+ - Create separate desktop.html / desktop/index.html
+ - Modify browse/queue JS files - so as not to change path
+ - New CSS - different heights for browse/queue
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -1073,27 +1073,35 @@ var lmsBrowse = Vue.component(""lms-browse"", {
id: TOP_APPS_ID });
},
playerMenu() {
+ console.log(""Update playr menu"");
if (this.serverTop.length>0 && this.serverTop[0].player==this.playerId()) {
+ console.log(""Player has not changed"");
return;
}
if (this.fetchingItems) {
+ console.log(""Currently fetching items, so tray again in 250ms"");
if (this.playerMenuTimeout) {
clearTimeout(this.playerMenuTimeout);
}
this.playerMenuTimeout = setTimeout(function () {
+ console.log(""Timeout, call playerMenu"");
this.playerMenu();
}.bind(this), 250);
return;
}
this.fetchingItems=true;
+ console.log(""Fetch player menu items"");
lmsList(this.playerId(), [""menu"", ""items""], [""direct:1""]).then(({data}) => {
+ console.log(""Got response"");
if (data && data.result && data.result.item_loop) {
+ console.log(""Clear current menu, and iterate response"");
this.serverTop = [];
this.serverTop.push({ header: i18n(""My Music""), id: TOP_ID_PREFIX+""mmh"" });
data.result.item_loop.forEach(c => {
if (c.node==""myMusic"" && c.id) {
+ console.log(""Got music item "" + c.id);
if (c.id.startsWith(""myMusic"") && !c.id.startsWith(""myMusicSearch"")) {
var command = this.buildCommand(c, ""go"", false, true);
var item = { title: c.text,
@@ -1130,8 +1138,10 @@ var lmsBrowse = Vue.component(""lms-browse"", {
} else if (c.id.startsWith(""myMusicFlopTracks"")) {
item.icon = ""arrow_downward"";
}
+ console.log(""add item"");
this.serverTop.push(item);
} else if (c.id==""randomplay"") {
+ console.log(""add random"");
this.serverTop.push({ title: i18n(""Random Mix""),
icon: ""shuffle"",
id: TOP_RANDOM_MIX_ID,
@@ -1139,16 +1149,22 @@ var lmsBrowse = Vue.component(""lms-browse"", {
}
}
});
+ console.log(""parsed items"");
this.serverTop.sort(function(a, b) { return a.weight!=b.weight ? a.weight>b.weight : titleSort(a, b); });
this.addExtraItems(this.serverTop, false);
+ console.log(""Store player id"");
this.serverTop[0].player=this.playerId();
+ console.log(""sm:""+this.$store.state.serverMenus+"" hl:""+this.history.length);
if (this.$store.state.serverMenus && 0==this.history.length) {
+ console.log(""set items to these"");
this.items = this.serverTop;
}
}
this.fetchingItems=false;
+ console.log(""player menu updated"");
}).catch(err => {
this.fetchingItems = false;
+ console.log(""Error loading player menu "" +err);
this.showError(err);
});
},
",0
"diff --git a/MaterialSkin/HTML/material/html/js/nowplaying-page.js b/MaterialSkin/HTML/material/html/js/nowplaying-page.js @@ -96,9 +96,9 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
<v-flex xs4>
<v-layout text-xs-center>
<v-flex xs6>
- <v-btn flat icon v-if=""playerStatus.playlist.repeat===1"" @click=""doAction(['playlist', 'repeat', 0])""><v-icon>repeat_one</v-icon></v-btn>
- <v-btn flat icon v-else-if=""playerStatus.playlist.repeat===2"" @click=""doAction(['playlist', 'repeat', 1])""><v-icon>repeat</v-icon></v-btn>
- <v-btn flat icon v-else @click=""doAction(['playlist', 'repeat', 2])"" class=""dimmed""><v-icon>repeat</v-icon></v-btn>
+ <v-btn :title=""trans.repeatOne"" flat icon v-if=""playerStatus.playlist.repeat===1"" @click=""doAction(['playlist', 'repeat', 0])""><v-icon>repeat_one</v-icon></v-btn>
+ <v-btn :title=""trans.repeatAll"" flat icon v-else-if=""playerStatus.playlist.repeat===2"" @click=""doAction(['playlist', 'repeat', 1])""><v-icon>repeat</v-icon></v-btn>
+ <v-btn :title=""trans.repeatOff"" flat icon v-else @click=""doAction(['playlist', 'repeat', 2])"" class=""dimmed""><v-icon>repeat</v-icon></v-btn>
</v-flex>
<v-flex xs6><v-btn flat icon @click=""doAction(['button', 'jump_rew'])""><v-icon large>skip_previous</v-icon></v-btn></v-flex>
</v-layout>
@@ -111,9 +111,9 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
<v-layout text-xs-center>
<v-flex xs6><v-btn flat icon @click=""doAction(['playlist', 'index', '+1'])""><v-icon large>skip_next</v-icon></v-btn></v-flex>
<v-flex xs6>
- <v-btn flat icon v-if=""playerStatus.playlist.shuffle===2"" @click=""doAction(['playlist', 'shuffle', 0])""><v-icon class=""shuffle-albums"">shuffle</v-icon></v-btn>
- <v-btn flat icon v-else-if=""playerStatus.playlist.shuffle===1"" @click=""doAction(['playlist', 'shuffle', 2])""><v-icon>shuffle</v-icon></v-btn>
- <v-btn flat icon v-else @click=""doAction(['playlist', 'shuffle', 1])"" class=""dimmed""><v-icon>shuffle</v-icon></v-btn>
+ <v-btn :title=""trans.shuffleAlbums"" flat icon v-if=""playerStatus.playlist.shuffle===2"" @click=""doAction(['playlist', 'shuffle', 0])""><v-icon class=""shuffle-albums"">shuffle</v-icon></v-btn>
+ <v-btn :title=""trans.shuffleAll"" flat icon v-else-if=""playerStatus.playlist.shuffle===1"" @click=""doAction(['playlist', 'shuffle', 2])""><v-icon>shuffle</v-icon></v-btn>
+ <v-btn :title=""trans.shuffleOff"" flat icon v-else @click=""doAction(['playlist', 'shuffle', 1])"" class=""dimmed""><v-icon>shuffle</v-icon></v-btn>
</v-flex>
</v-layout>
</v-flex>
@@ -135,7 +135,9 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
info: { show: false, tab:0,
tabs: [ { title:undefined, text:undefined }, { title:undefined, text:undefined }, { title:undefined, text:undefined } ] },
menu: { show: false, x:0, y:0, text: undefined },
- trans: { close: undefined }
+ trans: { close: undefined,
+ repeatAll:undefined, repeatOne:undefined, repeatOff:undefined,
+ shuffleAll:undefined, shuffleAlbums:undefined, shuffleOff:undefined }
};
},
mounted() {
@@ -224,7 +226,9 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
},
methods: {
initItems() {
- this.trans.close=i18n(""Close"");
+ this.trans = { close:i18n(""Close""),
+ repeatAll:i18n(""Repeat queue""), repeatOne:i18n(""Repeat single track""), repeatOff:i18n(""No repeat""),
+ shuffleAll:i18n(""Shuffle tracks""), shuffleAlbums:i18n(""Shuffle albums""), shuffleOff:i18n(""No shuffle"")};
this.menu.text=i18n(""Show information"");
this.info.tabs[0].title=i18n(""Lyrics"");
this.info.tabs[1].title=i18n(""Artist Biography"");
",0
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -295,11 +295,12 @@ a {
padding:16px 16px 0px 16px;
}
-.browse-text img {
+.browse-text img, .np-info-text img, .np-info-text-full img {
max-width: 300px !important;
max-height: 300px !important;
margin-left: auto;
margin-right: auto;
+ margin-bottom: 16px;
display: block;
}
@@ -319,23 +320,6 @@ a {
text-align: center;
}
-.np-info-text img {
- max-width: 300px !important;
- max-height: 300px !important;
- margin-left: auto;
- margin-right: auto;
- display: block;
-}
-
-
-.np-info-text-full img {
- max-width: 300px !important;
- max-height: 300px !important;
- margin-left: auto;
- margin-right: auto;
- display: block;
-}
-
.np-info-tab-cover {
background:transparent;
}
",0
"diff --git a/MaterialSkin/HTML/material/html/js/manage-players.js b/MaterialSkin/HTML/material/html/js/manage-players.js @@ -46,6 +46,9 @@ Vue.component('lms-manage-players', {
<v-list-tile-action v-if=""player.playIcon"" class=""pmgr-btn"" @click=""playPause(player)"">
<v-btn icon><v-icon>{{player.playIcon}}</v-icon></v-btn>
</v-list-tile-action>
+ <v-list-tile-action v-if=""player.playIcon && showAllButtons && stopButton"" class=""pmgr-btn"" @click=""stop(player)"">
+ <v-btn icon><v-icon>stop</v-icon></v-btn>
+ </v-list-tile-action>
<v-list-tile-action v-if=""player.playIcon && showAllButtons"" class=""pmgr-btn"" @click=""nextTrack(player)"">
<v-btn icon><v-icon>skip_next</v-icon></v-btn>
</v-list-tile-action>
@@ -256,6 +259,14 @@ Vue.component('lms-manage-players', {
updatePlayer(player);
});
},
+ stop(player) {
+ if (!this.show) {
+ return;
+ }
+ lmsCommand(player.id, ['stop']).then(({data}) => {
+ updatePlayer(player);
+ });
+ },
prevTrack(player) {
if (!this.show) {
return;
@@ -356,6 +367,9 @@ Vue.component('lms-manage-players', {
computed: {
currentPlayer() {
return this.$store.state.player
+ },
+ stopButton() {
+ return this.$store.state.stopButton
}
},
watch: {
",0
"diff --git a/MaterialSkin/HTML/material/html/css/mobile.css b/MaterialSkin/HTML/material/html/css/mobile.css position:relative !important;
height:var(--bottom-nav-height) !important;
top:calc(-1 * (var(--bottom-nav-height) + 2px)) !important;
+
+ @supports (padding-bottom: env(safe-area-inset-bottom)) {
+ padding-bottom: env(safe-area-inset-bottom) !important;
+ }
}
.lms-bottom-nav-button {
",0
"diff --git a/MaterialSkin/HTML/material/html/css/mobile.css b/MaterialSkin/HTML/material/html/css/mobile.css }
}
+@media only screen and (max-height: 300px) {
+ .np-text-landscape {
+ margin:0px 2px 0px 2px !important;
+ font-size: 50% !important;
+ text-align: center;
+ }
+}
+
.np-image {
display: block;
object-fit: contain;
",0
"diff --git a/ChangeLog b/ChangeLog 7. Fix double-presses occuring on volume buttons with touch devices.
8. Fix restoring command when go back.
9. Only check for wide layout if landscape - otherwise controls are sometimes
+ missing.
10. Respect 'nextWindow' when clicking on a 'text' action.
11. Darker botton navbar for dark mobile layout.
12. Transparent time progress background.
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -298,7 +298,8 @@ var lmsBrowse = Vue.component(""lms-browse"", {
pinned: [],
libraryName: undefined,
selection: [],
- collapsed: [false, false, false]
+ collapsed: [false, false, false],
+ showRatingButton: false
}
},
computed: {
",0
"diff --git a/MaterialSkin/HTML/material/html/js/server.js b/MaterialSkin/HTML/material/html/js/server.js @@ -319,15 +319,17 @@ var lmsServer = Vue.component('lms-server', {
bus.$emit(isCurrent ? 'playerStatus' : 'otherPlayerStatus', player);
if (isCurrent) {
- this.scheduleNextPlayerStatusUpdate(player.isplaying && player.current
- ? undefined!=player.current.duration
+ this.scheduleNextPlayerStatusUpdate(player.isplaying
+ ? undefined==player.current || data.waitingToPlay
+ ? 1000 // Just starting to play? Poll in 1 second
+ : undefined!=player.current.duration
? undefined!=player.current.time && (player.current.duration-player.current.time)<2.5
- ? 500
- : (player.current.duration-(player.current.time+2))*1000
+ ? 500 // Near end, every 5 seconds
+ : (player.current.duration-(player.current.time+2))*1000 // 2 seconds before end
: undefined!=player.current.time && player.current.time<5 // For streams, poll for the first 5 seconds
? 1000
: undefined
- : undefined);
+ : undefined); // Not playing?
}
},
handleFavoritesUpdate() {
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -940,6 +940,10 @@ function parseBrowseResp(data, parent, options, idStart, cacheKey) {
resp = data;
}
+ if (0==resp.items.length) {
+ resp.items.push({title:i18n(""Empty""), type: 'text', id:'empty'});
+ }
+
} catch(e) {
resp.items.push({title:i18n(""ERROR: List processing failed"")+""\n""+e, type: 'text', id:'error'});
logError(e);
",0
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -759,6 +759,14 @@ progress {
max-width:200px !important;
}
+.sleep-item {
+ white-space: normal !important;
+ overflow: auto !important;
+ text-overflow: initial !important;
+ height: auto;
+ max-height: 48px;
+}
+
.ios-vcard-text-workaround {
position:fixed;
overflow-y:auto;
",0
"diff --git a/README.md b/README.md @@ -58,3 +58,9 @@ force one or the other.
1. `http://<yourserver>:9000/material/mobile` will force mobile layout
2. `http://<yourserver>:9000/material/desktop` will force desktop layout
+
+## Donations
+
+I develop this skin purely for fun, so no donations are required. However, seeing as I have been asked about this a few times, here is a link...
+
+[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2X2CTDUH27V9L&source=url)
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -664,6 +664,10 @@ function parseBrowseResp(data, parent, options, idStart, cacheKey) {
}
}
var fixedPath = i.path.replace(""\\"", ""\\\\"");
+ var key = name.charAt(0);
+ if (undefined!=key && (resp.jumplist.length==0 || resp.jumplist[resp.jumplist.length-1].key!=key)) {
+ resp.jumplist.push({key: key, index: resp.items.length+idStart});
+ }
resp.items.push({
id: fixedPath,
title: name,
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -372,7 +372,10 @@ var lmsBrowse = Vue.component(""lms-browse"", {
<v-list v-else-if=""menu.libraries"">
<template v-for=""(item, index) in menu.libraries"">
<v-list-tile @click=""selectLibrary(item.id)"">
- <v-list-tile-title>{{item.name}}</v-list-tile-title>
+ <v-list-tile-avatar>
+ <v-icon small>{{item.name==libraryName ? 'radio_button_checked' :'radio_button_unchecked'}}</v-icon>
+ </v-list-tile-avatar>
+ <v-list-tile-content><v-list-tile-title>{{item.name}}</v-list-tile-title></v-list-tile-content>
</v-list-tile>
</template>
</v-list>
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -161,6 +161,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
<v-icon v-else>{{B_ACTIONS[action].icon}}</v-icon>
</v-btn>
</template>
+ <v-divider vertical v-if=""(showRatingButton && items.length>1) || (desktop && settingsMenuActions && settingsMenuActions.length>0)""></v-divider>
<template v-for=""(action, index) in tbarActions"">
<v-btn flat icon @click.stop=""headerAction(action, $event)"" class=""toolbar-button"" :title=""B_ACTIONS[action].title"" :id=""'tbar'+index"">
<img v-if=""B_ACTIONS[action].svg"" class=""svg-img"" :src=""B_ACTIONS[action].svg | svgIcon(darkUi)""></img>
",0
"diff --git a/README.md b/README.md @@ -74,6 +74,13 @@ received, start Material as follows:
* `http://<yourserver>:9000/material/?debug=cometd` for Cometd
* `http://<yourserver>:9000/material/?debug=json,cometd` for both
+### Cache
+
+Material cache's artist and album lists, to speed up subsequent listings. To
+clear this cache, start Material as follows:
+
+* `http://<yourserver>:9000/material/?clearcache=true`
+
## Donations
I develop this skin purely for fun, so no donations are required. However, seeing as I have been asked about this a few times, here is a link...
",0
"diff --git a/MaterialSkin/HTML/material/html/js/movequeue-dialog.js b/MaterialSkin/HTML/material/html/js/movequeue-dialog.js @@ -17,6 +17,7 @@ Vue.component('lms-movequeue-dialog', {
<v-list class=""sleep-list"">
<template v-for=""(p, index) in players"" v-if=""p.id!=src"">
<v-list-tile @click=""moveTo(p)"">
+ <v-list-tile-avatar :tile=""true"" class=""lms-avatar""><v-icon>{{p.isgroup ? 'speaker_group' : 'speaker'}}</v-icon></v-list-tile-avatar>
<v-list-tile-title class=""sleep-item"">{{p.name}}</v-list-tile-title>
</v-list-tile>
<v-divider></v-divider>
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -192,6 +192,9 @@ var lmsBrowse = Vue.component(""lms-browse"", {
<v-list-tile-avatar v-else-if=""item.icon"" :tile=""true"" class=""lms-avatar"">
<v-icon>{{item.icon}}</v-icon>
</v-list-tile-avatar>
+ <v-list-tile-avatar v-else-if=""item.svg"" :tile=""true"" class=""lms-avatar"">
+ <img class=""svg-list-img"" :src=""item.svg | svgIcon(darkUi)""></img>
+ </v-list-tile-avatar>
<!-- TODO: Do we have search fields with large lists?? -->
<v-subheader v-if=""item.header"">{{item.header}}</v-subheader>
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -1012,7 +1012,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
} else if (act==EDIT_FAV_ACTION) {
bus.$emit('dlg.open', 'favorite', 'edit', item);
} else if (act==ADD_FAV_FOLDER_ACTION) {
- this.dialog = { show:true, title:ADD_FAV_FOLDER_ACTION.title, ok: i18n(""Create""), cancel:undefined,
+ this.dialog = { show:true, title:ACTIONS[ADD_FAV_FOLDER_ACTION].title, ok: i18n(""Create""), cancel:undefined,
command:[""favorites"", ""addlevel"", ""title:""+TERM_PLACEHOLDER]};
} else if (act===DELETE_ACTION) {
this.$confirm(i18n(""Delete '%1'?"", item.title), {buttonTrueText: i18n('Delete'), buttonFalseText: i18n('Cancel')}).then(res => {
",0
"diff --git a/MaterialSkin/HTML/material/html/js/nowplaying-page.js b/MaterialSkin/HTML/material/html/js/nowplaying-page.js @@ -168,6 +168,7 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
<p class=""np-duration cursor"" v-else-if=""playerStatus.current.duration>0"" @click=""toggleTime()"">-{{playerStatus.current.duration-playerStatus.current.time | displayTime}}</p>
</v-layout>
</v-flex>
+ <v-flex xs12 v-else-if=""!info.show""><div style=""height:31px""></div></v-flex>
<v-flex xs4>
<v-layout text-xs-center>
<v-flex xs6>
@@ -230,6 +231,7 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
<p class=""np-duration cursor"" v-else-if=""playerStatus.current.duration>0"" @click=""toggleTime()"">-{{playerStatus.current.duration-playerStatus.current.time | displayTime}}</p>
</v-layout>
</v-flex>
+ <v-flex xs12 v-else-if=""!info.show""><div style=""height:31px""></div></v-flex>
<v-flex xs4 class=""no-control-adjust"">
<v-layout text-xs-center>
",0
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -183,7 +183,8 @@ Vue.component('lms-toolbar', {
data() {
return { songInfo:undefined,
playlist: { count: """", duration: """" },
- playerStatus: { ison: 1, isplaying: false, volume: 0, current: { title:undefined, artist:undefined, album:undefined }, sleepTime: undefined },
+ playerStatus: { ison: 1, isplaying: false, volume: 0, digital_volume_control: true,
+ current: { title:undefined, artist:undefined, album:undefined }, sleepTime: undefined },
menuItems: [],
showPlayerMenu: false,
otherMenuItems:{},
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -1773,6 +1773,11 @@ var lmsBrowse = Vue.component(""lms-browse"", {
updateTopList(items) {
this.top=items;
this.initItems();
+ for (var i=0, len=this.top.length; i<len; ++i) {
+ if (!this.top[i].id.startsWith(TOP_ID_PREFIX)) {
+ this.options.pinned.add(this.top[i].id);
+ }
+ }
},
saveTopList() {
setLocalStorageVal('topitems', JSON.stringify(this.top));
",0
"diff --git a/ChangeLog b/ChangeLog 6. Fix 'clickability' of home screen item checkbox list.
7. When using 'More'menu item or track information, only clear browse history
stack if it has 50 or more steps.
+8. Add Russian translation - thanks to sky418.
1.0.0
-----
",0
"diff --git a/MaterialSkin/HTML/material/html/js/init.js b/MaterialSkin/HTML/material/html/js/init.js @@ -12,7 +12,7 @@ function hideclassicSkinElems() {
}
if (iframe) {
var cssLink = iframe.contentDocument.createElement(""link"");
- cssLink.href = ""../../../material/html/css/classic-skin-mods.css"";
+ cssLink.href = ""../../../material/html/css/classic-skin-mods.css?r="" + LMS_MATERIAL_REVISION;
cssLink.rel = ""stylesheet"";
cssLink.type = ""text/css"";
iframe.contentDocument.head.appendChild(cssLink);
",0
"diff --git a/MaterialSkin/HTML/material/html/js/information.js b/MaterialSkin/HTML/material/html/js/information.js @@ -15,6 +15,8 @@ Vue.component('lms-information-dialog', {
<v-toolbar-title>
<div>{{i18n('Information')}}</div>
</v-toolbar-title>
+ <v-spacer></v-spacer>
+ <v-btn flat icon @click.native=""openWindow('https://cdn.statically.io/gh/d6jg/material-documentation/master/html/Material%20Skin.html')"" :title=""i18n('User guide')""><v-icon>help_outline</b-icon></v-btn>
</v-toolbar>
</v-card-title>
<div class=""ios-vcard-text-workaround""><div class=""infodetails"" id=""info-page"">
",0
"diff --git a/ChangeLog b/ChangeLog +1.1.4
+-----
+1. Add Italian translation, thanks to franz159
+
1.1.3
-----
1. Fix 100% CPU bug when navigating back from 'More' results. Issue #184
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -98,7 +98,7 @@ function parseBrowseResp(data, parent, options, cacheKey) {
title: i.album,
image: i.artwork_url
? resolveImageUrl(i.artwork_url, LMS_IMAGE_SIZE)
- : ""/music/"" + (""""==i.artwork || undefined==i.artwork ? ""0"" : i.artwork) + ""/cover"" + LMS_IMAGE_SIZE,
+ : (""/music/"" + (""""==i.artwork || undefined==i.artwork ? ""0"" : i.artwork) + ""/cover"" + LMS_IMAGE_SIZE),
stdItem: STD_ITEM_ALBUM,
type: ""group""
};
@@ -130,7 +130,7 @@ function parseBrowseResp(data, parent, options, cacheKey) {
title: i.track,
image: i.artwork_url
? resolveImageUrl(i.artwork_url, LMS_IMAGE_SIZE)
- : ""/music/"" + (""""==i.coverid || undefined==i.coverid ? ""0"" : i.coverid) + ""/cover"" +LMS_IMAGE_SIZE,
+ : (""/music/"" + (""""==i.coverid || undefined==i.coverid ? ""0"" : i.coverid) + ""/cover"" +LMS_IMAGE_SIZE),
stdItem: STD_ITEM_TRACK,
type: ""track""
};
@@ -662,7 +662,7 @@ function parseBrowseResp(data, parent, options, cacheKey) {
subtitle: i.artist ? i.artist : undefined,
image: i.artwork_url
? resolveImageUrl(i.artwork_url, LMS_IMAGE_SIZE)
- : ""/music/"" + i.artwork_track_id + ""/cover"" + LMS_IMAGE_SIZE,
+ : (""/music/"" + i.artwork_track_id + ""/cover"" + LMS_IMAGE_SIZE),
stdItem: STD_ITEM_ALBUM,
type: ""group"",
origTitle: i.album,
@@ -800,7 +800,7 @@ function parseBrowseResp(data, parent, options, cacheKey) {
subtitle: subtitle,
image: i.artwork_url
? resolveImageUrl(i.artwork_url, LMS_IMAGE_SIZE)
- : ""/music/"" + (""""==i.coverid || undefined==i.coverid ? ""0"" : i.coverid) + ""/cover"" +LMS_IMAGE_SIZE,
+ : (""/music/"" + (""""==i.coverid || undefined==i.coverid ? ""0"" : i.coverid) + ""/cover"" +LMS_IMAGE_SIZE),
//icon: ""music_note"",
stdItem: isRemote ? STD_ITEM_REMOTE_PLAYLIST_TRACK : STD_ITEM_PLAYLIST_TRACK,
type: ""track"",
",0
"diff --git a/MaterialSkin/HTML/material/html/css/black.css b/MaterialSkin/HTML/material/html/css/black.css --scrollbar-corner-color:#333;
--background-color:black;
--background-shadow-color:rgba(16, 16, 16, 0.8);
- --dialog-toolbar-color:#333;
+ --dialog-toolbar-color:black;
--bottom-toolbar-color:black;
--top-toolbar-color:black;
--sub-toolbar-color:black;
background-color:black;
}
-.v-menu__content {
- border:1px solid var(--dialog-toolbar-border-color);
+.v-menu__content, .v-dialog, .v-toast {
+ border:1px solid var(--dialog-toolbar-border-color) !important;
+}
+
+.v-dialog--fullscreen {
+ border:none !important;
}
.v-menu__content, .vol-sheet {
",0
"diff --git a/MaterialSkin/HTML/material/standardheader.html b/MaterialSkin/HTML/material/standardheader.html <link rel=""stylesheet"" type=""text/css"" href=""[% webroot %]slimserver.css?r=[% revision %]""/>
<link rel=""stylesheet"" type=""text/css"" href=""[% webroot %]skin.css?r=[% revision %]"" />
<link rel=""stylesheet"" type=""text/css"" href=""[% webroot %]html/css/light.css?r=[% revision %]""/>
+<link rel=""stylesheet"" type=""text/css"" href=""[% webroot %]html/css/blue.css?r=[% revision %]""/>
<link rel=""stylesheet"" type=""text/css"" href=""[% webroot %]html/css/classic-skin-mods-light.css?r=[% revision %]""/>
<link rel=""apple-touch-icon"" href=""[% webroot %]html/images/apple-touch-icon.png""/>
[% IF mobileBrowser %]
",0
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -30,7 +30,7 @@ Vue.component('lms-toolbar', {
<v-subheader v-if=""index==0 && !item.isgroup && (players[players.length-1].isgroup || otherPlayers.length>0)"">{{trans.standardPlayers}}</v-subheader>
<v-subheader v-else-if=""index>0 && item.isgroup && !players[index-1].isgroup"">{{trans.groupPlayers}}</v-subheader>
<v-list-tile @click=""setPlayer(item.id)"">
- <v-list-tile-avatar v-if=""players && players.length>1 || otherPlayers.length>0"">
+ <v-list-tile-avatar v-if=""(players && players.length>1) || otherPlayers.length>0"">
<v-icon small v-if=""players && players.length>1"">{{player && item.id === player.id ? 'radio_button_checked' :'radio_button_unchecked'}}</v-icon>
<v-icon small v-else></v-icon>
</v-list-tile-avatar>
",0
"diff --git a/ChangeLog b/ChangeLog +1.5.0
+-----
+1. When LSM is set to list a multi-CD album as 1 album, then visually split up
+ the CDs' track listings, and allow to play individual CDs.
+
1.4.4
-----
1. Fix colour of active repeat/shuffle/dstm buttons in now-playing.
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -86,7 +86,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
<div v-if=""idx>=items.length"" class=""image-grid-item defcursor""></div>
<div v-else class=""image-grid-item"" v-bind:class=""{'image-grid-item-few': grid.few}"" @click=""click(items[idx], idx, $event)"" :title=""items[idx] | itemTooltip"">
<div v-if=""selection.size>0"" class=""check-btn grid-btn image-grid-select-btn"" @click.stop=""select(items[idx], idx, $event)"" :title=""ACTIONS[items[idx].selected ? UNSELECT_ACTION : SELECT_ACTION].title"" v-bind:class=""{'check-btn-checked':items[idx].selected}""></div>
- <div v-else-if=""hoverBtns && (undefined!=items[idx].stdItem || (items[idx].menu && items[idx].menu.length>0 && items[idx].menu[0]==PLAY_ACTION))"" class=""grid-btns"">
+ <div v-else-if=""hoverBtns && (undefined!=items[idx].stdItem || (items[idx].menu && items[idx].menu.length>0 && (items[idx].menu[0]==PLAY_ACTION || items[idx].menu[0]==PLAY_ALL_ACTION)))"" class=""grid-btns"">
<div class=""add-btn grid-btn"" @click.stop=""itemAction(ADD_ACTION, items[idx], idx, $event)"" :title=""ACTIONS[ADD_ACTION].title""></div>
<div class=""play-btn grid-btn"" @click.stop=""itemAction(PLAY_ACTION, items[idx], idx, $event)"" :title=""ACTIONS[PLAY_ACTION].title""></div>
</div>
@@ -136,9 +136,9 @@ var lmsBrowse = Vue.component(""lms-browse"", {
</v-list-tile-content>
<v-list-tile-action class=""browse-action"" v-if=""undefined!=item.stdItem || (item.menu && item.menu.length>0)"">
- <div v-if=""hoverBtns && 0==selection.size && (undefined!=item.stdItem || (item.menu[0]==PLAY_ACTION))"" class=""list-btns"">
- <div class=""add-btn grid-btn"" @click.stop=""itemAction(ADD_ACTION, item, index, $event)"" :title=""ACTIONS[ADD_ACTION].title""></div>
- <div class=""play-btn grid-btn"" @click.stop=""itemAction(PLAY_ACTION, item, index, $event)"" :title=""ACTIONS[PLAY_ACTION].title""></div>
+ <div v-if=""hoverBtns && 0==selection.size && (undefined!=item.stdItem || item.menu[0]==PLAY_ACTION || item.menu[0]==PLAY_ALL_ACTION)"" class=""list-btns"">
+ <div class=""add-btn grid-btn"" @click.stop=""itemAction(item.header ? ADD_ALL_ACTION : ADD_ACTION, item, index, $event)"" :title=""ACTIONS[ADD_ACTION].title""></div>
+ <div class=""play-btn grid-btn"" @click.stop=""itemAction(item.header ? PLAY_ALL_ACTION : PLAY_ACTION, item, index, $event)"" :title=""ACTIONS[PLAY_ACTION].title""></div>
</div>
<v-btn icon @click.stop=""itemMenu(item, index, $event)"" :title=""i18n('%1 Menu', item.title)"">
<v-icon>more_vert</v-icon>
@@ -161,6 +161,10 @@ var lmsBrowse = Vue.component(""lms-browse"", {
<v-list-tile v-else-if=""item.type=='text'"" class=""lms-list-item browse-text"">{{item.title}}</v-list-tile>
<v-list-tile v-else-if=""item.header"" class=""lms-list-item browse-header"" @click=""click(item, index, $event)""><v-list-tile-content><v-list-tile-title>{{item.title}}</v-list-tile-title></v-list-tile-content>
<v-list-tile-action class=""browse-action"" v-if=""undefined!=item.stdItem || (item.menu && item.menu.length>0)"" :title=""i18n('%1 Menu', item.title)"">
+ <div v-if=""hoverBtns && 0==selection.size && (undefined!=item.stdItem || item.menu[0]==PLAY_ACTION || item.menu[0]==PLAY_ALL_ACTION)"" class=""list-btns"">
+ <div class=""add-btn grid-btn"" @click.stop=""itemAction(ADD_ALL_ACTION, item, index, $event)"" :title=""ACTIONS[ADD_ACTION].title""></div>
+ <div class=""play-btn grid-btn"" @click.stop=""itemAction(PLAY_ALL_ACTION, item, index, $event)"" :title=""ACTIONS[PLAY_ACTION].title""></div>
+ </div>
<v-btn icon @click.stop=""itemMenu(item, index, $event)"">
<v-icon>more_vert</v-icon>
</v-btn>
@@ -197,7 +201,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
</v-list-tile-content>
<v-list-tile-action class=""browse-action"" v-if=""undefined!=item.stdItem || (item.menu && item.menu.length>0)"">
- <div v-if=""hoverBtns && 0==selection.size && (undefined!=item.stdItem || (item.menu[0]==PLAY_ACTION))"" class=""list-btns"">
+ <div v-if=""hoverBtns && 0==selection.size && (undefined!=item.stdItem || item.menu[0]==PLAY_ACTION || item.menu[0]==PLAY_ALL_ACTION)"" class=""list-btns"">
<div class=""add-btn grid-btn"" @click.stop=""itemAction(ADD_ACTION, item, index, $event)"" :title=""ACTIONS[ADD_ACTION].title""></div>
<div class=""play-btn grid-btn"" @click.stop=""itemAction(PLAY_ACTION, item, index, $event)"" :title=""ACTIONS[PLAY_ACTION].title""></div>
</div>
@@ -678,7 +682,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
this.jumplistActive=0;
this.hoverBtns = !IS_MOBILE && this.items.length>0 &&
(this.items[0].stdItem==STD_ITEM_ARTIST || this.items[0].stdItem==STD_ITEM_ALBUM || this.items[0].stdItem==STD_ITEM_TRACK ||
- (this.items[0].menu && this.items[0].menu[0]==PLAY_ACTION));
+ (this.items[0].menu && (this.items[0].menu[0]==PLAY_ACTION || this.items[0].menu[0]==PLAY_ALL_ACTION)));
if (item.id.startsWith(SEARCH_ID)) {
this.tbarActions=[SEARCH_LIB_ACTION];
",0
"diff --git a/MaterialSkin/HTML/material/html/js/server.js b/MaterialSkin/HTML/material/html/js/server.js const PLAYER_STATUS_TAGS = ""tags:cdegloyrstABKNST"";
+window.nativeObj = function NativeClass(){};
+function updateNative(status) {
+ if (undefined==window.nativeObj || undefined!=window.nativeObj.updateStatus) {
+ return;
+ }
+
+ try {
+ window.nativeObj.updateStatus(status);
+ } catch (e) {
+ }
+}
+
function getHiddenProp(){
var prefixes = ['webkit','moz','ms','o'];
@@ -443,6 +455,7 @@ var lmsServer = Vue.component('lms-server', {
bus.$emit(isCurrent ? 'playerStatus' : 'otherPlayerStatus', player);
if (isCurrent) {
+ updateNative(player);
this.scheduleNextPlayerStatusUpdate(data.mode === ""play""
? data.waitingToPlay
? 1000 // Just starting to play? Poll in 1 second
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js 'use strict';
var B_ALBUM_SORTS=[ ];
+var NO_ADD_ALL = new Set(['radioparadise', 'artistinfo', 'albuminfo', 'genreinfo']); // Allow add-all/play-all from 'trackinfo', as Spotty's 'Top Titles' access via 'More' needs this
var lmsBrowse = Vue.component(""lms-browse"", {
template: `
@@ -751,11 +752,9 @@ var lmsBrowse = Vue.component(""lms-browse"", {
}
// No menu actions? If first item is an audio trsck, add a PlayAll/AddAll to toolbar. This will add each item individually
- if (this.tbarActions.length==0 && this.items.length>1 && this.items.length<=200 && isAudioTrack(this.items[0]) && this.items[0].menu && this.items[0].menu.length>0 &&
- (this.items[0].menu[0]==ADD_ACTION || this.items[0].menu[0]==PLAY_ACTION) && (!item.id || !item.id.startsWith(TOP_ID_PREFIX)) &&
- // Allow add-all/play-all from 'trackinfo', as Spotty's 'Top Titles' access via 'More' needs this
- !(this.command.command.length>0 && (/*this.command.command[0]==""trackinfo"" || */this.command.command[0]==""artistinfo"" ||
- this.command.command[0]==""albuminfo"") || this.command.command[0]==""genreinfo"")) {
+ if (this.tbarActions.length==0 && this.items.length>1 && this.items.length<=200 && isAudioTrack(this.items[0]) && this.items[0].menu &&
+ this.items[0].menu.length>0 && this.command.command.length>0 && !NO_ADD_ALL.has(this.command.command[0]) &&
+ (this.items[0].menu[0]==ADD_ACTION || this.items[0].menu[0]==PLAY_ACTION) && (!item.id || !item.id.startsWith(TOP_ID_PREFIX))) {
this.tbarActions=[ADD_ALL_ACTION, PLAY_ALL_ACTION];
// add-all/play-all is SLOW, but youtube allows add/play on modified version of parentID - where we make this
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js 'use strict';
var B_ALBUM_SORTS=[ ];
-var NO_ADD_ALL = new Set(['radioparadise', 'artistinfo', 'albuminfo', 'genreinfo']); // Allow add-all/play-all from 'trackinfo', as Spotty's 'Top Titles' access via 'More' needs this
+var NO_ADD_ALL = new Set(['radioparadise', 'lastmix', 'playhistory', 'wefunk', 'artistinfo', 'albuminfo', 'genreinfo']); // Allow add-all/play-all from 'trackinfo', as Spotty's 'Top Titles' access via 'More' needs this
var lmsBrowse = Vue.component(""lms-browse"", {
template: `
",0
"diff --git a/MaterialSkin/HTML/material/html/js/server.js b/MaterialSkin/HTML/material/html/js/server.js @@ -138,6 +138,12 @@ function playerIcon(player) {
return {icon:""android""};
}
}
+ if (player.model==""squeezeplayer"") {
+ if (player.modelname==""SqueezePlayer"") {
+ return {icon:""android""};
+ }
+ }
+
return {icon:""speaker""};
}
",0
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -2080,6 +2080,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
this.fetchingItems=true;
lmsCommand("""", [""material-skin"", ""browsemodes""]).then(({data}) => {
if (data && data.result) {
+ logJsonMessage(""RESP"", data);
this.myMusic = [];
var stdItems = new Set();
// Get basic, configurable, browse modes...
@@ -2163,6 +2164,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
} else {
lmsList(this.playerId(), [""menu"", ""items""], [""direct:1""]).then(({data}) => {
if (data && data.result && data.result.item_loop) {
+ logJsonMessage(""RESP"", data);
for (var idx=0, loop=data.result.item_loop, loopLen=loop.length; idx<loopLen; ++idx) {
var c = loop[idx];
if (c.node==""myMusic"" && c.id) {
",0
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -266,6 +266,10 @@ div.v-subheader {
height:calc(var(--list-elem-3line-height) - 1px) !important;
}
+.lms-list-item {
+ border-bottom: 1px solid var(--list-item-border-color);
+}
+
/* Make action buttons in lists closer together */
.list__tile__action {
min-width:48px !important;
",0
"diff --git a/MaterialSkin/Plugin.pm b/MaterialSkin/Plugin.pm @@ -194,7 +194,7 @@ sub initCLI {
Slim::Control::Request::addDispatch(['material-skin-group', '_cmd'], [1, 0, 1, \&_cliGroupCommand]);
# Notification
- Slim::Control::Request::addDispatch(['material-skin', 'notification', '_msg'], [0, 0, 0, undef]);
+ Slim::Control::Request::addDispatch(['material-skin', 'notification', '_type', '_msg'], [0, 0, 0, undef]);
}
sub _startsWith {
",0
"diff --git a/ChangeLog b/ChangeLog value from the current browe history. If this still fails and the track is
marked as comming from a compilation then use LMS's 'Various Artists' string.
6. Call icon mapping for favourites.
+7. Add support for sending notifications from perl to webapp.
2.6.1
-----
",0
"diff --git a/MaterialSkin/HTML/material/html/js/mediasession.js b/MaterialSkin/HTML/material/html/js/mediasession.js @@ -157,8 +157,16 @@ Vue.component('lms-mediasession', {
} else {
this.pauseSilence();
}
+ console.log(this.media.cover);
navigator.mediaSession.playbackState = this.playerStatus && this.playerStatus.isplaying ? ""playing"" : ""paused"";
if (force || this.playerStatus.current.title!=this.media.title || artist!=this.media.artist || this.playerStatus.current.album!=this.media.album) {
+ let artwork = undefined;
+ if (undefined!=this.media.cover && this.media.cover.endsWith('_1024x1024_f')) {
+ artwork = [ {src: this.media.cover.replace('_1024x1024_f', '_300x300_f') , sizes: '300x300', type: 'image/jpeg'},
+ {src: """"+this.media.cover, sizes: '1024x1024', type: 'image/jpeg'} ];
+ } else {
+ artwork = [ {src: """"+this.media.cover, type: 'image/jpeg'} ];
+ }
this.media.title = this.playerStatus.current.title;
this.media.artist = artist;
this.media.album = this.playerStatus.current.album;
@@ -166,7 +174,7 @@ Vue.component('lms-mediasession', {
title: this.media.title,
artist: this.media.artist,
album: this.media.album,
- artwork: [ {src: """"+this.media.cover, type: 'image/jpeg'}]
+ artwork: artwork
});
}
}
",0
"diff --git a/MaterialSkin/HTML/material/html/js/customactions.js b/MaterialSkin/HTML/material/html/js/customactions.js @@ -75,7 +75,7 @@ function performCustomAction(obj, action, player, item) {
}
}
-const ACTION_KEYS = ['ID', 'NAME', 'ARTISTID', 'ARTISTNAME', 'ALBUMID', 'ALBUMNAME', 'TRACKID', 'TRACKNAME', 'TRACKNUM', 'DISC', 'GENREID', 'GENRENAME', 'YEAR', 'COMPOSER'];
+const ACTION_KEYS = ['ID', 'NAME', 'ARTISTID', 'ARTISTNAME', 'ALBUMID', 'ALBUMNAME', 'TRACKID', 'TRACKNAME', 'TRACKNUM', 'DISC', 'GENREID', 'GENRENAME', 'YEAR', 'COMPOSER', 'LANG'];
function doReplacements(string, player, item) {
let val = ''+string;
@@ -142,6 +142,7 @@ function doReplacements(string, player, item) {
}
}
val=val.replace(""$HOST"", window.location.hostname);
+ val=val.replace(""$LANG"", undefined==lmsOptions.lang ? 'en' : lmsOptions.lang);
for (var i=0, len=ACTION_KEYS.length; i<len; ++i) {
val = val.replace(""+$""+ACTION_KEYS[i], """").replace(""$""+ACTION_KEYS[i]+""+"", """").replace(""$""+ACTION_KEYS[i], """");
}
",0
"diff --git a/MaterialSkin/HTML/material/html/misc/track-sources.json b/MaterialSkin/HTML/material/html/misc/track-sources.json ""bandcamp:"":""Bandcamp"",
""https://media-ssl.musicradio.com/"":""Global Player (UK)"",
""https://stream.radiofrance.fr/"":""Radio France"",
- ""youtube:"":""YouTube""
+ ""youtube:"":""YouTube"",
+ ""pandora:"":""Pandora""
},
""includes"":{
"".radioparadise.com/"":""Radio Paradise"",
",0
"diff --git a/MaterialSkin/HTML/material/html/misc/track-sources.json b/MaterialSkin/HTML/material/html/misc/track-sources.json {
""prefix"":{
""deezer:"":{
- ""name"":""Deezer""
+ ""name"":""Deezer"",
+ ""url"":{
+ ""from"":""deezer://"",
+ ""to"":""https://www.deezer.com/track/"",
+ ""removeext"":true
+ }
},
""spotify:"":{
""name"":""Spotify"",
}
},
""wimp:"":{
- ""name"":""Tidal""
+ ""name"":""Tidal"",
+ ""url"":{
+ ""from"":""wimp://"",
+ ""to"":""https://tidal.com/browse/track/"",
+ ""removeext"":true
+ }
},
""qobuz:"":{
""name"":""Qobuz"",
",0
"diff --git a/MaterialSkin/HTML/material/html/js/information.js b/MaterialSkin/HTML/material/html/js/information.js @@ -66,7 +66,7 @@ Vue.component('lms-information-dialog', {
</ul>
<v-btn v-if=""updates.details.length>0 && 'idle'==pluginStatus && unlockAll"" @click=""updatePlugins"" flat><img class=""svg-img btn-icon"" :src=""'update' | svgIcon(darkUi)"">{{i18n('Update plugins')}}</v-btn>
<p v-if=""'downloading'==pluginStatus""><v-icon class=""pulse"">cloud_download</v-icon> {{i18n('Downloading plugin updates')}}</p>
- <v-btn v-if=""'needs_restart'==pluginStatus && unlockAll"" @click=""restartServer"" flat>{{i18n('Restart server')}}</v-btn>
+ <v-btn v-if=""'needs_restart'==pluginStatus && unlockAll"" @click=""restartServer"" flat><img class=""svg-img btn-icon"" :src=""'restart' | svgIcon(darkUi)"">{{i18n('Restart server')}}</v-btn>
<p v-if=""'downloading'!=pluginStatus && updates.details.length>0"" style=""padding-top:16px"">{{i18n('The following plugins are up to date:')}}</p>
<ul>
<template v-for=""(plug, index) in plugins.details""><li v-if=""'downloading'==pluginStatus || !updates.names.has(plug.name)""><object class=""link-item"" @click=""pluginInfo(plug)"">{{plug.title}} {{plug.version}}</object></li></template>
",0
"diff --git a/MaterialSkin/HTML/material/html/js/queue-page.js b/MaterialSkin/HTML/material/html/js/queue-page.js @@ -1040,12 +1040,14 @@ var lmsQueue = Vue.component(""lms-queue"", {
selection = Array.from(this.selection);
selection.sort(function(a, b) { return a<b ? -1 : 1; });
} else {
- selection.push(which);
+ selection.push(this.dragIndex);
}
var urls = [];
for (var i=0, len=selection.length; i<len; ++i) {
+ if (i>=0 && i<this.items.length) {
urls.push(this.items[selection[i]].url);
}
+ }
return urls;
},
dragEnd() {
",0
"diff --git a/MaterialSkin/HTML/material/html/js/player-settings-plugin.js b/MaterialSkin/HTML/material/html/js/player-settings-plugin.js @@ -26,7 +26,7 @@ Vue.component('lms-player-settings-plugin', {
<template v-for=""(item, index) in items"">
<v-list-tile v-if=""item.slider"" class=""lms-list-item"">
<v-flex xs12>
- <v-layout>
+ <v-layout style=""padding-top:4px"">
<v-btn flat icon @click=""decrementSlider(item)"" style=""margin-top: 14px;""><v-icon>remove_circle_outline</v-icon></v-btn>
<v-slider :step=""item.adjust"" :min=""item.min"" :max=""item.max"" v-model=""item.initial"" @change=""sliderChanged(item)""></v-slider>
<v-btn flat icon @click=""incrementSlider(item)"" style=""margin-top: 14px;""><v-icon>add_circle_outline</v-icon></v-btn>
",0
"diff --git a/MaterialSkin/HTML/EN/html/material-skin/index.html b/MaterialSkin/HTML/EN/html/material-skin/index.html <li>Desktop</li>
</ul>
By default the app will attempt to use the correct layout depending on the width of your current screen. However, you may use
- ""Settings -> Interface"" to override this and force the usage of one or the other.
+ 'Settings -> Interface' to override this and force the usage of one or the other.
</p>
<p>This help page will provide some basic information that will hopefully provide some useful detail on how to use app.
</p>
</p>
<br/>
+ <h1>Browse modes</h1>
+ <p>Usually with LMS the list of browse modes (e.g. Artists, Albums, Genres) is configured per-player. This is why in
+ the 'Extra settings' section of 'Player settings' there is a section named 'Additional Browse Modes.' However, as
+ this app is designed to control multiple players, the list of browse modes available for this app is not configured
+ there but in 'Settings -> Interface'. In that dialog you will see a set of checkboxes to configure which categories
+ are shown on the 'Home' screen. The 'My Music' entry has a cog icon next to it. Pressing on this icon will produce
+ a dialog allowing you to configure which browse modes will be shown with this app.
+ </p>
+ <br/>
+
+ <h1>Virtual libraries</h1>
+ <p>Virtual libraries in LMS are a way of creating sub-libraries of your music collection. e.g. you could have a
+ library for each member of your family, so they only see the artists, etc., that they care about.
+ </p>
+ <p>As per 'Browse modes' LMS usually sets the active library per-player. And with this app you can set a library
+ for a player in the 'Player settings' dialog. If so, then that library would restrict the tracks that some
+ LMS features (such as 'Random mix') would use. However, this app differs again from standard LMS by allowing
+ the library selection to be set for this instance of the app, and would be the same no matter which player
+ you chose. So, for example, a family member would see their desired library no matter which player they were
+ currently trying to control.
+ </p>
+ <p>Please note, however, that these libraries, and the selection thereof, will not be visible until you actually
+ create such a library. There are various ways to do this; via saving an 'Advanced search' (click on the search
+ icon on this app's home screen, and then click on the 'Advanced search' icon that appears subsequently), or use
+ plugins such as 'Simple library views.'
+ </p>
+
</div>
</body>
</html>
\ No newline at end of file
",0
"diff --git a/MaterialSkin/HTML/material/html/js/iframe-dialog.js b/MaterialSkin/HTML/material/html/js/iframe-dialog.js @@ -49,6 +49,41 @@ function fixClassicSkinRefs(doc) {
}
}
+function iframeBrowseArtist(id, name, role) {
+ bus.$emit(""browse"", [""albums""], [""artist_id:""+id, ARTIST_ALBUM_TAGS, SORT_KEY+ARTIST_ALBUM_SORT_PLACEHOLDER, ""role_id:""+(undefined==role ? ""ALBUMARTIST"" : role)], name, undefined);
+ bus.$emit('iframe-close');
+}
+
+function iframeBrowseAlbum(id, name) {
+ bus.$emit(""browse"", [""tracks""], [""album_id:""+id, TRACK_TAGS, SORT_KEY+""tracknum""], name, undefined);
+ bus.$emit('iframe-close');
+}
+
+function iframeBrowseGenre(name) {
+ bus.$emit(""browse"", ""genre"", name, name);
+ bus.$emit('iframe-close');
+}
+
+function iframeBrowseYear(name) {
+ bus.$emit(""browse"", ""year"", name, name);
+ bus.$emit('iframe-close');
+}
+
+function iframeTrackInfo(id, name) {
+ bus.$emit('trackInfo', {id:""track_id:""+id, title:name});
+ bus.$emit('iframe-close');
+}
+
+function addHooks(doc) {
+ doc.lmsMaterialSkin = {
+ browseArtist:iframeBrowseArtist,
+ browseAlbum:iframeBrowseAlbum,
+ browseGenre:iframeBrowseGenre,
+ browseYear:iframeBrowseYear,
+ trackInfo:iframeTrackInfo
+ }
+}
+
var iframeMenuOpen = false;
function iframeClickHandler(e) {
if (iframeMenuOpen) {
@@ -274,6 +309,7 @@ function hideClassicSkinElems(page, textCol) {
fixClassicSkinRefs(content);
remapClassicSkinIcons(content, textCol);
+ addHooks(content);
let toHide = undefined;
if ('player'==page) {
@@ -473,6 +509,9 @@ Vue.component('lms-iframe-dialog', {
}
this.src = ref;
}.bind(this));
+ bus.$on('iframe-close', function() {
+ this.close();
+ }.bind(this));
bus.$on('noPlayers', function() {
this.close();
}.bind(this));
",0
"diff --git a/circle.yml b/circle.yml @@ -18,6 +18,7 @@ dependencies:
- /home/ubuntu/nvm/versions/node/v6.9.4/lib/node_modules
override:
- yarn global add bower
+ - yarn global add phantomjs-prebuilt
- yarn add node-sass
- yarn install
- bower install
",0
"diff --git a/app/templates/components/donation-goal-edit.hbs b/app/templates/components/donation-goal-edit.hbs <div class=""amount-group"">
<span class=""currency"">$</span>
- {{input class=""amount"" name=""amount"" type=""number"" placeholder=""Custom amount"" value=amount}}
+ {{input class=""amount"" name=""amount"" type=""number"" min=""0"" step=""1"" placeholder=""Custom amount"" value=amount}}
<span class=""period"">per month</span>
</div>
{{#each donationGoal.errors.amount as |error|}}
",0
"diff --git a/app/index.html b/app/index.html <link rel=""icon"" href=""https://d3pgew4wbk2vb1.cloudfront.net/icons/favicon.png"">
<link rel=""icon"" href=""https://d3pgew4wbk2vb1.cloudfront.net/icons/favicon-32.png"" sizes=""32x32"">
+ <title>Code Corps | Build a better future.</title>
+ <meta property=""description"" content=""Contribute to software projects for social good. Give your time or money to help build software to better the arts, education, government, science, and more.""></meta>
+ <meta property=""og:description"" content=""Contribute to software projects for social good. Give your time or money to help build software to better the arts, education, government, science, and more.""></meta>
+ <meta property=""og:image"" content=""https://d3pgew4wbk2vb1.cloudfront.net/images/universal-card.png""></meta>
+ <meta property=""og:site_name"" content=""Code Corps""></meta>
+ <meta property=""og:title"" content=""Code Corps | Build a better future.""></meta>
+ <meta property=""og:type"" content=""website""></meta>
+ <meta property=""og:url"" content=""http://www.codecorps.org""></meta>
+ <meta name=""twitter:card"" content=""summary_large_image""></meta>
+ <meta name=""twitter:creator"" content=""@thecodecorps""></meta>
+ <meta name=""twitter:creator:id"" content=""4608917052""></meta>
+ <meta name=""twitter:description"" content=""Contribute to software projects for social good. Give your time or money to help build software to better the arts, education, government, science, and more.""></meta>
+ <meta name=""twitter:image"" content=""https://d3pgew4wbk2vb1.cloudfront.net/images/universal-card.png""></meta>
+ <meta name=""twitter:site"" content=""@thecodecorps""></meta>
+ <meta name=""twitter:site:id"" content=""4608917052""></meta>
+ <meta name=""twitter:title"" content=""Code Corps | Build a better future.""></meta>
+
{{content-for ""head""}}
<link rel=""stylesheet"" href=""{{rootURL}}assets/vendor.css"">
",0
"diff --git a/app/templates/components/navigation-menu.hbs b/app/templates/components/navigation-menu.hbs <nav class=""header-navigation--left"">
<ul class=""header-navigation__options"">
<li>{{#link-to 'projects-list'}}Projects{{/link-to}}</li>
+ <li><a href=""https://codecorps.typeform.com/to/rMxOCA"">Submit a project</a></li>
<li><a href=""https://blog.codecorps.org"">Blog</a></li>
</ul>
</nav>
",0
"diff --git a/tests/test-helper.js b/tests/test-helper.js @@ -4,6 +4,8 @@ import {
} from 'ember-qunit';
import { start } from 'ember-cli-qunit';
import './helpers/flash-message';
+import loadEmberExam from 'ember-exam/test-support/load';
+loadEmberExam();
setResolver(resolver);
start();
",0
"diff --git a/app/router.js b/app/router.js @@ -15,6 +15,7 @@ const Router = EmberRouter.extend(RouterScroll, {
this._trackPage();
},
+ // Track the page view in Segment when it renders
_trackPage() {
run.scheduleOnce('afterRender', this, () => {
let page = document.location.pathname;
@@ -34,6 +35,7 @@ Router.map(function() {
});
});
+ // GitHub OAuth redirection route
this.route('github', {
path: '/oauth/github'
});
@@ -58,8 +60,8 @@ Router.map(function() {
this.route('privacy');
this.route('project', { path: '/:slugged_route_slug/:project_slug' }, function() {
- this.route('checkout');
- this.route('donate');
+ this.route('checkout'); // Where you enter your credit card details
+ this.route('donate'); // Where you choose your donation amount
this.route('settings', function() {
this.route('contributors');
this.route('donations', function() {
@@ -73,9 +75,10 @@ Router.map(function() {
this.route('new');
this.route('task', { path: '/:number' });
});
- this.route('thank-you');
+ this.route('thank-you'); // When your donation successfully processed
});
+ // Organization's projects
this.route('projects', {
path: '/:slugged_route_slug/projects'
});
@@ -89,6 +92,7 @@ Router.map(function() {
this.route('forgot');
});
+ // User settings
this.route('settings', function() {
this.route('profile');
this.route('integrations');
@@ -96,10 +100,13 @@ Router.map(function() {
this.route('signup');
+ // User *or* organization routes
+ // e.g. /code-corps or /joshsmith
this.route('slugged-route', {
path: '/:slugged_route_slug'
});
+ // Onboarding routes
this.route('start', function() {
this.route('hello');
this.route('interests');
",0
"diff --git a/config/environment.js b/config/environment.js @@ -7,7 +7,7 @@ module.exports = function(environment) {
rootURL: '/',
routerRootURL: '/',
locationType: 'auto',
- API_HOST: 'https://s3.amazonaws.com/api-docs.emberjs.com',
+ API_HOST: 'https://s3.amazonaws.com/api-docs.emberjs.com/json-docs',
IS_FASTBOOT: !!process.env.EMBER_CLI_FASTBOOT,
EmberENV: {
EXTEND_PROTOTYPES: false,
",0
"diff --git a/README.md b/README.md -# Ember-api-docs
+# Ember-api-docs [![Build Status](https://travis-ci.org/ember-learn/ember-api-docs.svg?branch=master)](https://travis-ci.org/ember-learn/ember-api-docs)
This app is used to produce versioned Ember api docs. To view the data generator producing its data, please visit https://github.com/ember-learn/ember-jsonapi-docs
",0
"diff --git a/app/routes/project-version.js b/app/routes/project-version.js @@ -46,6 +46,12 @@ export default Ember.Route.extend({
case 'project-version.class.index':
endingRoute = `classes/${this.modelFor('project-version.class').get('name')}`;
break;
+ case 'project-version.module.index':
+ const moduleName = this.paramsFor('project-version.module').module;
+ endingRoute = `modules/${moduleName}`;
+ case 'project-version.namespace.index':
+ const namespaceName = this.paramsFor('project-version.namespace').namespace;
+ endingRoute = `namespaces/${namespaceName}`;
default:
break;
}
",0
"diff --git a/README.md b/README.md This app is used to produce versioned Ember api docs. To view the data generator producing its data, please visit https://github.com/ember-learn/ember-jsonapi-docs
+## Want to help out?
+We'd love to get help working on the [next set of issues we're seeing](https://github.com/ember-learn/ember-api-docs/projects/2)
## a11y testing
",0
"diff --git a/README.md b/README.md This app is used to produce versioned Ember api docs. To view the data generator producing its data, please visit https://github.com/ember-learn/ember-jsonapi-docs
## Want to help out?
-We'd love to get help working on the [next set of issues we're seeing](https://github.com/ember-learn/ember-api-docs/projects/2)
+We'd love to get help working on the [next set of issues we're seeing](https://github.com/ember-learn/ember-api-docs/projects/2) & to see how to get started on this project, checkout [CONTRIBUTING.md](https://github.com/ember-learn/ember-api-docs/blob/master/CONTRIBUTING.md)
## a11y testing
",0
"diff --git a/app/templates/components/class-field-description.hbs b/app/templates/components/class-field-description.hbs <span class=""access"">deprecated</span>
{{/if}}
</h3>
- <p class=""github-link"">
+ <p class=""github-link"" data-test-file={{field.file}}>
{{#if field.inherited}}
Inherited from
<a href=""{{github-link model.project.id model.projectVersion.version field.file field.line}}"" target=""_blank"" rel=""noopener"">
",0
"diff --git a/tests/integration/components/api-index-filter-test.js b/tests/integration/components/api-index-filter-test.js @@ -15,10 +15,20 @@ const model = EmberObject.create({
version: '2.9'
},
name: 'hai',
+ file: 'my-class',
+ parentClass: {
+ file: 'my-class'
+ },
methods: [
{
name: 'doSomething',
- route: 'do-something'
+ route: 'do-something',
+ file: 'my-class'
+ },
+ {
+ name: 'doSomething',
+ route: 'do-something',
+ file: 'my-parent-class'
},
{
name: 'parentDoSomething',
@@ -371,3 +381,29 @@ test('clicking all toggles off should only show public', async function(assert)
assert.dom(findAll('.method-name')[0]).hasText('doSomething', 'should display 1 public method');
});
+
+
+test('should show only local method implementation when duplicates', async function (assert) {
+ let filterData = EmberObject.create({
+ showInherited: true,
+ showProtected: false,
+ showPrivate: false,
+ showDeprecated: false
+ });
+
+ this.set('model', model);
+ this.set('filterData', filterData);
+
+ this.render(hbs`
+ {{#api-index-filter model=model filterData=filterData as |myModel|}}
+ <h2>Methods</h2>
+ {{#each myModel.methods as |method|}}
+ <p class=\""method-name\"">{{method.name}}</p>
+ {{/each}}
+ {{/api-index-filter}}
+ `);
+ assert.equal(findAll('.method-name').length, 2, 'should display only the local method and the parent method with a different name');
+ assert.dom(findAll('.method-name')[0]).hasText('doSomething', 'should display 1 public method');
+ assert.dom(findAll('.method-name')[1]).hasText('parentDoSomething', 'should display 1 inherited method');
+
+});
",0
"diff --git a/config/environment.js b/config/environment.js @@ -24,7 +24,7 @@ module.exports = function(environment) {
// Here you can pass flags/options to your application instance
// when it is created
scrollContainerSelector: 'body, html',
- cdnUrl: process.env.FASTLY_CDN_URL ? process.env.FASTLY_CDN_URL : ''
+ cdnUrl: process.env.FASTLY_CDN_URL ? `https://process.env.FASTLY_CDN_URL` : ''
},
fastboot: {
",0
"diff --git a/tests/acceptance/switch-versions-test.js b/tests/acceptance/switch-versions-test.js @@ -32,6 +32,16 @@ test('switching module versions less than 2.16 should retain module page', async
assert.equal(currentURL(), '/ember/1.4/modules/ember-metal', 'navigated to v2.7 module');
});
+
+test('switching module versions greater than 2.16 should retain module page', async function(assert) {
+ await visit('/ember/2.18/modules/@ember%2Fapplication');
+ assert.equal(currentURL(), '/ember/2.18/modules/@ember%2Fapplication', 'navigated to v2.18 module');
+ await selectChoose('.select-container', '2.17');
+ assert.equal(currentURL(), '/ember/2.17/modules/@ember%2Fapplication', 'navigated to v2.17 module');
+ await selectChoose('.select-container', '2.16');
+ assert.equal(currentURL(), '/ember/2.16/modules/@ember%2Fapplication', 'navigated to v2.16 module');
+});
+
test('switching specific method less than 2.16 should retain method', async function (assert) {
await visit('/ember/2.8/classes/Ember.Component/methods/didReceiveAttrs?anchor=didReceiveAttrs')
assert.equal(currentURL(), '/ember/2.8/classes/Ember.Component/methods/didReceiveAttrs?anchor=didReceiveAttrs', 'navigated to v2.8 method');
@@ -87,6 +97,3 @@ test('switching from class version 2.16 to class version less then 2.16 should r
await selectChoose('.select-container', '2.11');
assert.equal(currentURL(), '/ember/2.11/modules/ember', 'navigated to v2.11 ember module');
});
-
-
-
",0
"diff --git a/app/routes/project-version/functions/function.js b/app/routes/project-version/functions/function.js import Route from '@ember/routing/route';
import getFullVersion from 'ember-api-docs/utils/get-full-version';
import { inject as service } from '@ember/service';
-import { get } from '@ember/object';
+import { get, set } from '@ember/object';
+import createExcerpt from 'ember-api-docs/utils/create-excerpt';
export default Route.extend({
@@ -32,6 +33,13 @@ export default Route.extend({
};
},
+ afterModel(model) {
+ let description = model.fn.description
+ if (description) {
+ set(this, 'headData.description', createExcerpt(description));
+ }
+ },
+
getFunctionObjFromList(classObj, functionName) {
return classObj.get('methods').find(fn => {
return fn.name === functionName;
",0
"diff --git a/README.md b/README.md @@ -4,7 +4,7 @@ This project contains only the [API docs](https://emberjs.com/api) portion of [E
see the [website](https://github.com/emberjs/website)
and [guides](https://github.com/emberjs/guides) repositories.
-There are four pieces that together create the Ember API docs:
+There are five pieces that together create the Ember API docs site:
- The app in this repository, which fetches and displays the API docs data. It is what you see at
[https://emberjs.com/api](https://emberjs.com/api)
- The YUIdoc code comments found in the
@@ -14,6 +14,7 @@ deploys the result,
[ember-jsonapi-docs](https://github.com/ember-learn/ember-jsonapi-docs)
- [ember-styleguide](https://github.com/ember-learn/ember-styleguide),
a component and styling library shared across apps.
+- [algolia-index-update-scripts](https://github.com/ember-learn/algolia-index-update-scripts) for managing the search feature of the api docs site
## Contributing
",0
"diff --git a/tests/acceptance/scroll-reset-on-transition-test.js b/tests/acceptance/scroll-reset-on-transition-test.js @@ -64,3 +64,14 @@ test('reset scroll on transitions', async function(assert) {
assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is resetted after visiting route with same tab but different model');
});
+
+test('reset scroll on transitions when transition between >=2.16 and <=2.15', async function(assert) {
+ await visit('/ember/2.16');
+
+ $(scrollContainerSelector).scrollTop(1000);
+ assert.notEqual($(scrollContainerSelector).scrollTop(), 0, 'scroll position is NOT zero after scroll on fresh visit');
+
+ await visit('/ember/2.15/classes/Ember.View');
+
+ assert.equal($(scrollContainerSelector).scrollTop(), 0, 'scroll position is zero after transition to different route');
+});
",0
"diff --git a/app/templates/components/class-field-description.hbs b/app/templates/components/class-field-description.hbs <span class=""access"">deprecated</span>
{{/if}}
</h3>
+ {{#if model.module}}
+ <div class=""attributes"">
+ <div class=""attribute"">
+ <span class=""attribute-label"">Module:</span>
+ <span class=""attribute-value"">{{#link-to 'project-version.modules.module' model.projectVersion.compactVersion model.module}}{{model.module}}{{/link-to}}</span>
+ </div>
+ </div>
+ {{/if}}
<p class=""github-link"" data-test-file={{field.file}}>
{{#if field.inherited}}
Inherited from
",0
"diff --git a/app/templates/project-version/index.hbs b/app/templates/project-version/index.hbs </p>
<h2>Commonly searched-for documentation</h2>
<ul class=""spec-method-list"">
- <li>{{#link-to 'project-version.classes.class' 'Component'}}Component{{/link-to}} - a view that is completely isolated</li>
+ <li>Components - {{#link-to 'project-version.classes.class' 'Component'}}Classic{{/link-to}} or {{#link-to 'project-version.modules.module' '@glimmer/component'}}Glimmer{{/link-to}}; a view that is completely isolated</li>
<li>{{#link-to 'project-version.classes.class' 'ComputedProperty'}}Computed Properties{{/link-to}} - declare functions as properties</li>
<li>{{#link-to 'project-version.classes.class' '@ember/object/computed'}}Computed Macros{{/link-to}} - shorter ways of expressing certain types of computed properties</li>
<li>{{#link-to 'project-version.classes.class' 'EmberArray'}}EmberArray{{/link-to}} - contains methods like {{#link-to 'project-version.classes.class.methods.method' 'EmberArray' 'forEach' (query-params anchor='forEach')}}forEach{{/link-to}} and {{#link-to 'project-version.classes.class.methods.method' 'EmberArray' 'mapBy' (query-params anchor='mapBy')}}mapBy{{/link-to}} that help you iterate over Ember Objects</li>
",0
"diff --git a/app/templates/project-version/index.hbs b/app/templates/project-version/index.hbs <h2>Commonly searched-for documentation</h2>
<ul class=""spec-method-list"">
<li>Components - {{#link-to 'project-version.classes.class' 'Component'}}Classic{{/link-to}} or {{#link-to 'project-version.modules.module' '@glimmer/component'}}Glimmer{{/link-to}}; a view that is completely isolated</li>
+ <li>{{#link-to 'project-version.functions.function' '@glimmer/tracking' 'tracked'}}Tracked{{/link-to}} - make your templates responsive to property updates</li>
<li>{{#link-to 'project-version.classes.class' 'ComputedProperty'}}Computed Properties{{/link-to}} - declare functions as properties</li>
<li>{{#link-to 'project-version.classes.class' '@ember/object/computed'}}Computed Macros{{/link-to}} - shorter ways of expressing certain types of computed properties</li>
<li>{{#link-to 'project-version.classes.class' 'EmberArray'}}EmberArray{{/link-to}} - contains methods like {{#link-to 'project-version.classes.class.methods.method' 'EmberArray' 'forEach' (query-params anchor='forEach')}}forEach{{/link-to}} and {{#link-to 'project-version.classes.class.methods.method' 'EmberArray' 'mapBy' (query-params anchor='mapBy')}}mapBy{{/link-to}} that help you iterate over Ember Objects</li>
",0
"diff --git a/config/deprecation-workflow.js b/config/deprecation-workflow.js @@ -3,5 +3,7 @@ self.deprecationWorkflow.config = {
workflow: [
{ handler: 'silence', matchId: 'ember.globals-resolver' },
{ handler: 'silence', matchId: 'ember-component.is-visible' },
+ { handler: 'silence', matchId: 'manager-capabilities.modifiers-3-13' },
+ { handler: 'silence', matchId: 'this-property-fallback' },
],
};
",0
"diff --git a/docs.yaml b/docs.yaml @@ -30,5 +30,7 @@ links:
- title: Npm
href: https://www.npmjs.org/package/dse-driver
versions:
+ - name: '1.4'
+ ref: 'master'
- name: '1.3'
- ref: 'dse'
\ No newline at end of file
+ ref: '1.3'
\ No newline at end of file
",0
"diff --git a/lib/types/index.js b/lib/types/index.js @@ -234,6 +234,25 @@ const protocolEvents = {
/**
* Server error codes returned by Cassandra
+ * @type {Object}
+ * @property {Number} serverError Something unexpected happened.
+ * @property {Number} protocolError Some client message triggered a protocol violation.
+ * @property {Number} badCredentials Authentication was required and failed.
+ * @property {Number} unavailableException Raised when coordinator knows there is not enough replicas alive to perform a query with the requested consistency level.
+ * @property {Number} overloaded The request cannot be processed because the coordinator is overloaded.
+ * @property {Number} isBootstrapping The request was a read request but the coordinator node is bootstrapping.
+ * @property {Number} truncateError Error encountered during a truncate request.
+ * @property {Number} writeTimeout Timeout encountered on write query on coordinator waiting for response(s) from replicas.
+ * @property {Number} readTimeout Timeout encountered on read query on coordinator waitign for response(s) from replicas.
+ * @property {Number} readFailure A non-timeout error encountered during a read request.
+ * @property {Number} functionFailure A (user defined) function encountered during execution.
+ * @property {Number} writeFailure A non-timeout error encountered during a write request.
+ * @property {Number} syntaxError The submitted query has a syntax error.
+ * @property {Number} unauthorized The logged user doesn't have the right to perform the query.
+ * @property {Number} invalid The query is syntactically correct but invalid.
+ * @property {Number} configError The query is invalid because of some configuration issue.
+ * @property {Number} alreadyExists The query attempted to create a schema element (i.e. keyspace, table) that already exists.
+ * @property {Number} unprepared Can be thrown while a prepared statement tries to be executed if the provided statement is not known by the coordinator.
*/
const responseErrorCodes = {
serverError: 0x0000,
",0
"diff --git a/build.yaml b/build.yaml @@ -6,8 +6,8 @@ schedules:
exclude:
# Exclude all builds for 6.x.
- nodejs: ['6']
- # Only build with latest for 4.x
- - nodejs: '4'
+ # Only build with latest for 4.x and 10.x
+ - nodejs: ['4','10']
cassandra: ['2.1', '2.2', '3.0']
# Only build with 2.1 and latest for 8.x
- nodejs: '8'
@@ -27,8 +27,9 @@ nodejs:
- '4'
- '6'
- '8'
+ - '10'
os:
- - ubuntu/trusty64
+ - ubuntu/bionic64/nodejs-driver
cassandra:
- '2.1'
- '2.2'
",0
"diff --git a/build.yaml b/build.yaml @@ -11,7 +11,7 @@ schedules:
cassandra: ['2.1', 'dse-5.1', 'dse-6.7', 'dse-6.8']
- nodejs: ['10']
# Examples are run on Node.js 10 and against DSE 6.7
- cassandra: ['2.1', '3.11', 'dse-6.0', 'dse-6.8']
+ cassandra: ['2.1', '3.11', 'dse-6.0']
nightly:
# nightly job for primary branches to run all configs.
schedule: nightly
",0
"diff --git a/build.yaml b/build.yaml @@ -4,14 +4,16 @@ schedules:
schedule: per_commit
matrix:
exclude:
- - nodejs: ['6']
- - nodejs: ['4']
- cassandra: ['3.11', 'dse-5.1', 'dse-6.0', 'dse-6.7', 'dse-6.8']
- nodejs: ['8']
- cassandra: ['2.1', 'dse-5.1', 'dse-6.7', 'dse-6.8']
+ # Include 2.1, dse-6.0
+ cassandra: ['3.11', 'dse-5.1', 'dse-6.7', 'dse-6.8']
- nodejs: ['10']
- # Examples are run on Node.js 10 and against DSE 6.7
- cassandra: ['2.1', '3.11', 'dse-6.0']
+ # Include 3.11, dse-6.8
+ cassandra: ['2.1', 'dse-5.1', 'dse-6.0', 'dse-6.7']
+ - nodejs: ['12']
+ # Include dse-5.1, dse-6.7
+ # Examples are run against DSE 6.7
+ cassandra: ['2.1', '3.11', 'dse-6.0', 'dse-6.8']
nightly:
# nightly job for primary branches to run all configs.
schedule: nightly
@@ -25,10 +27,9 @@ schedules:
branches:
exclude: [""/((\\d+(\\.[\\dx]+)+)|dse|master)/""]
nodejs:
- - '4'
- - '6'
- '8'
- '10'
+ - '12'
os:
- ubuntu/bionic64/nodejs-driver
cassandra:
",0
"diff --git a/js/pager.js b/js/pager.js if (!isVisible.length) {
$('li:visible:first, td:visible:first', self.element).attr('tabindex', '0');
}
- // Fix: Firefox by default not allow keyboard focus on links
- $('li a', this.pagerBar).each(function() {
+
+ // Fix: Firefox by default to not allow keyboard focus on links
+ $('li a', self.pagerBar).each(function() {
var a = $(this),
li = a.closest('li');
",0
"diff --git a/js/listview.js b/js/listview.js // Selection View Click/Touch
if (this.settings.selectable) {
+
this.element.addClass('is-selectable');
var trigger = $('.list-detail-back-button').find('.app-header'),
pattern = $(this.element).closest('.list-detail, .builder');
}
if (!this.settings.hoverable || this.settings.hoverable === 'false') {
+ this.element.removeClass('is-selectable');
+ this.element.addClass('disable-hover');
+ }
+
+ if (!this.settings.selectable || this.settings.selectable === 'false') {
+ this.element.removeClass('is-selectable');
this.element.addClass('disable-hover');
}
",0
"diff --git a/js/mask.js b/js/mask.js self.evaluateCurrentContents(undefined, e);
});
- // remove the value when blurred
- self.element.on('blur.mask', function(e) {
- if (self.element.prop('readonly')) {
- e.preventDefault();
- return false;
- }
-
+ function reprocess() {
var val = self.element.val();
if (self.settings.mustComplete) {
self.processStringAgainstMask(val);
self.element.trigger('change');
}
+ }
+
+ // custom event that can be triggered for forcing a remasking of the input field
+ self.element.on('remask.mask', function() {
+ reprocess();
+ });
+
+ // remove the value when blurred
+ self.element.on('blur.mask', function(e) {
+ if (self.element.prop('readonly')) {
+ e.preventDefault();
+ return false;
+ }
+ reprocess();
self.initValue = null;
});
",0
"diff --git a/js/popupmenu.js b/js/popupmenu.js unwrapPopup($(this));
});
+ if (this.menu[0]) {
$.removeData(this.menu[0], 'trigger');
+ }
+
if (wrapper.data('place')) {
wrapper.data('place').destroy();
}
",0
"diff --git a/js/mask.js b/js/mask.js negative: false,
number: false,
processOnInitialize: true, // If set to false, will not initialially mask the value of the input field.
+ processOnBlur: true, // If set to false, will not mask the value of the input field upon blur.
thousandsSeparator: false,
showSymbol: undefined, // can be 'currency', 'percent'
},
self.evaluateCurrentContents(undefined, e);
});
- function reprocess() {
+ function reprocess(isRemask) {
var val = self.element.val();
if (self.settings.mustComplete) {
self.checkCompletion();
}
if (val && self.initValue !== val) {
+ if (isRemask || self.settings.processOnBlur) {
self.element.val('');
self.processStringAgainstMask(val);
+ }
self.element.trigger('change');
}
}
// custom event that can be triggered for forcing a remasking of the input field
self.element.on('remask.mask', function() {
- reprocess();
+ reprocess(true);
});
// remove the value when blurred
",0
"diff --git a/gruntfile.js b/gruntfile.js @@ -110,6 +110,13 @@ module.exports = function(grunt) {
'concat:basic',
]);
+ grunt.registerTask('js-uglify', [
+ 'copy:amd',
+ 'strip_code',
+ 'concat:basic',
+ 'uglify',
+ ]);
+
// Don't do any uglify/minify/jshint while the Dev Watch is running.
grunt.registerTask('sohoxi-watch', [
'revision', 'sass', 'copy:amd', 'strip_code','concat', 'clean:amd', 'copy:main', 'usebanner'
",0
"diff --git a/js/listview.js b/js/listview.js }
this.element.attr({'tabindex': '-1'});
- this.element.parent('.card-content, .widget-content')[0].style.overflow = 'hidden';
+
+ var cardWidgetContent = this.element.parent('.card-content, .widget-content');
+ if (cardWidgetContent[0]) {
+ cardWidgetContent[0].style.overflow = 'hidden';
+ }
// Add Aria Roles
this.element.attr({ 'role' : 'listbox',
",0
"diff --git a/js/validation.js b/js/validation.js if (field.is('input.dropdown') && field.prev().prev('select').attr('data-validate')) {
validations = field.prev().prev('select').attr('data-validate').split(' ');
- }
- if (field.is('input.dropdown') && field.prev().prev('select').attr('data-validation')) {
+ } else if (field.is('input.dropdown') && field.prev().prev('select').attr('data-validation')) {
validations = field.prev().prev('select').attr('data-validation').split(' ');
- }
- if (field.attr('data-validation')) {
+ } else if (field.attr('data-validation')) {
validations = field.attr('data-validation').split(' ');
- }
- if (field.attr('data-validate')) {
+ } else if (field.attr('data-validate')) {
validations = field.attr('data-validate').split(' ');
+ } else {
+ validations = [];
}
//Filter out not needed events
",0
"diff --git a/js/popupmenu.js b/js/popupmenu.js this.menu[0].style.height = '';
this.menu[0].style.width = '';
+ if (wrapper[0]) {
wrapper[0].style.left = '-999px';
wrapper[0].style.height = '';
wrapper[0].style.width = '';
+ }
this.menu.find('.submenu').off('mouseenter mouseleave').removeClass('is-submenu-open');
if (menu[0]) {
",0
"diff --git a/views/tests/toolbar/toolbar-menu-button-options.html b/views/tests/toolbar/toolbar-menu-button-options.html <div class=""toolbar"">
<div class=""title"">
- Toolbar
+ Toolbar Title
</div>
<div class=""buttonset"">
<button type=""button"" id=""button-1"" class=""btn"">
- <span>Space Filler Button 1</span>
+ <span>Space Filler With Long Text Button 1</span>
</button>
<button type=""button"" id=""button-2"" class=""btn"">
// Disable button or item
if (element.is('button')) {
- $(selector).prop('disabled', true);
+ element.prop('disabled', true);
} else {
element.addClass('is-disabled');
+ element.children('a').attr('disabled', 'disabled'); // needed to prevent click event
}
});
// Enable button or item
if (element.is('button')) {
- $(selector).removeAttr('disabled');
+ element.removeAttr('disabled');
} else {
element.removeClass('is-disabled');
+ element.children('a').removeAttr('disabled');
}
});
",0
"diff --git a/js/dropdown.js b/js/dropdown.js self = this,
touchPrevented = false,
threshold = 10,
+ isEmpty = true,
pos;
if (current.length > 0) {
- current = current.eq(0);
+ isEmpty = true;
}
if (Soho.env.os.name === 'ios') {
}, 0);
}
- if (!this.settings.multiple) {
+ if (!this.settings.multiple && !isEmpty) {
this.searchInput.val(current.find('a').text());
}
return;
}
- if (!this.settings.multiple && option.index() === this.element[0].selectedIndex) {
- return;
- }
-
var code = option.val(),
val = this.element.val(),
oldText = this.pseudoElem.text(),
",0
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -26,7 +26,7 @@ window.Formatters = {
if (typeof value === 'string' && value) {
- if (value === '00000000') { //Means no date in some applications
+ if (value === '0'.repeat(value.length)) { //Means no date in some applications
return '';
}
@@ -4675,12 +4675,12 @@ $.fn.datagrid = function(options) {
return column || {};
},
- //Attempt to serialize the value back
- coerceValue: function (value, oldVal, col) {
+ //Attempt to serialize the value back into the dataset
+ coerceValue: function (value, oldVal, col, row, cell) {
var newVal;
if (col.serialize) {
- newVal = col.serialize(value);
+ newVal = col.serialize(value, oldVal, col, row, cell, this.settings.dataset[row]);
return newVal;
}
",0
"diff --git a/test2/unit/locale/common.js b/test2/unit/locale/common.js @@ -366,6 +366,15 @@ define([
Locale.set('en-US');
expect(Locale.formatNumber(123456.123456, {style: 'decimal', maximumFractionDigits: 5})).to.equal('123,456.12345');
expect(Locale.formatNumber(123456.123456, {style: 'decimal', maximumFractionDigits: 4})).to.equal('123,456.1234');
+ expect(Locale.formatNumber(1.001, {style: 'decimal', minimumFractionDigits: 0, maximumFractionDigits: 3})).to.equal('1');
+ expect(Locale.formatNumber(1.001, {style: 'decimal', minimumFractionDigits: 3, maximumFractionDigits: 3})).to.equal('1.001');
+ expect(Locale.formatNumber(1.001, {style: 'decimal', minimumFractionDigits: 3, maximumFractionDigits: 3, round: true})).to.equal('1.001');
+ expect(Locale.formatNumber(1.0019, {style: 'decimal', minimumFractionDigits: 0, maximumFractionDigits: 3})).to.equal('1.001');
+ expect(Locale.formatNumber(1.0019, {style: 'decimal', minimumFractionDigits: 3, maximumFractionDigits: 3})).to.equal('1.001');
+ expect(Locale.formatNumber(1.0019, {style: 'decimal', minimumFractionDigits: 3, maximumFractionDigits: 3, round: true})).to.equal('1.002');
+ expect(Locale.formatNumber(12345.6789, {style: 'decimal', minimumFractionDigits: 0, maximumFractionDigits: 3})).to.equal('12,345.678');
+ expect(Locale.formatNumber(12345.6789, {style: 'decimal', minimumFractionDigits: 3, maximumFractionDigits: 3})).to.equal('12,345.678');
+ expect(Locale.formatNumber(12345.6789, {style: 'decimal', minimumFractionDigits: 3, maximumFractionDigits: 3, round: true})).to.equal('12,345.679');
},
'should format integers': function() {
",0
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -122,7 +122,7 @@ window.Formatters = {
}
return col.icon ?
- ('<a href=""'+ colHref +'"" class=""btn-icon row-btn '+ (col.cssClass || '') +'"">'+
+ ('<a href=""'+ colHref +'"" class=""btn-icon row-btn '+ (col.cssClass || '') +'"" tabindex=""-1"">'+
$.createIcon({ icon: col.icon, file: col.iconFile }) +
'<span class=""audible"">'+ textValue +'</span>'+
'</a>') :
@@ -149,7 +149,7 @@ window.Formatters = {
}
return (
- '<button type=""button"" class=""btn-icon small datagrid-drilldown"">' +
+ '<button type=""button"" tabindex=""-1"" class=""btn-icon small datagrid-drilldown"">' +
$.createIcon({icon: 'drilldown'}) +
'<span>' + text + '</span>' +
'</button>'
@@ -340,7 +340,7 @@ window.Formatters = {
Button: function (row, cell, value, col) {
var text = col.text ? col.text : ((value === null || value === undefined || value === '') ? '' : value.toString()),
- markup ='<button type=""button"" class=""'+ ( col.icon ? 'btn-icon': 'btn') + ' row-btn ' + (col.cssClass ? col.cssClass : '') + '"">';
+ markup ='<button type=""button"" class=""'+ ( col.icon ? 'btn-icon': 'btn') + ' row-btn ' + (col.cssClass ? col.cssClass : '') + '"" tabindex=""-1"">';
if (col.icon) {
markup += $.createIcon({ icon: col.icon, file: col.iconFile });
@@ -4883,7 +4883,7 @@ $.fn.datagrid = function(options) {
}
}
- if (!this.settings.isList) {
+ if (this.settings.cellNavigation) {
var headers = self.headerNodes();
headers.removeClass('is-active');
headers.eq(cell).addClass('is-active');
",0
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -4864,7 +4864,7 @@ $.fn.datagrid = function(options) {
self.activeCell = prevCell;
}
- if (!$('input, button:not(.datagrid-expand-btn, .datagrid-drilldown)', self.activeCell.node).length) {
+ if (!$('input, button:not(.datagrid-expand-btn, .datagrid-drilldown, .btn-icon)', self.activeCell.node).length) {
self.activeCell.node.focus();
}
if (self.activeCell.node.hasClass('is-focusable')) {
",0
"diff --git a/js/toolbar.js b/js/toolbar.js }
this.element[0].classList.remove('do-resize');
+ this.buttonset[0].style.width = '';
+ if (this.title && this.title.length) {
+ this.title[0].style.width = '';
+ }
+
this.element.removeAttr('role').removeAttr('aria-label');
$.removeData(this.element[0], pluginName);
}
",0
"diff --git a/js/contextualactionpanel.js b/js/contextualactionpanel.js buttons: null, // List of buttons that will sit in the toolbar's Buttonset area
title: 'Contextual Action Panel', // string that fits into the toolbar's Title field
content: null, //Pass content through to modal
+ initializeContent: true, // initialize content before opening
trigger: 'click'
},
settings = $.extend({}, defaults, options);
}).on('close.contextualactionpanel', function(e) {
passEvent(e);
}).on('beforeopen.contextualactionpanel', function(e) {
+ if (self.settings.initializeContent) {
$(this).initialize();
+ }
passEvent(e);
}).on('afteropen.contextualactionpanel', function() {
if (self.toolbar) {
",0
"diff --git a/views/tests/tree/expand-collapse-splitter.html b/views/tests/tree/expand-collapse-splitter.html <div class=""sidebar scrollable"">
<div class=""panel-header"">
- <div class=""toolbar"">
+ <div class=""toolbar standalone"">
<div class=""title"">
<span>Nodes</span>
</div>
</div>
</div>
</div>
- <div class=""splitter splitter-right""></div>
+ <div class=""splitter splitter-right""><div class=""panel-header""></div></div>
<ul role=""tree"" aria-label=""Asset Types"" class=""tree"" data-init=""false"" id=""json-tree"">
</ul>
",0
"diff --git a/js/slider.js b/js/slider.js this.settings.range = this.element.attr('data-range') !== undefined ? (this.element.attr('data-range') === 'true') : this.settings.range;
this.settings.step = !isNaN(this.element.attr('step')) ? Number(this.element.attr('step')) : this.settings.step;
+ if (this.settings.value === '') {
+ this.settings.value = this.settings.min;
+ }
+
// build tick list
var parsedTicks;
if (this.element.attr('data-ticks') !== undefined) {
",0
"diff --git a/js/popupmenu.js b/js/popupmenu.js if (a.hasAttribute('disabled')) {
Soho.DOM.addClass(li, 'is-disabled');
a.setAttribute('aria-disabled', 'true');
- a.removeAttribute('disabled');
}
// menu items that contain submenus
",0
"diff --git a/sass/controls/_buttons.scss b/sass/controls/_buttons.scss @@ -140,6 +140,23 @@ button {
opacity: .7;
pointer-events: none;
}
+
+ &.btn-menu {
+ color: $primary-btn-color;
+
+ .icon {
+ fill: $primary-btn-color;
+ }
+
+ &:hover,
+ &.is-open {
+ color: $primary-btn-color;
+
+ .icon {
+ fill: $primary-btn-color;
+ }
+ }
+ }
}
a.btn,
@@ -165,7 +182,6 @@ a.btn-menu {
}
}
-
//Split Button
.btn-split-menu {
+ .separator {
@@ -204,7 +220,6 @@ a.btn-menu {
}
}
-
// Normal / Secondary Button
.btn,
.btn-secondary {
@@ -249,6 +264,25 @@ a.btn-menu {
.ripple-effect {
background: $graphite02;
}
+
+ // Menu Button Form
+ &.btn-menu {
+ color: $btn-color;
+
+ .icon {
+ fill: $btn-color;
+ }
+
+ &:hover,
+ &.is-open {
+ color: $btn-color;
+
+ .icon {
+ fill: $btn-color;
+ }
+ }
+ }
+
}
// Destructive Actions / Third Level Button
",0
"diff --git a/js/swaplist.js b/js/swaplist.js self.handle = ul.first().attr('data-swap-handle');
self.handle = (!self.isTouch && !!$(self.handle, ul).length) ? self.handle : null;
$(self.handle, ul).addClass('draggable')
+ .off('mousedown.swaplist touchstart.swaplist')
.on('mousedown.swaplist touchstart.swaplist', function() { self.selections.isHandle = true; })
+ .off('mouseup.swaplist touchend.swaplist')
.on('mouseup.swaplist touchend.swaplist', function() { self.selections.isHandle = false; });
self.targets = ul.attr({'aria-dropeffect': 'none'});
self.items = $('li:not(.is-disabled)', self.element)
- .not('a[href], img').on('selectstart.swaplist', function() {
+ .not('a[href], img')
+ .off('selectstart.swaplist')
+ .on('selectstart.swaplist', function() {
if(this.dragDrop) { this.dragDrop(); } //ie9
return false;
}).end()
}
},
+ // Update dataset
+ updateDataset: function(ds) {
+ var i, l, lv, c, api,
+ self = this,
+ s = self.settings,
+ containers = [
+ { type: 'available', dataset: ds.available, class: s.availableClass },
+ { type: 'selected', dataset: ds.selected, class: s.selectedClass },
+ { type: 'additional', dataset: ds.additional, class: s.additionalClass }
+ ];
+
+ for (i = 0, l = containers.length; i < l; i++) {
+ c = containers[i];
+ lv = $(c.class +' .listview', self.element);
+ api = lv.data('listview');
+
+ if (api) {
+ api.unselectRowsBetweenIndexes([0, $('li', lv).length - 1]);
+ s[c.type] = c.dataset || [];
+ api.loadData(s[c.type]);
+ }
+ }
+
+ self.initDataset();
+ self.makeDraggable();
+ self.initSelected(s.availableClass);
+ self.initSelected(s.additionalClass);
+ },
+
unbind: function() {
this.actionButtons.off('click.swaplist');
this.containers.off('keydown.swaplist');
",0
"diff --git a/js/modal.js b/js/modal.js this.element = this.settings.content.closest('.modal');
} else {
var self = this,
- isIE11 = /Trident.*rv[ :]*11\./i.test(navigator.userAgent);
+ isIE11 = /Trident.*rv[ :]*11\./i.test(navigator.userAgent),
+ body = self.element.find('.modal-body');
- self.element.find('.modal-body').append(self.settings.content);
+ body.append(self.settings.content);
//HACK force a paint for missing or icons are missing
if (isIE11) {
setTimeout(function () {
- var uses = self.settings.content[0].getElementsByTagName('use');
+ var uses = body[0].getElementsByTagName('use');
for (var i = 0; i < uses.length; i++) {
var attr = uses[i].getAttribute('xlink:href');
uses[i].setAttribute('xlink:href', 'x');
",0
"diff --git a/app.js b/app.js @@ -197,7 +197,8 @@ var express = require('express'),
}
// Returns a directory listing as page content with working links
- function getDirectoryListing(directory, req, res, next) {
+ // @param Array excludes - List of files names to exclude
+ function getDirectoryListing(directory, req, res, next, excludes) {
fs.readdir('./views/' + directory, function(err, paths) {
if (err) {
console.log(err);
@@ -210,12 +211,14 @@ var express = require('express'),
// Strip out paths that aren't going to ever work
paths.forEach(function pathIterator(val) {
- var excludes = [
- /^(layout)(\s)?(\.html)?/gm, // matches any filename that begins with ""layout"" (fx: ""layout***.html"")
- /footer\.html/,
- /\.DS_Store/
- ],
- match = false;
+ if (excludes === undefined) {
+ excludes = [];
+ }
+ excludes.push(/^(layout)(\s)?(\.html)?/gm); // matches any filename that begins with ""layout"" (fx: ""layout***.html"")
+ excludes.push(/footer\.html/);
+ excludes.push(/\.DS_Store/);
+
+ var match = false;
excludes.forEach(function(exclude) {
if (val.match(exclude)) {
@@ -343,7 +346,11 @@ var express = require('express'),
end = end.replace(/\?(.*)/, '');
if (!end || !end.length || end === '/') {
- getDirectoryListing('patterns/', req, res, next);
+ var exclude = [
+ 'step-process.html',
+ 'step-process-markup.html'
+ ];
+ getDirectoryListing('patterns/', req, res, next, exclude);
return;
}
",0
"diff --git a/js/popupmenu.js b/js/popupmenu.js menu = this.menu.find('.popupmenu');
this.menu.removeClass('is-open').attr('aria-hidden', 'true');
+ if (this.menu[0]) {
this.menu[0].style.height = '';
this.menu[0].style.width = '';
+ }
if (wrapper[0]) {
wrapper[0].style.left = '-999px';
",0
"diff --git a/js/fileupload.js b/js/fileupload.js this.textInput = elem.parent().find('[type=""text""]');
this.textInput.on('keypress.fileupload', function (e) {
if (e.which === 13 || e.which === 32) {
+ e.stopPropagation();
elem.find('input').trigger('click');
}
});
if (this.fileInput.attr('readonly')) {
this.textInput.prop('disabled', false);
- this.textInput[0].classList.remove('fileupload-background-transparent')
+ this.textInput[0].classList.remove('fileupload-background-transparent');
this.fileInput.attr('disabled', 'disabled');
}
",0
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -2848,7 +2848,6 @@ $.fn.datagrid = function(options) {
var percentWidth = Math.round(this.elemWidth / visibleColumns.length);
colWidth = percentWidth;
-
//Handle Columns where auto width is bigger than the percent width
if (percentWidth < textWidth) {
colWidth = textWidth;
@@ -2887,7 +2886,7 @@ $.fn.datagrid = function(options) {
var diff = this.elemWidth - this.totalWidth;
- if ((diff > 0) && diff > colWidth && !this.widthPercent) {
+ if ((diff > 0) && diff > colWidth && !this.widthPercent && !this.headerRow) {
colWidth = diff - 1;
this.headerWidths[index] = {id: col.id, width: colWidth, widthPercent: this.widthPercent};
col.width = colWidth;
",0
"diff --git a/js/toolbarsearchfield.js b/js/toolbarsearchfield.js this.button.off('beforeopen.toolbarsearchfield');
}
+ if (this.xButton && this.xButton.length) {
+ this.xButton.remove();
+ }
+
// Used to determine if the ""Tab"" key was involved in switching focus to the searchfield.
$(document).off('keydown.' + this.id);
$('body').off('resize.' + this.id);
",0
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -1450,7 +1450,9 @@ $.fn.datagrid = function(options) {
this.settings.uniqueId + '-' + suffix :
(window.location.pathname.split('/').pop()
.replace(/\.xhtml|\.shtml|\.html|\.htm|\.aspx|\.asp|\.jspx|\.jsp|\.php/g, '')
- .replace(/\./g, '-') +'-'+
+ .replace(/\./g, '-')
+ .replace(/ /g, '-')
+ .replace(/%20/g, '-') +'-'+
(this.element.attr('id') || 'datagrid') +'-'+ this.gridCount + suffix);
return uniqueid.replace(/--/g, '-');
",0
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -1151,11 +1151,13 @@ $.fn.datagrid = function(options) {
Datagrid.prototype = {
init: function() {
- var self = this;
+ var self = this, html = $('html');
+
this.isTouch = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
this.isFirefoxMac = (navigator.platform.indexOf('Mac') !== -1 && navigator.userAgent.indexOf(') Gecko') !== -1);
- this.isIe = $('html').is('.ie');
- this.isIe9 = $('html').is('.ie9');
+ this.isIe = html.is('.ie');
+ this.isIe9 = html.is('.ie9');
+ this.isSafari = html.is('.is-safari');
this.isWindows = (navigator.userAgent.indexOf('Windows') !== -1);
this.settings = settings;
this.initSettings();
@@ -2177,10 +2179,17 @@ $.fn.datagrid = function(options) {
placeholder: '<tr class=""datagrid-reorder-placeholder""><td colspan=""'+ this.visibleColumns().length +'""></td></tr>',
handle: '.datagrid-reorder-icon'
})
+ .on('beforearrange.datagrid', function(e, status) {
+ if (self.isSafari) {
+ status.start.css({'display': 'inline-block'});
+ }
+ })
.on('arrangeupdate.datagrid', function(e, status) {
+ if (self.isSafari) {
+ status.end.css({'display': ''});
+ }
// Move the elem in the data set
self.settings.dataset.splice(status.endIndex, 0, self.settings.dataset.splice(status.startIndex, 1)[0]);
-
// Fire an event
self.element.trigger('rowreorder', [status]);
});
",0
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -1161,7 +1161,7 @@ $.fn.datagrid = function(options) {
this.isWindows = (navigator.userAgent.indexOf('Windows') !== -1);
this.settings = settings;
this.initSettings();
- this.originalColumns = this.settings.columns.slice(0);
+ this.originalColumns = self.columnsFromString(JSON.stringify(this.settings.columns));
this.appendToolbar();
this.restoreColumns();
@@ -3049,6 +3049,34 @@ $.fn.datagrid = function(options) {
}
},
+ columnsFromString: function(columnStr) {
+ var self = this,
+ columns = JSON.parse(columnStr);
+
+ if (!columns) {
+ return [];
+ }
+
+ //Map back the missing functions/objects
+ for (var i = 0; i < columns.length; i++) {
+ var isHidden,
+ orgCol = self.columnById(columns[i].id);
+
+ if (orgCol) {
+ orgCol = orgCol[0];
+ isHidden = columns[i].hidden;
+
+ $.extend(columns[i], orgCol);
+
+ if (isHidden !== undefined) {
+ columns[i].hidden = isHidden;
+ }
+ }
+ }
+
+ return columns;
+ },
+
//Restore the columns from a saved list or local storage
restoreColumns: function (cols) {
if (!this.settings.saveColumns || !this.canUseLocalStorage()) {
@@ -3064,27 +3092,8 @@ $.fn.datagrid = function(options) {
var lsCols = localStorage[this.uniqueId('columns')];
if (!cols && lsCols) {
- lsCols = JSON.parse(lsCols);
this.originalColumns = this.settings.columns;
-
- //Map back the missing functions/objects
- for (var i = 0; i < lsCols.length; i++) {
- var isHidden,
- orgCol = this.columnById(lsCols[i].id);
-
- if (orgCol) {
- orgCol = orgCol[0];
- isHidden = lsCols[i].hidden;
-
- $.extend(lsCols[i], orgCol);
-
- if (isHidden !== undefined) {
- lsCols[i].hidden = isHidden;
- }
- }
- }
-
- this.settings.columns = lsCols;
+ this.settings.columns = this.columnsFromString(lsCols);
return;
}
",0
"diff --git a/views/controls/svg.html b/views/controls/svg.html <path d=""M15.414 3.414l-2.828-2.828c-.375-.375-.884-.586-1.415-.586h-6.671c-1.378 0-2.5 1.121-2.5 2.5v13c0 1.379 1.122 2.5 2.5 2.5h9c1.378 0 2.5-1.121 2.5-2.5v-10.672c0-.53-.211-1.039-.586-1.414zm-1.414 12.086c0 .276-.224.5-.5.5h-9c-.276 0-.5-.224-.5-.5v-13c0-.276.224-.5.5-.5h5.5v3c0 .55.45 1 1 1h3v9.5z""></path>
</symbol>
- <symbol id=""icon-double-chevron"" width=""14"" height=""14"" viewBox=""0 0 14 14"">
- <path d=""M2 12c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l3.293-3.293-3.293-3.293c-.391-.391-.391-1.023 0-1.414s1.023-.391 1.414 0l4 4c.391.391.391 1.023 0 1.414l-4 4c-.195.195-.451.293-.707.293m6 0c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l3.293-3.293-3.293-3.293c-.391-.391-.391-1.023 0-1.414s1.023-.391 1.414 0l4 4c.391.391.391 1.023 0 1.414l-4 4c-.195.195-.451.293-.707.293"" fill=""#5C5C5C""/>
+ <symbol id=""icon-double-chevron"" viewBox=""0 0 14 14"">
+ <path d=""M2 12c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l3.293-3.293-3.293-3.293c-.391-.391-.391-1.023 0-1.414s1.023-.391 1.414 0l4 4c.391.391.391 1.023 0 1.414l-4 4c-.195.195-.451.293-.707.293m6 0c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l3.293-3.293-3.293-3.293c-.391-.391-.391-1.023 0-1.414s1.023-.391 1.414 0l4 4c.391.391.391 1.023 0 1.414l-4 4c-.195.195-.451.293-.707.293"" fill=""#5C5C5C""></path>
</symbol>
<symbol id=""icon-down-arrow"" viewBox=""0 0 18 18"">
",0
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -4358,7 +4358,7 @@ $.fn.datagrid = function(options) {
// activate a row when in mixed selection mode
activateRow: function(idx) {
- if (this.activatedRow().row !== idx) {
+ if (this.activatedRow().length === 0 || this.activatedRow()[0].row !== idx) {
this.toggleRowActivation(idx);
}
},
",0
"diff --git a/sass/controls/_buttons.scss b/sass/controls/_buttons.scss @@ -534,6 +534,13 @@ html[dir='rtl'] {
}
}
+//Do not allow upper case in french
+html[lang^='fr-'] {
+ [class^=""btn""] {
+ text-transform: none;
+ }
+}
+
//Special ""Ghost"" Secondary Border button-font-size
.btn-secondary-border {
@include transition(all 300ms cubic-bezier(.17, .04, .03, .94));
",0
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -3627,7 +3627,7 @@ $.fn.datagrid = function(options) {
//Returns a cell node
cellNode: function (row, cell, includeGroups) {
- var rowNode = this.tableBody.find('tr').eq(row);
+ var rowNode = this.tableBody.find('tr').not('.datagrid-expandable-row').eq(row);
if (row instanceof jQuery) {
rowNode = row;
",0
"diff --git a/sass/layouts/_panes.scss b/sass/layouts/_panes.scss width: 100%;
}
+ // used for panes that have a datagrid with a pager
+ .datagrid-container.paginated {
+ height: calc(100% - 103px);
+ }
+
// scss-lint:enable ImportantRule
//
//Directional Panes
",0
"diff --git a/sass/layouts/_panes.scss b/sass/layouts/_panes.scss }
// used for panes that have a datagrid with a pager
- .datagrid-container.paginated {
+ .datagrid-container {
+ height: 100%;
+
+ &.paginated {
+ height: calc(100% - 58px);
+ }
+ }
+
+ .toolbar + .datagrid-container {
+ height: calc(100% - 45px);
+
+ &.paginated {
+ height: calc(100% - 103px);
+ }
+ }
+
+ .tab-container.horizontal {
+ height: 100%;
+
+ .tab-panel {
+ height: calc(100% - 50px);
+
+ .page-container {
+ position: static;
+
+ .toolbar + .datagrid-container {
+ height: calc(100% - 45px);
+
+ &.paginated {
height: calc(100% - 103px);
}
+ }
+
+ // used for panes that have a datagrid with a pager
+ .datagrid-container {
+ height: 100%;
+
+ &.paginated {
+ height: calc(100% - 58px);
+ }
+ }
+ }
+ }
+ }
// scss-lint:enable ImportantRule
//
",0
"diff --git a/js/chart.js b/js/chart.js @@ -25,6 +25,7 @@ window.Chart = function(container) {
this.isTouch = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
this.pieColors = d3.scale.ordinal().range(colorRange);
+ this.colorRange = colorRange;
this.greyColors = d3.scale.ordinal().range(['#737373', '#999999', '#bdbdbd', '#d8d8d8']);
this.sparklineColors = d3.scale.ordinal().range(['#1D5F8A', '#999999', '#bdbdbd', '#d8d8d8']);
this.colors = d3.scale.ordinal().range(colorRange);
@@ -55,7 +56,7 @@ window.Chart = function(container) {
}
if (chartType === 'pie') {
- return this.pieColors(i);
+ return this.colorRange[i];
}
if (chartType === 'bar-single' || chartType === 'column-single') {
return '#1D5F8A';
@@ -794,7 +795,7 @@ window.Chart = function(container) {
var chartData = initialData[0].data;
chartData = chartData.sort(function(a, b) {
- return +a.value - +b.value;
+ return isRTL ? +b.value - +a.value : +a.value - +b.value;
});
var total = d3.sum(chartData, function(d) { return d.value; });
@@ -812,12 +813,8 @@ window.Chart = function(container) {
var pie = d3.layout.pie().value(function (d) {
return d.value;
- });
- // .sort(null);
+ }).sort(null);
- if (isRTL) {
- pie.sort(null);
- }
// Store our chart dimensions
var dims = {
@@ -954,7 +951,7 @@ window.Chart = function(container) {
clearInterval(tooltipInterval);
charts.hideTooltip();
})
- .style('fill', function(d, i) {return charts.chartColor(i, 'pie', d.data); })
+ .style('fill', function(d, i) {return charts.chartColor(self.isRTL ? chartData.length-i-1 : i, 'pie', d.data); })
.transition().duration(750)
.attrTween('d', function(d) {
var i = d3.interpolate(d.startAngle + 0.1, d.endAngle);
@@ -1079,7 +1076,7 @@ window.Chart = function(container) {
},
labelsColorFormatter = function (d, i, opt) {
- return opt === 'color-as-arc' ? (charts.chartColor(i, 'pie', d.data)) : (opt === 'default' ? '' : opt);
+ return opt === 'color-as-arc' ? (charts.chartColor(self.isRTL ? chartData.length-i-1 : i, 'pie', d.data)) : (opt === 'default' ? '' : opt);
},
drawTextlabels = function (isShortName) {
",0
"diff --git a/js/popupmenu.js b/js/popupmenu.js return;
}
- var otherMenus = $('.popupmenu.is-open').not(this.menu); //close others.
+ var otherMenus = $('.popupmenu.is-open').filter(function() {
+ return $(this).parents('.popupmenu').length === 0;
+ }).not(this.menu); //close others.
+
otherMenus.each(function() {
var api = $(this).data('trigger').data('popupmenu');
if (api && typeof api.close === 'function') {
",0
"diff --git a/views/tests/datagrid/datagrid-row-click.html b/views/tests/datagrid/datagrid-row-click.html +<div class=""row"">
+ <div class=""six columns"">&nbsp;</div>
+ <div class=""six columns"">
+ <h3>Grid Functional Test</h3>
+ <p>A visual test for showing the ability to click rows to navigate.
+ You should be able to click any row, while hovering the row you will see a cursor.
+ Then it will fire an alert() when you click it.
+ </p>
+ </div>
+</div>
<div class=""row"">
<div class=""twelve columns"">
-
<div id=""datagrid"">
</div>
-
</div>
</div>
",0
"diff --git a/views/examples/saleshub/open-orders-grid.html b/views/examples/saleshub/open-orders-grid.html <header class=""header has-tabs-only"">
<div class=""call-to-action-header"">
- <div class=""tab-container header-tabs"">
+ <div class=""tab-container header-tabs"" data-options=""{containerElement: '#header-tabs-container'}"">
<ul class=""tab-list"">
<li class=""tab is-selected""><a href=""#recent-activity"">Recent Activity</a></li>
<li class=""tab""><a href=""#customers"">Customers</a></li>
</div>
</div>
</header>
- <div class=""page-container scrollable"">
+ <div class=""page-container scrollable"" id=""header-tabs-container"">
<div id=""recent-activity"" class=""tab-panel"">
<header class=""subheader"">
<div class=""full-searchfield-container"">
",0
"diff --git a/docs/utilities.md b/docs/utilities.md @@ -89,6 +89,6 @@ If you want to Escrow some funds, check out [`Escrow`](api/payment#escrow) and [
### Misc
-Want to check if an address is a contract? Use [`Address`](api/utils#address) and [`Address#isContract()`](api/utils#Address.isContract(address)).
+Want to check if an address is a contract? Use [`Address`](api/utils#address) and [`Address.isContract()`](api/utils#Address.isContract(address)).
Want to keep track of some numbers that increment by 1 every time you want another one? Check out [`Counter`](api/drafts#counter). This is especially useful for creating incremental ERC721 `tokenId`s like we did in the last section.
",1
"diff --git a/contracts/utils/Address.sol b/contracts/utils/Address.sol @@ -24,7 +24,7 @@ library Address {
* ====
*/
function isContract(address account) internal view returns (bool) {
- // This method relies in extcodesize, which returns 0 for contracts in
+ // This method relies on extcodesize, which returns 0 for contracts in
// construction, since the code is only stored at the end of the
// constructor execution.
",1
"diff --git a/docs/modules/ROOT/pages/erc1155.adoc b/docs/modules/ROOT/pages/erc1155.adoc ERC1155 is a novel token standard that aims to take the best from previous standards to create a xref:tokens.adoc#different-kinds-of-tokens[*fungibility-agnostic*] and *gas-efficient* xref:tokens.adoc#but_first_coffee_a_primer_on_token_contracts[token contract].
-TIP: ERC1155 draws ideas from all of xref:erc20.adoc[ERC20], xref:721.adoc[ERC721], and xref:erc777.adoc[ERC777]. If you're unfamiliar with those standards, head to their guides before moving on.
+TIP: ERC1155 draws ideas from all of xref:erc20.adoc[ERC20], xref:erc721.adoc[ERC721], and xref:erc777.adoc[ERC777]. If you're unfamiliar with those standards, head to their guides before moving on.
[[multi-token-standard]]
== Multi Token Standard
",1
"diff --git a/docs/modules/ROOT/pages/erc20-supply.adoc b/docs/modules/ROOT/pages/erc20-supply.adoc @@ -4,7 +4,7 @@ In this guide you will learn how to create an ERC20 token with a custom supply m
The standard interface implemented by tokens built on Ethereum is called ERC20, and Contracts includes a widely used implementation of it: the aptly named xref:api:token/ERC20.adoc[`ERC20`] contract. This contract, like the standard itself, is quite simple and bare-bones. In fact, if you try to deploy an instance of `ERC20` as-is it will be quite literally useless... it will have no supply! What use is a token with no supply?
-The way that supply is created is not defined in the ERC20 document. Every token is free to experiment with their own mechanisms, ranging from the most decentralized to the most centralized, from the most naive to the most researched, and more.
+The way that supply is created is not defined in the ERC20 document. Every token is free to experiment with its own mechanisms, ranging from the most decentralized to the most centralized, from the most naive to the most researched, and more.
[[fixed-supply]]
== Fixed Supply
",1
"diff --git a/CHANGELOG.md b/CHANGELOG.md * `Votes`: Added a base contract for vote tracking with delegation. ([#2944](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2944))
* `ERC721Votes`: Added an extension of ERC721 enabled with vote tracking and delegation. ([#2944](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2944))
* `ERC2771Context`: use immutable storage to store the forwarder address, no longer an issue since Solidity >=0.8.8 allows reading immutable variables in the constructor. ([#2917](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2917))
- * `Base64`: add a library to parse bytes into base64 strings using `encode(bytes memory)` function, and provide examples to show how to use to build URL-safe `tokenURIs`. ([#2884](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2884))
- * `ERC20`: reduce allowance before triggering transfer. ([#3056](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#3056))
- * `ERC20`: do not update allowance on `transferFrom` when allowance is `type(uint256).max`. ([#3085](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#3085))
- * `ERC777`: do not update allowance on `transferFrom` when allowance is `type(uint256).max`. ([#3085](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#3085))
+ * `Base64`: add a library to parse bytes into base64 strings using `encode(bytes memory)` function, and provide examples to show how to use to build URL-safe `tokenURIs`. ([#2884](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2884))
+ * `ERC20`: reduce allowance before triggering transfer. ([#3056](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3056))
+ * `ERC20`: do not update allowance on `transferFrom` when allowance is `type(uint256).max`. ([#3085](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3085))
+ * `ERC777`: do not update allowance on `transferFrom` when allowance is `type(uint256).max`. ([#3085](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3085))
* `SignedMath`: a new signed version of the Math library with `max`, `min`, and `average`. ([#2686](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2686))
* `SignedMath`: add a `abs(int256)` method that returns the unsigned absolute value of a signed value. ([#2984](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2984))
* `ERC1967Upgrade`: Refactor the secure upgrade to use `ERC1822` instead of the previous rollback mechanism. This reduces code complexity and attack surface with similar security guarantees. ([#3021](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3021))
## 4.4.2 (2022-01-11)
### Bugfixes
- * `GovernorCompatibilityBravo`: Fix error in the encoding of calldata for proposals submitted through the compatibility interface with explicit signatures. ([#3100](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#3100))
+ * `GovernorCompatibilityBravo`: Fix error in the encoding of calldata for proposals submitted through the compatibility interface with explicit signatures. ([#3100](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3100))
## 4.4.1 (2021-12-14)
",1
"diff --git a/contracts/token/ERC20/ERC20.sol b/contracts/token/ERC20/ERC20.sol @@ -15,7 +15,7 @@ import ""../../utils/Context.sol"";
* For a generic mechanism see {ERC20PresetMinterPauser}.
*
* TIP: For a detailed writeup see our guide
- * https://forum.zeppelin.solutions/t/how-to-implement-erc20-supply-mechanisms/226[How
+ * https://forum.openzeppelin.com/t/how-to-implement-erc20-supply-mechanisms/226[How
* to implement supply mechanisms].
*
* We have followed general OpenZeppelin Contracts guidelines: functions revert
",1
"diff --git a/src/routes/Dataset/components/DatasetDataGouvPublication/DatasetDataGouvPublication.js b/src/routes/Dataset/components/DatasetDataGouvPublication/DatasetDataGouvPublication.js @@ -69,7 +69,7 @@ class DatasetDataGouvPublication extends React.PureComponent {
} else {
return (
<div className={styles.checklist}>
- <Trans i18nKey='DatasetDataGouvPublication.cantBePublished'>
+ <Trans i18nKey='components.DatasetDataGouvPublication.cantBePublished'>
This dataset <b>can not</b> be published on data.gouv.fr
</Trans>
{expanded && (
",1
"diff --git a/src/routes/Search/components/FiltersSummary/FiltersSummary.js b/src/routes/Search/components/FiltersSummary/FiltersSummary.js @@ -2,7 +2,7 @@ import React from 'react'
import { translate } from 'react-i18next'
import PropTypes from 'prop-types'
-import Filter from 'components/Filter'
+import Filter from 'common/components/Filter'
import styles from './FiltersSummary.scss'
",1
"diff --git a/components/facet.js b/components/facet.js @@ -85,7 +85,7 @@ const Facet = ({ facet, count, detailed, remove, onClick, t, i18n }) => {
}
.value {
- max-width: 210px;
+ max-width: 215px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@@ -95,11 +95,11 @@ const Facet = ({ facet, count, detailed, remove, onClick, t, i18n }) => {
}
@media (max-width: 960px) {
- max-width: 280px;
+ max-width: 255px;
}
@media (max-width: 551px) {
- max-width: 160px;
+ max-width: 145px;
}
}
@@ -122,7 +122,13 @@ const Facet = ({ facet, count, detailed, remove, onClick, t, i18n }) => {
.number {
line-height: 26px;
height: 26px;
- margin-left: 5px;
+ margin-left: 4px;
+ font-size: 0.9em;
+
+ @media (max-width: 551px) {
+ margin-left: 2px;
+ font-size: 0.8em;
+ }
}
`}</style>
</div>
",1
"diff --git a/pages/dataset.js b/pages/dataset.js @@ -225,11 +225,8 @@ class DatasetPage extends React.Component {
@media (max-width: 1080px) {
flex: 1 0 100%;
width: 100%;
- order: 2;
- }
-
- @media (max-width: 768px) {
margin: 0;
+ order: 2;
}
}
",1
"diff --git a/components/page/header/index.js b/components/page/header/index.js @@ -132,7 +132,7 @@ class Header extends React.Component {
}
@media (max-width: 551px) {
- margin-right: 5px;
+ margin-right: 15px;
margin-bottom: 2px;
+ li {
",1
"diff --git a/MaterialSkin/HTML/material/html/js/constants.js b/MaterialSkin/HTML/material/html/js/constants.js @@ -26,7 +26,7 @@ const LMS_BLANK_IMAGE = ""html/images/blank.png"";
const LMS_DOUBLE_CLICK_TIMEOUT = 300;
const LMS_DARK_SVG = ""fff"";
const LMS_LIGHT_SVG = ""444"";
-const LMS_DARK_ACTIVE_SVG =""58b7ff"";
+const LMS_DARK_ACTIVE_SVG =""82b1ff"";
const LMS_LIGHT_ACTIVE_SVG = ""346dd2"";
// Semi-constant :-)
",1
"diff --git a/mkrel.py b/mkrel.py @@ -155,8 +155,8 @@ def fixClassisSkinMods():
with open(path, ""r"") as f:
lines=f.readlines()
for line in lines:
- for css in [""classic-skin-mods-dark"", ""classic-skin-mods-light"", ""classic-skin-mods""]:
- line=line.replace(css+"".css"", css+"".min.css"")
+ if ""html/css/"" in line:
+ line=line.replace("".css?"", "".min.css?"")
fixedLines.append(line)
with open(path, ""w"") as f:
",1
"diff --git a/MaterialSkin/HTML/material/html/css/classic-skin/mods.css b/MaterialSkin/HTML/material/html/css/classic-skin/mods.css @@ -28,57 +28,6 @@ div#browsedbList {
margin-left:auto!important;
margin-right:auto!important;
}
-
-/* hide add/play/fav and next-page images */
-.browsedbLeftControls > a > img,
-.browsedbRightControls > a > img,
-.browsedbControls > a > img {
- display:none;
-}
-.browsedbLeftControls > a.loadtracks:before,
-.browsedbControls > a.loadtracks:before,
-.browsedbLeftControls > a.addtracks:before,
-.browsedbControls > a.addtracks:before,
-.browsedbControls > a.edititem:before,
-.browsedbRightControls > a.edititem:before,
-.browsedbRightControls > a.heartitem:before,
-.browsedbRightControls > a.removeitem:before, {
- font-family: ""Material Icons"";
- font-size:24px;
- margin-right:4px;
- text-decoration:none;
- color:var(--text-color);
-}
-
-/* Set play icon */
-.browsedbLeftControls > a.loadtracks:before,
-.browsedbControls > a.loadtracks:before {
- content:""\e039"";
-}
-/* Set add icon */
-.browsedbLeftControls > a.addtracks:before,
-.browsedbControls > a.addtracks:before {
- content:""\e148"";
-}
-/* Set edit icon */
-.browsedbControls > a.edititem:before,
-.browsedbRightControls > a.edititem:before {
- content:""edit"";
-}
-.browsedbRightControls > a.heartitem:before {
- content:""favorite"";
-}
-.browsedbRightControls > a.removeitem:before {
- content:""close"";
-}
-@media (hover: none) and (pointer: coarse) { /* Touch devices */
- .browsedbLeftControls > a.loadtracks:before {
- margin-right:12px;
- }
- .browsedbLeftControls > a.addtracks:before {
- margin-right:8px;
- }
-}
.pagebar > a, .pagebar > a > img, .pagebar > b, .browsedbLeftControls > a {
vertical-align:middle;
}
@@ -151,10 +100,6 @@ td input { /* Fix entry/combo alignment in additional browse modes */
padding-bottom:0px;
}
-td input[type=checkbox] { /* Fix checkbox in Performance / Custom pre-caching specification */
- margin-top:-6px;
-}
-
/* Advanced search */
.border tbody tr td input[type=text] {
padding-bottom:1px;
@@ -246,7 +191,7 @@ input[type=""submit""], input[type=""button""] {
}
input[type=checkbox], input[type=radio] {
- vertical-align: sub;
+ vertical-align: middle;
width:24px;
height:24px;
}
@@ -254,13 +199,14 @@ input[type=checkbox], input[type=radio] {
input[type=checkbox]:before {
font-family: ""Material Icons"";
font-size:24px;
- content:""\e835"";
+ line-height:24px;
+ content:""check_box_outline_blank"";
/*margin-right:4px;*/
text-decoration:none;
}
input[type=checkbox]:checked:before {
- content:""\e834"";
+ content:""check_box"";
}
input[type=checkbox], input[type=radio] {
@@ -273,16 +219,17 @@ input[type=checkbox], input[type=radio] {
}
input[type=radio]:before {
- vertical-align: sub;
+ vertical-align: middle;
font-family: ""Material Icons"";
font-size:24px;
- content:""\e836"";
+ line-height:24px;
+ content:""radio_button_unchecked"";
/*margin-right:4px;*/
text-decoration:none;
}
input[type=radio]:checked:before {
- content:""\e837 "";
+ content:""radio_button_checked"";
}
[type=""checkbox""]:before, [type=""radio""]:before {
@@ -432,3 +379,64 @@ div#Info0, div#Info1, div#Info2, div#Info3, div#Info4, div#Info5, div#Info6, div
.progressItem {
margin-bottom:-8px;
}
+
+/* hide add/play/fav and next-page images */
+.browsedbLeftControls > a > img,
+.browsedbRightControls > a > img,
+.browsedbControls > a > img {
+ display:none;
+}
+
+.browsedbLeftControls > a.loadtracks,
+.browsedbControls > a.loadtracks,
+.browsedbLeftControls > a.addtracks,
+.browsedbControls > a.addtracks,
+.browsedbControls > a.edititem,
+.browsedbRightControls > a.edititem,
+.browsedbRightControls > a.heartitem,
+.browsedbRightControls > a.removeitem,
+.browsedbLeftControls > a.loadtracks:before,
+.browsedbControls > a.loadtracks:before,
+.browsedbLeftControls > a.addtracks:before,
+.browsedbControls > a.addtracks:before,
+.browsedbControls > a.edititem:before,
+.browsedbRightControls > a.edititem:before,
+.browsedbRightControls > a.heartitem:before,
+.browsedbRightControls > a.removeitem:before {
+ font-family: ""Material Icons""!important;
+ font-size:24px!important;
+ line-height:24px!important;
+ margin-right:4px;
+ text-decoration:none!important;
+ color:var(--text-color)!important;
+}
+
+/* Set play icon */
+.browsedbLeftControls > a.loadtracks:before,
+.browsedbControls > a.loadtracks:before {
+ content:""play_circle_outline"";
+}
+/* Set add icon */
+.browsedbLeftControls > a.addtracks:before,
+.browsedbControls > a.addtracks:before {
+ content:""add_circle_outline"";
+}
+/* Set edit icon */
+.browsedbControls > a.edititem:before,
+.browsedbRightControls > a.edititem:before {
+ content:""edit"";
+}
+.browsedbRightControls > a.heartitem:before {
+ content:""favorite"";
+}
+.browsedbRightControls > a.removeitem:before {
+ content:""close"";
+}
+@media (hover: none) and (pointer: coarse) { /* Touch devices */
+ .browsedbLeftControls > a.loadtracks:before {
+ margin-right:12px;
+ }
+ .browsedbLeftControls > a.addtracks:before {
+ margin-right:8px;
+ }
+}
",1
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -761,7 +761,7 @@ div.v-subheader {
}
.toolbar-button {
- margin:var(--toolbar-button-margin) 6px 4px 6px; !important;/* t, r, b, l */
+ margin:var(--toolbar-button-margin) 6px 4px 6px !important;/* t, r, b, l */
min-height:36px !important;
min-width:36px !important;
}
@@ -1200,7 +1200,6 @@ progress {
.shuffle-albums {
border:2px solid;
border-radius:50%;
- padding:-2px;
}
.list-active {
@@ -1333,11 +1332,6 @@ progress {
margin-right:8px;
}
-.subheader-action {
- margin-left:auto;
- margin-right:-var(--std-font-size);
-}
-
#browse-list .v-subheader {
cursor:pointer;
padding-left:17px;
@@ -1516,7 +1510,7 @@ progress {
text-align:center;
}
-.v-icon:not(.image-grid-item-icon), .svg-list-img, .svg-img, .radio-image .svg-img {
+.v-icon:not(.image-grid-item-icon):not(.shuffle-albums), .svg-list-img, .svg-img, .radio-image .svg-img {
width:var(--icon-size) !important;
height:var(--icon-size) !important;
vertical-align:middle;
@@ -1842,7 +1836,7 @@ div.v-subheader {
padding-top:calc(var(--vh, 1vh)*8);
text-align:center;
font-weight:var(--std-weight);
- font-size:val(--std-font-size);
+ font-size:var(--std-font-size);
opacity:0.55;
position:fixed;
width:100%;
@@ -1866,7 +1860,7 @@ div.v-subheader {
font-size:24px;
}
.screesaver-name {
- font-size:val(--small-font-size);
+ font-size:var(--small-font-size);
}
}
",1
"diff --git a/ember-cli-build.js b/ember-cli-build.js @@ -30,13 +30,19 @@ module.exports = function(defaults) {
'asset-cache': {
version: '4', //Might have to change this with the app build,
prepend
- }
+ },
});
+ //TODO move the proxying main site to a variable for testing & dev
+ app.options['ember-service-worker'] = {
+ rootUrl: app.ENV.environment === 'production' ? 'https://emberjs.com/api-new/': '/'
+ };
+
+
app.options['esw-cache-first'] = {
patterns: [
- `${app.env.API_HOST}/json-docs-1/(.+)`,
- `${app.env.API_HOST}/rev-index/(.+)`
+ `${app.ENV.API_HOST}/json-docs-1/(.+)`,
+ `${app.ENV.API_HOST}/rev-index/(.+)`
]
};
",1
"diff --git a/app/routes/project-version/functions/function.js b/app/routes/project-version/functions/function.js @@ -18,12 +18,21 @@ export default Route.extend({
let projectObj = await this.store.findRecord('project', projectID);
let compactVersion = transition.params['project-version'].project_version;
let projectVersion = getFullVersion(compactVersion, projectID, projectObj, this.get('metaStore'));
- let className = params['module'];
+ let name = params['module'];
let functionName = params['fn'];
- let classObj = await this.store.find('class', `${projectID}-${projectVersion}-${className}`)
+ let fnModule;
+ let fn;
+ if (name === 'rsvp' || name === 'jquery') {
+ fnModule = await this.store.find('module', `${projectID}-${projectVersion}-${name}`);
+ fn = fnModule.get(`allstaticfunctions.${name}`).find(elem => elem.name === functionName);
+
+ } else {
+ fnModule = await this.store.find('class', `${projectID}-${projectVersion}-${name}`);
+ fn = this.getFunctionObjFromList(fnModule, functionName);
+ }
return {
- fnModule: classObj,
- fn: this.getFunctionObjFromList(classObj, functionName)
+ fnModule,
+ fn
};
},
",1
"diff --git a/app/templates/project-version/classes/class.hbs b/app/templates/project-version/classes/class.hbs <span>Index</span>
</LinkTo>
{{#if @model.methods}}
- <LinkTo @route={{concat this.parentName "".methods"" }} @models={{array @model.project.id @model.projectVersion.compactVersion @model.name}} @query={{hash anchor=undefined}} class=""tabbed-layout__menu__item"" @activeClass=""tabbed-layout__menu__item_selected"" @id=""methods"" @current-when={{concat this.parentName "".methods""}} data-test-tab=""methods"">
+ <LinkTo @route={{concat this.parentName "".methods"" }} @models={{array @model.project.id @model.projectVersion.compactVersion @model.name}} @query={{hash anchor=undefined}} class=""tabbed-layout__menu__item"" @activeClass=""tabbed-layout__menu__item_selected"" id=""methods"" @current-when={{concat this.parentName "".methods""}} data-test-tab=""methods"">
<span>Methods</span>
</LinkTo>
{{/if}}
",1
"diff --git a/sass/patterns/_homepage.scss b/sass/patterns/_homepage.scss -webkit-font-smoothing: antialiased;
font-weight: 100;
margin: 0;
- padding-top: 8px;
+ padding-top: 3px;
text-rendering: optimizeLegibility !important;
}
}
.searchfield-wrapper {
- margin: 8px 5px 5px 0;
+ margin: 4px 5px 5px 0;
}
+ /*
.buttonset {
> *:not(.searchfield-wrapper) {
margin-top: 6px;
margin-top: 6px;
}
}
+ */
}
[class^=""btn""] {
",1
"diff --git a/js/tabs.js b/js/tabs.js createTabPanel: function(tabId, content, doInsert) {
tabId = tabId.replace(/#/g, '');
- var markup = $('<div id=""'+ tabId +'"" class=""tab-panel"" role=""tabpanel"" style=""display: none;"">'+ content +'</div>');
+ // If a jQuery-wrapped element is provided, actually append the element.
+ // If content is text/string, simply inline it.
+ var markup = $('<div id=""'+ tabId +'"" class=""tab-panel"" role=""tabpanel"" style=""display: none;""></div>');
+ if (content instanceof $) {
+ markup.append(content);
+ } else {
+ markup[0].innerHTML = content;
+ }
if (doInsert === true) {
this.container.append(markup);
",1
"diff --git a/js/tabs.js b/js/tabs.js // Used for checking if a particular tab (in the form of a jquery-wrapped list item) is spilled into
// the overflow area of the tablist container <UL>.
isTabOverflowed: function(li) {
+ if (this.isVerticalTabs()) {
+ return false;
+ }
+
return li[0].getBoundingClientRect().top > this.tablist[0].getBoundingClientRect().top;
},
",1
"diff --git a/js/toolbar.js b/js/toolbar.js if (popupMenuInstance) {
this.more
- .triggerHandler('updated')
.on('beforeopen.toolbar', function() {
refreshTextAndDisabled(self.moreMenu);
- });
+ })
+ .triggerHandler('updated');
} else {
var actionButtonOpts = $.fn.parseOptions(this.more[0]);
",1
"diff --git a/sass/controls/_editor.scss b/sass/controls/_editor.scss &[data-element='foreColor'] {
.icon {
- margin-top: 0;
+ height: 17px;
+ margin-top: 1px;
+ width: 16px;
}
.trigger {
.icon {
height: 16px;
margin-left: -5px;
- width: 16px;
+ width: 12px;
}
}
&[data-element='backColor'] {
.icon {
- margin-top: 0;
+ height: 17px;
+ margin-top: 1px;
+ width: 16px;
}
.trigger {
.icon {
height: 16px;
- width: 16px;
+ width: 12px;
}
}
}
",1
"diff --git a/sass/controls/_toolbar.scss b/sass/controls/_toolbar.scss @@ -47,7 +47,6 @@ $toolbar-buttonset-height: 40px;
&.is-overflowed {
display: none;
- //visibility: hidden;
}
}
@@ -127,6 +126,7 @@ $toolbar-buttonset-height: 40px;
&.standalone {
background-color: $toolbar-standalone-bg-color;
border-bottom: 1px solid $toolbar-standalone-border-color;
+ text-align: left;
[class^=""btn""] {
&[disabled],
",1
"diff --git a/js/tabs.js b/js/tabs.js // Avoid filter(:visible)
for (var i = 0; i < self.panels.length; i++) {
- if (self.panels[i].style.display !== 'none') {
+ if (self.panels[i].classList.contains('is-visible')) {
oldPanel = $(self.panels[i]);
}
}
",1
"diff --git a/sass/controls/_tabs.scss b/sass/controls/_tabs.scss }
}
+
+ // These two rules fix an IE bug where contents of all tab panels are shown.
+ > .page-container {
+ position: static;
+ }
+ &.can-show {
+ > .page-container {
+ position: absolute;
+ }
+ }
+
}
// Page containers that directly house '.tab-panel' elements will allow them to fill the height of the container
// Used in vertical/header/module tabs.
.page-container > .tab-panel {
- height: 100%;
+ height: 0;
padding-top: 0;
+ width: 0;
+
+ &.can-show {
+ height: 100%;
+ width: 100%;
+ }
> .busy-indicator-container {
@include font-size(14);
",1
"diff --git a/views/tests/toolbar/resize-favoring.html b/views/tests/toolbar/resize-favoring.html <div class=""twelve columns"">
<div id=""toolbar-favor-buttonset"" class=""toolbar"" role=""toolbar"" data-options='{ ""resizeContainers"": true, ""favorButtonset"": false, ""maxVisibleButtons"": 4 }'>
- <div class=""title"">This Toolbar Favors the Buttonset Area</div>
+ <div class=""title"">This Toolbar Favors the Title Area</div>
<div class=""buttonset"">
<button type=""button"" id=""category-button"" class=""btn"" tabindex=""-1"">
<span>Category 1</span>
",1
"diff --git a/js/tabs.js b/js/tabs.js }
var liTop = Math.round(li[0].getBoundingClientRect().top),
- tablistTop = Math.round(this.tablist[0].getBoundingClientRect().top);
+ tablistTop = Math.round(this.tablist[0].getBoundingClientRect().top + 1);
+
+ // +1 to compensate for top border on Module Tabs
+ if (this.isModuleTabs()) {
+ tablistTop = tablistTop + 1;
+ }
return liTop > tablistTop;
},
",1
"diff --git a/js/autocomplete.js b/js/autocomplete.js },
listIsOpen: function() {
- return this.list && this.list.is(':visible');
+ return this.list instanceof $ && this.list.length && this.list.is(':visible');
},
handleEvents: function () {
handleAutocompleteKeydown: function(e) {
var self = this;
- if (self.isLoading()) {
+ if (this.isLoading()) {
e.preventDefault();
return false;
}
+ if (!this.listIsOpen()) {
+ return;
+ }
+
function getHighlighted(items) {
return items.filter('.is-selected');
}
",1
"diff --git a/js/autocomplete.js b/js/autocomplete.js setTimeout( function() {
var activeElem = document.activeElement;
- if ($.contains(self.list[0], activeElem) || self.element.is(activeElem)) {
+ if ((self.listIsOpen() && $.contains(self.list[0], activeElem)) || self.element.is(activeElem)) {
return;
}
",1
"diff --git a/views/tests/call-to-action-header/tabs-with-button.html b/views/tests/call-to-action-header/tabs-with-button.html grid = $('#open-orders-datagrid').datagrid({
columns: columns,
dataset: data,
+ isList: true,
paging: true,
pagesize: 5
}).data('datagrid');
",1
"diff --git a/sass/controls/_verticaltabs.scss b/sass/controls/_verticaltabs.scss > .tab-list-container > .tab-focus-indicator {
border-radius: 0;
- &.is-selected {
+ &.is-selected.is-visible {
border-color: transparent;
box-shadow: inset 0 0 0 1px $white;
}
",1
"diff --git a/js/popupmenu.js b/js/popupmenu.js return;
}
- var otherMenus = $('.popupmenu').not(this.menu); //close others.
+ var otherMenus = $('.popupmenu.is-open').not(this.menu); //close others.
otherMenus.each(function() {
- var api = $(this).data('popupmenu');
+ var api = $(this).data('trigger').data('popupmenu');
if (api && typeof api.close === 'function') {
api.close();
}
",1
"diff --git a/js/toolbar.js b/js/toolbar.js this.items.filter('.btn-menu, .btn-actions')
.off('close.toolbar').on('close.toolbar', function onClosePopup() {
- var el = $(this);
+ var el = $(this),
+ last;
+
if (el.is('.is-overflowed')) {
- self.getLastVisibleButton()[0].focus();
+ last = self.getLastVisibleButton();
+ if (last && last.length) {
+ last[0].focus();
+ }
return;
}
+
el.focus();
self.buttonset.scrollTop(0);
});
",1
"diff --git a/js/pager.js b/js/pager.js this.pagerBar
.find('.pager-count input').val(this.activePage);
+ // Update the total number of pages
if (this._pageCount !== '0' && !isNaN(this._pageCount)) {
this.pagerBar.find('.pager-total-pages').text(this._pageCount);
}
+ // Update the number of records per page
+ this.pagerBar.find('.btn-menu span')
+ .text(Locale.translate('RecordsPerPage').replace('{0}', this.settings.pagesize));
+
// Refresh Disabled
var prev = pb.find('.pager-prev a'),
next = pb.find('.pager-next a'),
",1
"diff --git a/sass/controls/_popupmenu.scss b/sass/controls/_popupmenu.scss @@ -502,10 +502,11 @@ html[dir='rtl'] {
padding: 0 10px;
}
- &.has-icons {
+ &.has-icons,
+ &.is-selectable {
> li a {
padding-left: 10px;
- padding-right: 40px;
+ padding-right: 35px;
}
.icon {
",1
"diff --git a/js/tabs.js b/js/tabs.js // Link tab to its corresponding ""More Tabs"" menu option
$item.data('moremenu-link', popupA);
+ popupA.find('.icon-more').remove();
// Link ""More Tabs"" menu option to its corresponding Tab.
// Remove onclick methods from the popup <li> because they are called
",1
"diff --git a/sass/controls/_verticaltabs.scss b/sass/controls/_verticaltabs.scss // Also works for placing a set of vertical tabs directly inside of a higher-level '.tab-panel' element
.page-container,
.tab-panel {
+
> .tab-container.vertical {
height: 100%;
overflow: auto;
+ .tab-panel-container {
min-height: 100%;
}
+
+ + .tab-panel-container > .tab-panel {
+ margin: 30px;
+ padding-top: 0;
+ }
}
}
",1
"diff --git a/js/tabs.js b/js/tabs.js build: function() {
var self = this,
tabPanelContainer,
+ appMenu,
moveTabPanelContainer = false;
// Check for a tab panel container immediately after the `.tab-container` element (default as of Soho Xi 4.3.0)
tabPanelContainer = this.element.next('.tab-panel-container');
+ // Check for a page container after an application menu
+ if (!tabPanelContainer.length) {
+ appMenu = $('.application-menu');
+ if (appMenu.length) {
+ tabPanelContainer = appMenu.next('.page-container');
+ }
+ }
+
// Auto-detect and move existing tab-panel containers in key areas, if applicable.
// Check inside the container first
if (!tabPanelContainer.length) {
",1
"diff --git a/js/toolbarsearchfield.js b/js/toolbarsearchfield.js this.xButton = this.inputWrapper.children('.icon.close');
// Open the searchfield once on intialize if it's a ""non-collapsible"" searchfield
- if (this.settings.collapsible === false && this.shouldExpandOnMobile()) {
+ if (this.settings.collapsible === false) {
this.inputWrapper.addClass('no-transition').one('expanded.' + this.id, function() {
$(this).removeClass('no-transition');
});
+
+ if (!this.shouldBeFullWidth()) {
this.expand(true);
+ }
} else {
if (this.button instanceof $ && this.button.length) {
this.setClosedWidth();
",1
"diff --git a/js/autocomplete.js b/js/autocomplete.js this.element.addClass('is-open')
.popupmenu(popupOpts)
.on('close.autocomplete', function () {
- self.closeList();
+ self.closeList(true);
});
// Optionally select the first item in the list
this.element.trigger('listopen', [items]);
},
- closeList: function() {
+ closeList: function(dontClosePopup) {
var popup = this.element.data('popupmenu');
if (!popup) {
return;
}
+ if (!dontClosePopup) {
popup.close();
+ }
+
this.element.trigger('listclose');
$('#autocomplete-list').parent('.popupmenu-wrapper').remove();
$('#autocomplete-list').remove();
",1
"diff --git a/views/controls/datagrid-grouped-headers.html b/views/controls/datagrid-grouped-headers.html data.push({ id: 6, productId: 2642206, productName: 'Some Compressor', activity: 'inspect and Repair', quantity: 41, price: '123.99', status: 'OK', orderDate: null, action: 'On Hold'});
//Define Columns for the Grid.
- columns.push({ id: 'productId', name: 'Product Id', field: 'productId', formatter: Formatters.Readonly, width: 75});
- columns.push({ id: 'productName', name: 'Product Name', sortable: false, field: 'productName', formatter: Formatters.Hyperlink, width: 200});
- columns.push({ id: 'activity', hidden: true, name: 'Activity', field: 'activity', width: 50});
- columns.push({ id: 'quantity', name: 'Quantity', field: 'quantity', width: 50});
- columns.push({ id: 'price', name: 'Price', field: 'price', formatter: Formatters.Decimal, width: 50});
- columns.push({ id: 'orderDate', name: 'Order Date', field: 'orderDate', formatter: Formatters.Date, dateFormat: 'M/d/yyyy', width: 50});
- columns.push({ id: 'status', name: 'Status', field: 'status', formatter: Formatters.Text, width: 50});
- columns.push({ id: 'action', name: 'Action Item', field: 'action', width: 50});
+ columns.push({ id: 'productId', name: 'Product Id', field: 'productId', formatter: Formatters.Readonly});
+ columns.push({ id: 'productName', name: 'Product Name', sortable: false, field: 'productName', formatter: Formatters.Hyperlink});
+ columns.push({ id: 'activity', hidden: true, name: 'Activity', field: 'activity'});
+ columns.push({ id: 'quantity', name: 'Quantity', field: 'quantity'});
+ columns.push({ id: 'price', name: 'Price', field: 'price', formatter: Formatters.Decimal});
+ columns.push({ id: 'orderDate', name: 'Order Date', field: 'orderDate', formatter: Formatters.Date, dateFormat: 'M/d/yyyy'});
+ columns.push({ id: 'status', name: 'Status', field: 'status', formatter: Formatters.Text});
+ columns.push({ id: 'action', name: 'Action Item', field: 'action'});
//Init and get the api for the grid
",1
"diff --git a/views/controls/index.html b/views/controls/index.html <div><a class=""hyperlink"" href=""{{basepath}}controls/expandablearea"">Expandable Area</a></div>
<div><a class=""hyperlink"" href=""{{basepath}}controls/tabs"" >Tabset</a></div>
<div><a class=""hyperlink"" href=""{{basepath}}patterns/vertical-tabs"" >Vertical Tabs</a></div>
- <div><a class=""hyperlink"" href=""{{basepath}}components/accordion/example-accordion"">Accordion</a></div>
+ <div><a class=""hyperlink"" href=""{{basepath}}components/accordion/example-index"">Accordion</a></div>
<div><a class=""hyperlink"" href=""{{basepath}}components/accordion/example-accordion-panels"">Accordion Panels</a></div>
<div><a class=""hyperlink"" href=""{{basepath}}controls/fieldset"">Field Set</a></div>
</div>
",1
"diff --git a/components/toolbarsearchfield/example-alternate-style.html b/components/toolbarsearchfield/example-alternate-style.html +<div class=""row"">
+ <div class=""six columns"">
+ <h2>Toolbar Searchfield Example: Alternate Style</h2>
+ <p><a class=""hyperlink"" href=""https://jira.infor.com/browse/SOHO-6442"" target=""_blank"">Related JIRA Ticket</a>.</p>
+ </div>
+</div>
+
<div class=""row"">
<div class=""twelve columns"">
<div class=""toolbar no-actions-button left-aligned"">
<div class=""title"">
- Toolbar Searchfield Example: Alternate Style
+ Look over there
</div>
<div class=""buttonset"">
<!-- Begin Toolbar Searchfield Component Part -->
+ <div class=""searchfield-wrapper toolbar-searchfield-wrapper"">
<label for=""example-toolbar-searchfield"">Alternate Example</label>
<input id=""example-toolbar-searchfield"" class=""searchfield alternate"" placeholder=""Search...""/>
+ </div>
<!-- End Toolbar Searchfield Component Part -->
</div>
",1
"diff --git a/js/popupmenu.js b/js/popupmenu.js switch(e.which) {
case 13:
case 32:
+ if (self.settings.trigger === 'click') {
self.open(e);
+ }
break;
case 121:
if (e.shiftKey) { //Shift F10
opts.x = getCoordinates(e, 'x') - (isRTL ? menuDimensions.width : 0) + ((isRTL ? -1 : 1) * this.settings.offset.x);
opts.y = getCoordinates(e, 'y') + this.settings.offset.y;
+ if (opts.x === 0 && opts.y === 0) {
+ opts.x = this.settings.offset.x || 0;
+ opts.y = this.settings.offset.y || 0;
+ opts.parent = this.element;
+ opts.placement = 'bottom';
+ opts.parentXAlignment = isRTL ? 'right' : 'left';
+ }
+
} else {
opts.x = this.settings.offset.x || 0;
opts.y = this.settings.offset.y || 0;
",1
"diff --git a/app.js b/app.js @@ -42,23 +42,6 @@ var express = require('express'),
commit: git.long(),
};
- /**
- * Simple Logging system that wraps `console.log()`
- * @param {string} message
- */
- /*
- var logger = function(message) {
- // Don't log empty messages.
- if (typeof message !== 'string' || !message.length) {
- return;
- }
-
- if (console && console.log) {
- console.log(message);
- }
- };
- */
-
// Option Handling - Custom Middleware
// Writes a set of default options the 'req' object. These options are always eventually passed to the HTML template.
// In some cases, these options can be modified based on query parameters. Check the default route for these options.
@@ -717,7 +700,7 @@ var express = require('express'),
var directory = 'tests/' + end;
if (hasTrailingSlash(directory)) {
- if (is('directory', directory) ) {
+ if (is('directory', '/views/' + directory) ) {
getDirectoryListing(directory, req, res, next);
return;
}
@@ -726,7 +709,6 @@ var express = require('express'),
}
// Custom configurations for some test folders
-
if (directory.match(/tests\/base-tag/)) {
opts.usebasehref = true;
}
@@ -775,8 +757,8 @@ var express = require('express'),
}
// No trailing slash. Check for an index file. If no index file, do directory listing
- if (is('directory', directory)) {
- if (is('file', directory + '/index')) {
+ if (is('directory', '/views/' + directory)) {
+ if (is('file', '/views/' + directory + '/index')) {
res.render(directory + '/index', opts);
return next();
}
@@ -811,8 +793,8 @@ var express = require('express'),
//Tests Index Page and controls sub pages
router.get('/tests/:component/:example', testsRouteHandler);
- router.get('/tests/:component', testsRouteHandler);
router.get('/tests/:component/', testsRouteHandler);
+ router.get('/tests/:component', testsRouteHandler);
router.get('/tests/', testsRouteHandler);
router.get('/tests', testsRouteHandler);
",1
"diff --git a/components/compositeform/_compositeform.scss b/components/compositeform/_compositeform.scss height: inherit;
overflow-y: hidden;
- > .tab-container {
- &.horizontal {
- padding: 0 0 0 20px;
- }
-
- &.vertical-tabs {
+ > .tab-panel-container {
height: inherit;
- }
- > .tab-list-container {
- height: calc(100% - 20px);
+ &.scrollable,
+ &.scrollable-x,
+ &.scrollable-y {
+ height: 100%;
}
}
- > .tab-panel-container {
- height: inherit;
+ > .tab-container {
+ &.horizontal {
+ padding: 0 0 0 20px;
+ + .tab-panel-container {
&.scrollable,
&.scrollable-x,
&.scrollable-y {
+ height: calc(100% - 40px);
+ }
+ }
+ }
+
+ &.vertical {
height: 100%;
+ min-height: 0;
+ }
+
+ > .tab-list-container {
+ height: calc(100% - 20px);
}
}
}
",1
"diff --git a/components/datagrid/datagrid.js b/components/datagrid/datagrid.js @@ -4842,6 +4842,10 @@ $.fn.datagrid = function(options) {
this.renderRows();
this.resetPager('searched');
this.setSearchActivePage();
+
+ if (!this.settings.paging) {
+ this.highlightSearchRows(term);
+ }
},
// Set search active page
",1
"diff --git a/components/charts/charts.js b/components/charts/charts.js @@ -3168,7 +3168,7 @@ window.Chart = function(container) {
.style('text-anchor', 'start');
}
- if (settings.xAxis.formatText) {
+ if (settings.xAxis && settings.xAxis.formatText) {
svg.selectAll('.x.axis .tick text').each(function(i) {
var elem = d3.select(this),
text = d3.select(this).text(),
",1
"diff --git a/test/unit/locale/common.js b/test/unit/locale/common.js @@ -247,7 +247,7 @@ define([
expect(Locale.parseDate('10/28/2015', 'M/d/yyyy').getTime()).to.equal(new Date(2015, 9, 28).getTime());
expect(Locale.parseDate('10282015', 'Mdyyyy').getTime()).to.equal(new Date(2015, 9, 28).getTime());
expect(Locale.parseDate('10282015', 'Mdyyyy').getTime()).to.equal(new Date(2015, 9, 28).getTime());
- expect(Locale.parseDate('10/28/99', 'MM/dd/yy').getTime()).to.equal(new Date(2099, 9, 28).getTime());
+ expect(Locale.parseDate('10/28/99', 'MM/dd/yy').getTime()).to.equal(new Date(1999, 9, 28).getTime());
//We can parse either 4 or 2 digit month day
expect(Locale.parseDate('10282015', 'Mdyyyy').getTime()).to.equal(new Date(2015, 9, 28).getTime());
",1
"diff --git a/components/mask/mask-functions.js b/components/mask/mask-functions.js @@ -231,6 +231,8 @@ var DATE_MAX_VALUES = {
'yy': 99,
'yyyy': 9999,
'h': 12,
+ 'hh': 12,
+ 'H': 24,
'HH': 24,
'mm': 60,
'ss': 60,
@@ -380,10 +382,14 @@ window.Soho.masks.dateMask = function dateMask(rawValue, options) {
var times = (function(symbols) {
var sep = symbols.timeSeparator;
return [
- 'HH' + sep + 'mm',
'HH' + sep + 'mm' + sep + 'ss',
- 'h' + sep + 'mm',
+ 'HH' + sep + 'mm',
+ 'hh' + sep + 'mm' + sep + 'ss',
+ 'hh' + sep + 'mm',
+ 'H' + sep + 'mm' + sep + 'ss',
+ 'H' + sep + 'mm',
'h' + sep + 'mm' + sep + 'ss',
+ 'h' + sep + 'mm'
];
})(options.symbols);
",1
"diff --git a/components/mask/masked-input.js b/components/mask/masked-input.js _replaceLegacySettings: function() {
var modes = ['group', 'number', 'date', 'time'];
+ // pre-set a bunch of objects if they don't already exist
+ this.settings.patternOptions = this.settings.patternOptions || {};
+ this.settings.patternOptions.symbols = this.settings.patternOptions.symbols || {};
+
//======================================
// Deprecated as of v4.3.2
//======================================
if (typeof this.settings.pattern === 'string') {
// If ""negative"" is defined, you can type the negative symbol in front of the number.
// Will automatically set to ""true"" if a negative symbol is detected inside the mask.
- this.settings.patternOptions.allowNegative = this.settings.pattern.indexOf('-') !== -1;
+ var allowNegative = this.settings.pattern.indexOf('-') !== -1;
+ if (allowNegative) {
+ this.settings.patternOptions.allowNegative = allowNegative;
+ this.settings.patternOptions.symbols.negative = '-';
+ }
// Detect the thousands separator and see if we use it.
var thousandsSep = this.settings.patternOptions && this.settings.patternOptions.symbols && this.settings.patternOptions.symbols.thousands ?
var hasThousandsInPattern = this.settings.pattern.indexOf(thousandsSep) !== -1;
this.settings.patternOptions.allowThousandsSeparator = hasThousandsInPattern;
if (hasThousandsInPattern) {
- this.settings.patternOptions.symbols = this.settings.patternOptions.symbols || {};
this.settings.patternOptions.symbols.thousands = thousandsSep;
}
// The new masking algorithm requires an ""integerLimit"" defined to function.
// This grabs the number of items currently inside this part of the mask, and sets it.
- var decimal = this.settings.patternOptions && this.settings.patternOptions.symbols && typeof this.settings.patternOptions.symbols.decimal === 'string' ?
+ var decimal = typeof this.settings.patternOptions.symbols.decimal === 'string' ?
this.settings.patternOptions.symbols.decimal : '.';
+ var decimalParts = this.settings.pattern.split(decimal);
- this.settings.patternOptions.integerLimit = this.settings.pattern.split(decimal)[0].replace(/[^#0]/g, '').length;
+ this.settings.patternOptions.integerLimit = decimalParts[0].replace(/[^#0]/g, '').length;
+
+ if (decimalParts[1]) {
+ this.settings.patternOptions.allowDecimal = true;
+ this.settings.patternOptions.decimalLimit = decimalParts[1].toString().length;
+ if (!this.settings.patternOptions.symbols.decimal) {
+ this.settings.patternOptions.symbols.decimal = decimal;
+ }
+ }
}
}
",1
"diff --git a/components/editor/editor.js b/components/editor/editor.js this.hideToolbarActions();
},
- //See if the Editor is Selected and Show Toolbar
+ //Set button states for toolbar buttons
setToolbarButtonStates: function () {
var buttons = this.toolbarActions.find('button');
this.checkButtonState('bold');
this.checkButtonState('italic');
this.checkButtonState('underline');
+ this.colorpickerButtonState('foreColor');
+ if (this.toolbar.find('.buttonset [data-action=""backColor""]').length) {
+ this.colorpickerButtonState('backColor');
+ }
var self = this,
parentNode = this.getSelectedParentElement();
if (currentElement === this.element) {
if (action.indexOf('append-') > -1) {
this.execFormatBlock(action.replace('append-', ''));
- this.setToolbarButtonStates();
} else if (action === 'anchor') {
this.restoreLinkSelection();
this.modals.url.data('modal').open();
this.switchToolbars();
},
- // Colorpicker actions ['foreColor'|'backColor']
- colorpickerActions: function(action) {
+ // Set ['foreColor'|'backColor'] button icon color in toolbar
+ colorpickerButtonState: function(action) {
var self = this,
cpBtn = $('[data-action=""'+ action +'""]', this.toolbar),
cpApi = cpBtn.data('colorpicker'),
color = cpApi.rgb2hex(color);
cpBtn.attr('data-value', color).find('.icon').css('fill', color);
}
+ return {cpBtn:cpBtn, cpApi:cpApi, color:color};
+ },
+
+ // Colorpicker actions ['foreColor'|'backColor']
+ colorpickerActions: function(action) {
+ var self = this,
+ state = this.colorpickerButtonState(action),
+ cpBtn = state.cpBtn,
+ cpApi = state.cpApi;
cpBtn.on('selected.editor', function (e, item) {
var value = ('#' + item.data('value')).toLowerCase();
}, 0);
}
+
+ setTimeout(function() {
+ self.getCurrentElement().focus();
+ }, 0);
});
// Toggle colorpicker
",1
"diff --git a/components/mask/mask-functions.js b/components/mask/mask-functions.js @@ -261,7 +261,7 @@ window.Soho.masks.dateMask = function dateMask(rawValue, options) {
if (part.length === 1 && rawValueFirstDigit > maxFirstDigit) {
mask.push(digitRegex);
- } else if (rawValueStr !== '0' && rawValueStr.length === 1 && rawValueFirstDigit <= maxFirstDigit) {
+ } else if (rawValueStr !== '0' && rawValueStr.length === 1 && rawValueFirstDigit <= maxFirstDigit && rawValueArray[i+1] !== undefined) {
mask.push(digitRegex);
} else {
mask = mask.concat(getRegexForPart(value, 'digits'));
",1
"diff --git a/components/mask/masked-input.js b/components/mask/masked-input.js if (decimalParts[1]) {
this.settings.patternOptions.allowDecimal = true;
- this.settings.patternOptions.decimalLimit = decimalParts[1].toString().length;
+ this.settings.patternOptions.decimalLimit = decimalParts[1].toString().replace(/[^#0]/g, '').length;
if (!this.settings.patternOptions.symbols.decimal) {
this.settings.patternOptions.symbols.decimal = decimal;
}
",1
"diff --git a/components/popupmenu/popupmenu.js b/components/popupmenu/popupmenu.js // Check external AJAX source, if applicable
if (!ajaxReturn) {
canOpen = this.callSource(e, true);
+
+ if (this.settings.beforeOpen) {
return;
}
+ }
var otherMenus = $('.popupmenu.is-open').filter(function() {
return $(this).parents('.popupmenu').length === 0;
",1
"diff --git a/components/dropdown/_dropdown.scss b/components/dropdown/_dropdown.scss @@ -749,6 +749,11 @@ div.dropdown-xs,
}
}
+ .dropdown-search {
+ padding-bottom: 8px;
+ padding-top: 10px;
+ }
+
&.dropdown-short {
.dropdown-search {
@include font-size(12);
@@ -756,6 +761,13 @@ div.dropdown-xs,
}
}
}
+
+ div.dropdown,
+ div.multiselect {
+ > span {
+ padding-top: 1px;
+ }
+ }
}
// iOS needs a nudge too
@@ -845,7 +857,7 @@ html[dir='rtl'] {
> .trigger {
.icon {
- margin-right: -24px;
+ margin-right: -22px;
}
}
@@ -954,9 +966,4 @@ html[dir='rtl'] {
}
}
}
-
- .trigger .icon {
- left: 6px;
- right: auto;
- }
}
",1
"diff --git a/components/tooltip/tooltip.js b/components/tooltip/tooltip.js self.handleAfterPlace(e, placementObj);
});
+ //Tool tip may be cleaned up on a modal or CAP
+ if (this.tooltip.data('place')) {
this.tooltip.data('place').place(opts);
+ } else {
+ this.tooltip.place(opts);
+ this.tooltip.data('place').place(opts);
+ }
return this;
},
",1
"diff --git a/components/mask/mask-functions.js b/components/mask/mask-functions.js @@ -261,7 +261,7 @@ window.Soho.masks.dateMask = function dateMask(rawValue, options) {
if (part.length === 1 && rawValueFirstDigit > maxFirstDigit) {
mask.push(digitRegex);
- } else if (rawValueStr !== '0' && rawValueStr.length === 1 && rawValueFirstDigit <= maxFirstDigit && rawValueArray[i+1] !== undefined && part !== 'HH') {
+ } else if (rawValueStr !== '0' && rawValueStr.length === 1 && rawValueFirstDigit <= maxFirstDigit && rawValueArray[i+1] !== undefined && part.toUpperCase() !== 'HH') {
mask.push(digitRegex);
} else {
mask = mask.concat(getRegexForPart(value, 'digits'));
",1
"diff --git a/components/searchfield/test-rich-categories.html b/components/searchfield/test-rich-categories.html </div>
</div>
+<style id=""category-tests-style"">
+ #output-area {
+ padding: 20px;
+ }
+</style>
+
<div class=""row"">
<div class=""six columns"">
// Fill the console with information about currently selected categories.
function getSelectionData(type, api) {
var data = api.getCategoryData(true),
- outputHTML = '<h3>'+ type +' Selected Elements</h3>';
+ outputHTML = '<h3>'+ type +' Selected Elements</h3><br />';
for (var i = 0; i < data.length; i++) {
outputHTML += '<b>' + data[i].name + '</b><br />';
buttonClear.on('click.test', clear);
// Get pseudo markup for categories button
- singleCategoriesButton = singleAPI.button;
- multiCategoriesButton = multiAPI.button;
+ singleCategoriesButton = singleAPI.categoryButton;
+ multiCategoriesButton = multiAPI.categoryButton;
// Clear the console whenever category selection on the searchfield changes.
singleCategoriesButton.on('selected.test', function() {
",1
"diff --git a/components/datagrid/datagrid.js b/components/datagrid/datagrid.js @@ -5035,7 +5035,7 @@ $.fn.datagrid = function(options) {
if (self.grandTotal) {
countText = self.settings.resultsText(self, self.grandTotal, count);
} else {
- countText = self.settings.resultsText(self, count, self.filteredCount || 0);
+ countText = self.settings.resultsText(self, count, (count - self.filteredCount) || 0);
}
} else {
",1
"diff --git a/components/trackdirty/trackdirty.js b/components/trackdirty/trackdirty.js if (field.is('.editor-container')) {
// editors values are further down it's tree in a textarea,
// so get the elements with the value
- const textArea = field.find('textarea');
+ var textArea = field.find('textarea');
original = textArea[0].defaultValue;
current = self.valMethod(textArea);
}
",1
"diff --git a/components/slider/slider.js b/components/slider/slider.js @@ -643,48 +643,23 @@ Slider.prototype = {
e.preventDefault();
clearTimeout(handle.data('animationTimeout'));
- function getIncrementBy() {
- if (increment !== undefined) {
- return increment;
- }
- if (this.settings.step !== undefined) {
- return this.settings.step;
- }
- return 1;
- }
-
const val = this.value().slice(0);
- let incrementBy = getIncrementBy();
+ let incrementBy = increment !== undefined ? increment : this.settings.step !== undefined ? this.settings.step : 1; //eslint-disable-line
let testVal;
let updatedVal;
let finalVal;
- function checkIncrementBy(handleType) {
- if (isInt(testVal)) {
- return incrementBy;
- }
- const subtract = handleType === 'lower';
- const fraction = testVal % incrementBy;
- if (isNaN(fraction)) {
- return 0;
- }
- if (subtract) {
- return incrementBy - fraction;
- }
- return fraction;
- }
-
if (handle.hasClass('higher')) {
testVal = value !== undefined ? value : val[1];
- incrementBy = checkIncrementBy();
+ incrementBy = isInt(testVal) ? incrementBy : isNaN(testVal % incrementBy) ? 0 : testVal % incrementBy; //eslint-disable-line
updatedVal = testVal + incrementBy <
- (this.settings.max ? testVal + incrementBy : this.settings.max);
+ this.settings.max ? testVal + incrementBy : this.settings.max;
finalVal = updatedVal % incrementBy ? updatedVal : roundToIncrement(updatedVal, incrementBy);
this.value([undefined, finalVal]);
} else {
testVal = value !== undefined ? value : val[0];
const maxValue = val[1] === undefined ? this.settings.max : val[1];
- incrementBy = checkIncrementBy();
+ incrementBy = isInt(testVal) ? incrementBy : isNaN(testVal % incrementBy) ? 0 : incrementBy - (testVal % incrementBy); //eslint-disable-line
updatedVal = testVal + incrementBy < maxValue ? testVal + incrementBy : maxValue;
finalVal = updatedVal % incrementBy ? updatedVal : roundToIncrement(updatedVal, incrementBy);
this.value([finalVal]);
@@ -706,49 +681,24 @@ Slider.prototype = {
e.preventDefault();
clearTimeout(handle.data('animationTimeout'));
- function getDecrementBy() {
- if (decrement !== undefined) {
- return decrement;
- }
- if (this.settings.step !== undefined) {
- return this.settings.step;
- }
- return 1;
- }
-
const val = this.value();
- let decrementBy = getDecrementBy();
+ let decrementBy = decrement !== undefined ? decrement : this.settings.step !== undefined ? this.settings.step : 1; //eslint-disable-line
let testVal;
let updatedVal;
let finalVal;
- function checkDecrementBy(handleType) {
- if (isInt(testVal)) {
- return decrementBy;
- }
- const subtract = handleType === 'higher';
- const fraction = testVal % decrementBy;
- if (isNaN(fraction)) {
- return 0;
- }
- if (subtract) {
- return decrementBy - fraction;
- }
- return fraction;
- }
-
if (handle.hasClass('higher')) {
testVal = value !== undefined ? value : val[1];
const minValue = val[0] === undefined ? this.settings.min : val[0];
- decrementBy = checkDecrementBy();
+ decrementBy = isInt(testVal) ? decrementBy : isNaN(testVal % decrementBy) ? 0 : decrementBy - (testVal % decrementBy); //eslint-disable-line
updatedVal = testVal - decrementBy > minValue ? testVal - decrementBy : minValue;
finalVal = updatedVal % decrementBy ? updatedVal : roundToIncrement(updatedVal, decrementBy);
this.value([undefined, finalVal]);
} else {
testVal = value !== undefined ? value : val[0];
- decrementBy = checkDecrementBy();
+ decrementBy = isInt(testVal) ? decrementBy : isNaN(testVal % decrementBy) ? 0 : testVal % decrementBy; //eslint-disable-line
updatedVal = testVal - decrementBy >
- (this.settings.min ? testVal - decrementBy : this.settings.min);
+ this.settings.min ? testVal - decrementBy : this.settings.min;
finalVal = updatedVal % decrementBy ? updatedVal : roundToIncrement(updatedVal, decrementBy);
this.value([finalVal]);
}
",1
"diff --git a/components/autocomplete/autocomplete.js b/components/autocomplete/autocomplete.js @@ -262,6 +262,7 @@ Autocomplete.prototype = {
this.settings.displayResultsCallback(modifiedFilterResults, () => {
self.element.trigger('listopen', [modifiedFilterResults]);
});
+ return;
}
this.handleListResults(term, items, modifiedFilterResults);
",1
"diff --git a/components/listview/listview.js b/components/listview/listview.js @@ -339,7 +339,7 @@ ListView.prototype = {
ds = ds || this.settings.dataset;
pagerInfo = pagerInfo || {};
- if (!Array.isArray(ds) || !ds.length) {
+ if (!Array.isArray(ds)) {
return;
}
",1
"diff --git a/components/toolbar-flex/_toolbar-flex.scss b/components/toolbar-flex/_toolbar-flex.scss &:not(.favor) {
overflow-x: hidden;
- text-overflow: ellipsis;
+ overflow-y: auto;
}
}
&.title {
h1, h2, h3, h4, h5, h6, {
- display: inline-block;
+ display: inline;
}
.page-title, .section-title {
+ .toolbar-section.buttonset {
text-align: right;
}
+
+ &:not(.favor) {
+ text-overflow: ellipsis;
+ }
}
+ .toolbar-section.title {
padding-left: 10px;
}
+ &.buttonset {
+ padding: 4px;
+
+ [class^=""btn""] {
+ margin-right: 0;
+ }
+ }
+
&.search {
padding: 0 10px;
}
@@ -73,6 +85,10 @@ html[dir='rtl'] {
padding-left: 0;
padding-right: 10px;
}
+
+ &.buttonset {
+ margin-left: 0;
+ }
}
}
",1
"diff --git a/components/accordion/example-index.html b/components/accordion/example-index.html <div class=""accordion-header"">
<a href=""#""><span>Sort By</span></a>
</div>
- <div class=""accordion-pane is-expanded"">
+ <div class=""accordion-pane"">
<div class=""accordion-content"">
<div class=""radio-group"">
<input type=""radio"" class=""radio"" name=""sort"" id=""sort-recent"" value=""recent"" />
",1
"diff --git a/components/toolbar/toolbar.js b/components/toolbar/toolbar.js @@ -51,7 +51,7 @@ const TOOLBAR_DEFAULTS = {
*/
function Toolbar(element, settings) {
this.element = $(element);
- this.settings = utils.mergeSettings(this.element[0], settings, this.settings);
+ this.settings = utils.mergeSettings(this.element[0], settings, TOOLBAR_DEFAULTS);
debug.logTimeStart(COMPONENT_NAME);
this.init();
",1
"diff --git a/components/stepprocess/example-index.html b/components/stepprocess/example-index.html createHTML: function(stepFolder, step) {
var $stepContainer = $(stepFolder);
var $contentContainer = $('.step-container');
- $stepContainer.append(`
- <li class=""js-step"">
- <a class=""js-step-link"" href=""#${step.id}"">
- <svg class=""step-alert icon-empty-circle icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
- <use xlink:href=""#icon-empty-circle""></use>
- </svg>
- <span class='tree-text'>${step.title}</span>
- </a>
- </li>
- `);
- $contentContainer.append(`
- <div id=""${step.id}"" class=""js-step-panel"">
- <h2>${step.title}</h2>
- <p>This is step ${step.id}</p>
- </div>
- `);
+ $stepContainer.append('<li class=""js-step"">' +
+ '<a class=""js-step-link"" href=""#' + step.id + '"">' +
+ '<svg class=""step-alert icon-empty-circle icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">' +
+ '<use xlink:href=""#icon-empty-circle""></use>' +
+ '</svg>' +
+ '<span class=""tree-text"">' + step.title + '</span>' +
+ '</a>' +
+ '</li>');
+ $contentContainer.append('<div id=""' + step.id + '"" class=""js-step-panel"">' +
+ '<h2>' + step.title + '</h2>' +
+ '<p>This is step ${step.id}</p>' +
+ '</div>');
}
};
",1
"diff --git a/components/searchfield/searchfield.js b/components/searchfield/searchfield.js @@ -572,7 +572,7 @@ SearchField.prototype = {
}
let subtractWidth = 0;
- let targetWidthProp = '100%';
+ let targetWidthProp;
if (this.hasCategories()) {
subtractWidth += this.categoryButton.outerWidth(true);
@@ -585,8 +585,9 @@ SearchField.prototype = {
if (subtractWidth > 0) {
targetWidthProp = `calc(100% - ${subtractWidth}px)`;
}
-
+ if (targetWidthProp) {
this.element[0].style.width = targetWidthProp;
+ }
},
/**
",1
"diff --git a/build/deploy-documentation.js b/build/deploy-documentation.js @@ -282,7 +282,7 @@ function cleanAll() {
console.error(chalk.red('Error!'), err);
})
.then(res => {
- logTaskAction('Cleaned', paths.idsWebsite.dist);
+ logTaskAction('Cleaned', paths.idsWebsite.dist.replace(rootPath, '.'));
createDirs([
paths.idsWebsite.root,
paths.idsWebsite.dist,
@@ -317,7 +317,7 @@ function markdownToHtml(filePath) {
reject(err);
} else {
componentStats.numConverted++;
- logTaskAction('Converting', fileBasename + '.md')
+ logTaskAction('Converting', fileBasename + '.md', true);
resolve(allDocsObjMap[fileBasename].body = content);
}
});
@@ -334,7 +334,7 @@ function createDirs(arrPaths) {
for (let path of arrPaths) {
if (!fs.existsSync(path)) {
fs.mkdirSync(path);
- logTaskAction('Created', path);
+ logTaskAction('Created', path.replace(rootPath, '.'));
}
}
}
@@ -369,7 +369,7 @@ function documentJsToHtml(componentName) {
return output.map((file) => {
return vinylToString(file, 'utf8').then(contents => {
componentStats.numDocumented++;
- logTaskAction('Documented', componentName + '.js');
+ logTaskAction('Documented', componentName + '.js', true);
allDocsObjMap[componentName].api = contents;
});
})
@@ -411,10 +411,12 @@ function logTaskEnd(taskName) {
* Log an individual task's action
* @param {string} action - the action
* @param {string} desc - a brief description or more details
+ * @param {boolean} [onlyVerbose] - console log only with verbose flag
* @param {string} [color] - one of the chalk module's color aliases
+ *
*/
-function logTaskAction(action, desc, color = 'green') {
- if (argv.verbose) {
+function logTaskAction(action, desc, onlyVerbose=false, color = 'green') {
+ if (!onlyVerbose || (onlyVerbose && argv.verbose)) {
console.log('-', action, chalk[color](desc));
}
}
@@ -425,23 +427,24 @@ function logTaskAction(action, desc, color = 'green') {
function postZippedBundle() {
const formData = require('form-data');
- logTaskStart(`publish to server ""${deployTo}""`);
+ logTaskStart(`attempt publish to server ""${deployTo}""`);
let form = new formData();
form.append('file', fs.createReadStream(`${paths.idsWebsite.dist}.zip`));
form.append('root_path', `ids-enterprise/${packageJson.version}`);
form.append('post_auth_key', process.env.DOCS_API_KEY ? process.env.DOCS_API_KEY : """");
form.submit(serverURIs[deployTo], (err, res) => {
+ logTaskEnd(`attempt publish to server ""${deployTo}""`);
if (err) {
console.error(err);
+ logTaskAction('Failed!', `Status ${err}`, false, 'red');
} else {
if (res.statusCode == 200) {
logTaskAction('Success', `to ""${serverURIs[deployTo]}""`)
} else {
- logTaskAction('Failed!', `Status ${res.statusCode}`, 'red');
+ logTaskAction('Failed!', `Status ${res.statusCode}: ${res.statusMessage}`, false, 'red');
}
res.resume();
- logTaskEnd(`publish to server ""${deployTo}""`);
numArchivesSent++;
statsConclusion();
}
@@ -509,7 +512,7 @@ function writeHtmlFile(hbsTemplate, componentName) {
if (err) {
reject(err);
} else {
- logTaskAction('Created', `${componentName}.html`);
+ logTaskAction('Created', `${componentName}.html`, true);
resolve();
}
});
@@ -528,7 +531,7 @@ function writeJsonFile(componentName) {
reject(err);
} else {
componentStats.numWritten++;
- logTaskAction('Created', thisName + '.json');
+ logTaskAction('Created', thisName + '.json', true);
resolve();
}
});
",1
"diff --git a/components/toolbar-flex/toolbar-flex.js b/components/toolbar-flex/toolbar-flex.js @@ -349,6 +349,9 @@ ToolbarFlex.prototype = {
return;
}
+ // reference the original direction for later, if placement fails.
+ const originalDirection = 0 + direction;
+
if (currentIndex === undefined) {
currentIndex = this.items.indexOf(this.focusedItem);
}
@@ -376,7 +379,7 @@ ToolbarFlex.prototype = {
const targetItem = this.items[currentIndex];
if (targetItem.focusable === false) {
- this.navigate(direction > 0 ? 1 : -1, currentIndex, doSetFocus);
+ this.navigate(originalDirection > 0 ? 1 : -1, currentIndex, doSetFocus);
return;
}
",1
"diff --git a/components/applicationmenu/applicationmenu.js b/components/applicationmenu/applicationmenu.js @@ -671,7 +671,7 @@ ApplicationMenu.prototype = {
this.accordion.on('blur.applicationmenu', () => {
self.closeMenu();
}).on('selected.applicationmenu', (e, header) => {
- const a = header.children('a');
+ const a = $(header).children('a');
self.handleDismissOnClick(a);
}).on('followlink.applicationmenu', (e, anchor) => {
self.handleDismissOnClick(anchor);
",1
"diff --git a/components/tabs/tabs.js b/components/tabs/tabs.js @@ -1393,6 +1393,13 @@ Tabs.prototype = {
return false;
}
+ const validKeys = [13, 32, 37, 38, 39, 40];
+ const key = e.which;
+
+ if (validKeys.indexOf(key) < 0) {
+ return false;
+ }
+
const self = this;
const isRTL = Locale.isRTL();
let targetLi;
@@ -1413,7 +1420,7 @@ Tabs.prototype = {
targetLi = self.tablist.find(filter).first();
}
- switch (e.which) {
+ switch (key) {
case 37: // left
if (isRTL) {
firstTab();
",1
"diff --git a/build/deploy-documentation.js b/build/deploy-documentation.js @@ -388,9 +388,9 @@ function documentJsToHtml(componentName) {
* @returns {string} - the component's name
*/
function deriveComponentName(dirPath) {
- return dirPath
- .replace(`${paths.components}/`, '')
- .slice(0, -1);
+ dirPath = removeTrailingSlash(dirPath);
+ const arr = dirPath.split(path.sep);
+ return arr[arr.length - 1];
}
/**
@@ -468,6 +468,15 @@ function readSitemapYaml() {
return sitemap;
}
+/**
+ * Remove trialing slash
+ * @param {string} uri - a uri/path
+ * @returns {string} - the path with a trailing slash
+ */
+function removeTrailingSlash(uri) {
+ return uri.replace(/\/$/, '');
+}
+
/**
* Console.log statistics from the build
*/
",1
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -4192,7 +4192,7 @@ Datagrid.prototype = {
const self = this;
const cell = $(e.target).closest('td').index();
const rowElem = $(e.target).closest('tr');
- let row = self.dataRowIndex(rowElem);
+ let row = this.settings.treeGrid ? this.actualRowIndex(rowElem) : this.dataRowIndex(rowElem);
let isTrigger = true;
if ($(e.target).is('a')) {
",1
"diff --git a/src/components/colorpicker/colorpicker.js b/src/components/colorpicker/colorpicker.js @@ -335,6 +335,7 @@ ColorPicker.prototype = {
ariaListbox: true,
menuId: 'colorpicker-menu',
trigger: 'immediate',
+ attachToBody: true,
placementOpts: {
containerOffsetX: 10,
containerOffsetY: 10,
",1
"diff --git a/src/components/searchfield/searchfield.js b/src/components/searchfield/searchfield.js @@ -1018,7 +1018,7 @@ SearchField.prototype = {
* @returns {boolean} the ability to cancel the menu's opening.
*/
handlePopupBeforeOpen(e, menu) {
- if (!this.isExpanded || !menu) {
+ if ((this.isCollapsible && (this.isExpanding || !this.isExpanded)) || !menu) {
return false;
}
",1
"diff --git a/src/components/locale/locale.js b/src/components/locale/locale.js @@ -338,7 +338,7 @@ const Locale = { // eslint-disable-line
const hours = value.getHours();
const seconds = value.getSeconds();
- if (cal.conversions) {
+ if (cal && cal.conversions) {
if (attribs.fromGregorian) {
const islamicParts = cal.conversions.fromGregorian(value);
day = islamicParts[2];
",1
"diff --git a/docs/PUBLISH.md b/docs/PUBLISH.md @@ -34,7 +34,7 @@ To do a dev release, publish a dated semever to npm.
## Official, Tagged Releases
-#### Documentation
+### Documentation
- Verify the [changelog](/changelog) is up-to-date
- Generate Release Notes <http://bit.ly/2w6X8Xw>
",1
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md ## v4.8.0
- [Npm Package](https://www.npmjs.com/package/ids-enterprise)
-- [IDS NG (Angular) Change Log](https://github.com/infor-design/enterprise-ng/blob/master/CHANGELOG.md)
+- [IDS NG (Angular) Change Log](https://github.com/infor-design/enterprise-ng/blob/master/docs/CHANGELOG.md)
### v4.8.0 Features
",1
"diff --git a/src/components/dropdown/dropdown.js b/src/components/dropdown/dropdown.js @@ -1032,7 +1032,7 @@ Dropdown.prototype = {
resetList() {
// 'typeahead' reloading skips client-side filtering in favor of server-side
if (this.settings.source && this.settings.reload === 'typeahead') {
- this.callSource();
+ this.callSource(null, true);
return;
}
@@ -2412,14 +2412,15 @@ Dropdown.prototype = {
/**
* Execute the source ajax option
* @private
- * @param {function} callback - The function call back.
+ * @param {function} callback The function call back.
+ * @param {boolean} doReset if defined, acts as a ""reset"" source call, where the search term will be ignored.
* @returns {function} The callback for execution.
*/
- callSource(callback) {
+ callSource(callback, doReset) {
const self = this;
let searchTerm = '';
- if (this.isOpen() && !this.element.hasClass('search-mode')) {
+ if (!doReset && this.isOpen() && !this.element.hasClass('search-mode')) {
searchTerm = this.searchInput.val();
}
",1
"diff --git a/src/components/toolbar/toolbar.js b/src/components/toolbar/toolbar.js @@ -151,7 +151,9 @@ Toolbar.prototype = {
this.more = $('<button class=""btn-actions"" type=""button""></button>')
.html(`${$.createIcon({ icon: 'more' })
}<span class=""audible"">${Locale.translate('MoreActions')}</span>`)
+ .attr('title', Locale.translate('More'))
.appendTo(moreContainer);
+ this.more = $(this.more).initialize();
}
// Reference all interactive items in the toolbar
",1
"diff --git a/test/components/datepicker/datepicker.e2e-spec.js b/test/components/datepicker/datepicker.e2e-spec.js @@ -238,7 +238,6 @@ describe('Datepicker Month Year Picker Tests', () => {
await dropdownEl.sendKeys(protractor.Key.ARROW_DOWN);
await dropdownEl.sendKeys(protractor.Key.ARROW_DOWN);
await dropdownEl.sendKeys(protractor.Key.ENTER);
- await dropdownEl.sendKeys(protractor.Key.TAB);
const buttonEl = await element(by.css('.select-month.btn-tertiary'));
await buttonEl.click();
@@ -246,7 +245,7 @@ describe('Datepicker Month Year Picker Tests', () => {
const testDate = new Date();
testDate.setMonth(testDate.getMonth() + 1);
- expect(await element(by.id('month-year')).getAttribute('value')).toEqual(`${(testDate.getMonth() + 1).toString().padStart(2, '0')}/${testDate.getFullYear()}`);
+ expect(await element(by.id('month-year')).getAttribute('value')).toEqual(`${(testDate.getMonth()).toString().padStart(2, '0')}/${testDate.getFullYear()}`);
});
it('Should be able to function as month/year picker long', async () => {
@@ -257,13 +256,12 @@ describe('Datepicker Month Year Picker Tests', () => {
await dropdownEl.sendKeys(protractor.Key.ARROW_DOWN);
await dropdownEl.sendKeys(protractor.Key.ARROW_DOWN);
await dropdownEl.sendKeys(protractor.Key.ENTER);
- await dropdownEl.sendKeys(protractor.Key.TAB);
const buttonEl = await element(by.css('.select-month.btn-tertiary'));
await buttonEl.click();
const testDate = new Date();
- testDate.setMonth(testDate.getMonth() + 1);
+ testDate.setMonth(testDate.getMonth());
expect(await element(by.id('month-year-long')).getAttribute('value')).toEqual(testDate.toLocaleDateString('en-US', { year: 'numeric', month: 'short' }));
});
@@ -282,29 +280,25 @@ describe('Datepicker Month Year Changer Tests', () => {
await dropdownEl.sendKeys(protractor.Key.ARROW_DOWN);
await dropdownEl.sendKeys(protractor.Key.ARROW_DOWN);
await dropdownEl.sendKeys(protractor.Key.ENTER);
- await dropdownEl.sendKeys(protractor.Key.TAB);
const yearEl = await element(by.css('#year-dropdown + .dropdown-wrapper div[aria-controls=""dropdown-list""]'));
await yearEl.sendKeys(protractor.Key.ARROW_DOWN);
await yearEl.sendKeys(protractor.Key.ARROW_DOWN);
await yearEl.sendKeys(protractor.Key.ARROW_DOWN);
await yearEl.sendKeys(protractor.Key.ENTER);
- await yearEl.sendKeys(protractor.Key.TAB);
const prevButtonEl = await element(by.css('.prev.btn-icon'));
- await prevButtonEl.sendKeys(protractor.Key.TAB);
await prevButtonEl.sendKeys(protractor.Key.ENTER);
const lastButtonEl = await element(by.css('.next.btn-icon'));
await lastButtonEl.sendKeys(protractor.Key.ENTER);
- await lastButtonEl.sendKeys(protractor.Key.TAB);
await browser.driver.sleep(config.sleep);
const buttonEl = await element.all(by.css('.calendar-table td:not(.alternate)')).first();
await buttonEl.click();
const testDate = new Date();
- testDate.setMonth(testDate.getMonth() + 2);
+ testDate.setMonth(testDate.getMonth() + 1);
expect(await element(by.id('date-field-normal')).getAttribute('value')).toEqual(`${(testDate.getMonth())}/1/${testDate.getFullYear()}`);
});
",1
"diff --git a/test/components/datagrid/datagrid-paging.func-spec.js b/test/components/datagrid/datagrid-paging.func-spec.js @@ -280,7 +280,7 @@ describe('Datagrid Paging API', () => {
const dataSourceContainer = {
dataSource: (request, response) => {
request.firstPage = false;
- request.lastPage = request.type === 'last';
+ request.lastPage = request.type === 'next';
response(sampleData, request);
}
};
@@ -297,7 +297,7 @@ describe('Datagrid Paging API', () => {
// and the paging bar is rendered
setTimeout(() => {
// get first button and click it
- const buttonEl = document.body.querySelector('li.pager-last a');
+ const buttonEl = document.body.querySelector('li.pager-next a');
const buttonClickSpy = spyOnEvent(buttonEl, 'click.button');
buttonEl.click();
@@ -308,18 +308,18 @@ describe('Datagrid Paging API', () => {
// ensure it's been called with a request.type of 'first'
expect(dataSourceSpy).toHaveBeenCalled();
expect(dataSourceSpy.calls.mostRecent().args[0].type).toBeDefined();
- expect(dataSourceSpy.calls.mostRecent().args[0].type).toEqual('last');
+ expect(dataSourceSpy.calls.mostRecent().args[0].type).toEqual('next');
done();
}, 500);
}, 1);
});
- it('test using last paging bar button', (done) => {
+ it('test using previous paging bar button', (done) => {
// build a source function
const dataSourceContainer = {
dataSource: (request, response) => {
- request.firstPage = false;
- request.lastPage = request.type === 'last';
+ request.firstPage = request.type === 'prev';
+ request.lastPage = false;
response(sampleData, request);
}
};
@@ -336,7 +336,7 @@ describe('Datagrid Paging API', () => {
// and the paging bar is rendered
setTimeout(() => {
// get first button and click it
- const buttonEl = document.body.querySelector('li.pager-last a');
+ const buttonEl = document.body.querySelector('li.pager-prev a');
const buttonClickSpy = spyOnEvent(buttonEl, 'click.button');
buttonEl.click();
@@ -347,7 +347,7 @@ describe('Datagrid Paging API', () => {
// ensure it's been called with a request.type of 'first'
expect(dataSourceSpy).toHaveBeenCalled();
expect(dataSourceSpy.calls.mostRecent().args[0].type).toBeDefined();
- expect(dataSourceSpy.calls.mostRecent().args[0].type).toEqual('last');
+ expect(dataSourceSpy.calls.mostRecent().args[0].type).toEqual('prev');
done();
}, 500);
}, 1);
",1
"diff --git a/test/components/tabs/tabs.e2e-spec.js b/test/components/tabs/tabs.e2e-spec.js @@ -452,7 +452,7 @@ describe('Tabs ajax as href tests', () => {
it('Should be able to activate href tabs', async () => {
expect(await element(by.id('ajaxified-tabs-tab-1')).getAttribute('innerHTML')).not.toBe('');
- await element.all(by.className('tab')).get(2).click();
+ await element.all(by.id('example-tab-two')).click();
await browser.driver
.wait(protractor.ExpectedConditions.visibilityOf(element(by.css('#ajaxified-tabs-tab-2.is-visible'))), config.waitsFor);
",1
"diff --git a/src/components/field-options/field-options.js b/src/components/field-options/field-options.js @@ -114,6 +114,13 @@ FieldOptions.prototype = {
const removeFocused = (elem) => {
(elem || this.element).removeClass('is-focused');
};
+ const canActive = (e) => {
+ let r = isFocus(this.element);
+ r = datepicker && datepicker.isOpen() ? false : r;
+ r = timepicker && timepicker.isOpen() ? false : r;
+ r = dropdown && dropdown.isOpen() ? false : r;
+ return r;
+ }
const doActive = () => {
self.element.add(self.trigger).add(self.field).add(self.fieldParent)
.addClass('is-active');
@@ -175,9 +182,15 @@ FieldOptions.prototype = {
// In desktop environments, the button should only display when the field is in use.
if (env.features.touch) {
this.field.addClass('visible');
- this.trigger.on(`beforeopen.${COMPONENT_NAME}`, () => {
+ this.trigger.on(`beforeopen.${COMPONENT_NAME}`, (e) => {
+ if (!canActive(e)) {
+ return;
+ }
doActive();
- }).on(`close.${COMPONENT_NAME}`, () => {
+ }).on(`close.${COMPONENT_NAME}`, (e) => {
+ if (!canUnactive(e)) {
+ return;
+ }
doUnactive();
});
} else {
@@ -329,8 +342,8 @@ FieldOptions.prototype = {
.on(`selected.${COMPONENT_NAME}`, () => {
this.popupmenuApi.settings.returnFocus = true;
})
- .on(`close.${COMPONENT_NAME}`, (e, isCancelled) => {
- if (canUnactive(e) && isCancelled) {
+ .on(`close.${COMPONENT_NAME}`, (e) => {
+ if (canUnactive(e)) {
doUnactive();
}
});
",1
"diff --git a/docs/DEVELOPER.md b/docs/DEVELOPER.md @@ -77,7 +77,7 @@ Finally, in a footer section below the markup on your page, add a `<script>` tag
</script>
```
-It's also possible to manually initialize each component you want to use individually:
+It's also possible to manually initialize each individual component:
```js
$('#my-button').button();
",1
"diff --git a/src/components/wizard/wizard.js b/src/components/wizard/wizard.js @@ -251,7 +251,7 @@ Wizard.prototype = {
* Fires before a step is activated/pressed. You can cancel selection by returning a 'beforeactivate'
* handler as 'false'
* @event beforeactivate
- * @memberof Datagrid
+ * @memberof Wizard
* @property {object} event - The jquery event object
* @property {HTMLElement} tick - The tick (link) that was activated.
*/
@@ -272,7 +272,7 @@ Wizard.prototype = {
* Fires while a step is activated/pressed.
* handler as 'false'
* @event activated
- * @memberof Datagrid
+ * @memberof Wizard
* @property {object} event - The jquery event object
* @property {HTMLElement} tick - The tick (link) that was activated.
*/
@@ -281,8 +281,8 @@ Wizard.prototype = {
/**
* Fires after a step is activated/pressed. And the new Dom is loaded.
* handler as 'false'
- * @event activated
- * @memberof Datagrid
+ * @event afteractivated
+ * @memberof Wizard
* @property {object} event - The jquery event object
* @property {HTMLElement} tick - The tick (link) that was activated.
*/
",1
"diff --git a/src/components/dropdown/dropdown.js b/src/components/dropdown/dropdown.js @@ -978,7 +978,6 @@ Dropdown.prototype = {
return;
}
-
results.removeClass('hidden');
list.not(results).add(headers).addClass('hidden');
list.filter(results).each(function (i) {
@@ -1012,10 +1011,12 @@ Dropdown.prototype = {
term = '';
this.position();
+ if (this.list.find('svg').length > 2) {
+ this.list.find('svg').last().changeIcon('icon-empty-circle');
+ }
+
if (noIcons && this.list.find('input').css('padding-left')) {
this.list.find('input').addClass('no-icon-padding');
- } else {
- this.list.find('svg').last().changeIcon('icon-empty-circle');
}
},
@@ -1070,6 +1071,10 @@ Dropdown.prototype = {
lis.removeClass('hidden');
this.position();
+ if (this.list.find('svg').length === 2) {
+ this.list.find('svg').last().remove();
+ }
+
if (this.list.find('input').css('padding-left')) {
this.list.find('input').addClass('no-icon-padding');
}
",1
"diff --git a/test/components/bar/bar-stacked.e2e-spec.js b/test/components/bar/bar-stacked.e2e-spec.js @@ -55,14 +55,14 @@ describe('Stacked Bar Chart example-colors', () => {
await utils.checkForErrors();
});
- it('Should first bar is green', async () => {
+ it('Should detect that first bar is green', async () => {
const fGroupEl = await element.all(by.css('.series-group')).get(0);
const barEl = await fGroupEl.element(by.css('.bar.series-0'));
expect(await barEl.getCssValue('fill')).toBe('rgb(142, 209, 198)');
});
- it('Should second bar is violet', async () => {
+ it('Should detect that second bar is violet', async () => {
const sGroupEl = await element.all(by.css('.series-group')).get(1);
const barEl = await sGroupEl.element(by.css('.bar.series-0'));
",1
"diff --git a/src/components/dropdown/dropdown.js b/src/components/dropdown/dropdown.js @@ -1057,7 +1057,15 @@ Dropdown.prototype = {
const li = $(this);
const text = a.text();
- const icon = (li.children('a').find('svg').length !== 0) ? li.children('a').find('svg')[0].outerHTML : '';
+ let icon = '';
+
+ if (li.children('a').find('svg').length !== 0) {
+ if (li.children('a').find('svg')[0].outerHTML) {
+ icon = li.children('a').find('svg')[0].outerHTML;
+ } else {
+ icon = new XMLSerializer().serializeToString(li.children('a').find('svg')[0]);
+ }
+ }
if (icon) {
hasIcons = true;
",1
"diff --git a/src/components/colorpicker/colorpicker.js b/src/components/colorpicker/colorpicker.js @@ -115,7 +115,8 @@ const COLORPICKER_DEFAULTS = {
{ label: 'Azure', number: '05', value: '4EA0D1' },
{ label: 'Azure', number: '04', value: '69B5DD' },
{ label: 'Azure', number: '03', value: '8DC9E6' },
- { label: 'Azure', number: '02', value: 'ADD8EB' }
+ { label: 'Azure', number: '02', value: 'ADD8EB' },
+ { label: 'Azure', number: '01', value: 'C8E9F4' }
],
placeIn: null, // null|'editor'
showLabel: false,
@@ -540,10 +541,6 @@ ColorPicker.prototype = {
const a = $(`<a href=""#"" title=""${s.clearableText}""><span class=""swatch is-empty${isBorderAll ? ' is-border' : ''}""></span></a>`).appendTo(li);
a.data('label', s.clearableText).data('value', '').tooltip();
menu.append(li);
- } else if (!this.settings.customColors) {
- const li = $('<li></li>');
- $('<a href=""#"" title=""Azure01 #C8E9F4""><span class=""swatch"" style=""background-color: rgb(173 ,216, 235);""></span></a>').appendTo(li).tooltip();
- menu.append(li);
}
$('body').append(menu);
",1
"diff --git a/src/components/bar/bar.js b/src/components/bar/bar.js @@ -647,6 +647,11 @@ Bar.prototype = {
* @private
*/
setTextValues() {
+ if (this.settings.isGrouped) {
+ // These are TODO, as you need a different structure since its using the group name
+ return;
+ }
+
const elems = document.querySelectorAll('.bar-chart .axis.y .tick text');
const dataset = this.settings.dataset;
for (let i = 0; i < dataset.length; i++) {
",1
"diff --git a/src/components/searchfield/_searchfield.scss b/src/components/searchfield/_searchfield.scss @@ -86,6 +86,7 @@ $cubic-bezier-ease: cubic-bezier(0.17, 0.04, 0.03, 0.94);
border-left: 0;
border-right: 0;
border-top: 0;
+ height: 33px;
padding-left: 32px;
width: 100%;
",1
"diff --git a/test/components/listview/listview.e2e-spec.js b/test/components/listview/listview.e2e-spec.js @@ -52,14 +52,14 @@ describe('Listview example-singleselect tests', () => {
it('Should deselect one item on click', async () => {
const listviewItemEl = await element(by.css('li[aria-posinset=""1""]'));
- listviewItemEl.click();
+ await listviewItemEl.click();
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(element(by.css('li[aria-selected=""true""].is-selected'))), config.waitsFor);
expect(await element(by.css('li[aria-selected=""true""]')).isPresent()).toBeTruthy();
expect(await element(by.className('selection-count')).getText()).toContain('1 Selected');
- listviewItemEl.click();
+ await listviewItemEl.click();
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(element(by.css('li[aria-selected=""false""]'))), config.waitsFor);
",1
"diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js @@ -3235,7 +3235,17 @@ Tabs.prototype = {
e.preventDefault();
e.stopPropagation();
+
+ if (li.is('.dismissible') && li.is('.has-popupmenu') && li.is('.submenu')) {
+ const listMenu = li.find('.wrapper').children().children();
+ const hrefs = [];
+ $.each(listMenu, (i, item) => {
+ hrefs.push(item.children[0].href);
+ });
+ self.closeDismissibleTabs(hrefs);
+ } else {
self.closeDismissibleTab(li.children('a').attr('href'));
+ }
self.popupmenu.close();
}
",1
"diff --git a/test/components/datepicker/datepicker.e2e-spec.js b/test/components/datepicker/datepicker.e2e-spec.js @@ -640,6 +640,7 @@ describe('Datepicker Timeformat Tests', () => {
const todayEl = await element(by.css('button.is-today'));
const testDate = new Date();
await todayEl.click();
+ const value = await element(by.id('dp3')).getAttribute('value');
let hours = testDate.getHours();
const minutes = testDate.getMinutes();
@@ -651,10 +652,12 @@ describe('Datepicker Timeformat Tests', () => {
}
expect([
+ `${(testDate.getMonth() + 1)}/${testDate.getDate()}/${testDate.getFullYear()} ${hours}:${(minutes - 2).toString().padStart(2, '0')} ${amPm}`,
+ `${(testDate.getMonth() + 1)}/${testDate.getDate()}/${testDate.getFullYear()} ${hours}:${(minutes - 1).toString().padStart(2, '0')} ${amPm}`,
`${(testDate.getMonth() + 1)}/${testDate.getDate()}/${testDate.getFullYear()} ${hours}:${(minutes).toString().padStart(2, '0')} ${amPm}`,
`${(testDate.getMonth() + 1)}/${testDate.getDate()}/${testDate.getFullYear()} ${hours}:${(minutes + 1).toString().padStart(2, '0')} ${amPm}`,
`${(testDate.getMonth() + 1)}/${testDate.getDate()}/${testDate.getFullYear()} ${hours}:${(minutes + 2).toString().padStart(2, '0')} ${amPm}` // for slow test on ci
- ]).toContain(await element(by.id('dp3')).getAttribute('value'));
+ ]).toContain(value);
});
});
",1
"diff --git a/test/components/tabs/tabs-api.func-spec.js b/test/components/tabs/tabs-api.func-spec.js @@ -289,11 +289,15 @@ describe('Tabs API', () => {
expect(tab.length).toBeFalsy();
});
- it('Should select tab, and focus', () => {
+ it('Should select tab, and focus', (done) => {
tabsObj.select('#tabs-normal-contracts');
expect(document.querySelector('.tab.is-selected').innerText).toEqual('Contracts');
+
+ setTimeout(() => {
expect(parseInt(document.querySelector('.animated-bar').style.left, 10)).toBeCloseTo(0, 1);
+ done();
+ }, 500);
});
it('Should return false whether tabs are overflowed at 300px', () => {
",1
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -1506,7 +1506,7 @@ describe('Datagrid timezone tests', () => {
if (utils.isChrome() && utils.isCI()) {
it('Should not visual regress', async () => {
const containerEl = await element(by.className('container'));
- await browser.driver.sleep(1500);
+ await browser.driver.sleep(400);
expect(await browser.protractorImageComparison.checkElement(containerEl, 'datagrid-timezone')).toEqual(0);
});
",1
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -1490,11 +1490,11 @@ describe('Datagrid select event tests', () => {
});
});
-describe('Datagrid timezone tests', () => {
+fdescribe('Datagrid timezone tests', () => {
beforeEach(async () => {
await utils.setPage('/components/datagrid/test-timezone-formats?layout=nofrills&locale=nl-NL');
- const datagridEl = await element(by.css('.datagrid tr:nth-child(10)'));
+ const datagridEl = await element(by.css('.datagrid tr:nth-child(5)'));
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(datagridEl), config.waitsFor);
});
@@ -1506,7 +1506,6 @@ describe('Datagrid timezone tests', () => {
if (utils.isChrome() && utils.isCI()) {
it('Should not visual regress', async () => {
const containerEl = await element(by.className('container'));
- await browser.driver.sleep(400);
expect(await browser.protractorImageComparison.checkElement(containerEl, 'datagrid-timezone')).toEqual(0);
});
",1
"diff --git a/src/components/form-compact/_form-compact.scss b/src/components/form-compact/_form-compact.scss font-weight: 700;
}
+// Specific paddings for non-Blink-based browsers (IE, FF)
+.ie,
+.is-firefox {
+ .form-compact {
+ .column,
+ .columns {
+ &.form-section-header {
+ padding: 16px 10px 15px;
+ }
+
+ label {
+ padding: 6px 9px 0;
+ }
+
+ input {
+ padding: 0 8px 6px;
+ }
+ }
+ }
+}
+
// Ensures a common min-height on headers
@media (max-width: $breakpoint-phone-to-tablet + 1) {
.form-compact {
",1
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -612,7 +612,7 @@ describe('Datagrid paging tests', () => {
await element(by.css('.pager-count input')).clear();
await element(by.css('.pager-count input')).sendKeys('101');
await element(by.css('.pager-count input')).sendKeys(protractor.Key.ENTER);
- await browser.driver.sleep(300);
+ await browser.driver.sleep(500);
expect(await element(by.css('tbody tr:nth-child(1) td:nth-child(2) span')).getText()).toEqual('0');
expect(await element(by.css('tbody tr:nth-child(10) td:nth-child(2) span')).getText()).toEqual('9');
",1
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -1081,7 +1081,7 @@ describe('Datagrid disableRowDeactivation setting tests', () => {
beforeEach(async () => {
await utils.setPage('/components/datagrid/test-mixed-selection-disable-row-dectivation');
- const datagridEl = await element(by.id('datagrid-header'));
+ const datagridEl = await element(by.css('#datagrid-header .datagrid-body tbody tr:nth-child(1)'));
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(datagridEl), config.waitsFor);
});
",1
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -394,7 +394,7 @@ describe('Datagrid index tests', () => {
beforeEach(async () => {
await utils.setPage('/components/datagrid/example-index?layout=nofrills');
- const datagridEl = await element(by.id('datagrid'));
+ const datagridEl = await element(by.css('#datagrid tbody tr:nth-child(1)'));
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(datagridEl), config.waitsFor);
await element(by.css('body')).sendKeys(protractor.Key.TAB);
",1
"diff --git a/test/components/datepicker/datepicker.e2e-spec.js b/test/components/datepicker/datepicker.e2e-spec.js @@ -577,7 +577,7 @@ describe('Datepicker Timeformat Tests', () => {
const dateVariances = [-2, -1, 0, 1, 2]
.map(amt => testDate.setSeconds(testDate.getSeconds() + amt));
- expect(dateVariances).toEqual(new Date(value).getTime());
+ expect(dateVariances).toContain(new Date(value).getTime());
});
});
",1
"diff --git a/app/views/components/mask/test-number-mask-gauntlet.html b/app/views/components/mask/test-number-mask-gauntlet.html }
};
- var localeString = Locale.currentLocale.name,
+ var thisLocale = Locale.currentLocale,
+ localeString = thisLocale.name,
isLocalized = localeString !== 'en-US'; // default for the test suite
// localize the label
if (isLocalized) {
- var number = Locale.parseNumber(numberSpan.text().toString()),
+ var spanText = numberSpan.text();
+ var hasThousands = spanText.indexOf(thisLocale.data.numbers.group) !== -1;
+ var number = Locale.parseNumber(spanText.toString()),
localizedLabelOpts = {
group: thisOpts.patternOptions.symbols.thousands,
decimal: thisOpts.patternOptions.symbols.decimal,
minusSign: thisOpts.patternOptions.symbols.negative,
minimumFractionDigits: 0
};
+ if (!hasThousands) {
+ localizedLabelOpts.groupSizes = [0, 0];
+ }
if (thisOpts.patternOptions.decimalLimit) {
localizedLabelOpts.maximumFractionDigits = thisOpts.patternOptions.decimalLimit;
}
",1
"diff --git a/package.json b/package.json ""build"": ""node ./scripts/build"",
""build:custom"": ""node ./scripts/build"",
""build:icons"": ""node ./scripts/build-icons.js"",
- ""clean"": ""npx grunt clean"",
+ ""clean"": ""rimraf temp && rimraf dist"",
+ ""clean:app"": ""rimraf app/dist"",
""stop"": ""./scripts/stop.sh"",
""watch"": ""npx grunt watch"",
""stylelint:demo"": ""npx stylelint 'app/src/**/*.scss'"",
""eslint:error-only"": ""npm run build:icons && npx eslint -c .eslintrc.js --quiet src test"",
""lint:ci"": ""npm run eslint:error-only && npm run mdlint && npm run stylelint"",
""minify"": ""node ./scripts/minify.js"",
- ""minify:js"": ""node ./scripts/minify-js.js"",
- ""minify:css"": ""node ./scripts/minify-css.js"",
""functional:local"": ""npx karma start test/karma.conf.js"",
""functional:ci"": ""npx karma start test/karma.conf.js --single-run"",
""e2e:ci"": ""npm run webdriver:update && npx protractor test/protractor.ci.conf.js"",
""pygmentize-bundled"": ""^2.3.0"",
""r2"": ""^2.0.1"",
""release-it"": ""^10.3.1"",
+ ""rimraf"": ""^2.6.3"",
""rollup"": ""^1.6.0"",
""rollup-plugin-analyzer"": ""^3.0.0"",
""rollup-plugin-babel"": ""^3.0.2"",
",1
"diff --git a/src/components/header/header.js b/src/components/header/header.js @@ -368,32 +368,34 @@ Header.prototype = {
const self = this;
this.element
- .on('updated.header', (e, settings) => {
+ .on(`updated.${COMPONENT_NAME}`, (e, settings) => {
self.updated(settings);
})
- .on('reset.header', () => {
+ .on(`reset.${COMPONENT_NAME}`, () => {
self.reset();
})
- .on('drilldown.header', (e, viewTitle) => {
+ .on(`drilldown.${COMPONENT_NAME}`, (e, viewTitle) => {
self.drilldown(viewTitle);
})
- .on('drillup.header', (e, viewTitle) => {
+ .on(`drillup.${COMPONENT_NAME}`, (e, viewTitle) => {
self.drillup(viewTitle);
});
// Events for the title button. e.preventDefault(); stops Application Menu
// functionality while drilled
- this.titleButton.bindFirst('click.header', (e) => {
+ if (this.titleButton && this.titleButton.length) {
+ this.titleButton.bindFirst(`click.${COMPONENT_NAME}`, (e) => {
if (self.levelsDeep.length > 1) {
e.stopImmediatePropagation();
self.drillup();
e.returnValue = false;
}
});
+ }
// Popupmenu Events
- if (this.settings.usePopupmenu) {
- this.titlePopup.on('selected.header', function (e, anchor) {
+ if (this.titlePopup && this.titlePopup.length) {
+ this.titlePopup.on(`selected.${COMPONENT_NAME}`, function (e, anchor) {
$(this).children('h1').text(anchor.text());
});
}
@@ -716,8 +718,21 @@ Header.prototype = {
* @returns {this} component instance
*/
unbind() {
- this.titleButton.off('click.header');
- this.element.off('drilldown.header drillup.header');
+ if (this.titleButton && this.titleButton.length) {
+ this.titleButton.off(`click.${COMPONENT_NAME}`);
+ }
+
+ if (this.titlePopup && this.titlePopup.length) {
+ this.titlePopup.off(`updated.${COMPONENT_NAME}`);
+ }
+
+ this.element.off([
+ `updated.${COMPONENT_NAME}`,
+ `reset.${COMPONENT_NAME}`,
+ `drilldown.${COMPONENT_NAME}`,
+ `drillup.${COMPONENT_NAME}`,
+ ].join(' '));
+
return this;
},
",1
"diff --git a/test/components/locale/locale.func-spec.js b/test/components/locale/locale.func-spec.js @@ -1053,7 +1053,7 @@ describe('Locale API', () => {
});
it('Should handle group size', () => {
- Locale.set('en-US'); // 3, 0
+ Locale.set('en-US'); // 3, 3
expect(Locale.formatNumber(-2.53, { style: 'percent', minimumFractionDigits: 2 })).toEqual('-253.00 %');
expect(Locale.formatNumber(1.1234)).toEqual('1.123');
@@ -1103,7 +1103,7 @@ describe('Locale API', () => {
});
it('Should parse group size', () => {
- Locale.set('en-US'); // 3, 0
+ Locale.set('en-US'); // 3, 3
expect(Locale.parseNumber('-253.00 %')).toEqual(-253);
expect(Locale.parseNumber('1.123')).toEqual(1.123);
@@ -1153,7 +1153,7 @@ describe('Locale API', () => {
});
it('Should be able to not show the group size', () => {
- Locale.set('en-US'); // 3, 0
+ Locale.set('en-US'); // 3, 3
expect(Locale.formatNumber(1234567.1234, { group: '' })).toEqual('1234567.123');
expect(Locale.formatNumber(12345678.1234, { group: '' })).toEqual('12345678.123');
@@ -1170,7 +1170,7 @@ describe('Locale API', () => {
});
it('Should be able to set the group size', () => {
- Locale.set('en-US'); // 3, 0
+ Locale.set('en-US'); // 3, 3
expect(Locale.formatNumber(1234567.1234, { groupSizes: [3, 0] })).toEqual('1234,567.123');
expect(Locale.formatNumber(12345678.1234, { groupSizes: [3, 0] })).toEqual('12345,678.123');
@@ -1187,7 +1187,7 @@ describe('Locale API', () => {
});
it('Should be able to set zero group size', () => {
- Locale.set('en-US'); // 3, 0
+ Locale.set('en-US'); // 3, 3
expect(Locale.formatNumber(1234567.1234, { groupSizes: [0, 0] })).toEqual('1234567.123');
expect(Locale.formatNumber(12345678.1234, { groupSizes: [0, 0] })).toEqual('12345678.123');
",1
"diff --git a/src/components/expandablearea/readme.md b/src/components/expandablearea/readme.md @@ -56,7 +56,6 @@ Its possible to assign a custom button that can toggle a specific area using the
</div>
```
-
## Testability
- Please refer to the [Application Testability Checklist](https://design.infor.com/resources/application-testability-checklist) for further details.
",1
"diff --git a/src/components/personalize/personalize.js b/src/components/personalize/personalize.js @@ -311,8 +311,8 @@ Personalize.prototype = {
*/
setTheme(incomingTheme) {
if (theme.currentTheme.id === incomingTheme) {
- if (!$('html').hasClass(`${theme}-theme`)) {
- $('html').addClass(`${theme}-theme`);
+ if (!$('html').hasClass(`${incomingTheme}-theme`)) {
+ $('html').addClass(`${incomingTheme}-theme`);
}
return;
}
",1
"diff --git a/scripts/build/create-svg-html.js b/scripts/build/create-svg-html.js @@ -142,8 +142,7 @@ function createHtmlFiles() {
*/
function createSvgHtml(verbose) {
IS_VERBOSE = verbose;
- cleanFiles();
- return createHtmlFiles();
+ cleanFiles().then(createHtmlFiles);
}
module.exports = createSvgHtml;
",1
"diff --git a/src/components/datagrid/_datagrid.scss b/src/components/datagrid/_datagrid.scss @@ -193,13 +193,13 @@ $datagrid-short-row-height: 23px;
&.has-group-headers.has-filterable-columns {
.datagrid-body {
- height: calc(100% - 100px);
+ height: calc(100% - 105px);
}
}
&.has-filterable-columns {
.datagrid-body {
- height: calc(100% - 65px);
+ height: calc(100% - 66px);
}
.datagrid-filter-wrapper {
",1
"diff --git a/app/views/components/slider/example-index.html b/app/views/components/slider/example-index.html <div class=""field"">
<label for=""slider-regular"">Regular</label>
- <input id=""slider-regular"" name=""slider-regular"" value=""10"" class=""slider"" type=""range"" data-tooltip-content=""['']"" data-tooltip-persist=""true"" />
+ <input id=""slider-regular"" name=""slider-regular"" value=""10"" class=""slider"" type=""range"" data-options=""{'persistTooltip': false, tooltipContent: ['']}""/>
</div>
</div>
",1
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md - `[Datagrid]` Added an example of expandOnActivate on a customer editor. ([#353](https://github.com/infor-design/enterprise-ng/issues/353))
- `[Datagrid]` Added ability to pass a function to the tooltip option for custom formatting. ([#354](https://github.com/infor-design/enterprise-ng/issues/354))
- `[Dropdown]` Changed the way dropdowns work with screen readers to be a collapsible listbox.([#404](https://github.com/infor-design/enterprise/issues/404))
-- `[Dropdown]` Changed the way dropdowns work with screen readers to be a collapsible listbox.([#404](https://github.com/infor-design/enterprise/issues/404))
+- `[Dropdown]` Fixed an issue where multiselect dropdown unchecking ""Select All"" was not getting clear after close list with Safari browser.([#1882](https://github.com/infor-design/enterprise/issues/1882))
- `[Dropdown]` Added an example of a color dropdown showing palette colors as icons.([#2013](https://github.com/infor-design/enterprise/issues/2013))
- `[Listbuilder]` Fixed an issue where the text was not sanitizing. ([#1692](https://github.com/infor-design/enterprise/issues/1692))
- `[Lookup]` Fixed an issue where the tooltip was using audible text in the code block component. ([#354](https://github.com/infor-design/enterprise-ng/issues/354))
",1
"diff --git a/src/components/applicationmenu/applicationmenu.js b/src/components/applicationmenu/applicationmenu.js @@ -29,7 +29,7 @@ const APPLICATIONMENU_DEFAULTS = {
dismissOnClickMobile: false,
filterable: false,
openOnLarge: false,
- triggers: [],
+ triggers: ['.application-menu-trigger'],
onExpandSwitcher: null,
onCollapseSwitcher: null,
};
",1
"diff --git a/README.md b/README.md [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![npm version](https://badge.fury.io/js/ids-enterprise.svg)](https://badge.fury.io/js/ids-enterprise)
[![Build Status](https://travis-ci.com/infor-design/enterprise.svg?branch=master)](https://travis-ci.com/infor-design/enterprise)
-[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=M2l2RFNkS2hHUU1CU0kvcFdsSGdIWFlMNEF0RVZzRzNvSHVTemJIektiOD0tLTUvWm1JUWNXbjhML01oR2hJNllLb2c9PQ==--dff99debefe381a9d6031c2ce209d663d727ecf9)](https://www.browserstack.com/automate/public-build/M2l2RFNkS2hHUU1CU0kvcFdsSGdIWFlMNEF0RVZzRzNvSHVTemJIektiOD0tLTUvWm1JUWNXbjhML01oR2hJNllLb2c9PQ==--dff99debefe381a9d6031c2ce209d663d727ecf9)
+[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=ZTBSMS9NZFgxN2VCZnpaNmdsa1NhY2J1NHlsNnFuMG5UcGViQUhMYnl1QT0tLVlTTks3UUVQbXd0emlxL1BKK2RjeGc9PQ==--eb3493141181901c21b84c0bf6c9c7d44635df2ausmvtmcconechy:enterprusmusmvtuusuuuuusuusmvusmvtuusmvuusuuuuuuu)](https://www.browserstack.com/automate/public-build/ZTBSMS9NZFgxN2VCZnpaNmdsa1NhY2J1NHlsNnFuMG5UcGViQUhMYnl1QT0tLVlTTks3UUVQbXd0emlxL1BKK2RjeGc9PQ==--eb3493141181901c21b84c0bf6c9c7d44635df2ausmvtmcconechy:enterprusmusmvtuusuuuuusuusmvusmvtuusmvuusuuuuuuu)
Infor Design System's Enterprise component library is a framework-independent UI library consisting of CSS and JS that provides Infor product development teams, partners, and customers the tools to create user experiences that are approachable, focused, relevant, perceptive.
",1
"diff --git a/README.md b/README.md [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![npm version](https://badge.fury.io/js/ids-enterprise.svg)](https://badge.fury.io/js/ids-enterprise)
[![Build Status](https://travis-ci.com/infor-design/enterprise.svg?branch=master)](https://travis-ci.com/infor-design/enterprise)
-[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=YjZiNnMrdklFaml2V3ZaY1g0NnFVNVhsZ2RjTjJleStKb2pzdmN1c2lraz0tLWEzdVBmUDhFYml5VzV2cGdKVnZiQnc9PQ==--2f996e1132d31738f133e4d1414e9591e2187a10](https://www.browserstack.com/automate/public-build/YjZiNnMrdklFaml2V3ZaY1g0NnFVNVhsZ2RjTjJleStKb2pzdmN1c2lraz0tLWEzdVBmUDhFYml5VzV2cGdKVnZiQnc9PQ==--2f996e1132d31738f133e4d1414e9591e2187a10)
+[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=YjZiNnMrdklFaml2V3ZaY1g0NnFVNVhsZ2RjTjJleStKb2pzdmN1c2lraz0tLWEzdVBmUDhFYml5VzV2cGdKVnZiQnc9PQ==--2f996e1132d31738f133e4d1414e9591e2187a10)](https://www.browserstack.com/automate/public-build/YjZiNnMrdklFaml2V3ZaY1g0NnFVNVhsZ2RjTjJleStKb2pzdmN1c2lraz0tLWEzdVBmUDhFYml5VzV2cGdKVnZiQnc9PQ==--2f996e1132d31738f133e4d1414e9591e2187a10)
Infor Design System's Enterprise component library is a framework-independent UI library consisting of CSS and JS that provides Infor product development teams, partners, and customers the tools to create user experiences that are approachable, focused, relevant, perceptive.
",1
"diff --git a/test/components/listbuilder/listbuilder-api.func-spec.js b/test/components/listbuilder/listbuilder-api.func-spec.js import { ListBuilder } from '../../../src/components/listbuilder/listbuilder';
+import { cleanup } from '../../helpers/func-utils';
const listbuilderHTML = require('../../../app/views/components/listbuilder/example-index.html');
const svg = require('../../../src/components/icons/svg.html');
@@ -6,7 +7,6 @@ const svg = require('../../../src/components/icons/svg.html');
require('../../../src/components/locale/cultures/en-US.js');
let listbuilderEl;
-let svgEl;
let listbuilderObj;
// Define dataset
@@ -27,19 +27,16 @@ ds.push({ id: 12, value: 'opt-12', text: 'Libya' });
describe('ListBuilder API', () => {
beforeEach(() => {
listbuilderEl = null;
- svgEl = null;
listbuilderObj = null;
document.body.insertAdjacentHTML('afterbegin', svg);
document.body.insertAdjacentHTML('afterbegin', listbuilderHTML);
listbuilderEl = document.body.querySelector('#example-listbuilder');
- svgEl = document.body.querySelector('.svg-icons');
listbuilderObj = new ListBuilder(listbuilderEl, { dataset: [...ds] });
});
afterEach(() => {
listbuilderObj.destroy();
- listbuilderEl.parentNode.removeChild(listbuilderEl);
- svgEl.parentNode.removeChild(svgEl);
+ cleanup(['#example-listbuilder-container', '.svg-icons', '#listbuilder-script', '#listbuilder-tmpl']);
});
it('Should be defined as an object', () => {
",1
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md -# What's New with Enterprise
+turquoiseturquoise# What's New with Enterprise
## v4.19.0
- `[Listview]` Improved accessibility when configured as selectable (all types), as well as re-enabled accessibility e2e tests. ([#403](https://github.com/infor-design/enterprise/issues/403))
- `[Datagrid]` Fixed charts in columns not resizing correctly to short row height. ([#1930](https://github.com/infor-design/enterprise/issues/1930))
- `[Datagrid]` Fixed an issue for xss where console.log was not sanitizing and make grid to not render. ([#1941](https://github.com/infor-design/enterprise/issues/1941))
+- `[Personalization]` Changed the default turquoise personalization to a darker one. ([#2063](https://github.com/infor-design/enterprise/issues/2063))
+- `[Personalization]` Added a default option to the personalization color pickers. ([#2063](https://github.com/infor-design/enterprise/issues/2063))
- `[Tree]` Fixed an issue where children property null was breaking tree to not render. ([#1908](https://github.com/infor-design/enterprise/issues/1908))
### v4.19.0 Chores & Maintenance
",1
"diff --git a/test/components/toolbar-flex/toolbar-flex-api.func-spec.js b/test/components/toolbar-flex/toolbar-flex-api.func-spec.js @@ -109,7 +109,7 @@ describe('Flex Toolbar', () => {
expect(overflow[0]).toEqual(jasmine.any(ToolbarFlexItem));
expect(overflow[0].overflowed).toBeTruthy();
done();
- }, 300);
+ }, 350);
});
it('Can programmatically navigate toolbar items', () => {
@@ -332,7 +332,9 @@ describe('Flex Toolbar', () => {
const textButton = toolbarAPI.items[0];
expect(textButton.overflowed).toBeFalsy();
+ }, 300);
+ setTimeout(() => {
const secondIconButton = toolbarAPI.items[2];
expect(secondIconButton.overflowed).toBeTruthy();
",1
"diff --git a/src/components/datagrid/_datagrid.scss b/src/components/datagrid/_datagrid.scss @@ -1051,6 +1051,10 @@ $datagrid-short-row-height: 23px;
min-width: 20px;
}
+ &.btn-primary {
+ top: -1px;
+ }
+
.icon {
margin-top: -3px;
}
",1
"diff --git a/src/components/personalize/personalize.js b/src/components/personalize/personalize.js @@ -261,14 +261,14 @@ Personalize.prototype = {
// Adapt them for backwards compatibility
const legacyThemeNames = ['light', 'dark', 'high-contrast'];
- if (legacyThemeNames.includes(incomingTheme)) {
+ if (legacyThemeNames.indexOf(incomingTheme) > -1) {
incomingTheme += '-theme';
}
$html
.removeClass((idx, val) => {
const classes = val.split(' ');
- const toRemove = classes.filter(c => c.includes('theme'));
+ const toRemove = classes.filter(c => c.indexOf('theme') > -1);
return toRemove.join();
})
.addClass(incomingTheme);
@@ -375,7 +375,7 @@ Personalize.prototype = {
}
// Copy the old settings to compare
- const prevSettings = Object.assign({}, this.settings);
+ const prevSettings = utils.extend({ }, this.settings);
// Merge in the new settings
this.settings = utils.mergeSettings(this.element[0], settings, this.settings);
",1
"diff --git a/src/components/searchfield/_searchfield.scss b/src/components/searchfield/_searchfield.scss @@ -355,6 +355,11 @@ $cubic-bezier-ease: cubic-bezier(0.17, 0.04, 0.03, 0.94);
// RTL Styles
html[dir='rtl'] {
.searchfield-wrapper {
+ .searchfield {
+ padding-left: 10px;
+ padding-right: 34px;
+ }
+
> .icon {
&:not(.close) {
left: auto;
",1
"diff --git a/app/views/components/hierarchy/test-multiple-charts.html b/app/views/components/hierarchy/test-multiple-charts.html console.log(event, eventInfo);
if (eventInfo.data.childrenUrl) {
- $.getJSON(`{{basepath}}api/${eventInfo.data.childrenUrl}`, function(newData) {
+ $.getJSON('{{basepath}}api/' + eventInfo.data.childrenUrl, function(newData) {
reload(eventInfo, hierarchyControl, newData);
});
}
</script>
</div>
<div id=""tabs-two"" class=""tab-panel"">
- <figure class=""hierarchy"" id=""hierarchyTwo""></figure>
+ <figure class=""hierarchy"" id=""hierarchy-two""></figure>
<script>
const optionsTwo = {
// Initial load
$.getJSON('{{basepath}}api/hc-john-randolph', function(data) {
optionsTwo.dataset = [data];
- $('#hierarchyTwo').hierarchy(optionsTwo);
+ $('#hierarchy-two').hierarchy(optionsTwo);
});
- $('#hierarchyTwo').on('selected', function(event, eventInfo) {
- const hierarchyControl = $('#hierarchyTwo').data('hierarchy');
+ $('#hierarchy-two').on('selected', function(event, eventInfo) {
+ const hierarchyControl = $('#hierarchy-two').data('hierarchy');
console.log(event, eventInfo);
if (eventInfo.data.childrenUrl) {
- $.getJSON(`{{basepath}}api/${eventInfo.data.childrenUrl}`, function(newData) {
+ $.getJSON('{{basepath}}api/' + eventInfo.data.childrenUrl, function(newData) {
reload(eventInfo, hierarchyControl, newData);
});
}
",1
"diff --git a/src/components/locale/locale.js b/src/components/locale/locale.js @@ -394,13 +394,16 @@ const Locale = { // eslint-disable-line
});
}
+ const correctLocale = this.correctLocale(lang);
if (this.languages[lang]) {
this.currentLanguage = this.languages[lang];
this.updateLanguageTag(lang);
- } else {
- this.currentLanguage.name = lang;
+ this.dff[correctLocale] = $.Deferred();
+ return this.dff[correctLocale].resolve();
}
- return this.dff[this.correctLocale(lang)];
+
+ this.currentLanguage.name = lang;
+ return this.dff[correctLocale];
},
/**
",1
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -4855,7 +4855,7 @@ Datagrid.prototype = {
}
const clone = columns.map((col) => {
- const newCol = col;
+ const newCol = utils.extend({}, col);
if (newCol.editorOptions) {
delete newCol.editorOptions;
}
",1
"diff --git a/src/components/datagrid/_datagrid-uplift.scss b/src/components/datagrid/_datagrid-uplift.scss font-size: $theme-size-font-xs !important;
}
+// Adjust Filter Text
+.datagrid-header .datagrid-filter-wrapper .dropdown {
+ padding: 1px 0 0 5px;
+}
+
// Adjust Row Links
.datagrid td .hyperlink {
margin-top: -2px;
",1
"diff --git a/app/views/components/datagrid/example-beforeselect-veto.html b/app/views/components/datagrid/example-beforeselect-veto.html }
// If just Control or Meta (Mac) is done then allow the select.
- if (Soho.keyboard.pressedKeys.entries().next().value[0] === 'Control' ||
- Soho.keyboard.pressedKeys.entries().next().value[0] === 'Meta') {
+ if (Soho.keyboard.pressedKeys.get('Control') ||
+ Soho.keyboard.pressedKeys.get('Meta')) {
var isSelected = gridApi.isRowSelected(args.idx);
if (isSelected) {
gridApi.deselectRow(args.idx, false, true);
} else {
gridApi.selectRow(args.idx, false, true);
}
+ return true;
}
+
+ $('body').toast({title: 'Selection Vetoed', message: 'In this example, selection is vetoed. You must hold CTRL and click a row to select (or Command on Mac)'});
return false;
},
toolbar: {title: 'Data Grid Header Title', personalize: true, results: true, actions: true, rowHeight: true, selectCount: true}
",1
"diff --git a/src/components/popupmenu/popupmenu.js b/src/components/popupmenu/popupmenu.js @@ -786,11 +786,8 @@ PopupMenu.prototype = {
if (!immediate) {
// Left-Click activation
if (leftClick) {
- this.element
- .on('click.popupmenu', (e) => {
- if (this.element.hasClass('is-open')) {
- self.close();
- } else {
+ this.element.on('click.popupmenu', (e) => {
+ if (!this.element.is('.is-open')) {
contextMenuHandler(e, true);
}
});
",1
"diff --git a/test/components/dount/line.e2e-spec.js b/test/components/dount/line.e2e-spec.js @@ -30,7 +30,7 @@ describe('Line Chart tests', () => {
describe('Line Chart Zero Millions tests', () => {
beforeEach(async () => {
- await utils.setPage('/components/donut/example-zero-millions?layout=nofrills');
+ await utils.setPage('/components/line/example-zero-millions?layout=nofrills');
});
it('Should not have errors', async () => {
@@ -53,7 +53,7 @@ describe('Line Chart Zero Millions tests', () => {
describe('Line Chart Two Line tests', () => {
beforeEach(async () => {
- await utils.setPage('/components/donut/example-two-lines.html?layout=nofrills');
+ await utils.setPage('/components/line/example-two-lines.html?layout=nofrills');
});
it('Should not have errors', async () => {
@@ -76,7 +76,7 @@ describe('Line Chart Two Line tests', () => {
describe('Line Chart Axis Label tests', () => {
beforeEach(async () => {
- await utils.setPage('/components/donut/example-axis-labels.html?layout=nofrills');
+ await utils.setPage('/components/line/example-axis-labels.html?layout=nofrills');
});
it('Should not have errors', async () => {
@@ -99,7 +99,7 @@ describe('Line Chart Axis Label tests', () => {
describe('Line Chart Axis Rotate tests', () => {
beforeEach(async () => {
- await utils.setPage('/components/donut/example-rotate.html?layout=nofrills');
+ await utils.setPage('/components/line/example-rotate.html?layout=nofrills');
});
it('Should not have errors', async () => {
",1
"diff --git a/test/components/datagrid/datagrid-settings.func-spec.js b/test/components/datagrid/datagrid-settings.func-spec.js +/* eslint-disable object-curly-newline */
import { Datagrid } from '../../../src/components/datagrid/datagrid';
import { Formatters } from '../../../src/components/datagrid/datagrid.formatters';
@@ -15,14 +16,14 @@ let defaultSettings;
// Define Columns for the Grid.
const columns = [];
-columns.push({ id: 'productId', name: 'Id', field: 'productId', reorderable: true, formatter: Formatters.Text, width: 100, filterType: 'Text' });
-columns.push({ id: 'productName', name: 'Product Name', field: 'productName', reorderable: true, formatter: Formatters.Hyperlink, width: 300, filterType: 'Text' });
-columns.push({ id: 'activity', name: 'Activity', field: 'activity', reorderable: true, filterType: 'Text' });
-columns.push({ id: 'hidden', hidden: true, name: 'Hidden', field: 'hidden', filterType: 'Text' });
-columns.push({ id: 'price', align: 'right', name: 'Actual Price', field: 'price', reorderable: true, formatter: Formatters.Decimal, numberFormat: { minimumFractionDigits: 0, maximumFractionDigits: 0, style: 'currency', currencySign: '$' } });
-columns.push({ id: 'percent', align: 'right', name: 'Actual %', field: 'percent', reorderable: true, formatter: Formatters.Decimal, numberFormat: { minimumFractionDigits: 0, maximumFractionDigits: 0, style: 'percent' } });
-columns.push({ id: 'orderDate', name: 'Order Date', field: 'orderDate', reorderable: true, formatter: Formatters.Date, dateFormat: 'M/d/yyyy' });
-columns.push({ id: 'phone', name: 'Phone', field: 'phone', reorderable: true, filterType: 'Text', formatter: Formatters.Text });
+columns.push({ id: 'productId', name: 'Id', field: 'productId', hideable: true, reorderable: true, formatter: Formatters.Text, width: 100, filterType: 'Text' });
+columns.push({ id: 'productName', name: 'Product Name', field: 'productName', hideable: true, reorderable: true, formatter: Formatters.Hyperlink, width: 300, filterType: 'Text' });
+columns.push({ id: 'activity', name: 'Activity', field: 'activity', hideable: true, reorderable: true, filterType: 'Text' });
+columns.push({ id: 'hidden', hidden: true, name: 'Hidden', hideable: true, field: 'hidden', filterType: 'Text' });
+columns.push({ id: 'price', align: 'right', name: 'Actual Price', hideable: true, field: 'price', reorderable: true, formatter: Formatters.Decimal, numberFormat: { minimumFractionDigits: 0, maximumFractionDigits: 0, style: 'currency', currencySign: '$' } });
+columns.push({ id: 'percent', align: 'right', name: 'Actual %', hideable: true, field: 'percent', reorderable: true, formatter: Formatters.Decimal, numberFormat: { minimumFractionDigits: 0, maximumFractionDigits: 0, style: 'percent' } });
+columns.push({ id: 'orderDate', name: 'Order Date', field: 'orderDate', hideable: true, reorderable: true, formatter: Formatters.Date, dateFormat: 'M/d/yyyy' });
+columns.push({ id: 'phone', name: 'Phone', field: 'phone', hideable: false, reorderable: true, filterType: 'Text', formatter: Formatters.Text });
describe('Datagrid Settings', () => {
const Locale = window.Soho.Locale;
@@ -126,6 +127,7 @@ describe('Datagrid Settings', () => {
});
it('Should set settings', () => {
+ debugger;
datagridObj.destroy();
datagridObj = new Datagrid(datagridEl, { dataset: data, columns });
datagridObj.settings.emptyMessage.title = 'No Data Available';
",1
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -741,6 +741,10 @@ fdescribe('Datagrid Align Header Text Tests', () => { //eslint-disable-line
.wait(protractor.ExpectedConditions.presenceOf(datagridEl), config.waitsFor);
});
+ it('Should not have errors', async () => {
+ await utils.checkForErrors();
+ });
+
if (utils.isChrome() && utils.isCI()) {
it('Should not visual regress', async () => {
const containerEl = await element(by.className('container'));
@@ -770,9 +774,14 @@ fdescribe('Datagrid Align Header Text Toggle Tests', () => { //eslint-disable-li
expect(await element(by.css('.has-filterable-columns'))).toBeTruthy();
});
- if (utils.isChrome() && utils.isCI()) {
+ it('Should not have errors', async () => {
+ await utils.checkForErrors();
+ });
+
+ //if (utils.isChrome() && utils.isCI()) {
it('Should not visual regress', async () => {
const containerEl = await element(by.className('container'));
+ await element.all(by.css('.btn-actions')).first().click();
await browser.driver
.wait(protractor.ExpectedConditions.visibilityOf(await element(by.css('.popupmenu.is-open'))), config.waitsFor);
await element(by.css('li a[data-option=""show-filter-row""')).click();
@@ -782,7 +791,7 @@ fdescribe('Datagrid Align Header Text Toggle Tests', () => { //eslint-disable-li
expect(await browser.protractorImageComparison.checkElement(containerEl, 'datagrid-test-align-header-text-toggle')).toEqual(0);
});
- }
+ //}
});
describe('Datagrid page size selector tests', () => {
",1
"diff --git a/test/components/bar/bar.e2e-spec.js b/test/components/bar/bar.e2e-spec.js @@ -79,25 +79,6 @@ describe('Bar Chart example-negative-value tests', () => {
});
});
-describe('Bar Chart example-hide-legend tests', () => {
- beforeEach(async () => {
- await utils.setPage('/components/bar/example-hide-legend');
- });
-
- it('Should not have errors', async () => {
- await utils.checkForErrors();
- });
-
- it('Should not have visible legends', async () => {
- const chartEl = await element(by.css('.chart-legend'));
-
- const resultEl = await browser.driver
- .wait(protractor.ExpectedConditions.invisibilityOf(chartEl), config.waitsFor);
-
- expect(await resultEl).toBe(true);
- });
-});
-
describe('Bar Chart example-colors', () => {
beforeEach(async () => {
await utils.setPage('/components/bar/example-colors?layout=nofrills');
",1
"diff --git a/src/components/tooltip/tooltip.js b/src/components/tooltip/tooltip.js @@ -451,7 +451,7 @@ Tooltip.prototype = {
titleArea.style.display = 'none';
}
- if (!contentArea.previousElementSibling.classList.contains('arrow')) {
+ if (contentArea && !contentArea.previousElementSibling.classList.contains('arrow')) {
contentArea.insertAdjacentHTML('beforebegin', '<div class=""arrow""></div>');
}
",1
"diff --git a/src/components/tooltip/tooltip.js b/src/components/tooltip/tooltip.js @@ -442,6 +442,10 @@ Tooltip.prototype = {
const tooltip = this.tooltip[0];
let classes = 'tooltip is-hidden';
+ if (!contentArea) {
+ return;
+ }
+
if (extraClass) {
classes += ` ${extraClass}`;
}
@@ -451,7 +455,7 @@ Tooltip.prototype = {
titleArea.style.display = 'none';
}
- if (contentArea && !contentArea.previousElementSibling.classList.contains('arrow')) {
+ if (!contentArea.previousElementSibling.classList.contains('arrow')) {
contentArea.insertAdjacentHTML('beforebegin', '<div class=""arrow""></div>');
}
",1
"diff --git a/src/components/tooltip/tooltip.js b/src/components/tooltip/tooltip.js @@ -442,10 +442,6 @@ Tooltip.prototype = {
const tooltip = this.tooltip[0];
let classes = 'tooltip is-hidden';
- if (!contentArea) {
- return;
- }
-
if (extraClass) {
classes += ` ${extraClass}`;
}
@@ -455,7 +451,7 @@ Tooltip.prototype = {
titleArea.style.display = 'none';
}
- if (!contentArea.previousElementSibling.classList.contains('arrow')) {
+ if (contentArea && !contentArea.previousElementSibling.classList.contains('arrow')) {
contentArea.insertAdjacentHTML('beforebegin', '<div class=""arrow""></div>');
}
",1
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -8265,7 +8265,7 @@ Datagrid.prototype = {
const rowIdx = this.dataRowIndex(rowNode);
return this.settings.treeGrid ?
this.settings.treeDepth[rowIdx].node :
- this.settings.dataset[dataRowIdx];
+ this.settings.dataset[rowIdx];
},
/**
",1
"diff --git a/src/utils/color.js b/src/utils/color.js @@ -74,7 +74,7 @@ colorUtils.validateHex = function validateHex(hex) {
* @param {string} dark Optional a custom hex color to return.
* @returns {string} a calculated contrast color string.
*/
-colorUtils.getContrastColor = function getContrastYIQ(hex, light, dark) {
+colorUtils.getContrastColor = function getContrastColor(hex, light, dark) {
hex = hex ? hex.replace('#', '') : '';
const r = parseInt(hex.substr(0, 2), 16);
const g = parseInt(hex.substr(2, 2), 16);
",1
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md ### v4.20.0 Features
- `[Datagrid]` Added support to resize column widths after a value change via the stretchColumnOnChange setting. ([#2174](https://github.com/infor-design/enterprise/issues/2174))
-- `[Datagrid]` Added a Sort Function to the datagrid column to allow the value to be formatted for the sort. ([#1766](https://github.com/infor-design/enterprise/issues/2274)))
+- `[Datagrid]` Added a Sort Function to the datagrid column to allow the value to be formatted for the sort. ([#2274](https://github.com/infor-design/enterprise/issues/2274)))
- `[Datagrid]` Added placeholder functionality to Lookup, Dropdown, and Decimal Formatrers. ([#2408](https://github.com/infor-design/enterprise/issues/2408)))
- `[Datagrid]` Added support to restrict the size of a column with minWidth and maxWidth setting on the column. ([#2313](https://github.com/infor-design/enterprise/issues/2313))
- `[Datagrid]` Automatically remove nonVisibelCellError when a row is removed. ([#2436](https://github.com/infor-design/enterprise/issues/2436))
",1
"diff --git a/test/components/calendar/calendar.e2e-spec.js b/test/components/calendar/calendar.e2e-spec.js @@ -99,7 +99,7 @@ describe('Calendar ajax loading tests', () => { //eslint-disable-line
});
});
-describe('Calendar specific month tests', () => {
+fdescribe('Calendar specific month tests', () => { //eslint-disable-line
beforeEach(async () => {
await utils.setPage('/components/calendar/test-specific-month');
const dateField = await element(by.id('monthview-datepicker-field'));
@@ -121,6 +121,8 @@ describe('Calendar specific month tests', () => {
it('Should be able to click on events', async () => {
await element.all(by.css('.calendar-event-title')).first().click();
+ await browser.driver
+ .wait(protractor.ExpectedConditions.visibilityOf(await element(by.css('#calendar-popup')), config.waitsFor));
expect(await element(by.css('#calendar-popup')).isDisplayed()).toBe(true);
await utils.checkForErrors();
@@ -235,7 +237,7 @@ describe('Calendar only calendar', () => { //eslint-disable-line
}
});
-describe('Calendar specific locale', () => {
+fdescribe('Calendar specific locale', () => { //eslint-disable-line
beforeEach(async () => {
await utils.setPage('/components/calendar/test-specific-locale');
const dateField = await element(by.id('monthview-datepicker-field'));
",1
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -1324,6 +1324,7 @@ describe('Datagrid filter lookup custom click function tests', () => {
await lookup.click();
await browser.driver.sleep(config.sleep);
await element.all(by.cssContainingText('#lookup-datagrid td', 'I Love Compressors')).first().click();
+ await element(by.css('#test-filter-lookup-click-function-datagrid-1-header-filter-1')).click();
expect(await element(by.css('#test-filter-lookup-click-function-datagrid-1-header-2 input')).getAttribute('value')).toEqual('I Love Compressors');
if (utils.isChrome() && utils.isCI()) {
",1
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -1324,9 +1324,11 @@ describe('Datagrid filter lookup custom click function tests', () => {
await lookup.click();
await browser.driver.sleep(config.sleep);
await element.all(by.cssContainingText('#lookup-datagrid td', 'I Love Compressors')).first().click();
- await element(by.css('#test-filter-lookup-click-function-datagrid-1-header-filter-1')).click();
+ await browser.driver.sleep(config.sleep);
expect(await element(by.css('#test-filter-lookup-click-function-datagrid-1-header-2 input')).getAttribute('value')).toEqual('I Love Compressors');
+ await browser.driver.sleep(config.sleep);
+ await element(by.css('#test-filter-lookup-click-function-datagrid-1-header-filter-1')).click();
if (utils.isChrome() && utils.isCI()) {
const containerEl = await element(by.className('container'));
",1
"diff --git a/test/components/multiselect/multiselect.e2e-spec.js b/test/components/multiselect/multiselect.e2e-spec.js @@ -96,7 +96,7 @@ describe('Multiselect example-index tests', () => {
});
if (!utils.isSafari()) {
- it('Should arrow down to Arizona, and focus', async () => {
+ it('Can navigate and properly focus dropdown list elements with the keyboard', async () => {
const multiselectEl = await element.all(by.css('div.dropdown')).first();
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(multiselectEl), config.waitsFor);
@@ -114,7 +114,7 @@ describe('Multiselect example-index tests', () => {
});
// Edited for #920
- it('Should tab into deselect Alaska, then tab out, and input should be empty', async () => {
+ fit('Can deselect all items and display an empty pseudo-element', async () => {
const multiselectEl = await element.all(by.css('div.dropdown')).first();
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(multiselectEl), config.waitsFor);
@@ -124,14 +124,14 @@ describe('Multiselect example-index tests', () => {
await multiselectEl.sendKeys(protractor.Key.ENTER);
const multiselectSearchEl = await element(by.id('dropdown-search'));
await multiselectSearchEl.sendKeys(protractor.Key.ENTER);
- await multiselectSearchEl.sendKeys(protractor.Key.TAB);
+ await multiselectSearchEl.sendKeys(protractor.Key.ESCAPE);
expect(['<span class=""audible"">States (Max 10) </span>', ''])
.toContain(await element.all(by.css('.dropdown span')).first().getText());
});
// Edited for #920
- it('Should arrow down to Arizona select, arrow down, and select Arkansas, and update search input', async () => {
+ it('Can select multiple items and display them in the pseudo-element', async () => {
const multiselectEl = await element.all(by.css('div.dropdown')).first();
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(multiselectEl), config.waitsFor);
@@ -175,7 +175,7 @@ describe('Multiselect example-index tests', () => {
});
}
- it('Should search for Colorado', async () => {
+ it('Can show a filtered list of items that match a search term (Colorado)', async () => {
const multiselectEl = await element.all(by.css('div.dropdown')).first();
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(multiselectEl), config.waitsFor);
",1
"diff --git a/package.json b/package.json {
""name"": ""ids-enterprise"",
""slug"": ""ids-enterprise"",
- ""version"": ""4.20.0-beta.0"",
+ ""version"": ""4.21.0-dev"",
""description"": ""Infor Design System (IDS) Enterprise Components for the web"",
""repository"": {
""type"": ""git"",
",1
"diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js @@ -889,8 +889,10 @@ Modal.prototype = {
return true;
}
+ if (this.changeObserver) {
this.changeObserver.disconnect();
delete this.changeObserver;
+ }
const elemCanClose = this.element.triggerHandler('beforeclose');
const self = this;
const fields = this.element.find('[data-validate]');
@@ -976,8 +978,10 @@ Modal.prototype = {
destroy() {
const self = this;
const canDestroy = this.element.trigger('beforedestroy');
+ if (this.changeObserver) {
this.changeObserver.disconnect();
delete this.changeObserver;
+ }
if (!canDestroy) {
return;
",1
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md - `[Locale]` Fixed race condition when using initialize and loading locales with a parent locale. ([#2540](https://github.com/infor-design/enterprise/issues/2540))
- `[Lookup]` Fixed a double scrollbar when the modal needs to be scrolled. ([#2586](https://github.com/infor-design/enterprise/issues/2586))
- `[Modal]` Fixed an issue where the modal component would disappear if its content had a checkbox in it in RTL. ([#332](https://github.com/infor-design/enterprise-ng/issues/332))
-- `[Modal]` Fixed an issue where tabbing was very slow on large DOMs in IE 11. (#2607](https://github.com/infor-design/enterprise/issues/2607))
+- `[Modal]` Fixed an issue where tabbing was very slow on large DOMs in IE 11. ([#2607](https://github.com/infor-design/enterprise/issues/2607))
- `[Personalization]` Fixed an issue where the text color was too dark. Changed the text color to be more readable in high contrast mode. ([#2539](https://github.com/infor-design/enterprise/issues/2539))
- `[Personalization]` Updated some of the colors to more readable in contrast mode. ([#2097](https://github.com/infor-design/enterprise/issues/2097))
- `[Personalization]` Fixes an issue where text color was too dark. ([#2476](https://github.com/infor-design/enterprise/issues/2476))
",1
"diff --git a/test/components/datepicker/datepicker.e2e-spec.js b/test/components/datepicker/datepicker.e2e-spec.js @@ -957,9 +957,10 @@ describe('Datepicker Umalqura EG Tests', () => {
});
});
-describe('Datepicker Gregorian SA Tests', () => {
+fdescribe('Datepicker Gregorian SA Tests', () => { //eslint-disable-line
beforeEach(async () => {
await utils.setPage('/components/datepicker/test-ar-sa-gregorian');
+ await browser.driver.sleep(config.sleep);
});
it('Should render gregorian on ar-SA time', async () => {
",1
"diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js @@ -1039,7 +1039,7 @@ Modal.prototype = {
elem = self.trigger[0];
}
}
- if (elem) {
+ if (elem && modalApi && modalApi.overlay) {
modalApi.overlay.remove();
$.removeData(elem, COMPONENT_NAME);
}
",1
"diff --git a/test/components/datepicker/datepicker.e2e-spec.js b/test/components/datepicker/datepicker.e2e-spec.js @@ -986,7 +986,9 @@ describe('Datepicker Gregorian SA Tests', () => {
testDate.setMinutes(0);
testDate.setSeconds(0);
- expect(await element(by.id('islamic-date')).getAttribute('value')).toEqual(`${testDate.getDate()}/${(testDate.getMonth() + 1).toString().padStart(2, '0')}/${testDate.getFullYear()}`);
+ const value = await element(by.id('islamic-date')).getAttribute('value');
+
+ expect([9, 10]).toContain(value.length);
});
});
",1
"diff --git a/test/components/datepicker/datepicker.e2e-spec.js b/test/components/datepicker/datepicker.e2e-spec.js @@ -988,7 +988,7 @@ describe('Datepicker Gregorian SA Tests', () => {
const value = await element(by.id('islamic-date')).getAttribute('value');
- expect([9, 10]).toContain(value.length);
+ expect([8, 9, 10]).toContain(value.length);
});
});
",1
"diff --git a/src/components/datepicker/datepicker.js b/src/components/datepicker/datepicker.js @@ -779,7 +779,6 @@ DatePicker.prototype = {
self.currentDate = self.conversions.toGregorian(year, month, 1);
}
- self.insertDate(self.isIslamic ? self.currentDateIslamic : self.currentDate);
if (s.range.useRange) {
self.isFocusAfterClose = false;
} else if (btn.hasClass('is-select-month')) {
",1
"diff --git a/test/components/utils/highlight.func-spec.js b/test/components/utils/highlight.func-spec.js import '../../../src/utils/highlight';
-const ipsum = require('../../../app/views/tests/highlight/lorem-ipsum.html');
+const ipsum = `<section id=""main"" class=""page-container"" role=""main"">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras convallis orci quis leo suscipit lobortis. Aenean congue bibendum mauris, nec volutpat leo consectetur in. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Sed lobortis sed odio nec auctor. Integer efficitur augue nisl, vitae gravida tortor tristique fermentum. Donec vestibulum orci vel enim gravida dictum. Pellentesque et orci in massa fermentum tempus. Proin risus tortor, facilisis facilisis risus vel, euismod congue ipsum. Fusce semper odio at neque aliquet, id ornare nisl consectetur. In finibus ipsum orci, vel tempor turpis venenatis in.
+ </p>
+ <p>In in mauris a nulla imperdiet convallis id ut felis. Donec arcu nulla, varius congue elit nec, lacinia porta elit. Mauris blandit lorem a ex ultrices viverra. Sed facilisis varius risus, quis ornare erat rutrum id. Curabitur neque velit, gravida in consectetur eget, lobortis eu leo. Quisque in ornare lacus, auctor rhoncus nisl. Sed tellus metus, luctus rhoncus efficitur sit amet, malesuada vestibulum eros. Ut laoreet rhoncus ornare. Etiam volutpat tincidunt tincidunt. Curabitur sed massa tortor. Aenean eu nisl consectetur, molestie elit vitae, luctus erat. Fusce sed mattis erat, in bibendum lacus. Proin mi lectus, tincidunt tempus lacus sed, aliquam hendrerit urna. Integer ullamcorper leo at egestas sagittis. Fusce ut dapibus felis.</p>
+ <p>Aliquam condimentum sapien metus, quis commodo urna blandit sit amet. In elit eros, elementum ut erat eget, malesuada feugiat nisi. Donec dapibus neque nec gravida fermentum. Vestibulum in sapien et metus vehicula porta. Donec vel turpis dui. Morbi ultricies ut sapien ut placerat. Donec sagittis egestas sagittis. Aliquam enim dui, congue vel sollicitudin sit amet, luctus efficitur turpis. Nam nec neque ante. Praesent tempor turpis et auctor interdum. Fusce lobortis libero sit amet ultrices cursus. Cras pellentesque ultrices leo in vehicula. Aenean vehicula, elit quis rhoncus blandit, neque ligula cursus purus, vitae lacinia libero sem at lectus. Suspendisse ac metus mi.</p>
+ <p>Sed at venenatis est. Mauris molestie blandit quam et porta. Nam accumsan lacus neque. Donec vitae condimentum justo. Maecenas sagittis imperdiet nunc vitae aliquam. Nulla consequat tincidunt ante, ut vestibulum augue mattis vitae. Nulla facilisi. Donec scelerisque nunc non nisl accumsan, in rutrum quam condimentum. Nullam non rhoncus erat. Suspendisse interdum gravida mollis. Nulla laoreet enim justo, vel tincidunt velit condimentum sed. Aenean odio ipsum, ornare nec velit at, fringilla consectetur dui. Sed malesuada mi ac dignissim porta. In et arcu non dui vehicula porta. In eget rhoncus ante. Fusce sodales mauris vitae lorem luctus pellentesque.</p>
+ <p>Etiam lacus mauris, blandit molestie sem a, semper vulputate eros. Duis et rutrum nibh. Interdum et malesuada fames ac ante ipsum primis in faucibus. Donec finibus turpis vitae justo cursus, facilisis ullamcorper tortor commodo. Maecenas porta elit a cursus convallis. Fusce arcu est, viverra sed elit eget, aliquam pretium lacus. Mauris interdum ligula vitae nisi dictum elementum. Proin ac velit aliquam, pretium lectus non, commodo sem. Cras iaculis imperdiet neque, ac volutpat enim sollicitudin sit amet. Maecenas nec efficitur orci. Nulla ut facilisis tortor. Aenean eget tincidunt leo.</p>
+</section>`;
let ipsumEl;
",1
"diff --git a/test/components/datagrid/datagrid-api.func-spec.js b/test/components/datagrid/datagrid-api.func-spec.js @@ -677,7 +677,7 @@ describe('Datagrid API', () => {
const end = new Date().getTime();
const result = (end - start) / 1000; // seconds
- expect(result).toBeLessThan(0.5);
+ expect(result).toBeLessThan(0.65);
expect(table[0].querySelectorAll('tr').length).toEqual(2000);
expect(table[0].querySelector('tr').outerHTML).toEqual('<tr><td>1</td><td>T100</td><td><b>sku #9000001-237</b></td><td>Compressor</td><td>Assemble Paint</td><td>1</td><td>true</td><td>210.99</td><td>0.1</td><td>OK</td><td>2018-08-07T06:00:00.000Z</td><td>Action</td></tr>');
});
",1
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -1524,10 +1524,8 @@ describe('Datagrid filter load data and update columns tests', () => {
await multiselectSearchEl.sendKeys(protractor.Key.ARROW_DOWN);
await multiselectSearchEl.sendKeys(protractor.Key.ARROW_DOWN);
await multiselectSearchEl.sendKeys(protractor.Key.SPACE);
- await multiselectSearchEl.sendKeys(protractor.Key.ARROW_DOWN);
- await multiselectSearchEl.sendKeys(protractor.Key.SPACE);
- expect(await element.all(by.css('#datagrid tbody tr')).count()).toEqual(4);
+ expect(await element.all(by.css('#datagrid tbody tr')).count()).toEqual(3);
await utils.checkForErrors();
});
});
",1
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -2499,7 +2499,7 @@ describe('Datagrid Tree Paging Tests', () => {
it('Should expand/collapse on first page click', async () => {
expect(await element.all(by.css('tr.is-hidden')).count()).toEqual(3);
expect(await element.all(by.css('tr:not(.is-hidden)')).count()).toEqual(20);
- await element(by.css('#datagrid tbody tr:nth-child(1) td:nth-child(1) button')).click();
+ await element(by.css('#datagrid tbody tr:nth-child(1) td:nth-child(2) button')).click();
expect(await element.all(by.css('tr.is-hidden')).count()).toEqual(0);
expect(await element.all(by.css('tr:not(.is-hidden)')).count()).toEqual(23);
@@ -2512,7 +2512,7 @@ describe('Datagrid Tree Paging Tests', () => {
expect(await element.all(by.css('tr[aria-rowindex=""26""]')).count()).toEqual(1);
expect(await element.all(by.css('tr.is-hidden')).count()).toEqual(3);
expect(await element.all(by.css('tr:not(.is-hidden)')).count()).toEqual(20);
- await element(by.css('#datagrid tbody tr:nth-child(1) td:nth-child(1) button')).click();
+ await element(by.css('#datagrid tbody tr:nth-child(1) td:nth-child(2) button')).click();
expect(await element.all(by.css('tr.is-hidden')).count()).toEqual(0);
expect(await element.all(by.css('tr:not(.is-hidden)')).count()).toEqual(23);
",1
"diff --git a/package.json b/package.json ""extend"": ""^3.0.0"",
""front-matter"": ""^2.3.0"",
""grunt"": ""^1.0.4"",
- ""grunt-chokidar"": ""^1.0.2"",
+ ""grunt-chokidar"": ""^1.0.1"",
""grunt-cli"": ""^1.2.0"",
""grunt-contrib-compress"": ""^1.5.0"",
""grunt-contrib-copy"": ""^1.0.0"",
""protractor-image-comparison"": ""^2.0.1"",
""pygmentize-bundled"": ""^2.3.0"",
""r2"": ""^2.0.1"",
- ""release-it"": ""^12.3.6"",
+ ""release-it"": ""^10.4.2"",
""rimraf"": ""^2.6.3"",
""rollup"": ""^1.10.0"",
""rollup-plugin-analyzer"": ""^3.0.0"",
",1
"diff --git a/test/components/toast/toast.e2e-spec.js b/test/components/toast/toast.e2e-spec.js @@ -34,6 +34,7 @@ describe('Toast example-index tests', () => {
const buttonEl = await element(by.id('show-toast-message'));
await buttonEl.click();
await browser.driver.wait(protractor.ExpectedConditions.visibilityOf(element(by.css('.toast'))), config.waitsFor);
+ await browser.driver.sleep(config.sleepShort);
expect(await element.all(by.css('.toast')).count()).toEqual(1);
",1
"diff --git a/app/views/components/modal/test-xss.html b/app/views/components/modal/test-xss.html @@ -42,13 +42,11 @@ var modals = {
opt = $.extend({
buttons: [{
text: 'Cancel',
- // id: 'modal-button-1',
click: function(e, modal) {
modal.close();
}
}, {
text: 'Save',
- // id: 'modal-button-2',
click: function(e, modal) {
modal.close();
},
",1
"diff --git a/test/components/icons/icons.e2e-spec.js b/test/components/icons/icons.e2e-spec.js @@ -11,7 +11,7 @@ xdescribe('Icon Soho (Subtle) tests', () => {
await browser.driver.sleep(config.sleep);
});
- it('Should render without error', async () => {
+ it('Should render without any error', async () => {
await utils.checkForErrors();
});
",1
"diff --git a/test/protractor.ci.bs.conf.js b/test/protractor.ci.bs.conf.js @@ -22,7 +22,7 @@ exports.config = {
specs: specs,
seleniumAddress: 'http://hub-cloud.browserstack.com/wd/hub',
SELENIUM_PROMISE_MANAGER: false,
- baseUrl: 'https://fix-cron-enterprise.demo.design.infor.com/',
+ baseUrl: 'http://master-enterprise.demo.design.infor.com/',
jasmineNodeOpt: {
defaultTimeoutInterval: 10000,
showColors: true,
",1
"diff --git a/src/components/dropdown/_dropdown-uplift.scss b/src/components/dropdown/_dropdown-uplift.scss @@ -57,18 +57,38 @@ div.multiselect {
top: 12px;
&.swatch {
- left: 15px;
+ left: 12px;
+ }
+
+ + span {
+ padding-left: 26px;
}
}
}
.dropdown-list {
+ &.has-icons {
+ .dropdown-search {
+ padding-left: 36px;
+ }
+ }
+
> ul {
li.dropdown-option {
.listoption-icon {
top: 3px;
}
}
+
+ li {
+ &.is-swatch {
+ padding-left: 26px;
+ }
+
+ span.swatch {
+ margin-left: -15px;
+ }
+ }
}
&:not(.dropdown-short) {
@@ -78,6 +98,10 @@ div.multiselect {
.listoption-icon {
top: 11px;
+
+ &.swatch {
+ left: 11px;
+ }
}
}
@@ -106,7 +130,25 @@ div.multiselect {
left: 12px;
&.swatch {
- left: 15px;
+ left: 12px;
+ }
+ }
+ }
+
+ .dropdown-list {
+ > .listoption-icon {
+ &.swatch {
+ left: 11px;
+ }
+ }
+
+ .dropdown-option {
+ &.is-swatch {
+ padding-left: 26px;
+ }
+
+ .swatch {
+ margin-left: -15px;
}
}
}
@@ -124,6 +166,10 @@ html.is-firefox:not([dir='rtl']) {
> .listoption-icon {
top: 10px;
+
+ + span {
+ padding-left: 26px;
+ }
}
}
@@ -142,7 +188,7 @@ html.is-firefox:not([dir='rtl']) {
&.has-icons {
.dropdown-search {
- padding: 6px 30px 6px 39px;
+ padding: 6px 30px 6px 36px;
}
}
",1
"diff --git a/src/components/calendar/calendar.js b/src/components/calendar/calendar.js @@ -107,8 +107,10 @@ Calendar.prototype = {
* @returns {void}
*/
setLocale() {
+ if (this.settings.language) {
Locale.getLocale(this.settings.language);
this.language = this.settings.language;
+ }
if (this.settings.locale && (!this.locale || this.locale.name !== this.settings.locale)) {
Locale.getLocale(this.settings.locale).done((locale) => {
",1
"diff --git a/test/components/modal/modal.e2e-spec.js b/test/components/modal/modal.e2e-spec.js @@ -317,7 +317,7 @@ fdescribe('Modal xss tests', () => {
fdescribe('Modal button tests', () => {
beforeEach(async () => {
- await utils.setPage('/components/modal/test-inline-buttons.');
+ await utils.setPage('/components/modal/test-inline-buttons');
const modalEl = await element(by.id('btn-show-modal'));
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(modalEl), config.waitsFor);
@@ -327,6 +327,10 @@ fdescribe('Modal button tests', () => {
await browser.driver.sleep(config.sleep);
});
+ it('Should not have errors', async () => {
+ await utils.checkForErrors();
+ });
+
if (utils.isChrome() && utils.isCI()) {
it('Should not visual regress on 3 buttons', async () => {
const bodyEl = await element(by.className('modal-engaged'));
",1
"diff --git a/app/views/components/modal/test-inline-buttons.html b/app/views/components/modal/test-inline-buttons.html <div class=""row top-padding"">
<div class=""twelve columns"">
- <button class=""btn-secondary"" type=""button"" data-modal=""modal-1"" id=""btn-show-modal'"">Four Buttons</button>
+ <button class=""btn-secondary"" type=""button"" data-modal=""modal-1"" id=""btn-show-modal"">Four Buttons</button>
<div class=""modal"" id=""modal-1"">
<div class=""modal-content"">
",1
"diff --git a/src/components/calendar/_calendar.scss b/src/components/calendar/_calendar.scss .calendar-monthview {
background-color: $calendar-bg-color;
flex: 1 1 auto;
- margin-right: 0 !important;
.monthview-table {
table-layout: fixed;
",1
"diff --git a/src/components/week-view/week-view.js b/src/components/week-view/week-view.js @@ -597,11 +597,10 @@ WeekView.prototype = {
*/
addToolbar() {
// Invoke the toolbar
- this.currentDate = new Date();
this.header = $('<div class=""week-view-header""><div class=""calendar-toolbar""></div></div>').appendTo(this.element);
this.calendarToolbarEl = this.header.find('.calendar-toolbar');
this.calendarToolbarAPI = new CalendarToolbar(this.calendarToolbarEl[0], {
- onOpenCalendar: () => this.currentDate || this.settings.startDate,
+ onOpenCalendar: () => this.settings.startDate,
locale: this.settings.locale,
year: this.currentYear,
month: this.currentMonth,
@@ -627,7 +626,6 @@ WeekView.prototype = {
this.element.off(`change-date.${COMPONENT_NAME}`).on(`change-date.${COMPONENT_NAME}`, (e, args) => {
const startDate = args.isToday ? new Date() : args.selectedDate;
- this.currentDate = startDate;
if (this.isDayView) {
this.settings.startDate = startDate;
@@ -706,7 +704,6 @@ WeekView.prototype = {
} else {
this.settings.endDate.setDate(this.settings.endDate.getDate() + diff);
}
- this.currentDate = this.settings.startDate;
this.showWeek(this.settings.startDate, this.settings.endDate);
},
",1
"diff --git a/src/components/searchfield/searchfield.js b/src/components/searchfield/searchfield.js @@ -672,49 +672,6 @@ SearchField.prototype = {
return this.settings.showGoButton && this.goButton && this.goButton.length;
},
- /**
- * Fires when the searchfield is focused.
- * @event focusin
- * @memberof ToolbarSearchfield
- * @property {object} event - The jquery event object
- * /
- /**
- * Fires when a key is pressed inside of the searchfield.
- * @event keydown
- * @memberof ToolbarSearchfield
- * @property {object} event - The jquery event object
- */
- /**
- * Fires when a `collapse` event is triggered externally on the searchfield.
- * @event collapse
- * @memberof ToolbarSearchfield
- * @property {object} event - The jquery event object
- */
- /**
- * Fires when a `beforeopen` event is triggered on the searchfield's optional categories menubutton.
- * @event beforeopen
- * @memberof ToolbarSearchfield
- * @property {object} event - The jquery event object
- */
- /**
- * Fires when a `navigate` event is triggered on the searchfield's parent toolbar.
- * @event navigate
- * @memberof ToolbarSearchfield
- * @property {object} event - The jquery event object
- */
- /**
- * Fires when a `keydown` event is triggered at the `document` level.
- * @event keydown
- * @memberof ToolbarSearchfield
- * @property {object} event - The jquery event object
- */
- /**
- * Fires when a `resize` event is triggered at the `body` level.
- * @event resize
- * @memberof ToolbarSearchfield
- * @property {object} event - The jquery event object
- */
-
/**
* Sets up the event-listening structure for this component instance.
* @private
@@ -1536,6 +1493,13 @@ SearchField.prototype = {
* @param {object} anchor the link object
*/
handleCategorySelected(e, anchor) {
+ /**
+ * Fires when the searchfield has become collapsed.
+ * @event selected
+ * @memberof SearchField
+ * @type {object}
+ * @property {object} event - The jquery event object
+ */
this.element.trigger('selected', [anchor]);
// Only change the text and searchfield size if we can
@@ -1746,6 +1710,13 @@ SearchField.prototype = {
eventArgs.push(containerSizeSetters);
}
+ /**
+ * Fires before the searchfield is expanded.
+ * @event beforeexpand
+ * @memberof SearchField
+ * @type {object}
+ * @property {object} event - The jquery event object
+ */
self.element.trigger('beforeexpand');
$(self.toolbarParent).triggerHandler('recalculate-buttons', eventArgs);
@@ -1754,7 +1725,16 @@ SearchField.prototype = {
updateCallback() {}, // TODO: make this work without an empty function
timeoutCallback() {
$(self.toolbarParent).triggerHandler('recalculate-buttons', eventArgs);
+
+ /**
+ * Fires when the searchfield has become expanded.
+ * @event expanded
+ * @memberof SearchField
+ * @type {object}
+ * @property {object} event - The jquery event object
+ */
self.element.trigger('expanded');
+
delete self.isExpanding;
self.isExpanded = true;
@@ -1805,6 +1785,13 @@ SearchField.prototype = {
self.categoryButton.data('popupmenu').close(false, true);
}
+ /**
+ * Fires before the searchfield is collapsed.
+ * @event beforecollapse
+ * @memberof SearchField
+ * @type {object}
+ * @property {object} event - The jquery event object
+ */
self.element.trigger('beforecollapse');
delete self.isExpanded;
@@ -1816,6 +1803,14 @@ SearchField.prototype = {
timeoutCallback() {
delete self.isCollapsing;
$(self.toolbarParent).triggerHandler('recalculate-buttons');
+
+ /**
+ * Fires when the searchfield has become collapsed.
+ * @event collapsed
+ * @memberof SearchField
+ * @type {object}
+ * @property {object} event - The jquery event object
+ */
self.element.trigger('collapsed');
resolve();
}
@@ -1854,6 +1849,14 @@ SearchField.prototype = {
// Collapse followed by a special event trigger (gets picked up by Flex Toolbar)
this.collapse().then(() => {
+ /**
+ * Fires when the searchfield has become collapsed.
+ * @event collapsed-responsive
+ * @memberof SearchField
+ * @type {object}
+ * @property {object} event - The jquery event object
+ * @property {number} dir - The direction in which the Flex Toolbar has navigated (can be 0 to stay, or 1 to navigate forward)
+ */
self.wrapper.trigger('collapsed-responsive', [dir]);
});
},
",1
"diff --git a/test/components/calendar/calendar.e2e-spec.js b/test/components/calendar/calendar.e2e-spec.js @@ -343,7 +343,6 @@ describe('Calendar WeekView settings tests', () => {
});
it('Should render without error', async () => {
- expect(await element.all(by.css('.calendar-event')).count()).toEqual(14);
await utils.checkForErrors();
});
",1
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -9628,15 +9628,14 @@ Datagrid.prototype = {
* @returns {object} The dom jQuery node
*/
rowNodes(row) {
+ let container = this.element;
+
if (row instanceof jQuery) {
+ container = row.closest('.datagrid-container');
row = row.attr('aria-rowindex') - 1;
}
- const getRow = el => (el ? el.find(`tr[aria-rowindex=""${row + 1}""]`) : $());
- const leftNodes = getRow(this.tableBodyLeft);
- const centerNodes = getRow(this.tableBody);
- const rightNodes = getRow(this.tableBodyRight);
- return $(centerNodes).add(leftNodes).add(rightNodes);
+ return container.find(`> .datagrid-body-container > .datagrid-body > table > tbody > tr[aria-rowindex=""${row + 1}""]`);
},
/**
",1
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -437,10 +437,10 @@ Datagrid.prototype = {
this.isInitialRender = true;
self.table.empty();
self.clearHeaderCache();
+ self.container = self.element.closest('.datagrid-container');
self.renderRows();
self.element.append(this.bodyContainer);
self.renderHeader();
- self.container = self.element.closest('.datagrid-container');
if (this.settings.emptyMessage) {
self.setEmptyMessage(this.settings.emptyMessage);
@@ -3352,10 +3352,6 @@ Datagrid.prototype = {
self.setAlternateRowShading();
self.createDraggableRows();
- if (!self.activeCell || !self.activeCell.node) {
- self.activeCell = { node: self.cellNode(0, 0).attr('tabindex', '0'), isFocused: false, cell: 0, row: 0 };
- }
-
if (self.activeCell.isFocused) {
self.setActiveCell(self.activeCell.row, self.activeCell.cell);
}
@@ -3400,9 +3396,20 @@ Datagrid.prototype = {
self.tableRight.parent().find('.datagrid-column-wrapper').eq(0).width(w);
self.headerTableRight.width(w);
}
+ this.activateFirstCell();
});
},
+ /**
+ * Set active node to first cell and focus if possible
+ * @private
+ */
+ activateFirstCell() {
+ if (!this.activeCell || !this.activeCell.node) {
+ this.activeCell = { node: this.cellNode(0, 0).attr('tabindex', '0'), isFocused: false, cell: 0, row: 0 };
+ }
+ },
+
/**
* Trigger the onDestroyCell for each cell
* @private
@@ -9648,7 +9655,6 @@ Datagrid.prototype = {
container = row.closest('.datagrid-container');
row = row.attr('aria-rowindex') - 1;
}
-
return container.find(`> .datagrid-body-container > .datagrid-body > table > tbody > tr[aria-rowindex=""${row + 1}""]`);
},
",1
"diff --git a/src/components/toast/toast.js b/src/components/toast/toast.js @@ -67,12 +67,15 @@ Toast.prototype = {
*/
show() {
const self = this;
- const s = self.settings;
+ const s = this.settings;
const maxHideTime = parseFloat(math.convertDelayToFPS(s.timeout));
const message = s.allowLink ? xssUtils.stripTags(s.message, '<a><br><p>') : xssUtils.stripHTML(s.message);
let isPausePlay = false;
let percentage = 100;
- let container = $('#toast-container');
+
+ this.uniqueId = this.generateUniqueId('usersettings-position');
+
+ let container = $(`#toast-container-${this.uniqueId}`);
const toast = $(`
<div class=""toast"">
<span class=""toast-title"">${xssUtils.stripHTML(s.title)}</span>
@@ -87,7 +90,7 @@ Toast.prototype = {
const progress = $('<div class=""toast-progress""></div>');
if (!container.length) {
- container = $('<div id=""toast-container"" class=""toast-container"" aria-relevant=""additions"" aria-live=""polite""></div>').appendTo('body');
+ container = $(`<div id=""toast-container-${this.uniqueId}"" class=""toast-container"" aria-relevant=""additions"" aria-live=""polite""></div>`).appendTo('body');
}
container
@@ -263,7 +266,7 @@ Toast.prototype = {
const doc = $(document);
doc
.off('mouseup.toast').on('mouseup.toast', (e) => {
- if ($('#toast-container .toast').length === 1) {
+ if ($(`#toast-container-${this.uniqueId} .toast`).length === 1) {
const dragApi = container.data('drag');
if (dragApi && typeof dragApi.getElementsFromPoint === 'function') {
const args = { dragApi, x: e.pageX, y: e.pageY };
@@ -274,7 +277,7 @@ Toast.prototype = {
}
})
.off('touchend.toast').on('touchend.toast', (e) => {
- if ($('#toast-container .toast').length === 1) {
+ if ($(`#toast-container-${this.uniqueId} .toast`).length === 1) {
const dragApi = container.data('drag');
if (dragApi && typeof dragApi.getElementsFromPoint === 'function') {
const orig = e.originalEvent;
@@ -304,7 +307,7 @@ Toast.prototype = {
}
// Save position to local storage
- localStorage[this.uniqueId('usersettings-position')] = JSON.stringify(pos);
+ localStorage[this.uniqueId] = JSON.stringify(pos);
/**
* Fires after settings are changed in some way
@@ -328,7 +331,7 @@ Toast.prototype = {
return null;
}
- const lsPosition = localStorage[this.uniqueId('usersettings-position')];
+ const lsPosition = localStorage[this.uniqueId];
return lsPosition ? JSON.parse(lsPosition) : null;
},
@@ -355,7 +358,7 @@ Toast.prototype = {
* @param {object} suffix Add this string to make the id more unique
* @returns {string} The unique id.
*/
- uniqueId(suffix) {
+ generateUniqueId(suffix) {
suffix = (suffix === undefined || suffix === null) ? '' : suffix;
const uniqueid = `toast-${this.settings.uniqueid || ''}-${suffix}`;
return uniqueid.replace(/--/g, '-').replace(/-$/g, '');
@@ -399,7 +402,7 @@ Toast.prototype = {
remove(toast) {
const removeCallback = () => {
toast.remove();
- const canDestroy = !$('#toast-container .toast').length;
+ const canDestroy = !$(`#toast-container-${this.uniqueId} .toast`).length;
if (canDestroy) {
this.destroy();
}
@@ -440,7 +443,7 @@ Toast.prototype = {
* @returns {void}
*/
destroy() {
- const container = $('#toast-container');
+ const container = $(`#toast-container-${this.uniqueId}`);
if (container[0]) {
const toasts = [].slice.call(container[0].querySelectorAll('.toast'));
toasts.forEach((toast) => {
@@ -450,6 +453,7 @@ Toast.prototype = {
}
$(document).off('keydown.toast keyup.toast mouseup.toast touchend.toast');
container.remove();
+ delete this.uniqueId;
$.removeData(this.element[0], COMPONENT_NAME);
}
};
",1
"diff --git a/src/components/toast/toast.js b/src/components/toast/toast.js @@ -73,9 +73,9 @@ Toast.prototype = {
let isPausePlay = false;
let percentage = 100;
- this.uniqueId = this.generateUniqueId('usersettings-position');
+ this.uniqueId = s.uniqueid ? this.generateUniqueId('usersettings-position') : '';
- let container = $(`#toast-container-${this.uniqueId}`);
+ let container = $(`#toast-container${this.uniqueId}`);
const toast = $(`
<div class=""toast"">
<span class=""toast-title"">${xssUtils.stripHTML(s.title)}</span>
@@ -90,7 +90,7 @@ Toast.prototype = {
const progress = $('<div class=""toast-progress""></div>');
if (!container.length) {
- container = $(`<div id=""toast-container-${this.uniqueId}"" class=""toast-container"" aria-relevant=""additions"" aria-live=""polite""></div>`).appendTo('body');
+ container = $(`<div id=""toast-container${this.uniqueId}"" class=""toast-container"" aria-relevant=""additions"" aria-live=""polite""></div>`).appendTo('body');
}
container
@@ -266,7 +266,7 @@ Toast.prototype = {
const doc = $(document);
doc
.off('mouseup.toast').on('mouseup.toast', (e) => {
- if ($(`#toast-container-${this.uniqueId} .toast`).length === 1) {
+ if ($(`#toast-container${this.uniqueId} .toast`).length === 1) {
const dragApi = container.data('drag');
if (dragApi && typeof dragApi.getElementsFromPoint === 'function') {
const args = { dragApi, x: e.pageX, y: e.pageY };
@@ -277,7 +277,7 @@ Toast.prototype = {
}
})
.off('touchend.toast').on('touchend.toast', (e) => {
- if ($(`#toast-container-${this.uniqueId} .toast`).length === 1) {
+ if ($(`#toast-container${this.uniqueId} .toast`).length === 1) {
const dragApi = container.data('drag');
if (dragApi && typeof dragApi.getElementsFromPoint === 'function') {
const orig = e.originalEvent;
@@ -402,7 +402,7 @@ Toast.prototype = {
remove(toast) {
const removeCallback = () => {
toast.remove();
- const canDestroy = !$(`#toast-container-${this.uniqueId} .toast`).length;
+ const canDestroy = !$(`#toast-container${this.uniqueId} .toast`).length;
if (canDestroy) {
this.destroy();
}
@@ -443,7 +443,7 @@ Toast.prototype = {
* @returns {void}
*/
destroy() {
- const container = $(`#toast-container-${this.uniqueId}`);
+ const container = $(`#toast-container${this.uniqueId}`);
if (container[0]) {
const toasts = [].slice.call(container[0].querySelectorAll('.toast'));
toasts.forEach((toast) => {
",1
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -2929,6 +2929,10 @@ Datagrid.prototype = {
self.bodyColGroupHtmlRight = '<colgroup>';
self.triggerDestroyCell(); // Trigger Destroy on previous cells
+ if (!self.settings.columns || self.settings.columns.length === 0) {
+ self.settings.columns.push({ id: 'blank', value: '', field: '' });
+ }
+
for (j = 0; j < self.settings.columns.length; j++) {
const col = self.settings.columns[j];
const container = self.getContainer(col.id);
@@ -5033,7 +5037,12 @@ Datagrid.prototype = {
$('body').off('open.datagrid');
}
}]
- }).on('beforeopen.datagrid', (e, modal) => {
+ }).off('beforeopen.datagrid')
+ .on('beforeopen.datagrid', (e, modal) => {
+ if (!modal) {
+ return;
+ }
+
self.isColumnsChanged = false;
modal.element.find('.searchfield').searchfield({ clearable: true });
modal.element.find('.listview')
@@ -5061,7 +5070,8 @@ Datagrid.prototype = {
searchableTextCallback: item => item.name
}
})
- .off('selected.datagrid').on('selected.datagrid', function (selectedEvent, args) {
+ .off('selected.datagrid')
+ .on('selected.datagrid', function (selectedEvent, args) {
const chk = args.elem.find('.checkbox');
const id = chk.attr('data-column-id');
const isChecked = chk.prop('checked');
",1
"diff --git a/src/components/toolbar-flex/toolbar-flex.js b/src/components/toolbar-flex/toolbar-flex.js @@ -57,13 +57,14 @@ ToolbarFlex.prototype = {
let itemComponentSettings = {};
const isActionButton = $(item).hasClass('btn-actions');
- if (isActionButton || this.settings.moreMenuSettings) {
- itemComponentSettings = this.settings.moreMenuSettings;
- }
+ if (isActionButton) {
+ itemComponentSettings = this.settings.moreMenuSettings || itemComponentSettings;
+
if (this.settings.beforeMoreMenuOpen) {
warnAboutDeprecation('settings.moreMenuSettings.beforeOpen', 'settings.beforeMoreMenuOpen', 'Flex Toolbar');
itemComponentSettings.beforeOpen = this.settings.beforeMoreMenuOpen;
}
+ }
$(item).toolbarflexitem({
toolbarAPI: this,
",1
"diff --git a/src/components/dropdown/dropdown.js b/src/components/dropdown/dropdown.js @@ -1822,7 +1822,7 @@ Dropdown.prototype = {
if (typeof this.filterTerm === 'string' && this.filterTerm.length > 0) {
this.searchInput.val(this.filterTerm);
} else if (!this.settings.multiple && current.length) {
- this.searchInput.val(current.find('a').text());
+ this.searchInput.val(current.find('a').text().trim());
}
const noScroll = this.settings.multiple;
",1
"diff --git a/src/themes/theme-uplift-contrast.scss b/src/themes/theme-uplift-contrast.scss @@ -117,12 +117,12 @@ $tooltip-error-color: $theme-color-palette-white;
// Badges
$badge-neutral-color: $theme-color-palette-graphite-100;
$badge-neutral-icon-color: $theme-color-palette-graphite-100;
-$badge-neutral-bg-color: $theme-color-palette-graphite-30;
+$badge-neutral-bg-color: $theme-color-palette-graphite-20;
$badge-neutral-hover-border-color: $theme-color-palette-graphite-100;
$badge-neutral-hover-bg-color: $theme-color-palette-white;
$badge-secondary-color: $theme-color-palette-black;
$badge-secondary-icon-color: $theme-color-palette-black;
-$badge-secondary-bg-color: $theme-color-palette-graphite-40;
+$badge-secondary-bg-color: $theme-color-palette-graphite-10;
$badge-secondary-border-color: $theme-color-palette-graphite-60;
$badge-secondary-hover-bg-color: $theme-color-palette-white;
$badge-secondary-disabled-border-color: $theme-color-palette-graphite-50;
",1
"diff --git a/test/components/slider/slider.e2e-spec.js b/test/components/slider/slider.e2e-spec.js @@ -47,7 +47,6 @@ describe('Slider Vertical tests', () => { //eslint-disable-line
}
});
-
describe('Slider short tests', () => { //eslint-disable-line
beforeEach(async () => {
await utils.setPage('/components/slider/example-short?layout=nofrills');
",1
"diff --git a/src/components/datagrid/_datagrid.scss b/src/components/datagrid/_datagrid.scss @@ -884,15 +884,9 @@ $datagrid-short-row-height: 25px;
}
.lookup-wrapper {
- padding-left: 14px !important;
+ padding-left: 0 !important;
padding-top: 2px !important;
- .trigger {
- margin-left: -8px !important;
- margin-top: -4px !important;
- overflow: visible;
- }
-
.align-text-right {
+ .trigger {
margin-left: 0 !important;
",1
"diff --git a/src/components/searchfield/searchfield.js b/src/components/searchfield/searchfield.js @@ -1969,7 +1969,9 @@ SearchField.prototype = {
updated(settings) {
if (settings) {
this.settings = utils.mergeSettings(this.element, settings, this.settings);
- if (settings.collapseSize === undefined) {
+
+ // `utils.mergeSettings` misses passing the empty `collapseSize` property, so we need to check for it
+ if (Object.prototype.hasOwnProperty.call(settings, 'collapseSize') && settings.collapseSize === undefined) {
this.settings.collapseSize = settings.collapseSize;
}
}
",1
"diff --git a/src/components/datepicker/datepicker.js b/src/components/datepicker/datepicker.js @@ -1710,7 +1710,7 @@ DatePicker.prototype = {
*/
setTime(date) {
const hasPopup = this.popup !== undefined;
- if (!hasPopup) {
+ if (!this.timepicker || !hasPopup) {
if (!this.settings.useCurrentTime) {
date.setHours(0, 0, 0, 0);
}
",1
"diff --git a/app/views/components/datagrid/test-two-columns.html b/app/views/components/datagrid/test-two-columns.html data = res.data;
// Define Columns for the Grid.
- columns.push({id: 'productId', name: 'Product Id', field: 'productId', reorderable: false, formatter: Formatters.Text});
- columns.push({ id: 'productName', name: 'Product Name', field: 'productName', reorderable: false, formatter: Formatters.Hyperlink});
+ columns.push({id: 'productId', name: 'Product Id', field: 'productId', reorderable: false, formatter: Formatters.Text, width: '50%'});
+ columns.push({ id: 'productName', name: 'Product Name', field: 'productName', reorderable: false, formatter: Formatters.Hyperlink, width: '50%'});
// Init and get the api for the grid
$('#datagrid').datagrid({
",1
"diff --git a/app/views/components/datepicker/test-specific-lang.html b/app/views/components/datepicker/test-specific-lang.html <div class=""field"">
<label for=""date-field-normal"" class=""label"">Date Field</label>
- <input id=""date-field-normal"" class=""datepicker"" name=""date-field"" type=""text"" data-options=""{'locale': 'da-DK', 'language': 'es'}""/>
+ <input id=""date-field-normal"" class=""datepicker"" name=""date-field"" type=""text"" data-options=""{'locale': 'da-DK', 'language': 'es'}"" value=""05-02-2020""/>
</div>
</div>
",1
"diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js @@ -493,7 +493,7 @@ Modal.prototype = {
// Handle Validation
if (settingsJSON.validate) {
- btn.element.classList.add('no-validation');
+ btn.element[0].classList.add('no-validation');
}
}
",1
"diff --git a/src/components/homepage/homepage.js b/src/components/homepage/homepage.js @@ -191,7 +191,7 @@ Homepage.prototype = {
});
cards
- .on('mouseenter.card', () => {
+ .on('mouseenter.card', function () {
const card = $(this);
const eastHandle = $('<div>').addClass('ui-resizable-handle ui-resizable-e')
.drag({ axis: 'x' })
@@ -270,23 +270,23 @@ Homepage.prototype = {
}
card.css({ border: '1px solid #078cd9' });
})
- .on('mouseleave.card', () => {
+ .on('mouseleave.card', function () {
const card = $(this);
if (!card.hasClass('ui-resize-passive')) {
$('.ui-resizable-handle').remove();
}
card.css({ border: '1px solid #bdbdbd' });
})
- .on('dragstart.card', () => {
+ .on('dragstart.card', function () {
const card = $(this);
card.addClass('is-dragging');
})
- .on('dragover.card', (event) => {
+ .on('dragover.card', function (event) {
// For mac chrome/safari to remove animation
// https://stackoverflow.com/questions/32206010/disable-animation-for-drag-and-drop-chrome-safari
event.preventDefault();
})
- .on('dragenter.card', (event) => {
+ .on('dragenter.card', function (event) {
event.preventDefault();
const card = $(this);
const draggingCard = $('.is-dragging');
@@ -306,7 +306,7 @@ Homepage.prototype = {
card.append(homepage.guide);
homepage.refresh(false);
})
- .on('dragend.card', () => {
+ .on('dragend.card', function () {
const card = $(this);
const cardOver = $(cards).has('.drop-indicator');
if (card.index() < cardOver.index()) {
",1
"diff --git a/src/components/datepicker/datepicker.js b/src/components/datepicker/datepicker.js @@ -527,7 +527,7 @@ DatePicker.prototype = {
const self = this;
const s = this.settings;
const timeOptions = {};
- this.lastValue = this.currentDate?.getTime();
+ this.lastValue = typeof this.currentDate === 'string' ? this.currentDate : this.currentDate?.getTime();
if ((this.element.is(':disabled') || this.element.attr('readonly')) && this.element.closest('.monthview').length === 0) {
return;
@@ -1216,8 +1216,9 @@ DatePicker.prototype = {
}));
}
- const isChanged = this.lastValue !== this.currentDate?.getTime();
- this.lastValue = this.currentDate?.getTime();
+ const newValue = typeof this.currentDate === 'string' ? this.currentDate : this.currentDate?.getTime();
+ const isChanged = this.lastValue !== newValue;
+ this.lastValue = newValue;
if (trigger && isChanged) {
if (s.range.useRange) {
",1
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -6941,6 +6941,7 @@ Datagrid.prototype = {
this.unselectRow(idx, true, true);
}
}
+ this.settings.dataset.map((row) => { delete row._selected; }); //eslint-disable-line
// Sync the Ui and call the events
this.dontSyncUi = false;
this._selectedRows = [];
",1
"diff --git a/src/utils/utils.js b/src/utils/utils.js @@ -642,6 +642,25 @@ DOM.focusableElems = function focusableElems(el) {
});
};
+/**
+ * See if the object is simple or more complex (has a constructor).
+ * @param {object} obj The object to check
+ * @returns {boolean} Returns true if simple
+ */
+utils.isPlainObject = function isPlainObject(obj) {
+ if (!obj || Object.prototype.toString.call(obj) !== '[object Object]') {
+ return false;
+ }
+
+ // Objects with no prototype (e.g., `Object.create( null )`) are plain
+ const proto = Object.getPrototypeOf(obj);
+ if (!proto) {
+ return true;
+ }
+
+ return obj !== null && typeof (obj) === 'object' && Object.getPrototypeOf(obj) === Object.prototype;
+};
+
/**
* Object deep copy and merge. Replaces jQuery.extend without the true option.
* @param {boolean|object} deep For a deep extend, set the first argument to `true`.
@@ -668,7 +687,8 @@ utils.extend = function extend() {
// Needed for now until jQuery is fully dropped
extended[prop] = $(obj[prop]);
} else if (deep && Object.prototype.toString.call(obj[prop]) === '[object Object]') {
- extended[prop] = extend(extended[prop], obj[prop]);
+ const isPlain = utils.isPlainObject(obj[prop]);
+ extended[prop] = isPlain ? extend(extended[prop], obj[prop]) : obj[prop];
} else {
extended[prop] = obj[prop] === undefined && extended[prop] !== undefined ?
extended[prop] : obj[prop];
",1
"diff --git a/test/components/error-page/error-page.e2e-spec.js b/test/components/error-page/error-page.e2e-spec.js @@ -73,6 +73,19 @@ describe('Error Page example-index tests', () => {
expect(await element(by.css('body')).getAttribute('class')).not.toContain('modal-engaged');
});
+});
+
+describe('Error page open example-index tests on click', () => {
+ beforeEach(async () => {
+ await utils.setPage('/components/error-page/example-index');
+ const modalEl = await element(by.id('modal-context'));
+ await browser.driver
+ .wait(protractor.ExpectedConditions.presenceOf(modalEl), config.waitsFor);
+ await modalEl.click();
+ await browser.driver
+ .wait(protractor.ExpectedConditions.presenceOf(element(by.className('overlay'))), config.waitsFor);
+ await browser.driver.sleep(config.sleep);
+ });
if (utils.isChrome() && utils.isCI()) {
it('Should not visual regress', async () => {
@@ -84,4 +97,9 @@ describe('Error Page example-index tests', () => {
expect(await browser.protractorImageComparison.checkScreen('error-page-message')).toEqual(0);
});
}
+
+ it('Should open error page on click', async () => {
+ expect(await element(by.css('.modal.is-visible')).isDisplayed()).toBeTruthy();
+ });
});
+
",1
"diff --git a/src/components/datepicker/datepicker.js b/src/components/datepicker/datepicker.js @@ -1611,7 +1611,8 @@ DatePicker.prototype = {
// Check and fix two digit year for main input element
const dateFormat = self.pattern;
- const isStrict = !(dateFormat === 'MMMM d' || dateFormat === 'yyyy' || dateFormat === 'MMMM' || dateFormat === 'MMM');
+ const isStrict = !(dateFormat === 'MMMM d' || dateFormat === 'yyyy' ||
+ dateFormat === 'MMMM' || dateFormat === 'MMM' || dateFormat === 'MM');
const fieldValueTrimmed = self.element.val().trim();
if (fieldValueTrimmed !== '' && !s.range.useRange) {
@@ -1911,7 +1912,7 @@ DatePicker.prototype = {
// Fix two digit year for main input element
self.element.on('blur.datepicker', () => {
- this.lastValue = this.currentDate?.getTime();
+ this.lastValue = this.currentDate?.getTime;
if (this.element.val().trim() !== '') {
this.setValueFromField();
",1
"diff --git a/test/components/searchfield/searchfield.e2e-spec.js b/test/components/searchfield/searchfield.e2e-spec.js @@ -205,8 +205,7 @@ if (utils.isChrome() && utils.isCI()) {
// blur the input field first, so we don't accidentaly get a text cursor in the screen capture.
await browser.executeScript('document.activeElement.blur();').then(async () => {
- expect(await browser.protractorImageComparison
- .checkElement(await element(by.css('.container')), 'searchfield-above-01')).toEqual(0);
+ expect(await browser.imageComparison.checkElement(await element(by.css('.container')), 'searchfield-above-01')).toEqual(0);
});
await searchfieldInputEl.sendKeys('ew');
@@ -214,8 +213,7 @@ if (utils.isChrome() && utils.isCI()) {
// blur the input field first, so we don't accidentaly get a text cursor in the screen capture.
await browser.executeScript('document.activeElement.blur();').then(async () => {
- expect(await browser.protractorImageComparison
- .checkElement(await element(by.css('.container')), 'searchfield-above-02')).toEqual(0);
+ expect(await browser.imageComparison.checkElement(await element(by.css('.container')), 'searchfield-above-02')).toEqual(0);
});
await browser.driver.manage().window().setSize(windowSize.width, windowSize.height);
",1
"diff --git a/test/components/accordion/accordion.e2e-spec.js b/test/components/accordion/accordion.e2e-spec.js @@ -231,6 +231,7 @@ describe('Accordion adding headers dynamically tests', () => {
.sendKeys(protractor.Key.TAB)
.sendKeys(protractor.Key.TAB)
.sendKeys(protractor.Key.TAB)
+ .sendKeys(protractor.Key.TAB)
.perform();
const focusedElem = await browser.driver.switchTo().activeElement();
",1
"diff --git a/test/components/slider/slider.e2e-spec.js b/test/components/slider/slider.e2e-spec.js @@ -70,7 +70,7 @@ describe('Slider short tests', () => { //eslint-disable-line
describe('Slider tooltip position test', () => { //eslint-disable-line
beforeEach(async () => {
- await utils.setPage('/components/slider/example-tooltip-position?layout=nofrills');
+ await utils.setPage('/components/slider/example-tooltip-position');
});
it('Should show the tooltip on top', async () => {
",1
"diff --git a/src/components/swaplist/swaplist.js b/src/components/swaplist/swaplist.js @@ -221,8 +221,8 @@ SwapList.prototype = {
// Dragging time placeholder
s.numOfSelectionsClass = 'num-of-selections';
s.itemContentClass = 'swaplist-item-content';
- s.itemContentTempl = $(`<div><p><span class=""${s.numOfSelectionsClass}"">###</span> ${
- Locale ? Locale.translate('ItemsSelected') : ' Items Selected '}</p><div/>`);
+ s.itemContentTempl = $(`<div><p><span class=""${s.numOfSelectionsClass}"">###</span>
+ <span class=""${s.numOfSelectionsClass}-text"">&nbsp;</span></p><div/>`);
// Make top buttons disabled if not draggable
if (!s.draggable.available) {
@@ -1105,6 +1105,7 @@ SwapList.prototype = {
}
$(`.${settings.numOfSelectionsClass}`, settings.itemContentTempl).html(selections.items.length);
+ $(`.${settings.numOfSelectionsClass}-text`, settings.itemContentTempl).text(Locale.translate('ItemsSelected'));
self.addDropeffects();
if (!self.isTouch) {
",1
"diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md @@ -67,7 +67,7 @@ If you'd like to submit a pull request you'll need to do the following:
- Occasionally there will be a need to contribute to a version branch (i.e. `4.9.x`) in which case you want to branch off of one of those.
- If you are unsure, just ask someone on the team so you don't have to redo your branch.
1. Remember to make an **e2e or functional test** for your case.
-1. Remember to add a **note to the [Change Log](docs/CHANGELOG.md)**.
+1. Remember to add a **note to the [Change Log](CHANGELOG.md)**.
1. **Commit your changes locally.** Try to follow the standards for your commit message outlined below.
- Try to follow
- [Github's commit message standards](https://github.com/erlang/otp/wiki/Writing-good-commit-messagesMore)
",1
"diff --git a/test/components/spinbox/spinbox-settings.func-spec.js b/test/components/spinbox/spinbox-settings.func-spec.js @@ -32,11 +32,11 @@ describe('Spinbox settings', () => {
spinboxEl.removeAttribute('data-options');
spinboxApi.destroy();
const settings = {
- autocorrectOnBlur: false,
+ autocorrectOnBlur: true,
min: 0,
max: 10,
step: null,
- validateOnInput: true
+ maskOptions: null
};
settings.min = 0; // example initializes with data-options
@@ -47,11 +47,11 @@ describe('Spinbox settings', () => {
it('Should update set settings via data', () => {
const settings = {
- autocorrectOnBlur: false,
+ autocorrectOnBlur: true,
min: 10,
max: 20,
step: null,
- validateOnInput: true
+ maskOptions: null
};
spinboxApi.updated();
@@ -63,11 +63,11 @@ describe('Spinbox settings', () => {
it('Should update set settings via parameter', () => {
const settings = {
- autocorrectOnBlur: false,
+ autocorrectOnBlur: true,
min: 10,
max: 20,
step: null,
- validateOnInput: true
+ maskOptions: null
};
spinboxApi.updated(settings);
spinboxApi.settings.min = 10;
@@ -78,11 +78,11 @@ describe('Spinbox settings', () => {
it('Should update settings via data-options', () => {
const settings = {
- autocorrectOnBlur: false,
+ autocorrectOnBlur: true,
min: 0,
max: 10,
step: null,
- validateOnInput: true
+ maskOptions: null
};
expect(spinboxApi.settings).toEqual(settings);
",1
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md ### v4.29.0 Features
-- `[Lookup]` Added x icon button so it has the ability to clear the field. ([#740](https://github.com/infor-design/enterprise/issues/740))
-- `[Lookuo]` Added x icon and apply button inside of modal so it has a two options to clear the field. ([#2507](https://github.com/infor-design/enterprise/issues/2507))
+- `[Lookup]` Added a clear (x icon) button to clear the field. ([#740](https://github.com/infor-design/enterprise/issues/740))
+- `[Lookup]` Added a clear (x icon) button and apply button inside of modal so there are now two options to clear the field. ([#2507](https://github.com/infor-design/enterprise/issues/2507))
- `[Multiselect]` Moved the functionality for displaying the Multiselect List's searchfield underneath/above the pseudo element into a configurable setting. ([#3864](https://github.com/infor-design/enterprise/issues/3864))
- `[Slider]` Added the ability to set position of the tooltip. ([#3746](https://github.com/infor-design/enterprise/issues/3746))
- `[Toast]` Added the ability to dismiss toasts via keyboard. ([#3521](https://github.com/infor-design/enterprise/issues/3521))
",1
"diff --git a/src/components/splitter/_splitter.scss b/src/components/splitter/_splitter.scss }
.splitter-overlay {
+ background-color: $theme-color-palette-white;
height: 100%;
- opacity: 0.6;
+ opacity: 0.8;
position: static;
visibility: visible;
}
",1
"diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js @@ -3957,8 +3957,10 @@ Tabs.prototype = {
}
$('.tab-panel input').off('error.tabs valid.tabs');
+ if (this.addTabButton) {
this.addTabButton.remove();
this.addTabButton = undefined;
+ }
this.element.find('.close.icon').remove();
return this;
",1
"diff --git a/test/components/datagrid/datagrid-settings.func-spec.js b/test/components/datagrid/datagrid-settings.func-spec.js @@ -102,6 +102,7 @@ describe('Datagrid Settings', () => { //eslint-disable-line
allowOneExpandedRow: true,
enableTooltips: false,
disableRowDeactivation: false,
+ disableRowDeselection: false,
sizeColumnsEqually: false,
expandableRow: false,
exportConvertNegative: false,
",1
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md -properly# What's New with Enterprise
+# What's New with Enterprise
## v4.30.0
@@ -10,7 +10,7 @@ properly# What's New with Enterprise
### v4.30.0 Fixes
-- `[Accordion]` Fixed an issue where the chevron icon is not poperly centered in Safari. ([#2161](https://github.com/infor-design/enterprise/issues/2161))
+- `[Accordion]` Fixed an issue where the chevron icon is not properly centered in Safari. ([#2161](https://github.com/infor-design/enterprise/issues/2161))
- `[Lookup]` Fixed an issue in the min width examples that showed up in Safari only. ([#3949](https://github.com/infor-design/enterprise/issues/3949))
## v4.29.0
",1
"diff --git a/test/karma.conf.js b/test/karma.conf.js @@ -12,6 +12,7 @@ const files = [
'dist/js/d3.v5.js',
'dist/js/sohoxi.js',
'dist/js/cultures/en-US.js',
+ 'dist/js/cultures/da-DK.js',
'dist/js/cultures/ar-EG.js',
'dist/js/cultures/es-ES.js',
'dist/js/cultures/fr-FR.js',
",1
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -11299,6 +11299,14 @@ Datagrid.prototype = {
placeOptions.y = 0;
}
+ tooltip
+ .one('afterplace.gridtooltip', (e, placementObj) => {
+ this.handleAfterPlaceTooltip(e, tooltip, placementObj);
+ })
+ .on('click.gridtooltip', () => {
+ this.hideTooltip();
+ });
+
// If not already have place instance
if (!tooltip.data('place')) {
tooltip.place(placeOptions);
@@ -11310,14 +11318,6 @@ Datagrid.prototype = {
// Flag to mark as gridtooltip
tooltip.data('gridtooltip', true);
- tooltip
- .one('afterplace.gridtooltip', (e, placementObj) => {
- this.handleAfterPlaceTooltip(e, tooltip, placementObj);
- })
- .on('click.gridtooltip', () => {
- this.hideTooltip();
- });
-
// Hide the tooltip when the page scrolls.
$('body, .scrollable').off('scroll.gridtooltip').on('scroll.gridtooltip', () => {
this.hideTooltip();
",1
"diff --git a/src/components/calendar/calendar.js b/src/components/calendar/calendar.js @@ -766,7 +766,7 @@ Calendar.prototype = {
if (eventHead[0]) {
const children = eventHead[0].parentNode.children;
- for (let i = 0; i < children.length; i++) {
+ for (let i = container.querySelector('.day-container').children.length; i < children.length; i++) {
const dataid = children[i].getAttribute('data-id');
if (dataid === event.id) {
break;
",1
"diff --git a/test/components/calendar/calendar.e2e-spec.js b/test/components/calendar/calendar.e2e-spec.js @@ -380,6 +380,7 @@ describe('Calendar allow one pane tests', () => {
await browser.driver
.wait(protractor.ExpectedConditions.visibilityOf(await element(by.css('.calendar-event-details > div:nth-child(6).is-expanded'))), config.waitsFor);
+ await browser.driver.sleep(1000);
expect(await element.all(by.css('.calendar-event-details .accordion-pane.is-expanded')).count()).toEqual(1);
});
",1
"diff --git a/test/components/locale/locale.func-spec.js b/test/components/locale/locale.func-spec.js @@ -1284,7 +1284,7 @@ describe('Locale API', () => {
const testDate2 = Soho.Locale.formatDate([1441, 6, 5, 0, 0, 0, 0], formatDateOptions);
- expect(testDate2).toEqual('0915');
+ expect(testDate2).toEqual('0229');
const testDate3 = Locale.formatDate('May 01', {
pattern: 'MMMM dd',
",1
"diff --git a/app/views/components/breadcrumb/example-callback.html b/app/views/components/breadcrumb/example-callback.html <div class=""row"">
- <div class=""six colums"">
+ <div class=""six columns"">
<p>Clicking on each of the Breadcrumb Items below will fire a callback</p>
</div>
</div>
",1
"diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js @@ -3484,6 +3484,7 @@ Tabs.prototype = {
const scrollingTablist = this.tablistContainer;
const tablistScrollLeft = scrollingTablist[0].scrollLeft;
const tablistScrollWidth = scrollingTablist[0].scrollWidth;
+ const tabListDifferWidth = tablistScrollWidth - this.tablistContainer[0].offsetWidth;
const targetStyle = window.getComputedStyle(target[0], null);
let paddingRight = parseInt(targetStyle.getPropertyValue('padding-right'), 10) || 0;
@@ -3498,7 +3499,7 @@ Tabs.prototype = {
(paddingRight + target.position().left + target.outerWidth(true)) : (target.position().left);
if (Locale.isRTL()) {
- style.right = `${tablistScrollWidth + paddingRight - (left + tablistScrollLeft)}px`;
+ style.right = `${tablistScrollWidth + paddingRight - (left + tablistScrollLeft) - tabListDifferWidth}px`;
} else {
style.left = `${left + tablistScrollLeft}px`;
}
",1
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -5923,7 +5923,7 @@ Datagrid.prototype = {
* @param {object} emptyMessage The update empty message config object.
*/
setEmptyMessage(emptyMessage) {
- this.element[emptyMessage.height === 'small' ? 'addClass' : 'removeClass']('empty-message-height-small');
+ this.element[emptyMessage?.height === 'small' ? 'addClass' : 'removeClass']('empty-message-height-small');
if (!this.emptyMessage) {
this.emptyMessageContainer = $('<div class=""empty-message-container""><div></div></div>');
this.element.append(this.emptyMessageContainer).addClass('has-empty-message');
",1
"diff --git a/src/components/autocomplete/autocomplete.js b/src/components/autocomplete/autocomplete.js @@ -688,6 +688,7 @@ Autocomplete.prototype = {
* @param {array} event An array with the buffer in it
*/
self.element.trigger('requeststart', [buffer]);
+ self.lastTerm = buffer;
if (sourceType === 'function') {
// Call the 'source' setting as a function with the done callback.
@@ -762,7 +763,6 @@ Autocomplete.prototype = {
// Attempt to resolve source as a URL string. Do an AJAX get with the URL
const sourceURL = self.settings.source.toString();
const request = $.getJSON(sourceURL + buffer);
- this.lastTerm = buffer;
request.done((data) => {
done(buffer, data, true);
",1
"diff --git a/test/components/homepage/homepage.e2e-spec.js b/test/components/homepage/homepage.e2e-spec.js @@ -84,7 +84,7 @@ describe('Homepage example five column tests', () => {
];
const windowSize = await browser.driver.manage().window().getSize();
await browser.driver.manage().window().setSize(1920, 1080);
- await browser.driver.sleep(config.sleep);
+ await browser.driver.sleep(config.sleepLonger);
const widgets = await element.all(by.css('.homepage .widget'));
const len = widgets.length;
@@ -115,7 +115,7 @@ describe('Homepage example five column tests', () => {
];
const windowSize = await browser.driver.manage().window().getSize();
await browser.driver.manage().window().setSize(1680, 1050);
- await browser.driver.sleep(config.sleep);
+ await browser.driver.sleep(config.sleepLonger);
const widgets = await element.all(by.css('.homepage .widget'));
const len = widgets.length;
@@ -146,7 +146,7 @@ describe('Homepage example five column tests', () => {
];
const windowSize = await browser.driver.manage().window().getSize();
await browser.driver.manage().window().setSize(1200, 1600);
- await browser.driver.sleep(config.sleep);
+ await browser.driver.sleep(config.sleepLonger);
const widgets = await element.all(by.css('.homepage .widget'));
const len = widgets.length;
@@ -177,7 +177,7 @@ describe('Homepage example five column tests', () => {
];
const windowSize = await browser.driver.manage().window().getSize();
await browser.driver.manage().window().setSize(768, 1024);
- await browser.driver.sleep(config.sleep);
+ await browser.driver.sleep(config.sleepLonger);
const widgets = await element.all(by.css('.homepage .widget'));
const len = widgets.length;
@@ -208,7 +208,7 @@ describe('Homepage example five column tests', () => {
];
const windowSize = await browser.driver.manage().window().getSize();
await browser.driver.manage().window().setSize(320, 480);
- await browser.driver.sleep(config.sleep);
+ await browser.driver.sleep(config.sleepLonger);
const widgets = await element.all(by.css('.homepage .widget'));
const len = widgets.length;
",1
"diff --git a/test/components/locale/locale.func-spec.js b/test/components/locale/locale.func-spec.js @@ -1290,7 +1290,7 @@ describe('Locale API', () => {
calendarName: 'gregorian'
};
- const testDate2 = Soho.Locale.formatDate([1441, 6, 5, 0, 0, 0, 0], formatDateOptions);
+ const testDate2 = Soho.Locale.formatDate([1442, 6, 5, 0, 0, 0, 0], formatDateOptions);
expect(testDate2).toEqual('0229');
",1
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md - `[Pager]` Fixed a bug that automation id's are not added when the attachToBody is used. ([#4692](https://github.com/infor-design/enterprise/issues/4692))
- `[Rating]` Fixed a bug with the readonly function, it did not toggle the readonly state correctly. ([#958](https://github.com/infor-design/enterprise-ng/issues/958))
- `[Tabs]` Added support for a ""More Actions"" button to exist beside horizontal/header tabs. ([#4532](https://github.com/infor-design/enterprise/issues/4532))
-- `[Toolbar Searchfield]` Fixed a bug where the toolbar searchfield were unable to focused when tabbing through the page. ([#4683](https://github.com/infor-design/enterprise/issues/4683))
+- `[Toolbar Searchfield]` Fixed a bug where the search bar were showing extra outline when focused. ([#4682](https://github.com/infor-design/enterprise/issues/4682))
- `[Tree]` Fixed an issue where the parent value was get deleted after use `addNode()` method. ([#4486](https://github.com/infor-design/enterprise/issues/4486))
- `[Wizard]` Fixed a slight layout issue with the highlighted step in RTL mode. ([#4714](https://github.com/infor-design/enterprise/issues/4714))
",1
"diff --git a/test/components/breadcrumb/breadcrumb.e2e-spec.js b/test/components/breadcrumb/breadcrumb.e2e-spec.js @@ -128,7 +128,7 @@ describe('Breadcrumb automation tests', () => {
});
});
-describe('Breadcrumb should be accessible with no WCAG 2AA violations', () => {
+describe('Breadcrumb should be accessible with no WCAG 2AA violations', async () => {
if (!utils.isIE()) {
await utils.setPage(`/components/breadcrumb/example-disabled?theme=classic&layout=nofrills`);
it('Should be accessible with no WCAG 2AA violations', async () => {
",1
"diff --git a/test/components/breadcrumb/breadcrumb.e2e-spec.js b/test/components/breadcrumb/breadcrumb.e2e-spec.js @@ -128,12 +128,12 @@ describe('Breadcrumb automation tests', () => {
});
});
-describe('Breadcrumb should be accessible with no WCAG 2AA violations', async () => {
- if (!utils.isIE()) {
- await utils.setPage(`/components/breadcrumb/example-disabled?theme=classic&layout=nofrills`);
+describe('Breadcrumb should be accessible with no WCAG 2AA violations', () => {
it('Should be accessible with no WCAG 2AA violations', async () => {
+ if (!utils.isIE()) {
+ await utils.setPage('/components/breadcrumb/example-disabled?theme=classic&layout=nofrills');
const res = await axePageObjects(browser.params.theme);
expect(res.violations.length).toEqual(0);
- });
}
});
+});
",1
"diff --git a/src/components/searchfield/_searchfield.scss b/src/components/searchfield/_searchfield.scss @@ -574,3 +574,14 @@ html[dir='rtl'] {
top: 0;
}
}
+
+/**
+ * align large searchfield search icon
+ */
+.header > .full-searchfield-container .searchfield-wrapper {
+ & > svg.icon:nth-child(1) {
+ height: 100%;
+ top: 50%;
+ transform: translateY(-50%);
+ }
+}
",1
"diff --git a/src/components/searchfield/_searchfield.scss b/src/components/searchfield/_searchfield.scss @@ -602,4 +602,10 @@ html[class*='theme-classic-'] {
top: -1px;
}
}
+
+ .application-menu.has-searchfield {
+ .searchfield-wrapper.has-close-icon-button > .btn-icon.close > svg.close.icon {
+ top: 0;
+ }
+ }
}
",1
"diff --git a/src/components/datagrid/_datagrid.scss b/src/components/datagrid/_datagrid.scss @@ -279,7 +279,8 @@ $datagrid-small-row-height: 25px;
background-color: $datagrid-empty-bg-color;
}
- td:first-child {
+ td:first-child,
+ td.is-hidden:first-child + td {
border-left: 0;
}
@@ -3043,7 +3044,8 @@ $datagrid-small-row-height: 25px;
&.center,
&.left {
- th:first-child {
+ th:first-child,
+ th.is-hidden:first-child + th {
border-left: 0;
}
}
",1
"diff --git a/src/components/popupmenu/popupmenu.js b/src/components/popupmenu/popupmenu.js @@ -1023,10 +1023,6 @@ PopupMenu.prototype = {
self.handleItemClick(e, a);
});
- this.menu.on(`click.btn-menu.${this.id}`, function (e) {
- e.preventDefault();
- });
-
const excludes = 'li:not(.separator):not(.hidden):not(.heading):not(.group):not(.is-disabled):not(.is-placeholder)';
// Select on Focus
@@ -1285,6 +1281,11 @@ PopupMenu.prototype = {
}
return undefined;
});
+
+ $(document).off(`click.btn.${this.id}`).on(`click.btn-menu.${this.id}`, (e) => {
+ e.preventDefault();
+ return false;
+ });
}, 1);
},
@@ -2334,12 +2335,6 @@ PopupMenu.prototype = {
this.menu.off('click.popupmenu touchend.popupmenu touchcancel.popupmenu dragstart.popupmenu');
}
- setTimeout(() => {
- if (this.menu && this.menu.length) {
- this.menu.off(`click.btn-menu.${this.id}`);
- }
- }, 1);
-
$('iframe').each(function () {
const frame = $(this);
try {
",1
"diff --git a/test/components/monthview/monthview-api.func-spec.js b/test/components/monthview/monthview-api.func-spec.js @@ -39,7 +39,6 @@ describe('Monthview API', () => {
month: 8,
year: 2018,
activeDate: new Date(2018, 8, 10),
- firstDayOfWeek: 1,
});
});
@@ -191,8 +190,13 @@ describe('Monthview API', () => {
});
it('Should populate header starting from given day of the week', () => {
- monthviewAPI.showMonth(9, 2021);
- expect(document.getElementById('monthview-datepicker-field').textContent).toEqual('October 2021');
+ monthviewAPI.destroy();
+ monthviewAPI = new MonthView(monthviewEl, {
+ month: 8,
+ year: 2018,
+ activeDate: new Date(2018, 8, 10),
+ firstDayOfWeek: 1
+ });
expect(document.getElementsByClassName('monthview-table')[0].children[0].children[0].children[0].innerHTML).toEqual('Mon');
});
});
",1
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -1578,7 +1578,7 @@ Datagrid.prototype = {
col.filterMaskOptions = utils.extend(true, {}, decimalDefaults, col.filterMaskOptions);
}
- if (col.maskOptions && typeof col.maskOptions != 'function') {
+ if (col.maskOptions && typeof col.maskOptions !== 'function') {
col.maskOptions = utils.extend(true, {}, decimalDefaults, col.maskOptions);
}
}
",1
"diff --git a/test/components/locale/locale.func-spec.js b/test/components/locale/locale.func-spec.js @@ -2215,7 +2215,7 @@ describe('Locale API', () => {
Locale.set('tl-PH');
expect(Locale.translate('Clickable')).toEqual('Clickable sa editor');
- expect(Locale.translate('Columns')).toEqual('Mga kolum');
+ expect(Locale.translate('Columns')).toEqual('Mga Column');
expect(Locale.translate('Component')).toEqual('Bahagi');
expect(Locale.translate('Classic')).toEqual('Klasiko');
expect(Locale.translate('ClassicDarkTheme')).toEqual('Klasiko Dark');
",1
"diff --git a/src/components/week-view/week-view.js b/src/components/week-view/week-view.js @@ -910,6 +910,8 @@ WeekView.prototype = {
this.teardown();
this.element.empty();
$.removeData(this.element[0], COMPONENT_NAME);
+ $.removeData(this.element[0], 'init');
+ $.removeData(this.element[0], 'automationId');
return this;
}
};
",1
"diff --git a/app/views/components/datagrid/test-stretch-last-column.html b/app/views/components/datagrid/test-stretch-last-column.html columns: columns,
dataset: data,
selectable: 'single',
- stretchColumn: columns[columns.length -1].id,
+ stretchColumn: columns[columns.length -1].id, // 'last' used to work see #6063
toolbar: {title: 'Data Grid Header Title', collapsibleFilter: true, results: true, keywordFilter: true, actions: true, rowHeight: true}
});
});
",1
"diff --git a/src/components/tooltip/tooltip.js b/src/components/tooltip/tooltip.js @@ -280,9 +280,7 @@ Tooltip.prototype = {
if (!this.tooltip.length) {
const name = (elem ? elem.substring(1, elem.length) : this.componentName);
this.tooltip = $(`<div class=""${className} bottom is-hidden"" id=""${name}"">
- <div class=""arrow""></div>
- <div class=""tooltip-content""></div>
- </div>`);
+ <div class=""arrow""></div><div class=""tooltip-content""></div></div>`);
xssUtils.removeWhiteSpaceCharacters(this.tooltip);
}
",1
"diff --git a/package.json b/package.json ""e2e:local:debug"": ""npm run webdriver:update && npx protractor test/protractor.local.debug.conf.js"",
""e2e:puppeteer"": ""npx --no-install jest --config=test/jest.config.js --runInBand --detectOpenHandles --forceExit"",
""webdriver:clean"": ""npx webdriver-manager clean"",
- ""webdriver:update"": ""npx webdriver-manager update --versions.chrome=97.0.4692.99 --standalone false --quiet --gecko=false"",
+ ""webdriver:update"": ""npx webdriver-manager update --standalone false --quiet --gecko=false"",
""zip-dist"": ""npx grunt zip-dist"",
""documentation"": ""node ./scripts/deploy-documentation.js"",
""release:dev"": ""node scripts/publish-nightly-manual"",
",1
"diff --git a/app/views/components/modal/example-index.html b/app/views/components/modal/example-index.html -<style>
- .container {
- width: 100%;
- }
- input {
- min-width: 300px;
- }
- .modal-content .modal-body-wrapper {
- padding-bottom: 0;
- }
- .row:last-child {
- margin-bottom: 0px;
- }
-</style>
<div class=""row top-padding"">
<div class=""twelve columns"">
",1
"diff --git a/src/components/bar/bar.js b/src/components/bar/bar.js @@ -584,9 +584,14 @@ Bar.prototype = {
total = 0;
hexColor = charts.chartColor(j, 'bar', series[j]);
for (let k = 0, kl = dataset.length; k < kl; k++) {
+ if (s.isNormalized) {
+ total += dataset[k][i].value;
+ totals[k] = dataset[k][i].value;
+ } else {
total += dataset[k][i].x;
totals[k] = dataset[k][i].x;
}
+ }
content += `<div class=""swatch-row"">
<div class=""swatch-color"">${setPattern(series[j].pattern, hexColor)}</div>
<span>${series[j].name}</span>
",1
"diff --git a/src/components/bar/bar.js b/src/components/bar/bar.js @@ -298,11 +298,11 @@ Bar.prototype = {
self.svg = d3.select(this.element[0])
.append('svg')
- .attr('width', w)
- .attr('height', h)
+ .attr('width', w + (isAxisLabels.atLeastOne ? 20 : 0))
+ .attr('height', h + (isAxisLabels.atLeastOne ? 5 : 0))
.append('g')
.attr('class', 'group')
- .attr('transform', `translate(${textWidth},${margins.top})`);
+ .attr('transform', `translate(${textWidth},${margins.top - (isAxisLabels.atLeastOne ? 3 : 0)})`);
const xMin = d3.min(dataset, g => (d3.min(g, d => (s.isStacked ? (d.x + d.x0) : d.x))));
let xMax = d3.max(dataset, g => (d3.max(g, d => (s.isStacked ? (d.x + d.x0) : d.x))));
@@ -716,7 +716,7 @@ Bar.prototype = {
});
// Adjust the labels
- self.svg.selectAll('.axis.y text').attr('x', () => (self.isRTL ? 15 : -15));
+ self.svg.selectAll('.axis.y text').attr('x', () => (self.isRTL ? (isAxisLabels.atLeastOne ? 5 : 15) : (isAxisLabels.atLeastOne ? -5 : -15)));
self.svg.selectAll('.axis.x text').attr('class', d => (d < 0 ? 'negative-value' : 'positive-value'));
if (self.isRTL && (charts.isIE || charts.isIEEdge)) {
@@ -726,20 +726,21 @@ Bar.prototype = {
if (isAxisLabels.atLeastOne) {
const axisLabelGroup = self.svg.append('g').attr('class', 'axis-labels');
- const widthAxisLabel = w - 45;
+ const widthAxisLabel = w - 95;
+ const heightAxisLabel = height - 60;
const place = {
- top: `translate(${widthAxisLabel / 2 - 51},${-5})`,
- right: `translate(${widthAxisLabel + 28},${height / 2})rotate(90)`,
- bottom: `translate(${widthAxisLabel / 2},${height + 40})`,
- left: `translate(${-80},${height / 2})rotate(-90)`,
+ top: `translate(${widthAxisLabel / 2},${-4})`,
+ right: `translate(${widthAxisLabel + 53},${height / 2})rotate(90)`,
+ bottom: `translate(${widthAxisLabel / 2},${heightAxisLabel + 89})`,
+ left: `translate(${-35},${height / 2})rotate(-90)`,
};
const placeStyle = {
- top: `rotate(0deg) scale(-1) translate(-${widthAxisLabel / 2}px, ${-10}px)`,
- right: `rotate(90deg) scaleX(-1) translate(-${(height / 2) + 5}px, -${widthAxisLabel + (self.isRTL ? 55 : 28)}px)`,
- bottom: `rotate(0deg) scaleX(-1) translate(-${widthAxisLabel / 2}px, ${height + 47}px)`,
- left: `rotate(90deg) scaleX(-1) translate(-${(height / 2 - 5)}px, ${self.isRTL ? 35 : 55}px)`
+ top: `rotate(0deg) scaleX(-1) translate(-${widthAxisLabel / 2}px, ${-4}px)`,
+ right: `rotate(90deg) scaleX(-1) translate(-${(height / 2) + 5}px, -${widthAxisLabel + (this.isRTL ? 45 : 28)}px)`,
+ bottom: `rotate(0deg) scaleX(-1) translate(-${widthAxisLabel / 2}px, ${heightAxisLabel + 89}px)`,
+ left: `rotate(90deg) scaleX(-1) translate(-${(height / 2 - 5)}px, ${this.isRTL ? 45 : 55}px)`
};
const addAxis = (pos) => {
",1
"diff --git a/test/components/datagrid/datagrid.puppeteer-spec.js b/test/components/datagrid/datagrid.puppeteer-spec.js @@ -171,7 +171,8 @@ describe('Datagrid', () => {
});
});
- describe('Count in select all current page setting', () => {
+ // TODO: improve this test
+ describe.skip('Count in select all current page setting', () => {
const url = `${baseUrl}/test-count-in-select-all-current-page-setting.html`;
beforeAll(async () => {
await page.goto(url, { waitUntil: ['domcontentloaded', 'networkidle0'] });
",1
"diff --git a/test/components/popdown/popdown.puppeteer-spec.js b/test/components/popdown/popdown.puppeteer-spec.js -const { checkDataAutomationId, checkIfElementHasFocused, checkIfElementExist, checkIfElementExists } = require('../../helpers/e2e-utils.js');
+const { checkDataAutomationId, checkIfElementHasFocused, checkIfElementExists } = require('../../helpers/e2e-utils.js');
/**
* #TODO: Refactor all the tests
*/
@@ -73,10 +73,10 @@ describe('Popdown Puppeteer Tests', () => {
// 1. On open first input should be focused.
// 2. On first input (Shift + Tab) should close and focus to previous.
// 3. On last input Tab should close and focus to next.
- it('should let close the popdown and if available focus to prev/next', async () => {
+ it.skip('should let close the popdown and if available focus to prev/next', async () => {
const tabPresses = 5;
- await Promise.all(Array.from({ length: tabPresses }, () => page.keyboard.press('Tab')));
+ await Promise.all(Array.from({ length: tabPresses }, () => page.keyboard.press('Tab', { delay: 400 })));
await page.waitForSelector('.popdown', { visible: true });
// Popdown should open and first input should be focused.
@@ -134,17 +134,16 @@ describe('Popdown Puppeteer Tests', () => {
});
it('Should remain open when an inner Lookup component is opened', async () => {
- const isFailed = [];
// Open the Popdown
await page.click('#popdown-trigger');
- isFailed.push(await checkIfElementExist('.popdown.bottom.visible'));
+ expect(await checkIfElementExists(page, '.popdown.bottom.visible')).toBe(true);
// Open the Lookup
await page.click('.btn-icon');
- isFailed.push(await checkIfElementExist('.lookup-modal'));
+ expect(await checkIfElementExists(page, '.lookup-modal')).toBe(true);
// Test that the Popdown remained open
- isFailed.push(await checkIfElementExist('.popdown.bottom.visible'));
+ expect(await checkIfElementExists(page, '.popdown.bottom.visible'));
// Choose an option from the Lookup
await page.click('#lookup-datagrid > div.datagrid-wrapper.center.scrollable-x.scrollable-y > table > tbody > tr:nth-child(1) > td:nth-child(2) > div > a');
@@ -152,41 +151,7 @@ describe('Popdown Puppeteer Tests', () => {
const input = await (await element.getProperty('value')).jsonValue();
expect(input).toBe('2142201');
- // Test that the Popdown remained open
- isFailed.push(await checkIfElementExist('.popdown.bottom.visible'));
- expect(isFailed).not.toContain(true);
- });
- });
-
- describe('Outside Event Tests', () => {
- const url = 'http://localhost:4000/components/popdown/test-click-outside.html';
- beforeEach(async () => {
- await page.goto(url, { waitUntil: ['domcontentloaded', 'networkidle0'] });
- });
-
- it('should show the title', async () => {
- await expect(page.title()).resolves.toMatch('IDS Enterprise');
- });
-
- it('should show have outside event', async () => {
- expect.assertions(8);
- // |----------------------------------------------------------|
- // | https://github.com/infor-design/enterprise/issues/3618 |
- // |----------------------------------------------------------|
- page
- .on('console', (message) => {
- expect(message.text()).toContain('click outside');
- const { _type, _text, _args } = message;
- const { _remoteObject } = _args[0];
- const value = _remoteObject.value;
- expect(_type).toBe('log');
- expect(_text).toBe('click outside JSHandle@object');
- expect(value).toBe('click outside');
- });
- await page.click('#popdown-example-trigger');
- await page.waitForSelector('#maincontent');
- await page.click('#maincontent', { delay: 500 });
- await page.click('[data-automation-id=""popover-listview-example-automation-id""]', { delay: 500 });
+ expect(await checkIfElementExists(page, '.popdown.bottom.visible')).toBe(true);
});
});
});
",1
"diff --git a/src/components/searchfield/_searchfield-toolbar.scss b/src/components/searchfield/_searchfield-toolbar.scss @@ -521,7 +521,7 @@ $toolbarsearchfield-category-empty-width: 51px;
&:not(.active) {
.btn-icon.close,
- .icon.close {
+ &:not(.is-hovered) .icon.close {
display: none;
}
}
",1
"diff --git a/spec/bubble-chart-spec.js b/spec/bubble-chart-spec.js @@ -458,7 +458,7 @@ describe('dc.bubbleChart', function () {
it('draws bubbles in appropriate locations', function () {
var coords = [
- [170.4,0], [820,155], [489.9,155], [394,310], [149.1,310], [0,310]
+ [0,310], [149.1,310], [170.4,0], [394,310], [489.9,155], [820,155],
];
chart.selectAll('g.node').each(function (d, i) {
expect(d3.select(this).attr('transform'))
",1
"diff --git a/spec/data-addition-spec.js b/spec/data-addition-spec.js @@ -26,6 +26,7 @@ describe('Dynamic data addition in crossfilter', function () {
.width(width)
.height(height)
.radius(radius)
+ .ordering(function (kv) { return kv.key; })
.transitionDuration(0);
chart.render();
baseData.add(moreData);
@@ -47,14 +48,14 @@ describe('Dynamic data addition in crossfilter', function () {
expect(chart.selectAll('svg g g.pie-slice path').data().length).toEqual(7);
});
it('default function should be used to dynamically generate label', function () {
- expect(d3.select(chart.selectAll('text.pie-slice')[0][0]).text()).toEqual('44');
+ expect(d3.select(chart.selectAll('text.pie-slice')[0][0]).text()).toEqual('11');
});
- it('pie chart slices should be in numerical size order', function () {
+ it('pie chart slices should be in numerical order', function () {
expect(chart.selectAll('text.pie-slice').data().map(function (slice) { return slice.data.key; }))
- .toEqual(['44', '22', '33', '55', '11', '66', '76']);
+ .toEqual(['11','22','33','44','55','66','76']);
});
it('default function should be used to dynamically generate title', function () {
- expect(d3.select(chart.selectAll('g.pie-slice title')[0][0]).text()).toEqual('44: 3');
+ expect(d3.select(chart.selectAll('g.pie-slice title')[0][0]).text()).toEqual('11: 1');
});
afterEach(function () {
valueDimension.filterAll();
",1
"diff --git a/spec/helpers/custom_matchers.js b/spec/helpers/custom_matchers.js @@ -191,13 +191,14 @@ beforeEach(function () {
/*
URL can be like:
url(http://localhost:8888/spec/?random=true#composite-chart-clip)
+ url(""http://localhost:8888/spec/?random=true#composite-chart-clip"")
http://localhost:8888/spec/?random=true#composite-chart-clip
http://localhost:8888/spec/##composite-chart-clip
*/
var cleanURL = function (u) {
var matches = u.match(/url\((.*)\)/);
if (matches) {
- u = matches[1];
+ u = matches[1].replace(/""/g, '');
}
return u.replace(/\#+/, '#');
};
",1
"diff --git a/src/cbox-menu.js b/src/cbox-menu.js @@ -73,7 +73,7 @@ dc.cboxMenu = function (parent, chartGroup) {
if (_chart.hasFilter() && _multiple) {
_cbox.selectAll('input')
.property('checked', function (d) {
- return d && _chart.filters().indexOf(String(_chart.keyAccessor()(d))) >= 0;
+ return d && _chart.filters().indexOf(String(_chart.keyAccessor()(d))) >= 0 || false;
});
} else if (_chart.hasFilter()) {
_cbox.select('input[value=""' + _chart.filter() + '""]')
",1
"diff --git a/spec/sunburst-chart-spec.js b/spec/sunburst-chart-spec.js @@ -104,8 +104,8 @@ describe('dc.sunburstChart', function () {
it('height should be set', function () {
expect(chart.height()).toEqual(height);
});
- it('radius should be set', function () {
- expect(chart.radius()).toEqual(radius);
+ it('radius should not be set', function () {
+ expect(chart.radius()).toBeFalsy();
});
it('cx should be set', function () {
expect(chart.cx()).toEqual(defaultCenter.x);
@@ -185,6 +185,16 @@ describe('dc.sunburstChart', function () {
});
});
+ describe('with radius', function () {
+ beforeEach(function () {
+ chart.radius(100)
+ .render();
+ });
+ it('should take', function () {
+ expect(chart.radius()).toEqual(radius);
+ });
+ });
+
describe('re-render', function () {
beforeEach(function () {
chart.render();
",1
"diff --git a/spec/color-spec.js b/spec/color-spec.js @@ -57,9 +57,9 @@ describe('dc.colorMixin', function () {
it('linear', function () {
// GIGO: mapping ordinal domain to linear scale is nonsensical
- // actually it gets scaled to NaN and then d3 corrects it
+ // d3 pre-5.8: scaled to NaN and corrected to black; 5.8+: scale returns undefined
chart.linearColors(['#ff0000','#00ff00']);
- expect(colorTest(chart, domain)).toMatchColors(['#000000', '#000000', '#000000', '#000000', '#000000']);
+ expect(colorTest(chart, domain)).toEqual([undefined, undefined, undefined, undefined, undefined]);
});
});
describe('with numeric domain' , function () {
",1
"diff --git a/web-src/examples/header.js b/web-src/examples/header.js '<a href=""//dc-js.github.io/dc.js""><img src=""../dc.logo.png"" style=""float:left; padding-right: 1em"" width=50 height=50></img></a>',
'<div id=""links"" style=""padding:10px 0px 0px 10px"">',
'<a href=""."">all ' + dir + '</a>&emsp;<a href=""',
- 'https://github.com/dc-js/dc.js/tree/master/web-src/' + dir + '/' + filename,
+ 'https://github.com/dc-js/dc.js/tree/develop/web-src/' + dir + '/' + filename,
'"">source</a>',
'<div style=""float:right""><span id=""version""></span></div>',
'</div>',
",1
"diff --git a/web-src/index.html b/web-src/index.html <li><a href=""vc/index.html"">US Venture Capital Landscape 2011 (choropleth chart, bubble chart)</a></li>
<li><a href=""crime/index.html"">Major Canadian City Crime Stats 1998-2011 (bubble overlay, bar chart, line chart)</a></li>
<li><a href=""https://github.com/dc-js/dc.js/wiki#examples-contributed-by-community"">List of Community Contributed Examples</a></li>
- <li><a href=""./examples"">Simple, Specific Chart Examples</a> (<a href=""https://github.com/dc-js/dc.js/tree/master/web/examples"">source</a>)</li>
+ <li><a href=""./examples"">Simple, Specific Chart Examples</a> (<a href=""https://github.com/dc-js/dc.js/tree/master/web-src/examples"">source</a>)</li>
</ul>
<h2>Nasdaq 100 Index 1985/11/01-2012/06/29</h2>
",1
"diff --git a/lib/services/batchManagement/README.md b/lib/services/batchManagement/README.md @@ -22,7 +22,7 @@ npm install azure-arm-batch
// the user will get a DeviceTokenCredentials object.
msRestAzure.interactiveLogin(function(err, credentials) {
var client = new batchManagementClient(credentials, 'your-subscription-id');
- client.account.list(rgName, function(err, result, request, response) {
+ client.batchAccountOperations.list(rgName, function(err, result, request, response) {
if (err) console.log(err);
console.log(result);
});
",1
"diff --git a/lib/services/HDInsightJob2/lib/hDInsightJobManagementClient.js b/lib/services/HDInsightJob2/lib/hDInsightJobManagementClient.js @@ -1467,21 +1467,21 @@ var JobOperations = ( /** @lends JobOperations */ function() {
*
* @param {HiveJobSubmissionParameters} parameters Hive job parameters.
*
- * @param {string} [parameters.query]
+ * @param {string} [parameters.query] One of either ""execute"" or ""file"" is required.
*
* @param {string} [parameters.userName]
*
- * @param {string} [parameters.file]
+ * @param {string} [parameters.file] One of either ""execute"" or ""file"" is required.
*
- * @param {string} [parameters.files]
+ * @param {string} [parameters.files] optional in Hive 0.12.0+
*
* @param {string} [parameters.defines]
*
- * @param {string} [parameters.arguments]
+ * @param {string} [parameters.arguments] optional in Hive 0.12.0+
*
* @param {string} [parameters.statusDir]
*
- * @param {string} [parameters.enableLog]
+ * @param {string} [parameters.enableLog] optional in Hive 0.12.0+
*
* @param {function} callback
*
@@ -1525,7 +1525,34 @@ var JobOperations = ( /** @lends JobOperations */ function() {
httpRequest.headers['User-Agent'] = 'xplat Hive job submission';
// Serialize Request
- var requestContent = 'user.name=' + parameters.userName + '&execute=' + parameters.query + '&file=' + parameters.file + '&arg=' + parameters.arguments + '&files=' + parameters.files + '&statusdir=' + parameters.statusDir + '&enablelog=' + parameters.enableLog + parameters.defines;
+ var requestContent = '';
+ if (!parameters.query && !parameters.file) {
+ throw new Error('One of either ""execute"" or ""file"" is required.');
+ }
+ if (parameters.username) {
+ requestContent += 'user.name=' + parameters.username;
+ }
+ if (parameters.query) {
+ requestContent += '&execute=' + parameters.query;
+ }
+ if (parameters.file) {
+ requestContent += '&file=' + parameters.file;
+ }
+ if (parameters.arguments) {
+ requestContent += '&arg=' + parameters.arguments;
+ }
+ if (parameters.files) {
+ requestContent += '&files=' + parameters.files;
+ }
+ if (parameters.statusDir) {
+ requestContent += '&statusdir=' + parameters.statusDir;
+ }
+ if (parameters.enableLog) {
+ requestContent += '&enablelog=' + parameters.enableLog;
+ }
+ if (parameters.defines) {
+ requestContent += '&define=' + encodeURIComponent(parameters.defines);
+ }
httpRequest.body = requestContent;
httpRequest.headers['Content-Length'] = Buffer.isBuffer(requestContent) ? requestContent.length : Buffer.byteLength(requestContent, 'UTF8');
// Send Request
",1
"diff --git a/src/plugins/npm-plugin/index.js b/src/plugins/npm-plugin/index.js @@ -29,7 +29,7 @@ export default function npmPlugin({ publicPath = '/@npm', prefix = '\bnpm/', ext
if (id.startsWith(publicPath)) return { id, external };
if (id.startsWith(prefix)) id = id.substring(prefix.length);
- else if (/^(?:\0|[a-z]+:)/.test(id)) return;
+ else if (/^(?:\0|[a-z]+:|\/)/.test(id)) return;
if (importer && importer.startsWith(prefix)) importer = importer.substring(prefix.length);
",1
"diff --git a/src/lib/prerender.js b/src/lib/prerender.js @@ -4,15 +4,16 @@ import { Worker } from 'worker_threads';
* @param {object} options
* @property {string} [cwd = '.']
* @property {string} [out = '.cache']
+ * @property {string} publicPath
*/
-export function prerender({ cwd = '.', out = '.cache' }) {
+export function prerender({ cwd = '.', out = '.cache', publicPath }) {
const w = new Worker(
`(${workerCode})(require('worker_threads').workerData)
.then(r => require('worker_threads').parentPort.postMessage([1,r]))
.catch(err => require('worker_threads').parentPort.postMessage([0,err && err.stack || err+'']))`,
{
eval: true,
- workerData: { cwd, out },
+ workerData: { cwd, out, publicPath },
// execArgv: ['--experimental-modules'],
stderr: true
}
@@ -28,7 +29,7 @@ export function prerender({ cwd = '.', out = '.cache' }) {
});
}
-async function workerCode({ cwd, out }) {
+async function workerCode({ cwd, out, publicPath }) {
/*global globalThis*/
const path = require('path');
@@ -67,6 +68,7 @@ async function workerCode({ cwd, out }) {
throw Error(`Unable to detect <script src=""entry.js""> in your index.html.`);
}
// script = new URL(`../dist/${script.replace(/^(\.?\/)?/g, '')}`, selfUrl).href;
+ script = script.replace(publicPath, '');
script = path.resolve(cwd, out, script.replace(/^(\.?\/)?/g, ''));
// Prevent Rollup from transforming `import()` here.
",1
"diff --git a/packages/wmr/src/plugins/wmr/client.js b/packages/wmr/src/plugins/wmr/client.js @@ -389,7 +389,7 @@ function createErrorOverlay(data) {
'div.inner',
null,
h('h1.title', null, String(data.error)),
- h('pre.code-frame', null, h('code', null, lines)),
+ h('pre.code-frame', null, h('code', null, ...lines)),
h(
'details.detail',
null,
",1
"diff --git a/packages/wmr/src/lib/prerender.js b/packages/wmr/src/lib/prerender.js @@ -76,7 +76,7 @@ async function workerCode({ cwd, out, publicPath, customRoutes }) {
const SCRIPT_TAG = /<script(?:\s[^>]*?)?\s+src=(['""]?)([^>]*?)\1(?:\s[^>]*?)?>/g;
let match;
- while ((match = SCRIPT_TAG.exec(tpl))) {
+ while ((match = SCRIPT_TAG.exec(tpl)) && !script) {
// Ignore external urls
if (!match || /^(?:https?|file|data)/.test(match[2])) continue;
",1
"diff --git a/index.js b/index.js @@ -507,6 +507,8 @@ Peer.prototype._maybeReady = function () {
self._connecting = true
self.getStats(function (err, items) {
+ if (self.destroyed) return
+
// Treat getStats error as non-fatal. It's not essential.
if (err) items = []
",1
"diff --git a/README.md b/README.md @@ -280,7 +280,7 @@ if (Peer.WEBRTC_SUPPORT) {
### duplex stream
-`Peer` objects are instances of `stream.Duplex`. The behave very similarly to a
+`Peer` objects are instances of `stream.Duplex`. They behave very similarly to a
`net.Socket` from the node core `net` module. The duplex stream reads/writes to the data
channel.
",1
"diff --git a/packages/razzle/config/createConfigAsync.js b/packages/razzle/config/createConfigAsync.js @@ -655,23 +655,19 @@ module.exports = (
// Check if plugin is a function.
// If it is, call it on the configs we created.
if (typeof plugin === 'function') {
- config = await Promise.resolve(
- runPlugin(
+ config = await runPlugin(
plugin,
config,
{ target, dev: IS_DEV },
webpackObject,
options
- )
);
}
}
// Check if razzle.config.js has a modify function.
// If it does, call it on the configs we created.
if (modify) {
- config = await Promise.resolve(
- modify(config, { target, dev: IS_DEV }, webpackObject)
- );
+ config = await modify(config, { target, dev: IS_DEV }, webpackObject);
}
resolve(config);
",1
"diff --git a/packages/razzle/package.json b/packages/razzle/package.json ""terser-webpack-plugin"": ""^2.3.5"",
""tiny-async-pool"": ""^1.1.0"",
""url-loader"": ""^2.3.0"",
- ""webpack"": ""^5.18.0"",
+ ""webpack"": ""4 || 5"",
""webpack-manifest-plugin"": ""3.0.0-rc.0"",
- ""webpackbar"": ""^5.0.0-3""
+ ""webpackbar"": ""4 || 5""
},
""peerDependencies"": {
""babel-preset-razzle"": ""4.0.0-canary.25"",
",1
"diff --git a/packages/razzle-dev-utils/webpackHotDevClient.js b/packages/razzle-dev-utils/webpackHotDevClient.js @@ -17,9 +17,6 @@ var devServerMajorVersion = require('./devServerMajor');
var formatWebpackMessages = require('./formatWebpackMessages');
var ErrorOverlay = require('react-error-overlay');
-var socketUrl = createSocketUrl();
-var parsedSocketUrl = url.parse(socketUrl);
-
var createSocketUrl;
if (devServerMajorVersion > 3) {
// The path changed with v4
@@ -28,6 +25,9 @@ if (devServerMajorVersion > 3) {
createSocketUrl = require('webpack-dev-server/client/utils/createSocketUrl');
}
+var socketUrl = createSocketUrl();
+var parsedSocketUrl = url.parse(socketUrl);
+
ErrorOverlay.setEditorHandler(function editorHandler(errorLocation) {
// Keep this sync with errorOverlayMiddleware.js
fetch(
",1
"diff --git a/packages/razzle/scripts/start.js b/packages/razzle/scripts/start.js @@ -179,7 +179,7 @@ function main() {
// listen was deprecated in v4 and causes issues when used, switch to its replacement
clientDevServer.start();
} else {
- // Start Webpack-dev-server with the explicit host and port
+ // Start Webpack-dev-server
clientDevServer.listen(port, err => {
if (err) {
logger.error(err);
",1
"diff --git a/packages/razzle/config/createConfigAsync.js b/packages/razzle/config/createConfigAsync.js @@ -895,7 +895,7 @@ module.exports = (
config.plugins = [
...config.plugins,
devServerMajorVersion > 3
- ? null // avoid warning since, webpack v4 automatically adds the HRM plugin when `hot` is true
+ ? null // avoid warning since v4 automatically adds the HRM plugin when `hot` is true
: new webpack.HotModuleReplacementPlugin({
// set this true will break HtmlWebpackPlugin
multiStep: !clientOnly,
",1
"diff --git a/website/pages/docs/customization.md b/website/pages/docs/customization.md @@ -426,7 +426,7 @@ module.exports = {
env: {
target, // the target 'node' or 'web'
dev, // is this a development build? true or false
- }
+ },
options: {
webpackOptions, // the default options that will be used to configure webpack/ webpack loaders and plugins
}
",1
"diff --git a/src/reducers/targets.js b/src/reducers/targets.js @@ -15,8 +15,8 @@ const reducer = function (state, action) {
.filter(target => !target.isStage)
.reduce(
(targets, target, listId) => Object.assign(
- {[target.id]: {order: listId, ...target}},
- targets
+ targets,
+ {[target.id]: {order: listId, ...target}}
),
{}
),
",1
"diff --git a/src/components/modal/modal.jsx b/src/components/modal/modal.jsx @@ -21,7 +21,7 @@ class ModalComponent extends React.Component {
>
<Box
direction=""column""
- grow=""1""
+ grow={1}
>
<div className={styles.header}>
<div className={classNames(styles.headerItem, styles.headerItemFilter)}>
",1
"diff --git a/test/unit/util/audio-effects.test.js b/test/unit/util/audio-effects.test.js @@ -16,14 +16,14 @@ describe('Audio Effects manager', () => {
test('changes buffer length and playback rate for faster effect', () => {
const audioEffects = new AudioEffects(audioBuffer, 'faster');
- expect(audioEffects.audioContext._.length).toEqual(Math.floor(400 / 1.5));
- expect(audioEffects.source.playbackRate.value).toEqual(1.5);
+ expect(audioEffects.audioContext._.length).toBeLessThan(400);
+ expect(audioEffects.source.playbackRate.value).toBeGreaterThan(1);
});
test('changes buffer length and playback rate for slower effect', () => {
const audioEffects = new AudioEffects(audioBuffer, 'slower');
- expect(audioEffects.audioContext._.length).toEqual(Math.floor(400 / 0.5));
- expect(audioEffects.source.playbackRate.value).toEqual(0.5);
+ expect(audioEffects.audioContext._.length).toBeGreaterThan(400);
+ expect(audioEffects.source.playbackRate.value).toBeLessThan(1);
});
test('changes buffer length for echo effect', () => {
",1
"diff --git a/src/components/sound-editor/sound-editor.css b/src/components/sound-editor/sound-editor.css @@ -49,7 +49,7 @@ $border-radius: 0.25rem;
transition: 0.2s;
}
-.button img {
+.button > img {
flex-grow: 1;
max-width: 100%;
max-height: 100%;
@@ -62,6 +62,10 @@ $border-radius: 0.25rem;
padding-right: 10px; /* To equalize with empty whitespace from image on left */
}
+.trim-button > img {
+ width: 1.5rem;
+}
+
.trim-button-active {
filter: hue-rotate(155deg); /* @todo replace blue -> red with real submit icon */
}
",1
"diff --git a/src/components/browser-modal/browser-modal.jsx b/src/components/browser-modal/browser-modal.jsx @@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
import React from 'react';
import ReactModal from 'react-modal';
import Box from '../box/box.jsx';
+import {defineMessages, injectIntl, intlShape, FormattedMessage} from 'react-intl';
import styles from './browser-modal.css';
@@ -17,14 +18,16 @@ const BrowserModal = ({intl, ...props}) => (
<ReactModal
isOpen
className={styles.modalContent}
- contentLabel=""Internet Explorer is not supported""
+ contentLabel={intl.formatMessage({...messages.label})}
overlayClassName={styles.modalOverlay}
onRequestClose={props.onBack}
>
<Box className={styles.illustration} />
<Box className={styles.body}>
- <h2>Internet Explorer is not supported</h2>
+ <h2>
+ <FormattedMessage {...messages.label} />
+ </h2>
<p>
{ /* eslint-disable max-len */ }
<FormattedMessage
@@ -58,7 +61,8 @@ const BrowserModal = ({intl, ...props}) => (
);
BrowserModal.propTypes = {
+ intl: intlShape.isRequired,
onBack: PropTypes.func.isRequired
};
-export default BrowserModal;
+export default injectIntl(BrowserModal);
",1
"diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx @@ -70,9 +70,9 @@ class Blocks extends React.Component {
);
this.workspace = this.ScratchBlocks.inject(this.blocks, workspaceConfig);
- // we actually never want the workspace to enable ""refresh toolbox"" - this basically re-renders the entire toolbox
- // every time we reset the workspace. We call updateToolbox as a part of componentDidUpdate so the toolbox will
- // still correctly be updated
+ // we actually never want the workspace to enable ""refresh toolbox"" - this basically re-renders the
+ // entire toolbox every time we reset the workspace. We call updateToolbox as a part of
+ // componentDidUpdate so the toolbox will still correctly be updated
this.setToolboxRefreshEnabled = this.workspace.setToolboxRefreshEnabled.bind(this.workspace);
this.workspace.setToolboxRefreshEnabled = () => this.setToolboxRefreshEnabled(false);
",1
"diff --git a/test/helpers/timer.js b/test/helpers/timer.js // timer for tests specific to testrpc
module.exports = s => {
- console.log('timer to', s);
return new Promise((resolve, reject) => {
web3.currentProvider.sendAsync({
jsonrpc: '2.0',
@@ -8,7 +7,6 @@ module.exports = s => {
params: [s], // 60 seaconds, may need to be hex, I forget
id: new Date().getTime() // Id of the request; anything works, really
}, function(err) {
- console.log('resolved to', err);
if (err) return reject(err);
resolve();
});
",2
"diff --git a/contracts/SafeMath.sol b/contracts/SafeMath.sol @@ -12,9 +12,9 @@ library SafeMath {
}
function div(uint a, uint b) internal returns (uint) {
- assert(b > 0);
+ // assert(b > 0); // Solidity automatically throws when dividing by 0
uint c = a / b;
- assert(a == b * c + a % b);
+ // assert(a == b * c + a % b); // There is no case in which this doesn't hold
return c;
}
",2
"diff --git a/contracts/token/PausableToken.sol b/contracts/token/PausableToken.sol @@ -16,10 +16,10 @@ import '../lifecycle/Pausable.sol';
contract PausableToken is Pausable, StandardToken {
function transfer(address _to, uint _value) whenNotPaused {
- return super.transfer(_to, _value);
+ super.transfer(_to, _value);
}
function transferFrom(address _from, address _to, uint _value) whenNotPaused {
- return super.transferFrom(_from, _to, _value);
+ super.transferFrom(_from, _to, _value);
}
}
",2
"diff --git a/contracts/lifecycle/Pausable.sol b/contracts/lifecycle/Pausable.sol @@ -34,18 +34,16 @@ contract Pausable is Ownable {
/**
* @dev called by the owner to pause, triggers stopped state
*/
- function pause() onlyOwner whenNotPaused returns (bool) {
+ function pause() onlyOwner whenNotPaused {
paused = true;
Pause();
- return true;
}
/**
* @dev called by the owner to unpause, returns to normal state
*/
- function unpause() onlyOwner whenPaused returns (bool) {
+ function unpause() onlyOwner whenPaused {
paused = false;
Unpause();
- return true;
}
}
",2
"diff --git a/README.md b/README.md @@ -16,7 +16,7 @@ With OpenZeppelin, you can build distributed applications, protocols and organiz
OpenZeppelin integrates with [Truffle](https://github.com/ConsenSys/truffle), an Ethereum development environment. Please install Truffle and initialize your project with `truffle init`.
```sh
-npm install -g truffle@beta
+npm install -g truffle
mkdir myproject && cd myproject
truffle init
```
",2
"diff --git a/package.json b/package.json ""name"": ""zeppelin-solidity"",
""version"": ""1.2.0"",
""description"": ""Secure Smart Contract library for Solidity"",
- ""main"": ""truffle.js"",
""scripts"": {
""test"": ""scripts/test.sh"",
""console"": ""truffle console"",
",2
"diff --git a/contracts/token/StandardToken.sol b/contracts/token/StandardToken.sol @@ -71,7 +71,6 @@ contract StandardToken is ERC20, BasicToken {
* From MonolithDAO Token.sol
*/
function increaseApproval (address _spender, uint _addedValue)
- onlyPayloadSize(2 * 32)
returns (bool success) {
allowed[msg.sender][_spender] = allowed[msg.sender][_spender].add(_addedValue);
Approval(msg.sender, _spender, allowed[msg.sender][_spender]);
@@ -79,7 +78,6 @@ contract StandardToken is ERC20, BasicToken {
}
function decreaseApproval (address _spender, uint _subtractedValue)
- onlyPayloadSize(2 * 32)
returns (bool success) {
uint oldValue = allowed[msg.sender][_spender];
if (_subtractedValue > oldValue) {
",2
"diff --git a/package.json b/package.json ""scripts"": {
""test"": ""scripts/test.sh"",
""console"": ""truffle console"",
- ""coverage"": ""scripts/coverage.sh"",
- ""coveralls"": ""scripts/coveralls.sh""
+ ""coverage"": ""scripts/coverage.sh""
},
""repository"": {
""type"": ""git"",
",2
"diff --git a/contracts/crowdsale/FinalizableCrowdsale.sol b/contracts/crowdsale/FinalizableCrowdsale.sol @@ -7,7 +7,7 @@ import './Crowdsale.sol';
/**
* @title FinalizableCrowdsale
* @dev Extension of Crowsdale where an owner can do extra work
- * after finishing. By default, it will end token minting.
+ * after finishing.
*/
contract FinalizableCrowdsale is Crowdsale, Ownable {
using SafeMath for uint256;
",2
"diff --git a/contracts/token/BurnableToken.sol b/contracts/token/BurnableToken.sol @@ -23,5 +23,5 @@ contract BurnableToken is StandardToken {
Burn(burner, _value);
}
- event Burn(address indexed burner, uint indexed value);
+ event Burn(address indexed burner, uint256 value);
}
",2
"diff --git a/test/DayLimit.js b/test/DayLimit.js @@ -6,7 +6,6 @@ import {increaseTimeTo, duration} from './helpers/increaseTime'
var DayLimitMock = artifacts.require('./helpers/DayLimitMock.sol');
contract('DayLimit', function(accounts) {
- const day = 60 * 60 * 24;
let dayLimit;
let initLimit = 10;
",2
"diff --git a/contracts/mocks/FinalizableCrowdsaleImpl.sol b/contracts/mocks/FinalizableCrowdsaleImpl.sol @@ -13,7 +13,6 @@ contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
address _wallet
) public
Crowdsale(_startTime, _endTime, _rate, _wallet)
- FinalizableCrowdsale()
{
}
",2
"diff --git a/contracts/token/ERC20/BasicToken.sol b/contracts/token/ERC20/BasicToken.sol @@ -32,7 +32,6 @@ contract BasicToken is ERC20Basic {
require(_to != address(0));
require(_value <= balances[msg.sender]);
- // SafeMath.sub will throw if there is not enough balance.
balances[msg.sender] = balances[msg.sender].sub(_value);
balances[_to] = balances[_to].add(_value);
Transfer(msg.sender, _to, _value);
",2
"diff --git a/README.md b/README.md @@ -31,7 +31,7 @@ npm install -E zeppelin-solidity
After that, you'll get all the library's contracts in the `node_modules/zeppelin-solidity/contracts` folder. You can use the contracts in the library like so:
-```js
+```solidity
import 'zeppelin-solidity/contracts/ownership/Ownable.sol';
contract MyContract is Ownable {
@@ -60,23 +60,5 @@ Interested in contributing to OpenZeppelin?
- Contribution guidelines: https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/CONTRIBUTING.md
- Wiki: https://github.com/OpenZeppelin/zeppelin-solidity/wiki
-## Collaborating organizations and audits by OpenZeppelin
-- [Golem](https://golem.network/)
-- [Mediachain](http://www.mediachain.io/)
-- [Truffle](http://truffleframework.com/)
-- [Firstblood](https://firstblood.io/)
-- [Rootstock](https://www.rsk.co/)
-- [Consensys](https://consensys.net/)
-- [DigixGlobal](https://www.dgx.io/)
-- [Coinfund](https://coinfund.io/)
-- [DemocracyEarth](https://democracy.earth/)
-- [Signatura](https://signatura.co/)
-- [Ether.camp](http://www.ether.camp/)
-- [Aragon](https://aragon.one/)
-- [Wings](https://wings.ai/)
-
-among others...
-
-
## License
Code released under the [MIT License](https://github.com/OpenZeppelin/zeppelin-solidity/blob/master/LICENSE).
",2
"diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -12,7 +12,6 @@ Smart contracts manage value and are highly vulnerable to errors and attacks. We
As a contributor, you are expected to fork this repository, work on your own fork and then submit pull requests. The pull requests will be reviewed and eventually merged into the main repo. See [""Fork-a-Repo""](https://help.github.com/articles/fork-a-repo/) for how this works.
*IMPORTANT*
-* Please use `rebase` instead of `merge` when updating your fork.
* Please see [""Git flow wiki entry""](https://github.com/OpenZeppelin/zeppelin-solidity/wiki/Git-flow) for understanding how to use branches in this repository.
## A typical workflow
",2
"diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -21,12 +21,11 @@ As a contributor, you are expected to fork this repository, work on your own for
```
cd openzeppelin-solidity
git fetch upstream
-git checkout development
-git pull --rebase upstream development
+git pull --rebase upstream master
```
NOTE: The directory `openzeppelin-solidity` represents your fork's local copy.
-2) Branch out from `development` into `fix/some-bug-#123`:
+2) Branch out from `master` into `fix/some-bug-#123`:
(Postfixing #123 will associate your PR with the issue #123 and make everyone's life easier =D)
```
git checkout -b fix/some-bug-#123
",2
"diff --git a/contracts/token/ERC721/ERC721BasicToken.sol b/contracts/token/ERC721/ERC721BasicToken.sol @@ -32,24 +32,6 @@ contract ERC721BasicToken is SupportsInterfaceWithLookup, ERC721Basic {
// Mapping from owner to operator approvals
mapping (address => mapping (address => bool)) internal operatorApprovals;
- /**
- * @dev Guarantees msg.sender is owner of the given token
- * @param _tokenId uint256 ID of the token to validate its ownership belongs to msg.sender
- */
- modifier onlyOwnerOf(uint256 _tokenId) {
- require(ownerOf(_tokenId) == msg.sender);
- _;
- }
-
- /**
- * @dev Checks msg.sender can transfer a token, by being owner, approved, or operator
- * @param _tokenId uint256 ID of the token to validate
- */
- modifier canTransfer(uint256 _tokenId) {
- require(isApprovedOrOwner(msg.sender, _tokenId));
- _;
- }
-
constructor()
public
{
@@ -158,8 +140,8 @@ contract ERC721BasicToken is SupportsInterfaceWithLookup, ERC721Basic {
uint256 _tokenId
)
public
- canTransfer(_tokenId)
{
+ require(isApprovedOrOwner(msg.sender, _tokenId));
require(_from != address(0));
require(_to != address(0));
@@ -188,7 +170,6 @@ contract ERC721BasicToken is SupportsInterfaceWithLookup, ERC721Basic {
uint256 _tokenId
)
public
- canTransfer(_tokenId)
{
// solium-disable-next-line arg-overflow
safeTransferFrom(_from, _to, _tokenId, """");
@@ -213,7 +194,6 @@ contract ERC721BasicToken is SupportsInterfaceWithLookup, ERC721Basic {
bytes _data
)
public
- canTransfer(_tokenId)
{
transferFrom(_from, _to, _tokenId);
// solium-disable-next-line arg-overflow
",2
"diff --git a/contracts/token/ERC20/ERC20.sol b/contracts/token/ERC20/ERC20.sol @@ -197,8 +197,6 @@ contract ERC20 is IERC20 {
* @param value The amount that will be burnt.
*/
function _burnFrom(address account, uint256 value) internal {
- require(value <= _allowed[account][msg.sender]);
-
// Should https://github.com/OpenZeppelin/zeppelin-solidity/issues/707 be accepted,
// this function needs to emit an event with the updated approval.
_allowed[account][msg.sender] = _allowed[account][msg.sender].sub(
",2
"diff --git a/contracts/token/ERC20/ERC20Pausable.sol b/contracts/token/ERC20/ERC20Pausable.sol @@ -20,11 +20,11 @@ contract ERC20Pausable is ERC20, Pausable {
return super.approve(spender, value);
}
- function increaseAllowance(address spender, uint addedValue) public whenNotPaused returns (bool success) {
+ function increaseAllowance(address spender, uint addedValue) public whenNotPaused returns (bool) {
return super.increaseAllowance(spender, addedValue);
}
- function decreaseAllowance(address spender, uint subtractedValue) public whenNotPaused returns (bool success) {
+ function decreaseAllowance(address spender, uint subtractedValue) public whenNotPaused returns (bool) {
return super.decreaseAllowance(spender, subtractedValue);
}
}
",2
"diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -79,7 +79,6 @@ jobs:
SOLIDITY_COVERAGE: true
# TODO(xinbenlv, #1839): run SOLC_NIGHTLY to be run but allow it to fail.
- # TODO(xinbenlv, #1839): requires SLACK WEBHOOK to be setup by repo owner.
workflows:
version: 2
",2
"diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
-## 2.4.0 (2019-08-15)
+## 2.4.0 (unreleased)
### New features:
* `Address.toPayable`: added a helper to convert between address types without having to resort to low-level casting. ([#1773](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1773))
",2
"diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
-## 2.4.0 (2019-08-16)
+## 2.4.0 (unreleased)
### New features:
* `Address.toPayable`: added a helper to convert between address types without having to resort to low-level casting. ([#1773](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1773))
",2
"diff --git a/contracts/payment/PullPayment.sol b/contracts/payment/PullPayment.sol @@ -62,10 +62,6 @@ contract PullPayment {
* @param amount The amount to transfer.
*/
function _asyncTransfer(address dest, uint256 amount) internal virtual {
- // solhint-disable-previous-line no-unused-vars
-
- // TODO: remove the previous linter directive once
- // https://github.com/protofire/solhint/issues/170 is fixed
_escrow.deposit{ value: amount }(dest);
}
}
",2
"diff --git a/contracts/math/SafeMath.sol b/contracts/math/SafeMath.sol @@ -109,7 +109,6 @@ library SafeMath {
* - The divisor cannot be zero.
*/
function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {
- // Solidity only automatically asserts when dividing by 0
require(b > 0, errorMessage);
uint256 c = a / b;
// assert(a == b * c + a % b); // There is no case in which this doesn't hold
",2
"diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol @@ -10,8 +10,6 @@ import ""./SafeERC20.sol"";
*
* Useful for simple vesting schedules like ""advisors get all of their tokens
* after 1 year"".
- *
- * For a more complete vesting schedule, see {TokenVesting}.
*/
contract TokenTimelock {
using SafeERC20 for IERC20;
",2
"diff --git a/README.md b/README.md @@ -32,8 +32,8 @@ pragma solidity ^0.6.0;
import ""@openzeppelin/contracts/token/ERC721/ERC721.sol"";
-contract MyNFT is ERC721 {
- constructor() ERC721(""MyNFT"", ""MNFT"") public {
+contract MyCollectible is ERC721 {
+ constructor() ERC721(""MyCollectible"", ""MCO"") public {
}
}
```
",2
"diff --git a/test/utils/SafeCast.test.js b/test/utils/SafeCast.test.js @@ -73,13 +73,6 @@ contract('SafeCast', async (accounts) => {
'SafeCast: value must be positive',
);
});
-
- it(`reverts when casting UINT256_MAX (${maxUint256})`, async function () {
- await expectRevert(
- this.safeCast.toUint256(maxUint256),
- 'SafeCast: value must be positive',
- );
- });
});
function testToInt (bits) {
",2
"diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
-## 3.3.0 (2020-11-17)
+## 3.3.0
* `Address`: added `functionStaticCall` and `functionDelegateCall`, similar to the existing `functionCall`. ([#2333](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2333))
* `TimelockController`: added a contract to augment access control schemes with a delay. ([#2364](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2364))
",2
"diff --git a/docs/contract.hbs b/docs/contract.hbs .Functions
--
{{#each inheritedItems}}
+{{#if (or @first (ne contract.name ""Context""))}}
{{#unless @first}}
[.contract-subindex-inherited]
.{{contract.name}}
* {xref-{{slug anchor~}} }[`++{{name}}({{args.names}})++`]
{{/each}}
+{{/if}}
{{/each}}
--
{{/if}}
",2
"diff --git a/contracts/mocks/BadBeacon.sol b/contracts/mocks/BadBeacon.sol pragma solidity >=0.6.0 <0.8.0;
-import ""../proxy/IBeacon.sol"";
-
contract BadBeaconNoImpl {
}
-contract BadBeaconNotContract is IBeacon {
- function implementation() external view override returns (address) {
+contract BadBeaconNotContract {
+ function implementation() external view returns (address) {
return address(0x1);
}
}
",2
"diff --git a/CHANGELOG.md b/CHANGELOG.md * `ERC721URIStorage`: add a new extension that implements the `_setTokenURI` behavior as it was available in 3.4.0. ([#2555](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2555))
* `AccessControl`: added ERC165 interface detection. ([#2562](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2562))
* `ERC1155`: make `uri` public so overloading function can call it using super. ([#2576](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2576))
- * `ERC777`: make reception acquirement optional in `_mint`. ([#2552](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2552))
### Bug fixes for beta releases
",2
"diff --git a/contracts/utils/Context.sol b/contracts/utils/Context.sol @@ -18,7 +18,6 @@ abstract contract Context {
}
function _msgData() internal view virtual returns (bytes calldata) {
- this; // silence state mutability warning without generating bytecode - see https://github.com/ethereum/solidity/issues/2691
return msg.data;
}
}
",2
"diff --git a/contracts/proxy/ERC1967/ERC1967Upgrade.sol b/contracts/proxy/ERC1967/ERC1967Upgrade.sol @@ -65,8 +65,7 @@ abstract contract ERC1967Upgrade {
bytes memory data,
bool forceCall
) internal {
- _setImplementation(newImplementation);
- emit Upgraded(newImplementation);
+ _upgradeTo(newImplementation);
if (data.length > 0 || forceCall) {
Address.functionDelegateCall(newImplementation, data);
}
@@ -103,8 +102,7 @@ abstract contract ERC1967Upgrade {
// Check rollback was effective
require(oldImplementation == _getImplementation(), ""ERC1967Upgrade: upgrade breaks further upgrades"");
// Finally reset to the new implementation and log the upgrade
- _setImplementation(newImplementation);
- emit Upgraded(newImplementation);
+ _upgradeTo(newImplementation);
}
}
",2
"diff --git a/contracts/token/ERC20/README.adoc b/contracts/token/ERC20/README.adoc @@ -33,7 +33,6 @@ Finally, there are some utilities to interact with ERC20 contracts in various wa
The following related EIPs are in draft status.
- {ERC20Permit}
-- {ERC20FlashMint}
NOTE: This core set of contracts is designed to be unopinionated, allowing developers to access the internal functions in ERC20 (such as <<ERC20-_mint-address-uint256-,`_mint`>>) and expose them as external functions in the way they prefer. On the other hand, xref:ROOT:erc20.adoc#Presets[ERC20 Presets] (such as {ERC20PresetMinterPauser}) are designed using opinionated patterns to provide developers with ready to use, deployable contracts.
@@ -61,14 +60,14 @@ NOTE: This core set of contracts is designed to be unopinionated, allowing devel
{{ERC20Wrapper}}
+{{ERC20FlashMint}}
+
== Draft EIPs
The following EIPs are still in Draft status. Due to their nature as drafts, the details of these contracts may change and we cannot guarantee their xref:ROOT:releases-stability.adoc[stability]. Minor releases of OpenZeppelin Contracts may contain breaking changes for the contracts in this directory, which will be duly announced in the https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/CHANGELOG.md[changelog]. The EIPs included here are used by projects in production and this may make them less likely to change significantly.
{{ERC20Permit}}
-{{ERC20FlashMint}}
-
== Presets
These contracts are preconfigured combinations of the above features. They can be used through inheritance or as models to copy and paste their source code.
",2
"diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc * Implementations of standards like xref:erc20.adoc[ERC20] and xref:erc721.adoc[ERC721].
* Flexible xref:access-control.adoc[role-based permissioning] scheme.
* Reusable xref:utilities.adoc[Solidity components] to build custom contracts and complex decentralized systems.
- * https://github.com/OpenZeppelin/openzeppelin-contracts/tree/master/audit[Audited] by leading security firms (_last full audit on v2.0.0_).
== Overview
",2
"diff --git a/CHANGELOG.md b/CHANGELOG.md * `ERC2771Context`: use private variable from storage to store the forwarder address. Fixes issues where `_msgSender()` was not callable from constructors. ([#2754](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2754))
* `EnumerableSet`: add `values()` functions that returns an array containing all values in a single call. ([#2768](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2768))
* `Governor`: added a modular system of `Governor` contracts based on `GovernorAlpha` and `GovernorBravo`. ([#2672](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2672))
- * Fix hierarchy inconsistencies between `contracts` and `test` introduced during the 4.0 repo refactor. ([#2814](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2814))
## 4.2.0 (2021-06-30)
",2
"diff --git a/test/utils/cryptography/MerkleProof.test.js b/test/utils/cryptography/MerkleProof.test.js @@ -37,7 +37,7 @@ contract('MerkleProof', function (accounts) {
const badElements = ['d', 'e', 'f'];
const badMerkleTree = new MerkleTree(badElements);
- const badProof = badMerkleTree.getHexProof(badElements[0], keccak256, { hashLeaves: true, sortPairs: true });
+ const badProof = badMerkleTree.getHexProof(badElements[0]);
expect(await this.merkleProof.verify(badProof, correctRoot, correctLeaf)).to.equal(false);
});
",2
"diff --git a/CHANGELOG.md b/CHANGELOG.md # Changelog
-## 4.4.1 (2021-12-10)
+## 4.4.1
* `Initializable`: change the existing `initializer` modifier and add a new `onlyInitializing` modifier to prevent reentrancy risk. ([#3006](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3006))
",2
"diff --git a/contracts/token/common/ERC2981.sol b/contracts/token/common/ERC2981.sol @@ -88,7 +88,6 @@ abstract contract ERC2981 is IERC2981, ERC165 {
*
* Requirements:
*
- * - `tokenId` must be already minted.
* - `receiver` cannot be the zero address.
* - `feeNumerator` cannot be greater than the fee denominator.
*/
",2
"diff --git a/docs/modules/ROOT/pages/access-control.adoc b/docs/modules/ROOT/pages/access-control.adoc @@ -73,7 +73,7 @@ contract MyToken is ERC20, AccessControl {
constructor(address minter) ERC20(""MyToken"", ""TKN"") {
// Grant the minter role to a specified account
- _setupRole(MINTER_ROLE, minter);
+ _grantRole(MINTER_ROLE, minter);
}
function mint(address to, uint256 amount) public {
@@ -104,8 +104,8 @@ contract MyToken is ERC20, AccessControl {
bytes32 public constant BURNER_ROLE = keccak256(""BURNER_ROLE"");
constructor(address minter, address burner) ERC20(""MyToken"", ""TKN"") {
- _setupRole(MINTER_ROLE, minter);
- _setupRole(BURNER_ROLE, burner);
+ _grantRole(MINTER_ROLE, minter);
+ _grantRole(BURNER_ROLE, burner);
}
function mint(address to, uint256 amount) public onlyRole(MINTER_ROLE) {
@@ -123,7 +123,7 @@ So clean! By splitting concerns this way, more granular levels of permission may
[[granting-and-revoking]]
=== Granting and Revoking Roles
-The ERC20 token example above uses `_setupRole`, an `internal` function that is useful when programmatically assigning roles (such as during construction). But what if we later want to grant the 'minter' role to additional accounts?
+The ERC20 token example above uses `_grantRole`, an `internal` function that is useful when programmatically assigning roles (such as during construction). But what if we later want to grant the 'minter' role to additional accounts?
By default, **accounts with a role cannot grant it or revoke it from other accounts**: all having a role does is making the `hasRole` check pass. To grant and revoke roles dynamically, you will need help from the _role's admin_.
@@ -149,7 +149,7 @@ contract MyToken is ERC20, AccessControl {
constructor() ERC20(""MyToken"", ""TKN"") {
// Grant the contract deployer the default admin role: it will be able
// to grant and revoke any roles
- _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
+ _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
}
function mint(address to, uint256 amount) public onlyRole(MINTER_ROLE) {
",2
"diff --git a/CHANGELOG.md b/CHANGELOG.md * `SafeCast`: optimize downcasting of signed integers. ([#3565](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3565))
* `VestingWallet`: remove unused library `Math.sol`. ([#3605](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3605))
* `ECDSA`: Remove redundant check on the `v` value. ([#3591](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3591))
- * `EIP712`: `utils/cryptography/EIP712.sol`
### Deprecations
",2
"diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml @@ -6,14 +6,13 @@ runs:
- uses: actions/setup-node@v3
with:
node-version: 14.x
- cache: npm
- uses: actions/cache@v3
id: cache
with:
path: '**/node_modules'
key: npm-v3-${{ hashFiles('**/package-lock.json') }}
- name: Install dependencies
- run: npm ci --prefer-offline
+ run: npm ci
shell: bash
if: steps.cache.outputs.cache-hit != 'true'
env:
",2
"diff --git a/docs/modules/ROOT/pages/extending-contracts.adoc b/docs/modules/ROOT/pages/extending-contracts.adoc @@ -66,8 +66,6 @@ contract ModifiedAccessControl is AccessControl {
The `super.revokeRole` statement at the end will invoke ``AccessControl``'s original version of `revokeRole`, the same code that would've run if there were no overrides in place.
-NOTE: As of v3.0.0, `view` functions are not `virtual` in OpenZeppelin, and therefore cannot be overridden. We're considering https://github.com/OpenZeppelin/openzeppelin-contracts/issues/2154[lifting this restriction] in an upcoming release. Let us know if this is something you care about!
-
[[using-hooks]]
== Using Hooks
",2
"diff --git a/src/helpers/withResolver.js b/src/helpers/withResolver.js import React, { Component } from 'react'
import { cancelAllPromises, waitForDataAndSetState } from './components'
-import Promise from 'bluebird'
import Errors from '../components/Errors/Errors'
import ContentLoader from '../components/Loader/ContentLoader'
@@ -14,9 +13,9 @@ export default function withResolver(WrappedComponent, dependencies) {
}
componentDidMount() {
- const dependenciesPromise = Promise.map(Object.keys(dependencies), dependencyName => {
+ const dependenciesPromise = Promise.all(Object.keys(dependencies).map(dependencyName => {
return waitForDataAndSetState(dependencies[dependencyName], this, dependencyName)
- })
+ }))
dependenciesPromise.then(() => this.setState({ dependenciesReady: true }))
",2
"diff --git a/project.config.js b/project.config.js @@ -48,9 +48,6 @@ module.exports = {
INSPIRE_DATAGOUV_API_KEY: null
},
- /** Whether to enable verbose logging */
- verbose: false,
-
/** The list of modules to bundle separately from the core application code */
vendors: [
'lodash',
",2
"diff --git a/project.config.js b/project.config.js const env = process.env.NODE_ENV || 'development'
-
-const development = {
- host: 'localhost',
- port: process.env.PORT || 3000
-}
+const port = process.env.PORT || 3000
module.exports = {
- /** Development server configuration */
- development,
+ /** Development server port */
+ port,
/** The environment to use when building the project */
env,
@@ -42,7 +38,7 @@ module.exports = {
/** A hash map of environment variables to retrieve and their default values */
environment: {
- PUBLIC_URL: `http://${development.host}:${development.port}`,
+ PUBLIC_URL: `http://localhost:${port}`,
INSPIRE_DATAGOUV_API_URL: 'https://next.data.gouv.fr/api',
INSPIRE_DATAGOUV_API_KEY: null,
",2
"diff --git a/src/routes/Search/modules/actions.js b/src/routes/Search/modules/actions.js @@ -11,6 +11,8 @@ import {
SEARCH_EXECUTE_FAILURE
} from './constants'
+const { INSPIRE_API_URL } = process.env
+
export const execute = (query, limit = 20) => dispatch => {
dispatch({
type: SEARCH_EXECUTE_PENDING
@@ -19,7 +21,7 @@ export const execute = (query, limit = 20) => dispatch => {
const filters = flattenFilters(query.filters)
return _get(
- `https://inspire.data.gouv.fr/api/geogw/records?${qs.stringify({
+ `${INSPIRE_API_URL}/records?${qs.stringify({
...filters,
q: query.textInput,
offset: (query.page - 1) * limit,
",2
"diff --git a/src/routes/Search/index.js b/src/routes/Search/index.js @@ -18,11 +18,6 @@ export default store => ({
async onEnter({ location }) {
const search = await import(/* webpackChunkName: 'search' */ './modules/search')
- injectReducer(store, {
- key: 'search',
- reducer: search.reducer
- })
-
store.dispatch(search.actions.execute(
search.query.parse(location.query)
))
",2
"diff --git a/src/routes/Dataset/components/DatasetView/DatasetView.js b/src/routes/Dataset/components/DatasetView/DatasetView.js @@ -99,7 +99,7 @@ class DatasetView extends React.PureComponent {
<DatasetDataGouvPublication dataset={dataset} publication={publication} />
</DatasetBlock>
- <DatasetBlock title={'Contacts'}>
+ <DatasetBlock title='Contacts'>
<DatasetContactList contacts={dataset.metadata.contacts} />
</DatasetBlock>
</div>
",2
"diff --git a/src/components/Warning/Warning.js b/src/components/Warning/Warning.js @@ -28,9 +28,7 @@ class Warning extends React.PureComponent {
render() {
const { displayed } = this.state
- if (!displayed) {
- return null
- }
+ if (!displayed) return
const { error, title, children } = this.props
const color = error ? styles.errorStyle : styles.warning
",2
"diff --git a/src/routes/Dataset/components/DatasetChecks/CheckLicense.js b/src/routes/Dataset/components/DatasetChecks/CheckLicense.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
import Check from './Check'
-import { ACCEPTED_LICENSES } from 'common//helpers/dataGouvChecks'
+import { ACCEPTED_LICENSES } from 'common/helpers/dataGouvChecks'
class CheckLicense extends React.PureComponent {
check() {
",2
"diff --git a/src/routes/Home/components/HomePage/HomePage.js b/src/routes/Home/components/HomePage/HomePage.js import React from 'react'
import PropTypes from 'prop-types'
-
+import DocumentTitle from 'react-document-title'
import { browserHistory, Link } from 'react-router'
import { translate } from 'react-i18next'
@@ -18,12 +18,6 @@ class HomePage extends React.PureComponent {
t: PropTypes.func.isRequired
}
- componentDidMount() {
- const { t } = this.props
-
- document.title = t('HomePage.home')
- }
-
search = value => {
browserHistory.push({
pathname: '/search',
@@ -38,6 +32,7 @@ class HomePage extends React.PureComponent {
const { catalogs, t } = this.props
return (
+ <DocumentTitle title={t('HomePage.home')}>
<div>
<div className={styles.masthead}>
<h1>
@@ -70,6 +65,7 @@ class HomePage extends React.PureComponent {
</div>
</div>
</div>
+ </DocumentTitle>
)
}
}
",2
"diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -12,6 +12,8 @@ defaults:
filters: &default_filters
tags:
only: '/v[0-9]+(\.[0-9]+)*/'
+ branches:
+ ignore: gh-pages
attach_workspace: &attach_workspace
attach_workspace:
@@ -122,26 +124,22 @@ workflows:
build_test_deploy:
jobs:
- install:
- filters:
- <<: *default_filters
+ filters: *default_filters
- lint:
requires:
- install
- filters:
- <<: *default_filters
+ filters: *default_filters
- test:
requires:
- install
- filters:
- <<: *default_filters
+ filters: *default_filters
- build:
requires:
- install
- filters:
- <<: *default_filters
+ filters: *default_filters
- deploy:
requires:
",2
"diff --git a/src/components/LanguageSelection/LanguageSelection.scss b/src/components/LanguageSelection/LanguageSelection.scss width: 100px;
height: 30px;
}
-
-.emoji {
- margin-left: 1em;
-}
",2
"diff --git a/src/components/Container/Container.scss b/src/components/Container/Container.scss width: 100%;
margin: 0 auto;
padding: 0 20px;
-
- @media (min-width: 400px) {
- width: 85%;
- padding: 0;
- }
-
- @media (min-width: 550px) {
- width: 80%;
- }
}
",2
"diff --git a/components/counter.js b/components/counter.js @@ -15,7 +15,6 @@ const Counter = ({ value, label, unit, size = '', color = '', title = '' }) => (
.value {
font-size: 2.2rem;
height: 1.8rem;
- text-align: left;
}
.unit {
@@ -36,10 +35,6 @@ const Counter = ({ value, label, unit, size = '', color = '', title = '' }) => (
color: ${colors.red};
}
- .label {
- text-align: center;
- }
-
// Sizes
.small {
font-size: 0.8rem;
",2
"diff --git a/components/page/header/index.js b/components/page/header/index.js @@ -8,7 +8,7 @@ import LanguageSelection from './language-selection'
import { PUBLIC_URL, PUBLICATION_BASE_URL } from '@env'
-const Header = ({ router, t, i18n }) => {
+const Header = ({ router, t }) => {
const loginRedirect = `${PUBLIC_URL}/publication`
const isPublication = router.pathname.startsWith('/publication')
const logoutRedirect = isPublication ? PUBLIC_URL : PUBLIC_URL + router.pathname
@@ -40,7 +40,7 @@ const Header = ({ router, t, i18n }) => {
)}
</li>
<li>
- <LanguageSelection language={i18n.language} />
+ <LanguageSelection />
</li>
{user && (
<li>
@@ -112,9 +112,6 @@ Header.propTypes = {
pathname: PropTypes.string.isRequired
}).isRequired,
- i18n: PropTypes.shape({
- language: PropTypes.string.isRequired
- }).isRequired,
t: PropTypes.func.isRequired
}
",2
"diff --git a/components/catalog-preview.js b/components/catalog-preview.js @@ -87,7 +87,6 @@ export const CatalogPreview = ({ catalog, t }) => {
right: 12px;
top: 9px;
font-size: 2em;
- opacity: 0.7;
}
.title {
",2
"diff --git a/next.config.js b/next.config.js +const webpack = require('webpack')
const { join } = require('path')
const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer')
module.exports = {
webpack: function (config, { dev }) {
+ config.plugins.push(
+ new webpack.ContextReplacementPlugin(/moment[/\\]locale$/, /fr/)
+ )
+
if (!dev) {
config.plugins.push(new BundleAnalyzerPlugin({
analyzerMode: 'static',
",2
"diff --git a/components/facet.js b/components/facet.js @@ -52,6 +52,8 @@ class Facet extends React.Component {
...router.query
}
+ delete query.p
+
const match = query[filter.name]
if (Array.isArray(match)) {
query[filter.name].push(filter.value)
@@ -81,6 +83,8 @@ class Facet extends React.Component {
...router.query
}
+ delete query.p
+
const match = query[filter.name]
if (Array.isArray(match)) {
query[filter.name] = match.filter(v => v !== filter.value)
",2
"diff --git a/pages/search.js b/pages/search.js @@ -128,7 +128,7 @@ class SearchPage extends React.Component {
<Count count={count} />
<Results results={results} />
- <Paging count={count} query={query} />
+ {count > 0 && <Paging count={count} query={query} />}
</div>
<Facets groups={groups} open={showFacets} onClose={this.closeFacets} />
",2
"diff --git a/components/catalog/harvests/index.js b/components/catalog/harvests/index.js @@ -4,8 +4,7 @@ import { translate } from 'react-i18next'
import Table from './table'
-const Harvests = ({ catalog, harvests, t }) => {
- return (
+const Harvests = ({ catalog, harvests, t }) => (
<section>
<div>
<Table catalog={catalog} harvests={harvests} />
@@ -23,7 +22,6 @@ const Harvests = ({ catalog, harvests, t }) => {
`}</style>
</section>
)
-}
Harvests.propTypes = {
catalog: PropTypes.shape({
",2
"diff --git a/components/catalog/statistics.js b/components/catalog/statistics.js @@ -104,6 +104,10 @@ const Statistics = ({ metrics, t }) => {
width: calc(100% - 1.2em);
}
+ @media (max-width: 551px) {
+ height: auto;
+ }
+
div {
display: flex;
}
",2
"diff --git a/components/box.js b/components/box.js @@ -11,7 +11,7 @@ const Box = ({ children }) => (
div {
background-color: $white;
box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.3);
- padding: 1.6em 2em 3em;
+ padding: 1.6em 2em;
border-radius: 2px;
@media (max-width: 551px) {
",2
"diff --git a/components/dataset/thumbnails.js b/components/dataset/thumbnails.js import React from 'react'
import PropTypes from 'prop-types'
+import { uniqBy } from 'lodash'
import { GEODATA_API_URL } from '@env'
@@ -30,14 +31,16 @@ class Thumbnails extends React.Component {
const { recordId, thumbnails } = this.props
const { selected } = this.state
+ const thumbs = uniqBy(thumbnails, 'originalUrlHash')
+
return (
<div>
<div className='thumbnail'>
<img src={`${GEODATA_API_URL}/records/${recordId}/thumbnails/${selected.originalUrlHash}`} alt='' />
</div>
- {thumbnails.length > 1 && (
+ {thumbs.length > 1 && (
<div className='list'>
- {thumbnails.map(thumbnail => (
+ {thumbs.map(thumbnail => (
<img
key={thumbnail.originalUrlHash}
src={`${GEODATA_API_URL}/records/${recordId}/thumbnails/${thumbnail.originalUrlHash}`}
",2
"diff --git a/pages/dataset.js b/pages/dataset.js @@ -83,6 +83,8 @@ class DatasetPage extends React.Component {
const { dataset: { recordId, metadata, dataset, organizations }, datagouvPublication, t } = this.props
const { datagouvDatasetPromise } = this.state
+ const hasThumbnails = metadata.thumbnails && metadata.thumbnails.length > 0
+
return (
<Page>
<Meta title={metadata.title} />
@@ -120,8 +122,9 @@ class DatasetPage extends React.Component {
<Downloads distributions={dataset.distributions} />
</Box>
</div>
+ {(hasThumbnails || metadata.spatialExtent) && (
<div className='right'>
- {metadata.thumbnails && metadata.thumbnails.length > 0 && (
+ {hasThumbnails && (
<Box title={t('blocks.thumbnails')}>
<Thumbnails recordId={recordId} thumbnails={metadata.thumbnails} />
</Box>
@@ -136,6 +139,7 @@ class DatasetPage extends React.Component {
</Box>
)}
</div>
+ )}
</div>
</Container>
</Content>
",2
"diff --git a/components/contact.js b/components/contact.js @@ -18,7 +18,7 @@ const Contact = ({ contact, t }) => (
</div>
{contact.address && (
- <div>
+ <div className='address'>
{contact.address[0]} {contact.town} - {contact.postalCode} {contact.country}
</div>
)}
@@ -50,7 +50,10 @@ const Contact = ({ contact, t }) => (
.name {
font-weight: bold;
- margin-bottom: 0.6em;
+ }
+
+ .address {
+ margin-top: 0.5em;
}
.contact {
",2
"diff --git a/pages/search.js b/pages/search.js @@ -59,6 +59,10 @@ class SearchPage extends React.Component {
showFacets: false
}
+ componentWillUnmount() {
+ document.body.classList.remove('no-xs-scroll')
+ }
+
componentWillReceiveProps() {
this.setState(state => ({
showFacets: false
",2
"diff --git a/components/page/index.js b/components/page/index.js @@ -38,17 +38,11 @@ export const Page = ({ children }) => (
}
}
- body {
- &.no-scroll {
- overflow: hidden;
- }
-
- &.no-xs-scroll {
+ body.no-xs-scroll {
@media (max-width: 960px) {
overflow: hidden;
}
}
- }
#nprogress {
pointer-events: none;
",2
"diff --git a/components/page/header/index.js b/components/page/header/index.js @@ -69,7 +69,7 @@ class Header extends React.Component {
) : (
<Link href='/publication'>
<a>
- <img alt='avatar' className='avatar' src={user.avatar_thumbnail} />
+ <img alt='' className='avatar' src={user.avatar_thumbnail} />
{user.first_name} {user.last_name}
</a>
</Link>
",2
"diff --git a/components/dataset/discussions/form.js b/components/dataset/discussions/form.js @@ -132,6 +132,7 @@ class DiscussionForm extends React.Component {
width: 100%;
border: 1px solid $lightgrey;
height: 53px;
+ resize: none;
}
button {
",2
"diff --git a/components/page/header/index.js b/components/page/header/index.js @@ -34,12 +34,6 @@ class Header extends React.Component {
t: PropTypes.func.isRequired
}
- clearSession = e => {
- const { session } = this.props
-
- session.clear()
- }
-
render() {
const { router, session, t, i18n: { language } } = this.props
@@ -82,7 +76,7 @@ class Header extends React.Component {
</li>
{session && session.user && (
<li>
- <a href={logoutUrl} onClick={this.clearSession}>
+ <a href={logoutUrl} onClick={session.clear}>
<span>{t('header.logout')}</span>
</a>
</li>
",2
"diff --git a/components/piwik.js b/components/piwik.js import React from 'react'
import PropTypes from 'prop-types'
import Head from 'next/head'
-import { withRouter } from 'next/router'
import { PIWIK_URL, PIWIK_SITE_ID } from '@env'
@@ -14,10 +13,8 @@ class Piwik extends React.Component {
const { title } = this.props
if (window.Piwik) {
- const tracker = window.Piwik.getAsyncTracker()
+ const tracker = window.Piwik.getTracker(`${PIWIK_URL}/piwik.php`, PIWIK_SITE_ID)
- tracker.setTrackerUrl(`${PIWIK_URL}/piwik.php`)
- tracker.setSiteId(PIWIK_SITE_ID)
tracker.trackPageView(title)
}
}
@@ -35,4 +32,4 @@ class Piwik extends React.Component {
}
}
-export default withRouter(Piwik)
+export default Piwik
",2
"diff --git a/components/search/result/index.js b/components/search/result/index.js @@ -74,7 +74,7 @@ const Result = ({ result: { recordId, metadata }, i18n, t }) => (
h3 {
flex-grow: 1;
- margin-bottom: 0.8rem;
+ margin: 0 0 0.8rem;
}
}
",2
"diff --git a/components/centered-map/index.js b/components/centered-map/index.js @@ -85,7 +85,6 @@ class CenteredMap extends React.Component {
<ErrorWrapper message={t('errors.map')}>
<Map
style={mapStyle} /* eslint-disable-line react/style-prop-object */
- flyToOptions={{speed: 0.8}}
containerStyle={{
height: '100%',
width: '100%'
",2
"diff --git a/components/dataset/downloads/preview-table.js b/components/dataset/downloads/preview-table.js import React from 'react'
import PropTypes from 'prop-types'
-import Head from 'next/head'
import Table from 'react-table'
import {translate} from 'react-i18next'
@@ -40,11 +39,9 @@ const PreviewTable = ({data, t}) => {
ofText={t('preview.paging.of')}
/>
- <Head>
{/* eslint-disable react/no-danger */}
<style dangerouslySetInnerHTML={{__html: tableStyle}} />
{/* eslint-enable react/no-danger */}
- </Head>
<style jsx>{`
div {
display: flex;
",2
"diff --git a/pages/embed/preview.js b/pages/embed/preview.js @@ -52,10 +52,7 @@ class PreviewPage extends React.Component {
data: null,
error: null,
loading: {
- state: 'initializing',
- download: {
- bytes: 0
- }
+ state: 'initializing'
}
}
",2
"diff --git a/components/dataset/producer.js b/components/dataset/producer.js import React from 'react'
import PropTypes from 'prop-types'
-import withFetch from '../hoc/with-fetch'
-
-const Producer = ({name, logo_thumbnail: logo}) => (
+const Producer = ({producer}) => {
+ return (
<div>
<div className='wrapper'>
- <img src={logo} alt='' />
+ <img src={producer.logo_thumbnail} alt='' />
</div>
- <h4>{name}</h4>
+ <h4>{producer.name}</h4>
<style jsx>{`
.wrapper {
@@ -33,10 +32,13 @@ const Producer = ({name, logo_thumbnail: logo}) => (
`}</style>
</div>
)
+}
Producer.propTypes = {
+ producer: PropTypes.shape({
name: PropTypes.string.isRequired,
logo_thumbnail: PropTypes.string.isRequired
+ }).isRequired
}
-export default withFetch(data => data.organization)(Producer)
+export default Producer
",2
"diff --git a/pages/dataset.js b/pages/dataset.js @@ -40,6 +40,7 @@ class DatasetPage extends React.Component {
metadata: PropTypes.shape({
id: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
+ type: PropTypes.string.isRequired,
thumbnails: PropTypes.arrayOf(PropTypes.shape({
originalUrlHash: PropTypes.string.isRequired
})),
@@ -139,6 +140,7 @@ class DatasetPage extends React.Component {
</Box>
)}
+ {metadata.type !== 'service' && (
<Box title={t('blocks.datagouv')}>
<Datagouv
license={metadata.license}
@@ -147,6 +149,7 @@ class DatasetPage extends React.Component {
publication={datagouvPublication}
/>
</Box>
+ )}
{contacts.length > 0 && (
<Box title={t('blocks.contacts')}>
",2
"diff --git a/pages/dataset.js b/pages/dataset.js @@ -46,7 +46,6 @@ class DatasetPage extends React.Component {
})),
spatialExtent: PropTypes.object,
contacts: PropTypes.array.isRequired,
- links: PropTypes.array.isRequired,
credits: PropTypes.string
}).isRequired,
",2
"diff --git a/components/search-input.js b/components/search-input.js @@ -55,9 +55,11 @@ class SearchInput extends React.PureComponent {
const {router, i18n, defaultQuery} = this.props
const {value} = this.state
+ const currentQuery = router.pathname === '/search' ? router.query : {}
+
const query = {
...defaultQuery,
- ...router.query,
+ ...currentQuery,
q: value
}
",2
"diff --git a/pages/search.js b/pages/search.js @@ -40,7 +40,11 @@ class SearchPage extends React.Component {
}),
router: PropTypes.shape({
- query: PropTypes.object.isRequired
+ query: PropTypes.object.isRequired,
+ events: PropTypes.shape({
+ on: PropTypes.func.isRequired,
+ off: PropTypes.func.isRequired
+ }).isRequired
}).isRequired,
t: PropTypes.func.isRequired,
@@ -72,7 +76,17 @@ class SearchPage extends React.Component {
showFacets: false
}
- UNSAFE_componentWillReceiveProps() {
+ componentDidMount() {
+ const {router} = this.props
+ router.events.on('routeChangeStart', this.onRouteChangeStart)
+ }
+
+ componentWillUnmount() {
+ const {router} = this.props
+ router.events.off('routeChangeStart', this.onRouteChangeStart)
+ }
+
+ onRouteChangeStart = () => {
this.setState({
showFacets: false
})
",2
"diff --git a/components/search-input.js b/components/search-input.js @@ -39,16 +39,6 @@ class SearchInput extends React.PureComponent {
}
}
- UNSAFE_componentWillReceiveProps({router}) {
- const {value} = this.state
-
- if (router.query.q && router.query.q !== value) {
- this.setState({
- value: router.query.q
- })
- }
- }
-
onSubmit = event => {
event.preventDefault()
@@ -76,8 +66,6 @@ class SearchInput extends React.PureComponent {
}
onChange = event => {
- event.preventDefault()
-
this.setState({
value: event.target.value
})
",2
"diff --git a/pages/search.js b/pages/search.js @@ -63,7 +63,6 @@ class SearchPage extends React.Component {
return {
result: await _get(`${GEODATA_API_URL}/records?${stringify({
- __elastic: 1,
q: query.q,
limit: 20,
offset: (page - 1) * 20,
",2
"diff --git a/MaterialSkin/HTML/material/js/queue-page.js b/MaterialSkin/HTML/material/js/queue-page.js @@ -64,10 +64,8 @@ var lmsQueue = Vue.component(""LmsQueue"", {
<div>
<v-dialog v-model=""dialog.show"" persistent max-width=""500px"">
<v-card>
- <v-card-title v-if=""dialog.title"">
- <span class=""headline"">{{dialog.title}}</span>
- </v-card-title>
<v-card-text>
+ <span v-if=""dialog.title"">{{dialog.title}}</span>
<v-container grid-list-md>
<v-layout wrap>
<v-flex xs12>
@@ -155,7 +153,7 @@ var lmsQueue = Vue.component(""LmsQueue"", {
if (PQ_SAVE_ACTION.id===id) {
this.dialog={show: true, title: ""Save play queue"", hint: ""Name"", ok: ""Save"", value: undefined };
} else if (PQ_CLEAR_ACTION.id===id) {
- this.$confirm(""Remove all tracks from queue'?"",
+ this.$confirm(""Remove all tracks from queue?"",
{buttonTrueText: 'Clear', buttonFalseText: 'Cancel'}).then(res => {
if (res) {
bus.$emit('playerCommand', [""playlist"", ""clear""]);
",2
"diff --git a/MaterialSkin/HTML/material/js/main.js b/MaterialSkin/HTML/material/js/main.js @@ -242,11 +242,6 @@ var app = new Vue({
}
}
},
- filters: {
- i18n: function (value) {
- return i18n(value);
- }
- },
store,
router,
lmsServer
",2
"diff --git a/MaterialSkin/HTML/material/js/queue-page.js b/MaterialSkin/HTML/material/js/queue-page.js @@ -200,7 +200,7 @@ var lmsQueue = Vue.component(""LmsQueue"", {
document.documentElement.scrollTop=0;
// In case we missed the initial status update, ask for one now - so that we get queue quicker
bus.$emit('refreshStatus');
- });s
+ });
},
methods: {
initItems() {
",2
"diff --git a/MaterialSkin/HTML/material/js/nowplaying-page.js b/MaterialSkin/HTML/material/js/nowplaying-page.js @@ -20,7 +20,6 @@ var lmsNowPlaying = Vue.component(""LmsNowPlaying"", {
</template>
</v-tabs>
<v-card>
- <v-divider></v-divider>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn flat @click=""info.show = false"">{{trans.close}}</v-btn>
",2
"diff --git a/MaterialSkin/HTML/material/html/js/nowplaying-page.js b/MaterialSkin/HTML/material/html/js/nowplaying-page.js @@ -86,7 +86,7 @@ var lmsNowPlaying = Vue.component(""LmsNowPlaying"", {
playlist: { shuffle:0, repeat: 0 },
},
info: { installed: false, show: false, tab:0,
- tabs: [ { title:undefined, text: ""Wibble"" }, { title:undefined, text: ""Wobble"" }, { title:undefined, text: ""abc"" } ] },
+ tabs: [ { title:undefined, text:undefined }, { title:undefined, text:undefined }, { title:undefined, text:undefined } ] },
menu: { show: false, x:0, y:0, text: undefined },
trans: { close: undefined }
};
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -21,7 +21,7 @@ function parseBrowseResp(data, parent, artistImages, idStart) {
command: [""albums""],
params: [""artist_id:""+ i.contributor_id, ""tags:jly"", ""sort:""+ARTIST_ALBUM_SORT_PLACEHOLDER],
image: artistImages ? lmsServerAddress+""/imageproxy/mai/artist/"" + i.contributor_id + ""/image_100x100_o"" : undefined,
- icon: artistImages ? undefined : ""person"",
+ //icon: artistImages ? undefined : ""person"",
menuActions: [PLAY_ACTION, INSERT_ACTION, ADD_ACTION, ADD_RANDOM_ALBUM_ACTION, DIVIDER, ADD_TO_FAV_ACTION],
type: ""group"",
favIcon: artistImages ? ""imageproxy/mai/artist/""+i.contributor_id+""/image.png"" : undefined
@@ -297,7 +297,7 @@ function parseBrowseResp(data, parent, artistImages, idStart) {
title: i.name ? i.name : i.title,
command: [i.cmd, ""items""],
image: resolveImage(i.icon, i.image),
- icon: ""search"",
+ //icon: ""search"",
params: [""want_url:1"", ""search:""+TERM_PLACEHOLDER],
type: ""xmlsearch"",
id: parent.id+i.cmd,
@@ -322,7 +322,7 @@ function parseBrowseResp(data, parent, artistImages, idStart) {
title: i.name ? i.name : i.title,
command: [i.cmd, ""items""],
image: resolveImage(i.icon, i.image),
- icon: ""search"",
+ //icon: ""search"",
params: [""want_url:1"", ""search:""+TERM_PLACEHOLDER],
type: ""xmlsearch"",
id: parent.id+i.cmd,
@@ -349,7 +349,7 @@ function parseBrowseResp(data, parent, artistImages, idStart) {
title: i.name ? i.name : i.title,
command: [i.cmd ? i.cmd : parent.command[0], ""items""],
image: resolveImage(i.icon, i.image),
- icon: ""search"",
+ //icon: ""search"",
params: [""want_url:1"", ""item_id:""+i.id, ""search:""+TERM_PLACEHOLDER],
type: ""xmlsearch"", // Hack, so that we don't think this is library search...
id: parent.url+i.cmd+i.id,
@@ -360,7 +360,7 @@ function parseBrowseResp(data, parent, artistImages, idStart) {
title: i.name ? i.name : i.title,
command: parent.command,
image: resolveImage(i.icon, i.image),
- icon: ""folder""==i.type || ""url""==i.type ? ""folder"" : ""chevron_right"",
+ //icon: ""folder""==i.type || ""url""==i.type ? ""folder"" : ""chevron_right"",
params: [""item_id:""+i.id, ""want_url:1""],
type: ""group"",
url: i.url,
@@ -384,7 +384,7 @@ function parseBrowseResp(data, parent, artistImages, idStart) {
title: i.name ? i.name : i.title,
url: i.url,
image: resolveImage(i.icon, i.image),
- icon: i.url && (i.url.startsWith(""http:"") || i.url.startsWith(""https:"")) ? ""wifi_tethering"" : ""music_note"",
+ //icon: i.url && (i.url.startsWith(""http:"") || i.url.startsWith(""https:"")) ? ""wifi_tethering"" : ""music_note"",
type: ""track"",
menuActions: ""favorites""===parent.type
? topLevelFavourites
",2
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -266,10 +266,6 @@ a {
margin-top: 2px !important;
}
-.lms-footer .router-link-exact-active .btn {
- opacity: 1 !important;
-}
-
.shuffle-albums {
border: 1px solid;
border-radius: 50%;
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -242,9 +242,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
{ header: i18n(""My Music""), id: TOP_ID_PREFIX+""mmh"" },
{
title: this.separateArtists ? i18n(""All Artists"") : i18n(""Artists""),
- // SlimBrowse method - disabled for now
- //command: [""browselibrary"", ""items""],
- //params: [""menu:1"", ""mode:artists""],
command: [""artists""],
params: [],
icon: ""group"",
@@ -253,9 +250,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
},
{
title: i18n(""Albums""),
- // SlimBrowse method - disabled for now
- //command: [""browselibrary"", ""items""],
- //params: [""menu:1"", ""mode:albums"", ""sort:""+ALBUM_SORT_PLACEHOLDER],
command: [""albums""],
params: [""tags:jlya"", ""sort:""+ALBUM_SORT_PLACEHOLDER],
icon: ""album"",
@@ -264,9 +258,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
},
{
title: i18n(""Genres""),
- // SlimBrowse method - disabled for now
- //command: [""browselibrary"", ""items""],
- //params: [""menu:1"", ""mode:genres""],
command: [""genres""],
params: [],
icon: ""label"",
@@ -275,9 +266,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
},
{
title: i18n(""Playlists""),
- // SlimBrowse method - disabled for now
- //command: [""browselibrary"", ""items""],
- //params: [""menu:1"", ""mode:playlists""],
command: [""playlists""],
params: [],
icon: ""list"",
@@ -290,9 +278,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
this.top.splice(2, 0,
{
title: i18n(""Album Artists""),
- // SlimBrowse method - disabled for now
- //command: [""browselibrary"", ""items""],
- //params: [""menu:1"", ""mode:artists"", ""role_id:ALBUMARTIST""],
command: [""artists""],
params: [""role_id:ALBUMARTIST""],
icon: ""group"",
@@ -312,9 +297,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
this.other = [
{
title: i18n(""Compilations""),
- // SlimBrowse method - TODO
- //command: [""albums""],
- //params: [???]
command: [""albums""],
params: [""compilation:1"", ""tags:jlya"", ""sort:""+ALBUM_SORT_PLACEHOLDER],
icon: ""album"",
@@ -331,9 +313,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
},
{
title: i18n(""Years""),
- // SlimBrowse method - disabled for now
- //command: [""browselibrary"", ""items""],
- //params: [""menu:1"", ""mode:years""],
command: [""years""],
params: [],
icon: ""date_range"",
@@ -342,9 +321,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
},
{
title: i18n(""New Music""),
- // SlimBrowse method - disabled for now
- //command: [""browselibrary"", ""items""],
- //params: [""menu:1"", ""mode:albums"", ""sort:new""],
command: [""albums""],
params: [""tags:jlya"", ""sort:new""],
icon: ""new_releases"",
@@ -913,9 +889,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
addExtraItems(list, addMore) {
list.push({
title: i18n(""Search""),
- // SlimBrowse method - TODO
- // command: [],
- // params: [],
command: [""search""],
params: [""tags:jlyAdt"", ""extended:1"", ""term:""+TERM_PLACEHOLDER],
icon: ""search"",
@@ -935,9 +908,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
title: i18n(""Radio""),
command: [""radios""],
params: [""menu:radio""],
- // Non-SlimBrowse
- //command: [""radios""],
- //params: [""want_url:1""],
icon: ""radio"",
type: ""group"",
id: TOP_ID_PREFIX+""ra""
@@ -946,9 +916,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
title: i18n(""Favorites""),
command: [""favaddExtraItemsorites"", ""items""],
params: [""menu:favorites"", ""menu:1""],
- // Non-SlimBrowse
- //command: [""favorites"", ""items""],
- //params: [""want_url:1""],
icon: ""favorite"",
type: ""favorites"",
app: ""favorites"",
@@ -959,9 +926,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
title: i18n(""Apps""),
command: [""myapps"", ""items""],
params: [""menu:1""],
- // Non-SlimBrowse
- //command: [""apps""],
- //params: [""want_url:1""],
icon: ""apps"",
type: ""group"",
id: TOP_APPS_ID
@@ -1085,9 +1049,6 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
for (var i = data.result._p2.length; i-- > 0; ) {
var isAlbums = ""albums""==data.result._p2[i].feed;
var item = { title: data.result._p2[i].name,
- // SlimBrowse method - disabled for now
- //command: [""browselibrary"", ""items""],
- //params: [""menu:1"", ""mode:""+data.result._p2[i].feed],
command: [data.result._p2[i].feed],
params: [],
id: TOP_ID_PREFIX+""ebm-""+data.result._p2[i].id,
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -21,16 +21,10 @@ const TERM_PLACEHOLDER = ""__TAGGEDINPUT__"";
const ALBUM_SORT_PLACEHOLDER = ""__ALBUM_SORT__"";
const ARTIST_ALBUM_SORT_PLACEHOLDER = ""__ARTIST_ALBUM_SORT__"";
const TOP_ID_PREFIX = ""top:/"";
-const TOP_ARTISTS_ID = TOP_ID_PREFIX+""ar"";
-const TOP_ALBUM_ARTISTS_ID = TOP_ID_PREFIX+""aar"";
-const TOP_ALBUMS_ID = TOP_ID_PREFIX+""al"";
const TOP_MORE_ID = TOP_ID_PREFIX+""more"";
const TOP_RANDOM_ALBUMS_ID = TOP_ID_PREFIX+""rnda"";
const TOP_RANDOM_MIX_ID = TOP_ID_PREFIX+""rndm"";
const TOP_NEW_MUSIC_ID = TOP_ID_PREFIX+""new"";
-const TOP_SEARCH_ID = TOP_ID_PREFIX+""search"";
-const TOP_FAV_ID = TOP_ID_PREFIX+""fav"";
-const TOP_PLAYLISTS_ID = TOP_ID_PREFIX+""pl"";
const TOP_APPS_ID = TOP_ID_PREFIX+""apps"";
var lmsBrowse = Vue.component(""LmsBrowse"", {
@@ -246,7 +240,7 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
params: [],
icon: ""group"",
type: ""group"",
- id: TOP_ARTISTS_ID,
+ id: TOP_ID_PREFIX+""ar"",
},
{
title: i18n(""Albums""),
@@ -254,7 +248,7 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
params: [""tags:jlya"", ""sort:""+ALBUM_SORT_PLACEHOLDER],
icon: ""album"",
type: ""group"",
- id: TOP_ALBUMS_ID
+ id: TOP_ID_PREFIX+""al
},
{
title: i18n(""Genres""),
@@ -270,7 +264,7 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
params: [],
icon: ""list"",
type: ""group"",
- id: TOP_PLAYLISTS_ID
+ id: TOP_ID_PREFIX+""pl""
}
];
this.addExtraItems(this.top, true);
@@ -282,7 +276,7 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
params: [""role_id:ALBUMARTIST""],
icon: ""group"",
type: ""group"",
- id: TOP_ALBUM_ARTISTS_ID
+ id: TOP_ID_PREFIX+""aar""
});
}
@@ -612,8 +606,7 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
this.fetchItems(this.buildCommand(item, act), item);
} else {
var command = this.buildCommand(item, act);
- if (command.command.length<1) {
- // Non slim-browse command
+ if (command.command.length<1) { // Non slim-browse command
if (INSERT_ACTION.cmd==act) {
act=""insert"";
}
@@ -863,7 +856,7 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
} else if (mode==""vaalbums"") {
mode=""albums"";
p.push(""compilation:1"");
- } else if (mode!=""artists"" && mode!=""albums"" && mode!=""years"" && mode!=""genres"") {
+ } else if (mode!=""artists"" && mode!=""albums"" && mode!=""years"" && mode!=""genres"" && mode!=""tracks"") {
canReplace = false;
return;
}
@@ -893,7 +886,7 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
params: [""tags:jlyAdt"", ""extended:1"", ""term:""+TERM_PLACEHOLDER],
icon: ""search"",
type: ""search"",
- id: TOP_SEARCH_ID
+ id: TOP_ID_PREFIX+""search""
});
if (addMore) {
list.push({
@@ -919,7 +912,7 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
icon: ""favorite"",
type: ""favorites"",
app: ""favorites"",
- id: TOP_FAV_ID,
+ id: TOP_ID_PREFIX+""fav"",
isFavFolder: true
});
list.push({
",2
"diff --git a/MaterialSkin/HTML/material/html/js/nowplaying-page.js b/MaterialSkin/HTML/material/html/js/nowplaying-page.js @@ -24,11 +24,11 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
<img :src=""cover"" class=""np-image"" @click=""infoPlugin ? info.show=!info.show : undefined"" v-bind:class=""{'cursor' : infoPlugin}""></img>
<div>
<p class=""np-text ellipsis"" v-if=""playerStatus.current.title"">{{playerStatus.current.title}}</p>
- <p class=""np-text"" v-else>&nbsp;Title</p>
+ <p class=""np-text"" v-else>&nbsp;</p>
<p class=""np-subtext ellipsis"" v-if=""playerStatus.current.artist && playerStatus.current.album"">{{playerStatus.current.artist}} - {{playerStatus.current.album}}</p>
<p class=""np-subtext ellipsis"" v-else-if=""playerStatus.current.artist"">{{playerStatus.current.artist}}</p>
<p class=""np-subtext ellipsis"" v-else-if=""playerStatus.current.album"">{{playerStatus.current.album}}</p>
- <p class=""np-subtext"" v-else>&nbsp;Artist - Album</p>
+ <p class=""np-subtext"" v-else>&nbsp;</p>
<p class=""np-subtext np-time"">{{formattedTime}}</p>
<v-slider id=""pos-slider"" class=""np-slider"" :value='playerStatus.current.time' :max='playerStatus.current.duration' @click.native=""sliderChanged($event)""></v-slider>
</div>
",2
"diff --git a/MaterialSkin/HTML/material/html/js/nowplaying-page.js b/MaterialSkin/HTML/material/html/js/nowplaying-page.js @@ -18,7 +18,7 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
<v-btn flat icon large v-else @click=""doAction(['play'])"" class=""np-playpause""><v-icon x-large>play_circle_outline</v-icon></v-btn>
</v-flex>
<v-flex xs4>
- <v-flex xs6><v-btn flat icon @click=""doAction(['playlist', 'index', '+1'])""><v-icon large>skip_next</v-icon></v-btn></v-flex>
+ <v-btn flat icon @click=""doAction(['playlist', 'index', '+1'])""><v-icon large>skip_next</v-icon></v-btn>
</v-flex>
</v-layout>
<img :src=""cover"" class=""np-image"" @click=""infoPlugin && playerStatus.current.artist ? info.show=!info.show : undefined"" v-bind:class=""{'cursor' : infoPlugin}""></img>
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -1573,6 +1573,14 @@ var lmsBrowse = Vue.component(""lms-browse"", {
},
setBgndCover() {
var url = this.current && this.current.image && !this.current.image.startsWith(""/plugins/"") ? this.current.image : undefined;
+
+ if (url) {
+ if (url.endsWith(LMS_LIST_IMAGE_SIZE+"".png"")) {
+ url = url.replace(LMS_LIST_IMAGE_SIZE+"".png"", "".png"");
+ } else if (url.endsWith(LMS_GRID_IMAGE_SIZE+"".png"")) {
+ url = url.replace(LMS_GRID_IMAGE_SIZE+"".png"", "".png"");
+ }
+ }
setBgndCover(this.scrollElement, url, this.$store.state.darkUi);
}
},
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -1699,14 +1699,6 @@ var lmsBrowse = Vue.component(""lms-browse"", {
return;
}
});
- if (undefined!=this.serverTop && this.serverTop.length>0) {
- this.serverTop.forEach(i => {
- if (i.id == TOP_REMOTE_ID) {
- i.disabled = !this.remoteLibraries;
- return;
- }
- });
- }
}
}
});
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -374,9 +374,9 @@ function parseBrowseResp(data, parent, options, idStart) {
i.menuActions.push(options.pinned.has(i.id) ? UNPIN_ACTION : PIN_ACTION);
} else if (!isFavorites) { // move/rename on favs needs ids of a.b.c (created below)
if (i.params && i.params.item_id) {
- i.id = ""item_id:x""+i.params.item_id;
+ i.id = ""item_id:""+i.params.item_id;
} else if (i.actions && i.actions.go && i.actions.go.params && i.actions.go.params.item_id) {
- i.id = ""item_id:y""+i.actions.go.params.item_id;
+ i.id = ""item_id:""+i.actions.go.params.item_id;
}
}
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -479,11 +479,6 @@ function parseBrowseResp(data, parent, options, idStart) {
}
data.result.albums_loop.forEach(i => {
- // Bug on my system? There is a 'No Album' entry with no tracks!
- if (undefined!==i.year && 0==i.year && i.artist && ""No Album""===i.album && ""Various Artists""===i.artist) {
- data.result.count--;
- return;
- }
var title = i.album;
if (i.year && i.year>0) {
title+="" ("" + i.year + "")"";
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js const MORE_COMMANDS = new Set([""item_add"", ""item_insert"", ""itemplay"", ""item_fav""]);
function parseBrowseResp(data, parent, options, idStart, cacheKey) {
- // NOTE: If add key to resp, then update addToCache in utils.js
var resp = {items: [], baseActions:[], useGrid: false, total: 0, useScroller: false, jumplist:[] };
try {
",2
"diff --git a/MaterialSkin/HTML/material/html/js/server.js b/MaterialSkin/HTML/material/html/js/server.js @@ -132,9 +132,6 @@ var lmsServer = Vue.component('lms-server', {
{data:{response:'/'+this.cometd.getClientId()+'/slim/serverstatus', request:['', ['serverstatus', 0, 100, 'subscribe:60']]}});
}
});
- this.cometd.onTransportException = (_cometd, failure, oldTransport, newTransport) => {
- console.log(""FAIL"");
- };
},
handleCometDMessage(msg) {
if (!msg.channel || !msg.data) {
",2
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -201,7 +201,7 @@ a {
width:130px !important;
}
- .image-grid-text {;
+ .image-grid-text {
width:118px;
}
@@ -231,7 +231,7 @@ a {
width:115px !important;
}
- .image-grid-text {;
+ .image-grid-text {
width:102px;
}
",2
"diff --git a/MaterialSkin/HTML/material/html/js/manage-players.js b/MaterialSkin/HTML/material/html/js/manage-players.js @@ -190,7 +190,7 @@ Vue.component('lms-manage-players', {
}
},
close() {
- this.show=false;s
+ this.show=false;
},
i18n(str) {
if (this.show) {
",2
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -86,6 +86,10 @@ a {
margin-right:8px !important;
}
+.lms-image-grid table {
+ border-spacing:0px !important;
+}
+
.lms-image-grid table td .v-card {
background-color:rgba(0,0,0,0) !important
}
@@ -111,7 +115,7 @@ a {
.image-grid-item {
padding:0px;
- margin:0px 6px 0px 2px; /* t, r, b, l */
+ margin:0px 4px 0px 4px; /* t, r, b, l */
background-color:rgba(0,0,0,0) !important;
cursor:pointer;
}
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -471,7 +471,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
}
}.bind(this));
bus.$on('searchLib', function(command, params, term) {
- this.fetchItems({command: command, params: params}, {cancache:false, id:""<>"", title:term, id:""search""==command[0] ? TOP_SEARCH_ID : ""search:""+command[0]});
+ this.fetchItems({command: command, params: params}, {cancache:false, title:term, id:""search""==command[0] ? TOP_SEARCH_ID : ""search:""+command[0]});
}.bind(this));
},
methods: {
",2
"diff --git a/MaterialSkin/Plugin.pm b/MaterialSkin/Plugin.pm @@ -111,7 +111,7 @@ sub _cliCommand {
params => [ $id, ['connect', Slim::Utils::Network::serverAddr()] ]
});
- main::INFOLOG && $log->is_info && $log->info(string('Connect player ${id} from ${serverurl} to this server'));
+ main::INFOLOG && $log->is_info && $log->info('Connect player ${id} from ${serverurl} to this server');
$http->post( $serverurl . 'jsonrpc.js', $postdata);
$request->setStatusDone();
return;
@@ -167,7 +167,7 @@ sub _cliCommand {
}
sub _connect_done {
- main::INFOLOG && $log->is_info && $log->info(string('Connect response recieved player'));
+ main::INFOLOG && $log->is_info && $log->info('Connect response recieved player');
# curl 'http://localhost:9000/jsonrpc.js' --data-binary '{""id"":1,""method"":""slim.request"",""params"":[""aa:aa:b5:38:e2:d7"",[""disconnect"",""192.168.1.16""]]}'
my $http = shift;
my $server = $http->params('server');
@@ -182,7 +182,7 @@ sub _connect_done {
my $id = $params[0];
my $buddy = Slim::Player::Client::getClient($id);
if ($buddy) {
- main::INFOLOG && $log->is_info && $log->info(string('Disconnect player ${id} from ${server}'));
+ main::INFOLOG && $log->is_info && $log->info('Disconnect player ' . $id . ' from ' . $server);
$buddy->execute([""disconnect"", $server]);
}
}
",2
"diff --git a/mkrel.py b/mkrel.py @@ -145,7 +145,7 @@ def minifyCss():
cssStr+=line.replace(""\n"", """").replace("" {"", ""{"")
while ("" "" in cssStr):
cssStr=cssStr.replace("" "", "" "")
- cssStr=cssStr.replace(""} "", ""}"").replace(""{ "", ""{"").replace(""; "", "";"");
+ cssStr=cssStr.replace(""} "", ""}"").replace(""{ "", ""{"").replace(""; "", "";"").replace("": "", "":"").replace("" :"", "":"").replace("" !"", ""!"");
while True:
start = cssStr.find(""/*"")
if start<0:
",2
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -1005,6 +1005,10 @@ div.v-subheader {
font-size:17px !important;
}
+.v-card__text {
+ padding:0!important;
+}
+
.dialog-section-header {
font-size:17px !important;
font-weight:600 !important;
",2
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -70,7 +70,7 @@ Vue.component('lms-toolbar', {
<v-toolbar-title slot=""activator"">
<div class=""maintoolbar-title ellipsis"" v-bind:class=""{'dimmed': !playerStatus.ison}"">
<v-icon v-if=""playerStatus.sleepTime"" class=""player-icon-pad"">hotel</v-icon>
- <v-icon v-if=""playerStatus.synced"" class=""player-icon-pad"">link</v-icon>{{player.name}} <v-icon>arrow_drop_down</v-icon></div>
+ <v-icon v-if=""playerStatus.synced"" class=""player-icon-pad"">link</v-icon>{{player.name}}</div>
<div v-if=""!desktop"" class=""maintoolbar-subtitle subtext ellipsis"" v-bind:class=""{'dimmed' : !playerStatus.ison}"">{{undefined===songInfo ? trans.nothingplaying : (!desktop && isNowPlayingPage && (!infoPlugin || !infoOpen)) ? playlist.count+playlist.duration : songInfo}}</div>
</v-toolbar-title>
",2
"diff --git a/MaterialSkin/HTML/material/html/js/information.js b/MaterialSkin/HTML/material/html/js/information.js @@ -115,7 +115,6 @@ Vue.component('lms-information-dialog', {
var inf = JSON.parse(data.result.info);
if (inf && inf.server) {
this.server=inf.server;
- this.server.push({ label: i18n('Material Skin'), text:""""+LMS_MATERIAL_REVISION});
}
}
});
",2
"diff --git a/MaterialSkin/HTML/material/html/js/iframe-dialog.js b/MaterialSkin/HTML/material/html/js/iframe-dialog.js * MIT license.
*/
-function hideClassicSkinElems() {
+function hideClassicSkinElems(isPlayer) {
+ if (!isPlayer) {
+ return;
+ }
var iframe = document.getElementById(""classicSkinIframe"");
if (iframe) {
var cssLink = iframe.contentDocument.createElement(""link"");
@@ -28,8 +31,7 @@ Vue.component('lms-iframe-dialog', {
</v-toolbar>
</v-card-title>
<v-card-text class=""embedded-page"">
- <iframe v-if=""isPlayer"" id=""classicSkinIframe"" v-on:load=""hideClassicSkinElems()"" :src=""src"" frameborder=""0""></iframe>
- <iframe v-else :src=""src"" frameborder=""0""></iframe>
+ <iframe id=""classicSkinIframe"" v-on:load=""hideClassicSkinElems(isPlayer)"" :src=""src"" frameborder=""0""></iframe>
</v-card-text>
</v-card>
</v-dialog>
",2
"diff --git a/MaterialSkin/HTML/material/standardheader.html b/MaterialSkin/HTML/material/standardheader.html -<title>[% IF pagetitle %][% pagetitle | html -%][% ELSE %][% ""SQUEEZEBOX_SERVER"" | string %][% END -%]asdf[% skinVersion %]</title>
+<title>[% IF pagetitle %][% pagetitle | html -%][% ELSE %][% ""SQUEEZEBOX_SERVER"" | string %][% END -%]</title>
<link rel=""shortcut icon"" href=""[% webroot %]favicon.ico"" type=""image/x-icon""/>
<link rel=""icon"" href=""[% webroot %]favicon.ico"" type=""image/x-icon""/>
<meta http-equiv=""Content-Type"" content=""text/html; charset=[% LOCALE %]""/>
",2
"diff --git a/MaterialSkin/HTML/material/html/js/nowplaying-page.js b/MaterialSkin/HTML/material/html/js/nowplaying-page.js @@ -817,7 +817,7 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
lmsCommand("""", command).then(({data}) => {
if (data && data.result && (data.result.biography || data.result.error)) {
this.info.tabs[BIO_TAB].text=data.result.biography ? replaceNewLines(data.result.biography) : data.result.error;
- this.info.tabs[BIO_TAB].isMsg=undefined==data.result.biography || data.result.biography.length<110;
+ this.info.tabs[BIO_TAB].isMsg=undefined==data.result.biography;
}
}).catch(error => {
this.info.tabs[BIO_TAB].text=i18n(""Failed to retreive information."");
@@ -865,7 +865,7 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
lmsCommand("""", command).then(({data}) => {
if (data && data.result && (data.result.albumreview || data.result.error)) {
this.info.tabs[REVIEW_TAB].text=data.result.albumreview ? replaceNewLines(data.result.albumreview) : data.result.error;
- this.info.tabs[REVIEW_TAB].isMsg=undefined==data.result.albumreview || data.result.albumreview.length<110;
+ this.info.tabs[REVIEW_TAB].isMsg=undefined==data.result.albumreview;
}
}).catch(error => {
this.info.tabs[REVIEW_TAB].text=i18n(""Failed to retreive information."");
",2
"diff --git a/MaterialSkin/HTML/material/index.html b/MaterialSkin/HTML/material/index.html <link href=""html/images/icon-ios.png?r=[% material_revision %]"" rel=""apple-touch-icon"" sizes=""128x128"">
</head>
<body>
- <script src=""html/lib/vue.min.js?r=2.5.17""></script>
- <script src=""html/js/utils.js?r=[% material_revision %]""></script>
<script>
- var layout = getLocalStorageVal(""layout"", ""auto"");
+ var layout = window.localStorage.getItem(""lms-material::layout"");
if (layout != ""desktop"" && layout != ""mobile"") {
- layout = IS_MOBILE ? ""mobile"" : ""desktop"";
+ layout = window.innerWidth<600 || /Android|webOS|iPhone|iPad|BlackBerry|Windows Phone|Opera Mini|IEMobile|Mobile/i.test(navigator.userAgent) ? ""mobile"" : ""desktop"";
}
var query = window.location.href.indexOf('?');
var queryString = query > 0 ? window.location.href.substring(window.location.href.indexOf('?')) : """";
",2
"diff --git a/MaterialSkin/HTML/material/html/js/utils.js b/MaterialSkin/HTML/material/html/js/utils.js @@ -426,8 +426,7 @@ function parseQueryParams() {
}
function isLandscape() {
-console.log(window.innerWidth, window.innerHeight, window.innerHeight*1.4, window.innerWidth > (window.innerHeight*1.4));
- return window.innerWidth > (window.innerHeight*1.4);
+ return window.innerWidth >= (window.innerHeight*1.5);
}
function incrementVolume() {
",2
"diff --git a/MaterialSkin/HTML/material/html/js/nowplaying-page.js b/MaterialSkin/HTML/material/html/js/nowplaying-page.js @@ -959,8 +959,12 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
setLocalStorageVal(""showTotal"", this.showTotal);
},
setBgndCover(force) {
- if (this.page && (!this.$store.state.desktopLayout || this.largeView || force)) {
- setBgndCover(this.page, (!this.$store.state.desktopLayout || this.largeView) && this.$store.state.nowPlayingBackdrop && this.coverUrl!=LMS_BLANK_COVER ? this.coverUrl : undefined);
+ if (this.page && (!this.$store.state.desktopLayout || this.largeView)) {
+ setBgndCover(this.page, this.$store.state.nowPlayingBackdrop && this.coverUrl!=LMS_BLANK_COVER ? this.coverUrl : undefined);
+ } else if (this.page && force && this.$store.state.desktopLayout && !this.largeView) {
+ // Switched from mobile to desktop, and bottom bar should not have cover
+ this.page.style.backgroundImage = 'none';
+ this.page.style.boxShadow = 'none';
}
},
playPauseButton(showSleepMenu) {
",2
"diff --git a/MaterialSkin/HTML/material/html/js/screensaver.js b/MaterialSkin/HTML/material/html/js/screensaver.js @@ -73,7 +73,7 @@ Vue.component('lms-screensaver', {
},
updateDateAndTime() {
var date = new Date();
- this.date = date.toLocaleDateString(undefined, { weekday: 'short', month: 'short', day: 'numeric', year: undefined });
+ this.date = date.toLocaleDateString(undefined, { weekday: 'short', month: 'short', day: 'numeric', year: undefined }).replace("", "", "" "");
this.time = date.toLocaleTimeString(undefined, { hour: 'numeric', minute: 'numeric' });
if (undefined!==this.updateTimer) {
",2
"diff --git a/MaterialSkin/HTML/material/index.html b/MaterialSkin/HTML/material/index.html print("" <script src=\""html/js/screensaver.js?r=$version\""></script>\n"");
print("" <script src=\""html/js/i18n.js?r=$version\""></script>\n"");
print("" <script src=\""html/js/store.js?r=$version\""></script>\n"");
- print("" <script src=\""html/js/main.js?r=$version\""></script>\n"");
+ print("" <script src=\""html/js/main.js?r=$version\""></script>"");
[% END %]
<!--JS end-->
- </script>
</body>
</html>
",2
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -349,23 +349,22 @@ div.v-subheader {
.image-grid-select-btn, .image-grid-select-btn:hover {
position:absolute;
top:2px !important;
- left:6px !important;
+ left:4px !important;
}
.image-grid-item .emblem {
position:absolute;
top:2px !important;
- right:8px !important;
- width:28px !important;
- height:28px !important;
+ right:4px !important;
+ width:32px !important;
+ height:32px !important;
border-radius:50% !important;
- padding:2px;
- box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
+ padding:3px;
}
.image-grid-item .emblem img {
- width:24px !important;
- height:24px !important;
+ width:26px !important;
+ height:26px !important;
}
.lms-list-sub .emblem, .lms-list-jump .emblem {
",2
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -650,7 +650,7 @@ Vue.component('lms-toolbar', {
return this.$store.state.visibleMenus.size>0
},
updatesAvailable() {
- return true || this.$store.state.updatesAvailable.size>0
+ return this.$store.state.updatesAvailable.size>0
},
keyboardControl() {
return this.$store.state.keyboardControl && !IS_MOBILE
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -12,6 +12,16 @@ function itemText(i) {
return i.title ? i.title : i.name ? i.name : i.caption ? i.caption : i.credits ? i.credits : undefined;
}
+function removeDiactrics(key) {
+ if (undefined!=key && key.length==1) {
+ var code = key.charCodeAt(0);
+ if (code>127) { // Non-ASCII...
+ return key.normalize(""NFD"").replace(/[\u0300-\u036f]/g, """");
+ }
+ }
+ return key;
+}
+
function parseBrowseResp(data, parent, options, cacheKey) {
// NOTE: If add key to resp, then update addToCache in utils.js
var resp = {items: [], baseActions:[], canUseGrid: false, jumplist:[] };
@@ -19,7 +29,6 @@ function parseBrowseResp(data, parent, options, cacheKey) {
try {
if (data && data.result) {
logJsonMessage(""RESP"", data);
- var textKeys = new Set();
if (data.result.item_loop) { // SlimBrowse response
var playAction = false;
var addAction = false;
@@ -359,10 +368,9 @@ function parseBrowseResp(data, parent, options, cacheKey) {
i.section = parent ? parent.section : undefined;
- var key = i.textkey;
- if (undefined!=key && (resp.jumplist.length==0 || (resp.jumplist[resp.jumplist.length-1].key!=key && !textKeys.has(key)))) {
+ var key = removeDiactrics(i.textkey);
+ if (undefined!=key && (resp.jumplist.length==0 || resp.jumplist[resp.jumplist.length-1].key!=key)) {
resp.jumplist.push({key: key, index: resp.items.length});
- textKeys.add(key);
}
if (isFavorites) {
i.draggable = true;
@@ -458,10 +466,9 @@ function parseBrowseResp(data, parent, options, cacheKey) {
resp.canUseGrid = lmsOptions.infoPlugin && lmsOptions.artistImages;
for (var idx=0, loop=data.result.artists_loop, loopLen=loop.length; idx<loopLen; ++idx) {
var i = loop[idx];
- var key = i.textkey;
- if (undefined!=key && (resp.jumplist.length==0 || (resp.jumplist[resp.jumplist.length-1].key!=key && !textKeys.has(key)))) {
+ var key = removeDiactrics(i.textkey);
+ if (undefined!=key && (resp.jumplist.length==0 || resp.jumplist[resp.jumplist.length-1].key!=key)) {
resp.jumplist.push({key: key, index: resp.items.length});
- textKeys.add(key);
}
var artist = {
id: ""artist_id:""+i.id,
@@ -515,10 +522,9 @@ function parseBrowseResp(data, parent, options, cacheKey) {
if (i.year && i.year>0) {
title+="" ("" + i.year + "")"";
}
- var key = jumpListYear ? (""""+i.year) : i.textkey;
- if (undefined!=key && (resp.jumplist.length==0 || (resp.jumplist[resp.jumplist.length-1].key!=key && !textKeys.has(key)))) {
+ var key = jumpListYear ? (""""+i.year) : removeDiactrics(i.textkey);
+ if (undefined!=key && (resp.jumplist.length==0 || resp.jumplist[resp.jumplist.length-1].key!=key)) {
resp.jumplist.push({key: key, index: resp.items.length});
- textKeys.add(key);
}
var album = {
@@ -627,10 +633,9 @@ function parseBrowseResp(data, parent, options, cacheKey) {
} else if (data.result.genres_loop) {
for (var idx=0, loop=data.result.genres_loop, loopLen=loop.length; idx<loopLen; ++idx) {
var i = loop[idx];
- var key = i.textkey;
- if (undefined!=key && (resp.jumplist.length==0 || (resp.jumplist[resp.jumplist.length-1].key!=key && !textKeys.has(key)))) {
+ var key = removeDiactrics(i.textkey);
+ if (undefined!=key && (resp.jumplist.length==0 || resp.jumplist[resp.jumplist.length-1].key!=key)) {
resp.jumplist.push({key: key, index: resp.items.length});
- textKeys.add(key);
}
resp.items.push({
id: ""genre_id:""+i.id,
@@ -645,11 +650,10 @@ function parseBrowseResp(data, parent, options, cacheKey) {
} else if (data.result.playlists_loop) {
for (var idx=0, loop=data.result.playlists_loop, loopLen=loop.length; idx<loopLen; ++idx) {
var i = loop[idx];
- var key = i.textkey;
+ var key = removeDiactrics(i.textkey);
var isRemote = 1 == parseInt(i.remote);
- if (undefined!=key && (resp.jumplist.length==0 || (resp.jumplist[resp.jumplist.length-1].key!=key && !textKeys.has(key)))) {
+ if (undefined!=key && (resp.jumplist.length==0 || resp.jumplist[resp.jumplist.length-1].key!=key)) {
resp.jumplist.push({key: key, index: resp.items.length});
- textKeys.add(key);
}
resp.items.push({
id: ""playlist_id:""+i.id,
@@ -714,9 +718,8 @@ function parseBrowseResp(data, parent, options, cacheKey) {
for (var idx=0, loop=data.result.years_loop, loopLen=loop.length; idx<loopLen; ++idx) {
var i = loop[idx];
var key = i.textkey;
- if (undefined!=key && (resp.jumplist.length==0 || (resp.jumplist[resp.jumplist.length-1].key!=key && !textKeys.has(key)))) {
+ if (undefined!=key && (resp.jumplist.length==0 || resp.jumplist[resp.jumplist.length-1].key!=key)) {
resp.jumplist.push({key: key, index: resp.items.length});
- textKeys.add(key);
}
resp.items.push({
id: ""year:""+i.year,
",2
"diff --git a/MaterialSkin/HTML/material/html/js/manage-players.js b/MaterialSkin/HTML/material/html/js/manage-players.js @@ -128,7 +128,7 @@ Vue.component('lms-manage-players', {
<div v-for=""(player, index) in otherPlayers"" :key=""player.id"" style=""width:100%"">
<v-flex xs12 v-if=""0==index || player.server!=otherPlayers[index-1].server"" v-bind:class=""{'pmgr-grp-title':players.length>0,'pmgr-title':0==players.length}"" class=""ellipsis"">{{player.server}}</v-flex>
- <v-flex xs12>
+ <v-flex xs12 style=""padding:0px;"">
<v-list style=""padding:0px;"">
<v-list-tile @click=""movePlayer(player)"">
<v-list-tile-content>
",2
"diff --git a/MaterialSkin/HTML/material/html/js/server.js b/MaterialSkin/HTML/material/html/js/server.js @@ -398,7 +398,6 @@ var lmsServer = Vue.component('lms-server', {
for (var idx=0, len=data.players_loop.length; idx<len; ++idx) {
var i = data.players_loop[idx];
if (1==parseInt(i.connected)) { // Only list/use connected players...
- var icon = playerIcon(i);
players.push({ id: i.playerid,
name: i.name,
canpoweroff: 1==parseInt(i.canpoweroff),
",2
"diff --git a/MaterialSkin/HTML/material/html/js/icon-mapping.js b/MaterialSkin/HTML/material/html/js/icon-mapping.js @@ -16,6 +16,7 @@ function getMiscJson(item, name, obj) {
try {
let data = JSON.parse(cfg);
if (undefined!=data) {
+ for (var x in item) if (item.hasOwnProperty(x)) delete item[x];
for (let [key, value] of Object.entries(data)) {
item[key]=value;
}
@@ -26,6 +27,7 @@ function getMiscJson(item, name, obj) {
if (item['material-version']!=LMS_MATERIAL_REVISION) {
axios.get(""html/misc/""+name+"".json?r="" + LMS_MATERIAL_REVISION).then(function (resp) {
let data = eval(resp.data);
+ for (var x in item) if (item.hasOwnProperty(x)) delete item[x];
data['material-version']=LMS_MATERIAL_REVISION;
for (let [key, value] of Object.entries(data)) {
item[key]=value;
",2
"diff --git a/MaterialSkin/HTML/material/html/js/nowplaying-page.js b/MaterialSkin/HTML/material/html/js/nowplaying-page.js @@ -220,7 +220,7 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
<div>
<b class=""np-title"">{{playerStatus.current.title ? playerStatus.current.title : """"}}</b><br/>
<obj class=""subtext"">{{playerStatus.current.artistAndComposer ? playerStatus.current.artistAndComposer : """"}}</obj><br/>
- <obj class=""subtext"">{{playerStatus.current.album ? playerStatus.current.album : playerStatus.current.remote_title && playerStatus.current.remote_title!=playerStatus.current.title ? playerStatus.current.remote_title : """"}}</obj><br/><br/>
+ <obj class=""subtext"">{{playerStatus.current.album ? playerStatus.current.album : playerStatus.current.remote_title && playerStatus.current.remote_title!=playerStatus.current.title ? playerStatus.current.remote_title : """"}}</obj><br/>
</div>
</div>
</div>
",2
"diff --git a/MaterialSkin/HTML/material/html/js/nowplaying-page.js b/MaterialSkin/HTML/material/html/js/nowplaying-page.js @@ -315,8 +315,7 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
disablePrev:true,
disableNext:true,
dstm:false,
- infoZoom:10,
- threeLines:false
+ infoZoom:10
};
},
mounted() {
@@ -393,8 +392,6 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
var playStateChanged = false;
var trackChanged = false;
- this.threeLines = playerStatus.current.remote_title && (""""+playerStatus.current.id)[0]=='-';
-
// Have other items changed
if (playerStatus.isplaying!=this.playerStatus.isplaying) {
this.playerStatus.isplaying = playerStatus.isplaying;
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -2363,6 +2363,8 @@ var lmsBrowse = Vue.component(""lms-browse"", {
this.top[i].params.push(""menu:1"");
} else if (this.top[i].id==TOP_RADIO_ID) {
this.top[i].icon=undefined; this.top[i].svg=""radio-tower"";
+ } else if (this.top[i].id==TOP_MYMUSIC_ID) {
+ this.top[i].menu=undefined;
}
}
for (var i=0, len=this.top.length; i<len; ++i) {
",2
"diff --git a/MaterialSkin/HTML/material/html/misc/icon-map.json b/MaterialSkin/HTML/material/html/misc/icon-map.json ""PLUGIN_SYNCHRONIZER_NAME"":{""icon"":""sync""},
""MUSICSOURCE"":{""svg"":""music""},
""/BBCSounds.png"":{""svg"":""bbc-sounds""},
- ""/TimesRadio.png"":{""svg"":""times-radio""},
- ""/BBCSoundsAllEpisodes.png"":{""icon"":""dynamic_feed""},
- ""/BBCSoundsBookmark.png"":{""icon"":""add""},
- ""/BBCSoundsBrowse.png"":{""icon"":""library_books""},
- ""/BBCSoundsContinue.png"":{""icon"":""subscriptions""},
- ""/BBCSoundsLatest.png"":{""icon"":""update""},
- ""/BBCSoundsMusic.png"":{""svg"":""music""},
- ""/BBCSoundsMySounds.png"":{""icon"":""recent_actors""},
- ""/BBCSoundsPlay.png"":{""icon"":""play_arrow""},
- ""/BBCSoundsSearch.png"":{""icon"":""search""},
- ""/BBCSoundsSpeech.png"":{""icon"":""format_quote""},
- ""/BBCSoundsStations.png"":{""svg"":""radio-tower""},
- ""/BBCSoundsSubscribe.png"":{""icon"":""rss_feed""},
- ""/BBCSoundsSynopsis.png"":{""icon"":""view_headline""},
- ""/BBCSoundsTracks.png"":{""icon"":""album""}
+ ""/TimesRadio.png"":{""svg"":""times-radio""}
},
""indexOf"":{
""www.jazzfm.com"":{""svg"":""saxophone""},
",2
"diff --git a/MaterialSkin/HTML/material/html/js/browse-functions.js b/MaterialSkin/HTML/material/html/js/browse-functions.js @@ -175,7 +175,7 @@ function browseHandleListResponse(view, item, command, resp, prevPage) {
view.currentActions.items.push({title:/*!i81n*/'wimp'==loop[i] ? 'Tidal' : capitalize(loop[i]),
weight:10, svg:emblem ? emblem.name : undefined, id:loop[i], isService:true});
}
- } else { // if (undefined!=view.$store.state.ratingsPlugin && view.items.length>1) {
+ } else if (undefined!=view.$store.state.ratingsPlugin && view.items.length>1) {
view.currentActions.items.push({albumRating:true, title:i18n(""Set rating for all tracks""), icon:""stars"", weight:99});
}
view.currentActions.items.sort(function(a, b) { return a.weight!=b.weight ? a.weight<b.weight ? -1 : 1 : titleSort(a, b) });
",2
"diff --git a/MaterialSkin/HTML/material/html/js/nowplaying-functions.js b/MaterialSkin/HTML/material/html/js/nowplaying-functions.js @@ -464,7 +464,7 @@ function nowplayingFetchArtistInfo(view) {
lmsCommand("""", [""musicartistinfo"", ""biography"", ""artist_id:""+ids[i].trim(), ""html:1""], view.info.tabs[ARTIST_TAB].reqId).then(({data}) => {
logJsonMessage(""RESP"", data);
if (data && view.isCurrent(data, ARTIST_TAB)) {
- if (data.result && data.result.biograph)) {
+ if (data.result && data.result.biograph) {
if (data.result.artist) {
view.info.tabs[ARTIST_TAB].found = true;
if (view.info.tabs[ARTIST_TAB].first) {
",2
"diff --git a/MaterialSkin/HTML/material/html/js/track-sources.js b/MaterialSkin/HTML/material/html/js/track-sources.js @@ -13,7 +13,6 @@ function initTrackSources() {
function getTrackSource(track) {
if (undefined!=track.url) {
- console.log(track.url);
if (track.url.startsWith(""file:"") && !track.url.startsWith(""tmp:"")) {
return i18n(""Local"");
}
",2
"diff --git a/MaterialSkin/HTML/material/html/js/customactions.js b/MaterialSkin/HTML/material/html/js/customactions.js @@ -56,6 +56,8 @@ function performCustomAction(obj, action, player, item) {
}
}
+const ACTION_KEYS = ['ID', 'NAME', 'ARTISTID', 'ARTISTNAME', 'ALBUMID', 'ALBUMNAME', 'TRACKID', 'TRACKNAME', 'TRACKNUM', 'DISC', 'GENREID', 'GENRENAME', 'YEAR', 'COMPOSER'];
+
function doReplacements(string, player, item) {
let val = ''+string;
if (undefined!=player) {
@@ -100,6 +102,9 @@ function doReplacements(string, player, item) {
if (undefined!=item.album_id) {
val=val.replace(""$ALBUMNAME"", item.album);
}
+ if (undefined!=item.composer) {
+ val=val.replace(""$COMPOSER"", item.composer);
+ }
if (undefined!=item.title) {
if (undefined!=item.id) {
let id = ''+item.id;
@@ -116,9 +121,9 @@ function doReplacements(string, player, item) {
val=val.replace(""$TRACKNAME"", item.title);
}
}
- if (undefined!=item.composer) {
- val=val.replace(""$COMPOSER"", item.composer);
}
+ for (var i=0, len=ACTION_KEYS.length; i<len; ++i) {
+ val = val.replace(""+$""+ACTION_KEYS[i], """").replace(""$""+ACTION_KEYS[i]+""+"", """").replace(""$""+ACTION_KEYS[i], """");
}
return val;
}
",2
"diff --git a/MaterialSkin/HTML/material/html/js/iframe-dialog.js b/MaterialSkin/HTML/material/html/js/iframe-dialog.js @@ -231,20 +231,6 @@ function hideClassicSkinElems(page, textCol) {
}
var iframe = document.getElementById(""embeddedIframe"");
if (iframe) {
- iframe.contentWindow.alert = function(msg) {
- var statusarea = iframeInfo.content.getElementById('statusarea');
- console.log('STATUS', statusarea);
- if (undefined!=statusarea && undefined!=statusarea.innerText) {
- console.log('MSG', msg);
- console.log('SA', statusarea.innerText);
- if (msg==statusarea.innerText) {
- return;
- }
- }
- console.log('show');
- bus.$emit('showMessage', msg);
- }
-
iframe.contentDocument.bus = bus;
var content = iframe.contentDocument;
iframeInfo.content = content;
",2
"diff --git a/MaterialSkin/HTML/material/html/js/server.js b/MaterialSkin/HTML/material/html/js/server.js @@ -277,9 +277,6 @@ var lmsServer = Vue.component('lms-server', {
this.cometd.subscribe('/slim/subscribe',
function(res) { },
{data:{response:'/'+this.cometd.getClientId()+'/slim/serverprefs', request:[['prefset']]}});
- this.cometd.subscribe('/slim/subscribe',
- function(res) { },
- {data:{response:'/'+this.cometd.getClientId()+'/slim/material-skin', request:['material-skin', ['notification']]}});
this.updateFavorites();
}
});
@@ -300,8 +297,6 @@ var lmsServer = Vue.component('lms-server', {
this.handlePlayerPrefs(msg.channel.split('/').pop(), msg.data);
} else if (msg.channel.endsWith('/slim/serverprefs')) {
this.handleServerPrefs(msg.data);
- } else if (msg.channel.endsWith('/slim/material-skin')) {
- console.log(""MSK"", JSON.stringify(msg));
} else {
logCometdDebug(""ERROR: Unexpected channel:""+msg.channel);
}
",2
"diff --git a/MaterialSkin/HTML/material/html/js/iframe-dialog.js b/MaterialSkin/HTML/material/html/js/iframe-dialog.js @@ -200,8 +200,7 @@ function hideSections(doc) {
let hidden = false;
for (let s=0, len=sections.length; s<len; ++s) {
- let elem = doc.getElementById(sections[s]);
- console.log(sections[s]);
+ let elem = doc.getElementById(sections[s].trim());
if (undefined!=elem && hideSection(elem)) {
hidden = true;
}
",2
"diff --git a/ChangeLog b/ChangeLog +3.0.3
+-----
+1. Remove some shortcurt information when in party mode.
+
3.0.2
-----
1. Fix toggling of power when power button replaces player icon.
",2
"diff --git a/MaterialSkin/HTML/material/html/js/utils.js b/MaterialSkin/HTML/material/html/js/utils.js @@ -1207,44 +1207,6 @@ function copyTextToClipboard(text) {
}
}
-function copyImageToClipboard(url) {
- console.log('create img');
- var img=document.createElement('img');
- img.src=url;
- document.body.appendChild(img);
- /*
- var r = document.createRange();
- r.setStartBefore(img);
- r.setEndAfter(img);
- r.selectNode(img);
- var sel = window.getSelection();
- sel.addRange(r);*/
- //img.select();
- const range = document.createRange();
- range.selectNodeContents(img);
- const sel = window.getSelection();
- sel.removeAllRanges();
- sel.addRange(range);
- //img.setSelectionRange(0, img.value.length);
- try {
- console.log('copy');
- document.execCommand('copy');
- } catch (err) {
- } finally {
- document.body.removeChild(img);
- }
-}
-
-function copyElementToClipboard(element) {
- window.getSelection().removeAllRanges();
- let range = document.createRange();
- range.selectNode(typeof element === 'string' ? document.getElementById(elementName) : element);
- window.getSelection().addRange(range);
- console.log(""COPY"");v
- document.execCommand('copy');
- window.getSelection().removeAllRanges();
- }
-
function getTouchPos(ev) {
if (undefined==ev) {
return undefined;
",2
"diff --git a/app/services/raven.js b/app/services/raven.js @@ -16,18 +16,6 @@ export default RavenLogger.extend({
return this._super(...arguments);
},
- ignoreError(error) {
- // Ember 2.X seems to not catch `TransitionAborted` errors caused by
- // regular redirects. We don't want these errors to show up in Sentry
- // so we have to filter them ourselves.
- //
- // Once this issue https://github.com/emberjs/ember.js/issues/12505 is
- // resolved we can remove this code.
- //
- // Last checked 9/28/2016
- return error.name === 'TransitionAborted';
- },
-
callRaven(/* methodName, ...optional */) {
return this._super(...arguments);
}
",2
"diff --git a/circle.yml b/circle.yml @@ -18,7 +18,6 @@ dependencies:
- /home/ubuntu/nvm/versions/node/v6.9.4/lib/node_modules
override:
- yarn global add bower
- - yarn global add phantomjs-prebuilt
- yarn add node-sass
- yarn install
- bower install
",2
"diff --git a/app/app.js b/app/app.js @@ -5,8 +5,6 @@ import config from './config/environment';
const { Application } = Ember;
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
const App = Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
",2
"diff --git a/package.json b/package.json ""ember-composable-helpers"": ""2.1.0"",
""ember-concurrency"": ""^0.8.1"",
""ember-data"": ""~2.18.0"",
- ""ember-deferred-content"": ""0.2.0"",
""ember-disable-proxy-controllers"": ""^1.0.1"",
""ember-dragula"": ""1.9.3"",
""ember-exam"": ""1.0.0"",
",2
"diff --git a/ember-cli-build.js b/ember-cli-build.js @@ -40,11 +40,6 @@ module.exports = function(defaults) {
]
};
- if (app.env === 'production' && prepend !== '') {
- app.options['ember-service-worker'] = {
- rootUrl: `${prepend}/`
- }
- }
if (!process.env.EMBER_CLI_FASTBOOT) {
app.import(app.bowerDirectory + '/jquery-scrollparent/jquery.scrollparent.js');
",2
"diff --git a/bin/ember-fastboot b/bin/ember-fastboot @@ -38,6 +38,7 @@ const app = httpServer.app;
app.use(express.static(distPath, {
setHeaders(res, path, stat) {
res.setHeader('Cache-Control', 'public, max-age=365000000, immutable');
+ res.removeHeader('X-Powered-By');
}
}));
",2
"diff --git a/lib/hash-to-query/index.js b/lib/hash-to-query/index.js @@ -15,9 +15,6 @@ module.exports = {
var hash = window.location.hash;
if (hash && hash.length > 1) {
var pathName = window.location.pathname;
- if (pathName.indexOf('/methods/') === -1 &&
- pathName.indexOf('/properties/') === -1 &&
- pathName.indexOf('/events/') === -1) {
var type = hash.slice(1, hash.indexOf('_'));
var name = hash.slice(hash.indexOf('_') + 1, hash.length);
var anchor = '?anchor=' +
@@ -27,7 +24,6 @@ module.exports = {
type;
window.location.href = window.location.origin + pathName + anchor;
}
- }
</script>
`
}
",2
"diff --git a/app/components/api-index-filter.js b/app/components/api-index-filter.js import { computed } from '@ember/object';
import Component from '@ember/component';
-import uniq from 'npm:lodash.uniq';
import sortBy from 'npm:lodash.sortby';
const filterDataComputedParams = 'filterData.{showInherited,showProtected,showPrivate,showDeprecated}';
@@ -38,8 +37,8 @@ export default Component.extend({
items = items.filter(item => item.deprecated !== true);
}
- let sortedUniqueItems = uniq(sortBy(items, 'name'), true, (item => item.name));
- return this.filterMultipleInheritance(sortedUniqueItems);
+ let sortedItems = sortBy(items, (item => item.name));
+ return this.filterMultipleInheritance(sortedItems);
},
filteredData: computed('filteredMethods', 'filteredProperties', 'filteredEvents', function() {
",2
"diff --git a/.travis.yml b/.travis.yml @@ -23,12 +23,3 @@ install:
script:
- yarn test
-
-deploy:
- provider: heroku
- buildpack: https://codon-buildpacks.s3.amazonaws.com/buildpacks/hone/emberjs.tgz
- app:
- master: ember-api-docs-staging
- production: ember-api-docs
- api_key:
- secure: Gkx9aZ9FrLnuWuaedWCND8Wg7PoYeFO4kIzuIjXp8b3MJTGpUszSGqC6nMBNqpzsACKdDXERPwsRoXTDLgKPCjngpnc67BedJfZJ2X7ruu1SsjNjs0GuWZ3EX0ppw6vgCWvcL2dkn6cs7w9AzYdUsi4l4zMoSTHYXG1VxFXR7TqVJ3Aw/Cx7UoOrrB0eZw1DhoPqfnLjwZ6sl6K7ol4a5413MYcMTIZq3ZzwdnfQF8iBC1uQT6TkDP640pZdLvt3fKTmoG/3WgFuw9Ijy+IjDzJbiVIaOcYrhc2Sev1PDy1EKybZ/xYbqFkSUk7ehCzPCLJwKVrpW+8b3bqNZXXq7XhbLGrK7yQnTEu49KepkAxOMUPOdnEd0Iy4nbDtCkBI19BfJKcP5rqYL/p//Qv/iXO1zzuBWevRZFF7thk+vgXljpSmPEBlKFjsMiUV3E6HIqZIw4n5GNkq8BuRHq2EjLp+IVHl5KFDvnwL+D9zv0Aigq5bYmGH7tyLQ4bTIa1EfZSSWHCu+g6+X/7tCaeoncjTT0gJgYGJgYhQ/LD5GmVCLvSwCXcY5q7rS5lHRDP6FuKzvyScGCjJixo6PA1NN32xIfUVA8cj6VdIHatqSZ0dpfm9sHHnE3gwJ2F3yw3Bdl5ZtV0uNDubrA0Q+RiqzMxHyW9kUl3BWBhmCXlKg1M=
",2
"diff --git a/tests/unit/utils/create-excerpt-test.js b/tests/unit/utils/create-excerpt-test.js @@ -7,7 +7,9 @@ const testString = ""<html><head></head><body><p><code>HashLocation</code> implem
test('it works', function(assert) {
let result = createExcerpt(testString);
- assert.ok(result.includes('/\n') === false, 'does not include line breaks');
+ assert.ok(result.includes('/\n') === false, 'does not include tabs');
+ assert.ok(result.includes('<table') === false, 'does not include table code example');
+ assert.ok(result.includes('/\t') === false, 'does not include line breaks');
assert.ok(result.length <= 300, 'length is maximum 300 characters');
});
",2
"diff --git a/app/templates/head.hbs b/app/templates/head.hbs <link rel=""dns-prefetch"" href=""{{model.cdnDomain}}"">
<meta property=""og:title"" content={{model.title}}>
-<meta property=""og:image"" content=""assets/images/ember-logo.png"">
-<meta property=""og:image:width"" content=""1200"">
-<meta property=""og:image:height"" content=""1016"">
{{#if model.description}}
<meta name=""description"" content={{model.description}}>
",2
"diff --git a/tests/acceptance/open-graph-tags-test.js b/tests/acceptance/open-graph-tags-test.js @@ -19,14 +19,3 @@ test('assigns title property', function (assert) {
const title = findOpenGraphContent('title');
assert.equal(title, 'Container - 1.0 - Ember API Documentation');
});
-
-test('assigns image property and width/height', function (assert) {
- const image = findOpenGraphContent('image');
- assert.equal(image, 'assets/images/ember-logo.png');
-
- const imageWidth = findOpenGraphContent('image:width');
- assert.equal(imageWidth, '1200');
-
- const imageHeight = findOpenGraphContent('image:height');
- assert.equal(imageHeight, '1016');
-});
",2
"diff --git a/bin/ember-fastboot b/bin/ember-fastboot @@ -57,7 +57,6 @@ app.use(
/** We rewrite the 307 location header into a relativeURL so that our special setup is handled */
app.use(function(req, res, next) {
- console.log(req.headers['x-forwarded-host'], req.headers.host);
const originalSendFn = res.send;
",2
"diff --git a/config/deprecation-workflow.js b/config/deprecation-workflow.js @@ -2,7 +2,6 @@ self.deprecationWorkflow = self.deprecationWorkflow || {};
self.deprecationWorkflow.config = {
workflow: [
{ handler: ""silence"", matchId: ""transition-state"" },
- { handler: ""throw"", matchId: ""deprecate-router-events"" },
- { handler: ""throw"", matchId: ""ember-native-dom-helpers-click"" }
+ { handler: ""throw"", matchId: ""deprecate-router-events"" }
]
};
",2
"diff --git a/app/templates/project-version/index.hbs b/app/templates/project-version/index.hbs <li>{{#link-to 'project-version.classes.class' 'Route'}}Route{{/link-to}} - used to define individual routes, including the {{#link-to 'project-version.classes.class.methods.method' 'Route' 'model' (query-params anchor='model')}}model{{/link-to}} hook for loading data</li>
<li>{{#link-to 'project-version.classes.class' 'Service'}}Service{{/link-to}} - an Ember object that lives for the duration of the application, and can be made available in different parts of your application</li>
</ul>
- <h2>How to import and use packages</h2>
- <p>
- Ember has a modern ECMAScript 2015 (also known as ES2015 or ES6) modules API. Each major class and its supporting functions live in a dedicated module, which you can import like this:
- </p>
- {{newPackageImportSyntax}}
- <p>
- When working with older Ember codebases, you may see a different set of imports. Before the Ember JavaScript Modules API design, developers had to import the entire Ember framework as a single package. That package was an object which contained <em>all</em> the Ember classes and functions, so you will see code that pulls the classes or functions off that object, like this:
- </p>
- {{oldPackageImportSyntax}}
- <p>
- For new apps, you should always prefer the the JavaScript Modules API, and old apps should migrate to it over time: it allows the building of smaller packages based on chunks of functionality and importing only parts of the Ember framework that are needed.
- </p>
- <p>
- The most up-to-date and complete mappings between the previous API and the new JavaScript Modules API can be found at the <a href='https://github.com/ember-cli/ember-rfc176-data'>ember-rfc176-data</a> repository. <a href='https://github.com/tomdale/ember-modules-codemod'>Codemod tooling</a> is also available to help migrate existing Ember projects to the new JavaScript Modules API syntax.
- </p>
<h2>Useful links</h2>
<ul>
<li>
",2
"diff --git a/app/components/class-field-description.js b/app/components/class-field-description.js @@ -7,8 +7,8 @@ export default class ClassFieldDescription extends Component {
get hasImportExample() {
return this.legacyModuleMappings.hasFunctionMapping(
- this.args.field.name,
- this.args.field.class
+ this.field.name,
+ this.field.class
);
}
",2
"diff --git a/app/components/ember-anchor.js b/app/components/ember-anchor.js @@ -7,7 +7,7 @@ export default class EmberAnchor extends AnchorComponent {
// This overrides Ember Anchor to support scrolling within a fixed position element
_scrollToElemPosition() {
let qp = this.anchorQueryParam;
- let qpVal = this.a ?? this.controller[qp];
+ let qpVal = this.a;
let elem = document.querySelector(`[data-${qp}=""${qpVal}""]`);
if (elem && elem.offsetHeight) {
",2
"diff --git a/app/components/search-input/dropdown.js b/app/components/search-input/dropdown.js @@ -6,7 +6,6 @@ import {
import { get } from '@ember/object';
import Component from '@ember/component';
import { A } from '@ember/array';
-import { tracked } from '@glimmer/tracking';
@tagName('span')
@classNames('ds-dropdown-menu', 'ds-with-1')
@@ -17,13 +16,6 @@ export default class Dropdown extends Component {
isVisible = false;
- @tracked results;
-
- constructor() {
- super(...arguments);
- this.results = A();
- }
-
// show
// Massage data to make it easier for displaying on the template
// Returned object:
",2
"diff --git a/lib/types/time-uuid.js b/lib/types/time-uuid.js @@ -171,9 +171,9 @@ function writeTime(buffer, time, ticks) {
.multiply(Long.fromNumber(10000))
.add(Long.fromNumber(ticks));
const timeHigh = val.getHighBitsUnsigned();
- buffer.writeUInt32BE(val.getLowBitsUnsigned(), 0, true);
- buffer.writeUInt16BE(timeHigh & 0xffff, 4, true);
- buffer.writeUInt16BE(timeHigh >>> 16 & 0xffff, 6, true);
+ buffer.writeUInt32BE(val.getLowBitsUnsigned(), 0);
+ buffer.writeUInt16BE(timeHigh & 0xffff, 4);
+ buffer.writeUInt16BE(timeHigh >>> 16 & 0xffff, 6);
}
/**
",2
"diff --git a/sass/patterns/_homepage.scss b/sass/patterns/_homepage.scss .searchfield-wrapper {
margin: 4px 5px 5px 0;
}
-
- /*
- .buttonset {
- > *:not(.searchfield-wrapper) {
- margin-top: 6px;
- }
- }
-
- .more {
- > * {
- margin-top: 6px;
- }
- }
- */
}
[class^=""btn""] {
",2
"diff --git a/views/controls/dropdown.html b/views/controls/dropdown.html <div class=""row"">
<div class=""twelve columns"">
- <a class=""hyperlink"" href=""#"">More Information Hyperlink</a><br><br><br><br>
<div class=""field"">
<label for=""states"" class=""label"">States</label>
",2
"diff --git a/js/tabs.js b/js/tabs.js // the overflow area of the tablist container <UL>.
isTabOverflowed: function(li) {
return li[0].getBoundingClientRect().top > this.tablist[0].getBoundingClientRect().top;
- /*
- if (!li || li.length === 0) {
- return true;
- }
-
- var tab = li[0],
- tablist = this.tablist[0],
- tabOffset = tab.offsetTop,
- tablistOffset = tablist.offsetTop,
- tablistHeight = window.getComputedStyle(tablist, null).getPropertyValue('height');
-
- if (tablist.scrollTop > 0) {
- tablist.scrollTop = 0;
- }
-
- return tabOffset - tablistOffset >= tablistHeight;
- */
},
findLastVisibleTab: function() {
",2
"diff --git a/js/tabs.js b/js/tabs.js activate: function(href) {
var self = this,
a, targetTab, targetPanel, oldTab, oldPanel,
- selectedStateTarget;
+ selectedStateTarget,
+ activeStateTarget;
if (self.isURL(href)) {
return this.callSource(href, true);
if (targetTab.is('.tab')) {
selectedStateTarget = targetTab;
+ activeStateTarget = targetTab;
}
- var ddMenu = targetTab.parents('.popupmenu');
+ var ddMenu = targetTab.parents('.popupmenu'),
+ ddTab;
+
if (ddMenu.length) {
- var tab = ddMenu.data('trigger');
- if (tab.length) {
- selectedStateTarget = tab;
+ ddTab = ddMenu.data('trigger');
+ if (ddTab.length) {
+ selectedStateTarget = ddTab;
+ activeStateTarget = ddTab;
}
}
- var activeStateTarget = targetTab;
- if (this.isTabOverflowed(targetTab)) {
+ if (this.isTabOverflowed(activeStateTarget)) {
activeStateTarget = this.moreButton;
selectedStateTarget = this.moreButton;
}
// Remove overflowed tabs
sizeableTabs.removeAttr('style').each(function() {
var t = $(this);
-
if (self.isTabOverflowed(t)) {
sizeableTabs = sizeableTabs.not(t);
}
// Math: +101 is the padding of the <ul class=""tab-list""> element
if (!sizeableTabs.length) {
visibleTabSize = (tabContainerW - appTriggerSize + 101);
- this.moreButton.width(visibleTabSize);
+ this.moreButton[0].style.width = visibleTabSize + 'px';
return;
}
visibleTabSize = defaultTabSize;
}
- sizeableTabs.width(visibleTabSize);
+ for (var i = 0; i < sizeableTabs.length; i++) {
+ sizeableTabs[i].style.width = visibleTabSize + 'px';
+ }
+
this.adjustSpilloverNumber();
},
return;
}
+ var targetClassName = target[0].className,
+ isTab = Soho.DOM.classNameHas(targetClassName, 'tab'),
+ isDismissible = Soho.DOM.classNameHas(targetClassName, 'dismissible'),
+ isDropdown = Soho.DOM.classNameHas(targetClassName, 'has-popupmenu');
+
targetStyle = window.getComputedStyle(target[0], null);
paddingLeft = parseInt(targetStyle.getPropertyValue('padding-left'), 10) || 0;
paddingRight = parseInt(targetStyle.getPropertyValue('padding-right'), 10) || 0;
- width = target.innerWidth();
+ width = parseInt(targetStyle.getPropertyValue('width')) || 0;
- if (target.is('.tab')) {
+ if (isTab) {
anchorStyle = window.getComputedStyle(target.children('a')[0]);
paddingLeft += parseInt(anchorStyle.getPropertyValue('padding-left'), 10) || 0;
paddingRight += parseInt(anchorStyle.getPropertyValue('padding-right'), 10) || 0;
- width = target.width();
- // Dirty hack for first/last tab types, and Firefox.
- if (target.is(':first-child, :last-child')) {
- width = width - 1;
- }
- if ($('html').hasClass('is-firefox')) {
- width = width - 1;
+ /*
+ if (isDropdown &&) {
+ width += 10;
}
+ */
+
+ /*
+ if (isDismissible) {
+ paddingRight -= 10;
}
- if (target.is('.dismissible.tab') || target.is('.has-popupmenu.tab')) {
- paddingRight -= target.is('.has-popupmenu.tab') ? 0 : 10;
- width += 10;
+ */
+
}
var left = Locale.isRTL() ?
clearTimeout(self.animationTimeout);
this.animatedBar.addClass('visible');
-
function animationTimeout(cb) {
self.animatedBar[0].style.left = left + 'px';
self.animatedBar[0].style.width = width + 'px';
",2
"diff --git a/js/lookup.js b/js/lookup.js self.modal = $('body').data('modal');
if (!this.settings.title) {
- self.modal.element.find('.modal-title').append(' <span class=""datagrid-result-count"">(N Results)</span>');
+ self.modal.element.find('.modal-title').append(' <span class=""datagrid-result-count""></span>');
}
// Wait until search field available
",2
"diff --git a/js/tabs.js b/js/tabs.js // If a jQuery-wrapped element is provided, actually append the element.
// If content is text/string, simply inline it.
- var markup = $('<div id=""'+ tabId +'"" class=""tab-panel"" role=""tabpanel"" style=""display: none;""></div>');
+ var markup = $('<div id=""'+ tabId +'"" class=""tab-panel"" role=""tabpanel""></div>');
if (content instanceof $) {
markup.append(content);
} else {
- markup[0].innerHTML = content;
+ markup[0].innerHTML = content || '';
}
if (doInsert === true) {
",2
"diff --git a/js/stepprocess.js b/js/stepprocess.js * @param {object} [options.stepFolder="".js-step-folder""] - jQuery selector for the step folder elements
* @param {object} [options.btnPrev="".js-step-link-prev""] - jQuery selector for the previous step button
* @param {object} [options.btnNext="".js-step-link-next""] - jQuery selector for the next step button
- * @param {object} [options.btnNext="".js-step-container-scroll""] - jQuery selector for the sidebar scrolling
- * @param {object} [options.btnNext="".js-step-list-scroll""] - jQuery selector for the step panel scrolling
* @param {function(event, args)|Promise} [options.beforeSelectStep=null] - A callback (function or promise) that gives
* args.stepLink (the step link element) and args.isStepping (whether we are prev/next'ing or not)
*/
",2
"diff --git a/js/mask.js b/js/mask.js key = e.which,
typedChar = $.actualChar(e);
- // set the original value if it doesn't exist.
- if (!self.initValue) {
- self.initValue = self.element.val();
- }
-
// Remove modifiers on ""keyup""
if (eventType === 'keyup') {
if (key === 8) {
",2
"diff --git a/CHANGELOG.md b/CHANGELOG.md -## 4.2.6
-Release Date: 2017-03-31 (Tentative)
-
-### Download Build Assets:
-Build Server: http://bamboo.infor.com/browse/SOHO-DOC
-Npm: http://npm.infor.com
-
-### Demo Site
-http://usmvvwdev53:425/controls
-
-### Key New Features
-
-### Improvements
-
-### Bug Fixes
-
-### Breaking Changes
-
-### Ui Changes
-
-### Tips
-
-### Other
-
-
## 4.2.5
Release Date: 2017-02-23
",2
"diff --git a/views/tests/toolbarsearchfield/destroy.html b/views/tests/toolbarsearchfield/destroy.html <input class=""searchfield"" placeholder=""keyword"" id=""regular-toolbar-searchfield"" name=""regular-toolbar-searchfield"" />
</div>
- <button type=""button"" class=""btn"" type=""button"" id=""destroy"">Destroy</button>
+ <button type=""button"" class=""btn"" id=""destroy"">Destroy</button>
</div>
</div>
",2
"diff --git a/views/tests/datagrid/datagrid-source-format.html b/views/tests/datagrid/datagrid-source-format.html columns.push({ id: 'activity', name: 'Activity', field: 'activity', editor: Editors.Input, filterType: 'text'});
columns.push({ id: 'quantity', name: 'Quantity', field: 'quantity', editor: Editors.Input, filterType: 'text'});
columns.push({ id: 'orderDate', name: 'Order Date', field: 'orderDate', formatter: Formatters.Date, editor: Editors.Date, filterType: 'date' , sourceFormat: 'yyyyMMdd', dateFormat: 'yyyy-MM-dd'});
- columns.push({ id: 'orderDate2', name: 'Order Date2', field: 'orderDate', formatter: Formatters.Date, editor: Editors.Date, filterType: 'date' , sourceFormat: 'yyyyMMdd', dateFormat: 'dd-MM-yyyy'});
columns.push({ id: 'status', name: 'Status', field: 'status', formatter: Formatters.Text, editor: Editors.Input, filterType: 'text' });
//Init and get the api for the grid
",2
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -625,15 +625,8 @@ window.Editors = {
};
this.destroy = function () {
- var self = this,
- orgStyle = container.attr('data-org-style');
-
- if (orgStyle !== 'false') {
- container.attr('style', orgStyle).removeAttr('data-org-style');
- } else {
- container.removeAttr('style data-org-style');
- }
-
+ var self = this;
+ container.removeAttr('style');
api.quickEditMode = false;
self.input.off('hide.editor keydown.editor');
setTimeout(function() {
@@ -5085,11 +5078,7 @@ $.fn.datagrid = function(options) {
}
if (isEditor) {
- var orgStyle = cellNode.attr('style') || false;
- cellNode.attr('data-org-style', orgStyle).css({
- 'position': 'static',
- 'height': cellNode.outerHeight()
- });
+ cellNode.css({'position': 'static', 'height': cellNode.outerHeight()});
}
//Editor.init
",2
"diff --git a/views/controls/modal.html b/views/controls/modal.html <!-- ""Context"" Example -->
<div id=""modal-mask"" style=""display: none;"">
<div class=""field"">
- <label for=""upper"">Upper Case</label>
- <input id=""upper"" name=""upper"" style=""text-transform: uppercase"" />
+ <label for=""title"">Title</label>
+ <input type=""text"" id=""title"" name=""title"" />
</div>
<div class=""field"">
",2
"diff --git a/js/dropdown.js b/js/dropdown.js showSelectAll: false, // If true, on Multiselect dropdowns, will show an additional option at the top of the list labeled ""select all"".
source: undefined, //A function that can do an ajax call.
sourceArguments: {}, // If a source method is defined, this flexible object can be passed into the source method, and augmented with parameters specific to the implementation.
- dontManageOptions: false, //Option used in Angular as angular will mange the options add.
reloadSourceOnOpen: false, // If set to true, will always perform an ajax call whenever the list is opened. If false, the first AJAX call's results are cached.
empty: false, //Initialize Empty Value
delay: 300 //Typing Buffer Delay
",2
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -1956,7 +1956,7 @@ $.fn.datagrid = function(options) {
//just the button
break;
case 'date':
- filterMarkup += '<input ' + (col.filterDisabled ? ' disabled' : '') + ' type=""text"" class=""datepicker"" ' + (col.dateFormat ? 'data-options=""{dateFormat: ' + col.dateFormat + '}""' : '') + ' id=""'+ filterId +'""/>';
+ filterMarkup += '<input ' + (col.filterDisabled ? ' disabled' : '') + ' type=""text"" class=""datepicker"" id=""'+ filterId +'""/>';
break;
case 'decimal':
filterMarkup += '<input ' + (col.filterDisabled ? ' disabled' : '') + ' type=""text"" id=""'+ filterId +'"" data-mask-mode=""number"" data-mask=""'+ (col.mask ? col.mask : '####.00') + '"">';
",2
"diff --git a/test2/unit/locale/common.js b/test2/unit/locale/common.js @@ -8,9 +8,6 @@ define([
document = jsdom('<!DOCTYPE html><html id=""html""><head></head><body></body></html>'); // jshint ignore:line
window = document.defaultView; // jshint ignore:line
- //Load Jquery from node packages
- $ = jQuery = require('jquery'); // jshint ignore:line
-
//Load the Locale.js we are testing
require('../../../js/locale.js');
Locale = window.Locale; // jshint ignore:line
@@ -315,13 +312,6 @@ define([
// Test date only different format
expect(Locale.parseDate('05-10-2015', 'dd-MM-yyyy').getTime()).to.equal(new Date(2015, 09, 5, 0, 0, 0).getTime());
- // Test full UTC
- //$('#date-field').data('datepicker').setValue('2015-05-10T00:00:00');
- // Test full UTC around midday
- //$('#date-field-2').data('datepicker').setValue('2015-05-10T12:00:00');
- // Test full UTC with Date object
- //$('#date-field-3').data('datepicker').setValue(new Date('2015-05-10T00:00:00'));
-
},
'be able to return time format': function(){
",2
"diff --git a/components/listbuilder/test-on-selected.html b/components/listbuilder/test-on-selected.html @@ -121,17 +121,17 @@ $('body').one('initialized', function () {
// Make selected after every one second (1000 milliseconds) ================
// Select first item
setTimeout(function() {
- // api.select('first');
+ api.select('first');
}, 1000);
// Select last item
setTimeout(function() {
- // api.select('last');
+ api.select('last');
}, 2000);
// Select third item (zero based index)
setTimeout(function() {
- // api.select(2);
+ api.select(2);
}, 3000);
});
",2
"diff --git a/components/accordion/accordion.js b/components/accordion/accordion.js */
handleEvents: function() {
var self = this,
- headerWhereMouseDown = null,
- linkFollowedByTouch = null;
+ headerWhereMouseDown = null;
// Returns ""Header"", ""Anchor"", or ""Expander"" based on the element's tag
function getElementType(element) {
return elementType;
}
- // Intercepts a 'touchend' event in order to either prevent a link from being followed,
- // or allows it to continue.
- function touchendInterceptor(e, element) {
- linkFollowedByTouch = true;
- var type = getElementType(element),
- result = self['handle' + type + 'Click'](e, element);
-
- if (!result) {
- e.preventDefault();
- }
- return result;
- }
-
// Intercepts a 'click' event in order to either prevent a link from being followed,
// or allows it to continue.
function clickInterceptor(e, element) {
var type = getElementType(element);
- if (linkFollowedByTouch) {
- linkFollowedByTouch = null;
- return false;
- }
return self['handle' + type + 'Click'](e, element);
}
- this.headers.on('touchend.accordion', function(e) {
- return touchendInterceptor(e, $(this));
- }).on('click.accordion', function(e) {
+ this.headers.on('click.accordion', function(e) {
return clickInterceptor(e, $(this));
}).on('focusin.accordion', function(e) {
var target = $(e.target);
headerWhereMouseDown = null;
});
- this.anchors.on('touchend.accordion', function(e) {
- return touchendInterceptor(e, $(this));
- }).on('click.accordion', function(e) {
+ this.anchors.on('click.accordion', function(e) {
return clickInterceptor(e, $(this));
});
this.headers.children('[class^=""btn""]')
- .on('touchend.accordion', function(e) {
- return touchendInterceptor(e, $(this));
- })
.on('click.accordion', function(e) {
return clickInterceptor(e, $(this));
}).on('keydown.accordion', function(e) {
",2
"diff --git a/components/applicationmenu/applicationmenu.js b/components/applicationmenu/applicationmenu.js * Detects a change in breakpoint size that can cause the Application Menu's state to change.
*/
testWidth: function() {
- /*
- if (this.isLargerThanBreakpoint()) {
- this.menu.addClass('show-shadow');
- if (this.userClosed || !this.settings.openOnLarge || this.menu.hasClass('is-open') || this.isAnimating === true) {
- return;
- }
-
- this.openMenu(true);
- return;
- }
-
- this.menu.addClass('show-shadow');
- if (!this.element.find(document.activeElement).length && this.menu.is('.is-open') && this.isAnimating === false) {
- this.closeMenu();
- }
- */
-
if (this.isOpen()) {
if (Soho.breakpoints.isAbove(this.settings.breakpoint)) {
return;
",2
"diff --git a/package.json b/package.json ""scripts"": {
""start"": ""node server.js"",
""stop"": ""./bin/stop.sh"",
- ""jshint"": ""jshint gruntfile.js app.js js/*.js components/**/*.js"",
+ ""jshint"": ""jshint gruntfile.js app.js components/**/*.js"",
""eslint"": ""eslint src"",
""build"": ""grunt"",
""install-test-deps"": ""npm install selenium-standalone@latest && npm run install-drivers"",
",2
"diff --git a/components/datagrid/_datagrid.scss b/components/datagrid/_datagrid.scss @@ -662,16 +662,6 @@ $datagrid-short-row-height: 23px;
}
}
- // a.row-btn {
- // // scss-lint:disable ImportantRule
- // top: -3px;
- // // scss-lint:disable ImportantRule
- //
- // .icon {
- // margin: 0;
- // }
- // }
-
&.datagrid-trigger-cell {
.icon {
height: 16px;
",2
"diff --git a/components/colorpicker/colorpicker.md b/components/colorpicker/colorpicker.md 2. Select the label not the Hex [View Example]( ../components/colorpicker/example-show-label)
4. Test States [View Test]( ../components/colorpicker/test-states)
5. Test it works on a Modal [View Test]( ../components/colorpicker/test-modal)
-6. Test it works on a Modal [View Test]( ../components/colorpicker/test-modal)
{{api-details}}
",2
"diff --git a/components/datagrid/datagrid.js b/components/datagrid/datagrid.js @@ -3695,7 +3695,7 @@ $.fn.datagrid = function(options) {
if (this.canUseLocalStorage()) {
localStorage[this.uniqueId('columns')] = JSON.stringify(this.settings.columns);
}
- //this.setTreeDepth();
+
},
// Omit events and save to local storage for supported settings
",2
"diff --git a/components/form/example-forms.html b/components/form/example-forms.html <div class=""compound-field"">
<div class=""field"">
-<<<<<<< Updated upstream
- <label for=""example-mulitcolumn-first"">First Name <span class=""audible"">Required</span></label>
- <input type=""text"" id=""example-mulitcolumn-first"" name=""first-name"" data-validate=""required"">
-=======
<label for=""example-mulitcolumn-first"" class=""required"">First Name</label>
<input type=""text"" id=""example-mulitcolumn-first"" name=""first-name"" aria-required=""true"" data-validate=""required"">
->>>>>>> Stashed changes
</div>
<div class=""field"">
",2
"diff --git a/components/splitter/splitter.js b/components/splitter/splitter.js side: 'left', // or right
resize: 'immediate',
containment: null, //document or parent
- save: false
+ save: true
},
settings = $.extend({}, defaults, options);
if (this.isSplitterRightSide) {
var thisPrev = thisSide.prev();
- // this.leftSide = thisSide.prev().is('.main') ? thisSide.prev() : thisSide;
- // w = thisSide.parent().outerWidth() - w;
if (thisPrev.is('.main')) {
this.leftSide = thisPrev;
w = thisSide.parent().outerWidth() - w;
.next().addClass('flex-grow-shrink is-right-side')
.parent().addClass('splitter-container');
- // splitter.addClass('splitter-right');
-
if (s.collapseButton) {
var savedOffset = 0;
var $splitterButton = $('<button type=""button"" class=""splitter-btn"" id=""splitter-collapse-btn"" title=""Collapse""><svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation""><use xlink:href=""#icon-double-chevron""></use></svg></button>');
",2
"diff --git a/components/contextualactionpanel/contextualactionpanel.js b/components/contextualactionpanel/contextualactionpanel.js Soho.utils.fixSVGIcons(self.panel);
}).on('click.contextualactionpanel', function() {
if (self.ctrlPressed) {
- document.getElementById(""toolbar-example-searchfield"").select();
+ var searchfield = self.toolbar.find('.searchfield');
+ if (searchfield.length) {
+ searchfield[0].select();
+ }
self.ctrlPressed = false;
}
}).on('keydown.contextualactionpanel', function(event) {
",2
"diff --git a/components/pager/pager.js b/components/pager/pager.js });
//Attach button click and touch
- this.pagerBar.onTouchClick('pager', 'a').on('click.pager', 'a', function (e) {
- // this.pagerBar.onclick(function(e) {
+ this.pagerBar.on('click.pager', 'a', function (e) {
var li = $(this).parent();
e.preventDefault();
",2
"diff --git a/components/modal/modal.js b/components/modal/modal.js $(document).on('keyup.modal', function (e) {
var keyCode = e.which || e.keyCode;
if (keyCode === 27) {
- // setTimeout(function () {
var modals = $('.modal.is-visible');
if (modals.length > 1) {
modals.not(':last').on('beforeclose.modal', function () {
} else {
self.close();
}
- // }, 0);
- e.stopPropagation();
}
});
",2
"diff --git a/components/dropdown/_dropdown.scss b/components/dropdown/_dropdown.scss @@ -655,8 +655,6 @@ div.dropdown-xs,
}
li {
- padding-right: 21px;
-
> a {
line-height: 25px;
}
@@ -916,9 +914,6 @@ html[dir='rtl'] {
}
li {
- padding-left: 21px;
- padding-right: 4px;
-
.listoption-icon {
left: auto;
margin-left: -5px;
",2
"diff --git a/components/timepicker/timepicker.js b/components/timepicker/timepicker.js parts[0] = '' + parseInt(parts[0], 10);
}
timeparts.hours = self.hourText(parts[0]);
- // timeparts.hours = parts[0];
// Handle Minutes
if (parts[1]) {
",2
"diff --git a/components/autocomplete/autocomplete.js b/components/autocomplete/autocomplete.js handleListResults: function(term, items, filterResult) {
var self = this;
- function autocompletePlaceCallback(placementObj) {
- // Nudge the autocomplete to the right by 1px in Chrome
- if (Soho.env.browser.name === 'chrome') {
- placementObj.setCoordinate('x', placementObj.x + 1);
- }
- return placementObj;
- }
-
var popupOpts = {
menuId: 'autocomplete-list',
ariaListbox: true,
autoFocus: false,
returnFocus: false,
placementOpts: {
- callback: autocompletePlaceCallback,
parent: this.element
}
};
",2
"diff --git a/components/datagrid/datagrid.js b/components/datagrid/datagrid.js @@ -569,10 +569,6 @@ window.Editors = {
.appendTo(container);
}
- if (column.align) {
- this.input.addClass('l-'+ column.align +'-text');
- }
-
if (column.maxLength) {
this.input.attr('maxlength', column.maxLength);
}
",2
"diff --git a/components/autocomplete/_autocomplete.scss b/components/autocomplete/_autocomplete.scss border-radius: 0 0 3px 3px;
border-top: 1px solid $dropdown-menu-separator-color;
box-shadow: $dropdown-box-shadow, $autocomplete-box-shadow;
- // box-shadow: $focus-box-shadow;
- // box-shadow: $dropdown-box-shadow, $focus-box-shadow;
line-height: 30px;
margin-top: -1px;
overflow: auto;
",2
"diff --git a/components/datagrid/datagrid.js b/components/datagrid/datagrid.js @@ -4128,7 +4128,7 @@ $.fn.datagrid = function(options) {
var self = this;
// Implement Tooltip on cells with title attribute
- this.tableBody.find('td[title]').tooltip({placement: 'left', offset: {left: -5, top: 0}});
+ this.tableBody.find('td[title]').tooltip();
this.tableBody.find('a[title]').tooltip();
// Implement Tooltip on cells with ellipsis
",2
"diff --git a/package.json b/package.json ""eslint:log"": ""eslint -c .eslintrc.js components -o eslint.log"",
""eslint:error-only"": ""eslint -c .eslintrc.js --quiet components"",
""build"": ""rollup -c"",
+ ""rollup"": ""rollup"",
""install-test-deps"": ""npm install selenium-standalone@latest && npm run install-drivers"",
""install-drivers"": ""selenium-standalone install --config=./build/configs/selenium-standalone-install.js"",
""selenium"": ""selenium-standalone start"",
""grunt-sass"": ""^2.0.0"",
""grunt-shell"": ""^2.1.0"",
""grunt-strip-code"": ""^1.0.4"",
+ ""html-loader"": ""^0.5.5"",
""intern"": ""^3.4.6"",
+ ""jasmine-core"": ""^2.9.0"",
""jsdom"": ""^9.9.1"",
""jshint"": ""^2.9.2"",
""karma"": ""^2.0.0"",
""karma-webpack"": ""^2.0.9"",
""load-grunt-tasks"": ""^3.5.2"",
""mmm"": ""^0.2.2"",
- ""mocha"": ""^3.2.0"",
""moment"": ""^2.19.2"",
""node-pandoc"": ""^0.3.0"",
""pandoc"": ""^0.2.0"",
",2
"diff --git a/components/dropdown/test/unit/dropdown-updates-events.spec.js b/components/dropdown/test/unit/dropdown-updates-events.spec.js @@ -77,7 +77,6 @@ describe('Dropdown updates, events', () => {
});
it('Should update set settings via parameters', () => {
-
const settings = {
closeOnSelect: true,
cssClass: null,
",2
"diff --git a/package.json b/package.json ""eslint:log"": ""eslint -c .eslintrc.js components -o eslint.log"",
""eslint:error-only"": ""eslint -c .eslintrc.js --quiet components"",
""build"": ""rollup -c"",
- ""minify"": ""uglifyjs --compress --mangle --warn --output 'dist/js/sohoxi.min.js' -- dist/js/sohoxi.js"",
+ ""minify"": ""uglifyjs --compress --mangle --output 'dist/js/sohoxi.min.js' -- dist/js/sohoxi.js"",
""install-globals"": ""npm install -g pandoc-bin grunt-cli documentation rollup"",
""watch"": ""grunt watch"",
""grunt"": ""grunt"",
",2
"diff --git a/components/datagrid/datagrid.js b/components/datagrid/datagrid.js @@ -1997,8 +1997,6 @@ Datagrid.prototype = {
return;
}
- // const container = this.tableBody;
- // this.element.children().not('[data-arrange-exclude=""true""]')
this.tableBody.children().filter(function () {
return $(this).find('.datagrid-reorder-icon').length < 1;
}).attr('data-arrange-exclude', true);
",2
"diff --git a/components/toolbar/toolbar.js b/components/toolbar/toolbar.js @@ -1316,7 +1316,7 @@ Toolbar.prototype = {
const hiddenOverflowItems = overflowItems.not('.hidden');
let method = 'removeClass';
- if (this.hasDefaultMenuItems || hiddenOverflowItems.length > 0) {
+ if (hiddenOverflowItems.length > 0) {
method = 'addClass';
}
",2
"diff --git a/components/datagrid/datagrid.js b/components/datagrid/datagrid.js @@ -1494,7 +1494,6 @@ Datagrid.prototype = {
if (columnDef.filterType === 'date' || columnDef.filterType === 'time') {
if (columnDef.filterType === 'date' && typeof rowValue === 'string') {
rowValue = columnDef.formatter(false, false, rowValue, columnDef, true);
- // rowValue = window.Formatters.Date(false, false, rowValue, columnDef, true);
}
const getValues = (rValue, cValue) => {
cValue = Locale.parseDate(cValue, conditions[i].format);
",2
"diff --git a/components/toolbar-flex/toolbar-flex.js b/components/toolbar-flex/toolbar-flex.js @@ -82,7 +82,6 @@ ToolbarFlex.prototype = {
* @returns {void}
*/
handleEvents() {
- $('body').on(`resize.${COMPONENT_NAME}`, () => this.handleResize);
this.element.addEventListener('keydown', this.handleKeydown.bind(this));
this.element.addEventListener('keyup', this.handleKeyup.bind(this));
this.element.addEventListener('click', this.handleClick.bind(this));
@@ -472,7 +471,6 @@ ToolbarFlex.prototype = {
* @returns {void}
*/
teardown() {
- $('body').off(`resize.${COMPONENT_NAME}`);
this.element.removeEventListener('keydown', this.handleKeydown.bind(this));
this.element.removeEventListener('up', this.handleKeyup.bind(this));
this.element.removeEventListener('click', this.handleClick.bind(this));
",2
"diff --git a/components/colorpicker/colorpicker.js b/components/colorpicker/colorpicker.js @@ -114,8 +114,7 @@ const COLORPICKER_DEFAULTS = {
{ label: 'Azure', number: '05', value: '4EA0D1' },
{ label: 'Azure', number: '04', value: '69B5DD' },
{ label: 'Azure', number: '03', value: '8DC9E6' },
- { label: 'Azure', number: '02', value: 'ADD8EB' },
- { label: 'Azure', number: '01', value: 'CBEBF4' }
+ { label: 'Azure', number: '02', value: 'ADD8EB' }
],
placeIn: null, // null|'editor'
showLabel: false,
",2
"diff --git a/Makefile b/Makefile -MOCHA_OPTS = --check-leaks
-REPORTER = spec
-
# Container Name
SOHO_CONTAINER = hl_sohoxi
.PHONY: test
-test:
- @node test-runner.js
-
-test-accessibility:
- @node test-runner.js accessibility
-
-test-autocomplete:
- @node test-runner.js autocomplete
-
-test-button:
- @node test-runner.js button
-
-test-busyindicator:
- @node test-runner.js busyindicator
-
-test-charts:
- @node test-runner.js charts
-
-test-checkbox:
- @node test-runner.js checkbox
-
-test-dropdown:
- @node test-runner.js dropdown
-
-test-tmpl:
- @node test-runner.js tmpl
-
-test-locale:
- @node test-runner.js locale
-
-test-mask:
- @node test-runner.js mask
-
-test-multiselect:
- @node test-runner.js multiselect
-
-test-form:
- @node test-runner.js form
-
-test-colorpicker:
- @node test-runner.js colorpicker
-
-test-timepicker:
- @node test-runner.js timepicker
-
-test-datepicker:
- @node test-runner.js datepicker
-
-test-spinbox:
- @node test-runner.js spinbox
-
-test-slider:
- @node test-runner.js slider
-
-test-radio:
- @node test-runner.js radio
-
-test-message:
- @node test-runner.js message
-
-test-toast:
- @node test-runner.js toast
-
-test-toolbar:
- @node test-runner.js toolbar
-
-test-searchfield:
- @node test-runner.js searchfield
-
-test-tabs:
- @node test-runner.js tabs
-
pull :
docker-compose pull
@@ -107,7 +32,3 @@ tail :
watch :
docker exec -ti $(SOHO_CONTAINER) /bin/bash -c ""cd /controls && grunt watch""
@echo ""[Info] ctrl-c to stop grunt watch""
-
-unit-tests :
- docker exec -ti $(SOHO_CONTAINER) /bin/bash -c ""./node_modules/.bin/intern-client config=test/intern.local.unit""
- @echo ""[Info] Running unit-tests...""
",2
"diff --git a/test/karma.conf.js b/test/karma.conf.js @@ -15,8 +15,7 @@ module.exports = function (config) {
'node_modules'
],
preprocessors: {
- '**/components/*/!(.spec|.jquery).js': ['webpack', 'sourcemap', 'coverage'],
- '**/tests/components/*/*.spec.js': ['webpack', 'sourcemap'],
+ '**/components/*/*.js': ['webpack', 'sourcemap'],
},
webpack: {
module: {
@@ -44,14 +43,14 @@ module.exports = function (config) {
stats: 'errors-only'
},
reporters: ['mocha', 'coverage'],
- coverageReporter: {
- dir: 'coverage',
- reporters: [
- { type: 'lcov', subdir: '.' },
- { type: 'text-summary' },
- { type: 'json' }
- ]
- },
+ // coverageReporter: {
+ // dir: 'coverage',
+ // reporters: [
+ // { type: 'lcov', subdir: '.' },
+ // { type: 'text-summary' },
+ // { type: 'json' }
+ // ]
+ // },
port: 9876,
colors: true,
browsers: ['ChromeHeadlessNoSandbox'],
",2
"diff --git a/package.json b/package.json ""report:coverage"": ""codecov"",
""webdriver"": ""webdriver-manager update --standalone false --gecko false --quiet"",
""webdriver:update"": ""webdriver-manager update"",
- ""pree2e"": ""npm run webdriver && (npm run start & sleep 10)"",
""publish-dev"": ""grunt publish && npm publish publish --tag dev --force"",
""publish-nightly"": ""grunt publish && npm publish publish --tag nightly"",
""publish-prod"": ""grunt publish && npm publish publish --force"",
",2
"diff --git a/package.json b/package.json ""postlocal:functional"": ""npm run stop && exit 0"",
""prebrowserstack:functional"": ""npm run webdriver && (npm run start & sleep 10)"",
""browserstack:functional"": ""protractor test/protractor.browserstack.conf.js || npm run stop"",
- ""postbrowserstack:functional"": ""npm run stop && exit 0"",
""report:coverage"": ""codecov"",
""webdriver"": ""webdriver-manager update --standalone false --gecko false --quiet"",
""webdriver:update"": ""webdriver-manager update"",
",2
"diff --git a/app/app.js b/app/app.js @@ -107,12 +107,12 @@ function is(type, filePath) {
};
if (!type) {
- console.warn(`No type defined. Using the default type of ""${defaultType}"".`);
+ logger('alert', `No type defined. Using the default type of ""${defaultType}"".`);
type = defaultType;
}
if (!mappings[type]) {
- console.error(`Provided type ""${type}"" is not in the list of valid types.`);
+ logger('alert', `Provided type ""${type}"" is not in the list of valid types.`);
return false;
}
@@ -127,7 +127,7 @@ function is(type, filePath) {
try {
return fs.statSync(targetPath)[methodName]();
} catch (e) {
- console.info(`File Path ""${targetPath}"" is not a ${type}.`);
+ logger('info', `File Path ""${targetPath}"" is not a ${type}.`);
return false;
}
}
",2
"diff --git a/publish/package.json b/publish/package.json {
""name"": ""ids-enterprise"",
""slug"": ""ids-enterprise"",
- ""version"": ""4.6.0-alpha.4"",
+ ""version"": ""4.6.0"",
""description"": ""Infor Design System (IDS) Enterprise Components for the web"",
""repository"": {
""type"": ""git"",
",2
"diff --git a/app/app.js b/app/app.js @@ -72,7 +72,6 @@ app.use(require('./src/js/middleware/error-handler')(app));
const generalRoute = require('./src/js/routes/general');
const sendGeneratedDocPage = require('./src/js/routes/docs');
-const dataRoute = require('./src/js/routes/data');
// ======================================
// Main Routing and Param Handling
",2
"diff --git a/app/app.js b/app/app.js -/* eslint-disable */
+/* eslint-disable no-underscore-dangle */
const csp = require('express-csp');
const express = require('express');
const extend = require('extend'); // equivalent of $.extend()
-const fs = require('fs');
const mmm = require('mmm');
const path = require('path');
-
const getJSONFile = require('./src/js/get-json-file');
-const logger = require('../scripts/logger');
const app = express();
const BASE_PATH = process.env.BASEPATH || '/';
@@ -67,6 +64,7 @@ app.use(require('./src/js/middleware/basepath-handler')(app));
app.use(require('./src/js/middleware/global-data-handler')(app));
app.use(require('./src/js/middleware/response-throttler')(app));
app.use(require('./src/js/middleware/csp-handler')(app));
+
app.use(router);
app.use(require('./src/js/middleware/error-handler')(app));
@@ -82,7 +80,7 @@ router.get('/', (req, res, next) => {
});
router.get('/index', (req, res, next) => {
- let opts = {
+ const opts = {
path: path.resolve(__dirname, 'docs', 'index.html')
};
sendGeneratedDocPage(opts, req, res, next);
@@ -97,8 +95,9 @@ router.get('/kitchen-sink', (req, res, next) => {
// Collection of Performance Tests Pages
// =========================================
router.get('/performance-tests', (req, res, next) => {
- let performanceOpts = { subtitle: 'Performance Tests' },
- opts = extend({}, res.opts, performanceOpts);
+ const opts = extend({}, res.opts, {
+ subtitle: 'Performance Tests'
+ });
res.render('performance-tests/index.html', opts);
next();
",2
"diff --git a/package.json b/package.json ""e2e:ci"": ""npm run e2e:ci:pre && protractor test/protractor.ci.conf.js || npm run stop"",
""webdriver"": ""webdriver-manager update --standalone false --gecko false --quiet"",
""webdriver:update"": ""webdriver-manager update"",
- ""prepublishOnly"": ""npx grunt publish publish"",
""publish-dev"": ""npx grunt publish && npm publish publish/ --tag dev"",
""publish-nightly"": ""npx grunt publish && npm publish publish/ --tag nightly"",
""publish-prod"": ""npx grunt publish && npm publish publish/"",
",2
"diff --git a/README.md b/README.md @@ -96,8 +96,6 @@ Note: There may be a cost involved to using this with Infor's amazon s3 account
* Clone the repo using `git`: `git clone https://github.com/infor-design/enterprise.git`
* `cd` into the repo directory
-* Then `npm install` to install node packages. On macOS you may need `sudo npm install` as some packages require elevated permissions
-* Then `npm run install-globals` to install some global packages we use
### Running the app
",2
"diff --git a/src/components/tabs/_tabs.scss b/src/components/tabs/_tabs.scss .tab-list-container {
display: inline-block;
overflow-x: auto; // facilitates scrolling of the tabset
+ overflow-y: hidden; // prevents vertical scrolling
position: relative;
width: calc(100% - 51px);
}
",2
"diff --git a/src/components/applicationmenu/_applicationmenu.scss b/src/components/applicationmenu/_applicationmenu.scss }
}
- &.has-searchfield .accordion {
- margin-bottom: calc(-2rem - 76px);
- }
-
.searchfield-wrapper {
background-color: $accordion-inverse-pane-bg-color;
margin-bottom: 0;
",2
"diff --git a/test/components/autocomplete/autocomplete-select.func-spec.js b/test/components/autocomplete/autocomplete-select.func-spec.js @@ -29,7 +29,7 @@ let autocompleteLabelEl;
let autocompleteAPI;
let svgEl;
-fdescribe('Autocomplete API (select)', () => {
+describe('Autocomplete API (select)', () => {
beforeEach(() => {
autocompleteInputEl = null;
autocompleteAPI = null;
",2
"diff --git a/package.json b/package.json ""zip-dist"": ""npx grunt zip-dist"",
""documentation"": ""node ./scripts/deploy-documentation.js"",
""publish-aws"": ""AWS_PROFILE=sohoxi directory-to-s3 -d publish infor-devops-core-soho-us-east-1/sohoxi/4.4.0 -v"",
- ""release"": ""npx release-it minor"",
+ ""release"": ""release-it minor"",
""prepublishOnly"": ""npm run build"",
""test"": ""echo \""Error: no test specified\"" && exit 1""
},
",2
"diff --git a/app/src/js/middleware/option-handler.js b/app/src/js/middleware/option-handler.js @@ -63,9 +63,7 @@ module.exports = function (app, defaults) {
}
// Disable live reload for IE
- const ua = req.headers['user-agent'];
- const isIE = /Windows NT/.test(ua) && (/Trident/.test(ua) || /Edge/.test(ua));
- if (isIE && req.hostname === '10.0.2.2') {
+ if (req.hostname === '10.0.2.2') {
res.opts.enableLiveReloadVM = true;
res.opts.enableLiveReload = false;
}
",2
"diff --git a/test/components/autocomplete/autocomplete-select.func-spec.js b/test/components/autocomplete/autocomplete-select.func-spec.js @@ -52,7 +52,7 @@ describe('Autocomplete API (select)', () => {
autocompleteInputEl.parentNode.removeChild(autocompleteInputEl);
});
- it('returns an object with index, label and value about an item that was programmatically selected', () => {
+ it('returns an object with metadata about an item that was programmatically selected', () => {
autocompleteAPI.openList('new', statesData);
const autocompleteListEl = document.querySelector('#autocomplete-list');
const resultItems = autocompleteListEl.querySelectorAll('li');
@@ -64,7 +64,7 @@ describe('Autocomplete API (select)', () => {
expect(selectedItem.value).toEqual('NJ'); // Should be retrieved from `data-value`
});
- it('returns an object with index, value and addedValue about an item that was programmatically selected', () => {
+ it('returns an object with metadata about an item that was programmatically selected', () => {
autocompleteAPI.openList('new', statesExtraData);
const autocompleteListEl = document.querySelector('#autocomplete-list');
const resultItems = autocompleteListEl.querySelectorAll('li');
",2
"diff --git a/app/views/components/datagrid/test-export-without-datagrid.html b/app/views/components/datagrid/test-export-without-datagrid.html var url = '{{basepath}}api/tasks';
$.getJSON(url, function(res) {
- Soho.excel.exportToExcel('MyExport.xls', 'Worksheet1', res);
- // Soho.excel.exportToCsv('MyExport.xls', res);
+ Soho.excel.exportToExcel('MyExport', 'Worksheet1', res);
+ // Soho.excel.exportToCsv('MyExport', res);
});
});
",2
"diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js @@ -2251,10 +2251,6 @@ Tabs.prototype = {
}
// do nothing if it's just a string of text.
break;
- case 'object':
- // jQuery object or HTML Element
- sourceString = $(sourceString).clone();
- break;
default:
break;
}
",2
"diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js @@ -2247,7 +2247,7 @@ Tabs.prototype = {
// Text Content or a Selector.
if (hasId !== null) {
const obj = $(sourceString);
- sourceString = obj.length ? $(sourceString).clone() : sourceString;
+ sourceString = obj.length ? obj : sourceString;
}
// do nothing if it's just a string of text.
break;
",2
"diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js @@ -407,9 +407,7 @@ Tabs.prototype = {
this.setOverflow();
- if (this.hasSquareFocusState()) {
this.positionFocusState(selectedAnchor);
- }
if (this.hasAnimatedBar()) {
this.animatedBar.addClass('no-transition');
@@ -443,16 +441,10 @@ Tabs.prototype = {
auxilaryButtonLocation = this.tablist;
}
- // Square Focus State
- if (this.hasSquareFocusState()) {
this.focusState = this.element.find('.tab-focus-indicator');
if (!this.focusState.length) {
this.focusState = $('<div class=""tab-focus-indicator"" role=""presentation""></div>').insertBefore(this.tablist);
}
- } else if (this.focusState && this.focusState.length) {
- this.focusState.off().remove();
- this.focusState = undefined;
- }
// Animated Bar
if (this.hasAnimatedBar()) {
@@ -660,9 +652,7 @@ Tabs.prototype = {
return false;
}
- if (self.hasSquareFocusState()) {
self.positionFocusState(a);
- }
if (self.hasAnimatedBar()) {
self.focusBar(popupLi);
@@ -869,9 +859,7 @@ Tabs.prototype = {
}
this.changeHash(href);
- if (this.hasSquareFocusState()) {
this.focusState.removeClass('is-visible');
- }
a.focus();
@@ -968,10 +956,8 @@ Tabs.prototype = {
$.removeData(this.moreButton[0], 'focused-by-click');
- if (this.hasSquareFocusState()) {
this.focusState.removeClass('is-visible');
this.positionFocusState(this.moreButton, focusedByKeyboard);
- }
},
/**
@@ -1157,10 +1143,8 @@ Tabs.prototype = {
this.scrollTabList(focusStateTarget);
}
- if (self.hasSquareFocusState()) {
self.positionFocusState(focusStateTarget, true);
}
- }
return true;
},
@@ -1593,14 +1577,6 @@ Tabs.prototype = {
return !this.isModuleTabs() && !this.isVerticalTabs();
},
- /**
- * Determines whether or not this tabset's tab list should display a square focus state on a tab.
- * @returns {boolean} whether or not the square focus state should display.
- */
- hasSquareFocusState() {
- return true;
- },
-
/**
* Determines whether or not this tabset currently has a ""More Tabs"" spillover button.
* @returns {boolean} whether or not the ""More Tabs"" button is currently displayed.
@@ -1937,11 +1913,12 @@ Tabs.prototype = {
// Update the currently-selected tab
self.updateAria(a);
oldTab.add(self.moreButton).removeClass('is-selected');
-
+ if (targetTab[0]) {
if (targetTab[0].classList.contains('tab')) {
selectedStateTarget = targetTab;
activeStateTarget = targetTab;
}
+ }
const ddMenu = targetTab.parents('.popupmenu');
let ddTab;
@@ -1960,7 +1937,9 @@ Tabs.prototype = {
}
self.focusBar(activeStateTarget);
+ if (selectedStateTarget) {
selectedStateTarget.addClass('is-selected');
+ }
// Fires a resize on any invoked child toolbars inside the tab panel.
// Needed to fix issues with Toolbar alignment, since we can't properly detect
@@ -3158,9 +3137,7 @@ Tabs.prototype = {
self.moreButton.addClass('popup-is-open');
self.popupmenu = self.moreButton.data('popupmenu');
- if (self.hasSquareFocusState()) {
self.positionFocusState(self.moreButton);
- }
function closeMenu() {
$(this).off('close.tabs selected.tabs');
@@ -3507,9 +3484,7 @@ Tabs.prototype = {
* @returns {void}
*/
hideFocusState() {
- if (this.hasSquareFocusState()) {
this.focusState.removeClass('is-visible');
- }
},
/**
@@ -3519,10 +3494,6 @@ Tabs.prototype = {
* @returns {void}
*/
positionFocusState(target, unhide) {
- if (!this.hasSquareFocusState()) {
- return;
- }
-
const self = this;
// TODO: Recheck this and improve
@@ -3661,10 +3632,7 @@ Tabs.prototype = {
const self = this;
const focusableItems = self.tablist;
- if (this.hasSquareFocusState() &&
- focusableItems.find('.is-focused').length === 0 &&
- !self.moreButton.hasClass('is-focused') &&
- !self.moreButton.hasClass('popup-is-open')) {
+ if (focusableItems.find('.is-focused').length === 0 && !self.moreButton.hasClass('is-focused') && !self.moreButton.hasClass('popup-is-open')) {
self.focusState.removeClass('is-visible');
}
@@ -3923,10 +3891,8 @@ Tabs.prototype = {
this.tablistContainer.off('mousewheel.tabs');
}
- if (this.hasSquareFocusState()) {
this.focusState.remove();
this.focusState = undefined;
- }
if (this.hasAnimatedBar()) {
this.animatedBar.remove();
",2
"diff --git a/test/components/searchfield/searchfield.e2e-spec.js b/test/components/searchfield/searchfield.e2e-spec.js @@ -84,17 +84,11 @@ describe('Searchfield full-text category tests', () => {
});
it('Can select a category from the list', async () => {
- let searchfieldCategoryButtonEl = await element(by.css('[aria-controls=""popupmenu-2""]'));
- await searchfieldCategoryButtonEl.click();
-
- const targetCategory = await element(by.id('clothing-single'));
- await targetCategory.click();
-
- searchfieldCategoryButtonEl = await element(by.css('[aria-controls=""popupmenu-2""]'));
- await browser.driver
- .wait(protractor.ExpectedConditions.presenceOf(searchfieldCategoryButtonEl), config.waitFor);
+ const categoryButtonSelector = '[aria-controls=""popupmenu-2""]';
+ await element(by.css(categoryButtonSelector)).click();
+ await element(by.id('clothing-single')).click();
- expect(searchfieldCategoryButtonEl.getText()).toEqual('Clothing');
+ expect(await element(by.css(categoryButtonSelector)).getText()).toEqual('Clothing');
});
});
",2
"diff --git a/test/components/colorpicker/colorpicker.func-spec.js b/test/components/colorpicker/colorpicker.func-spec.js @@ -43,33 +43,17 @@ describe('ColorPicker Methods', () => {
expect(colorpickerEl.parentNode.style.width).toEqual('400px');
});
- it('Should get the current hex value', (done) => {
- colorpickerObj.toggleList();
-
- setTimeout(() => {
- expect(colorpickerObj.isPickerOpen).toBeTruthy();
- expect(document.body.querySelector('.colorpicker.is-open')).toBeTruthy();
- const anchor = document.body.querySelector('#colorpicker-menu li a');
- anchor.click();
+ it('Should get the current hex value', () => {
+ colorpickerObj.setColor('#1a1a1a');
expect(colorpickerObj.getHexValue()).toEqual('#1A1A1A');
- done();
- }, 300);
});
- it('Should get the current label value', (done) => {
+ it('Should get the current label value', () => {
colorpickerObj.settings.showLabel = true;
- colorpickerObj.toggleList();
-
- setTimeout(() => {
- expect(colorpickerObj.isPickerOpen).toBeTruthy();
- expect(document.body.querySelector('.colorpicker.is-open')).toBeTruthy();
- const anchor = document.body.querySelector('#colorpicker-menu li a');
- anchor.click();
+ colorpickerObj.setColor('#1a1a1a');
expect(colorpickerObj.getLabelValue()).toEqual('Slate10');
- done();
- }, 300);
});
it('Should set the color/label on the field', () => {
",2
"diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md **Explain the _details_ for making this change. What existing problem does the pull request solve?**
-
-<!-- Example: When ""Adding a function to do X"", explain why it is necessary to have a way to do X. -->
+<!--
+Example: When ""Adding a function to do X"",
+explain why it is necessary to have a way to do X.
+-->
**Related github/jira issue (required)**:
-
-<!-- Provide a link to the related issue to this Pull Request.-->
+<!--
+Provide a link to the related issue(s) to this Pull Request;
+auto-closing github issues if necessary (example: ""Closes #100"")
+-->
**Steps necessary to review your pull request (required)**:
<!--
@@ -14,8 +18,4 @@ Include:
- test scenarios
-->
-
-**Closing issues**
-<!-- Please add `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if such). -->
-
<!-- After submitting your PR, please check back to make sure tests pass on Travis. -->
",2
"diff --git a/test/protractor.ci.bs.conf.js b/test/protractor.ci.bs.conf.js @@ -12,11 +12,10 @@ const getSpecs = (listSpec) => {
};
const theme = process.env.ENTERPRISE_THEME || 'light'
-let browserstackBuildID = `${theme} theme: ci:bs e2e ${Date.now()}`;
+let browserstackBuildID = `${Date.now()} : ${theme} theme: ci:bs e2e`;
if (process.env.TRAVIS_BUILD_NUMBER) {
- browserstackBuildID = process.env.TRAVIS_BUILD_NUMBER;
- browserstackBuildID = `${theme} theme: ci:bs e2e ${process.env.TRAVIS_BUILD_NUMBER}`;
+ browserstackBuildID = `Travis Build No. ${process.env.TRAVIS_BUILD_NUMBER} : ${theme} theme: ci:bs e2e`;
}
exports.config = {
",2
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md ## v4.8.0
- [Npm Package](https://www.npmjs.com/package/ids-enterprise)
-- [IDS NG (Angular) Change Log](https://github.com/infor-design/enterprise-ng/blob/master/docs/CHANGELOG.md)
+- [IDS Enterprise Angular Change Log](https://github.com/infor-design/enterprise-ng/blob/master/docs/CHANGELOG.md)
### v4.8.0 Features
- [Full Jira Release Notes](https://bit.ly/2HyT3zF)
- [Npm Package](https://www.npmjs.com/package/ids-enterprise)
-- [Angular Components Change Log](https://github.com/infor-design/enterprise-ng/blob/master/CHANGELOG.md)
+- [IDS Enterprise Angular Change Log](https://github.com/infor-design/enterprise-ng/blob/master/docs/CHANGELOG.md)
### v4.7.0 Features
- [Full Jira Release Notes](https://bit.ly/2jodbem)
- [Npm Package](http://npm.infor.com)
-- [Angular Components Change Log](https://github.com/infor-design/enterprise-ng/blob/master/CHANGELOG.md)
-- [Example Site](http://usalvlhlpool1.infor.com/4.6.0/components/)
+- [IDS Enterprise Angular Change Log](https://github.com/infor-design/enterprise-ng/blob/master/docs/CHANGELOG.md)
### v4.6.0 Key New Features
## v4.5.0
-[Full Jira Release Notes](https://bit.ly/2GlnGJ1)\
-[Npm Package](http://npm.infor.com)\
-[Angular Components Change Log](https://github.com/infor-design/enterprise-ng/blob/master/CHANGELOG.md)\
-[Example Site](http://usalvlhlpool1.infor.com/4.5.0/components/)
-
### v4.5.0 Key New Features
-- `[Font]` Experimental new font added from IDS as explained [here](http://bit.ly/2p2sjjZ)
+- `[Font]` Experimental new font added from IDS as explained
- `[Datagrid]` Added support for pasting from excel
- `[Datagrid]` Added option to specify which column stretches
",2
"diff --git a/app/views/components/datagrid/test-wide-grid-expandable-row-with-form-buttons.html b/app/views/components/datagrid/test-wide-grid-expandable-row-with-form-buttons.html <div class=""row"">
<div class=""twelve columns"">
- <form class=""test-form"" data-validate-on=""submit"" data-validate-on=""submit"">
+ <form class=""test-form"" data-validate-on=""submit"">
<div class=""row"">
<div class=""one-half column"">
<div class=""content"">
",2
"diff --git a/src/components/validation/readme.md b/src/components/validation/readme.md @@ -5,8 +5,6 @@ demo:
pages:
- name: Main Validation Examples
slug: example-index
- - name: Disabled Form
- slug: example-form-disabled
- name: Multiple Validation Errors on a Field
slug: example-multiple-errors
- name: Legacy Short Fields
",2
"diff --git a/test/components/dropdown/dropdown.e2e-spec.js b/test/components/dropdown/dropdown.e2e-spec.js @@ -156,7 +156,6 @@ describe('Dropdown example-index tests', () => {
// First key press causes the menu to close
await dropdownSearchEl.sendKeys(protractor.Key.TAB);
- await browser.driver.sleep(config.sleep);
// Second key press causes the focus to shift away
await element(by.css('div[aria-controls=""dropdown-list""]')).sendKeys(protractor.Key.TAB);
",2
"diff --git a/.travis.yml b/.travis.yml @@ -6,8 +6,8 @@ dist: trusty
node_js:
- ""10""
before_install:
- - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
- - sudo dpkg -i google-chrome*.deb
+ - if [ $TEST_SUITE != lint ]; then wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb; fi
+ - if [ $TEST_SUITE != lint ]; then sudo dpkg -i google-chrome*.deb; fi
cache:
directories:
- node_modules
",2
"diff --git a/src/components/hierarchy/hierarchy.js b/src/components/hierarchy/hierarchy.js @@ -27,7 +27,6 @@ const COMPONENT_NAME = 'hierarchy';
* @param {boolean} [settings.paging=false] If true show pagination.
* @param {boolean} [settings.renderSubLevel=false] If true elements with no children will be rendered detached
* @param {object} [settings.emptyMessage = { title: 'No Data', info: , icon: 'icon-empty-no-data' }]
-* @param {boolean} [settings.es6Template] If true create template using es6 template literals
* An empty message will be displayed when there is no chart data. This accepts an object of the form
* `emptyMessage: {
* title: 'No Data Available',
@@ -49,7 +48,6 @@ const HIERARCHY_DEFAULTS = {
beforeExpand: null,
paging: false,
renderSubLevel: false,
- es6Template: null,
rootClass: 'hierarchy',
emptyMessage: { title: (Locale ? Locale.translate('NoData') : 'No Data Available'), info: '', icon: 'icon-empty-no-data' }
};
@@ -443,6 +441,19 @@ Hierarchy.prototype = {
this.updateState(node, false, null, 'add');
},
+ /**
+ * Closes popupmenu
+ * @private
+ * @param node leaf containing btn-actions
+ */
+ closePopupMenu(node) {
+ const actionButton = node.find('.btn-actions');
+
+ if (actionButton.length !== 0) {
+ actionButton.data('popupmenu').close();
+ }
+ },
+
/**
* Expand the nodes until nodeId is displayed on the page.
* @private
@@ -455,6 +466,14 @@ Hierarchy.prototype = {
const s = this.settings;
const node = domObject.leaf;
let nodeTopLevel = node.next();
+ const actionButton = node.find('.btn-actions');
+
+ // close popupmenu if open
+ this.closePopupMenu(node);
+
+ if (actionButton.length !== 0) {
+ actionButton.data('popupmenu').close();
+ }
nodeTopLevel.animateOpen();
/**
@@ -490,6 +509,9 @@ Hierarchy.prototype = {
const node = domObject.leaf;
let nodeTopLevel = node.next();
+ // close popupmenu if open
+ this.closePopupMenu(node);
+
nodeTopLevel.animateClosed().on('animateclosedcomplete', () => {
/**
* Fires when leaf collapsed.
@@ -676,13 +698,7 @@ Hierarchy.prototype = {
* @returns {string} compiled template as HTML string
*/
getTemplate(data) {
- let template;
-
- if (this.settings.es6Template === null) {
- template = Tmpl.compile(`{{#dataset}}${$(`#${this.settings.templateId}`).html()}{{/dataset}}`, { dataset: data });
- } else if (this.settings.es6Template !== null) {
- return this.settings.es6Template(data);
- }
+ const template = Tmpl.compile(`{{#dataset}}${$(`#${this.settings.templateId}`).html()}{{/dataset}}`, { dataset: data });
// Init popupmenu after rendered in DOM
setTimeout(() => {
",2
"diff --git a/src/components/charts/charts.js b/src/components/charts/charts.js @@ -256,8 +256,7 @@ charts.showTooltip = function (x, y, content, arrow) {
*/
charts.addLegend = function (series, chartType, settings, container) {
let i;
- console.log('series', series);
- console.log('-->', series[0].data.legendAbbrName);
+
if (series.length === 0) {
return;
}
@@ -283,8 +282,6 @@ charts.addLegend = function (series, chartType, settings, container) {
width += 55;
const widthPercent = width / $(container).width() * 100;
- console.log('innerwidth', innerWidth);
-
for (i = 0; i < series.length; i++) {
if (!series[i].name) {
continue; // eslint-disable-line
",2
"diff --git a/test/components/dropdown/dropdown.e2e-spec.js b/test/components/dropdown/dropdown.e2e-spec.js @@ -180,7 +180,7 @@ describe('Dropdown example-index tests', () => {
expect(await element(by.css('div[aria-controls=""dropdown-list""]'))).not.toContain('is-open');
});
- fit('Should not allow the escape key to re-open a closed menu', async () => { //eslint-disable-line
+ it('Should not allow the escape key to re-open a closed menu', async () => { //eslint-disable-line
const dropdownEl = await element(by.css('div[aria-controls=""dropdown-list""]'));
await browser.driver
",2
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -5275,7 +5275,6 @@ Datagrid.prototype = {
value = value.toLowerCase();
// Strip any html markup that might be in the formatted value
- //value = value.replace(/(<([^>]+)>)|(&lt;([^>]+)&gt;)/ig, '');
value = value.replace(/(<([^>]+)>)|(amp;)|(&lt;([^>]+)&gt;)/ig, '');
return value.indexOf(filterExpr.value) > -1;
",2
"diff --git a/src/components/searchfield/_searchfield-toolbar.scss b/src/components/searchfield/_searchfield-toolbar.scss @@ -702,27 +702,6 @@ $toolbarsearchfield-category-empty-width: 51px;
}
}
}
-
- .header,
- .masthead {
- .toolbar-searchfield-wrapper.non-collapsible {
- .searchfield {
- background-color: rgba($searchfield-moduletabs-bg-color, 0.5);
- border-bottom-color: rgba($searchfield-moduletabs-border-color, 0.7);
- }
- }
- }
-
- .module-tabs {
- .toolbar-searchfield-wrapper.non-collapsible {
- // reset all the styling for the searchfield to correctly appear open.
- .searchfield {
- background-color: rgba($searchfield-header-bg-color, 0.5);
- border-bottom-color: rgba($searchfield-header-border-color, 0.7);
- }
- }
- }
-
}
html[dir='rtl'] {
",2
"diff --git a/test/components/tabs/tabs.e2e-spec.js b/test/components/tabs/tabs.e2e-spec.js @@ -485,36 +485,3 @@ describe('Tabs ajax as href tests', () => {
expect(await element(by.id('ajaxified-tabs-tab-2')).getAttribute('innerHTML')).not.toBe('');
});
});
-
-describe('Tabs click example-activated-event tests', () => {
- beforeEach(async () => {
- await utils.setPage('/components/tabs/example-activated-event');
- const tabsContainerEl = await element(by.id('tabs'));
- await browser.driver
- .wait(protractor.ExpectedConditions.presenceOf(tabsContainerEl), config.waitsFor);
- });
-
- it('Should not have errors', async () => {
- await utils.checkForErrors();
- });
-
- it('Should be able to call activate and beforeActivate in tabs', async () => { //eslint-disable-line
- const opportunitiesEl = await element.all(by.css('.tab-list li')).get(2);
-
- await browser.actions().mouseMove(opportunitiesEl).perform();
- await browser.actions().click(opportunitiesEl).perform();
- await opportunitiesEl.click();
-
- const beforeActivateEl = await element.all(by.css('.toast-title')).get(0);
- await browser.driver
- .wait(protractor.ExpectedConditions.presenceOf(beforeActivateEl), config.waitsFor);
-
- expect(await beforeActivateEl.getText()).toContain('beforeActivate');
-
- const activateEl = await element.all(by.css('.toast-title')).get(1);
- await browser.driver
- .wait(protractor.ExpectedConditions.presenceOf(activateEl), config.waitsFor);
-
- expect(await activateEl.getText()).toContain('activated');
- });
-});
",2
"diff --git a/app/src/js/custom-route-options.js b/app/src/js/custom-route-options.js @@ -59,8 +59,6 @@ module.exports = function customRouteOptions(req, res) {
// RenderLoop
if (url.match(/renderloop\/example-delayed-start/)) {
- debugger;
-
SohoConfig.renderLoop = {};
SohoConfig.renderLoop.noAutoStart = true;
}
@@ -78,7 +76,6 @@ module.exports = function customRouteOptions(req, res) {
// If there have been properties added to SohoConfig,
// stringify and pass it to the view options
if (Object.keys(SohoConfig).length) {
- debugger;
customOpts.SohoConfig = JSON.stringify(SohoConfig);
}
",2
"diff --git a/test/components/tabs/tabs-events.func-spec.js b/test/components/tabs/tabs-events.func-spec.js @@ -8,7 +8,7 @@ let tabsPanelEl;
let svgEl;
let tabsObj;
-describe('Tabs API', () => {
+fdescribe('Tabs API', () => { //eslint-disable-line
beforeEach(() => {
tabsEl = null;
tabsPanelEl = null;
@@ -46,16 +46,6 @@ describe('Tabs API', () => {
expect(spyEvent).toHaveBeenTriggered();
});
- it('Should trigger ""afteractivated"" event', (done) => {
- const spyEvent = spyOnEvent('#tabs-normal', 'afteractivated');
- tabsObj.activate('#tabs-normal-notes');
-
- setTimeout(() => {
- expect(spyEvent).toHaveBeenTriggered();
- done();
- }, 301);
- });
-
it('Should trigger ""hash-change"" event', () => {
tabsObj.settings.changeTabOnHashChange = true;
const spyEvent = spyOnEvent('#tabs-normal', 'hash-change');
",2
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -247,7 +247,7 @@ describe('Datagrid paging (client side) tests', () => {
expect(await element(by.css('tbody tr:nth-child(10) td:nth-child(2) span')).getText()).toEqual('9');
});
- fit('Should be able to move to specific page', async () => { //eslint-disable-line
+ it('Should be able to move to specific page', async () => {
expect(await element(by.css('tbody tr:nth-child(1) td:nth-child(2) span')).getText()).toEqual('0');
expect(await element(by.css('tbody tr:nth-child(10) td:nth-child(2) span')).getText()).toEqual('9');
",2
"diff --git a/app/views/components/bar/test-axis-formatter.html b/app/views/components/bar/test-axis-formatter.html @@ -18,23 +18,23 @@ $('body').on('initialized', function () {
var dataset = [{
data: [
// {'name': 'Lee Hogan', 'value': 1101061117},
- {'name': 'Dan Barret', 'abbrName': 'Dan Barret', 'shortName': 'Dan Barret', 'value': 1105272},
- {'name': 'Ed Martinez', 'abbrName': 'Ed Martinez', 'shortName': 'Ed Martinez', 'value': 773456},
- {'name': 'Linda Walsh', 'abbrName': 'Linda Walsh', 'shortName': 'Linda Walsh', 'value': 752648},
- {'name': 'Cathy Hughes', 'abbrName': 'Cathy Hughes', 'shortName': 'Cathy Hughes', 'value': 274582},
- {'name': 'Kim Lee', 'abbrName': 'Kim Lee', 'shortName': 'Kim Lee', 'value': 143623},
- {'name': 'Derek Murray', 'abbrName': 'Derek Murray', 'shortName': 'Derek Murray', 'value': 91783},
- {'name': 'Manuel Fuentes', 'abbrName': 'Manuel Fuentes', 'shortName': 'Manuel Fuentes', 'value': 79700},
- {'name': 'Georgine Ekels', 'abbrName': 'Georgine Ekels', 'shortName': 'Georgine Ekels', 'value': 79594},
- {'name': 'Hans Stichler', 'abbrName': 'Hans Stichler', 'shortName': 'Hans Stichler', 'value': 68719},
- {'name': 'Rajeev Mitra', 'abbrName': 'Rajeev Mitra', 'shortName': 'Rajeev Mitra', 'value': 41814},
- {'name': 'Jean Grant', 'abbrName': 'Jean Grant', 'shortName': 'Jean Grant', 'value': 14153},
- {'name': 'Agnes Kumer', 'abbrName': 'Agnes Kumer', 'shortName': 'Agnes Kumer', 'value': 11612},
- {'name': 'Administrator', 'abbrName': 'Administrator', 'shortName': 'Administrator', 'value': 10330},
- {'name': 'Brian McNulty', 'abbrName': 'Brian McNulty', 'shortName': 'Brian McNulty', 'value': 3812},
- {'name': 'Ken Dryden', 'abbrName': 'Ken Dryden', 'shortName': 'Ken Dryden', 'value': 0},
- {'name': 'Lou Pizzutti', 'abbrName': 'Lou Pizzutti', 'shortName': 'Lou Pizzutti', 'value': 0},
- {'name': 'John Smith', 'abbrName': 'John Smith', 'shortName': 'John Smith', 'value': 0}
+ {'name': 'Dan Barret', 'value': 1105272},
+ {'name': 'Ed Martinez', 'value': 773456},
+ {'name': 'Linda Walsh', 'value': 752648},
+ {'name': 'Cathy Hughes', 'value': 274582},
+ {'name': 'Kim Lee', 'value': 143623},
+ {'name': 'Derek Murray', 'value': 91783},
+ {'name': 'Manuel Fuentes', 'value': 79700},
+ {'name': 'Georgine Ekels', 'value': 79594},
+ {'name': 'Hans Stichler', 'value': 68719},
+ {'name': 'Rajeev Mitra', 'value': 41814},
+ {'name': 'Jean Grant', 'value': 14153},
+ {'name': 'Agnes Kumer', 'value': 11612},
+ {'name': 'Administrator', 'value': 10330},
+ {'name': 'Brian McNulty', 'value': 3812},
+ {'name': 'Ken Dryden', 'value': 0},
+ {'name': 'Lou Pizzutti', 'value': 0},
+ {'name': 'John Smith', 'value': 0}
],
name: 'Sales by Employee'
}];
",2
"diff --git a/src/components/searchfield/searchfield.js b/src/components/searchfield/searchfield.js @@ -429,6 +429,17 @@ SearchField.prototype = {
return this;
},
+ /**
+ * Simpler version of `adjustOnBreakpoint` for non-collapsible Toolbar Flex searchfields
+ */
+ simpleAdjustOnBreakpoint() {
+ if (this.shouldBeFullWidth()) {
+ this.wrapper[0].classList.remove('is-open');
+ return;
+ }
+ this.wrapper[0].classList.add('is-open');
+ },
+
/**
* Makes necessary adjustments to the DOM surrounding the Searchfield element to accommodate
* breakpoint changes.
@@ -763,6 +774,11 @@ SearchField.prototype = {
self.adjustOnBreakpoint();
});
self.adjustOnBreakpoint();
+ } else {
+ $('body').on(`resize.${this.id}`, () => {
+ self.simpleAdjustOnBreakpoint();
+ });
+ self.simpleAdjustOnBreakpoint();
}
if (this.collapseButton && this.collapseButton.length) {
",2
"diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js @@ -87,14 +87,6 @@ Modal.prototype = {
self.isCancelled = false;
- if (window.history && window.history.pushState) {
- $(window).off('popstate.modal');
-
- $(window).on('popstate.modal', () => {
- self.destroy();
- });
- }
-
// ensure is appended to body for new dom tree
if (this.settings.content) {
this.settings.trigger = this.settings.content instanceof jQuery ? this.settings.trigger : 'immediate';
@@ -914,8 +906,6 @@ Modal.prototype = {
self.element.closest('.modal-page-container').remove();
$.removeData(self.element[0], 'modal');
-
- $(window).off('popstate.modal');
}
if (!this.isOpen()) {
",2
"diff --git a/src/components/searchfield/searchfield.js b/src/components/searchfield/searchfield.js @@ -856,7 +856,7 @@ SearchField.prototype = {
// Override the 'click' listener created by Autocomplete (which overrides the
// default Popupmenu method) to act differntly when the More Results link is activated.
- self.element.on(`listopen.${this.id}`, (e, items) => {
+ self.element.on(`listopen.${this.id}`, () => {
const list = $('#autocomplete-list');
// Visual indicator class
",2
"diff --git a/src/components/tree/tree.js b/src/components/tree/tree.js @@ -140,7 +140,7 @@ Tree.prototype = {
* @param {object} a an anchor tag reference wrapped in a jQuery object.
* @returns {void}
*/
- //ApprovaOS Change - Added parameter checkox and icon to show check box and icon on demand for particular node
+ // Added parameters - To show check box and icon on demand for particular node
decorateNode(a, icon, hideCheckbox) {
a = this.isjQuery(a) ? a : $(a);
let parentCount = 0;
@@ -200,8 +200,7 @@ Tree.prototype = {
a[0].textContent = '';
if (a.children('svg.icon-tree').length === 0) {
- //old code: a.prepend($.createIcon({ icon: 'tree-node', classes: ['icon-tree'] }));
- //ApprovaOS Change - removed icon of node
+ // Show provided icon if any, if empty string provided then show empty icon otherwise show document icon.
if (icon || icon === '') {
a[0].insertAdjacentHTML('afterbegin', $.createIcon({ icon: icon, classes: ['icon-tree'] }));
} else {
@@ -214,9 +213,7 @@ Tree.prototype = {
}
// Inject checkbox
-
- //Old code - if (this.isMultiselect && !this.settings.hideCheckboxes) {
- //ApprovaOS Change - Show check box for particular node on demand
+ // Show check box for particular node on demand
if (this.isMultiselect && (!this.settings.hideCheckboxes || hideCheckbox === false)) {
a[0].insertAdjacentHTML('beforeend', '<span class=""tree-checkbox""></span>');
}
@@ -654,8 +651,8 @@ Tree.prototype = {
self.selectNodeFinish(node, focus, e);
}
} else { // No Callback specified
- //ApprovaOS Change - if tree is multiselect commented because do not select node on expand node
- //self.selectNodeFinish(node, focus, e);
+ // Commented because if tree is multiselect, do not select node on collapse node
+ // self.selectNodeFinish(node, focus, e)
}
self.setTreeIcon(node.closest('.folder').removeClass('is-open').end().find('svg.icon-tree'), s.folderIconClosed);
@@ -695,8 +692,8 @@ Tree.prototype = {
self.selectNodeFinish(node, focus, e);
}
} else { // No Callback specified
- //ApprovaOS Change - if tree is multiselect commented because do not select node on expand node
- //self.selectNodeFinish(node, focus, e);
+ // Commented because if tree is multiselect, do not select node on expand node
+ // self.selectNodeFinish(node, focus, e)
}
const nodeData = node.data('jsonData');
@@ -1295,7 +1292,7 @@ Tree.prototype = {
elem = this.findById(node.parent);
}
- //ApprovaOS Change - Update dataset after added node before or after.
+ // Update dataset after inserting node before or after other node.
if (location instanceof jQuery && location.is('li')) {
var updatedNode = this.findById($(location[0].parentNode.parentNode).find('a')[0].id);
var index = updatedNode.children.findIndex(function (element) {
@@ -1547,7 +1544,7 @@ Tree.prototype = {
* @returns {object} li added
*/
- //ApprovaOS Change - parameter added to add node before or after the node
+ // Parameter added - to add node before or after the node
addNode(nodeData, location, isBeforeOrAfter) {
const badgeAttr = typeof nodeData.badge === 'object' ? JSON.stringify(nodeData.badge) : nodeData.badge;
@@ -1565,7 +1562,7 @@ Tree.prototype = {
a.setAttribute('data-alert-icon', nodeData.alertIcon);
}
- //Start ApprovaOS Change - added for dropdown
+ // Insert dropdown - Start
if (nodeData.type === 'dropdown') {
var selectedOptionText;
a.attr({
@@ -1602,7 +1599,7 @@ Tree.prototype = {
}
}
}
- //End ApprovaOS Change - added for dropdown
+ // Insert dropdown - End
if (nodeData.text) {
a.textContent = nodeData.text;
@@ -1630,7 +1627,7 @@ Tree.prototype = {
found = true;
}
- //ApprovaOS Change - added node in between the node
+ // Insert node in between the node
if (location instanceof jQuery && isBeforeOrAfter === 'before') {
li.insertBefore(location);
found = true;
@@ -1639,7 +1636,6 @@ Tree.prototype = {
found = true;
}
- //ApprovaOS Change -
if (location instanceof jQuery &&
(!nodeData.parent || !found) && !(nodeData.parent instanceof jQuery)
&& !(isBeforeOrAfter === 'before' || isBeforeOrAfter === 'after')) {
@@ -1683,7 +1679,7 @@ Tree.prototype = {
}
a = $(a);
- //ApprovaOS Change - Added parameter to show or hide checkbox according to node.
+ // Added parameter to show or hide checkbox according to node.
this.decorateNode(a, nodeData.icon, nodeData.hideCheckbox);
if (nodeData.selected) {
",2
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -153,7 +153,7 @@ describe('Datagrid mixed selection tests', () => {
});
});
-fdescribe('Datagrid Lookup Editor', () => {
+describe('Datagrid Lookup Editor', () => {
beforeEach(async () => {
await utils.setPage('/components/datagrid/test-editable-lookup-mask');
",2
"diff --git a/app/src/js/custom-route-options.js b/app/src/js/custom-route-options.js @@ -40,17 +40,10 @@ module.exports = function customRouteOptions(req, res) {
// Distribution (AMD)
if (url.match(/tests\/distribution/)) {
customOpts.amd = true;
- customOpts.layout = 'layout-nofrills'; // No layout for this one on purpose.
+ customOpts.layout = 'layout-nofrills';
customOpts.subtitle = 'AMD Tests';
}
- /*
- // Header
- if (url.match(/components\/header/)) {
- customOpts.layout = 'components/header/layout';
- }
- */
-
// Placement Logic
if (url.match(/place\/test-container-is-body/)) {
customOpts.layout = 'components/place/layout-body';
",2
"diff --git a/src/components/cards/_cards.scss b/src/components/cards/_cards.scss .card-content {
height: auto;
min-height: auto;
- overflow: none;
}
}
.widget-content,
.card-content {
min-width: 0;
- overflow: none;
width: auto;
}
}
",2
"diff --git a/scripts/deploy-documentation.js b/scripts/deploy-documentation.js @@ -551,7 +551,7 @@ function writeHtmlFile(hbsTemplate, componentName) {
if (err) {
reject(err);
} else {
- swlog.logTaskAction('Created', `${dest.replace(process.cwd(), '')}.html`);
+ swlog.logTaskAction('Created', `${dest.replace(process.cwd(), '')}`);
resolve();
}
});
",2
"diff --git a/app/views/components/popupmenu/test-multiple-context-menu-destroy.html b/app/views/components/popupmenu/test-multiple-context-menu-destroy.html const contextMenuApi2 = contextMenu2.data('popupmenu');
// This emulates an *ngIf on the first field, where it's presence is toggled.
- $('#popdown-destroy').click(() => {
+ $('#popdown-destroy').click(function(){
// turn off events
contextMenu.off();
",2
"diff --git a/app/src/js/routes/custom-icons.js b/app/src/js/routes/custom-icons.js @@ -44,7 +44,6 @@ const template = handlebars.compile(hbsTemplate);
* @param {String} url - The route request
*/
module.exports = url => {
- console.log(url);
const fileName = path.basename(url, '.html');
const iconSet = pageMap[fileName];
const meta = JSON.parse(fs.readFileSync(`node_modules/ids-identity/dist/theme-soho/icons/${iconSet}/metadata.json`, 'utf-8').toString());
",2
"diff --git a/src/components/editor/_editor.scss b/src/components/editor/_editor.scss }
.html-icon {
- margin-left: -32px;
+ margin-left: -18px;
width: 85px;
}
&[data-element='strike'] {
margin-right: 8px;
-
- svg {
- height: 22px;
- width: 15px;
- }
}
&[data-element='foreColor'] {
",2
"diff --git a/src/components/datagrid/datagrid.editors.js b/src/components/datagrid/datagrid.editors.js @@ -486,7 +486,10 @@ const editors = {
};
this.val = function (v) {
- v = Locale.parseDate(v);
+ if (v === '0000' ||v === '000000' || v === '00000000') {
+ // Means no date in some applications
+ v = '';
+ }
if (v) {
// Note that the value should be formatted from the formatter.
this.input.val(v);
",2
"diff --git a/src/components/accordion/accordion.js b/src/components/accordion/accordion.js @@ -1493,24 +1493,6 @@ Accordion.prototype = {
return this;
},
-
- /**
- * Check for tooltip type spantooltip or component
- * @private
- * @returns {boolean} True if is spantooltip
- */
- isSpantooltip() {
- debugger
- let isSpantooltipType = false;
- if (self.tooltip) {
- const tooltipJQ = this.tooltip instanceof jQuery ? this.tooltip : $(this.tooltip);
- if (tooltipJQ.data('gridtooltip')) {
- isSpantooltipType = true;
- }
- }
- return isSpantooltipType;
- },
-
/**
* Hide the visible tooltip.
* @private
",2
"diff --git a/test/components/hierarchy/hierarchy.func-spec.js b/test/components/hierarchy/hierarchy.func-spec.js @@ -40,8 +40,6 @@ describe('hierarchy API', () => {
cleanup(['.svg-icons', '#hierarchyChartTemplate', '#hierarchy', '#hierarchyInit', '.hierarchy']);
hierarchyAPI.destroy();
- svgEl.parentNode.removeChild(svgEl);
- hierarchyEl.parentNode.removeChild(hierarchyEl);
});
it('Can be invoked', () => {
",2
"diff --git a/test/components/lookup/lookup.e2e-spec.js b/test/components/lookup/lookup.e2e-spec.js @@ -166,14 +166,14 @@ describe('Lookup (multiselect)', () => {
});
});
-describe('Lookup paging tests', () => {
+fdescribe('Lookup paging tests', () => {
beforeEach(async () => {
await utils.setPage('/components/lookup/example-paging');
+ await browser.driver.wait(protractor.ExpectedConditions.presenceOf(element(by.css('.trigger'))), config.waitsFor);
});
it('should have a pager component', async () => {
await element(by.css('.trigger')).click();
- await browser.driver.sleep(config.sleep);
await browser.driver.wait(protractor.ExpectedConditions.presenceOf(element(by.css('.pager-toolbar'))), config.waitsFor);
expect(await element(by.className('pager-toolbar')).isPresent()).toBeTruthy();
@@ -181,7 +181,6 @@ describe('Lookup paging tests', () => {
it('should have a search and actions', async () => {
await element(by.css('.trigger')).click();
- await browser.driver.sleep(config.sleep);
await browser.driver.wait(protractor.ExpectedConditions.presenceOf(element(by.css('.searchfield'))), config.waitsFor);
await browser.driver.wait(protractor.ExpectedConditions.presenceOf(element(by.css('.btn-actions'))), config.waitsFor);
@@ -192,7 +191,6 @@ describe('Lookup paging tests', () => {
it('should have an enabled next page button', async () => {
await element(by.css('.trigger')).click();
- await browser.driver.sleep(config.sleep);
await browser.driver.wait(protractor.ExpectedConditions.presenceOf(element(by.css('.pager-next'))), config.waitsFor);
expect(await element(by.css('.pager-next')).isEnabled()).toBe(true);
@@ -200,7 +198,6 @@ describe('Lookup paging tests', () => {
it('should be able to go the next page', async () => {
await element(by.css('.trigger')).click();
- await browser.driver.sleep(config.sleep);
await browser.driver.wait(protractor.ExpectedConditions.presenceOf(element(by.css('.pager-next'))), config.waitsFor);
await element(by.css('.pager-next')).click();
",2
"diff --git a/package.json b/package.json ""zip-dist"": ""npx grunt zip-dist"",
""documentation"": ""node ./scripts/deploy-documentation.js"",
""publish-aws"": ""AWS_PROFILE=sohoxi directory-to-s3 -d dist infor-devops-core-soho-us-east-1/sohoxi/4.12.0 -v"",
- ""release:beta"": ""npx release-it minor --preRelease=beta --no-github.release"",
- ""release:rc"": ""npx release-it --preRelease=rc --no-github.release"",
- ""release:final"": ""npx release-it"",
+ ""release:beta"": ""release-it minor --preRelease=beta --no-github.release"",
+ ""release:rc"": ""release-it --preRelease=rc --no-github.release"",
+ ""release:final"": ""release-it"",
""test"": ""npm run mdlint && npm run eslint && npm run stylelint && npm run functional:ci && npm run e2e:ci""
},
""dependencies"": {
",2
"diff --git a/src/components/pager/pager.js b/src/components/pager/pager.js @@ -1014,13 +1014,6 @@ Pager.prototype = {
};
pageSizeButton.popupmenu(popupOpts);
-
- // Show additional context on the condensed version.
- if (this.showSmallPageSizeSelector) {
- pageSizeButton.tooltip({
- content: translatedText
- });
- }
}
$(this.pageSizeSelectorButton).on('selected.pager', (e, args) => {
@@ -1422,11 +1415,6 @@ Pager.prototype = {
if (this.pageSizeSelectorButton) {
$(this.pageSizeSelectorButton).off(`selected.${COMPONENT_NAME}`);
$(this.pageSizeSelectorButton).data('popupmenu').destroy();
-
- const tooltipAPI = $(this.pageSizeSelectorButton).data('tooltip');
- if (tooltipAPI) {
- tooltipAPI.destroy();
- }
}
this.pagerBar[0].innerHTML = '';
",2
"diff --git a/test/components/locale/locale.func-spec.js b/test/components/locale/locale.func-spec.js @@ -934,7 +934,7 @@ describe('Locale API', () => {
expect(Locale.parseDate('22-03-2000 20:11 Eastern-standaardtijd', { pattern: 'dd-MM-yyyy HH:mm zzzz' }).getTime()).toEqual(new Date(2000, 2, 22, 20, 11).getTime());
});
- fit('Should be able to display dates into another timezone', () => { //eslint-disable-line
+ it('Should be able to display dates into another timezone', () => {
Locale.set('en-US');
expect(Locale.dateToTimeZone(new Date(2018, 2, 26), 'Australia/Brisbane')).toEqual('3/26/2018, 2:00:00 PM');
@@ -947,7 +947,7 @@ describe('Locale API', () => {
expect(Locale.dateToTimeZone(new Date(2018, 2, 26), 'America/New_York')).toEqual('26-3-2018 00:00:00');
});
- fit('Should be able to display dates into another timezone including short timezone name', () => { //eslint-disable-line
+ it('Should be able to display dates into another timezone including short timezone name', () => {
Locale.set('en-US');
expect(Locale.dateToTimeZone(new Date(2018, 2, 26), 'Australia/Brisbane', 'short')).toEqual('3/26/2018, 2:00:00 PM GMT+10');
@@ -960,7 +960,7 @@ describe('Locale API', () => {
expect(Locale.dateToTimeZone(new Date(2018, 2, 26), 'America/New_York', 'short')).toEqual('26-3-2018 00:00:00 GMT-4');
});
- fit('Should be able to display dates into another timezone including long timezone name', () => { //eslint-disable-line
+ it('Should be able to display dates into another timezone including long timezone name', () => {
Locale.set('en-US');
expect(Locale.dateToTimeZone(new Date(2018, 2, 26), 'Australia/Brisbane', 'long')).toEqual('3/26/2018, 2:00:00 PM Australian Eastern Standard Time');
",2
"diff --git a/src/components/compositeform/compositeform.js b/src/components/compositeform/compositeform.js @@ -81,8 +81,6 @@ CompositeForm.prototype = {
// Check size and append class, if necessary
this.checkResponsive();
- this.applyIE11Fix();
-
return this;
},
@@ -105,8 +103,6 @@ CompositeForm.prototype = {
function changeExpanderText() {
const isExpanded = self.expandableAreaAPI.isExpanded();
self.setExpanderText(self.settings[isExpanded ? 'expandedText' : 'collapsedText']);
-
- self.applyIE11Fix();
}
if (this.hasSummary) {
@@ -164,23 +160,6 @@ CompositeForm.prototype = {
return this.element[0].classList.contains('on-side');
},
- /**
- * Determines if browser is IE11 and applies min-height fix for overflow
- * @returns {void}
- */
- applyIE11Fix() {
- const isIE11 = $('html').hasClass('ie11');
- const expandableElementArea = $('.expandable-area');
- const isElementExpanded = expandableElementArea.hasClass('is-expanded');
- if (isIE11 && isElementExpanded) {
- setTimeout(function () {
- expandableElementArea.css('min-height', $('.expandable-pane').outerHeight(true) + $('.expandable-footer').outerHeight(true));
- }, 300); // equal to transition time
- } else if (isIE11 && !isElementExpanded) {
- expandableElementArea.css('min-height', 'auto');
- }
- },
-
/**
* Re-invokes the Composite Form
* @returns {object} The component API for chaining.
",2
"diff --git a/src/components/searchfield/_searchfield-toolbar.scss b/src/components/searchfield/_searchfield-toolbar.scss @@ -47,8 +47,8 @@ $toolbarsearchfield-category-empty-width: 51px;
}
&.has-go-button {
-
text-align: right;
+
.searchfield {
border-bottom-right-radius: 0;
border-top-right-radius: 0;
",2
"diff --git a/src/components/header/header.js b/src/components/header/header.js @@ -117,14 +117,9 @@ Header.prototype = {
*/
build() {
let isFlex = false;
- let elem = this.element.find('.toolbar, .flex-toolbar');
+ const elem = this.element.find('.toolbar, .flex-toolbar');
if (!elem.length) {
- // Build a simple toolbar, if applicable
- let type = 'toolbar';
- if (this.settings.useFlexToolbar) {
- type = 'flex-toolbar';
- }
- elem = $(`<div class=""${type}""></div>`).prependTo(this.element);
+ return this;
}
if (elem.is('.toolbar-flex')) {
isFlex = true;
",2
"diff --git a/src/components/lookup/lookup.js b/src/components/lookup/lookup.js @@ -172,10 +172,6 @@ Lookup.prototype = {
addAria() {
const self = this;
self.label = self.isInlineLabel ? self.inlineLabelText : $(`label[for=""${self.element.attr('id')}""]`);
-
- if (self.label) {
- self.label.append(`<span class=""audible"">${Locale.translate('UseEnter')}</span>`);
- }
},
/**
@@ -811,10 +807,6 @@ Lookup.prototype = {
this.icon.remove();
this.element.unwrap();
-
- if (this.label && this.label != null) {
- this.label.find('.audible').remove();
- }
}
};
",2
"diff --git a/test/components/applicationmenu/applicationmenu.e2e-spec.js b/test/components/applicationmenu/applicationmenu.e2e-spec.js @@ -148,7 +148,7 @@ describe('Applicationmenu Personalization tests', () => {
});
if (utils.isChrome() && utils.isCI()) {
- fit('Should not visual regress on personalize', async () => {
+ it('Should not visual regress on personalize', async () => {
const windowSize = await browser.driver.manage().window().getSize();
await browser.driver.manage().window().setSize(1280, 724);
const section = await element(by.css('body.no-scroll'));
",2
"diff --git a/test/components/tabs/tabs-api.func-spec.js b/test/components/tabs/tabs-api.func-spec.js @@ -58,9 +58,7 @@ describe('Tabs API', () => {
tabsEl.style.width = '400px';
$('body').triggerHandler('resize');
- setTimeout(() => {
expect(tabsObj.hasMoreButton()).toBeTruthy();
- }, 300);
});
it('Should not be in responsive mode', () => {
",2
"diff --git a/README.md b/README.md @@ -13,43 +13,28 @@ With Zeppelin, you can build distributed applications, protocols and organizatio
## Getting Started
Zeppelin integrates with [Truffle](https://github.com/ConsenSys/truffle), an Ethereum development environment. Please install Truffle and initialize your project with `truffle init`.
+
```sh
-npm install -g truffle
+npm install -g truffle@beta
mkdir myproject && cd myproject
truffle init
```
To install the Zeppelin library, run:
```sh
-npm i zeppelin-solidity
-```
-
-After that, you'll get all the library's contracts in the `contracts/zeppelin` folder. You can use the contracts in the library like so:
-
-```js
-import ""./zeppelin/Ownable.sol"";
-
-contract MyContract is Ownable {
- ...
-}
+truffle install zeppelin
```
-> NOTE: The current distribution channel is npm, which is not ideal. [We're looking into providing a better tool for code distribution](https://github.com/OpenZeppelin/zeppelin-solidity/issues/13), and ideas are welcome.
-
-#### Truffle Beta Support
-We also support Truffle Beta npm integration. If you're using Truffle Beta, the contracts in `node_modules` will be enough, so feel free to delete the copies at your `contracts` folder. If you're using Truffle Beta, you can use Zeppelin contracts like so:
+After that, you'll get all the library's contracts in the `installed_contracts` folder. You can use the contracts in the library like so:
```js
-import ""zeppelin-solidity/contracts/Ownable.sol"";
+import 'zeppelin/ownership/Ownable.sol';
contract MyContract is Ownable {
...
}
```
-For more info see [the Truffle Beta package management tutorial](http://truffleframework.com/tutorials/package-management).
-
-
## Security
Zeppelin is meant to provide secure, tested and community-audited code, but please use common sense when doing anything that deals with real money! We take no responsibility for your implementation decisions and any security problem you might experience.
",3
"diff --git a/docs/source/getting-started.rst b/docs/source/getting-started.rst @@ -13,7 +13,7 @@ To install the Zeppelin library, run::
After that, you'll get all the library's contracts in the contracts/zeppelin folder. You can use the contracts in the library like so::
- import ""./zeppelin/Ownable.sol"";
+ import ""zeppelin-solidty/contracts/Ownable.sol"";
contract MyContract is Ownable {
...
",3
"diff --git a/contracts/ownership/HasNoEther.sol b/contracts/ownership/HasNoEther.sol @@ -36,6 +36,6 @@ contract HasNoEther is Ownable {
* @dev Transfer all Ether held by the contract to the owner.
*/
function reclaimEther() external onlyOwner {
- owner.transfer(this.balance);
+ owner.transfer(address(this).balance);
}
}
",3
"diff --git a/contracts/token/ERC20/BasicToken.sol b/contracts/token/ERC20/BasicToken.sol @@ -17,14 +17,14 @@ contract BasicToken is ERC20Basic {
uint256 totalSupply_;
/**
- * @dev total number of tokens in existence
+ * @dev Total number of tokens in existence
*/
function totalSupply() public view returns (uint256) {
return totalSupply_;
}
/**
- * @dev transfer token for a specified address
+ * @dev Transfer token for a specified address
* @param _to The address to transfer to.
* @param _value The amount to be transferred.
*/
",3
"diff --git a/README.md b/README.md @@ -80,7 +80,7 @@ The following provides visibility into how OpenZeppelin's contracts are organize
- **introspection** - An interface that can be used to make a contract comply with the ERC-165 standard as well as a contract that implements ERC-165 using a lookup table.
- **lifecycle** - A collection of base contracts used to manage the existence and behavior of your contracts and their funds.
- **math** - Libraries with safety checks on operations that throw on errors.
-- **mocks** - A collection of abstract contracts that are primarily used for unit testing. They also serve as good usage examples and demonstrate how to combine contracts with inheritence when developing your own custom applciations.
+- **mocks** - A collection of abstract contracts that are primarily used for unit testing. They also serve as good usage examples and demonstrate how to combine contracts with inheritence when developing your own custom applications.
- **ownership** - A collection of smart contracts that can be used to manage contract and token ownership
- **payment** - A collection of smart contracts that can be used to manage payments through escrow arrangements, withdrawals, and claims. Includes support for both single payees and multiple payees.
- **proposals** - A collection of smart contracts that reflect community Ethereum Improvement Proposals (EIPs). These contracts are under development and standardization. They are not recommended for production, but they are useful for experimentation with pending EIP standards. Go [here](https://github.com/OpenZeppelin/openzeppelin-solidity/wiki/ERC-Process) for more information.
",3
"diff --git a/CHANGELOG.md b/CHANGELOG.md ## 2.1.0 (unreleased)
### New features:
+ * Now targeting the 0.5.x line of Solidity compilers. For 0.4.24 support, use version 2.0 of OpenZeppelin.
* `WhitelistCrowdsale`: a crowdsale where only whitelisted accounts (`WhitelistedRole`) can purchase tokens. Adding or removing accounts from the whitelist is done by whitelisters (`WhitelisterRole`). Similar to the pre-2.0 `WhitelistedCrowdsale`. ([#1525](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1525))
* `RefundablePostDeliveryCrowdsale`: replacement for `RefundableCrowdsale` (deprecated, see below) where tokens are only granted once the crowdsale ends (if it meets its goal). ([#1543](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1543))
* `PausableCrowdsale`: allows for pausers (`PauserRole`) to pause token purchases. Other crowdsale operations (e.g. withdrawals and refunds, if applicable) are not affected. ([#832](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/832))
",3
"diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md @@ -6,10 +6,10 @@ All of the content for the site is in this repository. The guides are in the
the source code. If you want to help improve the content, this is the
repository you should be contributing to.
-[`solidity-docgen`](https://github.com/OpenZeppelin/solidity-docgen/tree/next) is the
+[`solidity-docgen`](https://github.com/OpenZeppelin/solidity-docgen) is the
program that extracts the API Reference from source code.
-The [`openzeppelin-docsite`](https://github.com/OpenZeppelin/openzeppelin-docsite/tree/next)
+The [`openzeppelin-docsite`](https://github.com/OpenZeppelin/openzeppelin-docsite)
repository hosts the configuration for Docusaurus, the static site generator
that we use.
",3
"diff --git a/package-lock.json b/package-lock.json }
},
""caniuse-db"": {
- ""version"": ""1.0.30000966"",
- ""resolved"": ""https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000966.tgz"",
- ""integrity"": ""sha512-PDXDry9EACH5Ld4s1JZMKR9BOnhO5qX/2Saqq9SeQhOSJbauFDwUzSefVyDuXN3trnR9MOicR9apPKcb1sihEA=="",
+ ""version"": ""1.0.30000967"",
+ ""resolved"": ""https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000967.tgz"",
+ ""integrity"": ""sha512-70gk6cLSD5rItxnZ7WUxyCpM9LAjEb1tVzlENQfXQXZS/IiGnfAC6u32G5cZFlDBKjNPBIta/QSx5CZLZepxRA=="",
""dev"": true
},
""caniuse-lite"": {
- ""version"": ""1.0.30000966"",
- ""resolved"": ""https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000966.tgz"",
- ""integrity"": ""sha512-qqLQ/uYrpZmFhPY96VuBkMEo8NhVFBZ9y/Bh+KnvGzGJ5I8hvpIaWlF2pw5gqe4PLAL+ZjsPgMOvoXSpX21Keg=="",
+ ""version"": ""1.0.30000967"",
+ ""resolved"": ""https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz"",
+ ""integrity"": ""sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ=="",
""dev"": true
},
""caseless"": {
""dev"": true
},
""node-releases"": {
- ""version"": ""1.1.17"",
- ""resolved"": ""https://registry.npmjs.org/node-releases/-/node-releases-1.1.17.tgz"",
- ""integrity"": ""sha512-/SCjetyta1m7YXLgtACZGDYJdCSIBAWorDWkGCGZlydP2Ll7J48l7j/JxNYZ+xsgSPbWfdulVS/aY+GdjUsQ7Q=="",
+ ""version"": ""1.1.18"",
+ ""resolved"": ""https://registry.npmjs.org/node-releases/-/node-releases-1.1.18.tgz"",
+ ""integrity"": ""sha512-/mnVgm6u/8OwlIsoyRXtTI0RfQcxZoAZbdwyXap0EeWwcOpDDymyCHM2/aR9XKmHXrvizHoPAOs0pcbiJ6RUaA=="",
""dev"": true,
""requires"": {
""semver"": ""^5.3.0""
}
},
""openzeppelin-docsite"": {
- ""version"": ""github:OpenZeppelin/openzeppelin-docsite#a21e2688298f6f612d69212973a7e56bc1455f57"",
+ ""version"": ""github:OpenZeppelin/openzeppelin-docsite#1a4c169fb660f61f805e5d23b33184efe4b8155a"",
""from"": ""github:OpenZeppelin/openzeppelin-docsite"",
""dev"": true,
""requires"": {
",3
"diff --git a/docs/modules/ROOT/pages/gsn.adoc b/docs/modules/ROOT/pages/gsn.adoc @@ -7,7 +7,7 @@ Here you'll learn all about the Gas Station Network (GSN) and how to write contr
If you're already up to speed with the workings of the GSN, feel free to skip to <<Receiving a relayed call>>, where we'll go over how to use the OpenZeppelin Contracts to easily write a GSNRecipient contract. Otherwise, strap in!
-WARNING: This feature is under development, and will be released in the next version of `@openzeppelin/contracts`.
+NOTE: This feature is being released in the next version of `@openzeppelin/contracts`, available right now through `npm install @openzeppelin/contracts@next`.
== Sending gas-less transactions
",3
"diff --git a/app/controllers/project-version.js b/app/controllers/project-version.js @@ -69,7 +69,7 @@ export default Controller.extend(FilterParams, {
return project.hasMany('projectVersions').ids();
}),
- projectVersions: computed('model', function() {
+ projectVersions: computed('model.project.projectVersions.[]', function() {
const projectVersions = this.get('model.project.projectVersions');
let versions = projectVersions.toArray().sort(function(a, b) {
const a_ver = _.last(a.get('id').split(""-""));
",3
"diff --git a/ember-cli-build.js b/ember-cli-build.js @@ -37,11 +37,11 @@ module.exports = function(defaults) {
patterns: [
`${app.env.API_HOST}/json-docs-1/(.+)`,
`${app.env.API_HOST}/rev-index/(.+)`
- ],
+ ]
};
if (app.env === 'production') {
- app.options['ember-cli-service-worker'] = {
+ app.options['ember-service-worker'] = {
rootUrl: '/api-new/'
}
}
",3
"diff --git a/README.md b/README.md @@ -11,4 +11,4 @@ To run a11y tests, run `test_a11y=yes ember serve`
## Staging Environment
-Latest changes from master can be seen on https://ember-api-docs-staging.herokuapp.com/
+Latest changes from master can be seen on https://ember-api-docs-staging-herokuapp-com.global.ssl.fastly.net
",3
"diff --git a/lib/hash-to-query/index.js b/lib/hash-to-query/index.js @@ -22,7 +22,8 @@ module.exports = {
'&show=inherited,protected,private,deprecated' +
'&type=' +
type;
- window.location.href = window.location.origin + pathName + anchor;
+ window.location.hash = '';
+ window.location.search = anchor;
}
</script>
`
",3
"diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml @@ -29,6 +29,8 @@ jobs:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
+ - run: npm i -g npm@9
+
- name: Install dependencies
run: npm ci
@@ -50,6 +52,8 @@ jobs:
cache: 'npm'
node-version: ${{ env.NODE_VERSION }}
+ - run: npm i -g npm@9
+
- name: Install dependencies
run: npm ci
",3
"diff --git a/doc/features/connection-pooling/README.md b/doc/features/connection-pooling/README.md @@ -27,8 +27,8 @@ const options = {
contactPoints: ['1.2.3.4'],
pooling: {
coreConnectionsPerHost: {
- [distance.local] = 2,
- [distance.remote] = 1
+ [distance.local]: 2,
+ [distance.remote]: 1
}
}
};
",3
"diff --git a/js/tree.js b/js/tree.js clone, interval, doDrag;
self.targetArrow = self.element.prev('.tree-drag-target-arrow');
+ self.linkSelector = 'a:not(.is-dragging-clone, .is-disabled)';
if (!self.targetArrow.length) {
$('<div class=""tree-drag-target-arrow""></div>').insertBefore(self.element);
if (!self.loading) {
clearInterval(interval);
- $('a:not(.is-dragging-clone, .is-disabled)', self.element).each(function(i) {
+ $(self.linkSelector, self.element).each(function() {
var a = $(this);
// Don't drag with folder icon, save for toggle nodes
a.on('mousedown.tree', function(e) {
e.preventDefault();
- doDrag = $(e.target).is('.icon') ? !a.parent().is('.folder') : true;
+ doDrag = (e.which === 3) ? false : // 3 - Right mouse button clicked
+ ($(e.target).is('.icon') ? !a.parent().is('.folder') : true);
})
// Invoke drag
// Drag start =======================================
.on('dragstart.tree', function (e, pos, thisClone) {
if (!thisClone || !doDrag) {
+ a.removeClass('is-dragging');
+ if (thisClone) {
+ thisClone.remove();
+ }
return;
}
clone = thisClone;
self.sortable = {
startNode: a,
- startIndex: i,
+ // Do not use index from each loop, get updated index on drag start
+ startIndex: $(self.linkSelector, self.element).index(a),
+ startUl: a.closest('ul'),
startWidth: a.outerWidth()
};
}
// Down
else if (self.sortable.overDirection === 'down') {
+ if (end.is('.is-open')) {
+ $('ul:first', end).prepend(start);
+ }
+ else {
start.insertAfter(end);
}
+ }
// Sync dataset and ui
self.syncDataset(self.element);
var self = this,
treeRec = self.element[0].getBoundingClientRect(),
extra = 20,
- exMargin, isParentsStartNode, isFolder, isBeforeStart, isAfterSttart,
- li, a, links, rec, i, l, left, top, direction, doAction,
+ exMargin, isParentsStartNode, isBeforeStart, isAfterSttart,
+ li, a, ul, links, rec, i, l, left, top, direction, doAction,
// Icons used while moving
icons = {
disabled: 'icon-cancel',
- over: 'icon-add',
+ over: 'icon-open-folder',
list: 'icon-minus'
},
pos.left > (treeRec.left - extra - self.sortable.startWidth) &&
pos.left < (treeRec.left + treeRec.height + extra)) {
- links = $('a:not(.is-dragging-clone, .is-disabled)', self.element);
+ links = $(self.linkSelector, self.element);
extra = 2;
for (i = 0, l = links.length; i < l; i++) {
li = a.parent();
left = rec.left;
- isFolder = li.is('.folder');
+ ul = a.closest('ul');
exMargin = parseInt(li.css('margin-top'), 10) > 0 ? 2 : 0;
- isBeforeStart = ((i-1) === self.sortable.startIndex);
- isAfterSttart = ((i+1) === self.sortable.startIndex);
+ isBeforeStart = ((i-1) === self.sortable.startIndex && ul.is(self.sortable.startUl));
+ isAfterSttart = ((i+1) === self.sortable.startIndex && ul.is(self.sortable.startUl));
// Apply actions
doAction = function() {
if (!isBeforeStart && pos.top < rec.top) {
direction = 'up';
}
- else if (!isAfterSttart && !isFolder && pos.top > rec.top + (extra * 2)) {
+ else if (!isAfterSttart && pos.top > rec.top + (extra * 2)) {
direction = 'down';
}
else {
",3
"diff --git a/views/tests/toolbar/toolbar-menu-button-options.html b/views/tests/toolbar/toolbar-menu-button-options.html element.removeClass('hidden');
}
});
+
+ // Add click event messages to test if disabled states are properly suppressing this click function
+ $('#button-1, #button-2, #button-3, #test-menu li > a').on('click', function () {
+ var label = $(this).text();
+ $('body').toast({ title: 'Click Event', message: 'Click function for ' + label });
+ });
</script>
",3
"diff --git a/views/patterns/step-process-markup.html b/views/patterns/step-process-markup.html </div>
<ul class=""tree js-step-list-scroll"" data-init=""false"" id=""step-list"">
- <li class=""js-step"">
+ <li class=""js-step is-selected"">
<a class=""js-step-link"" href=""#profile"">
<svg class=""step-alert icon-empty-circle icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
<use xmlns:xlink=""http://www.w3.org/1999/xlink"" xlink:href=""#icon-empty-circle""></use>
<ul class=""js-step-folder folder"">
</ul>
</li>
- <li class=""js-step is-selected"">
+ <li class=""js-step"">
<a class=""js-step-link"" href=""#summary"">
<svg class=""step-alert icon-empty-circle icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
<use xmlns:xlink=""http://www.w3.org/1999/xlink"" xlink:href=""#icon-empty-circle""></use>
<div class=""main no-scroll"" role=""main"">
- <div class=""toolbar toolbar-custom toolbar-collapsible"" data-init=""false"">
+ <div class=""toolbar toolbar-custom toolbar-collapsible"">
<div class=""title"">
<button class=""btn-icon btn-toggle-steps js-toggle-sidebar"" type=""button"">
<svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
</svg>
</button>
<div class=""dual-title"">
+ Preferences
+ <small>Page X of XX</small>
</div>
</div>
<div class=""buttonset phone-hidden"">
// simulate ajax call
setTimeout(function()
{
-
+ var stepLinkToSelect;
// check to see if first panel is vetoable
if ($('#vetocheckbox1').is("":checked""))
{
var panelId = panel.attr(""id"");
$('<div id=""global"" class=""js-step-panel""><h2>Global</h2><p>This is Global Step</p></div>""').insertAfter(panel);
var step = $(""[href='#"" + panelId + ""']"").parent();
- $('<li class=""js-step""><a class=""js-step-link"" href=""#global"" role=""stepitem""><svg class=""step-alert icon-empty-circle icon"" focusable=""false"" aria-hidden=""true"" role=""presentation""><use xmlns:xlink=""http://www.w3.org/1999/xlink"" xlink:href=""#icon-empty-circle""></use></svg><span class=""tree-text"">Global - step 4</span></a></li>').insertAfter(step);
+ stepLinkToSelect = $('<li class=""js-step""><a class=""js-step-link"" href=""#global"" role=""stepitem""><svg class=""step-alert icon-empty-circle icon"" focusable=""false"" aria-hidden=""true"" role=""presentation""><use xmlns:xlink=""http://www.w3.org/1999/xlink"" xlink:href=""#icon-empty-circle""></use></svg><span class=""tree-text"">Global - step 4</span></a></li>').insertAfter(step);
}
else
if (stepId == ""information"" && instertSubStep)
markup += '<li class=""js-step""><a class=""js-step-link"" href=""#information-2"" role=""stepitem""><svg class=""step-alert icon-empty-circle icon"" focusable=""false"" aria-hidden=""true"" role=""presentation""><use xmlns:xlink=""http://www.w3.org/1999/xlink"" xlink:href=""#icon-empty-circle""></use></svg><span class=""tree-text"">Family - step 7-2</span/a></li>';
$(markup).appendTo(substeps); //.insertAfter(step);
+ stepLinkToSelect = $('.js-step-link[href=""#information-1""]');
+
var panel = $("".step-container"");
$('<div id=""information-2"" class=""js-step-panel""><h2>Global</h2><p>This is Information SubStep2</p></div>""').insertAfter(panel);
// $(e).attr(""data-alert-icon"", ""confirm"");
}
+
+ if (stepLinkToSelect)
+ {
+ deferred.resolve(true, stepLinkToSelect);
+ } else
+ {
deferred.resolve(true);
+ }
},100);
return deferred.promise();
",3
"diff --git a/views/controls/svg-patterns.html b/views/controls/svg-patterns.html <div class=""svg-patterns"">
- <svg xmlns=""http://www.w3.org/2000/svg"" version=""1.1"" width=""500"" height=""500"">
+ <svg xmlns=""http://www.w3.org/2000/svg"" version=""1.1"" width=""1500"" height=""1500"">
<defs>
<!-- Hatch -->
<rect width=""1"" height=""7"" transform=""translate(0,0)"" fill=""white""></rect>
</pattern>
<mask id=""hatch"">
- <rect x=""0"" y=""0"" width=""500"" height=""500"" fill=""url(#pt-hatch)""></rect>
+ <rect x=""0"" y=""0"" width=""1500"" height=""1500"" fill=""url(#pt-hatch)""></rect>
</mask>
<!-- Double Hatch -->
<rect width=""1"" height=""9"" transform=""translate(3,0)"" fill=""white""></rect>
</pattern>
<mask id=""doublehatch"">
- <rect x=""0"" y=""0"" width=""500"" height=""500"" fill=""url(#pt-doublehatch)""></rect>
+ <rect x=""0"" y=""0"" width=""1500"" height=""1500"" fill=""url(#pt-doublehatch)""></rect>
</mask>
<!-- Cross Hatch -->
<path d=""M0 0L10 10ZM10 0L0 10Z"" stroke-width=""1"" stroke=""white""></path>
</pattern>
<mask id=""crosshatch"">
- <rect x=""0"" y=""0"" width=""500"" height=""500"" fill=""url(#pt-crosshatch)""></rect>
+ <rect x=""0"" y=""0"" width=""1500"" height=""1500"" fill=""url(#pt-crosshatch)""></rect>
</mask>
<!-- Stitch -->
<rect width=""6"" height=""1"" transform=""translate(0,2)"" fill=""white""></rect>
</pattern>
<mask id=""stitch"">
- <rect x=""0"" y=""0"" width=""500"" height=""500"" fill=""url(#pt-stitch)""></rect>
+ <rect x=""0"" y=""0"" width=""1500"" height=""1500"" fill=""url(#pt-stitch)""></rect>
</mask>
<!-- Dots -->
<rect x=""2"" y=""2"" width=""2"" height=""2"" fill=""white""></rect>
</pattern>
<mask id=""dots"">
- <rect x=""0"" y=""0"" width=""500"" height=""500"" fill=""url(#pt-dots)""></rect>
+ <rect x=""0"" y=""0"" width=""1500"" height=""1500"" fill=""url(#pt-dots)""></rect>
</mask>
<!-- Squares -->
<rect x=""1"" y=""1"" width=""3"" height=""3"" fill=""white""></rect>
</pattern>
<mask id=""squares"">
- <rect x=""0"" y=""0"" width=""500"" height=""500"" fill=""url(#pt-squares)""></rect>
+ <rect x=""0"" y=""0"" width=""1500"" height=""1500"" fill=""url(#pt-squares)""></rect>
</mask>
<!-- Xs -->
<line x1=""16"" y1=""9"" x2=""9"" y2=""16"" stroke-width=""1"" stroke=""white""></line>
</pattern>
<mask id=""xs"">
- <rect x=""0"" y=""0"" width=""500"" height=""500"" fill=""url(#pt-xs)""></rect>
+ <rect x=""0"" y=""0"" width=""1500"" height=""1500"" fill=""url(#pt-xs)""></rect>
</mask>
<!-- Triangles -->
<polygon points=""6,6 10,6 6,10"" fill=""white""></polygon>
</pattern>
<mask id=""triangles"">
- <rect x=""0"" y=""0"" width=""500"" height=""500"" fill=""url(#pt-triangles)""></rect>
+ <rect x=""0"" y=""0"" width=""1500"" height=""1500"" fill=""url(#pt-triangles)""></rect>
</mask>
</defs>
",3
"diff --git a/js/dropdown.js b/js/dropdown.js // Actual DropDown Code
Dropdown.prototype = {
init: function() {
- var orgId = this.element.attr('id');
+ var orgId = this.element.attr('id'),
+ html = $('html');
- this.isIe10 = $('html').is('.ie10');
- this.isIe11 = $('html').is('.ie11');
+ this.isIe10 = html.is('.ie10');
+ this.isIe11 = html.is('.ie11');
this.inlineLabel = this.element.closest('label');
this.inlineLabelText = this.inlineLabel.find('.label-text');
",3
"diff --git a/views/tests/datagrid/datagrid-editable-editor.html b/views/tests/datagrid/datagrid-editable-editor.html //Define Columns for the Grid.
columns.push({ id: 'productDesc', resizable: false, name: 'Product Desc', sortable: false, field: 'productName', formatter: Formatters.Hyperlink, width: 200});
- columns.push({ id: 'comment', name: 'Comment', field: 'comment', formatter: Formatters.Editor, editor: Editors.Editor, width: '60%', contentTooltip: '{content}'});
- // columns.push({ id: 'comment', name: 'Comment', field: 'comment', formatter: Formatters.Editor, editor: Editors.Editor, width: '60%', singleline: true, tooltip: '{{value}}'});
+ columns.push({ id: 'comment', name: 'Comment', field: 'comment', formatter: Formatters.Editor, editor: Editors.Editor, width: '60%', contentTooltip: true });
columns.push({ id: 'productId', name: 'Product Id', field: 'productId', width: 160 });
//Init and get the api for the grid
",3
"diff --git a/views/examples/landmark/list-with-detail-sections.html b/views/examples/landmark/list-with-detail-sections.html <div class=""page-container"">
<section class=""pane top no-scroll"">
- <div class=""toolbar"" role=""toolbar"">
- <div class=""title"">My Assets</div>
- <div class=""buttonset"">
- <button id=""activate-selected-row"" type=""button"" class=""btn"">
- <span>Activate Selected Row</span>
- </button>
- <button id=""deactivate-activated-row"" type=""button"" class=""btn"">
- <span>Deactivate Activated Row</span>
- </button>
- </div>
- <div class=""more"">
- <button class=""btn-actions"" type=""button"">
- <svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
- <use xlink:href=""#icon-more""></use>
- </svg>
- <span class=""audible"">More Actions</span>
- </button>
- <ul class=""popupmenu"">
- <li><a href=""#"">Option One</a></li>
- <li><a href=""#"">Option Two</a></li>
- <li><a href=""#"">Option Three</a></li>
- <li class=""separator single-selectable-section""></li>
- <li class=""heading"">Row Height</li>
- <li class=""is-selectable""><a data-option=""row-short"" href=""#"">Short</a></li>
- <li class=""is-selectable""><a data-option=""row-medium"" href=""#"">Medium</a></li>
- <li class=""is-selectable is-checked""><a data-option=""row-normal"" href=""#"">Normal</a></li>
- </ul>
- </div>
- </div>
<div class=""contextual-toolbar toolbar is-hidden"">
<div class=""title selection-count"">0 Selected</div>
columns: columnsDetail,
editable: false,
resultsText: res[selectedId].id,
+ paging: true,
+ pagesize: 10,
toolbar: {results: true, actions: true, rowHeight: true, title: 'Detail for '}
}).data('datagrid');
});
",3
"diff --git a/views/tests/datagrid/datagrid-format-percent.html b/views/tests/datagrid/datagrid-format-percent.html columns = [];
// Some Sample Data
+ data.push({ value: '-0.122' });
data.push({ value: '0.122' });
data.push({ value: '0.125' });
data.push({ value: '0.35' });
//Define Columns for the Grid.
columns.push({ id: 'percent1', name: 'Value', field: 'value', width: 150, filterType: 'text', filterDisabled: true });
- columns.push({ id: 'percent2', name: 'Integer', field: 'value', align: 'right', formatter: Formatters.Integer, numberFormat: {style: ""percent""}, editor: Editors.Input, mask: '####', maskMode: 'number', filterType: 'percent'});
+ columns.push({ id: 'percent2', name: 'Integer', field: 'value', align: 'right', formatter: Formatters.Integer, numberFormat: {style: ""percent""}, editor: Editors.Input, mask: '-####', maskMode: 'number', filterType: 'percent'});
- columns.push({ id: 'percent3', name: 'Decimal', field: 'value', align: 'right', formatter: Formatters.Decimal, numberFormat: {style: ""percent"", minimumFractionDigits: 1}, editor: Editors.Input, mask: '####.00', maskMode: 'number', filterType: 'percent'});
+ columns.push({ id: 'percent3', name: 'Decimal', field: 'value', align: 'right', formatter: Formatters.Decimal, numberFormat: {style: ""percent"", minimumFractionDigits: 1}, editor: Editors.Input, mask: '-####.00', maskMode: 'number', filterType: 'percent'});
//Init and get the api for the grid
",3
"diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -11,6 +11,7 @@ http://usalvlhlpool1.infor.com/4.3.0-rc/controls
### Key New Features
- Hijri (Umm Al Qura) - Arabic Calendar Support
+- ""New Tabs"" - New Visual Design and functionality for In-Page and Header Tabs
### Improvements
- Datagrid - Added am option (allowOneExpanded) to only show one expandable row at a time. It is now the default.
@@ -24,6 +25,7 @@ http://usalvlhlpool1.infor.com/4.3.0-rc/controls
- Multiselect - Added ability to move selected items to the top of the entire list or to the top of groups when the list is opened.
- Locale - Added new set of translated strings for 37 languages / 49 locales
- Toggle Button - New official toggle button, can change icon or state to ""pressed""
+- Vertical Tabs - New setting 'verticalResponsive' allows a Vertical Tabset to become an instance of ""header tabs"" when viewed at the phone breakpoint.
### Bug Fixes
- Datagrid - Fixed column alignment issue on reload with hidden columns
@@ -37,6 +39,7 @@ http://usalvlhlpool1.infor.com/4.3.0-rc/controls
- Multiselect - `moveSelectedToTop` has been deprecated in favor of `moveSelected`, which is now a text string instead of a boolean. This defaults to `""all""` on Multiselect but can be defined as `""group""` or `""none""` as well.
- Removed Search Results Page as it was an example for the site
- Sign In Page was changed to not copy to invisible fields. Update your markup accordingly. (wont break but may need a look)
+- Tabs (Header/Module/Vertical) - it's now necessary to define the `containerElement` setting either through Javascript or via a `data-options` attribute if the element that contains tab panels cannot be directly adjacent to the `.tab-container` element. Existing tab markup that places tab panels inside of the `.tab-container` element must be changed to contain the panels outside of this element.
### Behavior Changes
- Pie - The Chart now sorts slices in the order of the dataset (was on size from biggest to smallest before).
@@ -44,6 +47,8 @@ http://usalvlhlpool1.infor.com/4.3.0-rc/controls
- Editor - Removed 'bold','italic','underline', 'anchor', 'quote' options from HTML editor.
- Datagrid - Made a new option enableTooltips which defaults to false. You know need to enable this to have the tooltips anyplace in the datagrid. This has a significant performance especially for Ellipsis columns, so should only be used if you are sure or your datagrid is not huge.
- Datagrid - Added option sizeColumnsEqually which defaults to false. If set all the columns will get an equal size. (this used to do it automatically for the first 8 columns)
+- Tabs - In-Page/Header tabs will allow the list of tabs to scroll left/right if using a device with touch capabilities.
+- Tabs - The ""Spillover Menu"" for In-Page/Header tabs is now a full list of all available tabs. This menu has been redesigned to be more touch/responsive friendly.
### Ui Changes
- Added heart and heart-filled icons
",3
"diff --git a/views/tests/tabs/absolute-position-tabs-and-panels.html b/views/tests/tabs/absolute-position-tabs-and-panels.html <div class=""row"">
<div class=""six columns"">
- <h2>Absolutely positioned tabs and contents</h2>
- <p><a class=""hyperlink"" href=""http://jira/browse/SOHO-5734"" target=""_blank"">Related JIRA Ticket</a>.</p>
+ <h2>Tabs Test: Absolute-Positioned Tabs and Contents</h2>
+ <p>
+ <a class=""hyperlink"" href=""http://jira/browse/SOHO-5734"" target=""_blank"">Original JIRA Ticket</a>.<br />
+ <a class=""hyperlink"" href=""http://jira/browse/SOHO-6148"" target=""_blank"">New Tabs Update</a> - Breaking changes in v4.3.0 caused this test to change.
+ </p>
+ <p>
+ Drag the handle to change the size of the tabset.<br />
+ Drag the tabset around to adjust its position on the screen.
+ </p>
+
+ </div>
</div>
+
+<div class=""row"">
+ <div class=""six columns"">
+
+ <div class=""field"">
+ <label for=""container-width"">Container Width</label>
+ <input id=""container-width"" name=""container-width"" class=""slider"" type=""range"" min=""20"" max=""100"" value=""40"" />
</div>
-<style>
- #tabs-common {
+ </div>
+</div>
+
+<style id=""absolute-tabs-style-rules"">
+ /**
+ * NOTE: Absolute-Positioned tabs is not handled directly by Soho.
+ * Below is some example CSS that demonstrates how this _could_ be implemented.
+ */
+ #absolute-tabs-outer-wrapper {
position: absolute;
- height: 400px;
- width: 400px;
- top: 100px;
left: 100px;
+ top: 220px;
+ height: 400px;
+
+ border: 5px dotted #d8d8d8;
+ cursor: pointer;
+ }
+
+ #absolute-tabs-position-reset {
+ background-color: white;
+ cursor: default;
+ height: 100%;
+ position: relative;
}
+
.tab-panel {
- position: absolute;
height: 100%;
width: 100%;
+ padding: 10px;
+ position: relative;
}
</style>
<div class=""row"">
<div class=""twelve columns"">
- <div id=""tabs-common"" class=""tab-container"">
+ <div id=""absolute-tabs-outer-wrapper"">
+ <div id=""absolute-tabs-position-reset"">
+
+ <div id=""tabs-common"" class=""tab-container alternate"">
<ul class=""tab-list"">
- <li><a href=""#tab1"">Overview</a></li>
- <li><a href=""#tab2"">Items</a></li>
+ <li><a href=""#tab-overview"">Overview</a></li>
+ <li><a href=""#tab-items"">Items</a></li>
+ <li><a href=""#tab-settings"">Settings</a></li>
</ul>
- <div id=""tab1"">
- <input style=""position:absolute;top:5px;width:200px;"" />
</div>
- <div id=""tab2"">
- <h3 style=""position:absolute;top:5px;"">Tab 2 Contents</h3>
- <p style=""position:absolute;top:40px;"">Bricks-and-clicks? Evolve ubiquitous matrix B2B 24/365 vertical 24/365 platforms standards-compliant global leverage dynamic 24/365 intuitive ROI seamless rss-capable. Cutting-edge grow morph web services leverage; ROI, unleash reinvent innovative podcasts citizen-media networking.<p>
+ <div class=""tab-panel-container"">
+ <div id=""tab-overview"">
+ <h3 style=""position:absolute;top:10px;"">Overview</h3>
+ <input type=""text"" style=""position:absolute;top:45px;width:200px;"" />
+ </div>
+ <div id=""tab-items"">
+ <h3 style=""position:absolute;top:10px;"">Items</h3>
+ <p style=""position:absolute;top:45px;"">Bricks-and-clicks? Evolve ubiquitous matrix B2B 24/365 vertical 24/365 platforms standards-compliant global leverage dynamic 24/365 intuitive ROI seamless rss-capable. Cutting-edge grow morph web services leverage; ROI, unleash reinvent innovative podcasts citizen-media networking.<p>
</div>
+ <div id=""tab-settings"">
+ <h3 style=""position:absolute;top:10px;"">Settings</h3>
+ <p style=""position:absolute;top:45px;"">Bricks-and-clicks? Evolve ubiquitous matrix B2B 24/365 vertical 24/365 platforms standards-compliant global leverage dynamic 24/365 intuitive ROI seamless rss-capable. Cutting-edge grow morph web services leverage; ROI, unleash reinvent innovative podcasts citizen-media networking.<p>
</div>
</div>
+
+ </div><!-- end #absolute-tabs-position-reset -->
+ </div><!-- end #absolute-tabs-outer-wrapper -->
+
+ </div>
</div>
+
+<script type=""text/javascript"">
+ var TEST_TABSET = $('#absolute-tabs-outer-wrapper'),
+ WIDTH_CONTROL = $('#container-width'),
+ WIDTH_CONTROL_API;
+
+ function setWidth(val) {
+ var val = WIDTH_CONTROL_API.value();
+
+ TEST_TABSET.css('width', val[0] + '%');
+ $('body').triggerHandler('resize');
+ }
+
+ $('body').on('initialized', function() {
+ TEST_TABSET.drag();
+ WIDTH_CONTROL_API = WIDTH_CONTROL.data('slider');
+
+ // Change the width of the tabset whenever the slider is adjusted.
+ WIDTH_CONTROL.on('change.test', setWidth);
+
+ // Set everything intially
+ setWidth();
+ });
+</script>
",3
"diff --git a/views/tests/listbuilder/listbuilder-on-updated.html b/views/tests/listbuilder/listbuilder-on-updated.html @@ -113,25 +113,6 @@ $('body').one('initialized', function () {
console.log('updated: ', args);
});
- // // Get api
- // var api = elem.data('listbuilder');
- //
- // // Make selected after every one second (1000 milliseconds) ================
- // // Select first item
- // setTimeout(function() {
- // api.select('first');
- // }, 1000);
- //
- // // Select last item
- // setTimeout(function() {
- // api.select('last');
- // }, 2000);
- //
- // // Select third item (zero based index)
- // setTimeout(function() {
- // api.select(2);
- // }, 3000);
-
});
});
</script>
",3
"diff --git a/components/toolbarsearchfield/toolbarsearchfield.js b/components/toolbarsearchfield/toolbarsearchfield.js * Event Handler for dealing with global (document) level clicks.
*/
handleOutsideClick: function() {
- if (Soho.env.os.name === 'ios') {
- $('head').triggerHandler('disable-zoom');
- }
-
if (this.hasFocus()) {
return;
}
self.isExpanded = false;
+ if (Soho.env.os.name === 'ios') {
+ $('head').triggerHandler('enable-zoom');
+ }
+
// TODO: Make this process more solid, without FOUC/jumpiness and better focus handling (EPC)
// See http://jira/browse/SOHO-6347
self.inputWrapper.one($.fn.transitionEndName(), function() {
self.toolbarParent.triggerHandler('recalculate-buttons');
- if (Soho.env.os.name === 'ios') {
- $('head').triggerHandler('enable-zoom');
- }
});
}
$(document).off(this.outsideEventStr);
this.toolbarParent.off('navigate.toolbarsearchfield');
+ this.element.off('blur.toolbarsearchfield');
if (this.xButton && this.xButton.length) {
this.xButton.remove();
self.adjustOnBreakpoint();
});
+ if (Soho.env.os.name === 'ios') {
+ this.element.on('blur.toolbarsearchfield', function() {
+ $('head').triggerHandler('disable-zoom');
+ });
+ }
+
return this;
}
};
",3
"diff --git a/components/datagrid/example-paging-indeterminate.html b/components/datagrid/example-paging-indeterminate.html //Load a specific page and set the page - simulating a page state
//Then we call load data with that.
- if (req.type === 'initial') {
- //req.activePage = 2;
- return; //Or can ignore and call loadData
- }
+ // if (req.type === 'initial') {
+ // //req.activePage = 2;
+ // return; //Or can ignore and call loadData
+ // }
var url = '{{basepath}}api/compressors?pageNum='+ req.activePage +'&pageSize='+ req.pagesize;
toolbar: {title: 'Data Grid Header Title', results: true, dateFilter: false ,keywordFilter: true, advancedFilter: true, actions: true, views: true, rowHeight: true}
});
- // Option 2: Bi-Pass Source Function
- var url = '{{basepath}}api/compressors?pageNum='+ 2 +'&pageSize='+ pageSize;
- $.getJSON(url, function(res) {
- var pageInfo = {total: res.total, activePage: 2, pagesize: pageSize, firstPage: false, lastPage: false};
- grid.data('datagrid').loadData(res.data, pageInfo);
- });
+ // // Option 2: Bi-Pass Source Function
+ // var url = '{{basepath}}api/compressors?pageNum='+ 2 +'&pageSize='+ pageSize;
+ // $.getJSON(url, function(res) {
+ // var pageInfo = {total: res.total, activePage: 2, pagesize: pageSize, firstPage: false, lastPage: false};
+ // grid.data('datagrid').loadData(res.data, pageInfo);
+ // });
});
</script>
",3
"diff --git a/components/fileupload-advanced/fileupload-advanced.js b/components/fileupload-advanced/fileupload-advanced.js * @param {Boolean} maxFilesInProcess &nbsp;-&nbsp; Max number of files can be uploaded
* @param {Boolean} maxFileSize &nbsp;-&nbsp; Max file size in bytes, -1 for unlimited
* @param {Boolean} fileName &nbsp;-&nbsp; Variable name to read from server
+ * @param {Boolean} isDisabled &nbsp;-&nbsp; Make control disabled
+ * @param {Boolean} isBrowse &nbsp;-&nbsp; Add way to browse files to upload
+ * @param {Function} send &nbsp;-&nbsp; Method for send file to upload
*
*/
function FileUploadAdvanced(element) {
",3
"diff --git a/components/datepicker/example-index.html b/components/datepicker/example-index.html <div class=""field"">
<label for=""start-time"" class=""label "" >Time and Date</label>
- <input id=""start-time"" name=""start-time"" type=""text"" class=""datepicker input-md"" data-options=""{'dateFormat': 'dd/MM/yyyy', 'timeFormat': 'hh:mm:ss a', 'showTime': 'true', 'customValidation': 'true'}"" />
+ <input id=""start-time"" name=""start-time"" type=""text"" class=""datepicker input-md"" data-options=""{'dateFormat': 'dd/MM/yyyy', 'timeFormat': 'hh:mm:ss a', 'showTime': 'true'}"" />
</div>
</div>
",3
"diff --git a/components/validation/test-alert-types.html b/components/validation/test-alert-types.html check: function (value) {
return (value !== '');
},
- message: 'This value is allowed to be empty',
+ message: 'Random information about this field',
type: 'info'
};
",3
"diff --git a/components/tabs/_tabs.scss b/components/tabs/_tabs.scss &.has-popupmenu {
.icon {
height: 16px;
- margin: 0 0 0 -10px;
+ margin: 0 0 0 -5px;
width: 32px;
+ position: static;
}
.icon-error {
",3
"diff --git a/components/locale/cultures/en-US.js b/components/locale/cultures/en-US.js messages: {
'AboutText': {id: 'AboutText', value: 'Copyright &copy; {0} Infor. All rights reserved. The word and design marks set forth herein are trademarks and/or registered trademarks of Infor and/or its affiliates and subsidiaries. All rights reserved. All other trademarks listed herein are the property of their respective owners'},
'Actions': {id: 'Actions', value: 'Actions', comment: 'Tooltip text for the action button with additional in context actions'},
- 'AdditionalItems': {id: 'AdditionalItems', value: 'Additional Items', comment: 'Title used in swaplist'},
+ 'AdditionalItems': {id: 'AdditionalItems', value: 'Additional Items', comment: 'Button tooltip used in a list of movable items'},
'Add': {id: 'Add', value: 'Add', comment: 'Add'},
'AddNewTab': {id: 'AddNewTab', value: 'Add New Tab', comment: 'Attached to a button that adds new tabs'},
'AdvancedFilter': {id: 'AdvancedFilter', value: 'Create Advanced Filter', comment: 'In a data grid active an advanced filtering feature'},
'Amethyst': {id: 'Amethyst', value: 'Amethyst', comment: 'Color in our color pallette'},
'Apply': {id: 'Apply', value: 'Apply', comment: 'Text in a button to apply an action'},
'Attach': {id: 'Attach', value: 'Attach', comment: 'Attach'},
- 'Available': {id: 'Available', value: 'Available', comment: 'Title used in swaplist'},
+ 'Available': {id: 'Available', value: 'Available', comment: 'Button tooltip used in a list of movable items'},
'Azure': {id: 'Azure', value: 'Azure', comment: 'Color in our color pallette'},
'BackgroundColor': {id: 'BackgroundColor', value: 'Background color', comment: 'add or edit text background color in the editor'},
'Between': {id: 'Between', value: 'Between', comment: 'Between in icons for filtering'},
'Month': {id: 'Month', value: 'Month', comment: 'As in a date month'},
'More': {id: 'More', value: 'More...', comment: 'Text Indicating More Buttons or form content'},
'MoreActions': {id: 'MoreActions', value: 'More Actions', comment: 'Text on the More Actions button indictating hidden functions'},
- 'MoveToLeft': {id: 'MoveToLeft', value: 'Move to left', comment: 'Title use in swaplist'},
- 'MoveToRight': {id: 'MoveToRight', value: 'Move to right', comment: 'Title use in swaplist'},
+ 'MoveToLeft': {id: 'MoveToLeft', value: 'Move to left', comment: 'Button tooltip used in a list of movable items'},
+ 'MoveToRight': {id: 'MoveToRight', value: 'Move to right', comment: 'Button tooltip used in a list of movable items'},
'MsgDirty': {id: 'MsgDirty', value: ', Modified', comment: 'for modified form fields'},
'NewDocument': {id: 'NewDocument', value: 'New Document', comment: 'New Document tooltip'},
'NewItem': {id: 'NewItem', value: 'New item', comment: 'New item in listbuilder'},
",3
"diff --git a/components/field-options/example-index.html b/components/field-options/example-index.html <div class=""one-half column"">
<div class=""field"">
- <label for=""item-desc"">Test Field</label>
+ <label for=""item-desc"">Text Field</label>
<input type=""text"" class=""field-options"" aria-required=""true"" name=""item-desc"">
<button class=""btn-actions btn-tertiary btn-menu"" type=""button"">
",3
"diff --git a/components/tree/tree.js b/components/tree/tree.js }
}
- var badgeStyle = """";
+ var badgeStyle = '';
if (/info|good|error|alert|pending/i.test(badgeData.type)) {
badge.elem.addClass(badgeData.type);
} else if (badgeData.type && badgeData.type.charAt(0) === '#' && badgeData.type.length === 7) {
- badgeStyle = ""background-color: "" + badgeData.type + "" !important;"";
+ badgeStyle = 'background-color: ' + badgeData.type + ' !important;';
}
- if (typeof badgeData.backColor !== 'undefined') {
- badgeStyle = ""background-color: "" + badgeData.backColor + "" !important;"";
+ if (badgeData.backColor) {
+ badgeStyle = 'background-color: ' + badgeData.backColor + ' !important;';
}
- if (typeof badgeData.foreColor !== 'undefined') {
- badgeStyle += ""color: "" + badgeData.foreColor + "" !important;"";
+ if (badgeData.foreColor) {
+ badgeStyle += 'color: ' + badgeData.foreColor + ' !important;';
}
- badge.elem.attr(""style"", badgeStyle);
+ badge.elem.attr('style', badgeStyle);
if (badge.elem.text() !== '') {
a.append(badge.elem);
",3
"diff --git a/components/menubutton/test-splitbutton-sort.html b/components/menubutton/test-splitbutton-sort.html // Split Button with Icon and Label
// ------------------------------------------------
(function() {
- var $splitButtonSortAction = $('#split-button-sort-icon-action');
- var $splitButtonSortLabelAction = $('#split-button-sort-icon-label-action');
- var $splitButtonSortMenuTrigger = $('#split-button-sort-icon-label-menu-trigger');
- var isAscending = true;
- var isAscending2 = true;
-
- // Action Button fires the action
- $splitButtonSortAction.on('click', function (e) {
- isAscending = !isAscending;
- $(this).find('use').attr('xlink:href', isAscending ? '#icon-sort-up' : '#icon-sort-down');
+ var splitButtonSortAction = $('#split-button-sort-icon-action');
+ var splitButtonSortLabelAction = $('#split-button-sort-icon-label-action');
+ var splitButtonSortMenuTrigger = $('#split-button-sort-icon-label-menu-trigger');
+ var isButtonSortAscending = true; // Icon state for sort icon without label
+ var isButtonSortLabelAscending = true; // Icon state for sort icon with label
+ debugger;
+ // Action Button fires the action - icon without label
+ splitButtonSortAction.on('click', function (e) {
+ isButtonSortAscending = !isButtonSortAscending;
+ $(this).find('use').attr('xlink:href', isButtonSortAscending ? '#icon-sort-up' : '#icon-sort-down');
});
- $splitButtonSortLabelAction.on('click', function (e) {
- isAscending2 = !isAscending2;
- $(this).find('use').attr('xlink:href', isAscending2 ? '#icon-sort-up' : '#icon-sort-down');
+ // Action Button fires the action - icon with label
+ splitButtonSortLabelAction.on('click', function (e) {
+ isButtonSortLabelAscending = !isButtonSortLabelAscending;
+ $(this).find('use').attr('xlink:href', isButtonSortLabelAscending ? '#icon-sort-up' : '#icon-sort-down');
});
// MenuButton selection changes the default action
- $splitButtonSortMenuTrigger.on('selected', function (e, args) {
+ splitButtonSortMenuTrigger.on('selected', function (e, args) {
setTimeout(function() {
alert(args.text() + ' selected');
}, 50);
",3
"diff --git a/components/charts/charts.js b/components/charts/charts.js @@ -73,10 +73,11 @@ window.Chart = function(container) {
}
else if (s.type === 'column-positive-negative') {
if (!elem.option || (elem.option && elem.option === 'target')) {
- return;
- }
+ selector = s.svg.select('.target-bar');
+ } else {
selector = s.svg.select('.bar.'+ elem.option);
}
+ }
else if (['Column', 'HorizontalBar'].indexOf(s.chartType) !== -1) {
// Grouped or singlular
if (s.isGrouped || s.isSingular) {
@@ -2670,20 +2671,30 @@ window.Chart = function(container) {
// Click
.on('click', function (d, i) {
var selector, isTargetBar = this && d3.select(this).classed('target-bar');
- if (isTargetBar) {
- selector = svg.select('.bar.series-'+ i);
- selector.on('click').call(selector.node(), selector.datum(), i);
- return;
- }
var isSelected = this && d3.select(this).classed('is-selected'),
thisGroupId = parseInt(d3.select(this.parentNode).attr('data-group-id'), 10);
+ // Set isSelected to false if even 1 bar is selected
+ if(isTargetBar) {
+ var allBars = d3.selectAll('.bar')[0];
+ var len = allBars.length;
+ for(var i = 0; i < len; i++) {
+ var bar = allBars[i];
+
+ if(d3.select(bar).classed('is-selected')) {
+ isSelected = false;
+ break;
+ }
+ }
+ }
+
charts.setSelectedElement({
task: (isSelected ? 'unselected' : 'selected'),
container: container,
selector: this,
isTrigger: !isSelected,
+ isTargetBar: isTargetBar,
triggerGroup: isGrouped,
d: d,
i: i
@@ -4339,6 +4350,7 @@ window.Chart = function(container) {
ticksY = svg.selectAll('.axis.y .tick'),
pnPositiveText = svg.selectAll('.bartext.positive, .target-bartext.positive'),
pnNegativeText = svg.selectAll('.bartext.negative, .target-bartext.negative'),
+ pnTargetText = svg.selectAll('.target-bartext.positive, .target-bartext.negative'),
thisGroup = d3.select(o.selector.parentNode),
thisGroupId = parseInt((thisGroup.node() ? thisGroup.attr('data-group-id') : 0), 10),
triggerData = [],
@@ -4364,11 +4376,17 @@ window.Chart = function(container) {
// By legends only
if (s.isByLegends && !isTypePie) {
if (isPositiveNegative) {
+ if(o.isTargetBar) {
+ s.svg.selectAll('.target-bar').classed('is-selected', true).style('opacity', 1);
+
+ pnTargetText.style('font-weight', 'bolder');
+ } else {
s.svg.selectAll(isPositive ?
'.bar.positive, .target-bar.positive': '.bar.negative, .target-bar.negative')
.classed('is-selected', true).style('opacity', 1);
(isPositive ? pnPositiveText : pnNegativeText).style('font-weight', 'bolder');
+ }
svg.selectAll('.bar').each(function(d, i) {
var bar = d3.select(this);
",3
"diff --git a/components/datagrid/datagrid.js b/components/datagrid/datagrid.js @@ -2854,13 +2854,18 @@ Datagrid.prototype = {
const cell = $(this);
const text = cell.text();
const inner = cell.children('.datagrid-cell-wrapper');
+ const element = $(inner[0]);
+ const clonedEl = element.clone().css({ display: 'inline', width: 'auto', visibility: 'hidden' }).appendTo('body');
- if (cell[0] && inner[0] && (inner[0].offsetWidth) < inner[0].scrollWidth && cell.data('tooltip')) {
+ if (cell[0] && inner[0] && clonedEl.width() > element.width() - 30 && cell.data('tooltip')) {
const w = inner.width();
cell.data('tooltip').settings.maxWidth = w;
+
+ clonedEl.remove();
return text;
}
+ clonedEl.remove();
return '';
}
});
",3
"diff --git a/components/modal/modal.js b/components/modal/modal.js @@ -18,7 +18,7 @@ const COMPONENT_NAME = 'modal';
* @property {string} id Optionally tag a dialog with an id.
* @property {number} frameHeight Optional extra height to add.
* @property {number} frameWidth Optional extra width to add.
-* @property {callback} beforeShow Optional callback for before show
+* @property {function} beforeShow Optional callback for before show
*/
const MODAL_DEFAULTS = {
trigger: 'click',
",3
"diff --git a/components/locale/locale.js b/components/locale/locale.js @@ -12,9 +12,11 @@ if (typeof window.SohoConfig === 'object' && typeof window.SohoConfig.culturesPa
* Data From: http://www.unicode.org/repos/cldr-aux/json/22.1/main/
* For Docs See: http://ibm.co/1nXyNxp
* @class Locale
-* @property {string} currentLocale The Currently Set Locale
-* @property {object} cultures Contains all currently-stored cultures.
-* @property {string} culturesPath the web-server's path to culture files.
+* @constructor
+*
+* @param {string} currentLocale The Currently Set Locale
+* @param {object} cultures Contains all currently-stored cultures.
+* @param {string} culturesPath the web-server's path to culture files.
*/
const Locale = { // eslint-disable-line
@@ -104,7 +106,7 @@ const Locale = { // eslint-disable-line
/**
* Set the currently used locale.
* @param {string} locale The locale to fetch and set.
- * @returns {jQuery.Deferred} which is resolved once the locale culture is retrieved and set
+ * @returns {jquery.deferred} which is resolved once the locale culture is retrieved and set
*/
set(locale) {
const self = this;
@@ -321,7 +323,7 @@ const Locale = { // eslint-disable-line
/**
* Check if the date is valid using the current locale to do so.
- * @param {Date} date The date to show in the current locale.
+ * @param {date} date The date to show in the current locale.
* @returns {boolean} whether or not the date is valid.
*/
isValidDate(date) {
@@ -341,7 +343,7 @@ const Locale = { // eslint-disable-line
* @param {string} dateFormat The source format fx yyyy-MM-dd
* @param {boolean} isStrict If true missing date parts will be considered
* invalid. If false the current month/day.
- * @returns {Date|undefined} updated date object, or nothing
+ * @returns {date|undefined} updated date object, or nothing
*/
parseDate(dateString, dateFormat, isStrict) {
const thisLocaleCalendar = this.calendar();
@@ -704,9 +706,9 @@ const Locale = { // eslint-disable-line
* Format a decimal with thousands and padding in the current locale.
* http://mzl.la/1MUOEWm
* @param {number} number The source number.
- * @param {boolean} options Additional options.style can be decimal, currency, percent
- * and integer options.percentSign, options.minusSign, options.decimal,
- * options.group options.minimumFractionDigits (0), options.maximumFractionDigits (3)
+ * @param {object} options Additional options.style can be decimal, currency,
+ percent and integer options.percentSign, options.minusSign, options.decimal,
+ options.group options.minimumFractionDigits (0), options.maximumFractionDigits (3)
* @returns {string} the formatted number.
*/
formatNumber(number, options) {
@@ -873,8 +875,8 @@ const Locale = { // eslint-disable-line
/**
* Overridable culture messages
* @param {string} key The key to search for on the string.
- * @param {boolean} [showAsUndefined] causes a translated phrase to be ""undefined""
- * instead of defaulting to the default locale's version of the string.
+ * @param {boolean} [showAsUndefined] causes a translated phrase to be
+ instead of defaulting to the default locale's version of the string.
* @returns {string|undefined} a translated string, or nothing, depending on configuration
*/
translate(key, showAsUndefined) {
",3
"diff --git a/components/datagrid/datagrid.js b/components/datagrid/datagrid.js @@ -1617,7 +1617,7 @@ Datagrid.prototype = {
let i;
let ii;
let len;
- let len2;
+ let dataSetLen;
if (this.settings.treeGrid) {
dataset = this.settings.treeDepth;
@@ -1628,7 +1628,7 @@ Datagrid.prototype = {
} else if (this.settings.groupable) {
for (i = 0, len = this.settings.dataset.length; i < len; i++) {
let isGroupFiltered = true;
- for (ii = 0, len2 = this.settings.dataset[i].values.length; ii < len2; ii++) {
+ for (ii = 0, dataSetLen = this.settings.dataset[i].values.length; ii < dataSetLen; ii++) {
isFiltered = !checkRow(this.settings.dataset[i].values[ii]);
this.settings.dataset[i].values[ii].isFiltered = isFiltered;
",3
"diff --git a/components/modal/modal.js b/components/modal/modal.js @@ -82,7 +82,7 @@ Modal.prototype = {
}
// ensure is appended to body for new dom tree
- if (this.settings.content || this.settings.beforeShow) {
+ if (this.settings.content) {
this.settings.trigger = this.settings.content instanceof jQuery ? this.settings.trigger : 'immediate';
this.appendContent();
setTimeout(() => {
@@ -91,6 +91,13 @@ Modal.prototype = {
return;
}
+ if (this.settings.beforeShow) {
+ this.settings.trigger = this.settings.content instanceof jQuery ? this.settings.trigger : 'immediate';
+ this.appendContent();
+ this.callSource();
+ return;
+ }
+
self.addButtons(this.settings.buttons);
this.element.appendTo('body');
this.element[0].style.display = 'none';
@@ -129,7 +136,19 @@ Modal.prototype = {
}
if (this.settings.beforeShow) {
- this.element.find('.modal-body').append($('<div class=""field""><div id=""modal-busyindicator"" class=""busy card""></div></div>'));
+ // this.element.find('.modal-body').append($('<div class=""field""><div id=""modal-busyindicator"" class=""busy card""></div></div>'));
+ $('body').append($('<div class=""overlay busy"">' +
+ '</div>' +
+ '<div class=""busy-indicator-container blocked-ui"" aria-live=""polite"" role=""status"">' +
+ '<div class=""busy-indicator active"">' +
+ '<div class=""bar one""></div>' +
+ '<div class=""bar two""></div>' +
+ '<div class=""bar three""></div>' +
+ '<div class=""bar four""></div>' +
+ '<div class=""bar five""></div>' +
+ '</div>' +
+ '<span>Loading...</span>' +
+ '</div>'));
}
if (!isAppended) {
@@ -151,6 +170,7 @@ Modal.prototype = {
utils.fixSVGIcons(this.element);
if (this.settings.beforeShow) {
+ // Change to full screen
const busyIndEl = $('#modal-busyindicator');
busyIndEl.busyindicator({}).data('busyindicator');
busyIndEl.trigger('start.busyindicator');
@@ -365,6 +385,8 @@ Modal.prototype = {
return false;
}
+ self.open(true);
+
$('#modal-busyindicator').trigger('complete.busyindicator');
if (!(content instanceof jQuery)) {
@@ -381,11 +403,11 @@ Modal.prototype = {
const callBackOpts = {};
this.settings.beforeShow(response, callBackOpts);
- self.open(true);
},
/**
* Open the modal via the api.
+ * @param {boolean} ajaxReturn ajaxReturn boolean
* @returns {void}
*/
open(ajaxReturn) {
",3
"diff --git a/components/timepicker/_timepicker.scss b/components/timepicker/_timepicker.scss .dropdown {
width: 60px;
- &[aria-label=""[TimePeriod]""] {
+ &.period {
+ + .dropdown-wrapper .dropdown {
width: 63px;
}
+ }
+ .icon {
height: 31px;
",3
"diff --git a/PUBLISH.md b/PUBLISH.md @@ -47,43 +47,43 @@ git checkout master
* Generate Release Notes http://bit.ly/2w6X8Xw
## Git Operations
-* Edit version in package.json and publish package.json (from 4.4.0-rc to 4.4.0 as an example)
+* Edit version in package.json and publish package.json (from 4.5.0-rc to 4.5.0 as an example)
* Push a PR
* Check for Last PR's http://git.infor.com/projects/SOHO/repos/angular-components/pull-requests and http://git.infor.com/projects/SOHO/repos/controls/pull-requests and make sure all merged
-* Merge 4.4.0-rc (the rc branch) back onto the 4.4.x (masterish branch) - Using a PR or Git Merge
-* Git Tag the release from the 4.4.x branch
+* Merge 4.5.0-rc (the rc branch) back onto the 4.5.x (masterish branch) - Using a PR
+* Git Tag the release from the 4.5.x branch
```bash
- git tag 4.4.4
+ git tag 4.5.0
git push origin --tags
```
-* Make the new branch off 4.4.x for the new version (4.5.0-rc)
- * In git http://git.infor.com/projects/SOHO/repos/controls/settings set the 4.5.0-rc branch as the default
+* Make the new branch off 4.5.x for the new version (4.6.0-rc)
+ * In git http://git.infor.com/projects/SOHO/repos/controls/settings set the 4.6.0-rc branch as the default
* set branch permissions
-* Delete the 4.4.0-rc branch and all feature/bug fix branches http://git.infor.com/projects/SOHO/repos/controls/branches
+* Delete the 4.5.0-rc branch and all feature/bug fix branches http://git.infor.com/projects/SOHO/repos/controls/branches
## Build Operations
* Change the v-Next build http://bamboo.infor.com/chain/admin/config/editChainDetails.action?buildKey=SOHO-NEXT
- * change the name to Angular 4.5.0-RC (Version Next)
+ * change the name to Angular 4.6.0-RC (Version Next)
* change the repo it points to
- * checkout 4.5.0-rc and bump the versions in package.json and publish/package.json
+ * checkout 4.6.0-rc and bump the versions in package.json and publish/package.json
* Change the current build http://bamboo.infor.com/build/admin/edit/editBuildTasks.action?buildKey=SOHO-R43X-JOB1
* change the versions in the build config
- * Label the build release-440 for example http://bamboo.infor.com/browse/label/release-440
+ * Label the build release-450 for example http://bamboo.infor.com/browse/label/release-440
## Update version in @infor/sohoxi-angular
* Repeat Git Operations on ssh://git@git.infor.com:7999/soho/angular-components.git
* Edit version in package.json and publish package.json (2) places
* Check for Last PR's http://git.infor.com/projects/SOHO/repos/angular-components/pull-requests and merge
-* Merge 4.5.0-rc (the rc branch) back onto the 4.4.x (masterish branch) - Using a PR or Git Merge
-* Git Tag the release from the 4.4.x branch
+* Merge 4.5.0-rc (the rc branch) back onto the 4.5.x (masterish branch) - Using a PR or Git Merge
+* Git Tag the release from the 4.5.x branch
```bash
- git tag 4.4.0
+ git tag 4.5.0
git push origin --tags
```
-* Make the new branch off 4.4.x for the new version (4.5.0-rc)
- * In git http://git.infor.com/projects/SOHO/repos/controls/settings set the 4.5.0-rc branch as the default
+* Make the new branch off 4.5.x for the new version (4.6.0-rc)
+ * In git http://git.infor.com/projects/SOHO/repos/controls/settings set the 4.6.0-rc branch as the default
* set branch permissions
-* Delete the 4.4.0-rc branch and all feature/bug fix branches http://git.infor.com/projects/SOHO/repos/controls/branches
+* Delete the 4.5.0-rc branch and all feature/bug fix branches http://git.infor.com/projects/SOHO/repos/controls/branches
* Update the build to the next release
@@ -99,8 +99,8 @@ npm info @infor/sohoxi dist-tags
```
* Test New and old links for example:
-http://usalvlhlpool1.infor.com/4.4.0/components/
-http://usalvlhlpool1.infor.com/4.5.0-rc/components/
+http://usalvlhlpool1.infor.com/4.5.0/components/
+http://usalvlhlpool1.infor.com/4.6.0-rc/components/
You may have to run this for new sites
",3
"diff --git a/docs/sitemap.yml b/docs/sitemap.yml @@ -17,14 +17,10 @@ sections:
pages:
- name: Elements
pages:
- - name: About
- slug: about
- name: Accordion
slug: accordion
- name: Alerts
slug: alerts
- - name: Application Menu
- slug: applicationmenu
- name: Autocomplete
slug: autocomplete
- name: Badges
@@ -41,10 +37,6 @@ sections:
slug: circlepager
- name: Color Picker
slug: colorpicker
- - name: Contextual Action Panel
- slug: contextualactionpanel
- - name: Context Menu
- slug: contextmenu
- name: Counts
slug: counts
- name: Datepicker
@@ -53,44 +45,22 @@ sections:
slug: dropdown
- name: Editor (RichText)
slug: editor
- - name: Empty Messages
- slug: emptymessage
- - name: Expandable Area
- slug: expandablearea
- name: Favorites
slug: favorites
- - name: Fieldset
- slug: fieldset
- name: Field Filter
slug: field-filter
- - name: Field Options
- slug: field-options
- name: File Upload
slug: fileupload
- name: File Upload (Advanced)
slug: fileupload-advanced
- - name: Form Functionality
- slug: form
- - name: Header
- slug: header
- - name: Hierarchy (Org Chart)
- slug: hierarchy
- - name: HomePage
- slug: homepage
- name: Hyperlinks
slug: hyperlinks
- name: Input (Text)
slug: input
- name: List Builder
slug: listbuilder
- - name: List Filter
- slug: listfilter
- - name: Lookup
- slug: lookup
- name: Menubutton
slug: menubutton
- - name: Message
- slug: message
- name: Modal
slug: modal
- name: Multiselect
@@ -113,8 +83,6 @@ sections:
slug: slider
- name: Spinbox
slug: spinbox
- - name: Step Process
- slug: stepprocess
- name: Swaplist
slug: swaplist
- name: Switch
@@ -141,10 +109,6 @@ sections:
slug: toolbarsearchfield
- name: Tooltip
slug: tooltip
- - name: Tree
- slug: tree
- - name: Wizard
- slug: wizard
- name: Blocks
pages:
- name: Data Tiles
@@ -153,6 +117,8 @@ sections:
slug: datagrid
- name: Data List
slug: listview
+ - name: Header
+ slug: header
- name: Toolbar
slug: toolbar
- name: Utilities
@@ -183,6 +149,18 @@ sections:
slug: validation
- name: Zoom
slug: zoom
+- name: Patterns
+ pages:
+ - name: About
+ slug: about
+ - name: Application Menu
+ slug: applicationmenu
+ - name: Contextual Action Panel
+ slug: contextualactionpanel
+ - name: Signin
+ slug: signin
+ - name: Step Process
+ slug: stepprocess
- name: Charts
pages:
- name: Getting Start with Charts
@@ -227,19 +205,43 @@ sections:
pages:
- name: Block Grid
slug: blockgrid
+ - name: Context Menu
+ slug: contextmenu
- name: Compositform
slug: compositeform
+ - name: Empty Messages
+ slug: emptymessage
+ - name: Expandable Area
+ slug: expandablearea
+ - name: Fieldset
+ slug: fieldset
+ - name: Field Options
+ slug: field-options
+ - name: Form Functionality
+ slug: form
+ - name: Hierarchy (Org Chart)
+ slug: hierarchy
+ - name: HomePage
+ slug: homepage
- name: Images
slug: images
+ - name: List Filter
+ slug: listfilter
+ - name: Lookup
+ slug: lookup
- name: Masthead
slug: masthead
+ - name: Message
+ slug: message
- name: Process Indicator
slug: processindicator
- name: Radios
slug: radios
- - name: Signin
- slug: signin
- name: Tabs-multi
slug: tabs-multi
- name: Textarea
slug: textarea
+ - name: Tree
+ slug: tree
+ - name: Wizard
+ slug: wizard
",3
"diff --git a/README.md b/README.md @@ -17,7 +17,7 @@ Infor Design System's Enterprise component library is a framework-independent UI
For guidelines on when and where to use the components see the [design.infor.com](http://design.infor.com).
-<details><summary>**Table of Contents**</summary>
+<details><summary><b>Table of Contents</b></summary>
<p>
* [Key Features](#key-features)
@@ -96,16 +96,15 @@ Note: There may be a cost involved to using this with Infor's amazon s3 account
## Running the Development Project
-### Manual Install
+### Install pre-requisites
-* (Windows) Install Python `>= v2.5.0 & < 3.0.0` from [python.org/downloads](https://www.python.org/downloads/)
* Install `node` for following the [directions for your OS](http://nodejs.org/)
-* Install [`grunt`](http://gruntjs.com/) by running the command `npm install -g grunt-cli`
-* On Windows you should run `git config core.autocrlf false`
+* On Windows, you'll need to [install Python](https://www.python.org/downloads/). Make sure the version is at least `2.5.0` but not Python 3.
+* Also on Windows, you should run `git config core.autocrlf false`
-### Get The Code
+### Clone the repo
-* Clone the repo: `git clone https://github.com/infor-design/enterprise.git`
+* Clone the repo using `git`: `git clone https://github.com/infor-design/enterprise.git`
* `cd` into the repo directory
* Then `npm install` to install node packages. On macOS you may need `sudo npm install` as some packages require elevated permissions
* Then `npm run install-globals` to install some global packages we use
@@ -125,7 +124,6 @@ Note that at this point any changes you make will cause SASS to recompile and th
Functional tests are the primary way we test the codebase. To run the tests, run `npm run functional:local`.
-
### Editor Plugins
This project uses `eslint` and `editorconfig`. You may want to add the following plugins to your editor to help comply with our coding standards: `eslint` for [Atom](https://github.com/AtomLinter/linter-eslint) and [VS Code](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint), as well as `editorconfig` for [Atom](https://github.com/sindresorhus/atom-editorconfig#readme) and [VS Code](https://github.com/editorconfig/editorconfig-vscode)
",3
"diff --git a/README.md b/README.md @@ -17,7 +17,8 @@ Infor Design System's Enterprise component library is a framework-independent UI
For guidelines on when and where to use the components see the [design.infor.com](http://design.infor.com).
-<details><summary><b>Table of Contents</b></summary>
+<details>
+<summary><b>Table of Contents</b></summary>
<p>
* [Key Features](#key-features)
@@ -33,7 +34,6 @@ For guidelines on when and where to use the components see the [design.infor.com
+ [Editor Plugins](#editor-plugins)
* [Documentation](#documentation)
* [Contacting Us and Updates](#contacting-us-and-updates)
-
</p>
</details>
@@ -57,7 +57,7 @@ We support the latest release and the release previous to the latest (R-1) for b
## Getting the code into your project
-### `npm`
+### npmjs
This node module is hosted on a private repo [npm.infor.com](http://npm.infor.com:4873). To be able to install it in your project you need to tell npm on your system to fetch packages with the `@infor` scope from the correct registry.
",3
"diff --git a/src/components/textarea/textarea.js b/src/components/textarea/textarea.js @@ -97,15 +97,37 @@ Textarea.prototype = {
* Checks a keycode value and determines if it belongs to a printable character.
* @private
* @param {number} keycode - a number representing an ASCII keycode value
+ * @param {boolean} shiftKey - a boolean set to true if shift key is being pressed
* @returns {boolean} Returns true if the key is a printable one.
*/
- isPrintable(keycode) {
- const valid =
- (keycode > 47 && keycode < 58) || // number keys
+ isPrintable(keycode, shiftKey) {
+ // (keycode > 47 && keycode < 58) || // number keys
+ // (keycode > 64 && keycode < 91) || // letter keys
+ // (keycode > 95 && keycode < 112) || // numpad keys
+ // (keycode > 185 && keycode < 193) || // ;=,-./` (in order)
+ // (keycode > 218 && keycode < 223); // [\]' (in order)
+
+ let valid = false;
+
+ if (shiftKey) {
+ valid =
(keycode > 64 && keycode < 91) || // letter keys
- (keycode > 95 && keycode < 112) || // numpad keys
- (keycode > 185 && keycode < 193) || // ;=,-./` (in order)
- (keycode > 218 && keycode < 223); // [\]' (in order)
+ (keycode >= 33 && keycode <= 38) ||
+ (keycode >= 40 && keycode <= 43) ||
+ (keycode === 126 || keycode === 58 || keycode === 60) ||
+ (keycode >= 123 && keycode <= 125) ||
+ (keycode === 94 || keycode === 95) ||
+ (keycode >= 62 && keycode <= 64);
+ } else {
+ valid =
+ keycode === 13 || // enter key
+ (keycode >= 48 && keycode <= 57) || // number keys
+ (keycode >= 97 && keycode <= 122) || // letter keys
+ (keycode === 59 || keycode === 61 ||
+ (keycode >= 44 && keycode <= 47) || keycode === 96) || // ;=,-./` (in order)
+ (keycode >= 91 && keycode <= 93) || keycode === 39; // [\]' (in order)
+ }
+
return valid;
},
@@ -189,7 +211,7 @@ Textarea.prototype = {
Locale.translate('CharactersLeft'))).replace('{0}', remaining.toString());
if (self.counter) {
- if (length === max) {
+ if (length >= max) {
text = (self.settings.charMaxText ? self.settings.charMaxText.replace('{0}', max) : Locale.translate('CharactersMax') + max);
self.counter.text(text);
self.counter.removeClass('almost-empty');
@@ -203,7 +225,7 @@ Textarea.prototype = {
}
}
- if (self.printarea) {
+ if (self.printarea && length < max) {
self.printarea.text(self.element.val());
}
},
@@ -276,11 +298,23 @@ Textarea.prototype = {
const self = this;
this.element.on('keyup.textarea', (e) => {
+ const value = self.element.val();
+ const isExtraLinebreaks = self.isChrome || self.isSafari;
+ const length = value.length + (isExtraLinebreaks ? self.countLinebreaks(value) : 0);
+ const max = parseInt(self.element.attr('maxlength'), 10);
+
self.updateCounter();
+ if (length >= max) {
+ e.preventDefault();
+ return false;
+ }
+
if (self.settings.autoGrow) {
self.handleResize(self, e);
}
+
+ return true;
}).on('focus.textarea', () => {
if (self.counter) {
self.counter.addClass('focus');
@@ -288,15 +322,17 @@ Textarea.prototype = {
}).on('updated.dropdown', () => {
self.updated();
}).on('keypress.textarea', function (e) {
- const length = self.element.val().length;
- const max = self.element.attr('maxlength');
+ const value = self.element.val();
+ const isExtraLinebreaks = self.isChrome || self.isSafari;
+ const length = value.length + (isExtraLinebreaks ? self.countLinebreaks(value) : 0);
+ const max = parseInt(self.element.attr('maxlength'), 10);
if ([97, 99, 118, 120].indexOf(e.which) > -1 && (e.metaKey || e.ctrlKey)) {
self.updateCounter();
return;
}
- if (!self.isPrintable(e.which)) {
+ if (!self.isPrintable(e.which, e.shiftKey)) {
return;
}
",3
"diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js @@ -722,8 +722,65 @@ ListView.prototype = {
if (typeof li === 'number') {
li = $(this.element.children()[0]).children().eq(li);
}
+
+ const self = this;
if (li.is('.is-selected')) {
- this.select(li);
+ this.selectedItems = [];
+ li.removeClass('is-selected hide-selected-color');
+
+ li.attr('aria-selected', false);
+ li.find('.listview-selection-checkbox input').prop('checked', false);
+
+ li.parent().find('.is-selected').each(function (i) {
+ self.selectedItems[i] = $(this);
+ });
+
+ /**
+ * Fires when a item is deselected.
+ *
+ * @event deselected
+ * @memberof ListView
+ * @property {object} event - The jquery event object
+ * @property {object} selected items and item info
+ */
+ this.element.triggerHandler('deselected', { selectedItems: this.selectedItems, elem: li });
+ }
+
+ let parent = this.element.closest('.card, .widget');
+ if (!parent.length) {
+ parent = this.element.parent();
+ }
+
+ const toolbar = parent.find('.listview-toolbar, .contextual-toolbar');
+ const toolbarControl = toolbar.data('toolbar');
+
+ if (self.selectedItems.length > 0) {
+ if (toolbarControl) {
+ toolbarControl.toggleMoreMenu();
+ }
+ // Order of operations: set up event, change display prop, animate, toggle menu.
+ // Menu toggle takes place after the animation starts
+ toolbar.one('animateopencomplete', () => {
+ self.element.addClass('is-toolbar-open');
+ toolbar.trigger('recalculate-buttons').removeClass('is-hidden');
+ });
+ if (toolbar[0]) {
+ toolbar[0].style.display = 'block';
+ }
+ // toolbar.animateOpen({distance: 52});
+ toolbar.animateOpen({ distance: 40 });
+
+ let title = toolbar.find('.title, .selection-count');
+ if (!title || !title.length) {
+ title = $('<div class=""title selection-count""></div>');
+ toolbar.prepend(title);
+ }
+ title.text(`${self.selectedItems.length} ${Locale ? Locale.translate('Selected') : 'Selected'}`);
+ } else {
+ toolbar.addClass('is-hidden').one('animateclosedcomplete', function (e) {
+ e.stopPropagation();
+ this.style.display = 'none';
+ }).animateClosed();
}
},
@@ -747,7 +804,7 @@ ListView.prototype = {
let isChecked = false;
const isMixed = self.settings.selectable === 'mixed';
- self.selectedItems = [];
+ // self.selectedItems = [];
if (typeof li === 'number') {
li = $(this.element.children()[0]).children().eq(li);
}
@@ -764,17 +821,7 @@ ListView.prototype = {
return;
}
- // Select
- if (this.settings.selectable !== 'multiple' && this.settings.selectable !== 'mixed') {
- li.parent().children().removeAttr('aria-selected');
- li.parent().find('.is-selected').removeClass('is-selected');
- self.selectedItems[0] = $(this);
- }
-
- if (isChecked) {
- self.selectedItems = [];
- li.removeClass('is-selected hide-selected-color');
- } else if (this.settings.selectable) {
+ if (!isChecked) {
li.addClass(`is-selected${isMixed ? ' hide-selected-color' : ''}`);
self.lastSelectedItem = li.index();// Rember index to use shift key
}
@@ -783,8 +830,8 @@ ListView.prototype = {
self.selectedItems[i] = $(this);
});
- li.attr('aria-selected', !isChecked);
- li.find('.listview-selection-checkbox input').prop('checked', !isChecked);
+ li.attr('aria-selected', true);
+ li.find('.listview-selection-checkbox input').prop('checked', true);
if (!noTrigger) {
const triggerStr = isChecked ? 'unselected' : 'selected';
@@ -797,18 +844,6 @@ ListView.prototype = {
* @property {object} selected items and item info
*/
this.element.triggerHandler(triggerStr, { selectedItems: this.selectedItems, elem: li });
-
- if (triggerStr === 'unselected') {
- /**
- * Fires when a item is deselected.
- *
- * @event deselected
- * @memberof ListView
- * @property {object} event - The jquery event object
- * @property {object} selected items and item info
- */
- this.element.triggerHandler('deselected', { selectedItems: this.selectedItems, elem: li });
- }
}
let parent = this.element.closest('.card, .widget');
@@ -1148,9 +1183,12 @@ ListView.prototype = {
if (isMultiple && e.shiftKey) {
self.selectItemsBetweenIndexes([self.lastSelectedItem, item.index()]);
e.preventDefault();
+ } else if (item.hasClass('is-selected')) {
+ self.deselect(item);
} else {
self.select(item);
}
+
item.focus();
}
",3
"diff --git a/docs/TESTING.md b/docs/TESTING.md @@ -99,7 +99,9 @@ For test isolation, please see [Debugging Test Tips](#debugging-tests-tips)
## Working With Visual Regression Tests
-- Create a e2e2 test similar to the following...
+Currently On-Hold until running ci is figured out see: [SOHO-7464](https://jira.infor.com/browse/SOHO-7464)
+
+- Create a e2e test similar to the following...
```javascript
if (utils.isChrome()) {
",3
"diff --git a/test/components/dropdown/dropdown-updates-events.func-spec.js b/test/components/dropdown/dropdown-updates-events.func-spec.js @@ -43,7 +43,8 @@ describe('Dropdown updates, events', () => {
showEmptyGroupHeaders: false,
showSelectAll: false,
sourceArguments: {},
- onKeyDown: null
+ onKeyDown: null,
+ clearable: false
};
expect(dropdownObj.settings).toEqual(settings);
@@ -65,7 +66,8 @@ describe('Dropdown updates, events', () => {
showEmptyGroupHeaders: false,
showSelectAll: false,
sourceArguments: {},
- onKeyDown: null
+ onKeyDown: null,
+ clearable: false
};
dropdownObj.updated();
@@ -91,7 +93,8 @@ describe('Dropdown updates, events', () => {
showEmptyGroupHeaders: false,
showSelectAll: false,
sourceArguments: {},
- onKeyDown: null
+ onKeyDown: null,
+ clearable: false
};
dropdownObj.updated(settings);
",3
"diff --git a/docs/TEAMS.md b/docs/TEAMS.md @@ -41,7 +41,8 @@ This is a list of Infor teams and contributors using the Enterprise controls rep
|Infor SCE Administration Console | Using some widget styling and Charts | James Wang, George Matthews | `4.x` |
| Infor Supplier Exchange | Replacing Fat client Java Swing UI | John Sipher | `4.x` |
| IPA | Using D3 component example and some controls | Christopher Fried, Keith Knud | `4.x` |
-| Landmark | Jetty Server Servlet, Angular Shared repo | Phillip Patton, Andrew Lipensky | `4.x` |
+| Landmark | (incl GHR and CSF) jQuery/HTML5, Angular Shared repo | Phillip Patton, Andrew Lipetzky | `3.3`, `3.5`, `4x` |
+| Landmark | (GHR and CSF suites) Old UI: jQuery/HTML5; New UI: Typescript/Angular Shared repo | Phillip Patton, Andrew Lipetzky | `3.3`, `3.5`, `4x` |
| Lawson S3 | | Andy Buboltz | `4.x` |
| LBI | | Steve Stahl, Rommel Dollison | `3.x` |
| LTM App Group | | Jerry Drinka, David Cooper | `3.x` |
",3
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -5252,8 +5252,9 @@ Datagrid.prototype = {
row.find('td').each(function () {
const cell = $(this);
const cellText = cell.text().toLowerCase();
+ const isSearchExpandableRow = self.settings.searchExpandableRow ? true : !row.hasClass('datagrid-expandable-row');
- if (cellText.indexOf(term) > -1 && !row.hasClass('datagrid-expandable-row')) {
+ if (cellText.indexOf(term) > -1 && isSearchExpandableRow) {
found = true;
cell.find('*').each(function () {
if (this.innerHTML === this.textContent) {
",3
"diff --git a/src/components/colorpicker/readme.md b/src/components/colorpicker/readme.md @@ -10,7 +10,7 @@ description: This page describes Color Picker.
1. Select the label not the Hex [View Example]( ../components/colorpicker/example-show-label)
1. Test States [View Test]( ../components/colorpicker/test-states)
1. Test it works on a Modal [View Test]( ../components/colorpicker/test-modal)
-1. Showing Custom Colors [View Example]( ../components/colorpicker/example-sizes)
+1. Showing different colorpicker sizes [View Example]( ../components/colorpicker/example-sizes)
## Code Example
",3
"diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md @@ -4,14 +4,12 @@ So you're interested in giving us a hand? That's awesome! We've put together som
There are several to get involved, this document covers:
-- [raising issues](#raising-issues)
- - [bug reports](#bugs)
- - [feature requests](#features)
- - [change requests](#changes)
-- [working on Enterprise core](#core)
+- [Raising Issues/Requests](#reporting-an-issue)
+ - [bug reports](#bug-reports)
+ - [feature requests](#feature-requests)
+- [Contributing to the codebase](#submitting-pull-requests)
- [submitting pull requests](#pull-requests)
-- [testing and quality assurance](#testing)
-- [writing documentation](#documentation)
+- [testing and quality assurance](#testing-and-quality-assurance)
## Reporting An Issue
@@ -63,10 +61,14 @@ If you'd like to submit a pull request you'll need to do the following:
1. **[Forking the repo](https://help.github.com/articles/fork-a-repo/)**. Navigate to [Github Repository](https://github.com/infor-design/enterprise) and click the ""Fork"" button in the top right corner of your browser.
-1. **[Clone the Repository](https://help.github.com/articles/cloning-a-repository/) to your machine.**.
-1. **Make your changes with the local copy of the code.**
+1. **[Clone the Repository](https://help.github.com/articles/cloning-a-repository/)** to your machine.
+1. **Make your changes** to your local fork for the proper branch.
+- Almost all development will be done on branches from `master`.
+- Occasionally there will be a need to contribute to a version branch (i.e. `4.9.x`) in which case you want to branch off of one of those.
-1. **Commit your changes locally.** Add any related JIRA Ticket numbers or Github issue numbers into the message
+If you are unsure, just ask someone on the team so you don't have to redo your branch.
+
+1. **Commit your changes locally.** Try to follow the standards for your commit message outlined below.
- Try to follow
- [Github's commit message standards](https://github.com/erlang/otp/wiki/Writing-good-commit-messagesMore)
- [Closing issues using keywords with commits and PRs](https://help.github.com/articles/closing-issues-using-keywords/)
@@ -88,7 +90,9 @@ If you'd like to submit a pull request you'll need to do the following:
1. **Push your changes to your remote repository.** Use `git push {remote} {branch}` to push your changes to your branch on the remote repository.
-1. **[Creating a pull request](https://help.github.com/articles/creating-a-pull-request/)**
+1. **[Create a pull request](https://help.github.com/articles/creating-a-pull-request/)** to the proper branch
+- Normal changes get merged into `master`
+- Version specific changes need to go into that specific version branch
See [help.github.com](https://help.github.com/) for further information.
",3
"diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js @@ -604,7 +604,7 @@ Modal.prototype = {
e.stopPropagation();
e.preventDefault();
- if ($(target).is(':button')) {
+ if (!target.hasClass('fileupload') && !$(target).is(':input')) {
this.element.find('.btn-modal-primary:enabled').trigger('click');
}
}
",3
"diff --git a/src/components/locale/cultures/nl-NL.js b/src/components/locale/cultures/nl-NL.js @@ -22,7 +22,7 @@ Soho.Locale.addCulture('nl-NL', {
month: 'dd MMMM',
year: 'MMMM yyyy',
timestamp: 'HH:mm:ss',
- datetime: 'M/d/yyyy HH:mm'
+ datetime: 'd/M/yyyy HH:mm'
}, // Infered short + short gregorian/dateTimeFormats
// ca-gregorian/main/dates/calendars/gregorian/days/format/short or abbreviated (2 digit)
days: {
",3
"diff --git a/test/components/busyindicator/busyindicator-api.func-spec.js b/test/components/busyindicator/busyindicator-api.func-spec.js -import { BusyIndicator } from '../../../src/components/busyindicator/busyindicator';
-
const busyindicatorHTML = require('../../../app/views/components/busyindicator/example-index.html');
-const svg = require('../../../src/components/icons/svg.html');
let busyindicatorEl;
-let svgEl;
let busyindicatorObj;
describe('Busy Indicator API', () => {
beforeEach(() => {
busyindicatorEl = null;
- svgEl = null;
- busyindicatorObj = null;
- document.body.insertAdjacentHTML('afterbegin', svg);
document.body.insertAdjacentHTML('afterbegin', busyindicatorHTML);
- busyindicatorEl = document.body.querySelector('.busy-indicator');
- svgEl = document.body.querySelector('.svg-icons');
- busyindicatorEl.classList.add('no-init');
- busyindicatorObj = new BusyIndicator(busyindicatorEl);
+
+ busyindicatorEl = $('#busy-form');
+
+ busyindicatorObj = busyindicatorEl.data('busyindicator');
});
afterEach(() => {
+ if (busyindicatorObj) {
busyindicatorObj.destroy();
- busyindicatorEl.parentNode.removeChild(busyindicatorEl);
- svgEl.parentNode.removeChild(svgEl);
+ }
});
- it('Should be defined on jQuery object', () => {
- expect(busyindicatorObj).toEqual(jasmine.any(Object));
- });
+ it('Should destroy busy indicator', () => {
+ const buttonEl = $('#submit');
+ buttonEl.click();
- it('Should destroy busy indicator', (done) => {
- const spyEvent = spyOnEvent(busyindicatorEl, 'start.busyindicator');
+ setTimeout(() => {
busyindicatorObj.destroy();
- const buttonEl = document.body.querySelector('#submit');
+ expect(busyindicatorObj).toBeFalsy();
+ }, 1000);
+ });
+
+ it('Should display busy indicator when triggering ""start.busyindicator""', () => {
+ busyindicatorEl.trigger('start.busyindicator');
+
+ setTimeout(() => {
+ expect(document.body.querySelector('.busy-indicator')).toBeTruthy();
+ }, 1000);
+ });
+
+ it('Should hide busy indicator when triggerring ""complete.busyindicator""', () => {
+ const buttonEl = $('#submit');
buttonEl.click();
setTimeout(() => {
- expect(spyEvent).not.toHaveBeenTriggered();
- done();
- }, 500);
+ busyindicatorEl.trigger('complete.busyindicator');
- expect($(busyindicatorEl).data('busyindicator')).toBeFalsy();
+ expect(document.body.querySelector('.busy-indicator')).toBeFalsy();
});
-
- it('Should set settings', () => {
- const settings = {
- blockUI: true,
- text: null,
- displayDelay: 1000,
- timeToComplete: 0,
- transparentOverlay: false,
- overlayOnly: false
- };
-
- expect(busyindicatorObj.settings).toEqual(settings);
});
- it('Should update settings via parameter', () => {
- const settings = {
- blockUI: false,
- text: null,
- displayDelay: 1000,
- timeToComplete: 0,
- transparentOverlay: false,
- overlayOnly: false
- };
+ it('Should update text of busy indicator', () => {
+ const buttonEl = $('#submit');
+ buttonEl.click();
+
+ let customText = '';
- busyindicatorObj.init();
- busyindicatorObj.updated(settings);
+ setTimeout(() => {
+ customText = 'Custom Text';
+ busyindicatorObj.updated({ text: customText });
+ }, 1000);
+
+ setTimeout(() => {
+ const customTextEl = $('.busy-indicator-container > span');
- expect(busyindicatorObj.settings.blockUI).toEqual(settings.blockUI);
+ expect(customTextEl.text()).toEqual(customText);
+ }, 2000);
+ });
+
+ it('Should return correct value for isActive', () => {
+ const buttonEl = $('#submit');
+ buttonEl.click();
+
+ setTimeout(() => {
+ expect(busyindicatorObj.isActive()).toEqual(true);
+ }, 1000);
});
});
",3
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -1701,7 +1701,7 @@ Datagrid.prototype = {
isMatch = !(rowValueStr.indexOf(conditionValue) === 0 && rowValueStr !== '');
break;
case 'is-empty':
- isMatch = (rowValue === '');
+ isMatch = (rowValueStr === '');
break;
case 'is-not-empty':
isMatch = (rowValue !== '');
",3
"diff --git a/app/views/components/autocomplete/test-beforeopen-event.html b/app/views/components/autocomplete/test-beforeopen-event.html <div class=""row"">
<div class=""twelve columns"">
+ <h2 class=""fieldset-title"">Autocomplete Test: Before Open event</h2>
+ </div>
+</div>
+
+<div class=""row"">
+ <div class=""twelve columns"">
+ <div class=""field"">
+ This autocomplete will only allow searches with { at the start. All other searches will prevent the popup from showing up
+ </div>
<div class=""field"">
- <label for=""autocomplete-default"">States</label>
- <input type=""text"" autocomplete=""off"" class='autocomplete' data-options='{source: ""{{basepath}}api/states?term=""}' placeholder=""Type to Search"" id=""autocomplete-default"">
+ <label for=""auto-template"">Users</label>
+ <input class=""autocomplete"" data-autocomplete=""source"" data-init=""false"" id=""auto-template"" placeholder=""Type to Search"" type=""text"">
+ </div>
</div>
</div>
- <script>
- $('#autocomplete-default').on('selected', function (e, elem, args) {
- console.log(args);
- }).on('beforeopen.autocomplete', function (e, elem) {
+
+<script id=""test-scripts"">
+ $('body').on('initialized', function() {
+
+ // Setup an alternate source for the templated Autocomplete.
+ $('#auto-template').autocomplete({
+ source: function (req, resp) {
+ var data = [];
+ data.push({ label: '{test1}'});
+ data.push({ label: '{test2}'});
+ data.push({ label: '{test3}'});
+ data.push({ label: '{test4}'});
+ data.push({ label: '{test5}'});
+ data.push({ label: 'John Smith' });
+ data.push({ label: 'Alex Mills' });
+ data.push({ label: 'Steve Mills' });
+ data.push({ label: 'Quincy Adams' });
+ data.push({ label: 'Paul Thompson' });
+ resp(req, data);
+ }
+ }).on('selected', function (e, anchor) {
+ console.log('Changed to: ' + $(anchor).parent().attr('data-value'));
+ });
+
+ $('#auto-default, #auto-template').on('beforeopen.autocomplete', function (e, elem) {
console.log('beforeopen');
if (elem.value.charAt(0) !== '{') {
console.log('open');
}
});
+ });
</script>
-</div>
\ No newline at end of file
+
\ No newline at end of file
",3
"diff --git a/app/views/components/bar/test-axis-formatter.html b/app/views/components/bar/test-axis-formatter.html @@ -18,32 +18,30 @@ $('body').on('initialized', function () {
var dataset = [{
data: [
// {'name': 'Lee Hogan', 'value': 1101061117},
- {'name': 'Dan Barret', 'value': 1105272},
- {'name': 'Ed Martinez', 'value': 773456},
- {'name': 'Linda Walsh', 'value': 752648},
- {'name': 'Cathy Hughes', 'value': 274582},
- {'name': 'Kim Lee', 'value': 143623},
- {'name': 'Derek Murray', 'value': 91783},
- {'name': 'Manuel Fuentes', 'value': 79700},
- {'name': 'Georgine Ekels', 'value': 79594},
- {'name': 'Hans Stichler', 'value': 68719},
- {'name': 'Rajeev Mitra', 'value': 41814},
- {'name': 'Jean Grant', 'value': 14153},
- {'name': 'Agnes Kumer', 'value': 11612},
- {'name': 'Administrator', 'value': 10330},
- {'name': 'Brian McNulty', 'value': 3812},
- {'name': 'Ken Dryden', 'value': 0},
- {'name': 'Lou Pizzutti', 'value': 0},
- {'name': 'John Smith', 'value': 0}
- ],
- name: 'Sales By Employee'
+ {'name': 'Dan Barret', 'abbrName': 'Dan Barret', 'shortName': 'Dan Barret', 'value': 1105272},
+ {'name': 'Ed Martinez', 'abbrName': 'Ed Martinez', 'shortName': 'Ed Martinez', 'value': 773456},
+ {'name': 'Linda Walsh', 'abbrName': 'Linda Walsh', 'shortName': 'Linda Walsh', 'value': 752648},
+ {'name': 'Cathy Hughes', 'abbrName': 'Cathy Hughes', 'shortName': 'Cathy Hughes', 'value': 274582},
+ {'name': 'Kim Lee', 'abbrName': 'Kim Lee', 'shortName': 'Kim Lee', 'value': 143623},
+ {'name': 'Derek Murray', 'abbrName': 'Derek Murray', 'shortName': 'Derek Murray', 'value': 91783},
+ {'name': 'Manuel Fuentes', 'abbrName': 'Manuel Fuentes', 'shortName': 'Manuel Fuentes', 'value': 79700},
+ {'name': 'Georgine Ekels', 'abbrName': 'Georgine Ekels', 'shortName': 'Georgine Ekels', 'value': 79594},
+ {'name': 'Hans Stichler', 'abbrName': 'Hans Stichler', 'shortName': 'Hans Stichler', 'value': 68719},
+ {'name': 'Rajeev Mitra', 'abbrName': 'Rajeev Mitra', 'shortName': 'Rajeev Mitra', 'value': 41814},
+ {'name': 'Jean Grant', 'abbrName': 'Jean Grant', 'shortName': 'Jean Grant', 'value': 14153},
+ {'name': 'Agnes Kumer', 'abbrName': 'Agnes Kumer', 'shortName': 'Agnes Kumer', 'value': 11612},
+ {'name': 'Administrator', 'abbrName': 'Administrator', 'shortName': 'Administrator', 'value': 10330},
+ {'name': 'Brian McNulty', 'abbrName': 'Brian McNulty', 'shortName': 'Brian McNulty', 'value': 3812},
+ {'name': 'Ken Dryden', 'abbrName': 'Ken Dryden', 'shortName': 'Ken Dryden', 'value': 0},
+ {'name': 'Lou Pizzutti', 'abbrName': 'Lou Pizzutti', 'shortName': 'Lou Pizzutti', 'value': 0},
+ {'name': 'John Smith', 'abbrName': 'John Smith', 'shortName': 'John Smith', 'value': 0}
+ ]
}];
$('#bar-example').chart({
type: 'bar',
dataset: dataset,
showLegend: false,
- useLogScale: false,
ticks: {largeNumber: 10, mediumNumber: 5, smallNumber: 3, format: ',.1s'}});
});
",3
"diff --git a/src/components/hierarchy/_hierarchy.scss b/src/components/hierarchy/_hierarchy.scss @@ -798,7 +798,7 @@ html[dir='rtl'] {
img,
.image-placeholder {
float: right;
- margin-left: inherit;
+ margin-left: 0px;
margin-right: 14px;
}
",3
"diff --git a/docs/PUBLISH.md b/docs/PUBLISH.md @@ -7,7 +7,8 @@ To do a dev release, publish a dated semver to npm.
1. Make sure you are on `master` and its clean
1. Change the `package.json` version to append the date, i.e. `4.7.0-dev.YYYYMMDD`
1. Save the `package.json` file (**DO NOT** commit it)
-1. `npm publish --tag=dev`
+1. `npm run build && npm run zip-dist` to build
+1. `npm publish --tag=dev` to publish
1. Undo the version change/reset your branch
## Production Release (tagged)
",3
"diff --git a/test/components/hierarchy/hierarchy-stacked.e2e-spec.js b/test/components/hierarchy/hierarchy-stacked.e2e-spec.js @@ -48,7 +48,6 @@ describe('Hierarchy stacked layout', () => {
// Go back
await element.all(by.css('.btn')).get(0).click();
expect(await element.all(by.css('.leaf')).count()).toEqual(3);
- expect(await element.all(by.css('.btn-actions')).count()).toEqual(3);
expect(await element.all(by.css('.btn-collapse')).count()).toEqual(3);
});
",3
"diff --git a/test/components/hierarchy/hierarchy-stacked-api.func-spec.js b/test/components/hierarchy/hierarchy-stacked-api.func-spec.js @@ -33,7 +33,7 @@ describe('Hierarchy Stacked API', () => {
templateId: 'hierarchyChartTemplate',
legendKey: 'employmentType',
legend: legendData,
- dataset: data,
+ dataset: [data],
layout: 'stacked'
});
",3
"diff --git a/app/views/components/datagrid/test-editable-before-commitcelledit.html b/app/views/components/datagrid/test-editable-before-commitcelledit.html +<div class=""row"">
+ <div class=""twelve columns"">
+ <button id=""can-commit"" type=""button"" class=""btn-menu btn-secondary"">
+ <span>Can Commit (<span id=""can-commit-text""></span>)</span>
+ <svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
+ <use xlink:href=""#icon-dropdown""></use>
+ </svg>
+ </button>
+ <ul class=""popupmenu is-selectable"">
+ <li><a href=""#"" data-value=""true"">True</a></li>
+ <li><a href=""#"" data-value=""false"">False</a></li>
+ </ul>
+ </div>
+</div>
<div class=""row"">
<div class=""twelve columns"">
</div>
<script>
- var gridApi = null;
-
$('body').one('initialized', function () {
-
Locale.set('en-US').done(function () {
- var grid,
- data = [],
+
+ var data = [],
columns = [],
//lookup data
}
};
-
// Some Sample Data
data.push({ id: 1, productId: 2142201, productName: 'Compressor', activity: '<svg/onload=alert(1)>', quantity: 1, price: 210.99, status: 'OK', orderDate: new Date(2016, 2, 15, 12, 30, 36), portable: false, action: 'ac', description: 'Compressor comes with various air compressor accessories, to help you with a variety of projects. All fittings are with 1/4 NPT connectors. The kit has an air blow gun that can be used for cleaning' });
data.push({ id: 2, productId: 2241202, productName: 'Different Compressor', activity: 'Inspect and Repair', quantity: 2, price: 210.991, status: '', orderDate: new Date(2016, 2, 15, 0, 30, 36), portable: false, action: 'oh', description: 'The kit has an air blow gun that can be used for cleaning' });
columns.push({ id: 'price', name: 'Price', field: 'price', width: 125, align: 'right', formatter: Formatters.Decimal, numberFormat: { minimumFractionDigits: 3, maximumFractionDigits: 3 }, editor: Editors.Input, mask: '###.000' });
columns.push({ id: 'orderDate', name: 'Order Date', field: 'orderDate', formatter: Formatters.Date, editor: Editors.Date5 });
- // Toast message
- var toast = function (message, timeout) {
- $('body').toast({
- title: '',
- message: message || '',
- timeout: timeout || 1000
- });
- };
+ var canCommit = false;
+ var canCommitBtn = $('#can-commit');
+ var canCommitText = $('#can-commit-text');
- // Message (Success or Error)
- var message = function(options) {
- var isError = options.type === 'error';
- $('body').message({
- title: '<span>'+ (isError ? 'Error' : 'Success') +'</span>',
- status: isError ? 'error' : 'success',
- returnFocus: $(this),
- message: options.msg || '',
- buttons: [{
- text: 'Ok',
- click: function() {
- $(this).data('modal').close();
- },
- isDefault: true
- }]
+ // Set button default values
+ var popupmenuApi = canCommitBtn.data('popupmenu');
+ popupmenuApi.select($('[data-value=""'+ canCommit +'""]'));
+ canCommitText.html(popupmenuApi.menu.find('.is-checked').text());
+
+ // Bind button
+ canCommitBtn.on('selected', function (e, args) {
+ canCommitText.html(args.text());
+ canCommit = args.attr('data-value');
});
- };
- const max = 3;
- let index = 0;
- //Init and get the api for the grid
- grid = $('#datagrid').datagrid({
+ // Init the grid
+ $('#datagrid').datagrid({
columns: columns,
dataset: data,
editable: true,
toolbar: { keywordFilter: true, results: true }
- }).on('cellchange', function (e, args) {
- console.log(e, args);
- }).on('rowadd', function (e, args) {
- console.log(e, args);
- }).on('rowremove', function (e, args) {
- console.log(e, args);
- }).on('beforecommitcelledit', function (e, args) {
- // index++;
- // return index > max ? true : false;
-
- // Lazy loading
- console.log('Begin: Before Commit Cell Edit');
- var delay = 3000;
- toast('Begin: Before Commit Cell Edit', delay);
-
- var deferred = $.Deferred();
-
- setTimeout(function() {
- var shouldGoAhead = false;
- if (shouldGoAhead) {
- deferred.resolve();
- } else {
- deferred.reject();
- message({ type: 'error', msg: 'Cell Edit Not Commited (row: '+ args.row +', cell: '+ args.cell +')' });
- }
- console.log('Complete: Before Commit Cell Edit');
- }, delay);
-
- return deferred.promise();
-
+ })
+ .on('beforecommitcelledit', function (e, args) {
+ console.log({ canCommit }, args);
+ return canCommit;
});
+
});
});
-
</script>
",3
"diff --git a/app/views/components/datagrid/test-editable-before-commitcelledit.html b/app/views/components/datagrid/test-editable-before-commitcelledit.html -<div class=""row"">
- <div class=""twelve columns"">
- <button id=""can-commit"" type=""button"" class=""btn-menu btn-secondary"">
- <span>Can Commit (<span id=""can-commit-text""></span>)</span>
- <svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
- <use xlink:href=""#icon-dropdown""></use>
- </svg>
- </button>
- <ul class=""popupmenu is-selectable"">
- <li><a href=""#"" data-value=""true"">True</a></li>
- <li><a href=""#"" data-value=""false"">False</a></li>
- </ul>
- </div>
-</div>
-
<div class=""row"">
<div class=""twelve columns"">
<div role=""toolbar"" class=""toolbar"">
columns.push({ id: 'price', name: 'Price', field: 'price', width: 125, align: 'right', formatter: Formatters.Decimal, numberFormat: { minimumFractionDigits: 3, maximumFractionDigits: 3 }, editor: Editors.Input, mask: '###.000' });
columns.push({ id: 'orderDate', name: 'Order Date', field: 'orderDate', formatter: Formatters.Date, editor: Editors.Date5 });
+ // Edit mode
var canCommit = false;
- var canCommitBtn = $('#can-commit');
- var canCommitText = $('#can-commit-text');
-
- // Set button default values
- var popupmenuApi = canCommitBtn.data('popupmenu');
- popupmenuApi.select($('[data-value=""'+ canCommit +'""]'));
- canCommitText.html(popupmenuApi.menu.find('.is-checked').text());
-
- // Bind button
- canCommitBtn.on('selected', function (e, args) {
- canCommitText.html(args.text());
- canCommit = args.attr('data-value');
- });
-
// Init the grid
$('#datagrid').datagrid({
toolbar: { keywordFilter: true, results: true }
})
.on('beforecommitcelledit', function (e, args) {
- console.log({ canCommit }, args);
- return canCommit;
+ // console.log(args);
+ // return false;
+ var targetCell = (args && args.target) ? args.target : null;
+ var deferred = $.Deferred();
+
+ if (!canCommit) {
+ canCommit = true;
+
+ $('body').message({
+ title: 'Commit Edit',
+ message: 'You are about to Commit Cell Edit<br>Would you like to proceed?',
+ buttons: [{
+ text: 'Yes',
+ click: function(e, modal) {
+ canCommit = true;
+ deferred.resolve();
+ modal.close();
+ }
+ }, {
+ text: 'No',
+ click: function(e, modal) {
+ canCommit = false;
+ deferred.reject();
+ modal.close();
+ },
+ isDefault: true
+ }]
+ })
+ .on('afterclose.message', (e) => {
+ if (canCommit) {
+ args.target.focus();
+ }
+ });
+ }
+
+ return deferred.promise();
});
});
",3
"diff --git a/app/views/components/dropdown/example-icons.html b/app/views/components/dropdown/example-icons.html </div>
<div class=""field"">
- <label for=""example-colors"">Dropdown with Colors</label>
- <select id=""example-colors"" name=""example-icon"" class=""dropdown"">
- <option value=""opt-1"" data-icon=""{icon: 'back-color', class: 'azure07-color'}"">Default</option>
- <option value=""opt-2"" data-icon=""{icon: 'back-color', class: 'azure07-color'}"">Azure</option>
- <option value=""opt-3"" data-icon=""{icon: 'back-color', class: 'amber07-color'}"">Amber</option>
- <option value=""opt-4"" data-icon=""{icon: 'back-color', class: 'amethyst07-color'}"">Amethyst</option>
- <option value=""opt-4"" data-icon=""{icon: 'back-color', class: 'turquoise07-color'}"">Turquoise</option>
- <option value=""opt-4"" data-icon=""{icon: 'back-color', class: 'emerald07-color'}"">Emerald</option>
- <option value=""opt-4"" data-icon=""{icon: 'back-color', class: 'ruby07-color'}"">Ruby</option>
- <option value=""opt-4"" data-icon=""{icon: 'back-color', class: 'slate07-color'}"">Slate</option>
- <option value=""opt-4"" data-icon=""{icon: 'back-color', class: 'graphite07-color'}"">Graphite</option>
+ <div class=""field"">
+ <label for=""example-colors"">Dropdown With Colors</label>
+ <select id=""example-colors"" name=""example-colors"" class=""dropdown"" data-init=""false"">
</select>
</div>
-
+ </div>
</div>
</div>
+
+<script>
+ $('body').on('initialized', function () {
+ // Set up colors dropdown
+ var colorsDropdown = $('#example-colors');
+ var colors = Soho.theme.personalizationColors();
+ var colorsHtml = '';
+ for (color in colors) {
+ colorsHtml += '<option data-icon=""{icon: \'swatch\', class: \'' + colors[color].backgroundColorClass +' swatch\'}"" value=""' + colors[color].id + '"" data-hex=""' + colors[color].value + '"">'+ colors[color].name +'</option>';
+ }
+
+ colorsDropdown.on('selected', function (e, args) {
+ $('html').data('personalize').setColors(this.selectedOptions[0].getAttribute('data-hex'));
+ //$('html').data('personalize').setTheme(this.selectedOptions[0].getAttribute('value'));
+ }).html(colorsHtml).dropdown().val('azure').trigger('updated');
+
+ $('html').on('colorschanged', function (e, args) {
+ console.log('colorschanged', args)
+ });
+ });
+</script>
",3
"diff --git a/src/components/popupmenu/popupmenu.js b/src/components/popupmenu/popupmenu.js @@ -1113,8 +1113,12 @@ PopupMenu.prototype = {
}
// Fix - not sure why, but firefox have to manualy trigger
- if (self.isFirefox && isAutocomplete && key === 13) {
+ if (self.isFirefox && isAutocomplete && !(/37|39|38|40/.test(key))) {
self.element.triggerHandler(e);
+ self.element[0].focus();
+ const val = self.element[0].value;
+ self.element[0].value = '';
+ self.element[0].value = val;
}
return undefined;
});
",3
"diff --git a/test/components/tree/tree.e2e-spec.js b/test/components/tree/tree.e2e-spec.js @@ -104,11 +104,11 @@ describe('Tree Ajax data tests', () => {
});
it('Should load Ajax data node on click', async () => {
- expect(await element.all(by.css('.tree li')).count()).toBe(2);
+ expect(await element.all(by.css('.tree li')).count()).toBe(3);
await element.all(by.css('.tree li.folder a[role=""treeitem""]')).first().click();
await browser.driver.sleep(2500);
- expect(await element.all(by.css('.tree li')).count()).toBe(4);
+ expect(await element.all(by.css('.tree li')).count()).toBe(5);
});
});
",3
"diff --git a/app/views/components/datagrid/test-modal-datagrid-single-column.html b/app/views/components/datagrid/test-modal-datagrid-single-column.html filterable: true,
redrawOnResize: false,
rowHeight: 'short',
+ selectable: 'multiple',
toolbar: {title: 'Compressors', actions: true, rowHeight: true, personalize: true}
});
",3
"diff --git a/test/components/toolbar-flex/toolbar-flex.e2e-spec.js b/test/components/toolbar-flex/toolbar-flex.e2e-spec.js @@ -47,7 +47,7 @@ describe('Flex toobar ajax tests', () => {
browser.driver.manage().window().setSize(450, 1000);
await browser.driver.sleep(config.sleep);
- expect(await browser.protractorImageComparison.checkElement(flexToolbarEl, 'flextool-index')).toBeLessThan(0.35);
+ expect(await browser.protractorImageComparison.checkElement(flexToolbarEl, 'flextool-index')).toBeLessThan(1);
await element(await by.css('button.btn-actions')).click();
await browser.driver.sleep(config.sleep);
",3
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md - `[Personalization]` Added several form examples with buttons and completion chart that can be personalized. ([#1963](https://github.com/infor-design/enterprise/issues/1963))
- `[Personalization]` Added an example of normal tabs behaving like header tabs in a personalized area. ([#1962](https://github.com/infor-design/enterprise/issues/1962))
- `[Popupmenu]` Fixed an issue where disabled submenus were opening on mouseover. ([#1863](https://github.com/infor-design/enterprise/issues/1863))
+- `[Timepicker]` Updated the Swedish translation for Set Time. ([#2153](https://github.com/infor-design/enterprise/issues/2153))
- `[Tree]` Fixed an issue where children property null was breaking tree to not render. ([#1908](https://github.com/infor-design/enterprise/issues/1908))
### v4.19.0 Chores & Maintenance
",3
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md - `[Modal]` Fixed memory leak issues after destroy. ([#2497](https://github.com/infor-design/enterprise/issues/2497))
- `[Slider]` Updated the color variant logic to match new uplift theming. ([#2647](https://github.com/infor-design/enterprise/issues/2647))
- `[Toast]` Fixed memory leak issues after destroy. ([#2634](https://github.com/infor-design/enterprise/issues/2634))
+- `[Uplift Theme]` Various improvements to the Dark/Contrast variants, with a focus on passing WCAG ([#2541](https://github.com/infor-design/enterprise/issues/2541)) ([#2588](https://github.com/infor-design/enterprise/issues/2588))
### v4.21.0 Chores & Maintenance
",3
"diff --git a/package.json b/package.json ""mdlint"": ""npm run mdlint:docs && npm run mdlint:src"",
""mdlint:docs"": ""npx markdownlint docs/ && npx markdownlint README.md"",
""mdlint:src"": ""npx markdownlint src --config=src/.markdownlintrc"",
- ""eslint"": ""npm run build:icons && npm run build:colors && npx eslint -c src/.eslintrc.js src test"",
- ""eslint:log"": ""npm run build:icons && npm run build:colors && npx eslint -c src/.eslintrc.js src test -o eslint.log"",
- ""eslint:error-only"": ""npm run build:icons && npm run build:colors && npx eslint -c src/.eslintrc.js --quiet src test"",
+ ""eslint"": ""npm run build:icons && npm run build:colors && npx eslint src test app"",
+ ""eslint:log"": ""npm run build:icons && npm run build:colors && npx eslint -o eslint.log src test app"",
+ ""eslint:error-only"": ""npm run build:icons && npm run build:colors && npx eslint --quiet src test app"",
""lint:ci"": ""npm run eslint:error-only && npm run mdlint && npm run stylelint"",
""minify"": ""node ./scripts/minify.js"",
""functional:local"": ""npx karma start test/karma.conf.js"",
""csurf"": ""^1.9.0"",
""del"": ""^4.1.0"",
""documentation"": ""^5.3.5"",
- ""eslint"": ""^4.19.1"",
+ ""eslint"": ""^6.5.1"",
""eslint-config-airbnb-base"": ""^12.1.0"",
""eslint-plugin-compat"": ""^3.1.1"",
""eslint-plugin-import"": ""^2.17.1"",
",3
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -569,8 +569,10 @@ Datagrid.prototype = {
this.restoreDirtyRows();
if (this.settings.selectable) {
+ if (!this.settings.groupable && (this.settings.groupable && this.originalDataset)) {
this.syncDatasetWithSelectedRows();
}
+ }
this.preventSelection = true;
if (!noSync) {
",3
"diff --git a/src/components/homepage/homepage.js b/src/components/homepage/homepage.js @@ -158,7 +158,7 @@ Homepage.prototype = {
.on('dragstart.handle', (event) => {
event.preventDefault();
card.addClass(""ui-resize-passive"");
- card.css({ borderColor: '#078cd9', opacity: 0.9, zIndex: 90 });
+ card.css({ opacity: 0.9, zIndex: 90 });
$(window)
.on('mousemove.handle', (event) => {
let width = event.clientX - card.offset().left;
@@ -186,7 +186,7 @@ Homepage.prototype = {
}
$("".ui-resizable-handle"").remove();
- card.css({ borderColor: '#bdbdbd', opacity: 1, width: """" });
+ card.css({ opacity: 1, width: """" });
homepage.refresh(false);
})
})
@@ -195,7 +195,7 @@ Homepage.prototype = {
.on('dragstart.handle', (event) => {
event.preventDefault();
card.addClass(""ui-resize-passive"");
- card.css({ borderColor: '#078cd9', opacity: 0.9, zIndex: 90 });
+ card.css({ opacity: 0.9, zIndex: 90 });
$(window)
.on('mousemove.handle', (event) => {
let height = event.clientY - card.offset().top;
@@ -219,19 +219,21 @@ Homepage.prototype = {
}
$("".ui-resizable-handle"").remove();
- card.css({borderColor: '#bdbdbd', opacity: 1, height: """" });
+ card.css({ opacity: 1, height: """" });
homepage.refresh(false);
})
});
if(card.has("".ui-resizable-handle"").length === 0){
card.append(eastHandle, southHandle);
}
+ card.css({border: '1px solid #078cd9'});
})
.on('mouseleave.card', function () {
const card = $(this);
if (!card.hasClass(""ui-resize-passive"")) {
$("".ui-resizable-handle"").remove();
}
+ card.css({border: '1px solid #bdbdbd'});
})
.on('dragstart.card', function () {
const card = $(this);
",3
"diff --git a/app/views/components/homepage/example-editable.html b/app/views/components/homepage/example-editable.html }
});
$('.homepage')
- .on('resizecard', function(event, columns, data){ console.log(""resizecard event: "", [columns, data])})
- .on('reordercard', function(event, columns, data){ console.log(""reordercard event: "", [columns, data])})
- .on('removecard', function(event, columns, data){ console.log(""removecard event: "", [columns, data])});
+ .on('resizecard', function(event, card, data){ console.log(""resizecard event: "", [card, data])})
+ .on('reordercard', function(event, card, data){ console.log(""reordercard event: "", [card, data])})
+ .on('removecard', function(event, card, data){ console.log(""removecard event: "", [card, data])});
</script>
\ No newline at end of file
",3
"diff --git a/app/views/components/homepage/example-editable.html b/app/views/components/homepage/example-editable.html }
});
$('.homepage')
- .on('resizecard', function(event, card, data){ console.log(""resizecard event: "", [card, data])})
- .on('reordercard', function(event, card, data){ console.log(""reordercard event: "", [card, data])})
- .on('removecard', function(event, card, data){ console.log(""removecard event: "", [card, data])});
+ .on('resizecard', function(event, card, data){ console.log(""Homepage: resizecard event: "", [card, data])})
+ .on('reordercard', function(event, card, data){ console.log(""Homepage: reordercard event: "", [card, data])})
+ .on('removecard', function(event, card, data){ console.log(""Homepage: removecard event: "", [card, data])});
+ $('.widget')
+ .on('resizecard', function(event, card, data){ console.log(""Widget: resizecard event: "", [card, data])})
+ .on('reordercard', function(event, card, data){ console.log(""Widget: reordercard event: "", [card, data])})
+ .on('removecard', function(event, card, data){ console.log(""Widget: removecard event: "", [card, data])});
</script>
\ No newline at end of file
",3
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md - `[Vertical Tabs]` Fixed an issue where the error icon was misaligning. ([#873](https://github.com/infor-design/enterprise-ng/issues/873))
- `[Popupmenu]` Fixed a minor issue with the shortcut text on small breakpoints. ([#3984](https://github.com/infor-design/enterprise/issues/3984))
- `[Splitter]` Fixes an issue where the collapse button was not working when splitter is on the right. ([#1730](https://github.com/infor-design/enterprise-ng/issues/1730))
+- `[Personalize]` Fixed an issue regarding the layout and scroll ability of a page. ([#3330](https://github.com/infor-design/enterprise/issues/3330))
## v4.31.0
",3
"diff --git a/test/components/textarea/textarea-settings.func-spec.js b/test/components/textarea/textarea-settings.func-spec.js @@ -34,7 +34,8 @@ describe('Textarea API', () => {
maxLength: null,
printable: true,
charRemainingText: null,
- charMaxText: null
+ charMaxText: null,
+ attributes: null
};
expect(textareaObj.settings).toEqual(settings);
@@ -48,7 +49,8 @@ describe('Textarea API', () => {
maxLength: null,
printable: true,
charRemainingText: null,
- charMaxText: null
+ charMaxText: null,
+ attributes: null
};
textareaObj.updated(settings);
",3
"diff --git a/src/components/tabs/readme.md b/src/components/tabs/readme.md @@ -171,7 +171,9 @@ You can add custom attributes/automation id's that can be used for scripting to
</div>
```
-Additionally, when using the `add()` API method, it's possible to pass an `attributes` object as part of the settings array that will append any additional attributes needed:
+The Tabs API also supports an `attributes` setting, similar to other IDS components, which allows for passing attributes to all pre-existing tabs, the more tabs button, the add-tabs (+) button, and the App Menu trigger button on Module Tabs instances.
+
+Additionally, when using the `add()` API method, the `attributes` setting will be respected when adding tabs. Also, it's possible to pass another `attributes` object as part of the settings array that will append new attributes specifically to the new tab:
```js
const api = $('#my-tabs').data('tabs');
",3
"diff --git a/test/components/spinbox/spinbox-settings.func-spec.js b/test/components/spinbox/spinbox-settings.func-spec.js @@ -36,7 +36,8 @@ describe('Spinbox settings', () => {
min: 0,
max: 10,
step: null,
- maskOptions: null
+ maskOptions: null,
+ attributes: null
};
settings.min = 0; // example initializes with data-options
@@ -51,7 +52,8 @@ describe('Spinbox settings', () => {
min: 10,
max: 20,
step: null,
- maskOptions: null
+ maskOptions: null,
+ attributes: null
};
spinboxApi.updated();
@@ -82,7 +84,8 @@ describe('Spinbox settings', () => {
min: 0,
max: 10,
step: null,
- maskOptions: null
+ maskOptions: null,
+ attributes: null
};
expect(spinboxApi.settings).toEqual(settings);
",3
"diff --git a/src/components/validation/validation.js b/src/components/validation/validation.js @@ -123,7 +123,6 @@ function ValidationRules() {
let dtApi = null;
if (field && field.data('datepicker')) {
dtApi = field.data('datepicker');
- console.log(dtApi.settings.showTime)
if (dtApi.settings.showTime) {
this.message = Locale.translate('InvalidDateTime');
}
",3
"diff --git a/src/components/charts/charts.js b/src/components/charts/charts.js @@ -7,82 +7,8 @@ import { theme } from '../theme/theme';
const charts = {};
charts.destroy = function destroy(el) {
- const e = el[0] === undefined ? window.document.getElementsByClassName('chart-container')[0] : el[0];
- const chartClasses = [
- {
- chart: {
- type: 'area',
- containerClass: ['line-chart']
- }
- },
- {
- chart: {
- type: 'bar',
- containerClass: ['bar-chart', 'bar-chart-stacked']
- }
- },
- {
- chart: {
- type: 'bar-grouped',
- containerClass: ['bar-chart', 'bar-chart-grouped']
- }
- },
- {
- chart: {
- type: 'bar-stacked',
- containerClass: ['bar-chart', 'bar-chart-stacked']
- }
- },
- {
- chart: {
- type: 'bubble',
- containerClass: ['line-chart', 'bubble']
- }
- },
- {
- chart: {
- type: 'column',
- containerClass: ['column-chart']
- }
- },
- {
- chart: {
- type: 'column-grouped',
- containerClass: ['column-chart']
- }
- },
- {
- chart: {
- type: 'completion-target',
- containerClass: ['completion-chart', 'chart-completion-target-padding']
- }
- },
- {
- chart: {
- type: 'donut',
- containerClass: ['chart-pie', 'has-right-legend']
- }
- },
- {
- chart: {
- type: 'line',
- containerClass: ['line-chart']
- }
- },
- {
- chart: {
- type: 'column-positive-negative',
- containerClass: ['column-chart']
- }
- },
- {
- chart: {
- type: 'sparkline-dots-n-peak',
- containerClass: []
- }
- },
- ];
- chartClasses.forEach(arrItem => e.classList.remove(...arrItem.chart.containerClass));
+ const chartClasses = ['line-chart', 'bar-chart', 'bar-chart-stacked', 'bar-chart-grouped', 'bubble', 'column-chart', 'completion-chart', 'chart-completion-target-padding', 'chart-pie', 'has-right-legend'];
+ el[0]?.classList.remove(...chartClasses);
};
// Reference to the tooltip
",3
"diff --git a/src/components/cards/cards.js b/src/components/cards/cards.js @@ -160,8 +160,15 @@ Cards.prototype = {
}
if (this.settings.selectable === 'multiple') {
- utils.addAttributes(this.cards.find('.card-content .checkbox-label'), this, this.settings.attributes, 'checkbox-label', true);
- utils.addAttributes(this.cards.find('.card-content .checkbox'), this, this.settings.attributes, 'checkbox', true);
+ const self = this;
+ setTimeout(() => {
+ const options = this.cards.find('.card');
+ options.each(function (i) {
+ const opt = $(this);
+ utils.addAttributes(opt.find('.checkbox-label'), self, self.settings.attributes, `checkbox-label-${i}`, true);
+ utils.addAttributes(opt.find('.card-content .checkbox'), self, self.settings.attributes, `checkbox-${i}`, true);
+ })
+ }, 1);
}
return this;
",3
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md - `[ContextualActionPanel]` Added `title` prop in CAP to control the title via `modaSettings`, and added missing `beforeclose` event. ([NG#1048](https://github.com/infor-design/enterprise-ng/issues/1048))
- `[Datagrid]` - Fixed a bug where the first two columns row heights did not match the others for the Medium setting ([#5366](https://github.com/infor-design/enterprise/issues/5366))
- `[Datepicker]` Fixed a bug where the -/+ keys were not detected in datepicker. ([#5353](https://github.com/infor-design/enterprise/issues/5353))
+-`[Datagrid]` Fixed a bug where the font color on tags was black when a row was hovered over in dark mode. Font color now white. ([#5289](https://github.com/infor-design/enterprise/issues/5289))
- `[Donut]` Changed legend design when item exceeds maximum width of chart. ([#5292](https://github.com/infor-design/enterprise/issues/5292))
- `[Dropdown]` Fixed a bug where backspace in Dropdown is not working when pressed. ([#5113](https://github.com/infor-design/enterprise/issues/5113))
- `[Icon]` Changed button icon colors to slate6 ([#5307](https://github.com/infor-design/enterprise/issues/5307))
- `[Monthview]` Fixed a bug where a vertical scroll is showing when it is unnecessary. ([#5350](https://github.com/infor-design/enterprise/issues/5350))
- `[Multiselect]` Fixed a regression bug where clear icon were not properly aligned on compact mode. ([#5396](https://github.com/infor-design/enterprise/issues/5396))
- `[Popdown]` Remove deprecation console warning. We still consider this component deprecated but will not remove until 5.0 version. The warning was only removed for now. ([#1070](https://github.com/infor-design/enterprise-ng/issues/1070))
--`[Datagrid]` Fixed a bug where the font color on tags was black when a row was hovered over in dark mode. Font color now white. ([#5289](https://github.com/infor-design/enterprise/issues/5289))
+- `[Personalize]` Added css to remove color gradient on overflowing horizontal tab headers. fix is limited to personalize styling ([#5303](https://github.com/infor-design/enterprise/issues/5303))
### v4.54.0 Markup Changes
",3
"diff --git a/src/components/toolbar-flex/toolbar-flex.js b/src/components/toolbar-flex/toolbar-flex.js @@ -372,8 +372,12 @@ ToolbarFlex.prototype = {
}
for (let i = 0; i < this.items.length; i++) {
+ if (this.items[i].settings.allowTabs) {
+ this.items[i].focused = true;
+ } else {
this.items[i].focused = false;
}
+ }
item.focused = true;
this.trueFocusedItem = item;
},
",3
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md - `[Multiselect]` Fixed a regression bug where clear icon were not properly aligned on compact mode. ([#5396](https://github.com/infor-design/enterprise/issues/5396))
- `[Personalize]` Added css to remove color gradient on overflowing horizontal tab headers. fix is limited to personalize styling ([#5303](https://github.com/infor-design/enterprise/issues/5303))
- `[Popdown]` Remove deprecation console warning. We still consider this component deprecated but will not remove until 5.0 version. The warning was only removed for now. ([#1070](https://github.com/infor-design/enterprise-ng/issues/1070))
+- `[ToolbarFlex]` updated logic to account for the AllowTabs property and set toolbar items with a tab-index of 0 when allowTabs is ture ([#5387](https://github.com/infor-design/enterprise/issues/5387))
### v4.54.0 Markup Changes
",3
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md - `[Calendar]` Fix on overlap in today text and calendar view changer when in mobile. ([#5438](https://github.com/infor-design/enterprise/issues/5438))
- `[Charts]` Fixed a bug where automation ids is not properly rendered on legend, text and slices. ([#5441](https://github.com/infor-design/enterprise/issues/5441))
-- `[Datagrid]` Fixed a bug where the checkbox overlaps with the label when `editorOptions.multiple` is set to true. ([NG#1075](https://github.com/infor-design/enterprise-ng/issues/1075))
+- `[Datagrid]` Fixed a bug where the checkbox overlaps with the label when `editorOptions.multiple` is set to true. Also added formatters and editor for multiselect. ([NG#1075](https://github.com/infor-design/enterprise-ng/issues/1075))
- `[Datagrid]` Fixed an issue where tree list indentation is not left aligned when row has no children and datagrid row height is extra small or small. ([#5487](https://github.com/infor-design/enterprise/issues/5487))
- `[Datagrid]` Fixed an issue where tree list indentation is not left aligned when row has no children and datagrid row height is extra small or small. ([#5487](https://github.com/infor-design/enterprise/issues/5487))
- `[Message]` Added maxWidth setting to allow message to go full width when title is long. ([#5443](https://github.com/infor-design/enterprise/issues/5443))
",3
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md ## v4.56.0 Features
- `[Charts]` Added ability to disable the selection of the charts including the legend. ([#2736](https://github.com/infor-design/enterprise/issues/2736))
+
## v4.56.0 Fixes
- `[Dropdown]` Fixed disabling of function keys F1 to F12. ([#4976](https://github.com/infor-design/enterprise/issues/4976))
",3
"diff --git a/package.json b/package.json ""e2e:local:debug"": ""npm run webdriver:update && npx protractor test/protractor.local.debug.conf.js"",
""e2e:puppeteer"": ""npx --no-install jest --config=test/jest.config.js --runInBand --detectOpenHandles --forceExit"",
""webdriver:clean"": ""npx webdriver-manager clean"",
- ""webdriver:update"": ""npx webdriver-manager update --versions.chrome 92.0.4515.43 --standalone false --quiet --gecko=false"",
+ ""webdriver:update"": ""npx webdriver-manager update --standalone false --quiet --gecko=false"",
""zip-dist"": ""npx grunt zip-dist"",
""documentation"": ""node ./scripts/deploy-documentation.js"",
""release:dev"": ""node scripts/publish-nightly-manual"",
""node-version-check"": ""npx check-node-version --node 12"",
""node-updates-check"": ""npx ncu""
},
- ""chrome-version"": ""92"",
+ ""chrome-version"": ""94"",
""dependencies"": {
""d3"": ""^5.16.0"",
""jquery"": ""^3.6.0"",
",3
"diff --git a/src/components/monthview/monthview.js b/src/components/monthview/monthview.js @@ -346,10 +346,8 @@ MonthView.prototype = {
const dayMilliseconds = 60 * 60 * 24 * 1000;
const rangeStart = new Date(this.settings.displayRange.start);
const originalEnd = new Date(this.settings.displayRange.end);
- // add one more day to make the last day inclusive
- const inclusiveEnd = new Date(originalEnd.getTime() + dayMilliseconds);
const leadDays = dateUtils.firstDayOfWeek(rangeStart);
- const numberOfWeeks = Math.ceil((inclusiveEnd - leadDays) / (7 * dayMilliseconds));
+ const numberOfWeeks = Math.ceil((originalEnd - leadDays) / (7 * dayMilliseconds));
this.settings.showMonthYearPicker = false;
this.settings.inPage = stringUtils.toBoolean(this.settings.inPage);
if (this.settings.inPage) {
",3
"diff --git a/app/views/components/checkboxes/example-checkboxes-with-hitboxes.html b/app/views/components/checkboxes/example-checkboxes-with-hitboxes.html </div>
<div class=""row top-padding"">
<div class=""six columns"">
+ <h2 class=""section-title"">With Hitbox</h2>
<form id=""test-form"">
<div class=""field"">
<input type=""checkbox"" class=""checkbox"" id=""starts-nolabel-checked"" checked />
</form>
</div>
+
+ <div class=""six columns"">
+ <h2 class=""section-title"">Without Hitbox</h2>
+ <form id=""test-form-2"">
+ <div class=""field"">
+ <input type=""checkbox"" class=""checkbox"" id=""starts-nolabel-checked-2"" checked />
+ <label for=""starts-nolabel-checked-2"" class=""checkbox-label hitbox-style""><span class=""audible"">Checked</span></label>
+ </div>
+ <div class=""field"">
+ <input type=""checkbox"" class=""checkbox"" name=""checkbox1-normal"" id=""checkbox1-normal"" />
+ <label for=""checkbox1-normal"" class=""checkbox-label hitbox-style"">Unchecked</label>
+ </div>
+
+ <div class=""field"">
+ <input type=""checkbox"" class=""checkbox"" id=""checkbox2-normal"" checked=""true"" />
+ <label for=""checkbox2-normal"" class=""checkbox-label hitbox-style"">Checked</label>
+ </div>
+
+ <div class=""field"">
+ <input type=""checkbox"" data-trackdirty=""true"" class=""checkbox"" id=""checkbox3-normal"" />
+ <label for=""checkbox3-normal"" class=""checkbox-label hitbox-style"" checked>Dirty tracking</label>
+ </div>
+
+ <div class=""field"">
+ <input type=""checkbox"" class=""checkbox"" id=""checkbox4-normal"" disabled=""true"" />
+ <label for=""checkbox4-normal"" class=""checkbox-label hitbox-style"">Disabled and unchecked</label>
+ </div>
+
+ <div class=""field"">
+ <input type=""checkbox"" class=""checkbox"" id=""checkbox5-normal"" disabled=""true"" checked=""true"" />
+ <label for=""checkbox5-normal"" class=""checkbox-label hitbox-style"">Disabled and checked</label>
+ </div>
+
+ <div class=""field"">
+ <input type=""checkbox"" aria-checked=""mixed"" class=""checkbox partial"" checked=""true"" id=""checkbox8-normal"" />
+ <label for=""checkbox8-normal"" class=""checkbox-label hitbox-style""><span class=""audible"">Partial (not
+ accessible)</span>Partial</label>
+ </div>
+
+ <div class=""field"">
+ <input type=""checkbox"" class=""checkbox error"" id=""checkbox9-normal"" />
+ <label for=""checkbox9-normal"" class=""checkbox-label hitbox-style"">Error</label>
+ </div>
+
+
+ <div class=""field"">
+ <input type=""checkbox"" class=""checkbox"" name=""checkbox10-normal"" id=""checkbox10-normal"" data-validate=""required"" />
+ <label for=""checkbox10-normal"" class=""checkbox-label hitbox-style"">Required<span class=""required""
+ aria-hidden=""true""></span></label>
+ </div>
+
+ <div class=""field"">
+ <input type=""checkbox"" class=""checkbox"" name=""checkbox11-normal"" id=""checkbox11-normal"" data-validate=""required"" />
+ <label for=""checkbox11-normal"" class=""checkbox-label hitbox-style required"">Required (No indicator)</label>
+ </div>
+ </form>
+
+ </div>
</div>
\ No newline at end of file
",3
"diff --git a/app/views/components/header/example-toolbar-flex-with-categories.html b/app/views/components/header/example-toolbar-flex-with-categories.html <div class=""toolbar-section search-categories search flex-grow-2"">
<div class=""searchfield-wrapper"">
<label class=""audible"" for=""maincontent""></label>
- <input id=""maincontent2"" data-init=""false"" class=""searchfield context"" placeholder=""Search for a Product"" data-options=""{ clearable: true }"" />
+ <input id=""maincontent"" data-init=""false"" class=""searchfield context"" placeholder=""Search for a Product"" data-options=""{ clearable: true }"" />
</div>
</div>
<div class=""toolbar-section buttonset flex-grow-1 flex-end"">
",3
"diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js @@ -129,7 +129,7 @@ Tabs.prototype = {
const self = this;
let tabPanelContainer;
let moveTabPanelContainer = false;
- const localeExemptions = ['en-US', 'de-DE', 'fr-FR', 'ja-JP', 'zh-CN', 'zh-Hans', 'zh-tw', 'zh-Hant'];
+ const localeExemptions = ['en-US', 'de-DE', 'ja-JP', 'zh-CN', 'zh-Hans', 'zh-TW', 'zh-Hant'];
// Check for a tab panel container immediately after the `.tab-container`
// element (default as of IDS Enterprise 4.3.0)
",3
"diff --git a/app/views/components/cards/example-actionable.html b/app/views/components/cards/example-actionable.html <button class=""btn card"" type=""button"" id=""actionable-btn-3"">Change Department</button>
<button class=""btn card"" type=""button"" id=""actionable-btn-4"">Change Project</button>
<button class=""btn card"" type=""button"" id=""actionable-btn-5"">Change Time Code</button>
- <hr />
- <br />
<button class=""btn card"" type=""button"" id=""actionable-btn-6"">View Clock Transactions</button>
- <a href=""#"" class=""btn card"" type=""button"" id=""actionable-btn-7"">View Clock Transactions</a>
+ <a href=""#"" class=""btn card"" type=""button"" id=""actionable-btn-7"">Change Level</a>
</div>
</div>
",3
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md - `[Icon]` Created a puppeteer script for the new launch icon. ([#5854](https://github.com/infor-design/enterprise/issues/5854))
- `[Icon]` Created a puppeteer script for the new mobile icon. ([#6199](https://github.com/infor-design/enterprise/issues/6199))
-- `[Spinbox]` Created a puppeteer script for Spinbox Field sizes on mobile. ([#6197](https://github.com/infor-design/enterprise/pull/6197))
+- `[Spinbox]` Created a puppeteer script for Spinbox Field sizes on mobile. ([#5843](https://github.com/infor-design/enterprise/issues/5843))
## v4.62.0 Fixes
",3
"diff --git a/package.json b/package.json ""e2e:puppeteer"": ""npx --no-install jest --config=test/jest.config.js --runInBand --detectOpenHandles --forceExit"",
""e2e:update-imagesnapshots"": ""npx --no-install jest --config=test/jest.config.js --updateSnapshot --runInBand --detectOpenHandles --forceExit"",
""webdriver:clean"": ""npx webdriver-manager clean"",
- ""webdriver:update"": ""npx webdriver-manager update --versions.chrome=98.0.4758.102 --standalone false --quiet --gecko=false"",
+ ""webdriver:update"": ""npx webdriver-manager update --standalone false --quiet --gecko=false"",
""zip-dist"": ""npx grunt zip-dist"",
""documentation"": ""node ./scripts/deploy-documentation.js"",
""release:dev"": ""node scripts/publish-nightly-manual"",
""node-version-check"": ""npx check-node-version --node 14"",
""node-updates-check"": ""npx ncu""
},
- ""chrome-version"": ""98"",
+ ""chrome-version"": ""100"",
""dependencies"": {
""d3"": ""^5.16.0"",
""ids-identity"": ""4.11.3"",
",3
"diff --git a/package.json b/package.json ""e2e:puppeteer"": ""npx --no-install jest --config=test/jest.config.js --runInBand --detectOpenHandles --forceExit"",
""e2e:update-imagesnapshots"": ""npx --no-install jest --config=test/jest.config.js --updateSnapshot --runInBand --detectOpenHandles --forceExit"",
""webdriver:clean"": ""npx webdriver-manager clean"",
- ""webdriver:update"": ""npx webdriver-manager update --versions.chrome=101.0.4951.41 --standalone false --quiet --gecko=false"",
+ ""webdriver:update"": ""npx webdriver-manager update --standalone false --quiet --gecko=false"",
""zip-dist"": ""npx grunt zip-dist"",
""documentation"": ""node ./scripts/deploy-documentation.js"",
""release:dev"": ""node scripts/publish-nightly-manual"",
""node-version-check"": ""npx check-node-version --node 14"",
""node-updates-check"": ""npx ncu""
},
- ""chrome-version"": ""100"",
+ ""chrome-version"": ""101"",
""dependencies"": {
""d3"": ""^5.16.0"",
""ids-identity"": ""4.11.3"",
",3
"diff --git a/app/views/components/datagrid/example-header-icon-with-tooltip.html b/app/views/components/datagrid/example-header-icon-with-tooltip.html //Define Columns for the Grid.
columns.push({ id: 'selectionCheckbox', sortable: false, resizable: false, formatter: Formatters.SelectionCheckbox, align: 'center'});
columns.push({ id: 'productId', name: 'Product Id', field: 'productId', minWidth: 75, textOverflow: 'ellipsis' });
- columns.push({ id: 'productName', name: 'Product Name', field: 'productName', textOverflow: 'ellipsis', headerTooltip: 'This is header', headerIcon: 'info', headerCssClass: 'lm-custom-class-header' , headerIconTooltip: headerIconTooltipContent, formatter: Formatters.Hyperlink });
+ columns.push({ id: 'productName', name: 'Product Name', field: 'productName', textOverflow: 'ellipsis', headerTooltip: headerIconTooltipContent, headerIcon: 'info', headerCssClass: 'lm-custom-class-header' , headerIconTooltip: headerIconTooltipContent, formatter: Formatters.Hyperlink });
columns.push({ id: 'activity', hidden: true, name: 'Activity', field: 'activity', textOverflow: 'ellipsis'});
columns.push({ id: 'quantity', align: 'right', name: 'Quantity', minWidth: 75, field: 'quantity', textOverflow: 'ellipsis'});
columns.push({ id: 'status', name: 'Status', field: 'price', textOverflow: 'ellipsis', formatter: Formatters.Alert, ranges: [{'min': 0, 'max': 150, 'classes': 'success', text: 'Confirmed'}, {'min': 151, 'max': 9999, 'classes': 'error', text: 'Error'}]});
",3
"diff --git a/package.json b/package.json ""e2e:puppeteer"": ""npx --no-install jest --config=test/jest.config.js --runInBand --detectOpenHandles --forceExit"",
""e2e:update-imagesnapshots"": ""npx --no-install jest --config=test/jest.config.js --updateSnapshot --runInBand --detectOpenHandles --forceExit"",
""webdriver:clean"": ""npx webdriver-manager clean"",
- ""webdriver:update"": ""npx webdriver-manager update --versions.chrome=104.0.5112.79 --standalone false --quiet --gecko=false"",
+ ""webdriver:update"": ""npx webdriver-manager update --versions.chrome=106.0.5249.91 --standalone false --quiet --gecko=false"",
""zip-dist"": ""npx grunt zip-dist"",
""documentation"": ""node ./scripts/deploy-documentation.js"",
""release:dev"": ""node scripts/publish-nightly-manual"",
""node-version-check"": ""npx check-node-version --node 14"",
""node-updates-check"": ""npx ncu""
},
- ""chrome-version"": ""104"",
+ ""chrome-version"": ""106"",
""dependencies"": {
""d3"": ""^5.16.0"",
""ids-identity"": ""4.11.11"",
",3
"diff --git a/.travis.yml b/.travis.yml @@ -6,14 +6,9 @@ python:
- 3.5
env:
- - DJANGOVER=django17
- DJANGOVER=django18
- DJANGOVER=django19
-
-matrix:
- exclude:
- - python: 3.5
- env: DJANGOVER=django17
+ - DJANGOVER=django110
install:
- pip install tox
",3
"diff --git a/web/examples/html-legend.html b/web/examples/html-legend.html </head>
<body>
-<div id=""test""></div>
-<div id=""legend""></div>
+<p>This page demonstrates the usage of the html legend.
+ It shows example of scrollbars for the vertical menu and setting up a horizontal menu</p>
+<div class=""container"">
+
+ <div style=""width:600px; height:300px"">
+ <div id=""year""></div>
+ <div id=""year-legend""></div>
+ </div>
+
+ <div style=""width:600px; height:300px"">
+ <div id=""name""></div>
+ <div id=""name-legend""></div>
+ </div>
<script type=""text/javascript"" src=""../js/d3.js""></script>
<script type=""text/javascript"" src=""../js/crossfilter.js""></script>
<script type=""text/javascript"" src=""../js/dc.js""></script>
-<script type=""text/javascript"">
- var chart = dc.pieChart(""#test"");
- d3.csv(""morley.csv"", function (error, experiments) {
+ <style type=""text/css"">
+ /* overrode the dc-html-legend class to make scroll bar appear for examples purpose*/
+ .dc-html-legend {
+ height: 80px;
+ width: 150px;
+ }
+ </style>
- var ndx = crossfilter(experiments),
- runDimension = ndx.dimension(function (d) {
- return ""run-"" + d.Run;
- }),
- speedSumGroup = runDimension.group().reduceSum(function (d) {
- return d.Speed * d.Run;
+ <script type=""text/javascript"">
+
+ var spendData = [
+ { Name: 'Mr A', Spent: '$40', Year: 2010 },
+ { Name: 'Mr B', Spent: '$10', Year: 2011 },
+ { Name: 'Mr C', Spent: '$40', Year: 2012 },
+ { Name: 'Mr D', Spent: '$70', Year: 2013 },
+ { Name: 'Mr E', Spent: '$20', Year: 2014 },
+ { Name: 'Mr F', Spent: '$50', Year: 2015 },
+ { Name: 'Mr G', Spent: '$30', Year: 2016 }
+ ];
+ // normalize/parse data
+ spendData.forEach(function (d) {
+ d.Spent = d.Spent.match(/\d+/)[0];
});
+ // set crossfilter
+ var ndx = crossfilter(spendData),
+ yearDim = ndx.dimension(function (d) {
+ return +d.Year;
+ }),
+ nameDim = ndx.dimension(function (d) {
+ return d.Name;
+ }),
+ spendPerYear = yearDim.group().reduceSum(function (d) {
+ return +d.Spent;
+ }),
+ nameGroup = nameDim.group().reduceCount();
+
- chart
- .width(768)
- .height(480)
- .slicesCap(4)
+ var yearChart = dc.pieChart(""#year""),
+ nameChart = dc.pieChart(""#name"");
+
+ yearChart
+ .width(400)
+ .height(300)
.innerRadius(100)
- .dimension(runDimension)
- .group(speedSumGroup)
- .legend(dc.htmlLegend().container('#legend').horizontal(false));
+ .dimension(yearDim)
+ .group(spendPerYear)
+ .legend(dc.htmlLegend().container('#year-legend').horizontal(false));
- chart.render();
- });
+ nameChart
+ .width(400)
+ .height(300)
+ .innerRadius(100)
+ .dimension(nameDim)
+ .group(nameGroup)
+ .legend(dc.htmlLegend().container('#name-legend').horizontal(true));
-</script>
+ yearChart.render();
+ nameChart.render();
+ </script>
+</div>
</body>
</html>
\ No newline at end of file
",3
"diff --git a/web/examples/html-legend.html b/web/examples/html-legend.html <body>
<p>This page demonstrates the usage of the html legend.
- It shows example of scrollbars for the vertical menu and setting up a horizontal menu</p>
+ It shows example of scrollbars for the vertical menu and setting up a horizontal menu.
+</p>
+<p style=""padding-bottom: 20px"">
+ It also shows the selected legend highlighted
+</p>
<div class=""container"">
- <div style=""width:600px; height:300px"">
+ <div style=""width:400px; height:150px;display: inline-block"">
<div id=""year""></div>
- <div id=""year-legend""></div>
+ <div id=""year-legend"" class=""dc-html-legend-container""></div>
</div>
- <div style=""width:600px; height:300px"">
+ <div style=""width:400px; height:150px;display: inline-block;margin-left: 100px"">
<div id=""name""></div>
- <div id=""name-legend""></div>
+ <div id=""name-legend"" class=""dc-html-legend-container""></div>
</div>
<script type=""text/javascript"" src=""../js/d3.js""></script>
<script type=""text/javascript"" src=""../js/crossfilter.js""></script>
<script type=""text/javascript"" src=""../js/dc.js""></script>
- <style type=""text/css"">
- /* overrode the dc-html-legend class to make scroll bar appear for examples purpose*/
- .dc-html-legend {
- height: 80px;
- width: 150px;
- }
- </style>
-
<script type=""text/javascript"">
var spendData = [
{ Name: 'Mr D', Spent: '$70', Year: 2013 },
{ Name: 'Mr E', Spent: '$20', Year: 2014 },
{ Name: 'Mr F', Spent: '$50', Year: 2015 },
- { Name: 'Mr G', Spent: '$30', Year: 2016 }
+ { Name: 'Mr G', Spent: '$30', Year: 2016 },
+ { Name: 'Mr D', Spent: '$70', Year: 2017 },
+ { Name: 'Mr E', Spent: '$20', Year: 2018 },
+ { Name: 'Mr F', Spent: '$50', Year: 2019 },
+ { Name: 'Mr G', Spent: '$30', Year: 2020 }
];
// normalize/parse data
spendData.forEach(function (d) {
nameDim = ndx.dimension(function (d) {
return d.Name;
}),
- spendPerYear = yearDim.group().reduceSum(function (d) {
+ spendPerYearGroup = yearDim.group().reduceSum(function (d) {
return +d.Spent;
}),
nameGroup = nameDim.group().reduceCount();
nameChart = dc.pieChart(""#name"");
yearChart
- .width(400)
- .height(300)
- .innerRadius(100)
+ .width(200)
+ .height(150)
.dimension(yearDim)
- .group(spendPerYear)
+ .group(spendPerYearGroup)
+ .turnOnControls(true)
.legend(dc.htmlLegend().container('#year-legend').horizontal(false));
nameChart
- .width(400)
- .height(300)
- .innerRadius(100)
+ .width(200)
+ .height(150)
.dimension(nameDim)
.group(nameGroup)
.legend(dc.htmlLegend().container('#name-legend').horizontal(true));
",3
"diff --git a/README.md b/README.md @@ -25,7 +25,7 @@ Support
* [Example Site](http://dc-js.github.com/dc.js/)
* [Changelog](https://github.com/dc-js/dc.js/blob/develop/Changelog.md)
* [Frequently Asked Questions](https://github.com/dc-js/dc.js/wiki/FAQ) and [Wiki](https://github.com/dc-js/dc.js/wiki)
-* [v2.0 API Reference](http://dc-js.github.io/dc.js/docs/html/) <sup>([markdown](https://github.com/dc-js/dc.js/blob/master/web/docs/api-latest.md))</sup> <sup>([next - v2.1](https://github.com/dc-js/dc.js/blob/develop/web/docs/api-latest.md))</sup> <sup>([last - v1.7](https://github.com/dc-js/dc.js/blob/master/web/docs/api-1.7.0.md))</sup>
+* [v3.0 API Reference](http://dc-js.github.io/dc.js/docs/html/) <sup>([markdown](https://github.com/dc-js/dc.js/blob/master/web/docs/api-latest.md))</sup> <sup>([last - v2.1](https://github.com/dc-js/dc.js/blob/develop/web/docs/api-latest.md))</sup>
* [dc.js on StackOverflow](http://stackoverflow.com/questions/tagged/dc.js) - ask questions and get help
* [User Group](https://groups.google.com/forum/?fromgroups#!forum/dc-js-user-group) (""mailing list"") - discussion and longer topics
* [GitHub Issues](https://github.com/dc-js/dc.js/issues) - bug reports and feature requests
@@ -37,7 +37,9 @@ Get help faster with a working example! Fork these to get started:<br>
CDN location
--------------------
-For CDN URLs, please visit [dc.js on cdnjs.com](https://cdnjs.com/libraries/dc), select the version you want (2.0 is stable, 2.1 has breaking changes), and copy the URLs from there.
+For CDN URLs, please visit [dc.js on cdnjs.com](https://cdnjs.com/libraries/dc), select the version you want (3.0 is stable, 2.1 is legacy version), and copy the URLs from there.
+
+dc.js version 3 needs d3.js versions 4/5. dc.js version 2.1 only works with d3.js version 3.
Please do not use github.io as a CDN unless you need the bleeding-edge features.
",3
"diff --git a/README.md b/README.md @@ -33,17 +33,19 @@ Support
*Please direct questions and support requests to Stack Overflow or the user group. When posting to Stack Overflow, use the* `[dc.js]` *and/or* `[crossfilter]` *tags - other tags are likely to draw unwanted attention.*
Get help faster with a working example! Fork these to get started:<br>
-[example jsFiddle](https://jsfiddle.net/gordonwoodhull/1hbjwxzy/) - [blank jsFiddle](https://jsfiddle.net/gordonwoodhull/kk4j0bzn/) - [example bl.ock](http://blockbuilder.org/gordonwoodhull/ecce8e32d64c662cffd5) - [blank bl.ock](http://blockbuilder.org/gordonwoodhull/9ab997c9a8d7d3380364)
+[example jsFiddle](https://jsfiddle.net/gordonwoodhull/raxxxmk1/) - [blank jsFiddle](https://jsfiddle.net/gordonwoodhull/ckf3d2cv/) - [example bl.ock](http://blockbuilder.org/gordonwoodhull/ecce8e32d64c662cffd5) - [blank bl.ock](http://blockbuilder.org/gordonwoodhull/9ab997c9a8d7d3380364)
-CDN location
---------------------
-For CDN URLs, please visit [dc.js on cdnjs.com](https://cdnjs.com/libraries/dc), select the version you want (3.0 is stable, 2.1 is legacy version), and copy the URLs from there.
+## Versioning
+Version 3.* is compatible with d3 versions 4 and 5. Use dc.js 2.* if you still need compatibility with d3 version 3.
-dc.js version 3 needs d3.js versions 4/5. dc.js version 2.1 only works with d3.js version 3.
+## CDN location
-Please do not use github.io as a CDN unless you need the bleeding-edge features.
+```
+http://unpkg.com/dc@3/dc.js
+http://unpkg.com/dc@3/dc.css
+```
-[More info on the Wiki.](https://github.com/dc-js/dc.js/wiki#cdn-location)
+or copy the latest links from [CDNJS](https://cdnjs.com/libraries/dc)
Install with npm
",3
"diff --git a/src/heatmap.js b/src/heatmap.js @@ -226,13 +226,13 @@ dc.heatMap = function (parent, chartGroup) {
.attr('y', function (d, i) { return rows(_chart.valueAccessor()(d, i)); })
.on('click', _chart.boxOnClick());
+ boxes = gEnter.merge(boxes);
+
if (_chart.renderTitle()) {
gEnter.append('title');
boxes.select('title').text(_chart.title());
}
- boxes = gEnter.merge(boxes);
-
dc.transition(boxes.select('rect'), _chart.transitionDuration(), _chart.transitionDelay())
.attr('x', function (d, i) { return cols(_chart.keyAccessor()(d, i)); })
.attr('y', function (d, i) { return rows(_chart.valueAccessor()(d, i)); })
",3
"diff --git a/web/examples/replacing-data.html b/web/examples/replacing-data.html </head>
<body>
-<link rel=""stylesheet"" type=""text/css"" href=""http://dc-js.github.io/dc.js/css/dc.css""/>
+<link rel=""stylesheet"" type=""text/css"" href=""//dc-js.github.io/dc.js/css/dc.css""/>
<div class=""container"">
<script type=""text/javascript"" src=""header.js""></script>
<script type=""text/javascript"" src=""../js/promise-polyfill.js""></script>
<script type=""text/javascript"" src=""../js/fetch.umd.js""></script>
-<script type=""text/javascript"" src=""http://dc-js.github.io/dc.js/js/d3.js""></script>
-<script type=""text/javascript"" src=""http://dc-js.github.io/dc.js/js/crossfilter.js""></script>
-<script type=""text/javascript"" src=""http://dc-js.github.io/dc.js/js/dc.js""></script>
+<script type=""text/javascript"" src=""//dc-js.github.io/dc.js/js/d3.js""></script>
+<script type=""text/javascript"" src=""//dc-js.github.io/dc.js/js/crossfilter.js""></script>
+<script type=""text/javascript"" src=""//dc-js.github.io/dc.js/js/dc.js""></script>
<div id=""chart-ring-year""></div>
<div id=""chart-row-spenders""></div>
<p>This page will replace the crossfilter data in 5 seconds. If you modify the filters before then, the filters will be restored.<p>
-<p>It's based on <a href=""http://stackoverflow.com/questions/32770830/updating-dc-js-data-and-reapplying-original-filters"">a question
+<p>It's based on <a href=""//stackoverflow.com/questions/32770830/updating-dc-js-data-and-reapplying-original-filters"">a question
and answer on Stack Overflow</a>; question by geotheory, answer by Ethan Jewett.</p>
<script type=""text/javascript"">
",3
"diff --git a/README.md b/README.md @@ -13,7 +13,7 @@ attributes through the position, size, and color of its elements, and also prese
which can be filtered. When the filter or brush changes, all other charts are updated dynamically,
using animated transitions.
-Check out the [example page](http://dc-js.github.com/dc.js/)
+Check out the [example page](http://dc-js.github.io/dc.js/)
and its [annotated source](http://dc-js.github.io/dc.js/docs/stock.html) for a quick five minute
how-to guide. The detailed [API reference is here](http://dc-js.github.io/dc.js/docs/html/)
([markdown version](https://github.com/dc-js/dc.js/blob/master/docs/api-latest.md)). For
@@ -22,7 +22,7 @@ more examples and hints please visit the [Wiki](https://github.com/dc-js/dc.js/w
Support
--------------------
-* [Example Site](http://dc-js.github.com/dc.js/)
+* [Example Site](http://dc-js.github.io/dc.js/)
* [Changelog](https://github.com/dc-js/dc.js/blob/develop/Changelog.md)
* [Frequently Asked Questions](https://github.com/dc-js/dc.js/wiki/FAQ) and [Wiki](https://github.com/dc-js/dc.js/wiki)
* [v4.0 API Reference](http://dc-js.github.io/dc.js/docs/html/) <sup>([markdown](https://github.com/dc-js/dc.js/blob/master/docs/api-latest.md))</sup> <sup>([last - v3.1.9](https://github.com/dc-js/dc.js/blob/master/docs/old-api-docs/api-3.1.9.md))</sup>
",3
"diff --git a/Extensions/azure-node-essentials/README.md b/Extensions/azure-node-essentials/README.md # Azure Node Essentials
-This extension provides NodeJs tools for developers working with Azure in VSCode.
+This extension provides NodeJs tools for developers working with Azure SDKs.
## Feature List
1. Project and file scaffolding
1. Snippets for some common operations such as authentication, creating a service principal.
+1. Code generation scenarios
+ * generate code for template deployment
+
## Dependencies
The following package/extension dependencies are auto installed when you install this extension.
1. [vscode yo](https://marketplace.visualstudio.com/items?itemName=samverschueren.yo)
-1. [generator-azure-node](https://github.com/balajikris/generator-azure-node)
+1. [generator-azure-node](https://github.com/Azure/azure-sdk-for-node/tree/master/Extensions/generator-azure-node)
",3
"diff --git a/Extensions/azure-node-essentials/README.md b/Extensions/azure-node-essentials/README.md @@ -5,23 +5,32 @@ This extension provides NodeJs tools for developers working with Azure SDKs.
## Feature List
1. Project and file scaffolding
+ * `yo azure-node` to create
+ * Javascript or Typescript project with package.json set up to target Azure SDKs
+ * Empty .js or .ts files
+ * pre populated .tsconfig or .jsconfig files
+ * create a service principal
1. Snippets for some common operations such as authentication, creating a service principal.
+ * `loginInt` : generate code for interactive login
+ * `loginPwd` : generate code for logging in with username and password
+ * `loginSp` : generate code for logging in with a service principal
+ * `spCreate` : generate code to create a service principal
1. Code generation scenarios
- * generate code for template deployment
+ * command `Azure-Node: Generate code for template deployment` : generate code for template deployment
### Sample workflow
-1. Open VS code with an empty workspace (no folder)
-2. Bring up VS code command palette, invoke `yo`
-3. Choose `azure-node` generator and invoke it.
-4. Choose `* app` to invoke the main generator (the sub generators for files are listed at the root level)
-5. Choose a Javascript project and proceed.
-6. This should initialize your project and install npm dependencies
-7. Meanwhile, open the folder in VSCode and navigate to index.js
-8. Notice that package.json has been set up and index.js has boiler plate code for authentication.
-9. Place caret on the line after `// TODO: Write your application logic here.`
-9. From VS Code's command palette, invoke `>Azure-Node: Generate code for template deployment`
-10. The extension generates code for template deployment.
+1. Open VS code with an empty workspace (empty folder)
+1. Bring up VS code command palette, invoke `yo`
+1. Choose `azure-node` generator and invoke it.
+1. Choose `* app` to invoke the main generator (the sub generators for files are listed at the root level)
+1. Choose a Javascript project and proceed.
+1. This should initialize your project and install npm dependencies
+1. Meanwhile, open the folder in VSCode and navigate to index.js
+1. Notice that package.json has been set up and index.js has boiler plate code for authentication.
+1. Place caret on the line after `// TODO: Write your application logic here.`
+1. From VS Code's command palette, invoke `>Azure-Node: Generate code for template deployment`
+1. The extension generates code for template deployment.
## Dependencies
",3
"diff --git a/Extensions/azure-node-essentials/changelog.md b/Extensions/azure-node-essentials/changelog.md # Change Log for Azure Node Essentials
-## 0.1.0-preview - 2017-02-07
+## 0.2.3 [2017-02-08]
+
+1. Bug fixes for Mac
+1. updates to readme
+1. check for generator package's version and upgrade if not latest
+
+## 0.2.0 - 0.2.2 [2017-02-07]
+
+1. No product change, updates to readme and other metadata about the project.
+
+## 0.1.0 [2017-02-07]
1. Project and file scaffolding
1. Snippets for some common operations such as authentication, creating a service principal.
",3
"diff --git a/lib/services/computeManagement/package.json b/lib/services/computeManagement/package.json ""Lee, Hyonho <Hyonho.Lee@microsoft.com>"",
""Desai, Priyank <priydes@microsoft.com>""
],
- ""version"": ""0.17.1"",
+ ""version"": ""0.18.1"",
""description"": ""Microsoft Azure Compute Management Client Library for node"",
""tags"": [
""azure"",
",3
"diff --git a/runtime/ms-rest/package.json b/runtime/ms-rest/package.json ""email"": ""azsdkteam@microsoft.com"",
""url"": ""https://github.com/Azure/azure-sdk-for-node""
},
- ""version"": ""1.15.5"",
+ ""version"": ""1.15.6"",
""description"": ""Client Runtime for Node.js client libraries generated using AutoRest"",
""tags"": [""node"", ""microsoft"", ""autorest"", ""clientruntime""],
""keywords"": [""node"", ""microsoft"", ""autorest"", ""clientruntime""],
",3
"diff --git a/runtime/ms-rest-azure/package.json b/runtime/ms-rest-azure/package.json ""email"": ""azsdkteam@microsoft.com"",
""url"": ""https://github.com/Azure/azure-sdk-for-node""
},
- ""version"": ""1.15.5"",
+ ""version"": ""1.15.6"",
""description"": ""Client Runtime for Node.js Azure client libraries generated using AutoRest"",
""tags"": [ ""node"", ""microsoft"", ""autorest"", ""azure"", ""clientruntime"" ],
""keywords"": [ ""node"", ""microsoft"", ""autorest"", ""azure"", ""clientruntime"" ],
""async"": ""0.2.7"",
""uuid"": ""^3.0.1"",
""adal-node"": ""^0.1.17"",
- ""ms-rest"": ""^1.15.5"",
+ ""ms-rest"": ""^1.15.6"",
""moment"": ""^2.14.1"",
""azure-arm-resource"": ""^1.6.1-preview""
},
",3
"diff --git a/nodeSDK.njsproj b/nodeSDK.njsproj <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{72210dc5-a996-48d4-bb68-ba82b3544c77}</ProjectGuid>
<ProjectHome />
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<StartupFile>
</StartupFile>
<WorkingDirectory>.</WorkingDirectory>
<Compile Include=""lib\services\dataLake.Analytics\lib\account\dataLakeAnalyticsAccountManagementClient.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\addDataLakeStoreParameters.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\addStorageAccountParameters.js"" />
- <Compile Include=""lib\services\dataLake.Analytics\lib\account\models\createStorageAccountInfo.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\dataLakeAnalyticsAccount.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\dataLakeAnalyticsAccountListDataLakeStoreResult.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\dataLakeAnalyticsAccountListResult.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\dataLakeAnalyticsAccountListStorageAccountsResult.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\dataLakeAnalyticsAccountUpdateParameters.js"" />
+ <Compile Include=""lib\services\dataLake.Analytics\lib\account\models\dataLakeAnalyticsFirewallRuleListResult.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\dataLakeStoreAccountInfo.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\errorDetails.js"" />
- <Compile Include=""lib\services\dataLake.Analytics\lib\account\models\errorModel.js"" />
+ <Compile Include=""lib\services\dataLake.Analytics\lib\account\models\firewallRule.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\index.js"" />
- <Compile Include=""lib\services\dataLake.Analytics\lib\account\models\innerError.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\listSasTokensResult.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\listStorageContainersResult.js"" />
+ <Compile Include=""lib\services\dataLake.Analytics\lib\account\models\optionalSubResource.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\resource.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\sasTokenInfo.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\storageAccountInfo.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\storageContainer.js"" />
+ <Compile Include=""lib\services\dataLake.Analytics\lib\account\models\subResource.js"" />
+ <Compile Include=""lib\services\dataLake.Analytics\lib\account\models\updateFirewallRuleParameters.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\models\updateStorageAccountParameters.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\operations\account.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\operations\dataLakeStoreAccounts.js"" />
+ <Compile Include=""lib\services\dataLake.Analytics\lib\account\operations\firewallRules.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\operations\index.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\account\operations\storageAccounts.js"" />
<Compile Include=""lib\services\dataLake.Analytics\lib\catalog\dataLakeAnalyticsCatalogManagementClient.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\models\encryptionConfig.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\models\encryptionIdentity.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\models\errorDetails.js"" />
- <Compile Include=""lib\services\dataLake.Store\lib\account\models\errorModel.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\models\firewallRule.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\models\index.js"" />
- <Compile Include=""lib\services\dataLake.Store\lib\account\models\innerError.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\models\keyVaultMetaInfo.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\models\resource.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\models\subResource.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\models\trustedIdProvider.js"" />
+ <Compile Include=""lib\services\dataLake.Store\lib\account\models\updateFirewallRuleParameters.js"" />
+ <Compile Include=""lib\services\dataLake.Store\lib\account\models\updateTrustedIdProviderParameters.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\operations\account.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\operations\firewallRules.js"" />
<Compile Include=""lib\services\dataLake.Store\lib\account\operations\index.js"" />
",3
"diff --git a/gulpfile.js b/gulpfile.js @@ -241,7 +241,7 @@ const mappings = {
},
'servermanagement': {
'dir': 'servermanagement/lib',
- 'source': 'arm-servermanagement/2016-07-01-preview/servermanagement.json'
+ 'source': 'arm-servermanagement/2016-07-01-preview/swagger/servermanagement.json'
},
'serviceMap': {
'dir': 'serviceMapManagement/lib',
@@ -288,12 +288,12 @@ const mappings = {
}
};
-const defaultAutoRestVersion = '1.0.1-20170322-2300-nightly';
+const defaultAutoRestVersion = '1.0.1-20170324-2300-nightly';
var usingAutoRestVersion;
const specRoot = args['spec-root'] || ""https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master"";
const project = args['project'];
-const language = 'Azure.NodeJS';
-const modeler = 'Swagger';
+var language = 'Azure.NodeJS';
+var modeler = 'Swagger';
function getAutorestVersion(version) {
if (!version) version = 'latest';
@@ -332,7 +332,7 @@ function deleteFolderRecursive(path) {
function clearProjectBeforeGenerating(projectDir) {
let modelsDir = `${projectDir}/models`;
let operationsDir = `${projectDir}/operations`;
- let clientTypedefFile = path.basename(glob.sync(`${projectDir}/*.d.ts`)[0]);
+ let clientTypedefFile = path.basename(glob.sync(`${projectDir}/*.d.ts`)[0] || '');
let clientJSFile = `${clientTypedefFile.split('.')[0]}.js`;
let directoriesToBeDeleted = [modelsDir, operationsDir];
let filesToBeDeleted = [clientTypedefFile, clientJSFile];
",3
"diff --git a/gulpfile.js b/gulpfile.js @@ -18,7 +18,7 @@ const mappings = {
},
'apiManagement': {
'dir': 'apiManagement/lib',
- 'source': 'azure-rest-api-specs/arm-apimanagement/compositeApiManagementClient.json',
+ 'source': 'arm-apimanagement/compositeApiManagementClient.json',
'modeler': 'CompositeSwagger'
},
'authorization': {
@@ -174,7 +174,7 @@ const mappings = {
},
'operationalInsights': {
'dir': 'operationalInsightsManagement2/lib',
- 'source': 'arm-operationalInsights/compositeOperationalInsights.json',
+ 'source': 'arm-operationalinsights/compositeOperationalInsights.json',
'modeler': 'CompositeSwagger'
},
'powerbiembedded': {
@@ -353,6 +353,7 @@ function generateProject(project, specRoot, autoRestVersion) {
let currentModeler = modeler;
let specPath = specRoot + '/' + mappings[project].source;
let result;
+ language = 'Azure.NodeJS'
//servicefabric wants to generate using generic NodeJS.
if (mappings[project].language && mappings[project].language.match(/^NodeJS$/ig) !== null) {
language = mappings[project].language;
",3
"diff --git a/.travis.yml b/.travis.yml @@ -13,6 +13,7 @@ before_install:
- npm install -g npm@1.4.23
- npm run-script setup
- npm install
+ - npm update -g npm
#- cd ..
#- git clone https://github.com/azure/azure-xplat-cli.git
#- cd azure-xplat-cli
",3
"diff --git a/ChangeLog.md b/ChangeLog.md +##2017.03.31 version 2.0.0-preview
+* Updated type definition (.d.ts) files for all the packages and improved typescript support .
+* Added Promise support for all the APIs. For each callback based API, we now have an overloaded method that returns a Promise.
+* Moved Javascript code to ES6 syntax
+* Minimum required node.js version is 6.10
+* Add client libraries for following ARM services
+ * Advisor Management
+ * Automation Management
+ * Billing Management
+ * Cognitive Services Management
+ * Container Registry Management
+ * Customer Insights Management
+ * DocumentDB Management
+ * Logic Management
+ * Machine Learning Management
+ * Media Services Management
+ * Operational Insights Management
+ * Recovery Services Backup Management
+ * Recovery Services Management
+ * Relay Management
+ * Scheduler Management
+ * Search Management
+ * ServiceMap Management
+ * SQL Management
+ * Storage Import Export Management
+ * Search Index
+ * Search Service
+
##2016.09.07 Version 1.2.0-preview
* Added client libraries for following ARM services
* Servicebus management
",3
"diff --git a/package.json b/package.json ""azure-scheduler"": ""0.10.3"",
""azure-storage"": ""1.3.0"",
""mime"": ""~1.2.4"",
- ""ms-rest-azure"": ""^2.0.0"",
+ ""ms-rest-azure"": ""^2.0.1"",
""ms-rest"": ""^2.0.0"",
""moment"": ""^2.18.1"",
""underscore"": ""1.4.x"",
",3
"diff --git a/gruntfile.js b/gruntfile.js @@ -25,9 +25,10 @@ module.exports = function(grunt) {
template: 'node_modules/minami',
configure: 'jsdocs/jsdoc.conf.json',
};
-
-
- var sources = _.map(glob.sync('lib/**/package.json', {}), function(pack) {
+ var servicePackages = glob.sync('lib/**/package.json', {ignore: 'lib/services/webSiteManagement2/package.json'});
+ var runtimePackages = glob.sync('runtime/**/package.json', {ignore: 'runtime/**/test/package.json'});
+ var packages = servicePackages.concat(runtimePackages);
+ var sources = _.map(packages, function(pack) {
return _.map(['/**/*.js', '/package.json', '/README.md'], function(i) {
return path.dirname(pack) + i;
});
",3
"diff --git a/gulpfile.js b/gulpfile.js +/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ */
+
+'use strict';
+
const gulp = require('gulp');
const args = require('yargs').argv;
const colors = require('colors');
",3
"diff --git a/lib/services/storageManagement2/package.json b/lib/services/storageManagement2/package.json ""Wang, Yugang <yugangw@microsoft.com>"",
""Zavery, Amar <amzavery@microsoft.com>""
],
- ""version"": ""1.1.0-preview"",
+ ""version"": ""2.0.0-preview"",
""description"": ""Microsoft Azure Storage Resource Provider Management Client Library for Node"",
""tags"": [
""azure"",
",3
"diff --git a/gulpfile.js b/gulpfile.js @@ -374,7 +374,7 @@ const mappings = {
}
};
-const defaultAutoRestVersion = '1.0.1-20170608-2300-nightly';
+const defaultAutoRestVersion = '1.1.0-20170704-2300-nightly --prerelease';
var usingAutoRestVersion;
const specRoot = args['spec-root'] || ""https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master"";
const project = args['project'];
",3
"diff --git a/package_service_mapping.json b/package_service_mapping.json ""service_name"": ""Monitor"",
""category"": ""Management""
},
- ""azure-arm-intune"": {
- ""service_name"": ""Intune"",
- ""category"": ""Management""
- },
""azure-arm-iothub"": {
""service_name"": ""IoT Hub"",
""category"": ""Management""
",3
"diff --git a/lib/services/networkManagement2/README.md b/lib/services/networkManagement2/README.md This project provides a Node.js package that makes it easy to manage Microsoft Azure Network Resources.
- **Node.js version: 6.x.x or higher**
-- **API version: 2017-06-01**
+- **API version: 2017-08-01**
## Features
",3
"diff --git a/gulpfile.js b/gulpfile.js @@ -22,6 +22,7 @@ const specRoot = args['spec-root'] || ""https://raw.githubusercontent.com/Azure/a
const project = args['project'];
var language = 'Azure.NodeJS';
var modeler = 'Swagger';
+const regexForExcludedServices = /\/(intune|documentdbManagement|insightsManagement|insights|search)\//i;
function getAutorestVersion(version) {
if (!version) version = 'latest';
@@ -241,9 +242,9 @@ gulp.task('validate-each-packagejson', (cb) => {
//This task updates the dependencies in package.json to the relative service libraries inside lib/services directory.
gulp.task('update-deps-rollup', (cb) => {
- const re = /\/(intune|documentdbManagement|insightsManagement|insights)\//i;
+
let packagePaths = glob.sync(path.join(__dirname, './lib/services', '/**/package.json')).filter((packagePath) => {
- return packagePath.match(re) === null;
+ return packagePath.match(regexForExcludedServices) === null;
});
let rollupPackage = require('./package.json');
let rollupDependencies = rollupPackage.dependencies;
@@ -372,9 +373,8 @@ gulp.task('sync-mappings-with-repo', (cb) => {
// This task synchronizes the dependencies in package.json to the versions of relative service libraries inside lib/services directory.
// This should be done in the end to ensure that all the package dependencies have the correct version.
gulp.task('sync-deps-rollup', (cb) => {
- const re = /\/(intune|documentdbManagement|insightsManagement|insights)\//i;
let packagePaths = glob.sync(path.join(__dirname, './lib/services', '/**/package.json')).filter((packagePath) => {
- return packagePath.match(re) === null;
+ return packagePath.match(regexForExcludedServices) === null;
});
//console.log(packagePaths);
console.log(`Total packages found under lib/services: ${packagePaths.length}`);
",3
"diff --git a/lib/services/networkManagement2/package.json b/lib/services/networkManagement2/package.json ""Rajendran, Deepak <derajen@microsoft.com>"",
""Choubey, Ankur <anchoube@microsoft.com>""
],
- ""version"": ""4.0.0"",
+ ""version"": ""4.0.1"",
""description"": ""Microsoft Azure Network Resource Provider Management Client Library for node"",
""tags"": [
""azure"",
",3
"diff --git a/package.json b/package.json ""azure-storage-legacy"": ""0.10.2"",
""mime"": ""~1.2.4"",
""moment"": ""~2.18.1"",
- ""ms-rest"": ""^2.2.3"",
- ""ms-rest-azure"": ""^2.4.1"",
+ ""ms-rest"": ""^2.2.5"",
+ ""ms-rest-azure"": ""^2.4.4"",
""request"": ""^2.81.0"",
""underscore"": ""1.8.3"",
""uuid"": ""^3.0.1""
",3
"diff --git a/runtime/ms-rest/index.d.ts b/runtime/ms-rest/index.d.ts @@ -15,6 +15,23 @@ export interface ClientRequestOptions extends RequestOptions {
jar?: boolean;
}
+/**
+ * HttpResponse wrapper that encapsulates the
+ * response stream plus available status codes/messages
+ *
+ * @property {Object} headers - response headers returned from the server, duplicate filtered
+ * as described in https://nodejs.org/dist/latest-v8.x/docs/api/http.html#http_message_headers
+ * @property {Array} [rawHeaders] - Original unprocessed response headers
+ * @property {Number} statusCode - HTTP status code for response
+ * @property {String} statusMessage - HTTP status response message
+ */
+export interface Response extends stream.Readable {
+ headers: any;
+ rawHeaders: string[];
+ statusCode: number;
+ statusMessage: string;
+}
+
/**
* HttpOperationResponse wrapper that provides the raw request, raw response and the deserialized response body.
*
@@ -24,7 +41,7 @@ export interface ClientRequestOptions extends RequestOptions {
*/
export interface HttpOperationResponse<T> {
request: WebResource;
- response: stream;
+ response: Response;
body: T;
}
@@ -250,6 +267,13 @@ export interface UrlBasedRequestPrepareOptions extends RequestPrepareOptions {
* properties to initiate a request.
*/
export class WebResource {
+ /**
+ * Access to raw request headers for requests. Useful when you need to set a header
+ * on every request (like in a credential object) where the prepare method does
+ * far too much work.
+ */
+ public headers: { [key: string]: string; };
+
/**
* Hook up the given input stream to a destination output stream if the WebResource method
* requires a request body and a body is not already set.
@@ -260,6 +284,7 @@ export class WebResource {
* @return destStream
*/
pipeInput(inputStream: stream.Readable, destStream: stream.Writable): stream.Writable;
+
/**
* Validates that the required properties such as method, url, headers['Content-Type'],
* headers['accept-language'] are defined. It will throw an error if one of the above
",3
"diff --git a/package.json b/package.json ""mime"": ""~1.2.4"",
""moment"": ""~2.18.1"",
""ms-rest"": ""^2.2.5"",
- ""ms-rest-azure"": ""^2.4.4"",
+ ""ms-rest-azure"": ""^2.5.0"",
""request"": ""^2.81.0"",
""underscore"": ""1.8.3"",
""uuid"": ""^3.0.1""
",3
"diff --git a/package_service_mapping.json b/package_service_mapping.json ""category"": ""Client"",
""service_name"": ""Batch""
},
- ""azure-cognitiveservices"": {
+ ""azure-cognitiveservices-computervision"": {
""category"": ""Client"",
- ""service_name"": ""Cognitiveservices""
+ ""service_name"": ""computerVision""
+ },
+ ""azure-cognitiveservices-contentmoderator"": {
+ ""category"": ""Client"",
+ ""service_name"": ""contentModerator""
+ },
+ ""azure-cognitiveservices-customsearch"": {
+ ""category"": ""Client"",
+ ""service_name"": ""customSearch""
+ },
+ ""azure-cognitiveservices-entitysearch"": {
+ ""category"": ""Client"",
+ ""service_name"": ""entitySearch""
+ },
+ ""azure-cognitiveservices-face"": {
+ ""category"": ""Client"",
+ ""service_name"": ""face""
+ },
+ ""azure-cognitiveservices-imagesearch"": {
+ ""category"": ""Client"",
+ ""service_name"": ""imageSearch""
+ },
+ ""azure-cognitiveservices-language"": {
+ ""category"": ""Client"",
+ ""service_name"": ""language""
+ },
+ ""azure-cognitiveservices-newssearch"": {
+ ""category"": ""Client"",
+ ""service_name"": ""newsSearch""
+ },
+ ""azure-cognitiveservices-search"": {
+ ""category"": ""Client"",
+ ""service_name"": ""search""
+ },
+ ""azure-cognitiveservices-spellcheck"": {
+ ""category"": ""Client"",
+ ""service_name"": ""spellCheck""
+ },
+ ""azure-cognitiveservices-textanalytics"": {
+ ""category"": ""Client"",
+ ""service_name"": ""textAnalytics""
+ },
+ ""azure-cognitiveservices-videosearch"": {
+ ""category"": ""Client"",
+ ""service_name"": ""videoSearch""
+ },
+ ""azure-cognitiveservices-vision"": {
+ ""category"": ""Client"",
+ ""service_name"": ""vision""
+ },
+ ""azure-cognitiveservices-websearch"": {
+ ""category"": ""Client"",
+ ""service_name"": ""webSearch""
},
""azure-graph"": {
""category"": ""Client"",
",3
"diff --git a/lib/services/consumptionManagement/package.json b/lib/services/consumptionManagement/package.json ""contributors"": [
""Zavery, Amar <amzavery@microsoft.com>""
],
- ""version"": ""2.1.0"",
+ ""version"": ""3.0.0"",
""description"": ""Microsoft Azure Consumption Management Client Library for node"",
""tags"": [
""azure"",
",3
"diff --git a/test/services/keyVault/keyVault-storage-tests.js b/test/services/keyVault/keyVault-storage-tests.js @@ -49,7 +49,7 @@ var testStorageAccount;
var _tokenFromUserCredentials = () => {
return new Promise ( (resolve, reject) => {
if(suite.isPlayback) {
- resolve( { 'oid': '7541419d-883d-452f-a823-56aa8bf0749f' } );
+ resolve( { 'oid': 'dummyoid' } );
return;
}
",3
"diff --git a/test/recordings/keyvaultstorage-tests/Key_Vault_Storage_should_successfully_assign_Key_Vault_the_operator_role_on_a_storage_account.nock.js b/test/recordings/keyvaultstorage-tests/Key_Vault_Storage_should_successfully_assign_Key_Vault_the_operator_role_on_a_storage_account.nock.js @@ -9,7 +9,7 @@ exports.scopes = [[function (nock) {
var result =
nock('https://management.azure.com:443')
.filteringRequestBody(function (path) { return '*';})
-.put('/subscriptions/6d8e19c2-3a60-481f-8ebb-118dc3007c5d/resourcegroups/nodeTestGroup8988?api-version=2017-05-10', '*')
+.put('/subscriptions/6d8e19c2-3a60-481f-8ebb-118dc3007c5d/resourcegroups/nodeTestGroup8988?api-version=2018-03-01-preview', '*')
.reply(201, ""{\""id\"":\""/subscriptions/6d8e19c2-3a60-481f-8ebb-118dc3007c5d/resourceGroups/nodeTestGroup8988\"",\""name\"":\""nodeTestGroup8988\"",\""location\"":\""westus\"",\""properties\"":{\""provisioningState\"":\""Succeeded\""}}"", { 'cache-control': 'no-cache',
pragma: 'no-cache',
'content-length': '187',
@@ -73,12 +73,12 @@ function (nock) {
var result =
nock('https://management.azure.com:443')
.filteringRequestBody(function (path) { return '*';})
-.put('/subscriptions/6d8e19c2-3a60-481f-8ebb-118dc3007c5d/resourceGroups/nodeTestGroup8988/providers/Microsoft.Storage/storageAccounts/testakvsa725?api-version=2017-10-01', '*')
+.put('/subscriptions/6d8e19c2-3a60-481f-8ebb-118dc3007c5d/resourceGroups/nodeTestGroup8988/providers/Microsoft.Storage/storageAccounts/testakvsa725?api-version=2018-03-01-preview', '*')
.reply(202, """", { 'cache-control': 'no-cache',
pragma: 'no-cache',
'content-type': 'text/plain; charset=utf-8',
expires: '-1',
- location: 'https://management.azure.com/subscriptions/6d8e19c2-3a60-481f-8ebb-118dc3007c5d/providers/Microsoft.Storage/locations/westus/asyncoperations/13677821-d80a-4bae-92c0-e81a17ae32e0?monitor=true&api-version=2017-10-01',
+ location: 'https://management.azure.com/subscriptions/6d8e19c2-3a60-481f-8ebb-118dc3007c5d/providers/Microsoft.Storage/locations/westus/asyncoperations/13677821-d80a-4bae-92c0-e81a17ae32e0?monitor=true&api-version=2018-03-01-preview',
'retry-after': '17',
'x-ms-request-id': '13677821-d80a-4bae-92c0-e81a17ae32e0',
'strict-transport-security': 'max-age=31536000; includeSubDomains',
@@ -94,7 +94,7 @@ nock('https://management.azure.com:443')
function (nock) {
var result =
nock('https://management.azure.com:443')
- .get('/subscriptions/6d8e19c2-3a60-481f-8ebb-118dc3007c5d/providers/Microsoft.Storage/locations/westus/asyncoperations/13677821-d80a-4bae-92c0-e81a17ae32e0?monitor=true&api-version=2017-10-01')
+ .get('/subscriptions/6d8e19c2-3a60-481f-8ebb-118dc3007c5d/providers/Microsoft.Storage/locations/westus/asyncoperations/13677821-d80a-4bae-92c0-e81a17ae32e0?monitor=true&api-version=2018-03-01-preview')
.reply(200, ""{\""sku\"":{\""name\"":\""Standard_RAGRS\"",\""tier\"":\""Standard\""},\""kind\"":\""Storage\"",\""id\"":\""/subscriptions/6d8e19c2-3a60-481f-8ebb-118dc3007c5d/resourceGroups/nodeTestGroup8988/providers/Microsoft.Storage/storageAccounts/testakvsa725\"",\""name\"":\""testakvsa725\"",\""type\"":\""Microsoft.Storage/storageAccounts\"",\""location\"":\""westus\"",\""tags\"":{},\""properties\"":{\""networkAcls\"":{\""bypass\"":\""AzureServices\"",\""virtualNetworkRules\"":[],\""ipRules\"":[],\""defaultAction\"":\""Allow\""},\""trustedDirectories\"":[\""72f988bf-86f1-41af-91ab-2d7cd011db47\""],\""supportsHttpsTrafficOnly\"":false,\""encryption\"":{\""services\"":{\""file\"":{\""enabled\"":true,\""lastEnabledTime\"":\""2018-06-27T23:53:18.5429883Z\""},\""blob\"":{\""enabled\"":true,\""lastEnabledTime\"":\""2018-06-27T23:53:18.5429883Z\""}},\""keySource\"":\""Microsoft.Storage\""},\""provisioningState\"":\""Succeeded\"",\""creationTime\"":\""2018-06-27T23:53:18.2617285Z\"",\""primaryEndpoints\"":{\""blob\"":\""https://testakvsa725.blob.core.windows.net/\"",\""queue\"":\""https://testakvsa725.queue.core.windows.net/\"",\""table\"":\""https://testakvsa725.table.core.windows.net/\"",\""file\"":\""https://testakvsa725.file.core.windows.net/\""},\""primaryLocation\"":\""westus\"",\""statusOfPrimary\"":\""available\"",\""secondaryLocation\"":\""eastus\"",\""statusOfSecondary\"":\""available\"",\""secondaryEndpoints\"":{\""blob\"":\""https://testakvsa725-secondary.blob.core.windows.net/\"",\""queue\"":\""https://testakvsa725-secondary.queue.core.windows.net/\"",\""table\"":\""https://testakvsa725-secondary.table.core.windows.net/\""}}}"", { 'cache-control': 'no-cache',
pragma: 'no-cache',
'content-length': '1380',
",3
"diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml @@ -144,7 +144,7 @@ jobs:
steps:
- powershell: |
- Invoke-WebRequest -Uri ""https://github.com/chidozieononiwu/azure-sdk-tools/releases/download/sdk-tools_v1.0/sdk-tools.zip"" `
+ Invoke-WebRequest -Uri ""https://github.com/Azure/azure-sdk-tools/releases/download/sdk-tools_14793/sdk-tools.zip"" `
-OutFile ""sdk-tools.zip"" | Wait-Process; Expand-Archive -Path ""sdk-tools.zip"" -DestinationPath ""./sdk-tools/""
workingDirectory: '$(Build.BinariesDirectory)'
displayName: 'Download Tools Archive From Github Release and Extract it'
@@ -152,7 +152,7 @@ jobs:
- task: PythonScript@0
displayName: 'Run VerifyAgentOS script'
inputs:
- scriptPath: '$(Build.BinariesDirectory)/sdk-tools/verify_agent_os.py'
+ scriptPath: '$(Build.BinariesDirectory)/sdk-tools/scripts/python/verify_agent_os.py'
arguments: $(OSName)
- task: NodeTool@0
",3
"diff --git a/packages/preact-iso/test/match.test.js b/packages/preact-iso/test/match.test.js import { exec } from '../router.js';
+function doExec(path, route, opts) {
+ return exec(path, route, { path, query: {}, params: {}, ...(opts || {}) });
+}
+
describe('match', () => {
it('Base route', () => {
- const accurateResult = exec('/', '/', { path: '/' });
+ const accurateResult = doExec('/', '/');
expect(accurateResult).toEqual({ path: '/', params: {} });
- const inaccurateResult = exec('/user/1', '/', { path: '/' });
+ const inaccurateResult = doExec('/user/1', '/');
expect(inaccurateResult).toEqual(undefined);
});
it('Param route', () => {
- const accurateResult = exec('/user/2', '/user/:id', { path: '/' });
+ const accurateResult = doExec('/user/2', '/user/:id');
expect(accurateResult).toEqual({ path: '/', params: { id: '2' } });
- const inaccurateResult = exec('/', '/user/:id', { path: '/' });
+ const inaccurateResult = doExec('/', '/user/:id');
expect(inaccurateResult).toEqual(undefined);
});
it('Optional param route', () => {
- const accurateResult = exec('/user', '/user/:id?', { path: '/' });
+ const accurateResult = doExec('/user', '/user/:id?');
expect(accurateResult).toEqual({ path: '/', params: { id: undefined } });
- const inaccurateResult = exec('/', '/user/:id?', { path: '/' });
+ const inaccurateResult = doExec('/', '/user/:id?');
expect(inaccurateResult).toEqual(undefined);
});
it('Handles leading/trailing slashes', () => {
- const result = exec('/about-late/_SEGMENT1_/_SEGMENT2_/', '/about-late/:seg1/:seg2/', {});
+ const result = doExec('/about-late/_SEGMENT1_/_SEGMENT2_/', '/about-late/:seg1/:seg2/');
expect(result).toEqual({
params: {
seg1: '_SEGMENT1_',
@@ -36,7 +40,7 @@ describe('match', () => {
});
it('should not overwrite existing properties', () => {
- const result = exec('/foo/bar', '/:path/:query', { path: '/' });
+ const result = doExec('/foo/bar', '/:path/:query');
expect(result).toEqual({
params: { path: 'foo', query: 'bar' },
path: '/'
",3
"diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml @@ -65,7 +65,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- node-version: [12.18, 14.x]
+ node-version: [12.x, 14.x]
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -96,7 +96,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- node-version: [12.18, 14.x]
+ node-version: [12.x, 14.x]
steps:
- name: Checkout
uses: actions/checkout@v2
",3
"diff --git a/README.md b/README.md @@ -41,7 +41,7 @@ For examples, see [`./sample_data`](./sample_data).
| Name | Type | Required | Description |
| - | - | - | - |
-| configuration | [ConfigurationObject](#configuration-object) | no | configuration for this dataset |
+| configuration | [ConfigurationObject](#ConfigurationObject) | no | configuration for this dataset |
| dataset | array\<object\> | yes | An array of data points. All data points are expected to have the same schema. |
#### ConfigurationObject
",3
"diff --git a/Dockerfile b/Dockerfile FROM node:alpine
LABEL maintainer=""rashley-iqt <rashley@iqt.org>""
+RUN apk --no-cache upgrade && \
+ apk --no-cache add \
+ curl
+
HEALTHCHECK --interval=15s --timeout=15s \
CMD curl --silent --fail http://localhost:5000/ || exit 1
-RUN apk add --update \
- curl \
- && rm -rf /var/cache/apk/*
-
COPY . /app
WORKDIR /app
",3
"diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml @@ -17,9 +17,10 @@ jobs:
run: if [ ""${{ steps.get_version.outputs.VERSION }}"" == ""master"" ]; then echo ::set-output name=VERSION::latest; else echo ::set-output name=VERSION::${{ steps.get_version.outputs.VERSION }}; fi
- name: Set up Docker Buildx
id: buildx
- uses: crazy-max/ghaction-docker-buildx@v1.4.0
+ uses: crazy-max/ghaction-docker-buildx@v1.6.0
with:
- version: latest
+ buildx-version: latest
+ qemu-version: latest
- name: Build Docker
run: |
",3
"diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml @@ -17,7 +17,7 @@ jobs:
run: if [ ""${{ steps.get_version.outputs.VERSION }}"" == ""master"" ]; then echo ::set-output name=VERSION::latest; else echo ::set-output name=VERSION::${{ steps.get_version.outputs.VERSION }}; fi
- name: Set up Docker Buildx
id: buildx
- uses: crazy-max/ghaction-docker-buildx@v1.6.2
+ uses: crazy-max/ghaction-docker-buildx@v3
with:
buildx-version: latest
qemu-version: latest
",3
"diff --git a/README.md b/README.md @@ -647,6 +647,9 @@ constructor. See the API docs above.
- [simple-peer-files](https://github.com/subins2000/simple-peer-files) - A simple library to easily transfer files over WebRTC. Has a feature to resume file transfer after uploader interruption.
- [WebDrop.Space](https://WebDrop.Space) - Share files and messages across devices. Cross-platform, no installation alternative to AirDrop, Xender. [Source Code](https://github.com/subins2000/WebDrop)
- [Speakrandom](https://speakrandom.com) - Voice-chat social network using simple-peer to create audio conferences!
+- [Deskreen](https://deskreen.com) - A desktop app that helps you to turn any device into a secondary screen for your computer. It uses simple-peer for sharing entire computer screen to any device with a web browser.
+
+
- *Your app here! - send a PR!*
",3
"diff --git a/packages/chakra-ui-core/src/CLink/accessibility.md b/packages/chakra-ui-core/src/CLink/accessibility.md @@ -16,7 +16,7 @@ A link widget provides an interactive reference to a resource. The target resour
### `CLink` WAI-ARIA compliance
The element containing the link text or graphic has role of link.
-Links are accessible elements used primarily for navigation. This component is styled to resemble a hyperlink and semantically renders an <a>.
+Links are accessible elements used primarily for navigation. This component is styled to resemble a hyperlink and semantically renders an `<a>`.
The `CLink` component composes `CPseudoBox`, so you can pass all `CPseudoBox` props
",3
"diff --git a/packages/chakra-ui-core/src/CLink/accessibility.md b/packages/chakra-ui-core/src/CLink/accessibility.md @@ -11,8 +11,6 @@ A link widget provides an interactive reference to a resource. The target resour
### `CLink` Keyboard Interaction
- [x] **`Enter`**: Executes the link and moves focus to the link target.
-- [x] **`Shift + F10 (Optional)`**: Opens a context menu for the link.
-
### `CLink` WAI-ARIA compliance
The element containing the link text or graphic has role of link.
",3
"diff --git a/website/pages/getting-started.mdx b/website/pages/getting-started.mdx @@ -100,7 +100,7 @@ yarn add --dev \
Choose your webpack version
```bash
-yarn add --dev webpack@5.24.0 html-webpack-plugin@5.2.0
+yarn add --dev webpack@5.65.0 html-webpack-plugin@5.2.0
# or
yarn add --dev webpack@4.46.0 html-webpack-plugin@4.5.2
```
",3
"diff --git a/src/components/library/library.css b/src/components/library/library.css @@ -98,7 +98,7 @@ $sides: 20rem;
/* @todo: move this animation to onClick? */
.filter-component:hover .x-icon-wrapper .x-icon {
- left: 0;
+ transform: translateX(0);
opacity: 1;
}
@@ -128,15 +128,14 @@ $sides: 20rem;
.x-icon {
position: relative;
- left: 10px;
+ transform: translateX(8px);
opacity: 0;
margin: 0.25rem;
user-select: none;
- /* @todo: transforms instead of left, for smoother perf? */
- transition: left 0.09s cubic-bezier(0.78, 1, 1, 1),
- opacity 0.04s ease;
+ transition: transform 0.085s cubic-bezier(0.78, 1, 1, 1),
+ opacity 0.05s linear;
}
.filter-input {
",3
"diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx @@ -53,12 +53,9 @@ class Blocks extends React.Component {
componentDidMount () {
this.ScratchBlocks.FieldColourSlider.activateEyedropper_ = this.props.onActivateColorPicker;
- const workspaceConfig = defaultsDeep({}, Blocks.defaultOptions, this.props.options);
+ const workspaceConfig = defaultsDeep({}, Blocks.defaultOptions, this.props.options, {toolbox: this.props.toolboxXML});
this.workspace = this.ScratchBlocks.inject(this.blocks, workspaceConfig);
- // Load the toolbox from the GUI (otherwise we get the scratch-blocks default toolbox)
- this.workspace.updateToolbox(this.props.toolboxXML);
-
// @todo change this when blockly supports UI events
addFunctionListener(this.workspace, 'translate', this.onWorkspaceMetricsChange);
addFunctionListener(this.workspace, 'zoom', this.onWorkspaceMetricsChange);
",3
"diff --git a/test/integration/test.js b/test/integration/test.js @@ -126,7 +126,7 @@ describe('costumes, sounds and variables', () => {
.window()
.setSize(1920, 1080);
const projectId = '96708228';
- await driver.get(`file://${uri}#${projectId}`);
+ await loadUri(`${uri}#${projectId}`);
await new Promise(resolve => setTimeout(resolve, 2000));
await clickXpath('//img[@title=""Zoom Control""]');
await clickXpath('//img[@title=""Go""]');
",3
"diff --git a/package.json b/package.json ""scratch-paint"": ""0.2.0-prerelease.20180309170325"",
""scratch-render"": ""0.1.0-prerelease.1516837442"",
""scratch-storage"": ""0.4.0"",
- ""scratch-vm"": ""0.1.0-prerelease.1520606673-prerelease.1520606691"",
+ ""scratch-vm"": ""0.1.0-prerelease.1521814818-prerelease.1521814838"",
""selenium-webdriver"": ""3.6.0"",
""startaudiocontext"": ""1.2.1"",
""style-loader"": ""^0.20.0"",
",3
"diff --git a/package.json b/package.json ""redux-throttle"": ""0.1.1"",
""rimraf"": ""^2.6.1"",
""scratch-audio"": ""0.1.0-prerelease.1523977528"",
- ""scratch-blocks"": ""0.1.0-prerelease.1526329848"",
+ ""scratch-blocks"": ""0.1.0-prerelease.1526507753"",
""scratch-l10n"": ""2.0.20180108132626"",
""scratch-paint"": ""0.2.0-prerelease.20180514184134"",
""scratch-render"": ""0.1.0-prerelease.20180514172756"",
",3
"diff --git a/package.json b/package.json ""redux-throttle"": ""0.1.1"",
""rimraf"": ""^2.6.1"",
""scratch-audio"": ""0.1.0-prerelease.1528210666"",
- ""scratch-blocks"": ""0.1.0-prerelease.1528384994"",
+ ""scratch-blocks"": ""0.1.0-prerelease.1528400332"",
""scratch-l10n"": ""3.0.20180604162003"",
""scratch-paint"": ""0.2.0-prerelease.20180607153112"",
""scratch-render"": ""0.1.0-prerelease.20180605145739"",
""scratch-storage"": ""0.5.0"",
- ""scratch-vm"": ""0.1.0-prerelease.1528384542"",
+ ""scratch-vm"": ""0.1.0-prerelease.1528399883"",
""scratch-svg-renderer"": ""0.2.0-prerelease.20180607141644"",
""selenium-webdriver"": ""3.6.0"",
""startaudiocontext"": ""1.2.1"",
",3
"diff --git a/gatsby-config.js b/gatsby-config.js @@ -44,8 +44,8 @@ module.exports = {
{
resolve: `gatsby-plugin-manifest`,
options: {
- name: `GatsbyJS`,
- short_name: `GatsbyJS`,
+ name: `Cheat Sheets`,
+ short_name: `Cheat Sheets`,
start_url: `/`,
background_color: `#f7f0eb`,
theme_color: `#a2466c`,
",3
"diff --git a/src/hooks/useSiteMetadata.js b/src/hooks/useSiteMetadata.js @@ -9,6 +9,15 @@ export const useSiteMetadata = () => {
title
siteUrl
siteTitle
+ titleTemplate
+ description
+ image
+ twitterUsername
+ faviconPng
+ backgroundColour
+ themeColour
+ siteLanguage
+ siteLocale
}
}
}
",3
"diff --git a/renovate.json b/renovate.json },
""packageRules"": [
{
- ""packagePatterns"": [""^gatsby""],
- ""extends"": ""schedule:after 10pm on Wednesday""
+ ""packagePatterns"": [""gatsby^""],
+ ""extends"": {
+ ""schedule"": [
+ ""after 10pm every weekday"",
+ ""before 5am every weekday"",
+ ""every weekend""
+ ]
+ }
}
]
}
",3
"diff --git a/src/templates/cheat-sheet-template.js b/src/templates/cheat-sheet-template.js import { graphql } from 'gatsby'
import { MDXRenderer } from 'gatsby-plugin-mdx'
import React from 'react'
-import { Helmet } from 'react-helmet'
import SEO from 'react-seo-component'
import styled from 'styled-components'
import { GitHubCorner } from '../components/github-corner'
@@ -85,7 +84,7 @@ export default ({ data }) => {
title={title}
titleTemplate={siteTitle}
description={excerpt}
- image={`${siteUrl}${image}`}
+ image={ogImageUrl(authorName, 'cheatsheets.xyz', title)}
pathname={`${siteUrl}${fields.slug}`}
article={true}
publishedDate={createdDate}
@@ -93,16 +92,6 @@ export default ({ data }) => {
twitterUsername={twitterUsername}
author={authorName}
/>
- <Helmet encodeSpecialCharacters={false}>
- <meta
- property=""og:image""
- content={ogImageUrl(authorName, 'cheatsheets.xyz', title)}
- />
- <meta
- name=""twitter:image:src""
- content={ogImageUrl(authorName, 'cheatsheets.xyz', title)}
- />
- </Helmet>
<GitHubCorner />
{typeof tableOfContents.items === 'undefined' ? null : (
<Toc>
",3
"diff --git a/LICENSE b/LICENSE MIT License
-Copyright (c) 2019 Scott Spence
+Copyright (c) 2021 Scott Spence
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the ""Software""), to deal
",3
"diff --git a/lib/run/index.js b/lib/run/index.js var fs = require('fs'),
_ = require('lodash'),
+ sdk = require('postman-collection'),
asyncEach = require('async/each'),
EventEmitter = require('eventemitter3'),
runtime = require('postman-runtime'),
@@ -103,23 +104,19 @@ module.exports = function (options, callback) {
},
// todo: add support for more types of timeouts, currently only request is supported
timeout: options.timeoutRequest ? { request: options.timeoutRequest } : undefined,
- requester: {
fileResolver: fs,
+ requester: {
cookieJar: request.jar(),
followRedirects: _.has(options, 'ignoreRedirects') ? !options.ignoreRedirects : undefined,
- strictSSL: _.has(options, 'insecure') ? !options.insecure : undefined,
- certificateManager: options.sslClientCert ? {
- getCertificateContents: function (hostname, callback) {
- return callback(null, {
- key: options.sslClientKey ? fs.readFileSync(options.sslClientKey) : '',
- pem: fs.readFileSync(options.sslClientCert),
- passphrase: options.sslClientPassphrase,
- keyPath: options.sslClientKey,
- pemPath: options.sslClientCert
- });
- }
- } : undefined
- }
+ strictSSL: _.has(options, 'insecure') ? !options.insecure : undefined
+ },
+ certificates: options.sslClientCert && new sdk.CertificateList({}, [{
+ name: 'client-cert',
+ matches: ['<all_urls>'],
+ key: { src: options.sslClientKey },
+ cert: { src: options.sslClientCert },
+ passphrase: options.sslClientPassphrase
+ }])
}, function (err, run) {
var callbacks = {},
// ensure that the reporter option type polymorphism is handled
",3
"diff --git a/examples/reports/html-reporter-template-data.json b/examples/reports/html-reporter-template-data.json {
- ""timestamp"": ""Thu Feb 16 2017 17:46:41 GMT+0530 (IST)"",
- ""version"": ""3.4.3"",
+ ""timestamp"": ""Wed Apr 05 2017 13:32:47 GMT+0530 (IST)"",
+ ""version"": ""3.5.2"",
""aggregations"": [
{
""parent"": {
""header"": [
{
""key"": ""User-Agent"",
- ""value"": ""PostmanRuntime/4.0.3""
+ ""value"": ""PostmanRuntime/6.0.0.beta-4""
},
{
""key"": ""Accept"",
},
{
""key"": ""User-Agent"",
- ""value"": ""PostmanRuntime/4.0.3""
+ ""value"": ""PostmanRuntime/6.0.0.beta-4""
},
{
""key"": ""Accept"",
",3
"diff --git a/package.json b/package.json ""lodash"": ""4.17.2"",
""mkdirp"": ""0.5.1"",
""parse-json"": ""2.2.0"",
- ""postman-collection"": ""1.1.0"",
+ ""postman-collection"": ""1.1.1-beta.2"",
""postman-collection-transformer"": ""2.0.12"",
""postman-request"": ""2.80.1-postman.1"",
- ""postman-runtime"": ""6.0.1"",
+ ""postman-runtime"": ""6.1.0-beta.2"",
""pretty-ms"": ""2.1.0"",
""semver"": ""5.3.0"",
""serialised-error"": ""1.1.2"",
",3
"diff --git a/lib/run/index.js b/lib/run/index.js @@ -23,7 +23,7 @@ var fs = require('fs'),
beforePrerequest: ['events', 'item'],
prerequest: ['executions', 'item'],
beforeRequest: ['request', 'item'],
- request: ['response', 'request', 'item'],
+ request: ['response', 'request', 'item', 'cookies'],
beforeTest: ['events', 'item'],
test: ['executions', 'item'],
item: ['item'],
@@ -120,7 +120,9 @@ module.exports = function (options, callback) {
}, function (err, run) {
var callbacks = {},
// ensure that the reporter option type polymorphism is handled
- reporters = _.isString(options.reporters) ? [options.reporters] : options.reporters;
+ reporters = _.isString(options.reporters) ? [options.reporters] : options.reporters,
+ // keep a track of start assertion indices of legacy assertions
+ legacyAssertionIndices = {};
// emit events for all the callbacks triggered by the runtime
_.forEach(runtimeEvents, function (definition, eventName) {
@@ -173,6 +175,28 @@ module.exports = function (options, callback) {
});
},
+ assertion: function (cursor, assertion) {
+ !assertion && (assertion = {});
+
+ // store the legacy assertion index
+ assertion.index && (legacyAssertionIndices[cursor.ref] = assertion.index);
+
+ emitter.emit('assertion', (assertion.passed ? null : {
+ name: _.get(assertion, 'error.name', ''),
+ index: assertion.index,
+ message: _.get(assertion, 'error.message', ''),
+
+ stack: 'AssertionFailure: ' + _.get(assertion, 'error.message', '') + '\n' +
+ ' at Object.eval sandbox-script.js:' + (assertion.index + 1) + ':' +
+ ((cursor && cursor.position || 0) + 1) + ')'
+ }), {
+ cursor: cursor,
+ assertion: assertion.name,
+ error: assertion.error,
+ item: run.resolveCursor(cursor)
+ });
+ },
+
/**
* Custom callback to override the `done` event to fire the end callback.
*
@@ -223,26 +247,28 @@ module.exports = function (options, callback) {
}
});
- // generate pseudo assertion events since runtime does not trigger assertion events yet.
+ // generate pseudo assertion events for all legacy assertions.
// without this, all reporters would needlessly need to extract assertions and create an error object
// out of it
emitter.on('script', function (err, o) {
// we iterate on each test assertion to trigger an event. during this, we create a pseudo error object
// for the assertion
- var index = 0,
+ var cursor = o && o.cursor || {},
+ index = legacyAssertionIndices[cursor.ref] || 0,
type = o && o.event && o.event.listen;
_.forEach(_.get(o.execution, 'tests'), function (passed, assertion) {
+ index += 1;
+
emitter.emit('assertion', (passed ? null : {
name: 'AssertionFailure',
index: index,
message: assertion,
- stack: 'AssertionFailure: Expected tests[""' + assertion + '""] to be truth-like\n' +
- ' at Object.eval test.js:' + (index + 1) + ':' +
- ((o.cursor && o.cursor.position || 0) + 1) + ')'
+ stack: 'AssertionFailure: Expected tests[""' + assertion + '""] to be true-like\n' +
+ ' at Object.eval ' + type + '.js:' + (index + 1) + ':' +
+ ((cursor.position || 0) + 1) + ')'
}), _.assignIn({ assertion: assertion }, o));
- index += 1;
});
// bubble special script name based events
",3
"diff --git a/examples/sample-collection.json b/examples/sample-collection.json ""listen"": ""test"",
""script"": {
""type"": ""text/javascript"",
- ""exec"": [""tests['response code is 200'] = (responseCode.code === 200);""]
+ ""exec"": [
+ ""pm.test('expect response be 200', function () {"",
+ "" pm.expect(pm.response.code).to.equal(200);"",
+ ""})"",
+ ""pm.test('expect response json contain args', function () {"",
+ "" pm.expect(pm.response.json().args).to.have.property('source')"",
+ "" .and.equal('newman-sample-github-collection')"",
+ ""})""
+ ]
}
}],
""request"": {
",3
"diff --git a/package.json b/package.json {
""name"": ""newman"",
- ""version"": ""3.5.2"",
+ ""version"": ""3.6.0-beta.2"",
""description"": ""Command-line companion utility for Postman"",
""homepage"": ""https://github.com/postmanlabs/newman"",
""bugs"": ""https://github.com/postmanlabs/newman/issues"",
",3
"diff --git a/README.md b/README.md @@ -452,7 +452,7 @@ file-upload.postman_collection.json sample-file.txt
$ newman run file-upload.postman_collection.json
```
-## Using Newman with the Postman Cloud API
+## Using Newman with the Postman Pro API
1 [Generate an API key](https://app.getpostman.com/dashboard/integrations)<br/>
2 Fetch a list of your collections from: `https://api.getpostman.com/collections?apikey=$apiKey`<br/>
@@ -460,7 +460,8 @@ $ newman run file-upload.postman_collection.json
4 Obtain the environment URI from: `https://api.getpostman.com/environments?apikey=$apiKey`<br/>
5 Using the collection and environment URIs acquired in steps 3 and 4, run the collection as follows:
```
-newman run <collectionUri> --environment <environmentUri>
+newman run https://api.getpostman.com/collections/$uid?apikey=$apiKey \
+ --environment https://api.getpostman.com/environments/$uid?apikey=$apiKey
```
---
",3
"diff --git a/CHANGELOG.md b/CHANGELOG.md #### Unreleased
- support for second generation scripting sandbox with support for limited `require`
- addition of assertion functions on request and response.
+- Added momentjs to the sandbox
+- Added support for authorization mechanisms
+- Added support for IO events
#### v3.6.1 (June 9, 2017)
* :arrow_up: Updated dependencies
",3
"diff --git a/test/system/nsp.test.js b/test/system/nsp.test.js @@ -29,7 +29,7 @@ describe('nsp', function () {
});
it('must exclude only a known set of packages', function () {
- expect(nsprc.exclusions).to.eql(['postman-collection', 'postman-runtime']);
+ expect(nsprc.exclusions).to.eql([]);
});
// if you are changing the version here, most probably you are better of removing the exclusion in first place.
",3
"diff --git a/lib/run/options.js b/lib/run/options.js @@ -236,5 +236,13 @@ var _ = require('lodash'),
* @returns {*}
*/
module.exports = function (options, callback) {
- config.get(options, { loaders: configLoaders, command: 'run' }, callback);
+ config.get(options, { loaders: configLoaders, command: 'run' }, function (err, result) {
+ if (err) { return callback(err); }
+
+ !_.isEmpty(options.globalVar) && _.forEach(options.globalVar, function (variable) {
+ variable && (result.globals.set(variable.key, variable.value));
+ });
+
+ callback(null, result);
+ });
};
",3
"diff --git a/test/unit/cli.test.js b/test/unit/cli.test.js @@ -151,9 +151,12 @@ describe('cli parser', function () {
});
});
- it('should throw an error for --global-var values without an `=`', function (done) {
- cli.rawOptions('run myCollection.json --global-var foo'.split(' '), 'newmantests', function (err) {
- expect(err.code).to.equal('ARGError');
+ it('should handle --global-var values without an `=`', function (done) {
+ cli.rawOptions('run myCollection.json --global-var foo'.split(' '), 'newmantests', function (err, res) {
+ expect(err).to.be(null);
+ expect(res.run.globalVar).to.eql([
+ { key: 'foo', value: undefined }
+ ]);
done();
});
",3
"diff --git a/test/system/nsp.test.js b/test/system/nsp.test.js */
var expect = require('expect.js'),
- fs = require('fs');
+ fs = require('fs'),
+ _ = require('lodash');
/* global describe, it, before */
describe('nsp', function () {
@@ -28,8 +29,16 @@ describe('nsp', function () {
expect(nsprc.exceptions).to.eql([]);
});
- it('must exclude only a known set of packages', function () {
- expect(nsprc.exclusions).to.eql([]);
+ it('must exclude only a known set of packages (prevent erroneous exclusions)', function () {
+ expect(nsprc.exclusions).to.eql({
+ 'postman-runtime': '6.3.2',
+ 'postman-collection': '3.0.0'
+ });
+ });
+
+ it('dependency version in package.json should match .nsprc (time to remove exclusion?)', function () {
+ var pkg = _.pick(require('../../package').dependencies, _.keys(nsprc.exclusions));
+ expect(pkg).to.eql(nsprc.exclusions);
});
// if you are changing the version here, most probably you are better of removing the exclusion in first place.
",3
"diff --git a/npm/test-system.js b/npm/test-system.js @@ -92,7 +92,7 @@ module.exports = function (exit) {
nsp.check({
offline: false,
package: _.merge({
- dependencies: _.omit(pkg.dependencies, nsprc.exclusions || [])
+ dependencies: _.omit(pkg.dependencies, _.keys(nsprc.exclusions) || [])
}, _.pick(pkg, ['name', 'version', 'homepage', 'repository']))
}, function (err, result) {
// if processing nsp had an error, simply print that and exit
",3
"diff --git a/README.md b/README.md @@ -319,7 +319,7 @@ return of the `newman.run` function is a run instance, which emits run events th
| options.delayRequest | Specify the time (in milliseconds) to wait for between subsequent requests.<br /><br />_Optional_<br />Type: `number`, Default value: `0` |
| options.ignoreRedirects | This specifies whether newman would automatically follow 3xx responses from servers.<br /><br />_Optional_<br />Type: `boolean`, Default value: `false` |
| options.insecure | Disables SSL verification checks and allows self-signed SSL certificates.<br /><br />_Optional_<br />Type: `boolean`, Default value: `false` |
-| options.bail | A boolean switch to specify whether or not to gracefully stop a collection run on encountering the first error. Takes no arguments.<br /><br />_Optional_<br />Type: `boolean`, Default value: `false` |
+| options.bail | A switch to specify whether or not to gracefully stop a collection run on encountering the first error. Takes additional modifiers as arguments to specify whether to end the run with an error for invalid name or path.<br /><br/>Available modifiers: `folder` and `failure`.<br />eg. `bail : ['folder']`<br /><br />_Optional_<br />Type: `boolean|object`, Default value: `false` |
| options.suppressExitCode | If present, allows overriding the default exit code from the current collection run, useful for bypassing collection result failures. Takes no arguments.<br /><br />_Optional_<br />Type: `boolean`, Default value: `false` |
| options.reporters | Specify one reporter name as `string` or provide more than one reporter name as an `array`.<br /><br />Available reporters: `cli`, `json`, `html` and `junit`.<br /><br />_Optional_<br />Type: `string|array` |
| options.reporter | Specify options for the reporter(s) declared in `options.reporters`. <br /> e.g. `reporter : { junit : { export : './xmlResults.xml' } }` <br /> e.g. `reporter : { html : { export : './htmlResults.html', template: './customTemplate.hbs' } }` <br /><br />_Optional_<br />Type: `object` |
",3
"diff --git a/test/library/run-options.test.js b/test/library/run-options.test.js @@ -129,7 +129,7 @@ describe('Newman run options', function () {
bail: ['folder', 'failure']
}, function (err) {
expect(err).to.be.ok();
- expect(err.message).to.contain('Unable to find a folder or request');
+ expect(err.message).to.be('Unable to find a folder or request: invalidName');
done();
});
",3
"diff --git a/docker/scripts/run.sh b/docker/scripts/run.sh function build_docker_image {
BASENAME=$(basename $1);
IMAGE_NAME=""newman_$BASENAME"";
- TAG=""$2"";
- docker build -t ""$DOCKER_ID_USER/$IMAGE_NAME:$TAG"" .
+ docker build -t ""$DOCKER_ID_USER/$IMAGE_NAME:$TRAVIS_TAG"" -t ""$DOCKER_ID_USER/$IMAGE_NAME:latest"" .;
if docker images | grep -q ""$DOCKER_ID_USER/$IMAGE_NAME""; then
- echo ""Image built""
- if docker run -t ""$DOCKER_ID_USER/$IMAGE_NAME:$TAG"" run ""sample-collection.json""; then
- echo ""Collection run successfully""
- docker login -u ""$DOCKER_ID_USER"" -p ""$DOCKER_ID_PASSWORD""
- docker push ""$DOCKER_ID_USER/$IMAGE_NAME:$TAG""
+ echo ""Image built"";
+ if docker run -t ""$DOCKER_ID_USER/$IMAGE_NAME:$TRAVIS_TAG"" run ""sample-collection.json""; then
+ echo ""Collection run successfully"";
+ docker login -u ""$DOCKER_ID_USER"" -p ""$DOCKER_ID_PASSWORD"";
+ docker push ""$DOCKER_ID_USER/$IMAGE_NAME:$TRAVIS_TAG"" ""$DOCKER_ID_USER/$IMAGE_NAME:latest"";
else
- echo ""Collection not run successfully""
+ echo ""Collection not run successfully"";
fi
else
- echo ""Image $BASENAME:$TAG not built""
+ echo ""Image $BASENAME:$TRAVIS_TAG and $BASENAME:latest not built"";
fi
}
-IMAGES_BASE_PATH=""./docker/images""
-EXTRACTED_TAG=$(echo $TRAVIS_TAG | grep -o ""[0-9]\+.[0-9]\+.[0-9]\+"")
+IMAGES_BASE_PATH=""./docker/images"";
+EXTRACTED_TAG=$(echo $TRAVIS_TAG | grep -o ""[0-9]\+.[0-9]\+.[0-9]\+"");
if [ -n ""$TRAVIS_TAG"" ] && [ ""$TRAVIS_TAG"" = ""$EXTRACTED_TAG"" ] && [ ""$TRAVIS_NODE_VERSION"" = ""8"" ]; then
for image in $IMAGES_BASE_PATH/*; do
- if [ -d ""${image}"" ] && [ -f ""${image}/Dockerfile"" ]; then
- cp ""${image}/Dockerfile"" .
- build_docker_image ${image} ${TRAVIS_TAG};
- build_docker_image ${image} ""latest"";
- rm -f ./Dockerfile
+ if [ -f ""${image}/Dockerfile"" ]; then
+ cp ""${image}/Dockerfile"" .;
+ build_docker_image ${image};
+ rm -f ./Dockerfile;
fi
done
fi
",3
"diff --git a/lib/reporters/cli/index.js b/lib/reporters/cli/index.js @@ -328,12 +328,15 @@ _.assignIn(PostmanCLIReporter, {
_.forEach(failures, function (failure, index) {
var name = failure.error && failure.error.name || E,
- message = failure.error && failure.error.message || E;
+ message = failure.error && failure.error.test || E;
// augment name with iteration information
failure.cursor && (failure.cursor.cycles > 1) &&
(name += LF + colors.gray('iteration: ' + (failure.cursor.iteration + 1)));
+ // include the assertion error message in the failure details
+ failure.error && (message += LF + colors.gray(failure.error.message || E));
+
// augment the message with stack information
failure.at && (message += LF + colors.gray('at ' + failure.at));
",3
"diff --git a/test/system/repository.test.js b/test/system/repository.test.js @@ -73,22 +73,29 @@ describe('project repository', function () {
describe('script definitions', function () {
it('files must exist', function () {
- var scriptRegex = /^node\snpm\/.+\.js$/;
-
+ var scriptRegexJS = /^node\snpm\/.+\.js$/,
+ scriptRegexSH = /^\.\/npm\/.+\.sh$/;
expect(json.scripts).to.be.ok();
json.scripts && Object.keys(json.scripts).forEach(function (scriptName) {
- expect(scriptRegex.test(json.scripts[scriptName])).to.be.ok();
- expect(fs.statSync('npm/' + scriptName + '.js')).to.be.ok();
+ expect(scriptRegexJS.test(json.scripts[scriptName]) ||
+ scriptRegexSH.test(json.scripts[scriptName])).to.be.ok();
+ expect(fs.existsSync('npm/' + scriptName + '.js') ||
+ fs.existsSync('npm/' + scriptName + '.sh')).to.be.ok();
});
});
it('must have the hashbang defined', function () {
json.scripts && Object.keys(json.scripts).forEach(function (scriptName) {
- var fileContent = fs.readFileSync('npm/' + scriptName + '.js').toString();
+ fs.readFile('npm/' + scriptName + '.js', function (err, fileContent) {
+ if (err) {
+ fileContent = fs.readFileSync('npm/' + scriptName + '.sh');
+ }
+ fileContent = fileContent.toString();
expect(/^#!\/(bin\/bash|usr\/bin\/env\snode)[\r\n][\W\w]*$/g.test(fileContent)).to.be.ok();
});
});
});
+ });
describe('dependencies', function () {
it('must exist', function () {
",3
"diff --git a/docker/images/alpine33/Dockerfile b/docker/images/alpine33/Dockerfile @@ -8,12 +8,16 @@ RUN if [ ! $(echo $newman_version | grep -oE ""^[0-9]+\.[0-9]+\.[0-9]+$"") ]; then
exit 1; \
fi
-# Can't upgrade to node v8 because it isn't supported in alpine 3.3
-ENV NODE_VERSION 4.3.2
+ENV NODE_VERSION 8.11.2
# Install node
RUN echo -e ""http://nl.alpinelinux.org/alpine/v3.3/main\nhttp://nl.alpinelinux.org/alpine/v3.3/community"" > /etc/apk/repositories && \
- apk add --update nodejs=${NODE_VERSION}-r1;
+ apk add --update --no-cache libgcc libstdc++;
+
+ADD https://github.com/oznu/alpine-node/releases/download/${NODE_VERSION}/node-v${NODE_VERSION}-linux-x86_64-alpine.tar.gz /opt/node-${NODE_VERSION}.tar.gz
+
+RUN tar -xzf /opt/node-${NODE_VERSION}.tar.gz -C /usr --no-same-owner && \
+ rm /opt/node-${NODE_VERSION}.tar.gz;
# Set environment variables
ENV LC_ALL=""en_US.UTF-8"" LANG=""en_US.UTF-8"" LANGUAGE=""en_US.UTF-8"" NEWMAN_VERSION=$newman_version
",3
"diff --git a/lib/reporters/html/template-default.hbs b/lib/reporters/html/template-default.hbs <div class=""col-md-6"">Average response time</div><div class=""col-md-6"">{{responseAverage}}</div>
<div class=""col-md-12"">&nbsp;</div>
- <div class=""col-md-3""><strong>Total Failures</strong></div><div class=""col-md-6""><strong>{{failures}}</strong></div>
+ <div class=""col-md-3""><strong>Total Failures</strong></div><div class=""col-md-6""><strong>{{failures.length}}</strong></div>
{{/with}}
</div>
{{> aggregations}}
{{/if}}
{{/each}}
+
+ {{#if summary.failures.length}}
+ <br/><h4>Failures</h4>
+
+ {{#each summary.failures}}
+ <div class=""panel-group"" id=""collapse-failure-{{@index}}"" role=""tablist"" aria-multiselectable=""true"">
+ <div class=""panel panel-default"">
+ <div class=""panel-heading"" role=""tab"" id=""failureHead-{{@index}}"">
+ <h4 class=""panel-title"">
+ <a data-toggle=""collapse"" data-parent=""#accordion"" href=""#failureData-{{@index}}"" aria-controls=""collapseOne"">
+ {{error.name}}: {{#if error.test}}{{error.test}}{{else}}{{error.message}}{{/if}}
+ </a>
+ </h4>
+ </div>
+
+ <div id=""failureData-{{@index}}"" class=""panel-collapse collapse in"" role=""tabpanel"" aria-labelledby=""failureHead-{{@index}}"">
+ <div class=""panel-body"">
+ <div class=""col-md-12"">&nbsp;</div>
+ {{#if error.test}}
+ <div class=""col-md-4"">Description</div><div class=""col-md-8"">{{error.message}}</div><br/>
+ {{/if}}
+
+ <div class=""col-md-4"">Location</div><div class=""col-md-8"">{{at}}</div><br/>
+ <div class=""col-md-4"">Request</div><div class=""col-md-8"">
+ <a href=""#collapse-request-{{source.id}}"">{{source.name}}</a>
+ </div>
+ {{#gt cursor.cycles 1}}
+ <div class=""col-md-4"">Iteration</div><div class=""col-md-8"">{{add cursor.iteration 1}}</div><br/>
+ {{/gt}}
+ </div>
+ </div>
+ </div>
+ </div>
+ {{/each}}
+ {{/if}}
</div>
</body>
</html>
",3
"diff --git a/README.md b/README.md @@ -34,8 +34,8 @@ The current Node version compatibility can also be seen from the `engines.node`
3. [HTML reporter options](#html-reporter-options)
4. [JUnit reporter options](#junitxml-reporter-options)
5. [Custom reporters](#custom-reporters)
- a. [Using custom reporters](#using-custom-reporters)
- b. [Creating custom reporters](#creating-custom-reporters)
+ 1. [Using custom reporters](#using-custom-reporters)
+ 2. [Creating custom reporters](#creating-custom-reporters)
2. [SSL client certificates](#ssl-client-certificates)
2. [Proxy](#proxy)
@@ -230,7 +230,7 @@ To enable JSON reporter, provide `--reporters json` as a CLI option.
| CLI Option | Description |
|-------------|-------------------|
-| `--reporter-json-export <path>` | Specify a path where the output JSON file will be written to disk. If not specified, the file will be written to `newman/` in the current working directory. |
+| `--reporter-json-export <path>` | Specify a path where the output JSON file will be written to disk. If not specified, the file will be written to `newman/` in the current working directory. If the specified path does not exist, it will be created. However, if the specified path is a pre-existing directory, the report will be generated in that directory. |
##### HTML reporter options
@@ -239,7 +239,7 @@ HTML reporter, provide `--reporters html` as a CLI option.
| CLI Option | Description |
|-------------|-------------------|
-| `--reporter-html-export <path>` | Specify a path where the output HTML file will be written to disk. If not specified, the file will be written to `newman/` in the current working directory. |
+| `--reporter-html-export <path>` | Specify a path where the output HTML file will be written to disk. If not specified, the file will be written to `newman/` in the current working directory. If the specified path does not exist, it will be created. However, if the specified path is a pre-existing directory, the report will be generated in that directory. |
| `--reporter-html-template <path>` | Specify a path to the custom template which will be used to render the HTML report. This option depends on `--reporter html` and `--reporter-html-export` being present in the run command. If this option is not specified, the [default template](https://github.com/postmanlabs/newman/blob/develop/lib/reporters/html/template-default.hbs) is used |
Custom templates (currently handlebars only) can be passed to the HTML reporter via `--reporter-html-template <path>` with `--reporters html` and `--reporter-html-export`.
@@ -251,7 +251,7 @@ Newman can output a summary of the collection run to a JUnit compatible XML file
| CLI Option | Description |
|-------------|-------------------|
-| `--reporter-junit-export <path>` | Specify a path where the output XML file will be written to disk. If not specified, the file will be written to `newman/` in the current working directory. |
+| `--reporter-junit-export <path>` | Specify a path where the output XML file will be written to disk. If not specified, the file will be written to `newman/` in the current working directory. If the specified path does not exist, it will be created. However, if the specified path is a pre-existing directory, the report will be generated in that directory. |
Older command line options are supported, but are deprecated in favour of the newer v3 options and will soon be
discontinued. For documentation on the older command options, refer to [README.md for Newman v2.X](https://github.com/postmanlabs/newman/blob/release/2.x/README.md).
",3
"diff --git a/test/system/nsp.test.js b/test/system/nsp.test.js @@ -30,9 +30,7 @@ describe('nsp', function () {
});
it('must not have exclusions (prevent erroneous exclusions)', function () {
- expect(nsprc.exclusions).to.eql({
- 'cli-table2': '0.2.0'
- });
+ expect(nsprc.exclusions).to.eql({});
});
it('dependency version in package.json should match .nsprc (time to remove exclusion?)', function () {
",3
"diff --git a/test/cli/shallow-junit-reporter.test.js b/test/cli/shallow-junit-reporter.test.js @@ -38,8 +38,13 @@ describe('JUnit reporter', function () {
expect(error).to.not.be.ok();
var suite = _.get(result.testsuites, 'testsuite.0');
+
+ expect(result.testsuites.$).to.not.be.empty();
+ expect(result.testsuites.$.time).to.match(/^\d+\.\d{3}$/);
+
expect(suite).to.not.be.empty();
expect(suite.$).to.not.be.empty();
+ expect(suite.$.time).to.match(/^\d+\.\d{3}$/);
expect(suite.testcase).to.not.be.empty();
expect(suite.$).to.have.property('tests', '1');
@@ -66,8 +71,12 @@ describe('JUnit reporter', function () {
var testcase,
suite = _.get(result.testsuites, 'testsuite.0');
+ expect(result.testsuites.$).to.not.be.empty();
+ expect(result.testsuites.$.time).to.match(/^\d+\.\d{3}$/);
+
expect(suite).to.not.be.empty();
expect(suite.$).to.not.be.empty();
+ expect(suite.$.time).to.match(/^\d+\.\d{3}$/);
expect(suite.testcase).to.not.be.empty();
expect(suite.$).to.have.property('tests', '1');
@@ -78,6 +87,7 @@ describe('JUnit reporter', function () {
expect(testcase).to.not.be.empty();
expect(testcase.$).to.have.property('classname', 'JUnitXmlReporter.constructor');
+ expect(testcase.$.time).to.match(/^\d+\.\d{3}$/);
expect(testcase.failure).to.not.be.empty();
expect(testcase.failure[0]._).to.not.be.empty();
expect(testcase.failure[0].$).to.have.property('type', 'AssertionFailure');
@@ -105,6 +115,7 @@ describe('JUnit reporter', function () {
expect(suite).to.not.be.empty();
expect(suite.$).to.not.be.empty();
+ expect(suite.$.time).to.match(/^\d+\.\d{3}$/);
expect(suite.testcase).to.not.be.empty();
expect(suite.$).to.have.property('tests', '2');
@@ -115,6 +126,7 @@ describe('JUnit reporter', function () {
expect(testcase).to.not.be.empty();
expect(testcase.$).to.have.property('classname', 'JUnitXmlReporter.constructor');
+ expect(testcase.$.time).to.match(/^\d+\.\d{3}$/);
expect(testcase.failure).to.not.be.empty();
expect(testcase.failure[0]._).to.not.be.empty();
expect(testcase.failure[0].$).to.have.property('type', 'AssertionFailure');
",3
"diff --git a/test/library/shallow-junit-reporter.test.js b/test/library/shallow-junit-reporter.test.js @@ -42,8 +42,13 @@ describe('JUnit reporter', function () {
expect(error).to.not.be.ok();
var suite = _.get(result.testsuites, 'testsuite.0');
+
+ expect(result.testsuites.$).to.not.be.empty();
+ expect(result.testsuites.$.time).to.match(/^\d+\.\d{3}$/);
+
expect(suite).to.not.be.empty();
expect(suite.$).to.not.be.empty();
+ expect(suite.$.time).to.match(/^\d+\.\d{3}$/);
expect(suite.testcase).to.not.be.empty();
expect(suite.$).to.have.property('tests', '1');
@@ -73,8 +78,12 @@ describe('JUnit reporter', function () {
var testcase,
suite = _.get(result.testsuites, 'testsuite.0');
+ expect(result.testsuites.$).to.not.be.empty();
+ expect(result.testsuites.$.time).to.match(/^\d+\.\d{3}$/);
+
expect(suite).to.not.be.empty();
expect(suite.$).to.not.be.empty();
+ expect(suite.$.time).to.match(/^\d+\.\d{3}$/);
expect(suite.testcase).to.not.be.empty();
expect(suite.$).to.have.property('tests', '1');
@@ -85,6 +94,7 @@ describe('JUnit reporter', function () {
expect(testcase).to.not.be.empty();
expect(testcase.$).to.have.property('classname', 'JUnitXmlReporter.constructor');
+ expect(testcase.$.time).to.match(/^\d+\.\d{3}$/);
expect(testcase.failure).to.not.be.empty();
expect(testcase.failure[0]._).to.not.be.empty();
expect(testcase.failure[0].$).to.have.property('type', 'AssertionFailure');
@@ -113,8 +123,12 @@ describe('JUnit reporter', function () {
var testcase,
suite = _.get(result.testsuites, 'testsuite.0');
+ expect(result.testsuites.$).to.not.be.empty();
+ expect(result.testsuites.$.time).to.match(/^\d+\.\d{3}$/);
+
expect(suite).to.not.be.empty();
expect(suite.$).to.not.be.empty();
+ expect(suite.$.time).to.match(/^\d+\.\d{3}$/);
expect(suite.testcase).to.not.be.empty();
expect(suite.$).to.have.property('tests', '2');
@@ -125,6 +139,7 @@ describe('JUnit reporter', function () {
expect(testcase).to.not.be.empty();
expect(testcase.$).to.have.property('classname', 'JUnitXmlReporter.constructor');
+ expect(testcase.$.time).to.match(/^\d+\.\d{3}$/);
expect(testcase.failure).to.not.be.empty();
expect(testcase.failure[0]._).to.not.be.empty();
expect(testcase.failure[0].$).to.have.property('type', 'AssertionFailure');
",3
"diff --git a/lib/run/index.js b/lib/run/index.js @@ -131,9 +131,9 @@ module.exports = function (options, callback) {
item: options.delayRequest
},
timeout: {
- global: options.timeout,
- request: options.timeoutRequest,
- script: options.timeoutScript
+ global: options.timeout || 0,
+ request: options.timeoutRequest || 0,
+ script: options.timeoutScript || 0
},
fileResolver: fs,
requester: {
",3
"diff --git a/npm/postpublish.sh b/npm/postpublish.sh # Bail out on the first error
set -e;
-BLUE='\033[0;34m';
-NO_COLOUR='\033[0m';
-DOCKER_USER=""postman"";
-TAG=${npm_package_version};
+LATEST=""alpine"";
+BLUE=""\033[0;34m"";
+NO_COLOUR=""\033[0m"";
+DOCKER_REPO=""postman/newman"";
+VERSION=${npm_package_version};
IMAGES_BASE_PATH=""./docker/images"";
+GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD);
# It's good to be paranoid
-[[ -z ""$TAG"" ]] && TAG=$(jq -r "".version"" < package.json);
+[[ -z ""$VERSION"" ]] && VERSION=$(jq -r "".version"" < package.json);
+
+MAJOR=$(echo ${VERSION} | grep -oE ""^\d+"");
+MINOR=$(echo ${VERSION} | grep -oE ""^\d+\.\d+"");
function build_docker_image {
- local TAG=""$2"";
- local BASENAME=$(basename $1);
- local IMAGE_NAME=""newman_$BASENAME"";
- local GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD);
+ local TAG=$(basename $1);
echo """";
- # Build
- if [[ ${GIT_BRANCH} = ""master"" ]]; then
- echo -e ""$BLUE Building docker image for $DOCKER_USER/$IMAGE_NAME:$TAG, latest $NO_COLOUR"";
-
- docker build \
- --no-cache --force-rm --squash \
- -t ""$DOCKER_USER/$IMAGE_NAME:$TAG"" -t ""$DOCKER_USER/$IMAGE_NAME:latest"" \
- --file=""docker/images/$BASENAME/Dockerfile"" --build-arg NEWMAN_VERSION=""$TAG"" .;
-
- echo -e ""$BLUE Running docker image test for $DOCKER_USER/$IMAGE_NAME:$TAG, latest $NO_COLOUR"";
- else
- echo -e ""$BLUE Building docker image for $DOCKER_USER/$IMAGE_NAME:$TAG $NO_COLOUR"";
+ echo -e ""$BLUE Building $DOCKER_REPO:$VERSION-$TAG $NO_COLOUR"";
docker build \
- --no-cache --force-rm --squash \
- -t ""$DOCKER_USER/$IMAGE_NAME:$TAG"" \
- --file=""docker/images/$BASENAME/Dockerfile"" --build-arg NEWMAN_VERSION=""$TAG"" .;
+ --no-cache --force-rm --squash -t ${DOCKER_REPO}:${VERSION}-${TAG} \
+ --file=""docker/images/$TAG/Dockerfile"" --build-arg NEWMAN_VERSION=${VERSION} .;
- echo -e ""$BLUE Running docker image test for $DOCKER_USER/$IMAGE_NAME:$TAG $NO_COLOUR"";
- fi
+ echo -e ""$BLUE Running docker image test for $DOCKER_REPO:$VERSION-$TAG, latest $NO_COLOUR"";
# Test
- docker run -v ""$PWD/examples:/etc/newman"" -t ""$DOCKER_USER/$IMAGE_NAME:$TAG"" run ""sample-collection.json"";
+ docker run -v ${PWD}/examples:/etc/newman -t ${DOCKER_REPO}:${VERSION}-${TAG} run ""sample-collection.json"";
- # Tag
- if [[ ${GIT_BRANCH} = ""master"" ]]; then
- echo -e ""$BLUE Pushing docker image for $DOCKER_USER/$IMAGE_NAME:$TAG, latest $NO_COLOUR"";
+ echo -e ""$BLUE Pushing docker image for $DOCKER_REPO:$VERSION-$TAG $NO_COLOUR"";
- docker tag ""$DOCKER_USER/$IMAGE_NAME:latest"" ""$DOCKER_USER/$IMAGE_NAME:latest"";
- docker push ""$DOCKER_USER/$IMAGE_NAME:latest"";
+ # Tag
+ if [[ ${GIT_BRANCH} != ""master"" ]]; then
+ if [[ ${TAG} == ""ubuntu1404"" || ${TAG} == ""alpine33"" ]]; then
+ docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}_${TAG}:latest;
+ docker push ${DOCKER_REPO}_${TAG}:latest;
else
- echo -e ""$BLUE Pushing docker image for $DOCKER_USER/$IMAGE_NAME:$TAG $NO_COLOUR"";
+ docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${TAG};
+ docker push ${DOCKER_REPO}:${TAG};
+
+ if [[ ${TAG} == ${LATEST} ]]; then
+ docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:latest;
+ docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${VERSION};
+ docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${MINOR};
+ docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${MAJOR};
+
+ docker push ${DOCKER_REPO}:latest;
+ docker push ${DOCKER_REPO}:${VERSION};
+ docker push ${DOCKER_REPO}:${MINOR};
+ docker push ${DOCKER_REPO}:${MAJOR};
+ fi
+ fi
fi
+ if [[ ${TAG} == ""ubuntu1404"" || ${TAG} == ""alpine33"" ]]; then
+ docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}_${TAG}:${VERSION};
+ docker push ${DOCKER_REPO}_${TAG}:${VERSION};
+ else
# Push
- docker tag ""$DOCKER_USER/$IMAGE_NAME:$TAG"" ""$DOCKER_USER/$IMAGE_NAME:$TAG"";
- docker push ""$DOCKER_USER/$IMAGE_NAME:$TAG"";
+ docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${VERSION}-${TAG};
+ docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${MINOR}-${TAG};
+ docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${MAJOR}-${TAG};
+
+ docker push ${DOCKER_REPO}:${VERSION}-${TAG};
+ docker push ${DOCKER_REPO}:${MINOR}-${TAG};
+ docker push ${DOCKER_REPO}:${MAJOR}-${TAG};
+ fi
}
for image in ${IMAGES_BASE_PATH}/*; do
- build_docker_image ${image} ${TAG};
+ build_docker_image ${image};
done
",3
"diff --git a/test/system/dockerfile_rules.yml b/test/system/dockerfile_rules.yml multiline_regex: /\\$/
line_rules:
FROM:
- paramSyntaxRegex: /^[a-z0-9./-]+(:[a-z0-9.]+)?$/
+ paramSyntaxRegex: /^[a-z0-9./-]+(:[a-z0-9.-]+)?$/
rules:
-
label: ""is_latest_tag""
reference_url:
- ""https://docs.docker.com/reference/builder/""
- ""#from""
- MAINTAINER:
- paramSyntaxRegex: /.+/
- rules: []
RUN:
paramSyntaxRegex: /.+/
rules:
",3
"diff --git a/lib/util.js b/lib/util.js @@ -64,6 +64,9 @@ util = {
* @returns {String} - The prettified time, scaled to units of time, depending on the input value.
*/
prettyms: function (ms) {
+ if (ms < 1) {
+ return `${parseInt(ms * 1000, 10)}ns`;
+ }
return (ms < 1998) ? `${parseInt(ms, 10)}ms` : prettyms(ms || 0);
},
",3
"diff --git a/README.md b/README.md @@ -415,40 +415,46 @@ Older command line options are supported, but are deprecated in favour of the ne
discontinued. For documentation on the older command options, refer to [README.md for Newman v2.X](https://github.com/postmanlabs/newman/blob/release/2.x/README.md).
### HTML Reporter
-Its an external reporter which can be installed via `npm install -g newman-reporter-html`.
-The complete installation and usage guide is available at [newman-reporter-html](https://github.com/postmanlabs/newman-reporter-html#readme). Once HTML reporter is installed you can provide `--reporters html` as a CLI option.
+An external reporter, maintained by Postman, which can be installed via `npm install -g newman-reporter-html`. This reporter was part of the Newman project but was separated out into it's own project in V4.
+
+The complete installation and usage guide is available at [newman-reporter-html](https://github.com/postmanlabs/newman-reporter-html#readme). Once the HTML reporter is installed you can provide `--reporters html` as a CLI option.
[back to top](#table-of-contents)
## External Reporters
### Using External Reporters
-Newman also supports external reporters, provided that the reporter works with Newman's event sequence. Working examples on
+Newman also supports external reporters, provided that the reporter works with Newman's event sequence. Working examples of
how Newman reporters work can be found in [lib/reporters](https://github.com/postmanlabs/newman/tree/develop/lib/reporters).
-For instance, to use the [Newman HTML Reporter](https://github.com/postmanlabs/newman-reporter-html):
+
+For instance, to use the [Newman htmlextra Reporter](https://github.com/DannyDainton/newman-reporter-htmlextra):
- Install the reporter package. Note that the name of the package is of the form `newman-reporter-<name>`. The installation should be global if newman is installed globally, local otherwise. (Remove `-g` flag from the command below for a local installation.)<br/>
```console
-$ npm install -g newman-reporter-html
+$ npm install -g newman-reporter-htmlextra
```
- Use the installed reporter, either via the CLI, or programmatic usage. Here, the `newman-reporter` prefix is **not** required while specifying the reporter name in the options.<br/>
```console
-$ newman run /path/to/collection.json -r cli,html
+$ newman run /path/to/collection.json -r cli,htmlextra
```
```javascript
const newman = require('newman');
newman.run({
collection: '/path/to/collection.json',
- reporters: ['cli', 'html']
+ reporters: ['cli', 'htmlextra']
}, process.exit);
```
#### Community Maintained Reporters
-- [HTML](https://github.com/postmanlabs/newman-reporter-html)
-- [TeamCity](https://github.com/leafle/newman-reporter-teamcity)
-- [JSON-Light](https://github.com/Paramagnetic/newman-reporter-json-light)
+- [htmlextra](https://github.com/DannyDainton/newman-reporter-htmlextra)
+- [csv](https://github.com/matt-ball/newman-reporter-csv)
+- [json-summary](https://github.com/spenceclark/newman-reporter-json-summary)
+- [teamcity](https://github.com/leafle/newman-reporter-teamcity)
+- [testrail](https://github.com/billylam/newman-reporter-testrail)
+- [statsd](https://github.com/gsorry/newman-reporter-statsd)
+- [confluence](https://github.com/OmbraDiFenice/newman-reporter-confluence)
### Creating Your Own Reporter
A custom reporter is a Node module with a name of the form `newman-reporter-<name>`. To create a custom reporter:
@@ -460,8 +466,11 @@ function CustomNewmanReporter (emitter, reporterOptions, collectionRunOptions) {
// reporterOptions is an object of the reporter specific options. See usage examples below for more details.
// collectionRunOptions is an object of all the collection run options: https://github.com/postmanlabs/newman#newmanrunoptions-object--callback-function--run-eventemitter
}
+module.exports = CustomNewmanReporter
```
-3. Publish your reporter using `npm publish`, or use your reporter locally [see usage instructions](https://github.com/postmanlabs/newman/tree/develop/lib/reporters).
+3. To use your reporter locally, use the `npm pack` command to create a `.tgz` file. Once created, this can be installed using the `npm i -g newman-reporter-<name>.<version>.tgz` command.
+
+Once you're happy with your reporter, it can be published to `npm` using `npm publish`. This will then be made available for other people to download.
Scoped reporter package names like `@myorg/newman-reporter-<name>` are also supported. Working reporter examples can be found in [lib/reporters](lib/reporters).
",3
"diff --git a/README.md b/README.md ### Newman v4 has been released. Check the [migration guide](MIGRATION.md#migrating-from-v3-to-v4) and [changelog](https://github.com/postmanlabs/newman/blob/v4.0.0/CHANGELOG.yaml#L3) for more details.
-<a href=""https://www.getpostman.com/""><img src=""https://raw.githubusercontent.com/postmanlabs/postmanlabs.github.io/develop/global-artefacts/postman-logo%2Btext-320x132.png"" /></a><br />
-_Supercharge your API workflow<br/>Modern software is built on APIs. Postman helps you develop APIs faster._
+<a href=""https://www.getpostman.com/""><img src=""https://assets.getpostman.com/common-share/postman-logo-horizontal-320x132.png"" /></a><br />
+_Manage all of your organization's APIs in Postman, with the industry's most complete API development environment._
# newman <sub>_the cli companion for postman_</sub>
",3
"diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md @@ -34,10 +34,11 @@ In order to contribute to this project, you should:
4. Make sure everything is working by running `npm test`.
5. Create a new feature branch from `develop` with `feature/your-feature-name`.
6. Make the necessary changes in line with the objective(s) of the pull request
-7. Ensure that you have added unit and integration tests for any new features added / bugs fixed
-8. Run `npm test`. If any tests fail, resolve the issue with the code, and re-try
-9. Once the tests pass, commit and push. **Do not** alter the `version` in `package.json`
-10. Create a pull request to `develop`
+7. You can debug newman locally by running `node ./bin/newman <command-name>`.
+8. Ensure that you have added unit and integration tests for any new features added / bugs fixed
+9. Run `npm test`. If any tests fail, resolve the issue with the code, and re-try
+10. Once the tests pass, commit and push. **Do not** alter the `version` in `package.json`
+11. Create a pull request to `develop`
## NPM Command Reference
",3
"diff --git a/README.md b/README.md @@ -425,6 +425,9 @@ such a scenario.
| CLI Option | Description |
|-------------|-------------------|
| `--reporter-cli-silent` | The CLI reporter is internally disabled and you see no output to terminal. |
+
+| `--reporter-cli-show-timestamp` | This prints the local time for each request made. |
+| `--reporter-cli-show-timestamp-utc` | This prints the UTC time of each request made. |
| `--reporter-cli-no-summary` | The statistical summary table is not shown. |
| `--reporter-cli-no-failures` | This prevents the run failures from being separately printed. |
| `--reporter-cli-no-assertions` | This turns off the output for request-wise assertions as they happen. |
",3
"diff --git a/CHANGELOG.yaml b/CHANGELOG.yaml @@ -3,6 +3,10 @@ master:
- >-
GH-2806 Exposed the runner on newman and the runtime run object in start
event
+ - >-
+ Added ability to see request and responses in CLI reporter `--verbose`
+ mode. Also added ability to see additional meta such as header count,
+ cookie count and body mime-types in verbose mode.
5.2.4:
date: 2021-06-24
",3
"diff --git a/packages/reports/addon/consumers/request/metric.js b/packages/reports/addon/consumers/request/metric.js @@ -39,8 +39,8 @@ export default ActionConsumer.extend({
* @param {Object} metric - metadata model of metric to add
* @param {Object} parameter - selected metric parameter
*/
- [RequestActions.ADD_METRIC_WITH_PARAM]({ currentModel }, metric, parameter) {
- get(currentModel, 'request').addRequestMetricWithParam(metric, parameter);
+ [RequestActions.ADD_METRIC_WITH_PARAM]({ currentModel }, metric, parameters) {
+ get(currentModel, 'request').addRequestMetricWithParam(metric, parameters);
},
/**
@@ -49,18 +49,22 @@ export default ActionConsumer.extend({
* @param {Object} metric - metadata model of metric to add
* @param {Object} parameter - selected metric parameter
*/
- [RequestActions.REMOVE_METRIC_WITH_PARAM]({ currentModel }, metric, parameter) {
- get(currentModel, 'request').removeRequestMetricWithParam(metric, parameter);
+ [RequestActions.REMOVE_METRIC_WITH_PARAM]({ currentModel }, metric, parameters) {
+ get(currentModel, 'request').removeRequestMetricWithParam(metric, parameters);
},
/**
- * @action TOGGLE_METRIC_FILTER
+ * @action ADD_METRIC_FILTER
* @param {Object} route - route that has a model that contains a request property
* @param {Object} metric - metric to filter
*/
- [RequestActions.ADD_METRIC_FILTER](route, metric) {
+ [RequestActions.ADD_METRIC_FILTER](route, metric, parameters) {
// Metric filter can't exist without the metric present in the request
+ if(parameters){
+ get(this, 'requestActionDispatcher').dispatch(RequestActions.ADD_METRIC_WITH_PARAM, route, metric, parameters);
+ } else {
get(this, 'requestActionDispatcher').dispatch(RequestActions.ADD_METRIC, route, metric);
+ }
},
/**
",3
"diff --git a/packages/reports/addon/templates/components/metric-selector.hbs b/packages/reports/addon/templates/components/metric-selector.hbs {{else}}
Remove all
{{/if}}
+ {{else}}
{{#if (get metricsFiltered metric.name)}}
Remove Filter
{{else}}
Add Filter
{{/if}}
+ {{/if}}
{{/tooltip-on-component}}
{{/navi-icon}}
</div>
",3
"diff --git a/README.md b/README.md @@ -45,31 +45,14 @@ Try out the [live demo](http://demo.groovebasin.com/).
* File system monitoring. Add songs anywhere inside your music directory and
they instantly appear in your library.
-## Install
+## Installation on Ubuntu
-### Pre-Built Packages
+Last updated for Zesty 17.04.
-#### Ubuntu
-
-```
-sudo apt-add-repository ppa:andrewrk/libgroove
-sudo apt-get update
-sudo apt-get install groovebasin
-groovebasin
-```
-
-### From Source
-
-1. Install one of these:
- * [Node.js](http://nodejs.org) v0.10.36 or v0.12.x
- * [io.js](https://iojs.org) v1.x.x
- * On Debian and Ubuntu, `sudo apt-get install nodejs-dev nodejs-legacy npm`
-2. Install [libgroove](https://github.com/andrewrk/libgroove).
- libgroove is available in many package managers. See the libgroove README
- for more details.
-3. Clone the source and cd to it.
-4. `npm run build`
-5. `npm start`
+1. `sudo apt-get install nodejs libgrooveloudness-dev libgroovefingerprinter-dev libgrooveplayer-dev libgroove-dev`
+2. Clone this repo and cd to it.
+3. `npm run build`
+4. `npm start`
## Configuration
",3
"diff --git a/package.json b/package.json ""httpolyglot"": ""~0.1.1"",
""keese"": ""~1.1.1"",
""lastfm"": ""~0.9.2"",
- ""leveldown"": ""~1.4.3"",
+ ""leveldown"": ""~2.1.1"",
""mess"": ""~0.1.2"",
""mkdirp"": ""~0.5.1"",
""multiparty"": ""~4.1.2"",
",3
"diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -28,5 +28,5 @@ The [/src/recipes/](/src/recipes/) directory contains all the drink recipes as a
* Filename should match recipe filename
* JPG format, 600x400px if possible, 200KB max in size
* Submit a Pull Request with your recipe!
-* Once approved and merged, the latest update will be published to https://drinklist.netlify.com
+* Once approved and merged, the latest update will be published to https://opendrinks.netlify.com
",3
"diff --git a/src/recipes/lemonade.json b/src/recipes/lemonade.json ""Combine lemon juice, simple syrup: Pour the juice and the simple syrup sugar water into a serving pitcher. Add more water if you would like it to be more diluted (though note that when you add ice, it will melt and naturally dilute the lemonade)."",
""Chill: Refrigerate 30 to 40 minutes and serve""
],
- ""image"": ""<lemonade.jpg>""
+ ""image"": ""lemonade.jpg""
}
",3
"diff --git a/src/recipes/bourbon-mule.json b/src/recipes/bourbon-mule.json ""Fill cup with ice. Add ginger beer; stir gently to combine."",
""Garnish with mint sprig and lime slice.""
],
- ""image"": ""<bourbon-mule.jpg>"",
+ ""image"": ""bourbon-mule.jpg"",
""source"": ""https://www.cookinglight.com/recipes/bourbon-mule"",
""keywords"": [
""bourbon mule"",
- ""bourbon"",
+ ""bourbon""
]
}
",3
"diff --git a/.netlify/functions-src/getRecipes.js b/.netlify/functions-src/getRecipes.js -import { getRecipes } from '../../src/recipes/index';
+import recipes from '../../src/recipes/index';
exports.handler = function(event, context, callback) {
- // const r = recipes.getRecipes();
+ const r = recipes.getRecipes();
return callback(null, {
statusCode: 200,
headers: {
'Content-Type': 'application/json',
},
- // body: JSON.stringify({ recipes: r }),
+ body: JSON.stringify({ recipes: r }),
});
}
",3
"diff --git a/docs/ast.md b/docs/ast.md @@ -10,8 +10,9 @@ Pending changes in AST:
- `Progid` is subject to be removed
- `Space` will be extended to store actual whitespaces
+- `Space` may to be renamed into `WhiteSpace`
- `Type`, `Universal`, `Id`, `Class`, `Attribute`, `PseudoClass` and `PseudoElement` may to be renamed to add a `Selector` suffix
-- `PseudoClass` and `PseudoElement` may to be joined into single type `Pseudo` (or `PseudoSelector`)
+- `Type` and `Universal` to be joined into single type `Type`
Other node types are stable enough.
",3
"diff --git a/docs/ast.md b/docs/ast.md @@ -11,8 +11,6 @@ Pending changes in AST:
- `Progid` is subject to be removed
- `Space` will be extended to store actual whitespaces
- `Space` may to be renamed into `WhiteSpace`
-- `Type`, `Universal`, `Id`, `Class`, `Attribute`, `PseudoClass` and `PseudoElement` may to be renamed to add a `Selector` suffix
-- `Type` and `Universal` to be joined into single type `Type`
Other node types are stable enough.
@@ -23,10 +21,10 @@ Node types:
- [AnPlusB](#anplusb)
- [Atrule](#atrule)
- [AtruleExpression](#atruleexpression)
-- [Attribute](#attribute)
+- [AttributeSelector](#attributeselector)
- [Block](#block)
- [Brackets](#brackets)
-- [Class](#class)
+- [ClassSelector](#classselector)
- [Combinator](#combinator)
- [Comment](#comment)
- [Declaration](#declaration)
@@ -34,7 +32,7 @@ Node types:
- [Dimension](#dimension)
- [Function](#function)
- [Hash](#hash)
-- [Id](#id)
+- [IdSelector](#idselector)
- [Identifier](#identifier)
- [MediaFeature](#mediafeature)
- [MediaQuery](#mediaquery)
@@ -45,8 +43,8 @@ Node types:
- [Parentheses](#parentheses)
- [Percentage](#percentage)
- [Progid](#progid)
-- [PseudoClass](#pseudoclass)
-- [PseudoElement](#pseudoelement)
+- [PseudoClassSelector](#pseudoclassselector)
+- [PseudoElementSelector](#pseudoelementselector)
- [Ratio](#ratio)
- [Raw](#raw)
- [Rule](#rule)
@@ -55,9 +53,8 @@ Node types:
- [Space](#space)
- [String](#string)
- [StyleSheet](#stylesheet)
-- [Type](#type)
+- [TypeSelector](#typeselector)
- [UnicodeRange](#unicoderange)
-- [Universal](#universal)
- [Url](#url)
- [Value](#value)
@@ -97,11 +94,11 @@ Used to represent [the An+B microsyntax](https://drafts.csswg.org/css-syntax/#an
}
```
-## Attribute
+## AttributeSelector
```
{
- ""type"": ""Attribute"",
+ ""type"": ""AttributeSelector"",
""name"": string,
""operator"": string | null,
""value"": <String> | <Identifier> | null,
@@ -127,11 +124,11 @@ Used to represent [the An+B microsyntax](https://drafts.csswg.org/css-syntax/#an
}
```
-## Class
+## ClassSelector
```
{
- ""type"": ""Class"",
+ ""type"": ""ClassSelector"",
""name"": string
}
```
@@ -203,11 +200,11 @@ Used to represent [the An+B microsyntax](https://drafts.csswg.org/css-syntax/#an
}
```
-## Id
+## IdSelector
```
{
- ""type"": ""Id"",
+ ""type"": ""IdSelector"",
""name"": string
}
```
@@ -304,21 +301,21 @@ Used to represent [the An+B microsyntax](https://drafts.csswg.org/css-syntax/#an
}
```
-## PseudoClass
+## PseudoClassSelector
```
{
- ""type"": ""PseudoClass"",
+ ""type"": ""PseudoClassSelector"",
""name"": string,
""children"": List | null
}
```
-## PseudoElement
+## PseudoElementSelector
```
{
- ""type"": ""PseudoElement"",
+ ""type"": ""PseudoElementSelector"",
""name"": string,
""children"": List | null
}
@@ -375,7 +372,8 @@ Used to represent [the An+B microsyntax](https://drafts.csswg.org/css-syntax/#an
```
{
- ""type"": ""Space""
+ ""type"": ""Space"",
+ ""value"": string
}
```
@@ -397,11 +395,11 @@ Used to represent [the An+B microsyntax](https://drafts.csswg.org/css-syntax/#an
}
```
-## Type
+## TypeSelector
```
{
- ""type"": ""Type"",
+ ""type"": ""TypeSelector"",
""name"": string
}
```
@@ -415,15 +413,6 @@ Used to represent [the An+B microsyntax](https://drafts.csswg.org/css-syntax/#an
}
```
-## Universal
-
-```
-{
- ""type"": ""Universal"",
- ""name"": string
-}
-```
-
## Url
```
",3
"diff --git a/docs/supported.md b/docs/supported.md @@ -163,6 +163,7 @@ Support for a property means CSSTree has a grammar for such property, so its val
- `-webkit-mask-repeat`
- `-webkit-mask-repeat-x`
- `-webkit-mask-repeat-y`
+- `-webkit-mask-size`
- `-webkit-overflow-scrolling`
- `-webkit-print-color-adjust`
- `-webkit-tap-highlight-color`
@@ -320,6 +321,7 @@ Support for a property means CSSTree has a grammar for such property, so its val
- `font-feature-settings`
- `font-kerning`
- `font-language-override`
+- `font-optical-sizing`
- `font-size`
- `font-size-adjust`
- `font-stretch`
",3
"diff --git a/src/components/screens/IndexScreen/Hero.js b/src/components/screens/IndexScreen/Hero.js @@ -368,7 +368,6 @@ Framework.propTypes = {
};
export default function Hero({ startOpen, ...props }) {
- const [namespace, repo] = url.gitHub.repo.match(/github.com\/(.*)\/(.*)$/).slice(1);
const Modal = () => (
<AspectRatio ratio={0.5625}>
@@ -392,6 +391,9 @@ export default function Hero({ startOpen, ...props }) {
query HeroContributorQuery {
gitHubRepoData {
contributorCount
+ url
+ author
+ name
}
}
`}
@@ -484,7 +486,7 @@ export default function Hero({ startOpen, ...props }) {
<Stats>
<GitHubWrapper className=""chromatic-ignore"">
- <GitHubButton type=""stargazers"" namespace={namespace} repo={repo} />
+ <GitHubButton type=""stargazers"" namespace={data.gitHubRepoData.author} repo={data.gitHubRepoData.name} />
</GitHubWrapper>
<Stat
size=""small""
@@ -492,7 +494,7 @@ export default function Hero({ startOpen, ...props }) {
text=""Latest version""
noPlural
status=""primary""
- countLink={url.gitHub.releases}
+ countLink={`${data.gitHubRepoData.url}/releases`}
/>
<NpmDownloadStat />
<Stat
",3
"diff --git a/src/components/layout/ValueProp.stories.js b/src/components/layout/ValueProp.stories.js @@ -4,6 +4,8 @@ import { storiesOf } from '@storybook/react';
import ValueProp from './ValueProp';
import PlaceholderAspectRatio from './PlaceholderAspectRatio';
+import { Video } from '../basics';
+
const ImageWrapper = styled.div`
img {
width: 100%;
@@ -19,9 +21,11 @@ storiesOf('screens/IndexScreen/ValueProp', module).add('default', () => (
media={
/* eslint-disable jsx-a11y/media-has-caption */
<PlaceholderAspectRatio ratio={0.75}>
- <video autoPlay muted loop playsInline>
- <source src=""videos/storybook-workflow-build-optimized-sm.mp4"" type=""video/mp4"" />
- </video>
+ <Video
+ src=""videos/storybook-workflow-build-optimized-lg.mp4""
+ alt=""Storybook build workflow video""
+ shouldChangeSize
+ />
</PlaceholderAspectRatio>
}
title=""Lorem ipsum dolor sit amet""
",3
"diff --git a/src/components/screens/IndexScreen/Hero.js b/src/components/screens/IndexScreen/Hero.js @@ -385,8 +385,9 @@ export default function Hero({ startOpen, ...props }) {
<Pitch>
<Title>Build bulletproof UI components faster</Title>
<Subtitle>
- Storybook is an open source tool for developing UI components in isolation for React, Vue,
- Angular, and more. It makes building stunning UIs organized and efficient.
+ Storybook is an open source tool for developing, testing and documenting UI components in
+ isolation for React, Vue, Angular, and more. It makes building stunning UIs organized and
+ efficient.
</Subtitle>
<PitchActions>
<Button appearance=""primary"" isLink href={docs}>
",3
"diff --git a/gatsby-config.js b/gatsby-config.js @@ -14,11 +14,10 @@ module.exports = {
...siteMetadata,
...versionData,
},
- // flags: {
- // PRESERVE_WEBPACK_CACHE: true,
- // FAST_DEV: true,
- // QUERY_ON_DEMAND: true,
- // },
+ flags: {
+ FAST_DEV: true,
+ QUERY_ON_DEMAND: true,
+ },
...(!versionData.isLatest
? { assetPrefix: getReleaseBranchUrl(versionData.versionString) }
: undefined),
@@ -177,6 +176,17 @@ module.exports = {
{
resolve: `gatsby-plugin-sitemap`,
options: {
+ query: `
+ {
+ allSitePage {
+ edges {
+ node {
+ path
+ }
+ }
+ }
+ }
+ `,
serialize: ({ site, allSitePage }) =>
allSitePage.edges.map((edge) => ({
url: `${site.siteMetadata.siteUrl}${edge.node.path}/`,
",3
"diff --git a/src/config/testnet_postake_medium_curves.mlh b/src/config/testnet_postake_medium_curves.mlh [%%define genesis_ledger ""testnet_postake""]
[%%define genesis_state_timestamp ""2019-01-30 12:00:00-08:00""]
-[%%define block_window_duration 30000]
+[%%define block_window_duration 300000]
[%%define integration_tests false]
[%%define force_updates false]
",3
"diff --git a/src/lib/proposer/proposer.ml b/src/lib/proposer/proposer.ml @@ -343,7 +343,13 @@ let run ~logger ~prover ~verifier ~trust_system ~get_completed_work
(Protocol_state.hash previous_protocol_state)
|> Option.value_exn
in
- let transition =
+ let error_msg_prefix = ""Validation failed: "" in
+ let reason_for_failure =
+ "" One possible reason could be a ledger-catchup is \
+ triggered before we produce a proof for the proposed \
+ transition.""
+ in
+ match
External_transition.Validation.wrap
{ With_hash.hash= transition_hash
; data=
@@ -359,24 +365,32 @@ let run ~logger ~prover ~verifier ~trust_system ~get_completed_work
`This_transition_was_not_received_via_gossip
|> Transition_frontier_validation
.validate_frontier_dependencies ~logger ~frontier
- |> Result.map_error ~f:(fun err ->
- let exn name =
- Error.to_exn
- (Error.of_string
- (sprintf
- ""Error validating proposed \
- transition frontier dependencies: %s""
- name))
- in
- match err with
- | `Already_in_frontier ->
- exn ""already in frontier""
- | `Not_selected_over_frontier_root ->
- exn ""not selected over frontier root""
- | `Parent_missing_from_frontier ->
- exn ""parent missing from frontier"" )
- |> Result.ok_exn
- in
+ with
+ | Error `Already_in_frontier ->
+ Logger.error logger ~module_:__MODULE__
+ ~location:__LOC__
+ ~metadata:
+ [ ( ""protocol_state""
+ , Protocol_state.value_to_yojson protocol_state
+ ) ]
+ ""%sproposed transition is already in frontier""
+ error_msg_prefix ;
+ return ()
+ | Error `Not_selected_over_frontier_root ->
+ Logger.warn logger ~module_:__MODULE__
+ ~location:__LOC__
+ ""%sproposed transition is not selected over the \
+ root of transition frontier.%s""
+ error_msg_prefix reason_for_failure ;
+ return ()
+ | Error `Parent_missing_from_frontier ->
+ Logger.warn logger ~module_:__MODULE__
+ ~location:__LOC__
+ ""%sparent of proposed transition is missing from \
+ the frontier.%s""
+ error_msg_prefix reason_for_failure ;
+ return ()
+ | Ok transition -> (
let%bind breadcrumb_result =
Breadcrumb.build ~logger ~verifier ~trust_system
~parent:crumb ~transition ~sender:None
@@ -398,33 +412,39 @@ let run ~logger ~prover ~verifier ~trust_system ~get_completed_work
(Exn.to_string e))
| `Invalid_staged_ledger_diff e ->
exn
- (sprintf ""invalid staged ledger diff -- %s""
+ (sprintf
+ ""invalid staged ledger diff -- %s""
(Error.to_string_hum e))
| `Invalid_staged_ledger_hash e ->
exn
- (sprintf ""invalid staged ledger hash -- %s""
+ (sprintf
+ ""invalid staged ledger hash -- %s""
(Error.to_string_hum e)) )
|> Result.ok_exn
in
let metadata =
- [(""state_hash"", State_hash.to_yojson transition_hash)]
+ [ ( ""state_hash""
+ , State_hash.to_yojson transition_hash ) ]
in
- Logger.info logger ~module_:__MODULE__ ~location:__LOC__
- !""Submitting newly produced block $state_hash to the \
- transition frontier controller""
+ Logger.info logger ~module_:__MODULE__
+ ~location:__LOC__
+ !""Submitting newly produced block $state_hash to \
+ the transition frontier controller""
~metadata ;
- Coda_metrics.(Counter.inc_one Proposer.blocks_proposed) ;
+ Coda_metrics.(
+ Counter.inc_one Proposer.blocks_proposed) ;
let%bind () =
- Strict_pipe.Writer.write transition_writer breadcrumb
+ Strict_pipe.Writer.write transition_writer
+ breadcrumb
in
- Logger.debug logger ~module_:__MODULE__ ~location:__LOC__
- ~metadata
- ""Waiting for transition $state_hash to be inserted \
- into frontier"" ;
+ Logger.debug logger ~module_:__MODULE__
+ ~location:__LOC__ ~metadata
+ ""Waiting for transition $state_hash to be \
+ inserted into frontier"" ;
Deferred.choose
[ Deferred.choice
- (Transition_frontier.wait_for_transition frontier
- transition_hash)
+ (Transition_frontier.wait_for_transition
+ frontier transition_hash)
(Fn.const `Transition_accepted)
; Deferred.choice
( Time.Timeout.create time_controller
@@ -439,19 +459,20 @@ let run ~logger ~prover ~verifier ~trust_system ~get_completed_work
| `Transition_accepted ->
Logger.info logger ~module_:__MODULE__
~location:__LOC__ ~metadata
- ""Generated transition $state_hash was accepted \
- into transition frontier""
+ ""Generated transition $state_hash was \
+ accepted into transition frontier""
| `Timed_out ->
let str =
""Timed out waiting for generated transition \
$state_hash to enter transition frontier. \
- Continuing to produce new blocks anyway. This \
- may mean your CPU is overloaded. Consider \
- disabling `-run-snark-worker` if it's configured.""
+ Continuing to produce new blocks anyway. \
+ This may mean your CPU is overloaded. \
+ Consider disabling `-run-snark-worker` if \
+ it's configured.""
in
(* FIXME #3167: this should be fatal, and more importantly, shouldn't happen. *)
Logger.error logger ~module_:__MODULE__
- ~location:__LOC__ ~metadata ""%s"" str )) )
+ ~location:__LOC__ ~metadata ""%s"" str ) )) )
in
let proposal_supervisor = Singleton_supervisor.create ~task:propose in
let scheduler = Singleton_scheduler.create time_controller in
",3
"diff --git a/frontend/website/docs/contributing.md b/frontend/website/docs/contributing.md @@ -22,7 +22,9 @@ Coda is entirely open source, and the code is distributed under the terms of the
## Coda Grants
-There are also a limited set of grants for projects related to Coda's development. Many of these focus on development, but more will be added in the areas of design and community development. Reach out on Discord for more info on the grant program.
+O(1) Labs provides grants for certain projects related to the development of Coda -- visit the [Coda Grants repo](https://github.com/CodaProtocol/coda-grants) to find out more details.
+
+Currently, the projects are mostly programming focused, but more will be added in the areas of design and community development. Reach out on Discord if you have any questions about the grant program.
## Reporting Issues
",3
"diff --git a/src/lib/pipe_lib/broadcast_pipe.ml b/src/lib/pipe_lib/broadcast_pipe.ml @@ -21,7 +21,6 @@ let create a =
in
don't_wait_for
(Pipe.iter ~flushed:(Consumer consumer) root_r ~f:(fun v ->
- t.cache <- v ;
downstream_flushed_v := Ivar.create () ;
let inner_pipes = Int.Table.data t.pipes in
let%bind () =
@@ -105,6 +104,7 @@ module Writer = struct
let write t x =
guard_already_closed t (fun () ->
+ t.cache <- x ;
let%bind () = Pipe.write t.root_pipe x in
let%bind _ = Pipe.downstream_flushed t.root_pipe in
Deferred.unit )
",3
"diff --git a/frontend/website/docs/glossary.md b/frontend/website/docs/glossary.md @@ -45,7 +45,7 @@ The Coda daemon is a background process that implements the Coda protocol and ru
Because staking coda requires nodes to be online, some nodes may desire to delegate their coda to another node which runs a staking service. This process is called delegating a stake, and often the service provider or staking pool operator may charge a fee for running this service, which will be deducted any time the delegator gets selected to be a block producer.
-###Full Node
+####Full Node
A Coda node that is able to verify the state of the network trustlessly. In Coda, every node is a full node since all nodes can receive and verify zk-SNARKs.
",3
"diff --git a/graphql_schema.json b/graphql_schema.json ""enumValues"": null,
""possibleTypes"": null
},
+ {
+ ""kind"": ""OBJECT"",
+ ""name"": ""AddrsAndPorts"",
+ ""description"": null,
+ ""fields"": [
+ {
+ ""name"": ""externalIp"",
+ ""description"": null,
+ ""args"": [],
+ ""type"": {
+ ""kind"": ""NON_NULL"",
+ ""name"": null,
+ ""ofType"": {
+ ""kind"": ""SCALAR"",
+ ""name"": ""String"",
+ ""ofType"": null
+ }
+ },
+ ""isDeprecated"": false,
+ ""deprecationReason"": null
+ },
+ {
+ ""name"": ""bindIp"",
+ ""description"": null,
+ ""args"": [],
+ ""type"": {
+ ""kind"": ""NON_NULL"",
+ ""name"": null,
+ ""ofType"": {
+ ""kind"": ""SCALAR"",
+ ""name"": ""String"",
+ ""ofType"": null
+ }
+ },
+ ""isDeprecated"": false,
+ ""deprecationReason"": null
+ },
+ {
+ ""name"": ""discoveryPort"",
+ ""description"": null,
+ ""args"": [],
+ ""type"": {
+ ""kind"": ""NON_NULL"",
+ ""name"": null,
+ ""ofType"": {
+ ""kind"": ""SCALAR"",
+ ""name"": ""Int"",
+ ""ofType"": null
+ }
+ },
+ ""isDeprecated"": false,
+ ""deprecationReason"": null
+ },
+ {
+ ""name"": ""clientPort"",
+ ""description"": null,
+ ""args"": [],
+ ""type"": {
+ ""kind"": ""NON_NULL"",
+ ""name"": null,
+ ""ofType"": {
+ ""kind"": ""SCALAR"",
+ ""name"": ""Int"",
+ ""ofType"": null
+ }
+ },
+ ""isDeprecated"": false,
+ ""deprecationReason"": null
+ },
+ {
+ ""name"": ""libp2pPort"",
+ ""description"": null,
+ ""args"": [],
+ ""type"": {
+ ""kind"": ""NON_NULL"",
+ ""name"": null,
+ ""ofType"": {
+ ""kind"": ""SCALAR"",
+ ""name"": ""Int"",
+ ""ofType"": null
+ }
+ },
+ ""isDeprecated"": false,
+ ""deprecationReason"": null
+ },
+ {
+ ""name"": ""communicationPort"",
+ ""description"": null,
+ ""args"": [],
+ ""type"": {
+ ""kind"": ""NON_NULL"",
+ ""name"": null,
+ ""ofType"": {
+ ""kind"": ""SCALAR"",
+ ""name"": ""Int"",
+ ""ofType"": null
+ }
+ },
+ ""isDeprecated"": false,
+ ""deprecationReason"": null
+ }
+ ],
+ ""inputFields"": null,
+ ""interfaces"": [],
+ ""enumValues"": null,
+ ""possibleTypes"": null
+ },
{
""kind"": ""OBJECT"",
""name"": ""ConsensusConfiguration"",
},
""isDeprecated"": false,
""deprecationReason"": null
+ },
+ {
+ ""name"": ""addrsAndPorts"",
+ ""description"": null,
+ ""args"": [],
+ ""type"": {
+ ""kind"": ""NON_NULL"",
+ ""name"": null,
+ ""ofType"": {
+ ""kind"": ""OBJECT"",
+ ""name"": ""AddrsAndPorts"",
+ ""ofType"": null
+ }
+ },
+ ""isDeprecated"": false,
+ ""deprecationReason"": null
+ },
+ {
+ ""name"": ""libp2pPeerId"",
+ ""description"": null,
+ ""args"": [],
+ ""type"": {
+ ""kind"": ""NON_NULL"",
+ ""name"": null,
+ ""ofType"": {
+ ""kind"": ""SCALAR"",
+ ""name"": ""String"",
+ ""ofType"": null
+ }
+ },
+ ""isDeprecated"": false,
+ ""deprecationReason"": null
}
],
""inputFields"": null,
",3
"diff --git a/frontend/website/src/pages/Testnet.re b/frontend/website/src/pages/Testnet.re @@ -419,8 +419,7 @@ let make = (~challenges as _, ~testnetName as _) => {
</ul>
<p className=Styles.markdownStyles>
{React.string(""Check out all challenges "")}
- <a
- href=""https://forums.codaprotocol.com/t/testnet-beta-release-3-1-challenges/271"">
+ <a href=""https://bit.ly/Challenges3-2a"">
{React.string("" here "")}
</a>
{React.string(""and join "")}
",3
"diff --git a/buildkite/scripts/cache-through.sh b/buildkite/scripts/cache-through.sh @@ -10,7 +10,7 @@ fi
# download gsutil if it doesn't exist
# TODO: Bake this into the agents
-if [[ ! -f ./google-cloud-sdk/bin/gsutil ]]; then
+if [[ ! -f /usr/local/google-cloud-sdk/bin/gsutil ]]; then
echo ""Downloading gsutil because it doesn't exist""
wget https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-296.0.1-linux-x86_64.tar.gz
",3
"diff --git a/buildkite/scripts/unit-test.sh b/buildkite/scripts/unit-test.sh @@ -21,4 +21,4 @@ echo ""--- Make build""
time make build
echo ""--- Run unit tests""
-time dune runtest ""${path}"" --profile=""${profile}"" -j1 || (./scripts/link-coredumps.sh && false)
+time dune runtest ""${path}"" --profile=""${profile}"" -j16 || (./scripts/link-coredumps.sh && false)
",3
"diff --git a/src/lib/network_pool/transaction_pool.ml b/src/lib/network_pool/transaction_pool.ml @@ -931,6 +931,9 @@ struct
let unsafe_apply t env =
match%map apply t env with Ok e -> Ok e | Error e -> Error (`Other e)
+
+ (* Transaction verification currently happens in apply. In the future we could batch it. *)
+ let verify _ _ = Deferred.return true
end
let get_rebroadcastable (t : t) ~is_expired =
",3
"diff --git a/buildkite/src/Pipeline/TriggerCommand.dhall b/buildkite/src/Pipeline/TriggerCommand.dhall @@ -3,5 +3,5 @@ in
(
\(dhallPipelineRelativeToBuildKiteDir : Text) ->
- Cmd.quietly ""dhall-to-yaml --quoted <<< '(./buildkite/${dhallPipelineRelativeToBuildKiteDir}).pipeline' | BUILDKITE_AGENT_META_DATA_size=small buildkite-agent pipeline upload""
+ Cmd.quietly ""dhall-to-yaml --quoted <<< '(./buildkite/${dhallPipelineRelativeToBuildKiteDir}).pipeline' | BUILDKITE_AGENT_META_DATA_SIZE=small buildkite-agent pipeline upload""
) : Text -> Cmd.Type
",3
"diff --git a/src/lib/runtime_config/dune b/src/lib/runtime_config/dune (library
(name runtime_config)
(public_name coda_runtime_config)
- (libraries core_kernel currency ppx_dhall_type)
+ (libraries core_kernel currency ppx_dhall_type coda_numbers)
(preprocess (pps ppx_let ppx_deriving_yojson ppx_dhall_type ppx_version ppx_deriving.eq)))
",3
"diff --git a/src/nonconsensus/coda_numbers/dune b/src/nonconsensus/coda_numbers/dune (inline_tests)
(library_flags -linkall)
(libraries fold_lib tuple_lib bignum_bigint snark_bits_nonconsensus unsigned_extended_nonconsensus random_oracle_nonconsensus
- core_kernel codable)
+ core_kernel codable ppx_dhall_type)
(preprocessor_deps ../../config.mlh)
(preprocess
(pps ppx_version ppx_optcomp ppx_bin_prot ppx_sexp_conv ppx_compare ppx_hash ppx_deriving.eq ppx_deriving_yojson
",3
"diff --git a/src/lib/integration_test_cloud_engine/coda_automation.ml b/src/lib/integration_test_cloud_engine/coda_automation.ml @@ -98,7 +98,8 @@ module Network_config = struct
; balance=
Balance.of_formatted_string balance
(* delegation currently unsupported *)
- ; delegate= None }
+ ; delegate= None
+ ; timing= None }
in
let secret_name = ""test-keypair-"" ^ Int.to_string index in
let keypair =
",3
"diff --git a/frontend/website-redesign/src/components/Icon.re b/frontend/website-redesign/src/components/Icon.re @@ -43,10 +43,9 @@ type kind =
let make = (~kind, ~size=?) => {
let size =
switch (size) {
- | Some(size) => size
- | None => ""24""
+ | Some(size) => Js.Int.toString(size * 16) ++ ""px""
+ | None => ""24px""
};
-
switch (kind) {
| World => <svg height=size width=size />
| Discord => <svg height=size width=size />
",3
"diff --git a/scripts/client-sdk-unit-tests.sh b/scripts/client-sdk-unit-tests.sh @@ -4,6 +4,9 @@ set -e
# run client SDK tests in node
+export PATH=/home/opam/.cargo/bin:/usr/lib/go/bin:$PATH
+export GO=/usr/lib/go/bin/go
+
echo ""Building client SDK...""
make client_sdk
echo ""Running tests""
",3
"diff --git a/src/lib/currency/currency.ml b/src/lib/currency/currency.ml @@ -295,27 +295,12 @@ end = struct
let ( + ) = add
let equal (t1 : var) (t2 : var) =
- let seal x =
- let%bind y = exists Field.typ ~compute:As_prover.(read_var x) in
- let%map () = Field.Checked.Assert.equal x y in
- y
- in
- let%bind v1 = seal (pack_var t1.magnitude) in
- let v2 = pack_var t1.magnitude in
- let%bind v1_equal_v2 = Field.Checked.equal v1 v2
- and sgns_equal =
- Field.Checked.equal (t1.sgn :> Field.Var.t) (t2.sgn :> Field.Var.t)
- in
- let%bind v1_is_zero =
- Field.Checked.equal v1 (Field.Var.constant Field.zero)
- in
- let%bind v1_zero_or_sgns_equal =
- Boolean.any [v1_is_zero; sgns_equal]
- in
- Boolean.all [v1_equal_v2; v1_zero_or_sgns_equal]
+ let%bind t1 = to_field_var t1 and t2 = to_field_var t2 in
+ Field.Checked.equal t1 t2
let assert_equal (t1 : var) (t2 : var) =
- equal t1 t2 >>= Boolean.Assert.is_true
+ let%bind t1 = to_field_var t1 and t2 = to_field_var t2 in
+ Field.Checked.Assert.equal t1 t2
let cswap_field (b : Boolean.var) (x, y) =
(* (x + b(y - x), y + b(x - y)) *)
",3
"diff --git a/frontend/website/pages/docs/developers/sandbox-node.mdx b/frontend/website/pages/docs/developers/sandbox-node.mdx @@ -22,7 +22,7 @@ docker run \
--publish 3085:3085 \
-d \
--name coda \
- codaprotocol/coda-demo:sandbox-32a.1
+ codaprotocol/coda-demo:pickles-sandbox
```
This command will start a daemon inside the docker container and expose the GraphQL port (3085), which is used for communication with the client, to your computer. This daemon will automatically be running in the background with a block producer and snark worker.
@@ -59,8 +59,8 @@ The password for this account is the empty string (there's no password -- you ca
There are a few things you can do with your sandbox now that you have it running:
-- [Install Coda](/docs/getting-started#installation) as usual and use many of the client commands. Since the daemon is already running in the container, you don't need to run `coda daemon`!
-
-- Install the [GUI Wallet](/docs/gui-wallet) app to use a graphical interface to your node. Enter '127.0.0.1' as the host of your node during setup.
+- Follow [the normal instructions](https://codaprotocol.com/docs/my-first-transaction#create-a-new-account) skipping over those steps that interact with a live network such as using a faucet.
- Head over to http://localhost:3085/graphql to play with the GraphQL API directly.
+
+- Observe the logs and marvel at all the interesting crypto executing on your machine.
",3
"diff --git a/src/app/rosetta/README.md b/src/app/rosetta/README.md @@ -72,7 +72,7 @@ The Construction API is _not_ validated using `rosetta-cli` as this would requir
### Reproduce agent and rosetta-cli validation
-`gcr.io/o1labs-192920/coda-rosetta:debug-v1`
+`gcr.io/o1labs-192920/coda-rosetta:debug-v1.1`
and
[`rosetta-cli` @ 4bb48b24a794deb3635973e32d1ea806e5b30729](https://github.com/coinbase/rosetta-cli/commit/4bb48b24a794deb3635973e32d1ea806e5b30729)
using this [`rosetta.conf`](https://github.com/CodaProtocol/coda/blob/e02605429e9a490c14994087ce954e19fc321edc/src/app/rosetta/rosetta.conf)
",3
"diff --git a/src/lib/integration_test_cloud_engine/coda_automation.ml b/src/lib/integration_test_cloud_engine/coda_automation.ml @@ -122,7 +122,8 @@ module Network_config = struct
; block_window_duration_ms= None
; transaction_capacity= None
; coinbase_amount= None
- ; account_creation_fee= None }
+ ; account_creation_fee= None
+ ; supercharged_coinbase_factor= None }
in
let runtime_config =
{ Runtime_config.daemon= Some {txpool_max_size= Some txpool_max_size}
",3
"diff --git a/frontend/website/pages/docs/my-first-transaction.mdx b/frontend/website/pages/docs/my-first-transaction.mdx @@ -159,7 +159,7 @@ Finally we get to the good stuff, sending our first transaction! Before you send
For testing purposes, there's already an echo service set up that will immediately refund your payment minus the transaction fees. You can use the following public key for the echo bot.
```
-4vsRCViQQRxXfkgEspR9vPWLypuSEGkZtHxjYF7srq5M1mZN4LSoX7wWCFZGitJLmdoozDXmrCugvBBKsePd6hfBAp9P3eTCHs5HwdC763A1FbjzskfrCvWMq9KXXsmFxWhYpG9nnhWzqSC1
+B62qk5jqp4nYPwDDdd9XJAV8bYQ5cSzaZ9Me7ccaMdSSJpqKasDqMx9
```
<Alert kind=""warning"">
@@ -174,7 +174,7 @@ Let's send some of our newly received coda to this service to see what a payment
coda client send-payment \
-amount 0.5 \
- -receiver 4vsRCViQQRxXfkgEspR9vPWLypuSEGkZtHxjYF7srq5M1mZN4LSoX7wWCFZGitJLmdoozDXmrCugvBBKsePd6hfBAp9P3eTCHs5HwdC763A1FbjzskfrCvWMq9KXXsmFxWhYpG9nnhWzqSC1 \
+ -receiver B62qk5jqp4nYPwDDdd9XJAV8bYQ5cSzaZ9Me7ccaMdSSJpqKasDqMx9 \
-fee 0.1 \
-sender $CODA_PUBLIC_KEY
",3
"diff --git a/frontend/leaderboard/Dockerfile b/frontend/leaderboard/Dockerfile @@ -13,7 +13,7 @@ COPY ./src ./src
RUN yarn build
-ENV SPREADSHEET_ID=1dkHatzBcaN_5rb3sQEDIcwdh0qTc_9t7pHGAVfdHACY
+ENV SPREADSHEET_ID=1Nq_Y76ALzSVJRhSFZZm4pfuGbPkZs2vTtCnVQ1ehujE
ENTRYPOINT [""bash"", ""-c""]
CMD [""node lib/js/src/Main.bs.js""]
\ No newline at end of file
",3
"diff --git a/dockerfiles/Dockerfile-toolchain b/dockerfiles/Dockerfile-toolchain @@ -62,8 +62,8 @@ RUN export CLOUD_SDK_REPO=""cloud-sdk-$(lsb_release -c -s)"" && \
sudo apt-get update -y && sudo apt-get install google-cloud-sdk kubectl -y
# Helm tools
-RUN echo ""deb https://baltocdn.com/helm/stable/debian/ all main"" | tee /etc/apt/sources.list.d/helm-stable-debian.list && \
- apt-get update && apt-get install helm
+RUN echo ""deb https://baltocdn.com/helm/stable/debian/ all main"" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list && \
+ sudo apt-get update -y && sudo apt-get install helm -y --allow-unauthenticated
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o /tmp/rust_install.sh
RUN chmod +x /tmp/rust_install.sh
",3
"diff --git a/helm/block-producer/README.md b/helm/block-producer/README.md @@ -24,28 +24,28 @@ Parameter | Description
Parameter | Description | Default
--- | --- | ---
-`userAgent.image` | Container image to use for a Coda protocol user-agent sidecar
-`bots.image` | Container image to use for a Codaprotocol faucet and echo service sidecars
+`userAgent.image` | Container image to use for a Coda protocol user-agent sidecar | """"
+`bots.image` | Container image to use for a Codaprotocol faucet and echo service sidecars | """"
`coda.image` | container image to use for operating the archive node's Coda daemon | `codaprotocol/coda-daemon:0.0.12-beta-new-genesis-01eca9b`
-`blockProducerConfigs` | list of Coda protocol block producer config and provisioning settings
-`blockProducerConfigs[].name` | Name of block producer configuration and deployment object
-`blockProducerConfigs[].class` | Testnet block producer class based on account balance (e.g. fish or whale)
-`blockProducerConfigs[].runWithBots` | Whether to run with certain Coda protocol testnet bots
-`blockProducerConfigs[].runWithUserAgent` | Whether to run with a user-agent which periodically sends transactions
-`blockProducerConfigs[].enableGossipFlooding` | Whether to enable gossip flooding
-`blockProducerConfigs[].privateKeySecret` | account wallet private key secret associated with Coda test account/wallet
-`blockProducerConfigs[].externalPort` | Port Coda clients use for connecting to the external network
+`blockProducerConfigs` | list of Coda protocol block producer config and provisioning settings | `see [default] values.yaml`
+`blockProducerConfigs[].name` | Name of block producer configuration and deployment object | `<item-data>`
+`blockProducerConfigs[].class` | Testnet block producer class based on account balance (e.g. fish or whale) | `<item-data>`
+`blockProducerConfigs[].runWithBots` | Whether to run with certain Coda protocol testnet bots | `<item-data>`
+`blockProducerConfigs[].runWithUserAgent` | Whether to run with a user-agent which periodically sends transactions | `<item-data>`
+`blockProducerConfigs[].enableGossipFlooding` | Whether to enable gossip flooding | `<item-data>`
+`blockProducerConfigs[].privateKeySecret` | account wallet private key secret associated with Coda test account/wallet | `<item-data>`
+`blockProducerConfigs[].externalPort` | Port Coda clients use for connecting to the external network | `<item-data>`
`coda.logLevel` | log level to set for Coda daemon | `TRACE`
`coda.logReceivedBlocks` | whether the Coda daemon should log received blocks events | `false`
`coda.logSnarkWorkGossip` | whether the Coda daemon should log SNARK work gossip | `false`
`coda.runtimeConfig` | Coda daemon configuration to use at runtime | `undefined`
`coda.privKeyPass` | public-private key-pair associated with Coda daemon account | `see [default] values.yaml`
-`userAgent.minFee` | Minimum fee to accept for sending network transactions
-`userAgent.maxFee` | Maximum fee to accept for sending network transactions
-`userAgent.minTx` | Minimum transaction amount to send by the user-agent
-`userAgent.maxTx` | Maxiumum transaction amount to send by the user-agent
-`bots.faucet.amount` | Amount to send in response to request for faucet funds
-`bots.faucet.fee` | Fee to charge for sending faucet funds
+`userAgent.minFee` | Minimum fee to accept for sending network transactions | """"
+`userAgent.maxFee` | Maximum fee to accept for sending network transactions | """"
+`userAgent.minTx` | Minimum transaction amount to send by the user-agent | """"
+`userAgent.maxTx` | Maxiumum transaction amount to send by the user-agent | """"
+`bots.faucet.amount` | Amount to send in response to request for faucet funds | ""10000000000""
+`bots.faucet.fee` | Fee to charge for sending faucet funds | ""100000000""
## block-producer launch examples
",3
"diff --git a/frontend/website-redesign/src/pages/NodeOperators.re b/frontend/website-redesign/src/pages/NodeOperators.re @@ -331,7 +331,7 @@ module BlockExplorersAndTools = {
let make = () =>
<div
className={Styles.sectionContainer(
- ""/static/img/MinaSpectrumPrimary1.png"",
+ ""/static/img/MinaSpectrumPrimary1.jpg"",
)}>
<Spacer height=6. />
<Section title=""Block Explorers & Tools"" slug=""block-explorers-tools"">
@@ -347,9 +347,9 @@ let make = () => {
<div className=Nav.Styles.spacer />
<Hero
background={
- Theme.desktop: ""/static/img/NodeOperatorHero.png"",
- Theme.tablet: ""/static/img/NodeOperatorHero.png"",
- Theme.mobile: ""/static/img/NodeOperatorHero.png"",
+ Theme.desktop: ""/static/img/NodeOperatorHero.jpg"",
+ Theme.tablet: ""/static/img/NodeOperatorHero.jpg"",
+ Theme.mobile: ""/static/img/NodeOperatorHero.jpg"",
}
title=""Get Started For Node Operators""
header=""Run a Node""
",3
"diff --git a/frontend/website-redesign/src/pages/Genesis.re b/frontend/website-redesign/src/pages/Genesis.re @@ -355,11 +355,7 @@ let make = (~profiles) => {
}>
<Spacer height=2. />
<Button
- href={
- `External(
- ""https://docs.google.com/forms/d/e/1FAIpQLSebjJSGobXHIOPlnjnGtp0InsNFU3Z7Sig_xoqCfeaKebJ0XQ/viewform"",
- )
- }
+ href={`External(Constants.genesisGrantApplication)}
bgColor=Theme.Colors.black>
{React.string(""Apply Now"")}
<Icon kind=Icon.ArrowRightMedium />
@@ -383,10 +379,7 @@ let make = (~profiles) => {
buttonColor: Theme.Colors.orange,
buttonTextColor: Theme.Colors.white,
dark: false,
- href:
- `External(
- ""https://docs.google.com/forms/d/e/1FAIpQLSebjJSGobXHIOPlnjnGtp0InsNFU3Z7Sig_xoqCfeaKebJ0XQ/viewform"",
- ),
+ href: `External(Constants.genesisGrantApplication),
}),
}>
<Spacer height=4. />
",3
"diff --git a/src/lib/pickles/commitment_lengths.ml b/src/lib/pickles/commitment_lengths.ml @@ -5,54 +5,44 @@ open Import
(* Compute the number of group elements required to represent each commitment.
This is simply ceil(degree of commitment / max degree natively supported by the PCS) *)
-let generic' ~h ~k ~sub:( - ) ~mul:( * ) ~of_int ~ceil_div_max_degree :
- _ Dlog_marlin_types.Evals.t =
- let two_h = ceil_div_max_degree (of_int 2 * h#size) in
- let three_k_minus_three =
- ceil_div_max_degree ((of_int 3 * k#size) - of_int 3)
- in
- let h = ceil_div_max_degree h#size in
- let k = ceil_div_max_degree k#size in
- let index : _ Abc.t = {a= k; b= k; c= k} in
- { w_hat= h
- ; z_hat_a= h
- ; z_hat_b= h
- ; h_1= two_h
- ; h_2= h
- ; h_3= three_k_minus_three
- ; row= index
- ; col= index
- ; value= index
- ; rc= index
- ; g_1= h
- ; g_2= h
- ; g_3= k }
+let generic' ~h ~add:( + ) ~mul:( * ) ~of_int ~ceil_div_max_degree :
+ _ Dlog_plonk_types.Evals.t =
+ let n = h#size in
+ let n_plus_2 = ceil_div_max_degree (of_int 2 + n) in
+ let n_plus_3 = ceil_div_max_degree (of_int 3 + n) in
+ let five_n_plus_1 = ceil_div_max_degree (of_int 5 * (n + of_int 1)) in
+ let h = ceil_div_max_degree n in
+ { l= n_plus_2
+ ; r= n_plus_2
+ ; o= n_plus_2
+ ; z= n_plus_3
+ ; t= five_n_plus_1
+ ; f= n_plus_3
+ ; sigma1= h
+ ; sigma2= h }
-let generic map ~h ~k ~max_degree : _ Dlog_marlin_types.Evals.t =
- let index : _ Abc.t = {a= k; b= k; c= k} in
- Dlog_marlin_types.Evals.map
+let generic map ~h ~max_degree : _ Dlog_plonk_types.Evals.t =
+ let n_plus_2 = map h ~f:(fun h -> h + 2) in
+ let n_plus_3 = map h ~f:(fun h -> h + 3) in
+ let five_n_plus_1 = map h ~f:(fun h -> 5 * (h + 1)) in
+ Dlog_plonk_types.Evals.map
~f:(fun v ->
map v ~f:(fun x -> Int.round_up x ~to_multiple_of:max_degree / max_degree)
)
- { w_hat= h
- ; z_hat_a= h
- ; z_hat_b= h
- ; h_1= map h ~f:(( * ) 2)
- ; h_2= h
- ; h_3= map k ~f:(fun k -> (3 * k) - 3)
- ; row= index
- ; col= index
- ; value= index
- ; rc= index
- ; g_1= h
- ; g_2= h
- ; g_3= k }
+ { l= n_plus_2
+ ; r= n_plus_2
+ ; o= n_plus_2
+ ; z= n_plus_3
+ ; t= five_n_plus_1
+ ; f= n_plus_3
+ ; sigma1= h
+ ; sigma2= h }
-let of_domains {Domains.h; k} ~max_degree : int Dlog_marlin_types.Evals.t =
- let h, k = Domain.(size h, size k) in
- generic ~max_degree (fun x ~f -> f x) ~h ~k
+let of_domains {Domains.h} ~max_degree : int Dlog_plonk_types.Evals.t =
+ let h = Domain.size h in
+ generic ~max_degree (fun x ~f -> f x) ~h
let of_domains_vector domainses =
let open Vector in
let f field = map domainses ~f:(Fn.compose Domain.size field) in
- Vector.(generic map ~h:(f Domains.h) ~k:(f Domains.k))
+ Vector.(generic map ~h:(f Domains.h))
",3
"diff --git a/src/lib/snarky_log/snarky_log.ml b/src/lib/snarky_log/snarky_log.ml @@ -20,10 +20,10 @@ module Constraints (Snarky_backendless : Snark_intf.Basic) = struct
open Snarky_backendless
(** Generate a flamechart for the labels of a checked computation. *)
- let log (t : (_, _) Checked.t) : events =
+ let log ?weight (t : (_, _) Checked.t) : events =
let rev_events = ref [] in
let _total =
- constraint_count t ~log:(fun ?(start = false) label count ->
+ constraint_count ?weight t ~log:(fun ?(start = false) label count ->
rev_events :=
create_event label
~phase:(if start then Measure_start else Measure_end)
",3
"diff --git a/frontend/website-redesign/src/components/SecuredBySection.re b/frontend/website-redesign/src/components/SecuredBySection.re @@ -182,14 +182,14 @@ let make = () => {
<div className=Styles.flexRow>
<span className=Styles.imageColumn>
<img src=""/static/img/AboutBlockProducers.svg"" />
- <h3 className=Theme.Type.h3> {React.string(""XXXX"")} </h3>
+ <h3 className=Theme.Type.h3> {React.string(""100s"")} </h3>
<p className=Theme.Type.label>
{React.string(""Block Producers"")}
</p>
</span>
<span className=Styles.imageColumn>
<img src=""/static/img/AboutSnarkProducers.svg"" />
- <h3 className=Theme.Type.h3> {React.string(""XXXX"")} </h3>
+ <h3 className=Theme.Type.h3> {React.string(""100s"")} </h3>
<p className=Theme.Type.label>
{React.string(""Snark Workers"")}
</p>
",3
"diff --git a/frontend/website-redesign/src/components/TeamGrid.re b/frontend/website-redesign/src/components/TeamGrid.re @@ -65,7 +65,7 @@ let make = () => {
/>
<TeamMember
fullName=""Bijan Shahrokhi""
- title=""Product Manager, O(1) Labs""
+ title=""Head of Product, O(1) Labs""
src=""/static/img/headshots/BijanShahrokhi.jpg""
/>
<TeamMember
",3
"diff --git a/frontend/website-redesign/src/pages/About.re b/frontend/website-redesign/src/pages/About.re @@ -57,7 +57,7 @@ Next.injectGetInitialProps(make, _ => {
{
""include"": 1,
""content_type"": ContentType.TeamProfile.id,
- ""order"": ""-fields.name"",
+ ""order"": ""fields.order"",
},
),
Contentful.getEntries(
",3
"diff --git a/helm/common/templates/_healthchecks.tpl b/helm/common/templates/_healthchecks.tpl @@ -37,7 +37,7 @@ Daemon readiness check settings
readinessProbe:
exec:
command: [
- ""status=$(curl localhost:3085/graphql -d'{ query { daemonStatus { syncStatus } } }'); [[ status == \""synced\"" ]] && return 0 || return 1""
+ ""source /healthcheck/utilities.sh && isDaemonSynced""
]
{{- include ""healthcheck.common.settings"" . | indent 2 }}
{{- end }}
",3
"diff --git a/frontend/leaderboard/src/Sheets.re b/frontend/leaderboard/src/Sheets.re @@ -53,10 +53,10 @@ module Core = {
range: ""All-Time Leaderboard!C4:H"",
}
| CurrentPhaseLeaderboard => {
- name: ""Phase 3 Leaderboard"",
- range: ""Phase 3 Leaderboard!B4:E"",
+ name: ""Adversarial Testnet - Leaderboard"",
+ range: ""Adversarial Testnet - Leaderboard!B4:E"",
}
- | CurrentReleaseLeaderboard => {name: ""3.3"", range: ""3.3!A4:C""}
+ | CurrentReleaseLeaderboard => {name: ""4.1"", range: ""4.1!A4:C""}
| MemberProfileData => {
name: ""Member_Profile_Data"",
range: ""Member_Profile_Data!A2:Z"",
",3
"diff --git a/src/app/rosetta/README.md b/src/app/rosetta/README.md @@ -81,13 +81,13 @@ The Construction API is _not_ validated using `rosetta-cli` as this would requir
### Reproduce agent and rosetta-cli validation
-`gcr.io/o1labs-192920/coda-rosetta:debug-v1.1` and `rosetta-cli @ v0.5.12`
-using this [`rosetta.conf`](https://github.com/CodaProtocol/coda/blob/5625847fa820da3a4d34ef35e013db11fad2ada4/src/app/rosetta/rosetta.conf) and the [`bootstrap_balances.json`](https://github.com/CodaProtocol/coda/blob/5625847fa820da3a4d34ef35e013db11fad2ada4/src/app/rosetta/rosetta.conf) next to it.
+`gcr.io/o1labs-192920/coda-rosetta:debug-v1.1.4` and `rosetta-cli @ v0.5.12`
+using this [`rosetta.conf`](https://github.com/CodaProtocol/coda/blob/2b43c8cccfb9eb480122d207c5a3e6e58c4bbba3/src/app/rosetta/rosetta.conf) and the [`bootstrap_balances.json`](https://github.com/CodaProtocol/coda/blob/2b43c8cccfb9eb480122d207c5a3e6e58c4bbba3/src/app/rosetta/bootstrap_balances.json) next to it.
**Create one of each transaction type and exit**
```
-$ docker run --publish 3087:3087 --publish 3086:3086 --publish 3085:3085 --name coda-rosetta-test --entrypoint ./docker-test-start.sh -d gcr.io/o1labs-192920/coda-rosetta:debug-v1.1
+$ docker run --publish 3087:3087 --publish 3086:3086 --publish 3085:3085 --name coda-rosetta-test --entrypoint ./docker-test-start.sh -d gcr.io/o1labs-192920/coda-rosetta:debug-v1.1.4
$ docker logs --follow coda-rosetta-test
@@ -103,7 +103,7 @@ $ rosetta-cli --configuration-file rosetta.conf check:data
**Run a fast sandbox network forever**
```
-$ docker run --publish 3087:3087 --publish 3086:3086 --publish 3085:3085 --name coda-rosetta --entrypoint ./docker-demo-start.sh -d gcr.io/o1labs-192920/coda-rosetta:debug-v1.1
+$ docker run --publish 3087:3087 --publish 3086:3086 --publish 3085:3085 --name coda-rosetta --entrypoint ./docker-demo-start.sh -d gcr.io/o1labs-192920/coda-rosetta:debug-v1.1.4
$ docker logs --follow coda-rosetta
",3
"diff --git a/helm/seed-node/templates/_healthchecks.tpl b/helm/seed-node/templates/_healthchecks.tpl @@ -21,8 +21,10 @@ seed-node readiness settings
readinessProbe:
exec:
command: [
+ ""/bin/bash"",
+ ""-c"",
""source"",
- ""/healthcheck/utilities.sh && isDaemonSynced""
+ ""/healthcheck/utilities.sh && isDaemonSynced && peerCountGreaterThan 0""
]
{{- end }}
",3
"diff --git a/src/lib/coda_base/rpc_intf.ml b/src/lib/coda_base/rpc_intf.ml @@ -40,7 +40,12 @@ module type Rpc_interface_intf = sig
type ('query, 'response) rpc
type rpc_handler =
- | Rpc_handler : ('q, 'r) rpc * ('q, 'r) rpc_fn -> rpc_handler
+ | Rpc_handler :
+ { rpc: ('q, 'r) rpc
+ ; f: ('q, 'r) rpc_fn
+ ; cost: 'q -> int
+ ; budget: int * [`Per of Time.Span.t] }
+ -> rpc_handler
val implementation_of_rpc : ('q, 'r) rpc -> ('q, 'r) rpc_implementation
",3
"diff --git a/src/app/libp2p_helper/src/libp2p_helper/main.go b/src/app/libp2p_helper/src/libp2p_helper/main.go @@ -702,7 +702,10 @@ func (o *openStreamMsg) run(app *app) (interface{}, error) {
return nil, badRPC(err)
}
- stream, err := app.P2p.Host.NewStream(app.Ctx, peer, protocol.ID(o.ProtocolID))
+ ctx, cancel := context.WithTimeout(app.Ctx, 30*time.Second)
+ defer cancel()
+
+ stream, err := app.P2p.Host.NewStream(ctx, peer, protocol.ID(o.ProtocolID))
if err != nil {
return nil, badp2p(err)
}
",3
"diff --git a/helm/common/templates/_node-selectors.tpl b/helm/common/templates/_node-selectors.tpl @@ -14,9 +14,7 @@ affinity:
- labelSelector:
matchExpressions:
- key: ""cloud.google.com/gke-preemptible""
- operator: In
- values:
- - ""true""
+ operator: Exists
topologyKey: failure-domain.beta.kubernetes.io/region
{{- end }}
{{- end }}
",3
"diff --git a/helm/block-producer/templates/_healthchecks.tpl b/helm/block-producer/templates/_healthchecks.tpl @@ -61,6 +61,8 @@ user-agent readiness check settings
readinessProbe:
exec:
command: [
+ ""/bin/bash"",
+ ""-c"",
""source /healthcheck/utilities.sh && isDaemonSynced && hasSentUserCommandsGreaterThan 0""
]
{{- include ""healthcheck.common.settings"" . | indent 2 }}
@@ -100,6 +102,8 @@ Mina testnet bot readiness check settings
readinessProbe:
exec:
command: [
+ ""/bin/bash"",
+ ""-c"",
""source /healthcheck/utilities.sh && isDaemonSynced && peerCountGreaterThan 0 && ownsFunds""
]
{{- include ""healthcheck.common.settings"" . | indent 2 }}
",3
"diff --git a/src/lib/mina_base/gen/gen.ml b/src/lib/mina_base/gen/gen.ml @@ -20,7 +20,7 @@ let keypairs =
(* This key is also at the start of all the release ledgers. It's needed to generate a valid genesis transition *)
(Keypair.of_private_key_exn
(Private_key.of_base58_check_exn
- ""EKEjf4cZcaUScpV3iAE8r9PaEj4dbPbyUhzWryhhxQqjTTSCfyo8""))
+ ""EKFKgDtU3rcuFTVSEpmpXSkukjmX4cKefYREi6Sdsk7E7wsT7KRw""))
generated_keypairs
let expr ~loc =
",3
"diff --git a/helm/archive-node/Chart.yaml b/helm/archive-node/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2
name: archive-node
description: A Helm chart for Mina Protocol's archive node
type: application
-version: 0.4.3
+version: 0.4.4
appVersion: 1.16.0
dependencies:
- name: postgresql
",3
"diff --git a/helm/common/values.yaml b/helm/common/values.yaml @@ -12,7 +12,7 @@ nodeSelector:
watchman:
enable: false
- image: icalialabs/watchman:latest
- volumeName: watchman-dir
- volumeMountPath: /tmp
- command: ls
+ # image: icalialabs/watchman:latest
+ # volumeName: watchman-dir
+ # volumeMountPath: /tmp
+ # command: ls
",3
"diff --git a/automation/services/coda-network-services/Dockerfile b/automation/services/coda-network-services/Dockerfile @@ -5,7 +5,7 @@ ARG WATCHMAN_DEB_URL=""http://ftp.us.debian.org/debian/pool/main/w/watchman/watch
RUN apt update && apt install -y \
gnupg2 lsb-core apt-transport-https git curl jq wget \
- graphviz dumb-init build-essential python-dev automake autoconf libtool
+ graphviz dumb-init build-essential python-dev automake autoconf libtool pkg-config
# Install GCloud SDK
RUN wget ${GCLOUDSDK_DOWNLOAD_URL} && tar -zxf $(basename ${GCLOUDSDK_DOWNLOAD_URL}) -C /usr/local/
@@ -19,11 +19,11 @@ RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
RUN apt update && apt install -y kubectl
# Install Watchman utility
-RUN cd /tmp && git clone https://github.com/facebook/watchman.git
+RUN cd /tmp && git clone https://github.com/facebook/watchman.git -b v4.9.0 --depth 1
WORKDIR /tmp/watchman
-RUN git checkout v4.7.0 && ./autogen.sh && ./configure --enable-statedir=/tmp
+RUN ./autogen.sh && ./configure --enable-statedir=/tmp
RUN make && make install && mv watchman /usr/local/bin/watchman
ADD ""https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h"" skipcache
",3
"diff --git a/helm/watchdog/templates/watchdog.yaml b/helm/watchdog/templates/watchdog.yaml @@ -24,12 +24,12 @@ spec:
prometheus.io/path: '/metrics'
spec:
containers:
- - name: coda-network-services
+ - name: watchdog
resources:
requests:
memory: 512m
cpu: 1.0
- image: gcr.io/o1labs-192920/coda-network-services:latest
+ image: gcr.io/o1labs-192920/watchdog:latest
command: [""bash""]
args: [""-c"", ""/code/main.sh""]
ports:
",3
"diff --git a/helm/watchdog/templates/watchdog.yaml b/helm/watchdog/templates/watchdog.yaml @@ -15,7 +15,7 @@ spec:
labels:
app: {{ $config.name }}
testnet: {{ $.Values.testnetName }}
- role: block-producer
+ role: watchdog
class: {{ default ""undefined"" $config.class }}
version: {{ trunc 6 (split "":"" $.Values.coda.image)._1 | trimSuffix ""-"" }}
annotations:
",3
"diff --git a/automation/terraform/modules/kubernetes/testnet/helm.tf b/automation/terraform/modules/kubernetes/testnet/helm.tf @@ -269,6 +269,8 @@ resource ""helm_release"" ""archive_node"" {
# Watchdog
resource ""helm_release"" ""watchdog"" {
+ provider = helm.testnet_deploy
+
name = ""${var.testnet_name}-watchdog""
repository = local.use_local_charts ? """" : local.mina_helm_repo
chart = local.use_local_charts ? ""../../../../helm/watchdog"" : ""watchdog""
",3
"diff --git a/buildkite/src/Command/DeployTestnet.dhall b/buildkite/src/Command/DeployTestnet.dhall @@ -27,7 +27,7 @@ let deployEnv = ""DOCKER_DEPLOY_ENV"" in
),
Cmd.run (
-- upload genesis_ledger and related generated json files
- ""cd ~ && buildkite/scripts/buildkite-artifact-helper.sh automation/terraform/testnets/${testnetName}/*.json""
+ ""../../../../buildkite/scripts/buildkite-artifact-helper.sh *.json""
),
Cmd.run (
-- always execute post-deploy operation
",3
"diff --git a/buildkite/src/Command/DeployTestnet.dhall b/buildkite/src/Command/DeployTestnet.dhall @@ -13,9 +13,10 @@ let deployEnv = ""DOCKER_DEPLOY_ENV"" in
Command.build
Command.Config::{
commands = [
- -- create separate workspace based on build branch to isolate infrastructure states
Cmd.run (
- ""cd automation/terraform/testnets/${testnetName} && terraform init && (terraform workspace new \\\${BUILDKITE_BRANCH//_/-} || true)""
+ ""cd automation/terraform/testnets/${testnetName} && terraform init"" ++
+ -- create separate workspace based on build branch to isolate infrastructure states
+ "" && (terraform workspace select \\\${BUILDKITE_BRANCH//_/-} || terraform workspace new \\\${BUILDKITE_BRANCH//_/-})""
),
Cmd.run (
""if [ ! -f ${deployEnv} ]; then "" ++
",3
"diff --git a/helm/watchdog/templates/watchdog.yaml b/helm/watchdog/templates/watchdog.yaml @@ -29,7 +29,7 @@ spec:
cpu: 1.0
image: {{ .Values.image }}
command: [""python3""]
- args: [""/code/prometheus_server.py""]
+ args: [""/code/watchdog.py""]
env:
- name: ""RESTART_EVERY_MINS""
value: {{ .Values.restartEveryMins | quote }}
",3
"diff --git a/automation/terraform/modules/kubernetes/buildkite-agent/helm.tf b/automation/terraform/modules/kubernetes/buildkite-agent/helm.tf @@ -148,8 +148,9 @@ locals {
# upload artifact if explicitly set and exit
if [[ $UPLOAD_PATH ]]; then
- echo ""--- uploading artifact: $${FILE}""
- buildkite-agent artifact upload ""$${FILE}""
+ echo ""--- Uploading artifact: $${FILE}""
+ pushd $(dirname $FILE)
+ buildkite-agent artifact upload ""$(basename $FILE)""; popd
exit
fi
@@ -161,13 +162,16 @@ locals {
set -e
echo ""*** Cache miss -- executing step ***""
bash -c ""$${MISS_CMD}""
- buildkite-agent artifact upload ""$${FILE}""
+
+ echo ""--- Uploading artifact: $${FILE}""
+ pushd $(dirname $FILE)
+ buildkite-agent artifact upload ""$${FILE}""; popd
else
echo ""*** Cache miss -- failing since a miss command was NOT provided ***""
exit 1
fi
else
- echo ""*** Artifact not provided ***""
+ echo ""*** Artifact not provided - skipping ***""
fi
EOF
",3
"diff --git a/automation/terraform/modules/kubernetes/buildkite-agent/helm.tf b/automation/terraform/modules/kubernetes/buildkite-agent/helm.tf @@ -315,7 +315,7 @@ locals {
ln --symbolic --force /docker-entrypoint.d/00-artifact-cache-helper /usr/local/bin/artifact-cache-helper.sh
# Install mina debian package tools
- echo ""deb [trusted=yes] http://packages.o1test.net $deb_repo main"" > /etc/apt/sources.list.d/o1.list
+ echo ""deb [trusted=yes] http://packages.o1test.net unstable main"" > /etc/apt/sources.list.d/o1.list
apt-get update && apt-get install -y ""mina-testnet-postake-medium-curves""
EOF
}
",3
"diff --git a/src/lib/telemetry/telemetry.ml b/src/lib/telemetry/telemetry.ml (* telemetry.ml *)
-open Core_kernel
open Async
let get_telemetry_data_from_peers (net : Mina_networking.t)
- (peer_ids : Network_peer.Peer.Id.t list option) =
+ (peers : Network_peer.Peer.t list option) =
let open Deferred.Let_syntax in
- let run peer_id =
- let open Mina_base.Rpc_intf in
- match%map
- Mina_networking.(
- query_peer net peer_id Mina_networking.Rpcs.Get_telemetry_data ())
- with
- | Failed_to_connect err ->
- Error err
- | Connected envelope -> (
- match Network_peer.Envelope.Incoming.data envelope with
- | Ok response ->
- (* already an Or_error.t *)
- response
- | Error err ->
- Error err )
- in
+ let run peer = Mina_networking.get_peer_telemetry_data net peer in
let%bind peer_ids =
- match peer_ids with
- | Some ids ->
- return ids
+ match peers with
+ | Some ps ->
+ return ps
| None ->
(* use daemon peers *)
- let%bind peers = Mina_networking.peers net in
- Deferred.List.map peers ~f:(fun {peer_id; _} -> return peer_id)
+ Mina_networking.peers net
in
Deferred.List.map ~how:`Parallel peer_ids ~f:run
",3
"diff --git a/src/lib/daemon_rpcs/daemon_rpcs.ml b/src/lib/daemon_rpcs/daemon_rpcs.ml @@ -285,7 +285,7 @@ end
Mina_networking's Get_telemetry_data for each provided peer
*)
module Get_telemetry_data = struct
- type query = Network_peer.Peer.Id.Stable.Latest.t list option
+ type query = Mina_net2.Multiaddr.t list option
[@@deriving bin_io_unversioned]
type response =
",3
"diff --git a/automation/terraform/testnets/zenith/main.tf b/automation/terraform/testnets/zenith/main.tf @@ -100,7 +100,7 @@ module ""testnet_east"" {
agent_send_every_mins = ""1""
archive_node_count = 0
- mina_archive_schema = ""https://raw.githubusercontent.com/MinaProtocol/mina/10fcc9bc4b5aca13a00b80d92507ca21f0f20106/src/app/archive/create_schema.sql""
+ mina_archive_schema = ""https://raw.githubusercontent.com/MinaProtocol/mina/474e314bf6a35adb4976ed7c5b1b68f5c776ad78/src/app/archive/create_schema.sql""
seed_zone = local.seed_zone
seed_region = local.seed_region
",3
"diff --git a/contracts/crowdsale/Crowdsale.sol b/contracts/crowdsale/Crowdsale.sol @@ -77,7 +77,7 @@ contract Crowdsale {
uint256 weiAmount = msg.value;
// calculate token amount to be created
- uint256 tokens = weiAmount.mul(rate);
+ uint256 tokens = getTokenAmount(weiAmount);
// update state
weiRaised = weiRaised.add(weiAmount);
",4
"diff --git a/contracts/crowdsale/CappedCrowdsale.sol b/contracts/crowdsale/CappedCrowdsale.sol @@ -22,14 +22,14 @@ contract CappedCrowdsale is Crowdsale {
// @return true if crowdsale event has ended
function hasEnded() public view returns (bool) {
bool capReached = weiRaised >= cap;
- return super.hasEnded() || capReached;
+ return capReached || super.hasEnded();
}
// overriding Crowdsale#validPurchase to add extra cap logic
// @return true if investors can buy at the moment
function validPurchase() internal view returns (bool) {
bool withinCap = weiRaised.add(msg.value) <= cap;
- return super.validPurchase() && withinCap;
+ return withinCap && super.validPurchase();
}
}
",4
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -385,6 +385,7 @@ a {
.browse-text {
padding:16px 16px 0px 16px;
font-size: 16px;
+ font-weight: 200;
}
.browse-text img, .np-info-text img, .np-info-text-desktop img, .np-info-text-full img, .np-info-text-full-desktop img {
",4
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -20,7 +20,7 @@ function initMediaSessionAudio() {
mediaAudio = document.createElement('audio');
window.removeEventListener('touchend', initMediaSessionAudio);
setTimeout(function () {
- toolbarComponent.updateMediaSession(toolbarComponent.media, true);
+ toolbarComponent.updateMediaSession(toolbarComponent.playerStatus.current, true);
}, 500);
}
}
@@ -34,7 +34,7 @@ function startMediaSession() {
mediaAudio.play().then(_ => {
mediaAudio.currentTime = 0; // Go back to start
mediaAudio.pause();
- toolbarComponent.updateMediaSession(toolbarComponent.media, true);
+ toolbarComponent.updateMediaSession(toolbarComponent.playerStatus.current, true);
navigator.mediaSession.playbackState = /*toolbarComponent.playerStatus && toolbarComponent.playerStatus.isplaying ? ""playing"" :*/ ""paused"";
mediaInterval = setInterval(function() {
mediaAudio.play().then(_ => {
@@ -161,7 +161,7 @@ Vue.component('lms-toolbar', {
data() {
return { songInfo:undefined,
playlist: { count: undefined, duration: undefined, timestamp: undefined },
- playerStatus: { ison: 1, isplaying: false, volume: 0, current: { title:undefined, artist:undefined }, sleepTime: undefined },
+ playerStatus: { ison: 1, isplaying: false, volume: 0, current: { title:undefined, artist:undefined, album:undefined }, sleepTime: undefined },
menuItems: [],
trans:{noplayer:undefined, nothingplaying:undefined, synchronise:undefined, info:undefined, connectionLost:undefined,
switchoff:undefined, switchon:undefined, showLarge:undefined, hideLarge:undefined, startPlayer:undefined},
@@ -227,6 +227,7 @@ Vue.component('lms-toolbar', {
(playerStatus.current.trackartist && playerStatus.current.trackartist!=this.playerStatus.current.artist) ) {
this.playerStatus.current.title=playerStatus.current.title;
this.playerStatus.current.artist=playerStatus.current.artist ? playerStatus.current.artist : playerStatus.current.trackartist;
+ this.playerStatus.current.album=playerStatus.current.album;
if (this.playerStatus.current.title) {
if (this.playerStatus.current.artist) {
@@ -311,14 +312,14 @@ Vue.component('lms-toolbar', {
});
bus.$on('currentCover', function(coverUrl) {
this.media.cover = coverUrl;
- this.updateMediaSession(this.media, true);
+ this.updateMediaSession(this.playerStatus.current, true);
}.bind(this));
bus.$emit('getCurrentCover');
bus.$on('haveLocalAndroidPlayer', function(coverUrl) {
this.updateMediaSession(undefined, true);
}.bind(this));
bus.$on('lsAndNotifChanged', function(coverUrl) {
- this.updateMediaSession(this.media, true);
+ this.updateMediaSession(this.playerStatus.current, true);
}.bind(this));
}
bus.$on('networkStatus', function(connected) {
",4
"diff --git a/MaterialSkin/HTML/material/html/css/classic-skin-mods.css b/MaterialSkin/HTML/material/html/css/classic-skin-mods.css @@ -64,10 +64,14 @@ div#browsedbList {
margin-left:-8px;
margin-bottom:8px;
font-size:16px !important;
- font-weight:400 !important;
+ font-weight:500 !important;
border-radius: 0px;
}
+#choose_setting optgroup {
+ font-weight: 400;
+}
+
#statusMessage {
color:transparent!important;
}
",4
"diff --git a/MaterialSkin/HTML/material/html/js/icon-mapping.js b/MaterialSkin/HTML/material/html/js/icon-mapping.js @@ -111,9 +111,9 @@ function mapIconType(item, app, type) {
item.svg=lmsIcon.split(""MTL_svg_"").pop().split(""."")[0];
return true;
}
- if (lmsIcon.endsWith("".svg.png"")) {
+ if (lmsIcon.endsWith(""_svg.png"")) {
item.image=item.icon=undefined;
- item.svg=lmsIcon.replace("".svg.png"", "".svg"");
+ item.svg=lmsIcon.replace(""_svg.png"", "".svg"");
return true;
}
for (const [key, value] of Object.entries(iconMap[""endsWith""])) {
",4
"diff --git a/MaterialSkin/HTML/material/html/js/sync-dialog.js b/MaterialSkin/HTML/material/html/js/sync-dialog.js @@ -16,6 +16,11 @@ Vue.component('lms-sync-dialog', {
<v-flex xs12>{{i18n(""Select which players you would like to synchronise with '%1':"", player.name)}}</v-flex>
<v-flex xs12>
<v-list class=""sleep-list dialog-main-list"">
+ <v-list-tile @click=""toggleAll()"">
+ <v-list-tile-avatar :tile=""true"" class=""lms-avatar""><v-icon>{{selectAllIcon}}</v-icon></v-list-tile-avatar>
+ <v-list-tile-title class=""sleep-item"">{{i18n('Select All')}}</v-list-tile-title>
+ </v-list-tile>
+ <v-divider></v-divider>
<template v-for=""(p, index) in players"">
<v-list-tile @click=""p.synced=!p.synced; numSync+=(p.synced ? 1 : -1)"">
<v-list-tile-avatar :tile=""true"" class=""lms-avatar""><v-icon>{{p.synced ? 'check_box' : 'check_box_outline_blank'}}</v-icon></v-list-tile-avatar>
@@ -29,9 +34,7 @@ Vue.component('lms-sync-dialog', {
</v-container>
</v-card-text>
<v-card-actions>
- <div style=""width:12px""></div>
- <v-btn flat v-if=""numSync==players.length"" icon @click.native=""toggleAll(false)"" :title=""i18n('Unselect all')""><v-icon>filter_none</v-icon></v-btn>
- <v-btn flat v-else icon @click.native=""toggleAll(true)"" :title=""i18n('Select all')""><v-icon>library_add_check</v-icon></v-btn>
+ <p style=""margin-left:10px"" class=""dimmed"">{{i18np(""1 Player"", ""%1 Players"", numSync)}}</p>
<v-spacer></v-spacer>
<v-btn flat @click.native=""close()"">{{i18n('Cancel')}}</v-btn>
<v-btn flat @click.native=""sync()"">{{i18n('Sync')}}</v-btn>
@@ -48,6 +51,17 @@ Vue.component('lms-sync-dialog', {
numSync:0
}
},
+ computed: {
+ selectAllIcon () {
+ if (this.numSync==this.players.length) {
+ return ""check_box"";
+ }
+ if (this.numSync>0) {
+ return ""indeterminate_check_box"";
+ }
+ return ""check_box_outline_blank"";
+ }
+ },
mounted() {
bus.$on('sync.open', function(player) {
if (player.isgroup) {
@@ -136,7 +150,8 @@ Vue.component('lms-sync-dialog', {
});
}
},
- toggleAll(sel) {
+ toggleAll() {
+ let sel = this.numSync!=this.players.length;
for (let i=0, len=this.players.length; i<len; ++i) {
this.players[i].synced = sel;
}
",4
"diff --git a/config/environment.js b/config/environment.js @@ -7,7 +7,7 @@ module.exports = function(environment) {
rootURL: '/',
routerRootURL: '/',
locationType: 'auto',
- API_HOST: 'http://ember-api-cdn.perf.site.global.prod.fastly.net',
+ API_HOST: 'https://ead-sk.global.ssl.fastly.net',
IS_FASTBOOT: !!process.env.EMBER_CLI_FASTBOOT,
EmberENV: {
EXTEND_PROTOTYPES: false,
",4
"diff --git a/ember-cli-build.js b/ember-cli-build.js @@ -35,14 +35,14 @@ module.exports = function(defaults) {
//TODO move the proxying main site to a variable for testing & dev
app.options['ember-service-worker'] = {
- rootUrl: app.ENV.environment === 'production' ? 'https://emberjs.com/api-new/': '/'
+ rootUrl: app.env.environment === 'production' ? 'https://emberjs.com/api-new/': '/'
};
app.options['esw-cache-first'] = {
patterns: [
- `${app.ENV.API_HOST}/json-docs-1/(.+)`,
- `${app.ENV.API_HOST}/rev-index/(.+)`
+ `${app.env.API_HOST}/json-docs-1/(.+)`,
+ `${app.env.API_HOST}/rev-index/(.+)`
]
};
",4
"diff --git a/config/environment.js b/config/environment.js @@ -24,7 +24,7 @@ module.exports = function(environment) {
// Here you can pass flags/options to your application instance
// when it is created
scrollContainerSelector: 'body, html',
- cdnUrl: process.env.FASTLY_CDN_URL ? `https://process.env.FASTLY_CDN_URL` : ''
+ cdnUrl: process.env.FASTLY_CDN_URL ? `https://${process.env.FASTLY_CDN_URL}` : ''
},
fastboot: {
",4
"diff --git a/package.json b/package.json ""rewire"": "">= 2.1.0"",
""mocha-jenkins-reporter"": "">= 0.1.9"",
""mocha-appveyor-reporter"": "">= 0.2.1"",
- ""mocha-multi"": "">= 0.8.0""
+ ""mocha-multi"": ""~0.11.0""
},
""repository"": {
""type"" : ""git"",
",4
"diff --git a/lib/control-connection.js b/lib/control-connection.js @@ -15,7 +15,7 @@ const f = util.format;
// eslint-disable-next-line prefer-const
let dns = require('dns');
-const selectPeers = ""SELECT peer,data_center,rack,tokens,rpc_address,release_version FROM system.peers"";
+const selectPeers = ""SELECT * FROM system.peers"";
const selectLocal = ""SELECT * FROM system.local WHERE key='local'"";
const newNodeDelay = 1000;
const metadataQueryAbortTimeout = 2000;
",4
"diff --git a/test/test-helper.js b/test/test-helper.js @@ -43,6 +43,7 @@ const cassandraVersionByDse = {
};
const afterNextHandlers = [];
+let testUnhandledError = null;
// Use a afterEach handler at root level
afterEach(async () => {
@@ -52,9 +53,17 @@ afterEach(async () => {
}
});
+afterEach('unhandled check', function () {
+ if (testUnhandledError !== null) {
+ const err = testUnhandledError;
+ testUnhandledError = null;
+ this.test.error(err);
+ }
+});
+
// Add a listener for unhandled rejections and throw the error to exit with 1
process.on('unhandledRejection', reason => {
- throw reason;
+ testUnhandledError = reason;
});
const helper = {
",4
"diff --git a/components/colorpicker/colorpicker.js b/components/colorpicker/colorpicker.js menu = $('<ul id=""colorpicker-menu"" class=""popupmenu colorpicker""></ul>'),
currentTheme = Soho.theme;
- var isBorderAll = (settings.themes[currentTheme].border === 'all'),
- checkmark = settings.themes[currentTheme].checkmark,
+ var isBorderAll = (self.settings.themes[currentTheme].border === 'all'),
+ checkmark = self.settings.themes[currentTheme].checkmark,
checkmarkClass = '';
- for (var i = 0, l = settings.colors.length; i < l; i++) {
+ for (var i = 0, l = self.settings.colors.length; i < l; i++) {
var li = $('<li></li>'),
a = $('<a href=""#""><span class=""swatch""></span></a>').appendTo(li),
- number = settings.colors[i].number,
+ number = self.settings.colors[i].number,
num = parseInt(number, 10),
- text = (Locale.translate(settings.colors[i].label) || settings.colors[i].label) + (settings.colors[i].number || ''),
- value = settings.colors[i].value,
+ text = (Locale.translate(self.settings.colors[i].label) || self.settings.colors[i].label) + (settings.colors[i].number || ''),
+ value = self.settings.colors[i].value,
isBorder = false,
regexp = new RegExp('\\b'+ currentTheme +'\\b'),
elemValue = this.isEditor ? this.element.attr('data-value') : this.element.val();
}
// Set border to this swatch
- if (isBorderAll || regexp.test(settings.colors[i].border)) {
+ if (isBorderAll || regexp.test(self.settings.colors[i].border)) {
isBorder = true;
}
this.swatch.remove();
this.container.find('.trigger').remove();
var input = this.container.find('.colorpicker');
+
+ if (input.data('mask')) {
input.data('mask').destroy();
+ }
+
input.unwrap();
input.removeAttr('data-mask role aria-autocomplete');
},
",4
"diff --git a/publish/package.json b/publish/package.json {
""name"": ""ids-enterprise"",
""slug"": ""ids-enterprise"",
- ""version"": ""4.7.0-dev.20180511"",
+ ""version"": ""4.7.0-dev"",
""description"": ""Infor Design System (IDS) Enterprise Components for the web"",
""repository"": {
""type"": ""git"",
",4
"diff --git a/README.md b/README.md # Infor Design System's Enterprise Components
-[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=MmgvZ2tsa3pydTRlTklvNG9HZGYvMVlwdWRzWklWVWtXNEFFeVJXSG1raz0tLTZuR0J1Nllxd1pOTVJKaE4zRFVYUkE9PQ==--628ff7dc2ecde8982f3a89ad70cdcf252bdd8fba)](https://www.browserstack.com/automate/public-build/MmgvZ2tsa3pydTRlTklvNG9HZGYvMVlwdWRzWklWVWtXNEFFeVJXSG1raz0tLTZuR0J1Nllxd1pOTVJKaE4zRFVYUkE9PQ==--628ff7dc2ecde8982f3a89ad70cdcf252bdd8fba)
+[![BrowserStack Status](https://api.browserstack.com/automate/badge.svg?badge_key=MmgvZ2tsa3pydTRlTklvNG9HZGYvMVlwdWRzWklWVWtXNEFFeVJXSG1raz0tLTZuR0J1Nllxd1pOTVJKaE4zRFVYUkE9PQ==--628ff7dc2ecde8982f3a89ad70cdcf252bdd8fba)](https://www.browserstack.com/automate/public-build/MmgvZ2tsa3pydTRlTklvNG9HZGYvMVlwdWRzWklWVWtXNEFFeVJXSG1raz0tLTZuR0J1Nllxd1pOTVJKaE4zRFVYUkE9PQ==--628ff7dc2ecde8982f3a89ad70cdcf252bdd8fba)
Infor Design System's Enterprise component library is a framework-independent UI library consisting of CSS and JS that provides Infor product development teams, partners, and customers the tools to create user experiences that are approachable, focused, relevant, perceptive.
",4
"diff --git a/scripts/after-release.sh b/scripts/after-release.sh @@ -18,5 +18,5 @@ if [[ ""$RELEASE_TAG"" == ""latest"" ]]; then
echo ""Publishing and Deploying documentation""
echo """"
- node ./scripts/deploy-documentation.js
+ node ./scripts/deploy-documentation.js --site prod
fi
",4
"diff --git a/package.json b/package.json ""dist""
],
""scripts"": {
- ""start"": ""npx grunt clean && npm run build && npm run minify && npm run quickstart"",
+ ""start"": ""npm run clean && npm run build && npm run minify && npm run quickstart"",
""quickstart"": ""npx grunt demo && node app/server.js"",
""quickstart:livereload"": ""npx grunt demo && node app/server.js --livereload"",
""build"": ""node ./scripts/build"",
",4
"diff --git a/test/components/datepicker/datepicker.e2e-spec.js b/test/components/datepicker/datepicker.e2e-spec.js @@ -568,16 +568,15 @@ describe('Datepicker Timeformat Tests', () => {
await datepickerEl.sendKeys(protractor.Key.ARROW_DOWN);
const todayEl = await element(by.css('button.is-today'));
- const testDate = new Date();
- testDate.setSeconds(0);
- testDate.setMilliseconds(0);
await todayEl.click();
const value = await element(by.id('dp3')).getAttribute('value');
+ const valueDate = new Date(value);
- const dateVariances = [-2, -1, 0, 1, 2]
- .map(amt => testDate.setSeconds(testDate.getSeconds() + amt));
+ const testDate = new Date();
+ const allowedVariance = 60000; // milliseconds
+ const dateDiff = Math.abs(testDate - valueDate); // guarentee its a positive result
- expect(dateVariances).toContain(new Date(value).getTime());
+ expect(dateDiff).toBeLessThanOrEqual(allowedVariance);
});
});
",4
"diff --git a/src/components/notification/_notification.scss b/src/components/notification/_notification.scss .notification-text,
.notification-link {
- color: $theme-color-palette-graphite-60;
+ color: inherit;
}
.notification-link {
text-decoration: none;
&:hover {
- color: $theme-color-brand-secondary-contrast;
text-decoration: underline;
}
}
}
.notification-close {
+ color: inherit;
position: absolute;
right: 15px;
top: calc(50% - 18px);
.icon {
- color: $icon-color-fill;
+ color: inherit;
height: 15px;
}
",4
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -4068,6 +4068,9 @@ Datagrid.prototype = {
if (this.element.parent().is('.modal-body')) { // handle on invisible modal
this.elemWidth = this.settings.paging ? 466 : 300; // Default a size for when on modals
+ if (this.element.css('min-width')) {
+ this.elemWidth = parseInt(this.element.css('min-width'));
+ }
this.isInModal = true;
}
",4
"diff --git a/package.json b/package.json ""e2e:local:debug"": ""npm run webdriver:update && npx protractor test/protractor.local.debug.conf.js"",
""e2e:puppeteer"": ""npx --no-install jest --config=test/jest.config.js --runInBand --detectOpenHandles --forceExit"",
""webdriver:clean"": ""npx webdriver-manager clean"",
- ""webdriver:update"": ""npx webdriver-manager update --versions.chrome=94.0.4606.61 --standalone false --quiet --gecko=false"",
+ ""webdriver:update"": ""npx webdriver-manager update --standalone false --quiet --gecko=false"",
""zip-dist"": ""npx grunt zip-dist"",
""documentation"": ""node ./scripts/deploy-documentation.js"",
""release:dev"": ""node scripts/publish-nightly-manual"",
""node-version-check"": ""npx check-node-version --node 12"",
""node-updates-check"": ""npx ncu""
},
- ""chrome-version"": ""94"",
+ ""chrome-version"": ""95"",
""dependencies"": {
""d3"": ""^5.16.0"",
""ids-identity"": ""4.7.10"",
",4
"diff --git a/examples/server/templates/image-file-upload.html b/examples/server/templates/image-file-upload.html @@ -64,8 +64,8 @@ sent through Ajax. The server then moves the previously uploaded copy of that fi
{% endautoescape %}
<p class=""bg-info"">A form accepting files and images without a permanent storage does not make
-much sense. Therefore you normally would create a Django model using an ``models.ImageField``
-and/or ``models.FileField``. From this model, you can create a form as usual. Image and
+much sense. Therefore you normally would create a Django model using an <code>models.ImageField</code>
+and/or <code>models.FileField</code>. From this model, you can create a form as usual. Image and
file fields then are replaced by their AngularJS enabled counterparts, enabling drag & drop and
immediate image preview.<br/>
Some example code is shown in the last tab labeled <strong>Model</strong>.</p>
",4
"diff --git a/djng/forms/angular_base.py b/djng/forms/angular_base.py @@ -52,7 +52,6 @@ class TupleErrorList(UserList, list):
5: The desired error message. If this contains the magic word '$message' it will be added with
``ng-bind`` rather than rendered inside the list item.
""""""
- ul_format = '<ul class=""{1}"" ng-show=""{0}.{2}"" ng-cloak>{3}</ul>'
li_format = '<li ng-show=""{0}.{1}"" class=""{2}"">{3}</li>'
li_format_bind = '<li ng-show=""{0}.{1}"" class=""{2}"" ng-bind=""{0}.{3}""></li>'
@@ -104,8 +103,11 @@ class TupleErrorList(UserList, list):
err_tuple = (e[0], e[3], e[4], force_text(e[5]))
error_lists[e[2]].append(format_html(li_format, *err_tuple))
# renders and combine both of these lists
- return mark_safe(''.join([format_html(self.ul_format, first[0], first[1], prop,
- mark_safe(''.join(list_items))) for prop, list_items in error_lists.items()]))
+ dirty_errors = format_html('<ul ng-show=""{0}.$dirty && {0}.$touched"" class=""{1}"" ng-cloak>{2}</ul>',
+ first[0], first[1], mark_safe(''.join(error_lists['$dirty'])))
+ pristine_errors = format_html('<ul ng-show=""{0}.$pristine"" class=""{1}"" ng-cloak>{2}</ul>',
+ first[0], first[1], mark_safe(''.join(error_lists['$pristine'])))
+ return format_html('{}{}', dirty_errors, pristine_errors)
return format_html('<ul class=""errorlist"">{0}</ul>',
format_html_join('', '<li>{0}</li>', ((force_text(e),) for e in self)))
",4
"diff --git a/client/src/js/djng-forms-set.js b/client/src/js/djng-forms-set.js @@ -42,34 +42,14 @@ djngModule.directive('form', ['$timeout', function($timeout) {
if (!attrs.name)
throw new Error(""Each <form> embedded inside a <djng-forms-set> must identify itself by name."")
- element.find('input').on('keyup change', function() {
- // delay until validation is ready
- $timeout(reduceValidation);
- });
- element.find('select').on('change', function() {
- $timeout(reduceValidation);
- });
- element.find('textarea').on('blur', function() {
- $timeout(reduceValidation);
- });
-
- element.on('$destroy', function() {
- element.find('input').off('keyup change');
- element.find('select').off('keyup change');
- element.find('textarea').off('blur');
- });
-
- // delay first evaluation until form is fully validated
- $timeout(reduceValidation);
-
// check each child form's $valid state and reduce it to one single state `formsSetController.setIsValid`
- function reduceValidation() {
+ scope.$watch(attrs.name + '.$valid', function reduceValidation() {
formsSetController.digestValidatedForms[formController.$name] = formController.$valid;
formsSetController.setIsValid = true;
angular.forEach(formsSetController.digestValidatedForms, function(validatedForm) {
formsSetController.setIsValid = formsSetController.setIsValid && validatedForm;
});
- }
+ });
}
};
",4
"diff --git a/rollup.config.js b/rollup.config.js @@ -42,14 +42,16 @@ const umdConf = {
paths: d3Modules
};
-const umdMinConf = Object.assign({}, umdConf, {file: 'dist/dc.min.js'});
+const umdMinConf = Object.assign({}, umdConf, {
+ file: 'dist/dc.min.js',
+ plugins: [terser()]
+});
export default [
{
input: 'src/index-with-version.js',
external: Object.keys(d3Modules),
plugins: [
- terser(),
jsonPlugin,
licensePlugin
],
",4
"diff --git a/lib/services/billingManagement/README.md b/lib/services/billingManagement/README.md @@ -19,7 +19,7 @@ npm install azure-arm-billing
```javascript
const msRestAzure = require('ms-rest-azure');
- const BillingManagement = require(""azure-arm-billing"");
+ const BillingManagementClient = require(""azure-arm-billing"");
// Interactive Login
// It provides a url and code that needs to be copied and pasted in a browser and authenticated over there. If successful,
",4
"diff --git a/src/wmr-middleware.js b/src/wmr-middleware.js import { resolve, dirname, sep, posix } from 'path';
-import { promises as fs, fs as syncFS } from 'fs';
+import syncFS, { promises as fs } from 'fs';
import chokidar from 'chokidar';
import mime from 'mime/lite.js';
import htmPlugin from './plugins/htm-plugin.js';
",4
"diff --git a/src/plugins/process-global-plugin.js b/src/plugins/process-global-plugin.js @@ -30,7 +30,7 @@ export default function processGlobalPlugin({ NODE_ENV = 'development' } = {}) {
// if that wasn't the only way `process.env` was referenced...
if (code.match(/[^a-zA-Z0-9]process\.env/)) {
// hack: avoid injecting imports into commonjs modules
- if (/^import[\s{]|^export\s\w/gm.test(code)) {
+ if (/^\s*(import|export)[\s{]/gm.test(code)) {
code = `import process from '\0builtins:process.js';${code}`;
} else {
code = `var process=${processObj};${code}`;
",4
"diff --git a/src/plugins/htm-plugin.js b/src/plugins/htm-plugin.js @@ -50,8 +50,8 @@ export default function htmPlugin({ include, production = true } = {}) {
import: {
module: 'htm/preact'
},
- // @TODO: enable this to avoid a likely variable collision:
- // tag: '$$html',
+ // avoid a variable collisions:
+ tag: '$$html',
terse: true
}
]
",4
"diff --git a/packages/wmr/test/production.test.js b/packages/wmr/test/production.test.js @@ -241,17 +241,17 @@ describe('production', () => {
const main = await fs.readFile(path.join(env.tmp.path, 'dist', roots[2]), 'utf8');
// https://cdn.example.com/assets/math.d41e7373.css
- expect(math.includes(`(""https://cdn.example.com/assets/${assets[1]}"")`)).toBe(true);
- expect(math.includes(`import(""./${chunks[0]}"")`)).toBe(true);
+ expect(math).toMatch(`(""https://cdn.example.com/assets/${assets[1]}"")`);
+ expect(math).toMatch(`import(""./${chunks[0]}"")`);
// (preload) https://cdn.example.com/assets/math.d41e7373.css
- expect(main.includes(`$w_s$(""https://cdn.example.com/assets/${assets[1]}"")`)).toBe(true);
+ expect(main).toMatch(`$w_s$(""https://cdn.example.com/assets/${assets[1]}"")`);
// HTML stylesheet: https://cdn.example.com/assets/index.0544f0a6.css
- expect(html.includes(`href=""https://cdn.example.com/assets/${assets[0]}""`)).toBe(true);
+ expect(html).toMatch(`href=""https://cdn.example.com/assets/${assets[0]}""`);
// HTML script: https://cdn.example.com/assets/index.0544f0a6.css
- expect(html.includes(`src=""https://cdn.example.com/${roots[2]}""`)).toBe(true);
+ expect(html).toMatch(`src=""https://cdn.example.com/${roots[2]}""`);
});
it('should respect `config.publicPath` value (ts)', async () => {
@@ -278,17 +278,17 @@ describe('production', () => {
const main = await fs.readFile(path.join(env.tmp.path, 'dist', roots[2]), 'utf8');
// https://cdn.example.com/assets/math.d41e7373.css
- expect(math.includes(`(""https://cdn.example.com/assets/${assets[1]}"")`)).toBe(true);
- expect(math.includes(`import(""./${chunks[0]}"")`)).toBe(true);
+ expect(math).toMatch(`(""https://cdn.example.com/assets/${assets[1]}"")`);
+ expect(math).toMatch(`import(""./${chunks[0]}"")`);
// (preload) https://cdn.example.com/assets/math.d41e7373.css
- expect(main.includes(`$w_s$(""https://cdn.example.com/assets/${assets[1]}"")`)).toBe(true);
+ expect(main).toMatch(`$w_s$(""https://cdn.example.com/assets/${assets[1]}"")`);
// HTML stylesheet: https://cdn.example.com/assets/index.0544f0a6.css
- expect(html.includes(`href=""https://cdn.example.com/assets/${assets[0]}""`)).toBe(true);
+ expect(html).toMatch(`href=""https://cdn.example.com/assets/${assets[0]}""`);
// HTML script: https://cdn.example.com/assets/index.0544f0a6.css
- expect(html.includes(`src=""https://cdn.example.com/${roots[2]}""`)).toBe(true);
+ expect(html).toMatch(`src=""https://cdn.example.com/${roots[2]}""`);
});
});
",4
"diff --git a/index.js b/index.js @@ -40,6 +40,7 @@ function Peer (opts) {
self.initiator = opts.initiator || false
self.channelConfig = opts.channelConfig || Peer.channelConfig
self.config = opts.config || Peer.config
+ self.config.iceServers = self.config.iceServers || Peer.config.iceServers
self.constraints = self._transformConstraints(opts.constraints || Peer.constraints)
self.offerConstraints = self._transformConstraints(opts.offerConstraints || {})
self.answerConstraints = self._transformConstraints(opts.answerConstraints || {})
",4
"diff --git a/index.js b/index.js @@ -39,8 +39,7 @@ function Peer (opts) {
self.initiator = opts.initiator || false
self.channelConfig = opts.channelConfig || Peer.channelConfig
- self.config = opts.config || Peer.config
- self.config.iceServers = self.config.iceServers || Peer.config.iceServers
+ self.config = Object.assign({}, Peer.config, opts.config)
self.constraints = self._transformConstraints(opts.constraints || Peer.constraints)
self.offerConstraints = self._transformConstraints(opts.offerConstraints || {})
self.answerConstraints = self._transformConstraints(opts.answerConstraints || {})
",4
"diff --git a/packages/razzle-dev-utils/webpackHotDevClient.js b/packages/razzle-dev-utils/webpackHotDevClient.js @@ -27,7 +27,7 @@ ErrorOverlay.startReportingRuntimeErrors({
launchEditorEndpoint: url.format({
protocol: window.location.protocol,
hostname: window.location.hostname,
- port: parseInt(process.env.PORT, 10) + 1 || window.location.port,
+ port: parseInt(process.env.PORT || window.location.port, 10) + 1,
pathname: launchEditorEndpoint,
}),
onError: function() {
@@ -48,7 +48,7 @@ var connection = new SockJS(
url.format({
protocol: window.location.protocol,
hostname: window.location.hostname,
- port: parseInt(process.env.PORT, 10) + 1 || window.location.port,
+ port: parseInt(process.env.PORT || window.location.port, 10) + 1,
// Hardcoded in WebpackDevServer
pathname: '/sockjs-node',
})
",4
"diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx @@ -127,7 +127,6 @@ class Blocks extends React.Component {
if (this.props.vm.editingTarget && !this.state.workspaceMetrics[this.props.vm.editingTarget.id]) {
this.onWorkspaceMetricsChange();
}
-
this.ScratchBlocks.Events.disable();
this.workspace.clear();
@@ -152,6 +151,7 @@ class Blocks extends React.Component {
}
handlePromptCallback (data) {
this.state.prompt.callback(data);
+ this.props.vm.createVariable(data);
this.handlePromptClose();
}
handlePromptClose () {
",4
"diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx @@ -225,7 +225,8 @@ Blocks.propTypes = {
insertionMarkerOpacity: PropTypes.number,
fieldShadow: PropTypes.string,
dragShadowOpacity: PropTypes.number
- })
+ }),
+ comments: PropTypes.bool
}),
vm: PropTypes.instanceOf(VM).isRequired
};
@@ -252,7 +253,8 @@ Blocks.defaultOptions = {
insertionMarkerOpacity: 0.2,
fieldShadow: 'rgba(255, 255, 255, 0.3)',
dragShadowOpacity: 0.6
- }
+ },
+ comments: false
};
Blocks.defaultProps = {
",4
"diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx @@ -57,7 +57,7 @@ class Blocks extends React.Component {
this.workspace = this.ScratchBlocks.inject(this.blocks, workspaceConfig);
// Load the toolbox from the GUI (otherwise we get the scratch-blocks default toolbox)
- this.workspace.updateToolbox(makeToolboxXML());
+ this.workspace.updateToolbox(this.props.toolboxXML);
// @todo change this when blockly supports UI events
addFunctionListener(this.workspace, 'translate', this.onWorkspaceMetricsChange);
",4
"diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx @@ -76,14 +76,11 @@ class Blocks extends React.Component {
if (prevProps.toolboxXML !== this.props.toolboxXML) {
const selectedCategoryName = this.workspace.toolbox_.getSelectedItem().name_;
this.workspace.updateToolbox(this.props.toolboxXML);
- // Blockly throws if we don't select a category after updating the toolbox.
- /** @TODO Find a way to avoid the exception without accessing private properties. */
- this.setToolboxSelectedItemByName(selectedCategoryName);
+ this.workspace.toolbox_.setSelectedCategoryByName(selectedCategoryName);
}
if (this.props.isVisible === prevProps.isVisible) {
return;
}
-
// @todo hack to resize blockly manually in case resize happened while hidden
// @todo hack to reload the workspace due to gui bug #413
if (this.props.isVisible) { // Scripts tab
@@ -99,20 +96,6 @@ class Blocks extends React.Component {
this.detachVM();
this.workspace.dispose();
}
- /**
- * Select a particular category in the toolbox by specifying the category name.
- * This is a workaround for a bug: @see {@link componentDidUpdate} above.
- * @TODO Remove this or reimplement using only public APIs.
- * @param {string} name - the name of the category to select.
- */
- setToolboxSelectedItemByName (name) {
- const categories = this.workspace.toolbox_.categoryMenu_.categories_;
- for (let i = 0; i < categories.length; i++) {
- if (categories[i].name_ === name) {
- this.workspace.toolbox_.setSelectedItem(categories[i]);
- }
- }
- }
attachVM () {
this.workspace.addChangeListener(this.props.vm.blockListener);
this.flyoutWorkspace = this.workspace
",4
"diff --git a/src/lib/make-toolbox-xml.js b/src/lib/make-toolbox-xml.js @@ -112,12 +112,12 @@ const motion = `
</block>
<block type=""motion_gotoxy"">
<value name=""X"">
- <shadow type=""math_number"">
+ <shadow id=""movex"" type=""math_number"">
<field name=""NUM"">0</field>
</shadow>
</value>
<value name=""Y"">
- <shadow type=""math_number"">
+ <shadow id=""movey"" type=""math_number"">
<field name=""NUM"">0</field>
</shadow>
</value>
@@ -135,12 +135,12 @@ const motion = `
</shadow>
</value>
<value name=""X"">
- <shadow type=""math_number"">
+ <shadow id=""glidex"" type=""math_number"">
<field name=""NUM"">0</field>
</shadow>
</value>
<value name=""Y"">
- <shadow type=""math_number"">
+ <shadow id=""glidey"" type=""math_number"">
<field name=""NUM"">0</field>
</shadow>
</value>
@@ -165,7 +165,7 @@ const motion = `
</block>
<block type=""motion_setx"">
<value name=""X"">
- <shadow type=""math_number"">
+ <shadow id=""setx"" type=""math_number"">
<field name=""NUM"">0</field>
</shadow>
</value>
@@ -179,7 +179,7 @@ const motion = `
</block>
<block type=""motion_sety"">
<value name=""Y"">
- <shadow type=""math_number"">
+ <shadow id=""sety"" type=""math_number"">
<field name=""NUM"">0</field>
</shadow>
</value>
",4
"diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx @@ -172,13 +172,11 @@ class Blocks extends React.Component {
this.onWorkspaceMetricsChange();
}
- this.ScratchBlocks.Events.disable();
- this.workspace.clear();
-
+ // Remove and reattach the workspace listener (but allow flyout events)
+ this.workspace.removeChangeListener(this.props.vm.blockListener);
const dom = this.ScratchBlocks.Xml.textToDom(data.xml);
- this.ScratchBlocks.Xml.domToWorkspace(dom, this.workspace);
- this.ScratchBlocks.Events.enable();
- this.workspace.toolbox_.refreshSelection();
+ this.ScratchBlocks.Xml.clearWorkspaceAndLoadFromXml(dom, this.workspace);
+ this.workspace.addChangeListener(this.props.vm.blockListener);
if (this.props.vm.editingTarget && this.state.workspaceMetrics[this.props.vm.editingTarget.id]) {
const {scrollX, scrollY, scale} = this.state.workspaceMetrics[this.props.vm.editingTarget.id];
",4
"diff --git a/src/containers/sound-tab.jsx b/src/containers/sound-tab.jsx @@ -52,20 +52,18 @@ class SoundTab extends React.Component {
render () {
const {
- editingTarget,
- sprites,
- stage,
+ vm,
onNewSoundFromLibraryClick,
onNewSoundFromRecordingClick
} = this.props;
- const target = editingTarget && sprites[editingTarget] ? sprites[editingTarget] : stage;
+ const sprite = vm.editingTarget.sprite;
- if (!target) {
+ if (!sprite) {
return null;
}
- const sounds = target.sounds ? target.sounds.map(sound => (
+ const sounds = sprite.sounds ? sprite.sounds.map(sound => (
{
url: soundIcon,
name: sound.name
@@ -106,7 +104,7 @@ class SoundTab extends React.Component {
onDeleteClick={this.handleDeleteSound}
onItemClick={this.handleSelectSound}
>
- {editingTarget && target.sounds && target.sounds.length > 0 ? (
+ {sprite.sounds && sprite.sounds.length > 0 ? (
<SoundEditor soundIndex={this.state.selectedSoundIndex} />
) : null}
{this.props.soundRecorderVisible ? (
",4
"diff --git a/package.json b/package.json ""scratch-paint"": ""0.2.0-prerelease.20180410152401"",
""scratch-render"": ""0.1.0-prerelease.1523453612"",
""scratch-storage"": ""0.4.0"",
- ""scratch-vm"": ""0.1.0-prerelease.1524239914"",
+ ""scratch-vm"": ""0.1.0-prerelease.1524239808"",
""selenium-webdriver"": ""3.6.0"",
""startaudiocontext"": ""1.2.1"",
""style-loader"": ""^0.20.0"",
",4
"diff --git a/src/lib/project-loader-hoc.jsx b/src/lib/project-loader-hoc.jsx @@ -44,7 +44,7 @@ const ProjectLoaderHOC = function (WrappedComponent) {
analytics.event({
category: 'project',
action: 'Load Project',
- value: projectId,
+ label: projectId,
nonInteraction: true
});
}
",4
"diff --git a/renovate.json b/renovate.json {
- ""extends"": [
- ""config:base""
- ]
+ ""extends"": [""config:base""],
+ ""reviewers"": [""spences10""],
+ ""bumpVersion"": ""patch"",
+ ""baseBranches"": [""patch""],
+ ""automerge"": true,
+ ""major"": {
+ ""automerge"": false
+ },
+ ""lockFileMaintenance"": {
+ ""enabled"": true,
+ ""extends"": ""schedule:weekly""
+ }
}
",4
"diff --git a/sheets/graphcool.md b/sheets/graphcool.md @@ -45,6 +45,7 @@ Force local changes remotely resulting in potential data loss
graphcool push --force project.graphcool
```
-How to download the GraphQL SDL (schema definition language)
+[How to download the GraphQL SDL (schema definition language)]
+[how to download the graphql sdl (schema definition language)]:
https://www.graph.cool/docs/faq/graphql-how-to-download-graphql-sdl-schema-maiv5eekan/
",4
"diff --git a/docker/scripts/run.sh b/docker/scripts/run.sh @@ -17,10 +17,9 @@ function build_docker_image {
fi
}
-NODE_V=$(node -v | grep -o ""v."")
-
IMAGES_BASE_PATH=""./docker/images""
-if [ -n ""$TRAVIS_TAG"" ] && [ ""$NODE_V"" = ""v8"" ]; then
+EXTRACTED_TAG=$(echo $TRAVIS_TAG | grep -o ""[0-9]\+.[0-9]\+.[0-9]\+"")
+if [ -n ""$TRAVIS_TAG"" ] && [ ""$TRAVIS_TAG"" = ""$EXTRACTED_TAG"" ] && [ ""$TRAVIS_NODE_VERSION"" = ""8"" ]; then
for image in $IMAGES_BASE_PATH/*; do
if [ -d ""${image}"" ] && [ -f ""${image}/Dockerfile"" ]; then
cp ""${image}/Dockerfile"" .
",4
"diff --git a/packages/core/app/styles/navi-core/variables/colors.less b/packages/core/app/styles/navi-core/variables/colors.less @navi-lightest-gray: @navi-gray-200;
@navi-dark-gray: @navi-gray-800;
@navi-blue: #198fff;
+@navi-blue-500: #0066DF;
@navi-blue-900: #020E65;
@navi-gold: #ffc831;
@navi-red-400: #F16869;
@navi-form-error-border: @navi-red;
@navi-notification-success-background-color: #00b777;
-@navi-notification-info-background-color: @navi-blue;
+@navi-notification-info-background-color: @navi-blue-500;
@navi-notification-failure-background-color: @navi-red-400;
@navi-disabled-element-background-color: @navi-gray-200;
",4
"diff --git a/src/components/basics/SocialGraph.js b/src/components/basics/SocialGraph.js @@ -4,7 +4,8 @@ import Helmet from 'react-helmet';
export default function SocialGraph({ title, desc, url, image }) {
return (
- <Helmet title={title} meta={[{ name: 'description', content: desc }]}>
+ <Helmet title={title}>
+ <meta name=""description"" content={desc} />
{url && <meta property=""og:url"" content={url} />}
{image && <meta property=""og:image"" content={image} />}
{image && <meta name=""twitter:image"" content={image} />}
",4
"diff --git a/src/components/layout/DocsLayout.js b/src/components/layout/DocsLayout.js @@ -187,7 +187,7 @@ function DocsLayout({ children, data, pageContext, ...props }) {
<>
<GlobalStyle />
<Helmet>
- <link rel=""canonical"" href={`${homepageUrl}${buildPathWithFramework(slug, 'react')}/`} />
+ <link rel=""canonical"" href={`${homepageUrl}${buildPathWithFramework(slug, framework)}/`} />
<meta name=""docsearch:framework"" content={framework} />
<link
rel=""stylesheet""
",4
"diff --git a/src/components/screens/IndexScreen/StorybookDemo/HeroDemo.tsx b/src/components/screens/IndexScreen/StorybookDemo/HeroDemo.tsx @@ -29,10 +29,19 @@ const Wrapper = styled(motion.div)`
width: 100%;
height: 0;
padding-bottom: 69.10907577%;
- overflow: hidden;
- filter: drop-shadow(0px 1px 3px rgba(0, 0, 0, 0.1)) drop-shadow(0px 10px 20px rgba(0, 0, 0, 0.1))
- drop-shadow(0px 20px 40px rgba(0, 0, 0, 0.05)) drop-shadow(0px 40px 30px rgba(0, 0, 0, 0.05));
+ &:after {
+ content: '';
+ position: absolute;
+ top: 0;
+ right: 0;
+ left: 0;
+ bottom: 0;
+ border-radius: 8px;
+
+ box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.1), 0px 10px 20px 0px rgba(0, 0, 0, 0.1),
+ 0px 20px 40px 0px rgba(0, 0, 0, 0.05), 0px 40px 30px 0px rgba(0, 0, 0, 0.05);
+ }
@media (min-width: ${breakpoints[1]}px) {
margin-top: -12.625rem;
",4
"diff --git a/src/lib/coda_base/sparse_ledger.ml b/src/lib/coda_base/sparse_ledger.ml @@ -119,7 +119,8 @@ let apply_fee_transfer_exn =
fun t transfer ->
List.fold (Fee_transfer.to_list transfer) ~f:apply_single ~init:t
-let apply_coinbase_exn t ({proposer; fee_transfer} : Coinbase.t) =
+let apply_coinbase_exn t
+ ({proposer; fee_transfer; amount= coinbase_amount} : Coinbase.t) =
let open Currency in
let add_to_balance t pk amount =
let idx = find_index_exn t pk in
@@ -129,13 +130,10 @@ let apply_coinbase_exn t ({proposer; fee_transfer} : Coinbase.t) =
in
let proposer_reward, t =
match fee_transfer with
- | None -> (Protocols.Coda_praos.coinbase_amount, t)
+ | None -> (coinbase_amount, t)
| Some (receiver, fee) ->
let fee = Amount.of_fee fee in
- let reward =
- Amount.sub Protocols.Coda_praos.coinbase_amount fee
- |> Option.value_exn
- in
+ let reward = Amount.sub coinbase_amount fee |> Option.value_exn in
(reward, add_to_balance t receiver fee)
in
add_to_balance t proposer proposer_reward
",4
"diff --git a/src/app/cli/src/coda.ml b/src/app/cli/src/coda.ml @@ -110,8 +110,8 @@ let daemon log =
Core.printf ""Starting background coda daemon. (Log Dir: %s)\n%!""
conf_dir ;
Daemon.daemonize
- ~redirect_stdout:(`File_append (conf_dir ^/ ""coda.stdout""))
- ~redirect_stderr:(`File_append (conf_dir ^/ ""coda.stderr""))
+ ~redirect_stdout:(`File_append (conf_dir ^/ ""coda.log""))
+ ~redirect_stderr:(`File_append (conf_dir ^/ ""coda.log""))
() ;
Deferred.return conf_dir )
else Sys.home_directory () >>| compute_conf_dir
",4
"diff --git a/src/app/cli/src/coda.ml b/src/app/cli/src/coda.ml @@ -284,7 +284,12 @@ let daemon log =
in
let module M = Coda_main.Make_coda (Init) in
let module Run = Run (Config0) (M) in
- Async.Scheduler.report_long_cycle_times ~cutoff:(sec 0.5) () ;
+ Stream.iter
+ (Async.Scheduler.long_cycles
+ ~at_least:(sec 0.5 |> Time_ns.Span.of_span))
+ ~f:(fun span ->
+ Logger.warn log ""long async cycle %s"" (Time_ns.Span.to_string span)
+ ) ;
let%bind () =
let open M in
let run_snark_worker_action =
",4
"diff --git a/dockerfiles/Dockerfile-coda-demo b/dockerfiles/Dockerfile-coda-demo @@ -35,7 +35,7 @@ RUN echo ""deb [trusted=yes] http://packages.o1test.net $deb_repo main"" > /etc/ap
&& echo '4vsRCVMNTrCx4NpN6kKTkFKLcFN4vXUP5RB9PqSZe1qsyDs4AW5XeNgAf16WUPRBCakaPiXcxjp6JUpGNQ6fdU977x5LntvxrSg11xrmK6ZDaGSMEGj12dkeEpyKcEpkzcKwYWZ2Yf2vpwQP' > ~/.coda-config/wallets/store/4vsRCVMNTrCx4NpN6kKTkFKLcFN4vXUP5RB9PqSZe1qsyDs4AW5XeNgAf16WUPRBCakaPiXcxjp6JUpGNQ6fdU977x5LntvxrSg11xrmK6ZDaGSMEGj12dkeEpyKcEpkzcKwYWZ2Yf2vpwQP.pub \
&& cp /root/keys/demo-block-producer ~/.coda-config/wallets/store/4vsRCVMNTrCx4NpN6kKTkFKLcFN4vXUP5RB9PqSZe1qsyDs4AW5XeNgAf16WUPRBCakaPiXcxjp6JUpGNQ6fdU977x5LntvxrSg11xrmK6ZDaGSMEGj12dkeEpyKcEpkzcKwYWZ2Yf2vpwQP \
&& rm /var/lib/coda/coda_genesis_* \
- && echo '[{""pk"":""4vsRCVMNTrCx4NpN6kKTkFKLcFN4vXUP5RB9PqSZe1qsyDs4AW5XeNgAf16WUPRBCakaPiXcxjp6JUpGNQ6fdU977x5LntvxrSg11xrmK6ZDaGSMEGj12dkeEpyKcEpkzcKwYWZ2Yf2vpwQP"",""balance"":""0.000100000"",""sk"":null,""delegate"":null}]' > /genesis-accounts.json \
+ && echo '[{""pk"":""4vsRCVMNTrCx4NpN6kKTkFKLcFN4vXUP5RB9PqSZe1qsyDs4AW5XeNgAf16WUPRBCakaPiXcxjp6JUpGNQ6fdU977x5LntvxrSg11xrmK6ZDaGSMEGj12dkeEpyKcEpkzcKwYWZ2Yf2vpwQP"",""balance"":""66000"",""sk"":null,""delegate"":null}]' > /genesis-accounts.json \
&& coda-create-genesis -genesis-dir /var/lib/coda -account-file /genesis-accounts.json
",4
"diff --git a/buildkite/src/Jobs/ArchiveNode.dhall b/buildkite/src/Jobs/ArchiveNode.dhall @@ -45,7 +45,7 @@ Pipeline.build
, key = ""build-client-sdk""
, target = Size.Large
, docker = None Docker.Type
- , artifact_paths = [ S.strictlyStart ""/var/buildkite/test_output"" ]
+ , artifact_paths = [ S.contains ""/var/buildkite/test_output"" ]
}
]
}
\ No newline at end of file
",4
"diff --git a/src/app/rosetta/docker-test-start.sh b/src/app/rosetta/docker-test-start.sh @@ -37,13 +37,13 @@ sleep 3
sleep 3
# Setup and run demo-node
-PK=ZsMSUuKL9zLAF7sMn951oakTFRCCDw9rDfJgqJ55VMtPXaPa5vPwntQRFJzsHyeh8R8
+PK=B62qrPN5Y5yq8kGE3FbVKbGTdTAJNdtNtB5sNVpxyRwWGcDEhpMzc8g
genesis_time=$(date -d '2019-01-30 20:00:00.000000Z' '+%s')
now_time=$(date +%s)
export CODA_TIME_OFFSET=$(( $now_time - $genesis_time ))
export CODA_PRIVKEY_PASS=""""
export CODA_CONFIG_FILE=/root/.coda-config/config.json
-echo '{""box_primitive"":""xsalsa20poly1305"",""pw_primitive"":""argon2i"",""nonce"":""7UMMcQYuXzDWx3zv4HyCxkk9JvUyiWrP6Rje12a"",""pwsalt"":""Ac6n4NVqq2BvnqbmGfYzrZSSRFMe"",""pwdiff"":[134217728,6],""ciphertext"":""mzkgEY94mo27CycKXyMhJqAZTRniUiEAWEbj2PA1zDe5hmJqHic4zwdg5tavr9Mcdt6qisT64QMQux8P7ASG8""}' > /root/.coda-config/demo-block-producer-key
+echo '{""box_primitive"":""xsalsa20poly1305"",""pw_primitive"":""argon2i"",""nonce"":""8jGuTAxw3zxtWasVqcD1H6rEojHLS1yJmG3aHHd"",""pwsalt"":""AiUCrMJ6243h3TBmZ2rqt3Voim1Y"",""pwdiff"":[134217728,6],""ciphertext"":""DbAy736GqEKWe9NQWT4yaejiZUo9dJ6rsK7cpS43APuEf5AH1Qw6xb1s35z8D2akyLJBrUr6m""}' > /root/.coda-config/demo-block-producer-key
/coda-bin/cli/src/coda.exe daemon \
-seed \
",4
"diff --git a/src/lib/snark_worker/functor.ml b/src/lib/snark_worker/functor.ml @@ -158,12 +158,19 @@ module Make (Inputs : Intf.Inputs_intf) :
k ()
in
let rec go () =
- let daemon_address =
- match Sys.getenv ""SNARK_COORDINATOR"" with
- | None ->
- daemon_address
- | Some s -> (
- try Host_and_port.of_string s with _ -> daemon_address )
+ let%bind daemon_address =
+ let%bind cwd = Sys.getcwd () in
+ [%log debug]
+ !""Snark worker working directory $dir""
+ ~metadata:[(""dir"", `String cwd)] ;
+ let path = ""snark_coordinator"" in
+ match%bind Sys.file_exists path with
+ | `Yes -> (
+ let%map s = Reader.file_contents path in
+ try Host_and_port.of_string (String.strip s)
+ with _ -> daemon_address )
+ | `No | `Unknown ->
+ return daemon_address
in
match%bind
dispatch Rpcs_versioned.Get_work.Latest.rpc shutdown_on_disconnect ()
",4
"diff --git a/src/lib/random_oracle/random_oracle.ml b/src/lib/random_oracle/random_oracle.ml @@ -25,34 +25,21 @@ module Input = Random_oracle_input
let params : Field.t Sponge.Params.t =
Sponge.Params.(map tweedle_q ~f:Field.of_string)
-(* TODO: Unify with Bn382_inputs in the sponge lib *)
-module Inputs = struct
- module Field = Field
-
- let rounds_full = 8
-
- let rounds_partial = 30
-
[%%ifdef
consensus_mechanism]
- (* Computes x^17 *)
- let to_the_alpha x =
- let open Field in
- let res = square x in
- let open Pickles.Backend.Tick.Field in
- Mutable.square res ;
- (* x^4 *)
- Mutable.square res ;
- (* x^8 *)
- Mutable.square res ;
- (* x^16 *)
- res *= x ;
- res
+module Inputs = Pickles.Tick_field_sponge.Inputs
[%%else]
- (* Computes x^17 *)
+module Inputs = struct
+ module Field = Field
+
+ let rounds_full = 63
+
+ let rounds_partial = 0
+
+ (* Computes x^5 *)
let to_the_alpha x =
let open Field in
let res = x in
@@ -60,47 +47,24 @@ module Inputs = struct
(* x^2 *)
let res = res * res in
(* x^4 *)
- let res = res * res in
- (* x^8 *)
- let res = res * res in
- (* x^16 *)
res * x
- [%%endif]
-
module Operations = struct
- [%%ifdef
- consensus_mechanism]
-
- let add_assign ~state i x = Field.(state.(i) += x)
-
- let apply_affine_map (_rows, c) v =
- let open Field in
- let res = [|v.(0) + v.(2); v.(0) + v.(1); v.(1) + v.(2)|] in
- Array.iteri res ~f:(fun i ri -> ri += c.(i)) ;
- res
-
- (* TODO: Have an explicit function for making a copy of a field element. *)
- let copy a = Array.map a ~f:(fun x -> Field.(x + zero))
-
- [%%else]
-
let add_assign ~state i x = Field.(state.(i) <- state.(i) + x)
- (* TODO: Clean this up to use the near mds matrix properly *)
- let apply_affine_map (_matrix, constants) v =
- let open Field in
- let near_mds_matrix_v =
- [|v.(0) + v.(2); v.(0) + v.(1); v.(1) + v.(2)|]
+ let apply_affine_map (matrix, constants) v =
+ let dotv row =
+ Array.reduce_exn (Array.map2_exn row v ~f:Field.( * )) ~f:Field.( + )
in
- Array.mapi near_mds_matrix_v ~f:(fun i x -> constants.(i) + x)
+ let res = Array.map matrix ~f:dotv in
+ Array.map2_exn res constants ~f:Field.( + )
let copy a = Array.map a ~f:Fn.id
-
- [%%endif]
end
end
+[%%endif]
+
module Digest = struct
open Field
@@ -124,7 +88,7 @@ let hash ?init = hash ?init params
consensus_mechanism]
module Checked = struct
- module Inputs = Pickles.Sponge_inputs.Make (Pickles.Impls.Step)
+ module Inputs = Pickles.Step_main_inputs.Sponge.Permutation
module Digest = struct
open Pickles.Impls.Step.Field
@@ -135,7 +99,7 @@ module Checked = struct
List.take (choose_preimage_var ~length:Field.size_in_bits x) length
end
- include Sponge.Make_hash (Sponge.Poseidon (Inputs))
+ include Sponge.Make_hash (Inputs)
let params = Sponge.Params.map ~f:Inputs.Field.constant params
",4
"diff --git a/src/app/archive/archive_lib/processor.ml b/src/app/archive/archive_lib/processor.ml @@ -131,8 +131,7 @@ module Epoch_data = struct
in
let%bind ledger_hash_id = Snarked_ledger_hash.find (module Conn) hash in
let seed =
- Coda_base.Epoch_data.Poly.Stable.V1.seed t
- |> Snark_params.Tick.Field.to_string
+ Coda_base.Epoch_data.Poly.seed t |> Snark_params.Tick.Field.to_string
in
match%bind
Conn.find_opt
",4
"diff --git a/src/lib/snark_keys_header/snark_keys_header.ml b/src/lib/snark_keys_header/snark_keys_header.ml @@ -31,7 +31,7 @@ module Constraint_constants = struct
let to_yojson t : Yojson.Safe.t =
match t with
- | Log2 i ->
+ | Log_2 i ->
`Assoc [(""two_to_the"", `Int i)]
| Txns_per_second_x10 i ->
`Assoc [(""txns_per_second_x10"", `Int i)]
@@ -39,7 +39,7 @@ module Constraint_constants = struct
let of_yojson (json : Yojson.Safe.t) =
match json with
| `Assoc [(""two_to_the"", `Int i)] ->
- Ok (Log2 i)
+ Ok (Log_2 i)
| `Assoc [(""txns_per_second_x10"", `Int i)] ->
Ok (Txns_per_second_x10 i)
| `Assoc _ ->
@@ -55,7 +55,7 @@ module Constraint_constants = struct
module Fork_config = struct
(** Fork data *)
- type t = Runtime_config.t =
+ type t = Runtime_config.Fork_config.t =
{previous_state_hash: string; previous_length: int}
[@@deriving yojson]
",4
"diff --git a/src/lib/transition_handler/breadcrumb_builder.ml b/src/lib/transition_handler/breadcrumb_builder.ml @@ -92,14 +92,18 @@ let build_subtrees_of_breadcrumbs ~logger ~precomputed_values ~verifier
to current external transition's parent hash""))
in
let open Deferred.Let_syntax in
- try
match%bind
O1trace.trace_recurring ""Breadcrumb.build"" (fun () ->
+ Deferred.Or_error.try_with (fun () ->
Transition_frontier.Breadcrumb.build ~logger
~precomputed_values ~verifier ~trust_system ~parent
~transition:mostly_validated_transition
- ~sender:(Some sender) () )
+ ~sender:(Some sender) () ) )
with
+ | Error _ ->
+ Deferred.return @@ Or_error.error_string missing_parent_msg
+ | Ok result -> (
+ match result with
| Ok new_breadcrumb ->
let open Result.Let_syntax in
Coda_metrics.(
@@ -150,10 +154,7 @@ let build_subtrees_of_breadcrumbs ~logger ~precomputed_values ~verifier
trust_system_record_invalid
""invalid staged ledger diff"" error
| `Fatal_error exn ->
- Deferred.return (Or_error.of_exn exn) )
- with
- | Coda_base.Ledger.Mask.Attached.Dangling_parent_reference _ ->
- Deferred.return (Or_error.error_string missing_parent_msg) )
+ Deferred.return (Or_error.of_exn exn) ) ) )
|> Cached.sequence_deferred
in
Cached.sequence_result cached_result ) )
",4
"diff --git a/buildkite/scripts/connect-to-testnet-on-develop.sh b/buildkite/scripts/connect-to-testnet-on-develop.sh @@ -53,30 +53,13 @@ coda daemon \
& # -background
# Attempt to connect to the GraphQL client every 10s for up to 4 minutes
-(sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status \
-|| (sleep 10s; coda client status))))))))))))))))))))))))
+for i in {1..24}; do
+ sleep 10s
+ status_exit_code=$(coda client status; echo $?)
+ if [ $status_exit_code -eq 0 ]; then
+ break
+ fi
+done
# Check that the daemon has connected to peers and is still up after 2 mins
sleep 2m
",4
"diff --git a/buildkite/scripts/connect-to-testnet-on-develop.sh b/buildkite/scripts/connect-to-testnet-on-develop.sh @@ -54,7 +54,7 @@ coda daemon \
# Attempt to connect to the GraphQL client every 10s for up to 4 minutes
num_status_retries=24
-for i in {1..$num_status_retries}; do
+for ((i=1;i<=$num_status_retries;i++)); do
sleep 10s
status_exit_code=$(coda client status; echo $?)
if [ $status_exit_code -eq 0 ]; then
",4
"diff --git a/src/lib/ledger_catchup/ledger_catchup.ml b/src/lib/ledger_catchup/ledger_catchup.ml @@ -187,12 +187,13 @@ let rec fold_until ~(init : 'accum)
(* returns a list of state-hashes with the older ones at the front *)
let download_state_hashes ~logger ~trust_system ~network ~frontier ~peers
- ~target_hash =
+ ~target_hash ~job =
[%log debug]
~metadata:[(""target_hash"", State_hash.to_yojson target_hash)]
""Doing a catchup job with target $target_hash"" ;
- Deferred.Or_error.find_map_ok peers ~f:(fun peer ->
+ let hash_tree = Transition_frontier.catchup_hash_tree frontier in
let open Deferred.Or_error.Let_syntax in
+ Deferred.Or_error.find_map_ok peers ~f:(fun peer ->
let%bind transition_chain_proof =
Coda_networking.get_transition_chain_proof network peer target_hash
in
@@ -222,9 +223,12 @@ let download_state_hashes ~logger ~trust_system ~network ~frontier ~peers
(Non_empty_list.to_list hashes)
~init:[]
~f:(fun acc hash ->
- if Transition_frontier.find frontier hash |> Option.is_some then
- Continue_or_stop.Stop (Ok (peer, acc))
- else Continue_or_stop.Continue (hash :: acc) )
+ match Transition_frontier.find frontier hash with
+ | Some final ->
+ Continue_or_stop.Stop
+ (Ok (peer, Frontier_base.Breadcrumb.state_hash final, acc))
+ | None ->
+ Continue_or_stop.Continue (hash :: acc) )
~finish:(fun acc ->
let module T = struct
type t = State_hash.t list [@@deriving to_yojson]
@@ -243,6 +247,13 @@ let download_state_hashes ~logger ~trust_system ~network ~frontier ~peers
Or_error.errorf
!""Peer %{sexp:Network_peer.Peer.t} moves too fast""
peer ) )
+ >>| fun (peer, final, hashes) ->
+ let (_ : State_hash.t) =
+ List.fold hashes ~init:final ~f:(fun parent h ->
+ Transition_frontier.Catchup_hash_tree.add hash_tree h ~parent ~job ;
+ h )
+ in
+ (peer, hashes)
let verify_against_hashes transitions hashes =
List.length transitions = List.length hashes
@@ -523,6 +534,9 @@ let run ~logger ~precomputed_values ~trust_system ~verifier ~network ~frontier
don't_wait_for
(Strict_pipe.Reader.iter_without_pushback catchup_job_reader
~f:(fun (target_hash, subtrees) ->
+ let job =
+ Transition_frontier.Catchup_hash_tree.Catchup_job_id.create ()
+ in
don't_wait_for
(let start_time = Core.Time.now () in
[%log info] ""Catch up to $target_hash""
@@ -550,7 +564,7 @@ let run ~logger ~precomputed_values ~trust_system ~verifier ~network ~frontier
let open Deferred.Let_syntax in
match%bind
download_state_hashes ~logger ~trust_system ~network
- ~frontier ~peers:subtree_peers ~target_hash
+ ~frontier ~peers:subtree_peers ~target_hash ~job
with
| Ok (peer, hashes) ->
return (Ok (peer, hashes))
@@ -564,7 +578,7 @@ let run ~logger ~precomputed_values ~trust_system ~verifier ~network ~frontier
in
match%bind
download_state_hashes ~logger ~trust_system ~network
- ~frontier ~peers:random_peers ~target_hash
+ ~frontier ~peers:random_peers ~target_hash ~job
with
| Ok (peer, hashes) ->
return (Ok (peer, hashes))
@@ -638,6 +652,10 @@ let run ~logger ~precomputed_values ~trust_system ~verifier ~network ~frontier
""Catchup process failed -- unable to receive valid data \
from peers or transition frontier progressed faster than \
catchup data received. See error for details: $error"" ;
+ Transition_frontier.(
+ Catchup_hash_tree.catchup_failed
+ (catchup_hash_tree frontier)
+ job) ;
garbage_collect_subtrees ~logger ~subtrees ;
Coda_metrics.(
Gauge.set Transition_frontier_controller.catchup_time_ms
",4
"diff --git a/src/lib/genesis_ledger_helper/genesis_ledger_helper.ml b/src/lib/genesis_ledger_helper/genesis_ledger_helper.ml @@ -433,7 +433,7 @@ module Ledger = struct
let named_filename
~(constraint_constants : Genesis_constants.Constraint_constants.t)
- ~num_accounts ~balances ~ledger_name_prefix name =
+ ~num_accounts ~balances ~ledger_name_prefix ?other_data name =
let str =
String.concat
[ Int.to_string constraint_constants.ledger_depth
@@ -447,16 +447,16 @@ module Ledger = struct
Mina_base.Account.Stable.Latest.bin_writer_t
Mina_base.Account.empty ]
in
+ let str =
+ match other_data with None -> str | Some other_data -> str ^ other_data
+ in
ledger_name_prefix ^ ""_"" ^ name ^ ""_""
^ Blake2.(to_hex (digest_string str))
^ "".tar.gz""
- let accounts_name accounts =
- let hash =
+ let accounts_hash accounts =
Runtime_config.Accounts.to_yojson accounts
- |> Yojson.Safe.to_string |> Blake2.digest_string
- in
- ""accounts_"" ^ Blake2.to_hex hash
+ |> Yojson.Safe.to_string |> Blake2.digest_string |> Blake2.to_hex
let find_tar ~logger ~genesis_dir ~constraint_constants ~ledger_name_prefix
(config : Runtime_config.Ledger.t) =
@@ -500,10 +500,10 @@ module Ledger = struct
| None ->
return None
in
- let search_local_and_s3 name =
+ let search_local_and_s3 ?other_data name =
let named_filename =
named_filename ~constraint_constants ~num_accounts:config.num_accounts
- ~balances:config.balances ~ledger_name_prefix name
+ ~balances:config.balances ~ledger_name_prefix ?other_data name
in
match%bind
Deferred.List.find_map ~f:(file_exists named_filename) search_paths
@@ -526,7 +526,7 @@ module Ledger = struct
in
Deferred.List.find_map ~f:(file_exists named_filename) search_paths
| Accounts accounts, _ ->
- search_local_and_s3 (accounts_name accounts)
+ search_local_and_s3 ~other_data:(accounts_hash accounts) ""accounts""
| Hash hash, None ->
assert (Some hash = config.hash) ;
return None
@@ -732,16 +732,16 @@ module Ledger = struct
hash= Some (State_hash.to_string @@ Ledger.merkle_root ledger)
}
in
- let name =
+ let name, other_data =
match (config.base, config.name) with
| Named name, _ ->
- Some name
+ (Some name, None)
| Accounts accounts, _ ->
- Some (accounts_name accounts)
+ (Some ""accounts"", Some (accounts_hash accounts))
| Hash _, None ->
- None
+ (None, None)
| _, Some name ->
- Some name
+ (Some name, None)
in
match (tar_path, name) with
| Ok tar_path, Some name ->
@@ -749,7 +749,8 @@ module Ledger = struct
genesis_dir
^/ named_filename ~constraint_constants
~num_accounts:config.num_accounts
- ~balances:config.balances ~ledger_name_prefix name
+ ~balances:config.balances ~ledger_name_prefix
+ ?other_data name
in
(* Delete the file if it already exists. *)
let%bind () =
",4
"diff --git a/buildkite/src/Constants/ContainerImages.dhall b/buildkite/src/Constants/ContainerImages.dhall {
toolchainBase = ""codaprotocol/ci-toolchain-base:v3"",
- codaToolchain = ""codaprotocol/mina-toolchain@sha256:de14b58c6e2c69466210f20a116e2f7b8d32763e945a751dd05770582edeef95"",
+ codaToolchain = ""codaprotocol/mina-toolchain@sha256:d4ad6dec3a846e425f97de55a697de9d65327e76782337fcdcfb373f95d21dd4"",
elixirToolchain = ""elixir:1.10-alpine"",
rustToolchain = ""codaprotocol/coda:toolchain-rust-e855336d087a679f76f2dd2bbdc3fdfea9303be3"",
nodeToolchain = ""node:14.13.1-stretch-slim"",
",4
"diff --git a/src/app/test_executive/common_prefix.ml b/src/app/test_executive/common_prefix.ml @@ -37,10 +37,12 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
in
let length = Hash_set.length common_prefixes in
if length = 0 then
- Malleable_error.of_string_hard_error_format
- ""Chains don't have any common prefixes among their most recent %d \
- blocks""
- n
+ Malleable_error.soft_error ()
+ (Error.of_string
+ (sprintf
+ ""Chains don't have any common prefixes among their most recent \
+ %d blocks""
+ n))
else if length < n then
Malleable_error.soft_error ()
(Error.of_string
",4
"diff --git a/src/lib/ppx_register_event/register_event.ml b/src/lib/ppx_register_event/register_event.ml @@ -115,7 +115,6 @@ let generate_loggers_and_parsers ~loc:_ ~path ty_ext msg_opt =
@@ Conv_to_ppx_deriving.copy_core_type x
in
let elist ~f l = elist (List.map ~f l) in
- let plist ~f l = plist (List.map ~f l) in
let record_pattern =
let open Ast_helper.Pat in
let arg =
@@ -174,33 +173,35 @@ let generate_loggers_and_parsers ~loc:_ ~path ty_ext msg_opt =
; parse=
(fun args ->
let result =
- match args with
- | [%p
- plist label_names ~f:(fun label ->
- [%pat? [%p pstring label], [%p pvar label]] )] ->
+ let args_list = Core_kernel.String.Map.of_alist_exn args in
+ (* We use this to avoid an unused value warning. *)
+ ignore args_list ;
[%e
List.fold_right label_decls
- ~f:
- (fun {pld_name= {txt= name; _}; pld_type; _} acc ->
+ ~f:(fun {pld_name= {txt= name; _}; pld_type; _} acc ->
Conv_from_ppx_deriving.copy_expression
@@ Ppx_deriving_yojson.wrap_runtime
@@ Conv_to_ppx_deriving.copy_expression
@@ [%expr
+ match
+ Core_kernel.Map.find args_list [%e estring name]
+ with
+ | Some [%p pvar name] ->
Core_kernel.Result.bind
([%e
of_yojson
~path:(split_path @ [ctor; name])
pld_type]
[%e evar name])
- ~f:(fun [%p pvar name] -> [%e acc])] )
- ~init:
- [%expr Core_kernel.Result.return [%e record_expr]]]
- | _ ->
- failwith
+ ~f:(fun [%p pvar name] -> [%e acc])
+ | None ->
+ Core_kernel.Result.fail
[%e
estring
- (sprintf ""%s, parse: unexpected arguments""
- event_path)]
+ (sprintf
+ ""%s, parse: missing argument %s""
+ event_path name)]] )
+ ~init:[%expr Core_kernel.Result.return [%e record_expr]]]
in
match result with Ok ev -> Some ev | Error _ -> None ) }]
; [%stri
",4
"diff --git a/src/lib/consensus/proof_of_stake.ml b/src/lib/consensus/proof_of_stake.ml @@ -736,11 +736,10 @@ module Data = struct
let open Message in
let open Local_state in
let open Snapshot in
- let best_vrf = ref None in
- Hashtbl.iteri
+ Hashtbl.fold ~init:None
( Snapshot.delegators epoch_snapshot public_key_compressed
|> Option.value ~default:(Core_kernel.Int.Table.create ()) )
- ~f:(fun ~key:delegator ~data:account ->
+ ~f:(fun ~key:delegator ~data:account best_vrf ->
let vrf_result =
T.eval ~constraint_constants ~private_key
{global_slot; seed; delegator}
@@ -770,8 +769,7 @@ module Data = struct
Blake2.(Fn.compose to_raw_string digest_string)
in
let vrf_eval = string_of_blake2 truncated_vrf_result in
- let replace_prev_best_vrf () =
- best_vrf :=
+ let this_vrf () =
Some
( vrf_eval
, ( { Block_data.stake_proof=
@@ -781,8 +779,7 @@ module Data = struct
; delegator_pk= account.public_key
; coinbase_receiver_pk= coinbase_receiver
; ledger=
- Local_state.Snapshot.Ledger_snapshot
- .ledger_subset
+ Local_state.Snapshot.Ledger_snapshot.ledger_subset
[ Mina_base.(
Account_id.create
(Public_key.compress public_key)
@@ -796,13 +793,15 @@ module Data = struct
; vrf_result }
, account.public_key ) )
in
- match !best_vrf with
+ match best_vrf with
| Some (prev_best_vrf_eval, _) ->
if String.compare prev_best_vrf_eval vrf_eval < 0 then
- replace_prev_best_vrf ()
+ this_vrf ()
+ else best_vrf
| None ->
- replace_prev_best_vrf () ) ;
- Option.map ~f:snd !best_vrf
+ this_vrf ()
+ else best_vrf )
+ |> Option.map ~f:snd
end
module Optional_state_hash = struct
",4
"diff --git a/src/app/libp2p_helper/src/libp2p_helper/main_test.go b/src/app/libp2p_helper/src/libp2p_helper/main_test.go @@ -15,6 +15,7 @@ import (
""time""
""codanet""
+
logging ""github.com/ipfs/go-log""
""github.com/prometheus/client_golang/prometheus/promhttp""
@@ -24,8 +25,8 @@ import (
peer ""github.com/libp2p/go-libp2p-core/peer""
peerstore ""github.com/libp2p/go-libp2p-core/peerstore""
protocol ""github.com/libp2p/go-libp2p-core/protocol""
+ pubsub ""github.com/libp2p/go-libp2p-pubsub""
- ""github.com/libp2p/go-libp2p-pubsub""
ma ""github.com/multiformats/go-multiaddr""
""github.com/stretchr/testify/require""
@@ -999,7 +1000,7 @@ func TestMplex_SendLargeMessage(t *testing.T) {
msg := createMessage(msgSize)
testDirectionalStream(t, appA, appB, func(stream net.Stream) {
- appB.StreamStates[0] = STREAM_QUERY_HANDLED
+ appB.StreamStates[0] = STREAM_DATA_EXPECTED
sendStreamMessage(t, stream, msg)
require.Equal(t, msg, waitForMessage(t, appB, msgSize))
})
@@ -1024,13 +1025,13 @@ func TestMplex_SendMultipleMessage(t *testing.T) {
msg := createMessage(msgSize)
testDirectionalStream(t, appA, appB, func(stream net.Stream) {
- appB.StreamStates[0] = STREAM_QUERY_HANDLED
+ appB.StreamStates[0] = STREAM_DATA_EXPECTED
sendStreamMessage(t, stream, msg)
require.Equal(t, msg, waitForMessage(t, appB, msgSize))
- appB.StreamStates[0] = STREAM_QUERY_HANDLED
+ appB.StreamStates[0] = STREAM_DATA_EXPECTED
sendStreamMessage(t, stream, msg)
require.Equal(t, msg, waitForMessage(t, appB, msgSize))
- appB.StreamStates[0] = STREAM_QUERY_HANDLED
+ appB.StreamStates[0] = STREAM_DATA_EXPECTED
sendStreamMessage(t, stream, msg)
require.Equal(t, msg, waitForMessage(t, appB, msgSize))
})
@@ -1060,10 +1061,10 @@ func TestLibp2pMetrics(t *testing.T) {
// Send multiple messages from A to B
testDirectionalStream(t, appA, appB, func(stream net.Stream) {
- appB.StreamStates[0] = STREAM_QUERY_HANDLED
+ appB.StreamStates[0] = STREAM_DATA_EXPECTED
sendStreamMessage(t, stream, createMessage(maxStatsMsg))
waitForMessage(t, appB, maxStatsMsg)
- appB.StreamStates[0] = STREAM_QUERY_HANDLED
+ appB.StreamStates[0] = STREAM_DATA_EXPECTED
sendStreamMessage(t, stream, createMessage(minStatsMsg))
waitForMessage(t, appB, minStatsMsg)
})
",4
"diff --git a/src/lib/merkle_mask/masking_merkle_tree.ml b/src/lib/merkle_mask/masking_merkle_tree.ml @@ -535,9 +535,16 @@ module Make (Inputs : Inputs_intf.S) = struct
let num_accounts t =
assert_is_attached t ;
- let parent_num_accounts = Base.num_accounts (get_parent t) in
- let mask_num_accounts = Location_binable.Table.length t.account_tbl in
- parent_num_accounts + mask_num_accounts
+ match t.current_location with
+ | None ->
+ 0
+ | Some location -> (
+ match location with
+ | Account addr ->
+ Addr.to_int addr + 1
+ | _ ->
+ failwith ""Expected mask current location to represent an account""
+ )
let location_of_account t account_id =
assert_is_attached t ;
",4
"diff --git a/src/app/rosetta/lib/block.ml b/src/app/rosetta/lib/block.ml @@ -335,8 +335,7 @@ WITH RECURSIVE chain AS (
; failure_reason: string option
; fee_payer_account_creation_fee_paid: int64 option
; receiver_account_creation_fee_paid: int64 option
- ; created_token: int64 option
- ; valid_until: int64 option }
+ ; created_token: int64 option }
[@@deriving hlist]
let fee_payer t = `Pk t.fee_payer
@@ -357,8 +356,6 @@ WITH RECURSIVE chain AS (
let created_token t = t.created_token
- let valid_until t = t.valid_until
-
let typ =
let open Archive_lib.Processor.Caqti_type_spec in
let spec =
@@ -370,7 +367,6 @@ WITH RECURSIVE chain AS (
; option string
; option int64
; option int64
- ; option int64
; option int64 ]
in
let encode t = Ok (hlist_to_tuple spec (to_hlist t)) in
@@ -392,8 +388,7 @@ WITH RECURSIVE chain AS (
blocks_user_commands.failure_reason,
blocks_user_commands.fee_payer_account_creation_fee_paid,
blocks_user_commands.receiver_account_creation_fee_paid,
- blocks_user_commands.created_token,
- u.valid_until,
+ blocks_user_commands.created_token
FROM user_commands u
INNER JOIN blocks_user_commands ON blocks_user_commands.user_command_id = u.id
INNER JOIN public_keys pk1 ON pk1.id = u.fee_payer_id
@@ -584,7 +579,7 @@ WITH RECURSIVE chain AS (
; fee= Unsigned.UInt64.of_int64 uc.fee
; hash= uc.hash
; failure_status= Some failure_status
- ; valid_until= Option.map ~f:Unsigned.UInt32.of_int64 (User_commands.Extras.valid_until extras)
+ ; valid_until= Option.map ~f:Unsigned.UInt32.of_int64 uc.valid_until
} )
in
{ Block_info.block_identifier=
",4
"diff --git a/src/lib/random_oracle/random_oracle.ml b/src/lib/random_oracle/random_oracle.ml @@ -21,7 +21,7 @@ end
module Input = Random_oracle_input
let params : Field.t Sponge.Params.t =
- Sponge.Params.(map pasta_p ~f:Field.of_string)
+ Sponge.Params.(map pasta_p_3 ~f:Field.of_string)
module Operations = struct
let add_assign ~state i x = Field.(state.(i) <- state.(i) + x)
@@ -45,21 +45,16 @@ module Inputs = Pickles.Tick_field_sponge.Inputs
module Inputs = struct
module Field = Field
- let rounds_full = 63
+ let rounds_full = 55
- let initial_ark = true
+ let initial_ark = false
let rounds_partial = 0
- (* Computes x^5 *)
+ (* Computes x^7 *)
let to_the_alpha x =
let open Field in
- let res = x in
- let res = res * res in
- (* x^2 *)
- let res = res * res in
- (* x^4 *)
- res * x
+ square (square x * x) * x
module Operations = Operations
end
@@ -188,10 +183,10 @@ let%test_unit ""check rust implementation of block-cipher"" =
let module T = Internal_Basic in
Quickcheck.test (Quickcheck.Generator.list_with_length 3 T.Field.gen)
~f:(fun s ->
- let s = Array.of_list s in
+ let s () = Array.of_list s in
[%test_eq: T.Field.t array]
- (Ocaml_permutation.block_cipher params s)
- (Permutation.block_cipher params s))
+ (Ocaml_permutation.block_cipher params (s ()))
+ (Permutation.block_cipher params (s ())))
[%%endif]
",4
"diff --git a/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml b/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml @@ -609,7 +609,7 @@ struct
let add_gates gates =
List.iter gates ~f:(fun g ->
let g = to_absolute_row g in
- Gates.add rust_gates (Gate_spec.to_rust_gate g)) ;
+ Gates.add rust_gates (Gate_spec.to_rust_gate g))
in
add_gates public_gates ;
add_gates gates ;
@@ -632,11 +632,11 @@ struct
Returns `(last_scalar, last_variable, terms, terms_length)`
where terms does not contain the last scalar and last variable observed.
*)
- let accumulate_sorted_terms (c0, i0) terms =
- Sequence.of_list terms
- |> Sequence.fold ~init:(c0, i0, [], 0) ~f:(fun (acc, i, ts, n) (c, j) ->
- if Int.equal i j then (Fp.add acc c, i, ts, n)
- else (c, j, (acc, i) :: ts, n + 1))
+ let accumulate_terms terms =
+ List.fold terms ~init:Int.Map.empty ~f:(fun acc (x, i) ->
+ Map.change acc i ~f:(fun y ->
+ let res = match y with None -> x | Some y -> Fp.add x y in
+ if Fp.(equal zero res) then None else Some res))
(** Converts a [Cvar.t] to a `(terms, terms_length, has_constant)`.
if `has_constant` is set, then terms start with a constant term in the form of (c, 0).
@@ -648,20 +648,17 @@ struct
~equal ~one:(of_int 1))
x
in
- let terms =
- List.sort terms ~compare:(fun (_, i) (_, j) -> Int.compare i j)
- in
- let has_constant_term = Option.is_some c in
(* Note: [(c, 0)] represents the field element [c] multiplied by the 0th
variable, which is held constant as [Field.one].
*)
let terms = match c with None -> terms | Some c -> (c, 0) :: terms in
- match terms with
- | [] ->
- Some ([], 0, false)
- | t0 :: terms ->
- let acc, i, ts, n = accumulate_sorted_terms t0 terms in
- Some (List.rev ((acc, i) :: ts), n + 1, has_constant_term)
+ let has_constant_term = Option.is_some c in
+ let terms = accumulate_terms terms in
+ let terms_list =
+ Map.fold_right ~init:[] terms ~f:(fun ~key ~data acc ->
+ (data, key) :: acc)
+ in
+ Some (terms_list, Map.length terms, has_constant_term)
(** Adds a row/gate/constraint to a constraint system `sys` *)
let add_row sys (vars : V.t option array) kind coeffs =
@@ -738,20 +735,18 @@ struct
~equal ~one:(of_int 1))
x
in
- let terms =
- List.sort terms ~compare:(fun (_, i) (_, j) -> Int.compare i j)
+ let terms = accumulate_terms terms in
+ let terms_list =
+ Map.fold_right ~init:[] terms ~f:(fun ~key ~data acc ->
+ (data, key) :: acc)
in
- match (constant, terms) with
- | Some c, [] ->
+ match (constant, Map.is_empty terms) with
+ | Some c, true ->
(c, `Constant)
- | None, [] ->
+ | None, true ->
(Fp.zero, `Constant)
- | _, t0 :: terms -> (
- let terms =
- let acc, i, ts, _ = accumulate_sorted_terms t0 terms in
- List.rev ((acc, i) :: ts)
- in
- match terms with
+ | _ -> (
+ match terms_list with
| [] ->
assert false
| [ (ls, lx) ] -> (
",4
"diff --git a/src/lib/transaction_snark/transaction_snark.ml b/src/lib/transaction_snark/transaction_snark.ml @@ -4349,7 +4349,7 @@ module For_tests = struct
; call_data
; call_depth = 0
; protocol_state = Snapp_predicate.Protocol_state.accept
- ; use_full_commitment = false
+ ; use_full_commitment = true
}
; predicate
}
@@ -4395,28 +4395,31 @@ module For_tests = struct
|> Parties.Party_or_stack.accumulate_hashes_predicated
in
let other_parties_hash = Parties.Party_or_stack.stack_hash ps in
- let transaction : Parties.Transaction_commitment.t =
+ let commitment : Parties.Transaction_commitment.t =
Parties.Transaction_commitment.create ~other_parties_hash
~protocol_state_predicate_hash
~memo_hash:(Signed_command_memo.hash memo)
in
+ let full_commitment =
+ Parties.Transaction_commitment.with_fee_payer commitment
+ ~fee_payer_hash:Party.Predicated.(digest (of_fee_payer fee_payer.data))
+ in
let fee_payer =
let fee_payer_signature_auth =
- let txn_comm =
- Parties.Transaction_commitment.with_fee_payer transaction
- ~fee_payer_hash:
- Party.Predicated.(digest (of_fee_payer fee_payer.data))
- in
Signature_lib.Schnorr.sign sender.private_key
- (Random_oracle.Input.field txn_comm)
+ (Random_oracle.Input.field full_commitment)
in
{ fee_payer with authorization = fee_payer_signature_auth }
in
let sender_party =
Option.map sender_party ~f:(fun s ->
+ let commitment =
+ if s.data.body.use_full_commitment then full_commitment
+ else commitment
+ in
let sender_signature_auth =
Signature_lib.Schnorr.sign sender.private_key
- (Random_oracle.Input.field transaction)
+ (Random_oracle.Input.field commitment)
in
{ Party.data = s.data
; authorization = Signature sender_signature_auth
@@ -4425,7 +4428,8 @@ module For_tests = struct
( `Parties { Parties.fee_payer; other_parties = other_receivers; memo }
, `Sender_party sender_party
, `Proof_party snapp_party
- , `Txn_commitment transaction )
+ , `Txn_commitment commitment
+ , `Full_txn_commitment full_commitment )
let deploy_snapp ~constraint_constants (spec : Spec.t) =
let `VK vk, `Prover _trivial_prover =
@@ -4446,16 +4450,21 @@ module For_tests = struct
let ( `Parties { Parties.fee_payer; other_parties; memo }
, `Sender_party sender_party
, `Proof_party snapp_party
- , `Txn_commitment transaction ) =
+ , `Txn_commitment commitment
+ , `Full_txn_commitment full_commitment ) =
create_parties spec ~update:update_vk ~predicate:Party.Predicate.Accept
in
assert (List.is_empty other_parties) ;
let snapp_party =
Option.value_map ~default:[] snapp_party ~f:(fun snapp_party ->
+ let commitment =
+ if snapp_party.data.body.use_full_commitment then full_commitment
+ else commitment
+ in
let signature =
Signature_lib.Schnorr.sign
(Option.value_exn spec.snapp_account_keypair).private_key
- (Random_oracle.Input.field transaction)
+ (Random_oracle.Input.field commitment)
in
[ { Party.data = snapp_party.data
; authorization = Signature signature
@@ -4473,7 +4482,8 @@ module For_tests = struct
let ( `Parties { Parties.fee_payer; other_parties; memo }
, `Sender_party sender_party
, `Proof_party snapp_party
- , `Txn_commitment transaction ) =
+ , `Txn_commitment commitment
+ , `Full_txn_commitment full_commitment ) =
create_parties spec ~update:spec.snapp_update
~predicate:Party.Predicate.Accept
in
@@ -4494,7 +4504,7 @@ module For_tests = struct
Parties.Party_or_stack.stack_hash ps
in
let tx_statement : Snapp_statement.t =
- { transaction; at_party = proof_party }
+ { transaction = commitment; at_party = proof_party }
in
let handler (Snarky_backendless.Request.With { request; respond }) =
match request with _ -> respond Unhandled
@@ -4504,10 +4514,14 @@ module For_tests = struct
in
{ Party.data = snapp_party.data; authorization = Proof pi }
| Signature ->
+ let commitment =
+ if snapp_party.data.body.use_full_commitment then full_commitment
+ else commitment
+ in
let signature =
Signature_lib.Schnorr.sign
(Option.value_exn spec.snapp_account_keypair).private_key
- (Random_oracle.Input.field transaction)
+ (Random_oracle.Input.field commitment)
in
Async.Deferred.return
{ Party.data = snapp_party.data
@@ -4527,7 +4541,8 @@ module For_tests = struct
let ( `Parties parties
, `Sender_party sender_party
, `Proof_party snapp_party
- , `Txn_commitment _transaction ) =
+ , `Txn_commitment _commitment
+ , `Full_txn_commitment _full_commitment ) =
create_parties spec ~update:spec.snapp_update
~predicate:Party.Predicate.Accept
in
",4
"diff --git a/automation/terraform/testnets/test-snapps/main.tf b/automation/terraform/testnets/test-snapps/main.tf @@ -60,8 +60,8 @@ variable ""plain_node_count"" {
locals {
testnet_name = ""test-snapps""
- mina_image = ""minaprotocol/mina-daemon:1.3.0alpha1-feature-snapps-protocol-ce068a6-buster-devnet""
- mina_archive_image = ""minaprotocol/mina-archive:1.3.0alpha1-feature-snapps-protocol-ce068a6-buster""
+ mina_image = ""minaprotocol/mina-daemon:1.3.0beta1-feature-snapps-protocol-733f61a-buster-devnet""
+ mina_archive_image = ""minaprotocol/mina-archive:1.3.0beta1-feature-snapps-protocol-733f61a-buster-devnet""
seed_region = ""us-central1""
seed_zone = ""us-central1-b""
",4
"diff --git a/src/lib/currency/currency.ml b/src/lib/currency/currency.ml @@ -737,11 +737,10 @@ end = struct
let%map _res, `Overflow lt = range_check_flagged `Sub diff in
lt
- (* x <= y iff x < y || x = y *)
+ (* x <= y iff not (y < x) *)
let ( <= ) x y =
- let%bind x_lt_y = x < y in
- let%bind eq = x = y in
- Boolean.(x_lt_y ||| eq)
+ let%map y_lt_x = y < x in
+ Boolean.not y_lt_x
(* x >= y iff y <= x *)
let ( >= ) x y = y <= x
",4
"diff --git a/src/lib/mina_base/account_id.ml b/src/lib/mina_base/account_id.ml @@ -5,10 +5,10 @@ open Mina_base_import
module Digest = struct
let of_bigstring_exn =
- Binable.of_bigstring (module Kimchi_pasta.Pasta.Fp.Stable.Latest)
+ Binable.of_bigstring (module Pickles.Backend.Tick.Field.Stable.Latest)
let to_bigstring =
- Binable.to_bigstring (module Kimchi_pasta.Pasta.Fp.Stable.Latest)
+ Binable.to_bigstring (module Pickles.Backend.Tick.Field.Stable.Latest)
module Base58_check = Base58_check.Make (struct
let description = ""Private key""
@@ -30,7 +30,7 @@ module Digest = struct
[%%versioned
module Stable = struct
module V1 = struct
- type t = Kimchi_pasta.Pasta.Fp.Stable.V1.t
+ type t = Pickles.Backend.Tick.Field.Stable.V1.t
[@@deriving sexp, equal, compare, hash]
let to_yojson (t : t) : Yojson.Safe.t = `String (to_string t)
@@ -53,7 +53,7 @@ module Digest = struct
(* Just matters that this no one can find a preimage to this with poseidon.
Chose 1 for consistency for the old uint64 based token IDs *)
- let default : t = Kimchi_pasta.Pasta.Fp.one
+ let default : t = Pickles.Backend.Tick.Field.one
let gen : t Quickcheck.Generator.t = Snark_params.Tick.Field.gen
",4
"diff --git a/src/lib/integration_test_cloud_engine/mina_automation.ml b/src/lib/integration_test_cloud_engine/mina_automation.ml @@ -246,8 +246,8 @@ module Network_config = struct
in
let mina_archive_schema = ""create_schema.sql"" in
let mina_archive_schema_aux_files =
- [ ""https://raw.githubusercontent.com/MinaProtocol/mina/develop/src/app/archive/create_schema.sql""
- ; ""https://raw.githubusercontent.com/MinaProtocol/mina/develop/src/app/archive/snapp_tables.sql""
+ [ ""https://raw.githubusercontent.com/MinaProtocol/mina/feature/token-id-overhaul/src/app/archive/create_schema.sql""
+ ; ""https://raw.githubusercontent.com/MinaProtocol/mina/feature/token-id-overhaul/src/app/archive/snapp_tables.sql""
]
in
(* NETWORK CONFIG *)
",4
"diff --git a/src/lib/transaction_snark/test/snapp_payments/snapp_payments.ml b/src/lib/transaction_snark/test/snapp_payments/snapp_payments.ml @@ -153,7 +153,7 @@ let%test_module ""Snapp payments tests"" =
U.apply_parties ledger partiess |> fun _ -> ()))
let%test_unit ""multiple transfers from one account"" =
- let open Transaction_logic.For_tests in
+ let open Mina_transaction_logic.For_tests in
Quickcheck.test ~trials:1 U.gen_snapp_ledger
~f:(fun ({ init_ledger; specs }, new_kp) ->
Ledger.with_ledger ~depth:U.ledger_depth ~f:(fun ledger ->
",4
"diff --git a/src/app/test_executive/snarkyjs.ml b/src/app/test_executive/snarkyjs.ml @@ -53,19 +53,14 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
let my_account_id =
Mina_base.Account_id.create my_pk Mina_base.Token_id.default
in
- let (keypair : Signature_lib.Keypair.t) =
- { public_key = my_pk |> Signature_lib.Public_key.decompress_exn
- ; private_key = my_sk
- }
- in
(* concurrently make/sign the deploy transaction and wait for the node to be ready *)
let%bind.Deferred parties_deploy_contract, unit_with_error =
Deferred.both
- ((fun _keypair ->
+ ((fun _my_sk ->
failwith
""TODO: shell exec to make/sign the deploy transaction with \
keypair for paying fees"")
- keypair)
+ (Signature_lib.Private_key.to_base58_check my_sk))
(wait_for t (Wait_condition.node_to_initialize node))
in
let%bind () = Deferred.return unit_with_error in
",4
"diff --git a/src/lib/pickles/step_main.ml b/src/lib/pickles/step_main.ml @@ -163,15 +163,8 @@ let step_main :
match Type_equal.Id.same_witness self.id d.id with
| Some T ->
basic.typ
- | None -> (
- (* TODO: Abstract this into a function in Types_map *)
- match d.kind with
- | Compiled ->
- let d = Types_map.lookup_compiled d.id in
- d.typ
- | Side_loaded ->
- let d = Types_map.lookup_side_loaded d.id in
- d.permanent.typ )
+ | None ->
+ Types_map.typ d
in
typ)
d
",4
"diff --git a/src/app/test_executive/payments_test.ml b/src/app/test_executive/payments_test.ml @@ -48,12 +48,6 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
; extra_genesis_accounts =
[ { balance = ""1000""; timing = Untimed }
; { balance = ""1000""; timing = Untimed }
- ; { balance = ""1000""
- ; timing =
- make_timing ~min_balance:800_000_000_000 ~cliff_time:8
- ~cliff_amount:0 ~vesting_period:4
- ~vesting_increment:200_000_000_000
- }
]
; num_snark_workers =
3
@@ -74,7 +68,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
~f:(fun { Signature_lib.Keypair.public_key; _ } ->
public_key |> Signature_lib.Public_key.to_bigstring
|> Bigstring.to_string)) ;
- let[@warning ""-8""] [ fish1; fish2; fish3_timed ] =
+ let[@warning ""-8""] [ fish1; fish2 ] =
Network.extra_genesis_keypairs network
in
(* create a signed txn which we'll use to make a successfull txn, and then a replay attack *)
@@ -334,15 +328,11 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
in
let%bind () =
section ""send a single payment from timed account using available liquid""
- (let amount = Currency.Amount.of_formatted_string ""10"" in
- let receiver = fish1 in
- let receiver_pub_key =
- receiver.public_key |> Signature_lib.Public_key.compress
- in
- let sender = fish3_timed in
- let sender_pub_key =
- sender.public_key |> Signature_lib.Public_key.compress
- in
+ (let amount = Currency.Amount.of_int 1_000_000_000_000 in
+ let receiver = untimed_node_a in
+ let%bind receiver_pub_key = Util.pub_key_of_node receiver in
+ let sender = timed_node_c in
+ let%bind sender_pub_key = Util.pub_key_of_node sender in
let%bind { hash; _ } =
Network.Node.must_send_payment ~logger timed_node_c ~sender_pub_key
~receiver_pub_key ~amount ~fee
@@ -352,7 +342,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
~txn_hash:hash ~node_included_in:(`Node timed_node_c)))
in
section ""unable to send payment from timed account using illiquid tokens""
- (let amount = Currency.Amount.of_formatted_string ""900"" in
+ (let amount = Currency.Amount.of_int 25_000_000_000_000 in
let receiver = untimed_node_b in
let%bind receiver_pub_key = Util.pub_key_of_node receiver in
let sender = timed_node_c in
@@ -361,10 +351,11 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
Network.Node.must_get_account_data ~logger timed_node_c
~public_key:sender_pub_key
in
- [%log info] ""fish3_timed total balance: %s""
+ [%log info] ""timed_node_c total balance: %s""
(Currency.Balance.to_formatted_string timed_node_c_total) ;
[%log info]
- ""Attempting to send txn from fish3_timed to fish1 for amount of %s""
+ ""Attempting to send txn from timed_node_c to untimed_node_a for \
+ amount of %s""
(Currency.Amount.to_formatted_string amount) ;
(* TODO: refactor this using new [expect] dsl when it's available *)
let open Deferred.Let_syntax in
",4
"diff --git a/src/lib/integration_test_cloud_engine/mina_automation.ml b/src/lib/integration_test_cloud_engine/mina_automation.ml @@ -227,9 +227,11 @@ module Network_config = struct
; libp2p_secret = """"
}
in
- let mina_archive_schema =
- ""https://raw.githubusercontent.com/MinaProtocol/mina/develop/src/app/archive/create_schema.sql""
+ let mina_archive_base_url =
+ ""https://raw.githubusercontent.com/MinaProtocol/mina/""
+ ^ Mina_version.commit_id ^ ""/src/app/archive/""
in
+ let mina_archive_schema = mina_archive_base_url ^ ""create_schema.sql"" in
let mk_net_keypair index (pk, sk) =
let secret_name = ""test-keypair-"" ^ Int.to_string index in
let keypair =
",4
"diff --git a/src/lib/pickles/impls.ml b/src/lib/pickles/impls.ml @@ -128,9 +128,9 @@ module Step = struct
module Digest = Digest.Make (Impl)
module Challenge = Challenge.Make (Impl)
- let input ~proofs_verified ~wrap_rounds =
+ let input ~proofs_verified ~wrap_rounds ~lookup =
let open Types.Step.Statement in
- let spec = spec proofs_verified wrap_rounds in
+ let spec = spec proofs_verified wrap_rounds lookup in
let (T (typ, f, f_inv)) =
Spec.packed_typ
(module Impl)
@@ -142,8 +142,15 @@ module Step = struct
, Fn.id ) )
spec
in
- let typ = Typ.transport typ ~there:to_data ~back:of_data in
- Spec.ETyp.T (typ, (fun x -> of_data (f x)), fun x -> f_inv (to_data x))
+ let typ =
+ Typ.transport typ
+ ~there:(to_data ~option_map:Option.map)
+ ~back:(of_data ~option_map:Option.map)
+ in
+ Spec.ETyp.T
+ ( typ
+ , (fun x -> of_data ~option_map:Plonk_types.Opt.map (f x))
+ , fun x -> f_inv (to_data ~option_map:Plonk_types.Opt.map x) )
end
module Wrap = struct
@@ -225,7 +232,7 @@ module Wrap = struct
let to_bits x = Field.unpack x ~length:Field.size_in_bits
end
- let input () =
+ let input ~lookup =
let fp : ('a, Other_field.Constant.t) Typ.t = Other_field.typ_unchecked in
let open Types.Wrap.Statement in
let (T (typ, f, f_inv)) =
@@ -237,13 +244,15 @@ module Wrap = struct
Impl.run_checked (Other_field.check x) ;
t )
, Fn.id ) )
- In_circuit.spec
+ (In_circuit.spec lookup)
in
let typ =
- Typ.transport typ ~there:In_circuit.to_data ~back:In_circuit.of_data
+ Typ.transport typ
+ ~there:(In_circuit.to_data ~option_map:Option.map)
+ ~back:(In_circuit.of_data ~option_map:Option.map)
in
Spec.ETyp.T
( typ
- , (fun x -> In_circuit.of_data (f x))
- , fun x -> f_inv (In_circuit.to_data x) )
+ , (fun x -> In_circuit.of_data ~option_map:Plonk_types.Opt.map (f x))
+ , fun x -> f_inv (In_circuit.to_data ~option_map:Plonk_types.Opt.map x) )
end
",4
"diff --git a/src/lib/mina_generators/parties_generators.ml b/src/lib/mina_generators/parties_generators.ml @@ -1169,7 +1169,7 @@ let gen_parties_from ?failure ?(max_other_parties = max_other_parties)
|> Account_id.Table.keys
in
Hash_set.add account_ids_seen fee_payer_acct_id ;
- let gen_parties_with_dynamic_balance ~kind_of_parties num_parties =
+ let _gen_parties_with_dynamic_balance ~kind_of_parties num_parties =
let new_account = match kind_of_parties with `New -> true | _ -> false in
let rec go acc n =
let open Zkapp_basic in
@@ -1433,25 +1433,51 @@ let gen_parties_from ?failure ?(max_other_parties = max_other_parties)
in
let _other_parties = other_parties0 @ [ balancing_party ] in
*)
+ let gen_parties_with_token_accounts ~num_parties =
+ let authorization = Control.Signature Signature.dummy in
+ let permissions_auth = Control.Tag.Signature in
+ let caller = Party.Call_type.Call in
+ let rec go acc n =
+ let open Parties_builder in
+ if n <= 0 then return (List.rev acc)
+ else
+ let%bind party0 =
+ let required_balance_change =
+ Currency.Amount.(
+ Signed.negate
+ (Signed.of_unsigned
+ (of_fee
+ Genesis_constants.Constraint_constants.compiled
+ .account_creation_fee ) ))
+ in
+ gen_party_from ~zkapp_account_ids ~account_ids_seen ~authorization
+ ~permissions_auth ~available_public_keys ~caller ~account_state_tbl
+ ~required_balance_change ?protocol_state_view ?vk ()
+ in
+ let%bind party =
+ let token_id =
+ Account_id.derive_token_id
+ ~owner:
+ (Account_id.create party0.body.public_key party0.body.token_id)
+ in
+ gen_party_from ~zkapp_account_ids ~account_ids_seen ~new_account:true
+ ~token_id ~caller ~authorization ~permissions_auth
+ ~available_public_keys ~account_state_tbl ?protocol_state_view ?vk
+ ()
+ in
+ go (mk_node party0.body [ mk_node party.body [] ] :: acc) (n - 1)
+ in
+ go [] num_parties
+ in
let%bind num_new_token_parties = Int.gen_uniform_incl 1 max_other_parties in
let%bind new_token_parties =
- gen_parties_with_dynamic_balance ~kind_of_parties:`New_token
- num_new_token_parties
+ gen_parties_with_token_accounts ~num_parties:num_new_token_parties
in
let other_parties = new_token_parties in
let%map memo = Signed_command_memo.gen in
let parties_dummy_authorizations : Parties.t =
let open Parties_builder in
- let other_parties =
- mk_forest
- ( List.mapi other_parties ~f:(fun i p ->
- if i mod 2 = 0 then
- [ mk_node p.body
- [ mk_node (List.nth_exn other_parties (i + 1)).body [] ]
- ]
- else [] )
- |> List.concat )
- in
+ let other_parties = mk_forest other_parties in
{ fee_payer
; other_parties =
other_parties
",4
"diff --git a/src/lib/mina_base/account_update.ml b/src/lib/mina_base/account_update.ml @@ -35,22 +35,51 @@ module Authorization_kind = struct
end
end]
- let to_booleans = function
+ module Structured = struct
+ type t = { is_signed : bool; is_proved : bool } [@@deriving hlist]
+
+ let to_input ({ is_signed; is_proved } : t) =
+ let f x = if x then Field.one else Field.zero in
+ Random_oracle_input.Chunked.packeds
+ [| (f is_signed, 1); (f is_proved, 1) |]
+
+ [%%ifdef consensus_mechanism]
+
+ module Checked = struct
+ type t = { is_signed : Boolean.var; is_proved : Boolean.var }
+ [@@deriving hlist]
+
+ let to_input { is_signed; is_proved } =
+ let f (x : Boolean.var) = (x :> Field.Var.t) in
+ Random_oracle_input.Chunked.packeds
+ [| (f is_signed, 1); (f is_proved, 1) |]
+ end
+
+ let typ =
+ Typ.of_hlistable ~var_to_hlist:Checked.to_hlist
+ ~var_of_hlist:Checked.of_hlist ~value_to_hlist:to_hlist
+ ~value_of_hlist:of_hlist
+ [ Boolean.typ; Boolean.typ ]
+
+ [%%endif]
+ end
+
+ let to_structured : t -> Structured.t = function
| None_given ->
- (false, false)
+ { is_signed = false; is_proved = false }
| Signature ->
- (true, false)
+ { is_signed = true; is_proved = false }
| Proof ->
- (false, true)
+ { is_signed = false; is_proved = true }
- let of_booleans_exn = function
- | false, false ->
+ let of_structured_exn : Structured.t -> t = function
+ | { is_signed = false; is_proved = false } ->
None_given
- | true, false ->
+ | { is_signed = true; is_proved = false } ->
Signature
- | false, true ->
+ | { is_signed = false; is_proved = true } ->
Proof
- | true, true ->
+ | { is_signed = true; is_proved = true } ->
failwith ""Invalid authorization kind""
let to_string = function
@@ -78,28 +107,14 @@ module Authorization_kind = struct
iso_string ~name:""AuthorizationKind"" ~js_type:(Custom ""AuthorizationKind"")
~to_string ~of_string:of_string_exn obj
- let to_input x =
- let is_signed, is_proved = to_booleans x in
- let f x = if x then Field.one else Field.zero in
- Random_oracle_input.Chunked.packeds [| (f is_signed, 1); (f is_proved, 1) |]
+ let to_input x = Structured.to_input (to_structured x)
[%%ifdef consensus_mechanism]
- module Checked = struct
- type t = { is_signed : Boolean.var; is_proved : Boolean.var }
-
- let to_input { is_signed; is_proved } =
- let f (x : Boolean.var) = (x :> Field.Var.t) in
- Random_oracle_input.Chunked.packeds
- [| (f is_signed, 1); (f is_proved, 1) |]
- end
+ module Checked = Structured.Checked
let typ =
- Typ.(Boolean.typ * Boolean.typ)
- |> Typ.transport_var
- ~back:(fun (is_signed, is_proved) -> { Checked.is_signed; is_proved })
- ~there:(fun { Checked.is_signed; is_proved } -> (is_signed, is_proved))
- |> Typ.transport ~there:to_booleans ~back:of_booleans_exn
+ Structured.typ |> Typ.transport ~there:to_structured ~back:of_structured_exn
[%%endif]
end
",4
"diff --git a/src/lib/mina_base/pending_coinbase.ml b/src/lib/mina_base/pending_coinbase.ml @@ -321,7 +321,7 @@ module Make_str (A : Wire_types.Concrete) = struct
Random_oracle.hash ~init:Hash_prefix.protocol_state
[| (t.curr :> Field.t)
; (state_body_hash :> Field.t)
- ; Field.project (Mina_numbers.Global_slot.to_bits global_slot)
+ ; Mina_numbers.Global_slot.to_field global_slot
|]
|> Stack_hash.of_hash
}
",4
"diff --git a/src/lib/snark_profiler_lib/snark_profiler_lib.ml b/src/lib/snark_profiler_lib/snark_profiler_lib.ml @@ -330,9 +330,9 @@ let create_ledger_and_zkapps ?(min_num_updates = 1) ?(num_proof_updates = 0)
in
let parties =
Async.Thread_safe.block_on_async_exn (fun () ->
- Transaction_snark.For_tests.update_states ~zkapp_prover:prover
- ~constraint_constants ~empty_sender spec
- ~receiver_auth:Control.Tag.Signature )
+ Transaction_snark.For_tests.update_states
+ ~zkapp_prover_and_vk:(prover, vk) ~constraint_constants
+ ~empty_sender spec ~receiver_auth:Control.Tag.Signature )
in
let simple_parties = Zkapp_command.to_simple parties in
let other_parties = simple_parties.account_updates in
",4
"diff --git a/src/lib/zkapps_examples/zkapps_examples.ml b/src/lib/zkapps_examples/zkapps_examples.ml @@ -190,9 +190,11 @@ module Account_update_under_construction = struct
; call_data : Field.t option
; events : Events.t
; actions : Actions.t
+ ; vk_hash : Field.t
}
- let create ~public_key ?(token_id = Token_id.(Checked.constant default))
+ let create ~public_key ~vk_hash
+ ?(token_id = Token_id.(Checked.constant default))
?(may_use_token = Account_update.May_use_token.Checked.constant No) () =
{ public_key
; token_id
@@ -203,6 +205,7 @@ module Account_update_under_construction = struct
; call_data = None
; events = Events.create ()
; actions = Actions.create ()
+ ; vk_hash
}
let to_account_update_and_calls (t : t) :
@@ -269,9 +272,7 @@ module Account_update_under_construction = struct
; authorization_kind =
{ is_signed = Boolean.false_
; is_proved = Boolean.true_
- ; verification_key_hash =
- Field.zero
- (* the vk hash is a dummy, to be patched with `patch_verification_key_hashes`, below *)
+ ; verification_key_hash = t.vk_hash
}
}
in
@@ -313,11 +314,11 @@ module Account_update_under_construction = struct
end
end
-class account_update ~public_key ?token_id ?may_use_token =
+class account_update ~public_key ~vk_hash ?token_id ?may_use_token =
object
val mutable account_update =
- Account_update_under_construction.In_circuit.create ~public_key ?token_id
- ?may_use_token ()
+ Account_update_under_construction.In_circuit.create ~public_key ~vk_hash
+ ?token_id ?may_use_token ()
method assert_state_proved =
account_update <-
@@ -430,9 +431,9 @@ open Pickles_types
open Hlist
let wrap_main ~public_key ?token_id ?may_use_token f
- { Pickles.Inductive_rule.public_input = () } =
+ { Pickles.Inductive_rule.public_input = vk_hash } =
let account_update =
- new account_update ~public_key ?token_id ?may_use_token
+ new account_update ~public_key ~vk_hash ?token_id ?may_use_token
in
let auxiliary_output = f account_update in
{ Pickles.Inductive_rule.previous_proof_statements = []
@@ -467,8 +468,8 @@ let compile :
, prev_valuess
, widthss
, heightss
- , unit
- , unit
+ , Field.t
+ , Field.Constant.t
, account_update
, unit (* TODO: Remove? *)
, auxiliary_var
@@ -499,6 +500,7 @@ let compile :
H3_2.T(Pickles.Prover).t =
fun ?self ?cache ?disk_keys ~auxiliary_typ ~branches ~max_proofs_verified ~name
~constraint_constants ~choices () ->
+ let vk_hash = ref None in
let choices ~self =
let rec go :
type prev_varss prev_valuess widthss heightss.
@@ -506,8 +508,8 @@ let compile :
, prev_valuess
, widthss
, heightss
- , unit
- , unit
+ , Field.t
+ , Field.Constant.t
, account_update
, unit
, auxiliary_var
@@ -531,12 +533,16 @@ let compile :
; prevs
; uses_lookup
; main =
- (fun main_input ->
+ (fun { Pickles.Inductive_rule.public_input = () } ->
+ let vk_hash =
+ exists Field.typ ~compute:(fun () ->
+ Lazy.force @@ Option.value_exn !vk_hash )
+ in
let { Pickles.Inductive_rule.previous_proof_statements
; public_output = account_update_under_construction
; auxiliary_output
} =
- main main_input
+ main { Pickles.Inductive_rule.public_input = vk_hash }
in
let public_output, account_update_tree =
to_account_update account_update_under_construction
@@ -556,6 +562,13 @@ let compile :
~auxiliary_typ:Typ.(Prover_value.typ () * auxiliary_typ)
~branches ~max_proofs_verified ~name ~constraint_constants ~choices
in
+ let () =
+ vk_hash :=
+ Some
+ ( lazy
+ ( Zkapp_account.digest_vk
+ @@ Pickles.Side_loaded.Verification_key.of_compiled tag ) )
+ in
let provers =
let rec go :
type prev_valuess widthss heightss.
",4
"diff --git a/src/PluginsRegistry.js b/src/PluginsRegistry.js @@ -34,9 +34,9 @@ export default class PluginsRegistry {
this.hooks.onProcessRule[i](rule, sheet)
}
- // TODO
- // Find a way to use rule.type with flow
- if (rule instanceof RegularRule) this.onProcessStyle(rule.style, rule, sheet)
+ // $FlowFixMe
+ if (rule.style) this.onProcessStyle(rule.style, rule, sheet)
+
rule.isProcessed = true
}
@@ -44,11 +44,12 @@ export default class PluginsRegistry {
* Call `onProcessStyle` hooks.
*/
onProcessStyle(style: JssStyle, rule: Rule, sheet?: StyleSheet): void {
- // TODO
- // Only added because of flow.
- if (!(rule instanceof RegularRule)) return
+ let nextStyle = style
+
for (let i = 0; i < this.hooks.onProcessStyle.length; i++) {
- rule.style = style = this.hooks.onProcessStyle[i](style, rule, sheet)
+ nextStyle = this.hooks.onProcessStyle[i](nextStyle, rule, sheet)
+ // $FlowFixMe
+ rule.style = nextStyle
}
}
",4
"diff --git a/src/utils/createGenerateClassName.js b/src/utils/createGenerateClassName.js /* @flow */
+import warning from 'warning'
import type {Rule, generateClassName} from '../types'
const globalRef = typeof window === 'undefined' ? global : window
@@ -7,6 +8,8 @@ if (globalRef[namespace] == null) globalRef[namespace] = 0
// In case we have more than one JSS version.
const jssCounter = globalRef[namespace]++
+const maxRules = 1e10
+
/**
* Returns a function which generates unique class names based on counters.
* When new generator function is created, rule counter is reseted.
@@ -15,5 +18,21 @@ const jssCounter = globalRef[namespace]++
export default (): generateClassName => {
let ruleCounter = 0
- return (rule: Rule): string => `${rule.key}-${jssCounter}-${ruleCounter++}`
+ return (rule: Rule): string => {
+ ruleCounter += 1
+
+ if (ruleCounter > maxRules) {
+ warning(
+ false,
+ 'You might have a memory leak. Rule counter is at %s.',
+ ruleCounter
+ )
+ }
+
+ if (process.env.NODE_ENV === 'production') {
+ return `c${jssCounter}${ruleCounter}`
+ }
+
+ return `${rule.key}-${jssCounter}-${ruleCounter}`
+ }
}
",4
"diff --git a/.travis.yml b/.travis.yml @@ -21,7 +21,6 @@ jobs:
skip_cleanup: true
tag: ""$NPM_TAG""
email: npm@mjackson.me
- api_key:
- secure: riXkB6uFwqAutPG/1caeh6qV8fSl6Tkjrpfn17gDCZVjHa/lojfXrCgif1gXkBg8x+KthCL7YJyAsFFREkakzqTS4WSfEtFAx+ucsoeBUT99tjCbFocqdc51EdOctwOUdgNAW0XJD+0Jnm6IBm8vjIwTshmrfqB1lS0FAmRgAuoTF/DVFugRn1zMZgeoEy0c2HuyJQvmrDn7S/FDvZhWgogPln5C7ro4hVkBeQ929UhY8HSQk5tBag5rLcya/QGvxcvo4q5vy7L2Y/6XPtXLdN58GRXUjQmBqpqf3Uf6zHTO6injqatl9npyOa/ovEHKKc71R2/Ane4jkHXeavzm5nang38DU7TVhpqhKLaXp58euo4TJD6FnPfxpYOu27Nho/BibYyqyDRkhBZbc6yEO1lhB1plgToDn9ji0Ix2QNlFv3QpT5/be2KcQ5OnhtA2xR/MjzO54UJ6RTgmZ9eRrRxONDlBn4+ZGc02Ra4MbFIR2dM6Tkwhv5V1zyI+lUf267Ef1hHOJnAT13YqdRr5Y9jPSYHxEbOJ3CiUqrXVXSsrVHky/ERKbXrHLC73qWZ1wa0kAtD5YvImN4eszuTbPaX/X5RGNsG1BwkQ8X4Job8hhkkEsdsEy0bkhaQpCmbi4WhEhMlMGqhr1r3w7/V5aMf+T5OzHK8vH9+kJhoX18M=
+ api_key: ""$NPM_TOKEN""
on:
tags: true
",4
"diff --git a/scripts/rollup.config.js b/scripts/rollup.config.js @@ -6,7 +6,7 @@ import prettier from 'rollup-plugin-prettier';
import replace from '@rollup/plugin-replace';
import { terser } from 'rollup-plugin-terser';
-const dev = process.env.NODE_ENV === 'development';
+const pretty = !!process.env.PRETTY;
const modules = [
{
@@ -14,7 +14,7 @@ const modules = [
output: {
file: 'build/history/history.js',
format: 'esm',
- sourcemap: !dev
+ sourcemap: !pretty
},
external: ['./browser.js', './hash.js', './memory.js'],
plugins: [
@@ -46,7 +46,7 @@ const modules = [
],
verbose: true
})
- ].concat(dev ? prettier({ parser: 'babel' }) : [])
+ ].concat(pretty ? prettier({ parser: 'babel' }) : [])
},
...['browser', 'hash', 'memory'].map(env => {
return {
@@ -54,7 +54,7 @@ const modules = [
output: {
file: `build/history/${env}.js`,
format: 'esm',
- sourcemap: !dev
+ sourcemap: !pretty
},
external: ['@babel/runtime/helpers/esm/extends'],
plugins: [
@@ -73,7 +73,7 @@ const modules = [
language_in: 'ECMASCRIPT5_STRICT',
language_out: 'ECMASCRIPT5_STRICT'
})
- ].concat(dev ? prettier({ parser: 'babel' }) : [])
+ ].concat(pretty ? prettier({ parser: 'babel' }) : [])
};
})
];
@@ -91,7 +91,7 @@ const node = [
presets: [['@babel/preset-env', { loose: true }]],
plugins: ['babel-plugin-dev-expression']
})
- ].concat(dev ? prettier({ parser: 'babel' }) : [])
+ ].concat(pretty ? prettier({ parser: 'babel' }) : [])
}
];
@@ -101,7 +101,7 @@ const globals = [
output: {
file: 'build/history/history.development.js',
format: 'umd',
- sourcemap: !dev,
+ sourcemap: !pretty,
name: 'HistoryLibrary'
},
plugins: [
@@ -116,14 +116,14 @@ const globals = [
language_in: 'ECMASCRIPT5_STRICT',
language_out: 'ECMASCRIPT5_STRICT'
})
- ].concat(dev ? prettier({ parser: 'babel' }) : [])
+ ].concat(pretty ? prettier({ parser: 'babel' }) : [])
},
{
input: 'packages/history/modules/history.js',
output: {
file: 'build/history/history.production.min.js',
format: 'umd',
- sourcemap: !dev,
+ sourcemap: !pretty,
name: 'HistoryLibrary'
},
plugins: [
@@ -139,7 +139,7 @@ const globals = [
language_out: 'ECMASCRIPT5_STRICT'
}),
terser()
- ].concat(dev ? prettier({ parser: 'babel' }) : [])
+ ].concat(pretty ? prettier({ parser: 'babel' }) : [])
}
];
",4
"diff --git a/src/components/AnalyticsTable.js b/src/components/AnalyticsTable.js @@ -31,7 +31,7 @@ const HeaderCell = ({ children, ...props }) => (
</th>
);
const RegularCell = ({ children, ...props }) => <td {...props}>{children}</td>;
-RegularCell.propTypes = { children: PropTypes.shape({}).isRequired };
+RegularCell.propTypes = { children: PropTypes.node.isRequired };
HeaderCell.propTypes = { children: PropTypes.shape({}).isRequired };
const AnalyticsTable = ({ data }) => (
",4
"diff --git a/serverjs/updatecards.js b/serverjs/updatecards.js @@ -4,6 +4,7 @@ const https = require('https'); // eslint-disable-line import/no-extraneous-depe
const JSONStream = require('JSONStream');
const es = require('event-stream');
const winston = require('winston');
+const fetch = require('node-fetch');
const cardutil = require('../dist/utils/Card.js');
const util = require('./util.js');
@@ -88,8 +89,20 @@ function downloadFile(url, filePath) {
}
async function downloadDefaultCards(basePath = 'private', defaultSourcePath = null, allSourcePath = null) {
- const defaultUrl = 'https://archive.scryfall.com/json/scryfall-default-cards.json';
- const allUrl = 'https://archive.scryfall.com/json/scryfall-all-cards.json';
+ let defaultUrl = 'https://archive.scryfall.com/json/scryfall-default-cards.json';
+ let allUrl = 'https://archive.scryfall.com/json/scryfall-all-cards.json';
+
+ const res = await fetch(`https://api.scryfall.com/bulk-data`);
+ const json = await res.json();
+
+ for (const data of json.data) {
+ if (data.name === 'Default Cards') {
+ defaultUrl = data.download_uri;
+ } else if (data.name === 'All Cards') {
+ allUrl = data.download_uri;
+ }
+ }
+
return Promise.all([
downloadFile(defaultUrl, defaultSourcePath || path.resolve(basePath, 'cards.json')),
downloadFile(allUrl, allSourcePath || path.resolve(basePath, 'all-cards.json')),
@@ -562,6 +575,7 @@ function convertCard(card, isExtra) {
newcard.color_identity = Array.from(card.color_identity);
newcard.set = card.set;
newcard.collector_number = card.collector_number;
+
newcard.promo =
card.promo ||
(card.frame_effects && card.frame_effects.includes('extendedart')) ||
@@ -719,7 +733,7 @@ async function updateCardbase(basePath = 'private', defaultPath = null, allPath
fs.mkdirSync(basePath);
}
- await module.exports.downloadDefaultCards(basePath, defaultPath, allPath);
+ await downloadDefaultCards(basePath, defaultPath, allPath);
winston.info('Updating cardbase, this might take a little while...');
await saveAllCards(basePath, defaultPath, allPath);
",4
"diff --git a/src/library/webscheme_lib.js b/src/library/webscheme_lib.js @@ -399,12 +399,12 @@ if( typeof(BiwaScheme)!='object' ) BiwaScheme={}; with(BiwaScheme) {
var handler = function(event){
return _.clone(intp2).invoke_closure(proc, [event]);
};
- $(selector).bind(evtype, handler);
+ $(selector).on(evtype, handler);
return handler;
});
define_libfunc(""remove-handler!"", 3, 3, function(ar, intp){
var selector = ar[0], evtype = ar[1], handler = ar[2];
- $(selector).unbind(evtype, handler);
+ $(selector).off(evtype, handler);
return BiwaScheme.undef;
});
define_libfunc(""wait-for"", 2, 2, function(ar){
@@ -416,18 +416,18 @@ if( typeof(BiwaScheme)!='object' ) BiwaScheme={}; with(BiwaScheme) {
if (prev_handler) {
// Maybe a wait-for is called more than once,
// and previous handler is not consumed.
- elem.unbind(evtype, prev_handler);
+ elem.off(evtype, prev_handler);
}
return new BiwaScheme.Pause(function(pause){
var handler = function(event){
elem.biwascheme_wait_for[evtype] = undefined;
- elem.unbind(evtype, handler);
+ elem.off(evtype, handler);
return pause.resume(event);
};
elem.biwascheme_wait_for[evtype] = handler;
- elem.bind(evtype, handler);
+ elem.on(evtype, handler);
});
});
",4
"diff --git a/src/extensions/multiple-sort/bootstrap-table-multiple-sort.js b/src/extensions/multiple-sort/bootstrap-table-multiple-sort.js var t = that.options.queryParams;
that.options.queryParams = function(params) {
params.multiSort = that.options.sortPriority;
- return typeof window[t] === ""function"" ? window[t](params) : t(params);
+ return $.fn.bootstrapTable.utils.calculateObjectValue(that.options, t, [params]);
};
isSingleSort=false;
that.initServer(that.options.silentSort);
",4
"diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js showColumn (field) {
const fields = Array.isArray(field) ? field : [field]
- fields.forEach( (field) => {
+ fields.forEach(field => {
this.toggleColumn(this.fieldsColumnsIndex[field], true, true)
})
}
hideColumn (field) {
const fields = Array.isArray(field) ? field : [field]
- fields.forEach( (field) => {
+ fields.forEach(field => {
this.toggleColumn(this.fieldsColumnsIndex[field], false, true)
})
}
",4
"diff --git a/src/extensions/filter-control/bootstrap-table-filter-control.js b/src/extensions/filter-control/bootstrap-table-filter-control.js `.date-filter-control.bootstrap-table-filter-control-${field}`
)
.datepicker(filterDatepickerOptions)
- .on('changeDate', ({ currentTarget }) => {
- $(currentTarget).val(
- currentTarget.value
- )
- // Fired the keyup event
- $(currentTarget).keyup()
+ .on('changeDate', (event) => {
+ clearTimeout(event.currentTarget.timeoutId || 0)
+ event.currentTarget.timeoutId = setTimeout(() => {
+ that.onColumnSearch(event)
+ }, that.options.searchTimeOut)
})
}
})
",4
"diff --git a/src/themes/theme.scss b/src/themes/theme.scss text-align: center;
}
- .card-view .card-view-title {
+ .card-view{
+ display: flex;
+
+ .card-view-title {
font-weight: bold;
display: inline-block;
min-width: 30%;
text-align: left !important;
}
}
+ }
.bs-checkbox {
text-align: center;
",4
"diff --git a/src/extensions/editable/bootstrap-table-editable.js b/src/extensions/editable/bootstrap-table-editable.js @@ -57,8 +57,8 @@ $.BootstrapTable = class extends $.BootstrapTable {
column.formatter = column.formatter || (value => value)
column._formatter = column._formatter ? column._formatter : column.formatter
column.formatter = (value, row, index) => {
- const result = Utils.calculateObjectValue(column,
- column._formatter, [value, row, index], value)
+ let result = Utils.calculateObjectValue(column, column._formatter, [value, row, index], value)
+ result = typeof result === 'undefined' || result === null ? this.options.undefinedText : result
$.each(column, processDataOptions)
",4
"diff --git a/package.json b/package.json ""marked"": ""^0.3.7"",
""moment"": ""^2.19.3"",
""next"": ""^4.2.1"",
+ ""node-sass"": ""^4.7.2"",
""nprogress"": ""^0.2.0"",
""prop-types"": ""^15.6.0"",
""react"": ""^16.2.0"",
""react-leaflet"": ""^1.7.8"",
""react-table"": ""^6.7.4"",
""semantic-ui-css"": ""^2.2.12"",
+ ""styled-jsx-plugin-sass"": ""^0.2.2"",
""underscore.string"": ""^3.3.4""
},
""resolutions"": {
""jest-junit"": ""^3.4.0"",
""lerna-changelog"": ""^0.7.0"",
""mock-local-storage"": ""^1.0.5"",
- ""node-sass"": ""^4.7.2"",
""raf"": ""^3.4.0"",
""react-test-renderer"": ""^16.2.0"",
- ""styled-jsx-plugin-sass"": ""^0.2.2"",
""webpack-bundle-analyzer"": ""^2.9.1""
},
""browserslist"": [
",5
"diff --git a/pages/documentation.js b/pages/documentation.js import React from 'react'
import {flowRight} from 'lodash'
-import Link from '../components/link'
import attachI18n from '../components/hoc/attach-i18n'
import attachSession from '../components/hoc/attach-session'
@@ -9,6 +8,7 @@ import Page from '../components/page'
import Meta from '../components/meta'
import Content from '../components/content'
import Container from '../components/container'
+import Link from '../components/link'
const DocumentationPage = () => (
<Page>
",5
"diff --git a/next.config.js b/next.config.js -const {join, sep} = require('path')
+const {join} = require('path')
const webpack = require('webpack')
const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer')
// The following dependencies will be pushed to the commons.js bundle
const commonDependencies = [
- 'lodash-es',
- 'marked',
+ '/lodash-es/',
+ '/marked/',
- 'components/hoc'
+ '/components/hoc/',
+
+ '/pages/_error.js'
]
module.exports = {
@@ -25,7 +27,7 @@ module.exports = {
const {minChunks} = commonPlugin
commonPlugin.minChunks = (module, count) => {
- if (module.resource && commonDependencies.some(c => module.resource.includes(`${sep}${c}${sep}`))) {
+ if (module.resource && commonDependencies.some(c => module.resource.includes(c))) {
return true
}
",5
"diff --git a/next.config.js b/next.config.js @@ -5,6 +5,7 @@ const {BundleAnalyzerPlugin} = require('webpack-bundle-analyzer')
// The following dependencies will be pushed to the commons.js bundle
const commonDependencies = [
+ '/next/',
'/lodash-es/',
'/marked/',
",5
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -34,6 +34,11 @@ Vue.component('lms-toolbar', {
</v-list-tile>
</template>
+ <v-divider v-if=""players && players.length>1""></v-divider>
+ <v-list-tile v-if=""players && players.length>1"" @click=""menuAction(TB_MANAGE_PLAYERS.id)"">
+ <v-list-tile-title v-bind:class=""{'pm-icon-indent' : players && players.length>0}""><v-icon>speaker_group</v-icon>&nbsp;{{TB_MANAGE_PLAYERS.title}}</v-list-tile-title>
+ </v-list-tile>
+
<v-divider v-if=""(player && player.canpoweroff) || (players && players.length>1) || playerStatus.sleepTimer""></v-divider>
<v-list-tile v-if=""player && player.canpoweroff"" @click=""togglePower()"">
<v-list-tile-content v-if=""playerStatus.ison"">
@@ -195,7 +200,7 @@ Vue.component('lms-toolbar', {
TB_SERVER_SETTINGS.title=i18n('Server Settings');
TB_INFO.title=i18n('Information');
TB_MANAGE_PLAYERS.title=i18n('Manage Players');
- this.menuItems = [ TB_UI_SETTINGS, TB_PLAYER_SETTINGS, TB_SERVER_SETTINGS, TB_MANAGE_PLAYERS, TB_INFO ];
+ this.menuItems = [ TB_UI_SETTINGS, TB_PLAYER_SETTINGS, TB_SERVER_SETTINGS, TB_INFO ];
this.trans = {noplayer:i18n('No Player'), synchronise:i18n('Synchronise'),
managegroups:i18n('Manage player groups'), nothingplaying:i18n('Nothing playing'),
info:i18n(""Show current track information""), switchoff:i18n('Switch Off'), switchon:i18n('Switch On')};
",5
"diff --git a/MaterialSkin/HTML/material/html/js/ui-settings.js b/MaterialSkin/HTML/material/html/js/ui-settings.js @@ -48,6 +48,15 @@ Vue.component('lms-ui-settings', {
<v-select :items=""volumeSteps"" :label=""i18n('Volume step')"" v-model=""volumeStep"" item-text=""label"" item-value=""value""></v-select>
</v-list-tile>
+ <v-divider v-if=""android""></v-divider>
+ <v-list-tile v-if=""android"">
+ <v-list-tile-content @click=""showPlayerMenuEntry = !showPlayerMenuEntry"" class=""switch-label"">
+ <v-list-tile-title>{{i18n(""Add menu option to start player"")}}</v-list-tile-title>
+ <v-list-tile-sub-title>{{i18n('Add option to main menu to launch player.')}} {{i18n(""(Currently only 'SB Player' is supported.)"")}}</v-list-tile-title>
+ </v-list-tile-content>
+ <v-list-tile-action><v-switch v-model=""showPlayerMenuEntry""></v-switch></v-list-tile-action>
+ </v-list-tile>
+
<div class=""dialog-padding""></div>
<v-header>{{i18n('Browse')}}</v-header>
<v-list-tile>
@@ -192,16 +201,7 @@ Vue.component('lms-ui-settings', {
</v-list-tile-content>
<v-list-tile-action><v-switch v-model=""infoBackdrop""></v-switch></v-list-tile-action>
</v-list-tile>
- <div v-if=""showPlayerConfig"" class=""dialog-padding""></div>
- <v-header v-if=""showPlayerConfig"">{{i18n('Player')}}</v-header>
- <v-list-tile v-if=""showPlayerConfig"">
- <v-list-tile-content @click=""showPlayerMenuEntry = !showPlayerMenuEntry"" class=""switch-label"">
- <v-list-tile-title>{{i18n(""Add menu option to start player"")}}</v-list-tile-title>
- <v-list-tile-sub-title>{{i18n('Add option to main menu to launch player.')}} {{i18n(""(Currently only 'SB Player' is supported.)"")}}</v-list-tile-title>
- </v-list-tile-content>
- <v-list-tile-action><v-switch v-model=""showPlayerMenuEntry""></v-switch></v-list-tile-action>
- </v-list-tile>
<div class=""dialog-padding""></div>
</v-list>
</v-card-text>
@@ -243,7 +243,7 @@ Vue.component('lms-ui-settings', {
],
volumeStep: 5,
showPlayerMenuEntry: false,
- showPlayerConfig: isAndroid()
+ android: isAndroid()
}
},
computed: {
",5
"diff --git a/MaterialSkin/HTML/material/html/js/main.js b/MaterialSkin/HTML/material/html/js/main.js Vue.use(VueLazyload, {error:LMS_BLANK_COVER});
const MIN_DESKTOP_WIDTH = 600;
-var usingDesktopLayout = false;
-var autoLayout = true;
-function checkLayout() {
- if (autoLayout && !IS_MOBILE) { // auto-layout broken on iPad #109
- var changeTo=undefined;
- if ( (window.innerWidth<MIN_DESKTOP_WIDTH && usingDesktopLayout) || (window.innerWidth>=MIN_DESKTOP_WIDTH && !usingDesktopLayout)) {
- bus.$emit('changeLayout');
- }
- }
-}
-
-function checkEntryFocus() {
- if (IS_MOBILE && (document.activeElement.tagName==""INPUT"" || document.activeElement.tagName==""TEXTAREA"")) {
- ensureVisible(document.activeElement);
- }
-}
var app = new Vue({
el: '#app',
@@ -35,6 +19,7 @@ var app = new Vue({
dstm: false, savequeue: false } }
},
created() {
+ this.autoLayout = true;
this.splitterPercent = parseInt(getLocalStorageVal(""splitter"", ""50""));
this.splitter = this.splitterPercent;
document.documentElement.style.setProperty('--splitter-pc', this.splitter);
@@ -54,9 +39,6 @@ var app = new Vue({
this.setLayout(false);
} else {
this.setLayout();
- bus.$on('changeLayout', function(forceDesktop) {
- this.setLayout(forceDesktop);
- }.bind(this));
}
var storedTrans = getLocalStorageVal('translation', undefined);
@@ -127,6 +109,7 @@ var app = new Vue({
let lastWinHeight = window.innerHeight;
let lastWinWidth = window.innerWidth;
let timeout = undefined;
+ let lmsApp = this;
document.documentElement.style.setProperty('--vh', `${vh}px`);
window.addEventListener('resize', () => {
if (timeout) {
@@ -142,10 +125,14 @@ var app = new Vue({
timeout = undefined;
if (Math.abs(lastWinWidth-window.innerWidth)>=3) {
lastWinWidth = window.innerWidth;
- checkLayout();
+ lmsApp.checkLayout();
bus.$emit('windowWidthChanged');
}
- checkEntryFocus();
+
+ // Check entries are visible
+ if (IS_MOBILE && (document.activeElement.tagName==""INPUT"" || document.activeElement.tagName==""TEXTAREA"")) {
+ ensureVisible(document.activeElement);
+ }
}, 50);
}, false);
@@ -308,10 +295,16 @@ var app = new Vue({
}
}
},
+ checkLayout() {
+ if (this.autoLayout &&
+ ( (window.innerWidth<MIN_DESKTOP_WIDTH && this.$store.state.desktopLayout) ||
+ (window.innerWidth>=MIN_DESKTOP_WIDTH && !this.$store.state.desktopLayout)) ) {
+ this.setLayout();
+ }
+ },
setLayout(forceDesktop) {
- autoLayout = undefined==forceDesktop;
- usingDesktopLayout = undefined==forceDesktop ? window.innerWidth>=MIN_DESKTOP_WIDTH : forceDesktop;
- this.$store.commit('setDesktopLayout', usingDesktopLayout);
+ this.autoLayout = undefined==forceDesktop;
+ this.$store.commit('setDesktopLayout', undefined==forceDesktop ? window.innerWidth>=MIN_DESKTOP_WIDTH : forceDesktop);
}
},
components: {
",5
"diff --git a/MaterialSkin/HTML/material/html/js/information.js b/MaterialSkin/HTML/material/html/js/information.js @@ -35,7 +35,7 @@ Vue.component('lms-information-dialog', {
<p class=""about-header"">{{i18n('Library')}}</p>
<ul>
<template v-for=""(item, index) in library""><li>{{item}}</li></template>
- <li v-if=""scanning""><v-progress-circular size=16 width=2 indeterminate></v-progress-circular> {{scanInfo}}</li>
+ <li v-if=""scanning""><v-progress-circular size=16 width=2 indeterminate style=""margin-top:-4px""></v-progress-circular> {{scanInfo}}</li>
<li v-else>{{scanInfo}}</li>
</ul>
<v-menu bottom v-if=""!scanning && unlockAll"">
@@ -57,7 +57,7 @@ Vue.component('lms-information-dialog', {
<template v-for=""(plug, index) in updates.details""><li>{{plug.title}} {{plug.version}}<v-btn flat icon @click=""pluginInfo(plug)"" class=""info-help-icon""><v-icon small>help_outline</v-icon></v-btn></li></template>
</ul>
<v-btn v-if=""updates.details.length>0 && 'idle'==pluginStatus && unlockAll"" @click=""updatePlugins"" flat><img class=""svg-img btn-icon"" :src=""'update' | svgIcon(darkUi)"">{{i18n('Update plugins')}}</v-btn>
- <p v-if=""'downloading'==pluginStatus""><v-progress-circular size=16 width=2 indeterminate></v-progress-circular> {{i18n('Downloading plugin updates')}}</p>
+ <p v-if=""'downloading'==pluginStatus""><v-progress-circular size=16 width=2 indeterminate style=""margin-top:-4px""></v-progress-circular> {{i18n('Downloading plugin updates')}}</p>
<v-btn v-if=""'needs_restart'==pluginStatus && unlockAll"" @click=""restartServer"" flat>{{i18n('Restart server')}}</v-btn>
<p v-if=""'downloading'!=pluginStatus && updates.details.length>0"" style=""padding-top:16px"">{{i18n('The following plugins are up to date:')}}</p>
<ul>
",5
"diff --git a/MaterialSkin/HTML/material/html/js/ui-settings.js b/MaterialSkin/HTML/material/html/js/ui-settings.js @@ -137,15 +137,6 @@ Vue.component('lms-ui-settings', {
</v-list-tile>
<v-divider></v-divider>
- <v-list-tile>
- <v-list-tile-content @click=""largeCovers = !largeCovers"" class=""switch-label"">
- <v-list-tile-title>{{i18n('Large covers')}}</v-list-tile-title>
- <v-list-tile-sub-title>{{i18n(""When possible, allow the grid view to show larger covers."")}}</v-list-tile-title>
- </v-list-tile-content>
- <v-list-tile-action><v-switch v-model=""largeCovers""></v-switch></v-list-tile-action>
- </v-list-tile>
- <v-divider></v-divider>
-
<v-list-tile>
<v-list-tile-content @click=""showRating = !showRating"" class=""switch-label"">
<v-list-tile-title>{{i18n('Show rating')}}</v-list-tile-title>
@@ -216,6 +207,15 @@ Vue.component('lms-ui-settings', {
</v-list-tile>
<v-divider></v-divider>
+ <v-list-tile>
+ <v-list-tile-content @click=""largeCovers = !largeCovers"" class=""switch-label"">
+ <v-list-tile-title>{{i18n('Large covers')}}</v-list-tile-title>
+ <v-list-tile-sub-title>{{i18n(""When possible, allow the grid view to show larger covers."")}}</v-list-tile-title>
+ </v-list-tile-content>
+ <v-list-tile-action><v-switch v-model=""largeCovers""></v-switch></v-list-tile-action>
+ </v-list-tile>
+ <v-divider></v-divider>
+
<v-list-tile>
<v-list-tile-content @click=""sortHome = !sortHome"" class=""switch-label"">
<v-list-tile-title>{{i18n('Sort home screen')}}</v-list-tile-title>
",5
"diff --git a/js/popupmenu.js b/js/popupmenu.js opts.parentXAlignment = (isRTL ? 'left' : 'right');
}
+ function shiftDown() {
+ opts.y = opts.y + 15;
+ }
+
// Change the alignment of the popupmenu based on certain conditions
(function doAlignment() {
if (menuIsSmallerThanTrigger) {
}
})();
+ if (target.parents('.masthead').length > 0) {
+ shiftDown();
+ }
+
//=======================================================
// END Temporary stuff until we sort out passing these settings from the controls that utilize them
//=======================================================
",5
"diff --git a/js/autocomplete.js b/js/autocomplete.js closeList: function() {
var popup = this.element.data('popupmenu');
if (!popup) {
- popup.close();
return;
}
+ popup.close();
this.element.trigger('listclose');
$('#autocomplete-list').parent('.popupmenu-wrapper').remove();
$('#autocomplete-list').remove();
",5
"diff --git a/app/views/components/drag/example-index.html b/app/views/components/drag/example-index.html -<div class=""row"" style=""height: 100px"">
+<style>
+ .drag-container {
+ height: 100px;
+ }
+
+ .drag-box {
+ border: 1px solid #bdbdbd;
+ position: absolute;
+ width:50px;
+ height:50px;
+ background:#ffffff;
+ }
+
+ .left-340 {
+ left: 340px;
+ }
+
+ .left-395 {
+ left: 395px;
+ }
+</style>
+
+<div class=""row drag-container"">
<div class=""twelve columns"">
<span class=""label"">Draggable - Free</span>
- <div class=""draggable"" style=""border: 1px solid #bdbdbd;position:absolute; width:50px; height:50px; background:#ffffff;"">Free</div>
+ <div class=""draggable drag-box"">Free</div>
</div>
</div>
-<div class=""row"" style=""height: 100px"">
+<div class=""row drag-container"">
<div class=""twelve columns"">
<span class=""label"">Draggable - Clone</span>
- <div class=""draggable clone"" style=""border: 1px solid #bdbdbd;position:absolute; width:50px; height:50px; background:#ffffff;"">Clone</div>
+ <div class=""draggable clone drag-box"">Clone</div>
</div>
</div>
-<div class=""row"" style=""height: 100px"">
+<div class=""row drag-container"">
<div class=""twelve columns"">
- <span class=""label"">Draggable - only on x or y axis</span>
- <div class=""draggable x-only"" style=""border: 1px solid #bdbdbd;position:absolute; width:50px; height:50px; background:#ffffff;"">X Only</div>
+ <span class=""label"">Draggable - Only on X or Y axis</span>
+ <div class=""draggable x-only drag-box"">X Only</div>
</div>
</div>
-<div class=""row"" style=""height: 100px"">
+<div class=""row drag-container"">
<div class=""twelve columns"">
- <span class=""label"">Draggable - with collision detection</span>
- <div id=""one"" class=""draggable x-only collision"" style=""border: 1px solid #bdbdbd; position:absolute; left: 395px; width:50px; height:50px; background:#ffffff;"">Left</div>
- <div id=""two"" class=""draggable x-only collision"" style=""border: 1px solid #bdbdbd; position:absolute; left: 340px; width:50px; height:50px; background:#ffffff;"">Right</div>
+ <span class=""label"">Draggable - with Collision Detection</span>
+ <div id=""one"" class=""draggable x-only collision drag-box left-340"">Left</div>
+ <div id=""two"" class=""draggable x-only collision drag-box left-395"">Right</div>
</div>
</div>
",5
"diff --git a/src/components/monthview/monthview.js b/src/components/monthview/monthview.js @@ -1008,10 +1008,10 @@ MonthView.prototype = {
};
// Handle selecting a year, or month
- const triggerBtn = this.element[0].querySelector('#btn-monthyear-pane');
this.monthYearPane
.off('click.picklist-month')
.on('click.picklist-month', '.picklist.is-month li', (e) => {
+ const triggerBtn = this.element[0].querySelector('#btn-monthyear-pane');
this.currentMonth = parseInt(e.target.getAttribute('data-month'), 10);
this.currentDate.setMonth(this.currentMonth);
this.currentYear = parseInt(this.monthYearPane[0].querySelector('.is-year .is-selected a').getAttribute('data-year'), 10);
@@ -1035,6 +1035,7 @@ MonthView.prototype = {
this.monthYearPane
.off('click.picklist-year')
.on('click.picklist-year', '.picklist.is-year li', (e) => {
+ const triggerBtn = this.element[0].querySelector('#btn-monthyear-pane');
if (e.currentTarget.classList.contains('up')) {
appendYear('up');
return;
",5
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md ### v4.26.0 Features
-- `[Datagrid]` Added fixes for editing lookup fields, fixed the styling of the lookup editor and improved padding, also fixed the sort indicator color. ([#3160](https://github.com/infor-design/enterprise/issues/3160))
- `[Icons]` Added new icons `icon-play, icon-stop, icon-record, icon-pause` for video players. ([#397](https://github.com/infor-design/design-system/issues/397))
### v4.26.0 Fixes
+- `[Datagrid]` Added fixes for editing lookup fields, fixed the styling of the lookup editor and improved padding, also fixed the sort indicator color. ([#3160](https://github.com/infor-design/enterprise/issues/3160))
- `[Pie]` Fixed an issue where initial selection was getting error. ([#3157](https://github.com/infor-design/enterprise/issues/3157))
### v4.26.0 Chores & Maintenance
",5
"diff --git a/src/components/calendar/_calendar.scss b/src/components/calendar/_calendar.scss width: calc(100% - 3px);
}
- &:hover > a {
- text-decoration: none;
- }
-
.btn {
display: none;
}
}
.accordion-header {
+ &:hover > a {
+ text-decoration: none;
+ }
+
&.has-chevron > a {
line-height: 15px;
width: calc(100% - 40px);
",5
"diff --git a/src/components/popupmenu/popupmenu.js b/src/components/popupmenu/popupmenu.js @@ -1023,7 +1023,7 @@ PopupMenu.prototype = {
self.handleItemClick(e, a);
});
- this.menu.off(`click.btn-menu.${this.id}`).on(`click.btn-menu.${this.id}`, (e) => {
+ this.menu.on(`click.btn-menu.${this.id}`, function (e) {
e.preventDefault();
});
@@ -2334,6 +2334,12 @@ PopupMenu.prototype = {
this.menu.off('click.popupmenu touchend.popupmenu touchcancel.popupmenu dragstart.popupmenu');
}
+ setTimeout(() => {
+ if (this.menu && this.menu.length) {
+ this.menu.off(`click.btn-menu.${this.id}`);
+ }
+ }, 1);
+
$('iframe').each(function () {
const frame = $(this);
try {
",5
"diff --git a/src/base/base-mixin.js b/src/base/base-mixin.js @@ -8,6 +8,55 @@ import {logger} from '../core/logger';
import {InvalidStateException} from '../core/invalid-state-exception';
import {BadArgumentException} from '../core/bad-argument-exception';
+const _defaultFilterHandler = (dimension, filters) => {
+ if (filters.length === 0) {
+ dimension.filter(null);
+ } else if (filters.length === 1 && !filters[0].isFiltered) {
+ // single value and not a function-based filter
+ dimension.filterExact(filters[0]);
+ } else if (filters.length === 1 && filters[0].filterType === 'RangedFilter') {
+ // single range-based filter
+ dimension.filterRange(filters[0]);
+ } else {
+ dimension.filterFunction(d => {
+ for (let i = 0; i < filters.length; i++) {
+ const filter = filters[i];
+ if (filter.isFiltered && filter.isFiltered(d)) {
+ return true;
+ } else if (filter <= d && filter >= d) {
+ return true;
+ }
+ }
+ return false;
+ });
+ }
+ return filters;
+};
+
+const _defaultHasFilterHandler = (filters, filter) => {
+ if (filter === null || typeof (filter) === 'undefined') {
+ return filters.length > 0;
+ }
+ return filters.some(f => filter <= f && filter >= f);
+};
+
+const _defaultRemoveFilterHandler = (filters, filter) => {
+ for (let i = 0; i < filters.length; i++) {
+ if (filters[i] <= filter && filters[i] >= filter) {
+ filters.splice(i, 1);
+ break;
+ }
+ }
+ return filters;
+};
+
+const _defaultAddFilterHandler = (filters, filter) => {
+ filters.push(filter);
+ return filters;
+};
+
+const _defaultResetFilterHandler = filters => [];
+
/**
* `dc.baseMixin` is an abstract functional object representing a basic `dc` chart object
* for all chart and widget implementations. Methods from the {@link #dc.baseMixin dc.baseMixin} are inherited
@@ -79,11 +128,11 @@ export class BaseMixin {
this._filters = [];
- this._filterHandler = this._defaultFilterHandler;
- this._hasFilterHandler = this._defaultHasFilterHandler;
- this._removeFilterHandler = this._defaultRemoveFilterHandler;
- this._addFilterHandler = this._defaultAddFilterHandler;
- this._resetFilterHandler = this._defaultResetFilterHandler;
+ this._filterHandler = _defaultFilterHandler;
+ this._hasFilterHandler = _defaultHasFilterHandler;
+ this._removeFilterHandler = _defaultRemoveFilterHandler;
+ this._addFilterHandler = _defaultAddFilterHandler;
+ this._resetFilterHandler = _defaultResetFilterHandler;
// ES6: need to figure out proper way to deprecate
@@ -1533,57 +1582,6 @@ export class BaseMixin {
return (height && height > this._minHeight) ? height : this._minHeight;
}
- _defaultFilterHandler (dimension, filters) {
- if (filters.length === 0) {
- dimension.filter(null);
- } else if (filters.length === 1 && !filters[0].isFiltered) {
- // single value and not a function-based filter
- dimension.filterExact(filters[0]);
- } else if (filters.length === 1 && filters[0].filterType === 'RangedFilter') {
- // single range-based filter
- dimension.filterRange(filters[0]);
- } else {
- dimension.filterFunction(d => {
- for (let i = 0; i < filters.length; i++) {
- const filter = filters[i];
- if (filter.isFiltered && filter.isFiltered(d)) {
- return true;
- } else if (filter <= d && filter >= d) {
- return true;
- }
- }
- return false;
- });
- }
- return filters;
- }
-
- _defaultHasFilterHandler (filters, filter) {
- if (filter === null || typeof (filter) === 'undefined') {
- return filters.length > 0;
- }
- return filters.some(f => filter <= f && filter >= f);
- }
-
- _defaultRemoveFilterHandler (filters, filter) {
- for (let i = 0; i < filters.length; i++) {
- if (filters[i] <= filter && filters[i] >= filter) {
- filters.splice(i, 1);
- break;
- }
- }
- return filters;
- }
-
- _defaultAddFilterHandler (filters, filter) {
- filters.push(filter);
- return filters;
- }
-
- _defaultResetFilterHandler (filters) {
- return [];
- }
-
_defaultData (group) {
return group.all();
}
",5
"diff --git a/src/templates/cheat-sheet-template.js b/src/templates/cheat-sheet-template.js @@ -61,12 +61,12 @@ export default ({ data, pageContext }) => {
<StyledDate>Created: {createdDate}</StyledDate>
<StyledDate>Updated: {updatedDate}</StyledDate>
<StyledA
- target=""_blank""
- rel=""noopener noreferrer""
- href={fields.editLink}
onClick={() => {
fa('6ETKCM0U');
}}
+ target=""_blank""
+ rel=""noopener noreferrer""
+ href={fields.editLink}
>
Edit this page on GitHub
</StyledA>
",5
"diff --git a/src/components/layout/PageLayout.js b/src/components/layout/PageLayout.js @@ -3,32 +3,24 @@ import PropTypes from 'prop-types';
import styled from 'styled-components';
import Helmet from 'react-helmet';
-import { SocialGraph, site } from '../basics';
+import useSiteMetadata from '../lib/useSiteMetadata';
+
+import { SocialGraph } from '../basics';
import Header from './Header';
import Footer from './Footer';
-const { metadata, url } = site;
-
const Layout = styled.div``;
-export const navLinks = [
- { title: 'Docs', href: url.docs.home, isGatsby: false },
- { title: 'Addons', href: url.addons, isGatsby: true },
- { title: 'Community', href: url.community, isGatsby: true },
- { title: 'Use cases', href: url.useCases, isGatsby: true },
- { title: 'Support', href: url.support, isGatsby: true },
- { title: 'Team', href: url.team, isGatsby: true },
-];
-
export default function PageLayout({ allMediumPost, children, ...props }) {
+ const { urls, title, description, ogImage, googleSiteVerification } = useSiteMetadata();
return (
<Layout {...props}>
<SocialGraph
// this is default social graph styling, it will be overridden by page-specific oggraph
- title={metadata.title}
- desc={metadata.description}
- url={url.home}
- image={metadata.ogImage}
+ title={title}
+ desc={description}
+ url={urls.home}
+ image={ogImage}
/>
<Helmet
meta={[
@@ -47,7 +39,7 @@ export default function PageLayout({ allMediumPost, children, ...props }) {
sizes=""16x16 32x32 64x64""
/>
- <meta name=""google-site-verification"" content={metadata.googleSiteVerification} />
+ <meta name=""google-site-verification"" content={googleSiteVerification} />
</Helmet>
<Header />
{children}
",5
"diff --git a/src/components/screens/AddonScreen/AddonScreen.js b/src/components/screens/AddonScreen/AddonScreen.js @@ -371,11 +371,6 @@ export function PureAddonScreen({ ...props }) {
/>
<Subheader>Design</Subheader>
- <AddonItem
- title=""Zeplin""
- desc=""Embed Zeplin designs in a storybook panel.""
- addonUrl=""https://github.com/mertkahyaoglu/storybook-zeplin""
- />
<AddonItem
title=""Story2sketch""
desc=""Convert stories into Sketch symbols.""
@@ -406,6 +401,11 @@ export function PureAddonScreen({ ...props }) {
desc=""Suggestions on how to tweak the HTML and CSS of your components to be more mobile-friendly.""
addonUrl=""https://github.com/aholachek/storybook-mobile""
/>
+ <AddonItem
+ title=""Zeplin""
+ desc=""Embed Zeplin designs in a storybook panel.""
+ addonUrl=""https://github.com/mertkahyaoglu/storybook-zeplin""
+ />
<div>
<Button
appearance=""secondaryOutline""
",5
"diff --git a/automation/terraform/modules/testnet-alerts/templates/testnet-alert-rules.yml.tpl b/automation/terraform/modules/testnet-alerts/templates/testnet-alert-rules.yml.tpl @@ -261,15 +261,6 @@ groups:
summary: ""{{ $labels.testnet }} block production is critically low (there has been less than 1 block in the last hour)""
description: ""{{ $value }} blocks have been produced on network {{ $labels.testnet }} in the last hour (according to some node).""
- - alert: DisconnectedBlocksPerHour
- expr: max by (testnet) (increase(Coda_Rejected_blocks_no_common_ancestor ${rule_filter} [${alert_timeframe}])) > 10
- labels:
- testnet: ""{{ $labels.testnet }}""
- severity: warning
- annotations:
- summary: ""{{ $labels.testnet }} has more than 10 disconnected blocks in the last hour""
- description: ""{{ $value }} blocks have been produced on remote side chains on network {{ $labels.test }} in the last hour.""
-
- alert: LowPostgresBlockHeightGrowth
expr: min by (testnet) (increase(Coda_Archive_max_block_height ${rule_filter} [${alert_timeframe}])) < 1
for: ${alert_evaluation_duration}
",5
"diff --git a/automation/terraform/modules/testnet-alerts/templates/testnet-alert-rules.yml.tpl b/automation/terraform/modules/testnet-alerts/templates/testnet-alert-rules.yml.tpl @@ -16,6 +16,15 @@ groups:
summary: ""{{ $labels.testnet }} cluster nodes have crashed""
description: ""{{ $value }} Cluster nodes have crashed on network {{ $labels.testnet }}.""
+ - alert: MultipleNodeRestarted
+ expr: count by (testnet) (Coda_Runtime_process_uptime_ms_total{testnet=~""mainnet|devnet2|snappnet""} < 600000) > 2
+ labels:
+ testnet: ""{{ $labels.testnet }}""
+ severity: critical
+ annotations:
+ summary: ""At least 3 nodes on {{ $lables.testnet }} restarted""
+ description: ""{{ $value }} nodes on {{ $labels.testnet }} restarted""
+
- alert: WatchdogNoNewLogs
expr: max by (testnet) (Coda_watchdog_pods_with_no_new_logs) > 0
labels:
@@ -281,15 +290,6 @@ groups:
summary: ""At least one of the nodes on {{ $lables.testnet }} restarted""
description: ""{{ $value }} nodes on {{ $labels.testnet }} restarted""
- - alert: MultipleNodeRestarted
- expr: count by (testnet) (Coda_Runtime_process_uptime_ms_total{testnet=~""mainnet|devnet2|snappnet""} < 600000) > 2
- labels:
- testnet: ""{{ $labels.testnet }}""
- severity: critical
- annotations:
- summary: ""At least 3 nodes on {{ $lables.testnet }} restarted""
- description: ""{{ $value }} nodes on {{ $labels.testnet }} restarted""
-
- alert: UnparentedBlocksObserved
expr: max by (testnet) (Coda_Archive_unparented_blocks ${rule_filter})) > 1
for: ${alert_evaluation_duration}
",5
"diff --git a/src/lib/mina_base/transaction_logic.ml b/src/lib/mina_base/transaction_logic.ml @@ -1554,13 +1554,7 @@ module Make (L : Ledger_intf) : S with type ledger := L.t = struct
end
end
- module M = Parties_logic.Make (Inputs)
-
- let apply_parties_unchecked
- ~(constraint_constants : Genesis_constants.Constraint_constants.t)
- ~(state_view : Snapp_predicate.Protocol_state.View.t) (ledger : L.t)
- (c : Parties.t) : (Transaction_applied.Parties_applied.t * _) Or_error.t =
- let module Env = struct
+ module Env = struct
open Inputs
type t =
@@ -1583,7 +1577,14 @@ module Make (L : Ledger_intf) : S with type ledger := L.t = struct
Parties_logic.Local_state.t
; protocol_state_predicate : Snapp_predicate.Protocol_state.t
; transaction_commitment : unit >
- end in
+ end
+
+ module M = Parties_logic.Make (Inputs)
+
+ let apply_parties_unchecked
+ ~(constraint_constants : Genesis_constants.Constraint_constants.t)
+ ~(state_view : Snapp_predicate.Protocol_state.View.t) (ledger : L.t)
+ (c : Parties.t) : (Transaction_applied.Parties_applied.t * _) Or_error.t =
let original_account_states =
List.map (Parties.accounts_accessed c) ~f:(fun id ->
( id
",5
"diff --git a/src/app/archive/create_schema.sql b/src/app/archive/create_schema.sql @@ -205,6 +205,7 @@ CREATE TABLE blocks_internal_commands
CREATE INDEX idx_blocks_internal_commands_block_id ON blocks_internal_commands(block_id);
CREATE INDEX idx_blocks_internal_commands_internal_command_id ON blocks_internal_commands(internal_command_id);
+CREATE INDEX idx_blocks_internal_commands_receiver_balance ON blocks_internal_commands(receiver_balance);
/* in this file because reference to balances doesn't work if in snapp_tables.sql */
CREATE TABLE snapp_party_balances
@@ -234,4 +235,3 @@ CREATE TABLE blocks_snapp_commands
CREATE INDEX idx_blocks_snapp_commands_block_id ON blocks_snapp_commands(block_id);
CREATE INDEX idx_blocks_snapp_commands_snapp_command_id ON blocks_snapp_commands(snapp_command_id);
CREATE INDEX idx_blocks_snapp_commands_sequence_no ON blocks_snapp_commands(sequence_no);
-CREATE INDEX idx_blocks_internal_commands_receiver_balance ON blocks_internal_commands(receiver_balance);
",5
"diff --git a/src/lib/transaction_logic/parties_logic.ml b/src/lib/transaction_logic/parties_logic.ml @@ -872,7 +872,6 @@ module Make (Inputs : Inputs_intf) = struct
let a, inclusion_proof =
Inputs.Ledger.get_account party local_state.ledger
in
- let a = h.perform (Init_account { party; account = a }) in
Inputs.Ledger.check_inclusion local_state.ledger (a, inclusion_proof) ;
(* Register verification key, in case it needs to be 'side-loaded' to
verify a snapp proof.
@@ -1256,6 +1255,8 @@ module Make (Inputs : Inputs_intf) = struct
let a = Account.set_permissions permissions a in
(a, local_state)
in
+ (* Initialize account's pk, in case it is new. *)
+ let a = h.perform (Init_account { party; account = a }) in
(* DO NOT ADD ANY UPDATES HERE. They must be earlier in the code.
See comment above.
*)
",5
"diff --git a/site/docs/api/table-options.md b/site/docs/api/table-options.md @@ -580,28 +580,6 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
- **Example:** [Ignore Click To Select On](https://examples.bootstrap-table.com/#options/ignore-click-to-select-on.html)
-## locale
-
-- **Attribute:** `data-locale`
-
-- **Type:** `String`
-
-- **Detail:**
-
- Sets the locale to use (i.e. `'zh-CN'`). Locale files must be pre-loaded.
- Allows for fallback locales, if loaded, in the following order:
-
- * First tries for the locale as specified,
- * Then tries the locale with '_' translated to '-' and the region code upper cased,
- * Then tries the short locale code (i.e. `'zh'` instead of `'zh-CN'`),
- * And finally will use the last locale file loaded (or the default locale if no locales loaded).
-
- If left `undefined` or an empty string, use the last locale loaded (or `'en-US'` if no locale files loaded).
-
-- **Default:** `undefined`
-
-- **Example:** [Table Locale](https://examples.bootstrap-table.com/#options/table-locale.html)
-
## loadingFontSize
- **Attribute:** `data-loading-font-size`
@@ -642,6 +620,28 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
- **Example:** [Loading Template](https://examples.bootstrap-table.com/#options/loading-template.html)
+## locale
+
+- **Attribute:** `data-locale`
+
+- **Type:** `String`
+
+- **Detail:**
+
+ Sets the locale to use (i.e. `'zh-CN'`). Locale files must be pre-loaded.
+ Allows for fallback locales, if loaded, in the following order:
+
+ * First tries for the locale as specified,
+ * Then tries the locale with '_' translated to '-' and the region code upper cased,
+ * Then tries the short locale code (i.e. `'zh'` instead of `'zh-CN'`),
+ * And finally will use the last locale file loaded (or the default locale if no locales loaded).
+
+ If left `undefined` or an empty string, use the last locale loaded (or `'en-US'` if no locale files loaded).
+
+- **Default:** `undefined`
+
+- **Example:** [Table Locale](https://examples.bootstrap-table.com/#options/table-locale.html)
+
## maintainMetaData
- **Attribute:** `data-maintain-meta-data`
",5
"diff --git a/packages/react-dev-utils/printHostingInstructions.js b/packages/react-dev-utils/printHostingInstructions.js @@ -26,11 +26,9 @@ function printHostingInstructions(
printBaseMessage(buildFolder, publicPathname);
printDeployInstructions(publicUrl, hasDeployScript, useYarn);
-
} else if (publicPath !== '/') {
// ""homepage"": ""http://mywebsite.com/project""
printBaseMessage(buildFolder, publicPath);
-
} else {
// ""homepage"": ""http://mywebsite.com""
// or no homepage
@@ -39,6 +37,10 @@ function printHostingInstructions(
printStaticServerInstructions(buildFolder, useYarn);
}
console.log();
+ console.log('Find out more about deployment here:');
+ console.log();
+ console.log(` ${chalk.yellow('http://bit.ly/2vY88Kr')}`);
+ console.log();
}
function printBaseMessage(buildFolder, hostingLocation) {
@@ -64,15 +66,7 @@ function printBaseMessage(buildFolder, hostingLocation) {
);
}
console.log();
-
- console.log(
- `The ${chalk.cyan(buildFolder)} folder is ready to be deployed.`
- );
- console.log()
- console.log('Find out more about deployment here:');
- console.log();
- console.log(` ${chalk.yellow('http://bit.ly/2vY88Kr')}`);
- console.log();
+ console.log(`The ${chalk.cyan(buildFolder)} folder is ready to be deployed.`);
}
function printDeployInstructions(publicUrl, hasDeployScript, useYarn) {
@@ -88,20 +82,24 @@ function printDeployInstructions(publicUrl, hasDeployScript, useYarn) {
}
console.log();
- console.log(`Add the following script in your ${chalk.cyan(
- 'package.json'
- )}.`);
+ console.log(
+ `Add the following script in your ${chalk.cyan('package.json')}.`
+ );
console.log();
console.log(` ${chalk.dim('// ...')}`);
console.log(` ${chalk.yellow('""scripts""')}: {`);
console.log(` ${chalk.dim('// ...')}`);
- console.log(` ${chalk.yellow('""predeploy""')}: ${chalk.yellow(
+ console.log(
+ ` ${chalk.yellow('""predeploy""')}: ${chalk.yellow(
'""npm run build"",'
- )}`);
- console.log(` ${chalk.yellow('""deploy""')}: ${chalk.yellow(
+ )}`
+ );
+ console.log(
+ ` ${chalk.yellow('""deploy""')}: ${chalk.yellow(
'""gh-pages -d build""'
- )}`);
+ )}`
+ );
console.log(' }');
console.log();
",5
"diff --git a/user.js b/user.js @@ -139,11 +139,6 @@ user_pref(""javascript.use_us_english_locale"", true); // [HIDDEN PREF]
/*** [SECTION 0300]: QUIETER FOX ***/
user_pref(""_user.js.parrot"", ""0300 syntax error: the parrot's not pinin' for the fjords!"");
-/** UPDATES ***/
-/* 0306: disable search engine updates (e.g. OpenSearch)
- * [NOTE] This does not affect Mozilla's built-in or Web Extension search engines ***/
-user_pref(""browser.search.update"", false);
-
/** RECOMMENDATIONS ***/
/* 0320: disable recommendation pane in about:addons (uses Google Analytics) ***/
user_pref(""extensions.getAddons.showPane"", false); // [HIDDEN PREF]
@@ -1277,6 +1272,8 @@ user_pref(""browser.startup.homepage_override.mstone"", ""ignore""); // master switc
// user_pref(""app.update.auto"", false); // [NON-WINDOWS] disable auto app updates
// [NOTE] You will still get prompts to update, and should do so in a timely manner
// [SETTING] General>Firefox Updates>Check for updates but let you choose to install them
+ // user_pref(""browser.search.update"", false); // disable search engine updates (e.g. OpenSearch)
+ // [NOTE] This does not affect Mozilla's built-in or Web Extension search engines
// user_pref(""extensions.update.enabled"", false); // disable extension and theme update checks
// user_pref(""extensions.update.autoUpdateDefault"", false); // disable installing extension and theme updates
// [SETTING] about:addons>Extensions>[cog-wheel-icon]>Update Add-ons Automatically (toggle)
",5
"diff --git a/pages/faq.js b/pages/faq.js @@ -4,32 +4,32 @@ import Question from 'components/faq/question';
import QuestionAnswerData from 'components/faq/questions';
import styles from './styles/faq.css';
-const FAQ = () => {
- const generalQuestions = QuestionAnswerData().general.map(faq => (
- <Question question={faq.question} answer={faq.answer} key={faq.question} />
- ));
- const donationQuestions = QuestionAnswerData().donation.map(faq => (
- <Question question={faq.question} answer={faq.answer} key={faq.question} />
- ));
- const volunteerQuestions = QuestionAnswerData().volunteer.map(faq => (
- <Question question={faq.question} answer={faq.answer} key={faq.question} />
- ));
-
- return (
+const FAQ = () => (
<Section title=""General Questions"" theme=""white"">
<Section theme=""white"" headingLines={false}>
- <div className={styles.container}>{generalQuestions}</div>
+ <div className={styles.container}>
+ {QuestionAnswerData().general.map(faq => (
+ <Question question={faq.question} answer={faq.answer} key={faq.question} />
+ ))}
+ </div>
</Section>
<Section title=""Donation Questions"" theme=""white"">
<br />
- <div className={styles.container}>{donationQuestions}</div>
+ <div className={styles.container}>
+ {QuestionAnswerData().donation.map(faq => (
+ <Question question={faq.question} answer={faq.answer} key={faq.question} />
+ ))}
+ </div>
</Section>
<Section title=""Volunteer Questions"" theme=""white"">
<br />
- <div className={styles.container}>{volunteerQuestions}</div>
+ <div className={styles.container}>
+ {QuestionAnswerData().volunteer.map(faq => (
+ <Question question={faq.question} answer={faq.answer} key={faq.question} />
+ ))}
+ </div>
</Section>
</Section>
);
-};
export default FAQ;
",5
"diff --git a/package.json b/package.json ""react-svg-loader"": ""^2.1.0"",
""react-youtube"": ""^7.8.0"",
""redux"": ""^4.0.1"",
+ ""redux-devtools-extension"": ""^2.13.5"",
""redux-thunk"": ""^2.3.0"",
""reselect"": ""^4.0.0"",
""style-loader"": ""^0.23.1"",
""prettier"": ""^1.15.2"",
""react-addons-test-utils"": ""^15.6.2"",
""react-test-renderer"": ""^16.6.1"",
- ""redux-devtools-extension"": ""^2.13.5"",
""redux-mock-store"": ""^1.5.3"",
""stylelint"": ""^9.8.0"",
""stylelint-config-standard"": ""^18.2.0""
",5
"diff --git a/packages/create-react-app/yarn.lock.cached b/packages/create-react-app/yarn.lock.cached @@ -5060,9 +5060,9 @@ isstream@~0.1.2:
integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
istanbul-api@^2.1.1:
- version ""2.1.4""
- resolved ""https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.4.tgz#5c7fe1d1c9b96ba3184ac4bbff7fc04eaccbdd8b""
- integrity sha512-aAFQL0HA2BLUl18XmTQ7H7CGKI58DtZFvvfmg6e+rA3iNFergvpi16czLV4CpI7HOImMeZ5mqI62dvSNVtUQVA==
+ version ""2.1.5""
+ resolved ""https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.5.tgz#697b95ec69856c278aacafc0f86ee7392338d5b5""
+ integrity sha512-meYk1BwDp59Pfse1TvPrkKYgVqAufbdBLEVoqvu/hLLKSaQ054ZTksbNepyc223tMnWdm6AdK2URIJJRqdP87g==
dependencies:
async ""^2.6.1""
compare-versions ""^3.2.1""
@@ -5072,7 +5072,7 @@ istanbul-api@^2.1.1:
istanbul-lib-instrument ""^3.2.0""
istanbul-lib-report ""^2.0.7""
istanbul-lib-source-maps ""^3.0.5""
- istanbul-reports ""^2.2.2""
+ istanbul-reports ""^2.2.3""
js-yaml ""^3.13.0""
make-dir ""^2.1.0""
minimatch ""^3.0.4""
@@ -5123,10 +5123,10 @@ istanbul-lib-source-maps@^3.0.1, istanbul-lib-source-maps@^3.0.5:
rimraf ""^2.6.2""
source-map ""^0.6.1""
-istanbul-reports@^2.2.2:
- version ""2.2.2""
- resolved ""https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.2.tgz#b84303c46fc0541c3c3b69abae687c42a6907d44""
- integrity sha512-ZFuTdBQ3PSaPnm02aEA4R6mzQ2AF9w03CYiXADzWbbE48v/EFOWF4MaX4FT0NRdqIk48I7o0RPi+S8TMswaCbQ==
+istanbul-reports@^2.2.3:
+ version ""2.2.3""
+ resolved ""https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.3.tgz#14e0d00ecbfa9387757999cf36599b88e9f2176e""
+ integrity sha512-T6EbPuc8Cb620LWAYyZ4D8SSn06dY9i1+IgUX2lTH8gbwflMc9Obd33zHTyNX653ybjpamAHS9toKS3E6cGhTw==
dependencies:
handlebars ""^4.1.0""
",6
"diff --git a/modules/task/docker/src/taskRunner.js b/modules/task/docker/src/taskRunner.js @@ -146,3 +146,15 @@ const executeTask$ = ({id, name, params}) => {
}
module.exports = {executeTask$}
+
+// const job = require('root/jobs/job')
+
+// module.exports = job({
+// jobName: 'execute task',
+// jobPath: __filename,
+// initArgs: () => ({config: require('root/config')}),
+// before: [require('root/jobs/setConfig'), require('root/jobs/ee/initialize')],
+// services: [require('../driveLimiter').limiter],
+// args: ctx => [ctx], // TODO make it more flexible by allowing multiple params
+// executeTask$
+// })
",6
"diff --git a/modules/gui/frontend/src/widget/tabs/tabs.js b/modules/gui/frontend/src/widget/tabs/tabs.js @@ -7,7 +7,7 @@ import {TabContent} from './tabContent'
import {TabHandle} from './tabHandle'
import {compose} from 'compose'
import {connect, select} from 'store'
-import {delay} from 'rxjs/operators'
+import {delay, filter} from 'rxjs/operators'
import {isMobile} from 'widget/userAgent'
import {msg} from 'translate'
import Keybinding from 'widget/keybinding'
@@ -83,9 +83,10 @@ class _Tabs extends React.Component {
constructor(props) {
super(props)
const {tabs, statePath} = props
- if (tabs.length === 0)
+ if (tabs.length === 0) {
addTab(statePath)
}
+ }
renderTab(tab) {
const {selectedTabId, statePath, onTitleChanged, onClose} = this.props
@@ -100,9 +101,7 @@ class _Tabs extends React.Component {
closing={tab.ui && tab.ui.closing}
statePath={statePath}
onTitleChanged={onTitleChanged}
- onClose={() => {
- onClose ? onClose(tab, close) : close()
- }}
+ onClose={() => onClose ? onClose(tab, close) : close()}
/>
)
}
@@ -195,6 +194,7 @@ class _Tabs extends React.Component {
}
renderAddButton() {
+ const {onAdd} = this.props
return (
<Button
chromeless
@@ -204,21 +204,24 @@ class _Tabs extends React.Component {
icon='plus'
tooltip={msg('widget.tabs.addTab.tooltip')}
tooltipPlacement='bottom'
- disabled={this.isAddDisabled()}
+ disabled={this.isAddDisabled() && !onAdd}
onClick={() => this.addTab()}/>
)
}
addTab() {
+ const {onAdd} = this.props
const {statePath, tabs, isLandingTab} = this.props
+ if (!this.isAddDisabled()) {
if (isLandingTab) {
const tab = tabs.find(tab => isLandingTab(tab))
if (tab) {
return selectTab(tab.id, statePath)
}
}
- if (!this.isAddDisabled()) {
addTab(statePath)
+ } else {
+ onAdd && onAdd()
}
}
@@ -250,10 +253,11 @@ class _Tabs extends React.Component {
}
handleCloseTab() {
- const {addSubscription} = this.props
+ const {addSubscription, statePath} = this.props
addSubscription(
close$.pipe(
- delay(CLOSE_ANIMATION_DURATION_MS * 1.2)
+ filter(tab => tab.statePath === statePath),
+ delay(CLOSE_ANIMATION_DURATION_MS * 1.2),
).subscribe(
({id, statePath, nextId}) => this.finalizeCloseTab(id, statePath, nextId)
)
@@ -303,6 +307,7 @@ Tabs.propTypes = {
selectedTabId: PropTypes.string,
tabActions: PropTypes.func,
tabs: PropTypes.array,
+ onAdd: PropTypes.func,
onClose: PropTypes.func,
onTitleChanged: PropTypes.func
}
",6
"diff --git a/package.json b/package.json ""test"": ""jest"",
""preversion"": ""npm run test"",
""version"": ""./rnv/utils/update-versions.sh"",
- ""doc"": ""doctoc . --maxlevel 1""
+ ""doc"": ""doctoc . --maxlevel 1"",
+ ""prepare"": ""npm run build""
},
""dependencies"": {
""babel-polyfill"": ""6.26.0"",
",6
"diff --git a/packages/jest-preact-preset/package.json b/packages/jest-preact-preset/package.json ""name"": ""jest-preact-preset"",
""version"": ""1.0.0"",
""license"": ""MIT"",
+ ""main"": ""src/config.js"",
""author"": ""Preact Authors <core@preactjs.com>"",
""scripts"": {
""test"": ""jest""
""jest"": {
""preset"": ""./jest-preset.js""
},
+ ""files"": [
+ ""src"",
+ ""jest-preset.js""
+ ],
""dependencies"": {
""@babel/core"": ""^7.5.5"",
""babel-jest"": ""^24.8.0"",
",6
"diff --git a/v3/src/actions/GridAlign.js b/v3/src/actions/GridAlign.js @@ -65,15 +65,23 @@ var GridAlign = function (items, options)
var position = GetObjectValue(options, 'position', CONST.TOP_LEFT);
var x = GetObjectValue(options, 'x', 0);
var y = GetObjectValue(options, 'y', 0);
-
- tempZone.setPosition(x, y);
- tempZone.setSize(cellWidth, cellHeight);
+ // var centerX = GetObjectValue(options, 'centerX', null);
+ // var centerY = GetObjectValue(options, 'centerY', null);
var cx = 0;
var cy = 0;
var w = (width * cellWidth);
var h = (height * cellHeight);
+ // If the Grid is centered on a position then we need to calculate it now
+ // if (centerX !== null && centerY !== null)
+ // {
+ //
+ // }
+
+ tempZone.setPosition(x, y);
+ tempZone.setSize(cellWidth, cellHeight);
+
for (var i = 0; i < items.length; i++)
{
AlignIn(items[i], tempZone, position);
",6
"diff --git a/src/tilemaps/Tile.js b/src/tilemaps/Tile.js @@ -733,8 +733,9 @@ var Tile = new Class({
this.pixelY = this.y * this.baseHeight;
console.log(""orthopix ""+this.pixelX+"",""+this.pixelY)
} else if (this.orientation === ""isometric"" ||true) {
- // for the image to be centered we have to move the image to the right.
- this.pixelX = this.layer.widthInPixels/2 + (this.x - this.y) * this.baseWidth *0.5;
+ // for the image to be centered we have to move the image to the right with the camera !
+ // this is crucial for wordtotile, tiletoworld to work.
+ this.pixelX = (this.x - this.y) * this.baseWidth *0.5;
this.pixelY = (this.x + this.y) * this.baseHeight *0.5;
console.log(""isopix ""+this.pixelX+"",""+this.pixelY)
// console.log(this)
",6
"diff --git a/katas/libraries/hamjest/assertThat.js b/katas/libraries/hamjest/assertThat.js +// 1: assertThat
+// To do: make all tests pass, leave the assert lines unchanged!
+
import {
assertThat, equalTo,
containsString, throws, returns,
@@ -10,7 +13,8 @@ describe('The core function, `assertThat()`', () => {
});
describe('requires at least two params', () => {
it('1st: the actual value', () => {
- assertThat('actual', equalTo('actual'));
+ const expected = equalTo('actual');
+ assertThat('actual', expected);
});
it('2nd: a matcher for the expected value', () => {
const matcher = equalTo('expected');
",6
"diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -4,6 +4,12 @@ See [UPGRADE.md](UPGRADE.md) for notes on breaking changes for downstream develo
## Current
+## v9.0.1
+
+- Upgraded standard to v14 with subsequent formatting tweaks
+- createReadStream is up to 8x faster now! ([#261](https://github.com/hypercore-protocol/hypercore/pull/261) by [@tinchoz49](https://github.com/tinchoz49))
+- Fixed benchmarks ([#266](https://github.com/hypercore-protocol/hypercore/pull/266) by [@fwip](https://github.com/fwip))
+
## v9.0.0
- Ease of use update to signatures, https://github.com/mafintosh/hypercore/issues/260
",6
"diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -4,6 +4,10 @@ See [UPGRADE.md](UPGRADE.md) for notes on breaking changes for downstream develo
## Current
+## v9.1.0
+
+- Make peer.remoteOpened public ([#268](https://github.com/hypercore-protocol/hypercore/pull/268))
+
## v9.0.1
- Upgraded standard to v14 with subsequent formatting tweaks
",6
"diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -4,6 +4,10 @@ See [UPGRADE.md](UPGRADE.md) for notes on breaking changes for downstream develo
## Current
+## v9.2.0
+
+- Add `maxBlockSize` on write streams to auto chunk big blocks being written.
+
## v9.1.0
- Make peer.remoteOpened public ([#268](https://github.com/hypercore-protocol/hypercore/pull/268))
",6
"diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -4,6 +4,10 @@ See [UPGRADE.md](UPGRADE.md) for notes on breaking changes for downstream develo
## Current
+## v9.3.0
+
+- feed.get returns an id, that can be used to cancel a pending get with feed.cancel(getId)
+
## v9.2.0
- Add `maxBlockSize` on write streams to auto chunk big blocks being written.
",6
"diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -4,6 +4,10 @@ See [UPGRADE.md](UPGRADE.md) for notes on breaking changes for downstream develo
## Current
+## v9.4.0
+
+- feed.get accepts onwait hook, that is called if get is waiting for a network peer.
+
## v9.3.0
- feed.get returns an id, that can be used to cancel a pending get with feed.cancel(getId)
",6
"diff --git a/index.js b/index.js @@ -1195,8 +1195,10 @@ Feed.prototype._unannounce = function (message) {
for (var i = 0; i < this.peers.length; i++) this.peers[i].unhave(message)
}
-Feed.prototype.downloaded = function (start, end) {
- return this.bitfield.total(start, end)
+Feed.prototype.downloaded = function (start, end, cb) {
+ const count = this.bitfield.total(start, end)
+ if (cb) process.nextTick(cb, null, count) // prepare async interface for this
+ return count
}
Feed.prototype.has = function (start, end, cb) {
",6
"diff --git a/views/public/search.pug b/views/public/search.pug @@ -110,8 +110,7 @@ block content
if (e.which == 13) {
var searchQuery = $('.search-query-input').val()
- window.location = '/search?orderBy=' + orderBy + '&mediaType=' + mediaType + '&searchQuery=' + searchQuery + '&searchType=' + searchType
-
+ window.location = '/search?orderBy=' + orderBy + '&mediaType=' + mediaType + '&searchQuery=' + searchQuery + '&searchType=upload'
}
});
})
",6
"diff --git a/events/message.js b/events/message.js @@ -10,6 +10,14 @@ exports.run = async (client, msg) => {
if (msg.guild.id !== '332612123492483094') return undefined;
}
+ if (msg.guild.id === '352896116812939264' && (msg.channel.id === '440184907411619851' || msg.channel.id === '440184885781594113')) {
+ const noemoji = msg.guild.emojis.find('name', 'no');
+ const yesemoji = msg.guild.emojis.find('name', 'yes');
+
+ await msg.react(noemoji);
+ await msg.react(yesemoji);
+ }
+
const userconfs = {
inventory: {
crate: 0,
",6
"diff --git a/CHANGELOG.md b/CHANGELOG.md # Browsertime changelog
-## 12.0.0-beta.1 - 2021-04-08
+## 12.0.0-beta.2 - UNRELEASED
### Changed
* Display standard deviation instead of the home made median deviation in the cli output [#1529](https://github.com/sitespeedio/browsertime/pull/1529).
### Fixed
* Fix --chrome.blockDomainsExcept when you are using WebPageReplay [#1532](https://github.com/sitespeedio/browsertime/pull/1532). Thank you [Inderpartap Singh Cheema](https://github.com/inderpartap) for the original fix!
* Make sure gnirehtet is closed on the right device using device id [#1527](https://github.com/sitespeedio/browsertime/pull/1527)
-* Upgraded to Geckodriver 0.29.0 [#1501](https://github.com/sitespeedio/browsertime/pull/1501).
+* Upgraded to Geckodriver 0.29.1.
* Updated wpr_cert.pem to a new version for WebPageReplay [#1316](https://github.com/sitespeedio/browsertime/pull/1316).
* Include Google Web Vitals in the HAR file [#1535](https://github.com/sitespeedio/browsertime/pull/1535).
+* Added 3 seconds wait time for geckoprofiler to start see [#1538](https://github.com/sitespeedio/browsertime/issues/1538) and [#1539](https://github.com/sitespeedio/browsertime/pull/1539)
### Added
* New metrics: Delta between TTFB and First Contentful Paint, Largest Contentful paint and First visual change [#1528](https://github.com/sitespeedio/browsertime/pull/1528).
* Made it easier for people to get Google Web Vitals. We copy that data under the googleWebVitals namespace [#1521](https://github.com/sitespeedio/browsertime/pull/1521).
",6
"diff --git a/test/VestedToken.js b/test/VestedToken.js @@ -40,7 +40,7 @@ contract('VestedToken', function(accounts) {
})
it('all tokens are transferable after vesting', async () => {
- assert.equal(await token.transferableTokens(receiver, now + vesting + 1), tokenAmount);
+ assert.equal(await token.transferableTokens(receiver, now + vesting), tokenAmount);
})
it('throws when trying to transfer non vested tokens', async () => {
@@ -84,16 +84,34 @@ contract('VestedToken', function(accounts) {
})
it('can transfer all tokens after vesting ends', async () => {
- await timer(vesting + 1);
+ await timer(vesting);
await token.transfer(accounts[7], tokenAmount, { from: receiver })
assert.equal(await token.balanceOf(accounts[7]), tokenAmount);
})
it('can approve and transferFrom all tokens after vesting ends', async () => {
- await timer(vesting + 1);
+ await timer(vesting);
await token.approve(accounts[7], tokenAmount, { from: receiver })
await token.transferFrom(receiver, accounts[7], tokenAmount, { from: accounts[7] })
assert.equal(await token.balanceOf(accounts[7]), tokenAmount);
})
+
+ it('can handle composed vesting schedules', async () => {
+ await timer(cliff);
+ await token.transfer(accounts[7], 12, { from: receiver })
+ assert.equal(await token.balanceOf(accounts[7]), 12);
+
+ let newNow = web3.eth.getBlock(web3.eth.blockNumber).timestamp
+
+ await token.grantVestedTokens(receiver, tokenAmount, newNow, newNow + cliff, newNow + vesting, { from: granter })
+ await token.transfer(accounts[7], 13, { from: receiver })
+ assert.equal(await token.balanceOf(accounts[7]), tokenAmount / 2);
+
+ assert.equal(await token.balanceOf(receiver), 3 * tokenAmount / 2)
+ assert.equal(await token.transferableTokens(receiver, newNow), 0)
+ await timer(vesting);
+ await token.transfer(accounts[7], 3 * tokenAmount / 2, { from: receiver })
+ assert.equal(await token.balanceOf(accounts[7]), tokenAmount * 2)
+ })
})
});
",7
"diff --git a/contracts/math/SafeMath.sol b/contracts/math/SafeMath.sol @@ -7,8 +7,11 @@ pragma solidity ^0.4.11;
*/
library SafeMath {
function mul(uint256 a, uint256 b) internal constant returns (uint256) {
+ if (a == 0) {
+ return 0;
+ }
uint256 c = a * b;
- assert(a == 0 || c / a == b);
+ assert(c / a == b);
return c;
}
",7
"diff --git a/test/helpers/timer.js b/test/helpers/timer.js +'use strict';
+
// timer for tests specific to testrpc
-module.exports = s => {
+// s is the amount of seconds to advance
+// if account is provided, will send a transaction from that account to force testrpc to mine the block
+module.exports = (s) => {
return new Promise((resolve, reject) => {
web3.currentProvider.sendAsync({
jsonrpc: '2.0',
method: 'evm_increaseTime',
- params: [s], // 60 seaconds, may need to be hex, I forget
- id: new Date().getTime() // Id of the request; anything works, really
+ params: [s],
+ id: new Date().getTime()
}, function(err) {
- if (err) return reject(err);
- resolve();
+ if (err) {
+ return reject(err);
+ }
+ web3.currentProvider.sendAsync({
+ jsonrpc: '2.0',
+ method: 'evm_mine',
+ id: new Date().getTime()
+ }, (err, result) => {
+ if (err) {
+ return reject(err);
+ }
+ resolve(result);
+ });
});
- //setTimeout(() => resolve(), s * 1000 + 600) // 600ms breathing room for testrpc to sync
});
};
",7
"diff --git a/contracts/math/SafeMath.sol b/contracts/math/SafeMath.sol @@ -25,7 +25,7 @@ library SafeMath {
}
/**
- * @dev Integer division of two numbers, truncating the quotient.
+ * @dev Integer division of two numbers truncating the quotient, reverts on division by zero.
*/
function div(uint256 _a, uint256 _b) internal pure returns (uint256) {
require(_b > 0); // Solidity only automatically asserts when dividing by 0
",7
"diff --git a/contracts/token/ERC721/ERC721.sol b/contracts/token/ERC721/ERC721.sol @@ -21,6 +21,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Enumerable
using Address for address;
using EnumerableSet for EnumerableSet.UintSet;
using EnumerableMap for EnumerableMap.UintToAddressMap;
+ using Strings for uint256;
// Equals to `bytes4(keccak256(""onERC721Received(address,address,uint256,bytes)""))`
// which can be also obtained as `IERC721Receiver(0).onERC721Received.selector`
@@ -153,7 +154,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Enumerable
return string(abi.encodePacked(_baseURI, _tokenURI));
}
// If there is a baseURI but no tokenURI, concatenate the tokenID to the baseURI.
- return string(abi.encodePacked(_baseURI, Strings.toString(tokenId)));
+ return string(abi.encodePacked(_baseURI, tokenId.toString()));
}
/**
",7
"diff --git a/contracts/utils/Pausable.sol b/contracts/utils/Pausable.sol @@ -40,6 +40,10 @@ contract Pausable is Context {
/**
* @dev Modifier to make a function callable only when the contract is not paused.
+ *
+ * Requirements:
+ *
+ * - The contract must not be paused.
*/
modifier whenNotPaused() {
require(!_paused, ""Pausable: paused"");
@@ -48,6 +52,10 @@ contract Pausable is Context {
/**
* @dev Modifier to make a function callable only when the contract is paused.
+ *
+ * Requirements:
+ *
+ * - The contract must be paused.
*/
modifier whenPaused() {
require(_paused, ""Pausable: not paused"");
@@ -56,6 +64,10 @@ contract Pausable is Context {
/**
* @dev Triggers stopped state.
+ *
+ * Requirements:
+ *
+ * - The contract must not be paused.
*/
function _pause() internal virtual whenNotPaused {
_paused = true;
@@ -64,6 +76,10 @@ contract Pausable is Context {
/**
* @dev Returns to normal state.
+ *
+ * Requirements:
+ *
+ * - The contract must be paused.
*/
function _unpause() internal virtual whenPaused {
_paused = false;
",7
"diff --git a/contracts/math/SignedSafeMath.sol b/contracts/math/SignedSafeMath.sol @@ -10,7 +10,14 @@ library SignedSafeMath {
int256 constant private _INT256_MIN = -2**255;
/**
- * @dev Multiplies two signed integers, reverts on overflow.
+ * @dev Returns the multiplication of two signed integers, reverting on
+ * overflow.
+ *
+ * Counterpart to Solidity's `*` operator.
+ *
+ * Requirements:
+ *
+ * - Multiplication cannot overflow.
*/
function mul(int256 a, int256 b) internal pure returns (int256) {
// Gas optimization: this is cheaper than requiring 'a' not being zero, but the
@@ -29,7 +36,16 @@ library SignedSafeMath {
}
/**
- * @dev Integer division of two signed integers truncating the quotient, reverts on division by zero.
+ * @dev Returns the integer division of two signed integers. Reverts on
+ * division by zero. The result is rounded towards zero.
+ *
+ * Counterpart to Solidity's `/` operator. Note: this function uses a
+ * `revert` opcode (which leaves remaining gas untouched) while Solidity
+ * uses an invalid opcode to revert (consuming all remaining gas).
+ *
+ * Requirements:
+ *
+ * - The divisor cannot be zero.
*/
function div(int256 a, int256 b) internal pure returns (int256) {
require(b != 0, ""SignedSafeMath: division by zero"");
@@ -41,7 +57,14 @@ library SignedSafeMath {
}
/**
- * @dev Subtracts two signed integers, reverts on overflow.
+ * @dev Returns the subtraction of two signed integers, reverting on
+ * overflow.
+ *
+ * Counterpart to Solidity's `-` operator.
+ *
+ * Requirements:
+ *
+ * - Subtraction cannot overflow.
*/
function sub(int256 a, int256 b) internal pure returns (int256) {
int256 c = a - b;
@@ -51,7 +74,14 @@ library SignedSafeMath {
}
/**
- * @dev Adds two signed integers, reverts on overflow.
+ * @dev Returns the addition of two signed integers, reverting on
+ * overflow.
+ *
+ * Counterpart to Solidity's `+` operator.
+ *
+ * Requirements:
+ *
+ * - Addition cannot overflow.
*/
function add(int256 a, int256 b) internal pure returns (int256) {
int256 c = a + b;
",7
"diff --git a/test/token/ERC20/ERC20Snapshot.test.js b/test/token/ERC20/ERC20Snapshot.test.js @@ -134,7 +134,7 @@ describe('ERC20Snapshot', function () {
context('with balance changes after the snapshot', function () {
beforeEach(async function () {
await this.token.transfer(recipient, new BN('10'), { from: initialHolder });
- await this.token.mint(recipient, new BN('50'));
+ await this.token.mint(other, new BN('50'));
await this.token.burn(initialHolder, new BN('20'));
});
",7
"diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml @@ -14,11 +14,13 @@ jobs:
with:
node-version: 10.x
- uses: actions/cache@v2
+ id: cache
with:
- path: ~/.npm
- key: npm-${{ hashFiles('**/package-lock.json') }}
- restore-keys: npm-
+ path: '**/node_modules'
+ key: npm-v2-${{ hashFiles('**/package-lock.json') }}
+ restore-keys: npm-v2-
- run: npm ci
+ if: steps.cache.outputs.cache-hit != 'true'
- run: npm run lint
- run: npm run test
@@ -30,10 +32,12 @@ jobs:
with:
node-version: 10.x
- uses: actions/cache@v2
+ id: cache
with:
- path: ~/.npm
- key: npm-${{ hashFiles('**/package-lock.json') }}
- restore-keys: npm-
+ path: '**/node_modules'
+ key: npm-v2-${{ hashFiles('**/package-lock.json') }}
+ restore-keys: npm-v2-
- run: npm ci
+ if: steps.cache.outputs.cache-hit != 'true'
- run: npm run coverage
- uses: codecov/codecov-action@v1
",7
"diff --git a/contracts/proxy/utils/Initializable.sol b/contracts/proxy/utils/Initializable.sol @@ -18,10 +18,9 @@ pragma solidity ^0.8.0;
* ====
* Avoid leaving a contract uninitialized.
*
- * An uninitialized contract can be used in certain kinds of exploits since it may allow an attacker to take control of
- * the contract. This includes the implementation contract behind a proxy. You can either invoke the initializer
- * manually, independently of initialization of the proxy, or you can include a constructor to automatically mark it as
- * initialized when it is deployed:
+ * An uninitialized contract can be taken over by an attacker. This applies to both a proxy and its implementation
+ * contract, which may impact the proxy. To initialize the implementation contract, you can either invoke the
+ * initializer manually, or you can include a constructor to automatically mark it as initialized when it is deployed:
*
* [.hljs-theme-light.nopadding]
* ```
",7
"diff --git a/docs/modules/ROOT/pages/governance.adoc b/docs/modules/ROOT/pages/governance.adoc @@ -250,7 +250,11 @@ It is good practice to add a timelock to governance decisions. This allows users
IMPORTANT: When using a timelock, it is the timelock that will execute proposals and thus the timelock that should hold any funds, ownership, and access control roles. Funds in the Governor contract are not currently retrievable when using a timelock! (As of version 4.3 there is a caveat when using the Compound Timelock: ETH in the timelock is not easily usable, so it is recommended to manage ERC20 funds only in this combination until a future version resolves the issue.)
-TimelockController uses an AccessControl setup that we need to understand in order to set up roles. The Proposer role is in charge of queueing operations: this is the role the Governor instance should be granted, and it should likely be the only proposer in the system. The Executor role is in charge of executing already available operations: we can assign this role to the special zero address to allow anyone to execute (if operations can be particularly time sensitive, the Governor should be made Executor instead). Lastly, there is the Admin role, which can grant and revoke the two previous roles: this is a very sensitive role that will be granted automatically to both deployer and timelock itself, but should be renounced by the deployer after setup.
+TimelockController uses an AccessControl setup that we need to understand in order to set up roles.
+
+- The Proposer role is in charge of queueing operations: this is the role the Governor instance should be granted, and it should likely be the only proposer in the system.
+- The Executor role is in charge of executing already available operations: we can assign this role to the special zero address to allow anyone to execute (if operations can be particularly time sensitive, the Governor should be made Executor instead).
+- Lastly, there is the Admin role, which can grant and revoke the two previous roles: this is a very sensitive role that will be granted automatically to both deployer and timelock itself, but should be renounced by the deployer after setup.
== Proposal Lifecycle
",7
"diff --git a/contracts/proxy/utils/Initializable.sol b/contracts/proxy/utils/Initializable.sol @@ -5,7 +5,7 @@ pragma solidity ^0.8.0;
/**
* @dev This is a base contract to aid in writing upgradeable contracts, or any kind of contract that will be deployed
- * behind a proxy. Since a proxied contract can't have a constructor, it's common to move constructor logic to an
+ * behind a proxy. Since proxied contracts do not make use of a constructor, it's common to move constructor logic to an
* external initializer function, usually called `initialize`. It then becomes necessary to protect this initializer
* function so it can only be called once. The {initializer} modifier provided by this contract will have this effect.
*
",7
"diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml contact_links:
- - name: Support request
+ - name: Questions & Support Requests
url: https://forum.openzeppelin.com/c/support/contracts/18
- about: Ask the community in the Community Forum
+ about: Ask in the OpenZeppelin Forum
",7
"diff --git a/contracts/token/ERC721/extensions/ERC721URIStorage.sol b/contracts/token/ERC721/extensions/ERC721URIStorage.sol @@ -48,14 +48,9 @@ abstract contract ERC721URIStorage is ERC721 {
}
/**
- * @dev Destroys `tokenId`.
- * The approval is cleared when the token is burned.
- *
- * Requirements:
- *
- * - `tokenId` must exist.
- *
- * Emits a {Transfer} event.
+ * @dev See {ERC721-_burn}. This override additionally checks to see if a
+ * token-specific URI was set for the token, and if so, it deletes the token URI from
+ * the storage mapping.
*/
function _burn(uint256 tokenId) internal virtual override {
super._burn(tokenId);
",7
"diff --git a/contracts/token/ERC1155/ERC1155.sol b/contracts/token/ERC1155/ERC1155.sol @@ -480,7 +480,7 @@ contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI {
} catch Error(string memory reason) {
revert(reason);
} catch {
- revert(""ERC1155: transfer to non ERC1155Receiver implementer"");
+ revert(""ERC1155: transfer to non-ERC1155Receiver implementer"");
}
}
}
@@ -503,7 +503,7 @@ contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI {
} catch Error(string memory reason) {
revert(reason);
} catch {
- revert(""ERC1155: transfer to non ERC1155Receiver implementer"");
+ revert(""ERC1155: transfer to non-ERC1155Receiver implementer"");
}
}
}
",7
"diff --git a/contracts/proxy/utils/UUPSUpgradeable.sol b/contracts/proxy/utils/UUPSUpgradeable.sol @@ -46,7 +46,7 @@ abstract contract UUPSUpgradeable is IERC1822Proxiable, ERC1967Upgrade {
/**
* @dev Implementation of the ERC1822 {proxiableUUID} function. This returns the storage slot used by the
- * implementation. It is used to validate that the this implementation remains valid after an upgrade.
+ * implementation. It is used to validate the implementation's compatibility when performing an upgrade.
*
* IMPORTANT: A proxy pointing at a proxiable contract should not be considered proxiable itself, because this risks
* bricking a proxy that upgrades to it, by delegating to itself until out of gas. Thus it is critical that this
",7
"diff --git a/contracts/token/ERC721/IERC721.sol b/contracts/token/ERC721/IERC721.sol @@ -81,7 +81,9 @@ interface IERC721 is IERC165 {
/**
* @dev Transfers `tokenId` token from `from` to `to`.
*
- * WARNING: Usage of this method is discouraged, use {safeTransferFrom} whenever possible.
+ * WARNING: Note that the caller is responsible to confirm that the recipient is capable of receiving ERC721
+ * or else they may be permanently lost. Usage of {safeTransferFrom} prevents loss, though the caller must
+ * understand this adds an external call which potentially creates a reentrancy vulnerability.
*
* Requirements:
*
",7
"diff --git a/contracts/utils/cryptography/MerkleProof.sol b/contracts/utils/cryptography/MerkleProof.sol @@ -124,7 +124,7 @@ library MerkleProof {
bool[] memory proofFlags,
bytes32[] memory leaves
) internal pure returns (bytes32 merkleRoot) {
- // This function rebuild the root hash by traversing the tree up from the leaves. The root is rebuilt by
+ // This function rebuilds the root hash by traversing the tree up from the leaves. The root is rebuilt by
// consuming and producing values on a queue. The queue starts with the `leaves` array, then goes onto the
// `hashes` array. At the end of the process, the last hash in the `hashes` array should contain the root of
// the merkle tree.
@@ -147,7 +147,9 @@ library MerkleProof {
// `proof` array.
for (uint256 i = 0; i < totalHashes; i++) {
bytes32 a = leafPos < leavesLen ? leaves[leafPos++] : hashes[hashPos++];
- bytes32 b = proofFlags[i] ? leafPos < leavesLen ? leaves[leafPos++] : hashes[hashPos++] : proof[proofPos++];
+ bytes32 b = proofFlags[i]
+ ? (leafPos < leavesLen ? leaves[leafPos++] : hashes[hashPos++])
+ : proof[proofPos++];
hashes[i] = _hashPair(a, b);
}
@@ -172,7 +174,7 @@ library MerkleProof {
bool[] calldata proofFlags,
bytes32[] memory leaves
) internal pure returns (bytes32 merkleRoot) {
- // This function rebuild the root hash by traversing the tree up from the leaves. The root is rebuilt by
+ // This function rebuilds the root hash by traversing the tree up from the leaves. The root is rebuilt by
// consuming and producing values on a queue. The queue starts with the `leaves` array, then goes onto the
// `hashes` array. At the end of the process, the last hash in the `hashes` array should contain the root of
// the merkle tree.
@@ -195,7 +197,9 @@ library MerkleProof {
// `proof` array.
for (uint256 i = 0; i < totalHashes; i++) {
bytes32 a = leafPos < leavesLen ? leaves[leafPos++] : hashes[hashPos++];
- bytes32 b = proofFlags[i] ? leafPos < leavesLen ? leaves[leafPos++] : hashes[hashPos++] : proof[proofPos++];
+ bytes32 b = proofFlags[i]
+ ? (leafPos < leavesLen ? leaves[leafPos++] : hashes[hashPos++])
+ : proof[proofPos++];
hashes[i] = _hashPair(a, b);
}
",7
"diff --git a/test/utils/Strings.test.js b/test/utils/Strings.test.js @@ -132,10 +132,16 @@ contract('Strings', function (accounts) {
expect(await this.strings.methods['equal(string,string)']('aa', 'a')).to.equal(false);
});
- it('compares two different strings of different (big) lengths', async function () {
+ it('compares two different large strings', async function () {
const str1 = 'a'.repeat(201);
const str2 = 'a'.repeat(200) + 'b';
expect(await this.strings.methods['equal(string,string)'](str1, str2)).to.equal(false);
});
+
+ it('compares two equal large strings', async function () {
+ const str1 = 'a'.repeat(201);
+ const str2 = 'a'.repeat(201);
+ expect(await this.strings.methods['equal(string,string)'](str1, str2)).to.equal(true);
+ });
});
});
",7
"diff --git a/contracts/token/ERC20/ERC20.sol b/contracts/token/ERC20/ERC20.sol @@ -18,6 +18,9 @@ import ""../../utils/Context.sol"";
* https://forum.openzeppelin.com/t/how-to-implement-erc20-supply-mechanisms/226[How
* to implement supply mechanisms].
*
+ * The default value of {decimals} is 18. To change this, you should override
+ * this function so it returns a different value.
+ *
* We have followed general OpenZeppelin Contracts guidelines: functions revert
* instead returning `false` on failure. This behavior is nonetheless
* conventional and does not conflict with the expectations of ERC20
@@ -45,9 +48,6 @@ contract ERC20 is Context, IERC20, IERC20Metadata {
/**
* @dev Sets the values for {name} and {symbol}.
*
- * The default value of {decimals} is 18. To select a different value for
- * {decimals} you should overload it.
- *
* All two of these values are immutable: they can only be set once during
* construction.
*/
@@ -77,8 +77,8 @@ contract ERC20 is Context, IERC20, IERC20Metadata {
* be displayed to a user as `5.05` (`505 / 10 ** 2`).
*
* Tokens usually opt for a value of 18, imitating the relationship between
- * Ether and Wei. This is the value {ERC20} uses, unless this function is
- * overridden;
+ * Ether and Wei. This is the default value returned by this function, unless
+ * it's overridden.
*
* NOTE: This information is only used for _display_ purposes: it in
* no way affects any of the arithmetic of the contract, including
",7
"diff --git a/scripts/release/workflow/start.sh b/scripts/release/workflow/start.sh @@ -29,4 +29,7 @@ git add .
git commit -m ""Start release candidate""
# Push branch
-git push origin ""$RELEASE_BRANCH""
+if ! git push origin ""$RELEASE_BRANCH""; then
+ echo ""::error file=scripts/release/start.sh::Can't push $RELEASE_BRANCH. Did you forget to run this workflow from $RELEASE_BRANCH?""
+ exit 1
+fi
",7
"diff --git a/test/token/ERC721/extensions/ERC721Wrapper.test.js b/test/token/ERC721/extensions/ERC721Wrapper.test.js @@ -196,11 +196,21 @@ contract('ERC721Wrapper', function (accounts) {
to: initialHolder,
tokenId: firstTokenId,
});
+ await expectEvent.inTransaction(tx, this.underlying, 'Transfer', {
+ from: this.token.address,
+ to: initialHolder,
+ tokenId: secondTokenId,
+ });
await expectEvent.inTransaction(tx, this.token, 'Transfer', {
from: initialHolder,
to: constants.ZERO_ADDRESS,
tokenId: firstTokenId,
});
+ await expectEvent.inTransaction(tx, this.token, 'Transfer', {
+ from: initialHolder,
+ to: constants.ZERO_ADDRESS,
+ tokenId: secondTokenId,
+ });
});
it('works to another account', async function () {
",7
"diff --git a/src/modules/Datasets/components/Datasets/Datasets.js b/src/modules/Datasets/components/Datasets/Datasets.js @@ -32,66 +32,51 @@ class Datasets extends Component {
}
componentWillMount() {
- return this.search()
+ return this.fetchRecords()
}
componentWillUnmount() {
return cancelAllPromises(this)
}
- search(changes = {}) {
- const params = Object.assign({}, this.state, changes);
- let { textInput, filters, offset, page } = params
- const query = buildSearchQuery(textInput, filters, page)
+ fetchRecords() {
+ const { textInput, filters, page = 1 } = this.state
let allFilters = filters
-
- if (!offset && page) {
- offset = (page - 1) * 20 // Comment remplacer 20 par limit
- }
-
+ const offset = (page - 1) * 20
if (this.props.pathname === 'datasets') {
allFilters = [...filters, { name: 'availability', value: 'yes' }]
}
+ return waitForDataAndSetState(search(textInput, allFilters, offset), this, 'datasets')
+ }
+ search(changes = {}) {
+ window.scrollTo(0, 0);
+ return this.setState(changes, () => {
+ const params = Object.assign({}, this.state, changes)
+ let { textInput, filters, page } = params
+ const query = buildSearchQuery(textInput, filters, page)
+ if (window.location.search === `?${query}`) return
browserHistory.push(`${this.props.pathname}?${query}`)
-
- return waitForDataAndSetState(search(textInput, allFilters, offset), this, 'datasets')
+ return this.fetchRecords()
+ })
}
addFilter(filter) {
const filters = addFilter(this.state.filters, filter)
- const changes = { filters, offset: 0, page: 1, datasets: null }
-
- this.setState(changes)
- this.search(changes)
+ return this.search({ filters, page: 1, datasets: null })
}
removeFilter(filter) {
const filters = removeFilter(this.state.filters, filter)
- const changes = { filters, offset: 0, page: 1, datasets: null }
-
- this.setState(changes)
- this.search(changes)
+ return this.search({ filters, page: 1, datasets: null })
}
userSearch(textInput) {
- const changes = { textInput, datasets: null, offset: 0, page: 1 }
- this.setState(changes)
- this.search(changes)
+ return this.search({ textInput, datasets: null, page: 1 })
}
- handleChangePage(data) {
- const limit = this.state.datasets.query.limit
- const selected = data.selected
- const offset = Math.ceil(selected * limit)
- const page = (offset / limit) + 1
- const changes = { page, offset }
-
- window.scrollTo(0, 0);
-
- this.setState(changes, () => {
- this.search(changes)
- })
+ handleChangePage({ selected }) {
+ return this.search({ page: selected + 1 })
}
render() {
",7
"diff --git a/src/components/Dropdown/Dropdown.scss b/src/components/Dropdown/Dropdown.scss display: none;
position: absolute;
background-color: #fff;
+ width: 100px;
+ right: 0;
text-align: left;
- margin-left: -90px;
box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2);
z-index: 1;
",7
"diff --git a/app/styles/components/_article.scss b/app/styles/components/_article.scss @@ -83,4 +83,23 @@ article {
}
}
}
+
+ table {
+ td,th {
+ word-break: break-word;
+ }
+ }
+
+ @media (max-width: $medium-screen) {
+ table {
+ td,th {
+ display: block;
+ border: 0;
+ }
+
+ tr {
+ border-bottom: 1px solid darken($base-border-color, 15%);
+ }
+ }
+ }
}
",7
"diff --git a/test/integration/short/client-pool-tests.js b/test/integration/short/client-pool-tests.js @@ -781,7 +781,7 @@ describe('Client', function () {
setTimeout(next, 5000);
},
function warmUpPool(seriesNext) {
- utils.times(10, function (n, next) {
+ utils.times(20, function (n, next) {
client.execute(query, function (err, result) {
assert.ifError(err);
hosts[result.info.queriedHost] = true;
@@ -789,14 +789,14 @@ describe('Client', function () {
});
}, seriesNext);
},
- next => setImmediate(next),
+ helper.setIntervalUntilTask(() => {
+ const state = client.getState();
+ return client.hosts.values().reduce((accumulator, h) => accumulator + state.getInFlightQueries(h), 0) === 0;
+ }, 20, 100),
function testCase(seriesNext) {
// 3 hosts alive
assert.strictEqual(Object.keys(hosts).length, 3);
- const state = client.getState();
- client.hosts.forEach(h => assert.strictEqual(state.getInFlightQueries(h), 0));
-
let killed = false;
utils.timesLimit(500, 20, function (n, next) {
if (n === 30) {
",7
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -2563,26 +2563,19 @@ $.fn.datagrid = function(options) {
self = this,
field = columnDef.field,
maxText = '',
+ title = columnDef.name || '',
chooseHeader = false;
+ //Get max cell value length for this column
for (var i = 0; i < this.settings.dataset.length; i++) {
var val = this.fieldValue(this.settings.dataset[i], field),
- len = 0, title;
+ len = 0;
- //Some types should be formatted
- if (val instanceof Date || typeof val === 'number' || columnDef.dateFormat) {
- val = self.formatValue(columnDef.formatter, i , null, this.fieldValue(this.settings.dataset[i], field), columnDef, this.settings.dataset[i], self);
+ //Get formatted value (without html) so we have accurate string that will display for this cell
+ val = self.formatValue(columnDef.formatter, i, null, val, columnDef, this.settings.dataset[i], self);
val = val.replace(/<\/?[^>]+(>|$)/g, '');
- }
len = val.toString().length;
- title = columnDef.name || '';
-
- if (title.length > len) {
- chooseHeader = true;
- len = title.length;
- val = title;
- }
if (len > max) {
max = len;
@@ -2590,6 +2583,13 @@ $.fn.datagrid = function(options) {
}
}
+ //Use header text length as max if bigger than all data cells
+ if (title.length > max) {
+ max = title.length;
+ maxText = title;
+ chooseHeader = true;
+ }
+
if (maxText === '' || this.settings.dataset.length === 0) {
maxText = columnDef.name || ' Default ';
chooseHeader = true;
",7
"diff --git a/views/tests/modal/events.html b/views/tests/modal/events.html +<div class=""row"">
+ <div class=""six columns"">
+
+ <h2>Modal Test: Events</h2>
+ <p>
+ <a class=""hyperlink"" href=""http://jira/browse/SOHO-5992"">Related JIRA Ticket</a>. This test demonstrates how lifecycle events work on the Modal component. Lifecycle events include <span class=""code"">beforeopen</span>, <span class=""code"">open</span>, <span class=""code"">afteropen</span>, <span class=""code"">beforeclose</span>, <span class=""code"">close</span>, and <span class=""code"">afterclose</span>. The two modal triggers below display the order and timing in which these events fire.
+ </p>
+ <p>
+ The ""Show Modal"" trigger button creates a modal that has its opening cancelled by using <span class=""code"">return false;</span> from inside its beforeopen event. Doing this causes rendering of the modal to stop, so it won't show.
+ </p>
+
+ </div>
+</div>
+
<div class=""row"">
<div class=""twelve columns"">
+ <div class=""field"">
<button class=""btn-secondary"" type=""button"" id=""show"">Show Modal</button>
<button class=""btn-secondary"" type=""button"" id=""show2"">Show Modal 2</button>
- <div id=""modal-1"" style=""display: none"">
+ </div>
+ <div id=""modal-1"" style=""display: none;"">
<div class=""field"">
<label for=""context-name"" class=""required"">Name</label>
<input id=""context-name"" aria-required=""true"" data-validate=""required"" name=""context-name"" type=""text"">
<option value=""5"">Context #5</option>
</select>
</div>
-
</div>
- <div id=""modal-2"" style=""display: none"">
+ <div id=""modal-2"" style=""display: none;"">
<div class=""field"">
<label for=""context-name"" class=""required"">Name</label>
<input id=""context-name"" aria-required=""true"" data-validate=""required"" name=""context-name"" type=""text"">
</div>
<script>
- $('#show2').on('click', function () {
- var modal2 = $('body').modal({
- title: 'Modal 2',
- content: $('#modal-2'),
- buttons: [{
- text: 'Cancel',
- click: function(e, modal) {
- modal.close();
- }
- }, {
- text: 'Submit',
- click: function(e, modal) {
- modal.close();
+ var customContent = {
+ modal1: {
+ title: ""Add Content"",
+ content: $('#modal-1')
},
- validate: false,
- isDefault: true
- }]
- }).data('modal').element;
+ modal2: {
+ title: ""Modal 2"",
+ content: $('#modal-2')
+ }
+ };
+ function toast(message) {
+ $('body').toast({
+ title: '',
+ message: message,
+ timeout: 3000
});
+ }
- $('#show').on('click', function () {
-
+ function createModal(modalName) {
var modal = $('body').modal({
- title: 'Add a Comment',
- content: $('#modal-1'),
+ title: customContent[modalName].title,
+ content: customContent[modalName].content,
buttons: [{
text: 'Cancel',
click: function(e, modal) {
validate: false,
isDefault: true
}]
- }).data('modal').element;
+ });
- modal.on('beforeopen', function () {
- console.log('beforeopen');
- return false;
- }).on('open', function () {
- console.log('open');
+ return modal.data('modal').element;
+ }
+
+ function handleSimilarEvents(id, modalElement) {
+ var modalName = customContent[id].title
+
+ return modalElement.on('open', function () {
+ toast(modalName + ': open');
}).on('afteropen', function () {
- console.log('afteropen');
+ toast(modalName + ': afteropen');
}).on('beforeclose', function() {
- console.log('beforeclose');
+ toast(modalName + ': beforeclose');
}).on('close', function() {
- console.log('close');
+ toast(modalName + ': close');
}).on('afterclose', function() {
- console.log('afterclose');
+ toast(modalName + ': afterclose');
});
+ }
+
+ // Modal #1 doesn't display due to a 'return false;' on its `beforeopen` event
+ $('#show').on('click.test', function () {
+ var thisModal = createModal('modal1');
+ thisModal = handleSimilarEvents('modal1', thisModal);
+ thisModal.on('beforeopen', function () {
+ toast('Add Content: beforeopen');
+ return false;
+ });
+ });
+
+ // Modal #2 should display all the time, and fire all lifecycle events
+ $('#show2').on('click.test', function() {
+ var thisModal = createModal('modal2');
+ thisModal = handleSimilarEvents('modal2', thisModal);
+
+ thisModal.on('beforeopen', function() {
+ toast('Modal 2: beforeopen');
+ });
});
</script>
",7
"diff --git a/views/tests/menubutton/splitbutton.html b/views/tests/menubutton/splitbutton.html <div class=""row"">
<div class=""six columns"">
<h2>Menu Button Test</h2>
- <p>Split buttons are not officially supported. This is a non-official way you could implement them.
- </p><br />
+ <p><a class=""hyperlink"" href=""http://jira/browse/SOHO-5922"" target=""_blank"">Related JIRA Ticket</a>. Split buttons are not officially supported. This is a non-official way you could implement them.</p>
</div>
</div>
<div class=""row"">
<div class=""twelve columns"">
- <div class=""toolbar"" role=""toolbar"" data-options=""{maxVisibleButtons: 4}"">
+ <div id=""example-toolbar"" class=""toolbar"" role=""toolbar"" data-options=""{maxVisibleButtons: 4}"">
<div class=""title"">
Toolbar Title
</div>
<div class=""buttonset"">
- <button type=""button"" class=""btn"">
+ <button id=""unhelpful"" class=""btn"">
+ <span>Unhelpful Button</span>
+ </button>
+
+ <button id=""add-row-button"" type=""button"" class=""btn"">
<svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
<use xlink:href=""#icon-add""></use>
</svg>
<span>Add Row</span>
</button>
- <button type=""button"" class=""btn-split-menu btn"">
+ <button id=""split-button-action"" type=""button"" class=""btn-split-menu btn"">
<span>Add</span>
</button>
<div class=""separator""></div>
- <button type=""button"" class=""btn-split-menu btn-menu"">
+ <button id=""split-button-menu-trigger"" type=""button"" class=""btn-split-menu btn-menu"">
<span class=""audible"">Change Default</span>
<svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
<use xlink:href=""#icon-dropdown""></use>
</div>
<script>
- $('.btn-split-menu.btn').on('click', function (e) {
+ var EXAMPLE_TOOLBAR = $('#example-toolbar'),
+ SPLIT_BUTTON_ACTION = $('#split-button-action'),
+ SPLIT_BUTTON_MENU_TRIGGER = $('#split-button-menu-trigger');
+
+ // Action Button fires the action
+ SPLIT_BUTTON_ACTION.on('click', function (e) {
alert('Do ' + $(this).find('span').text() + ' Action');
});
- $('.toolbar').on('selected', function (e, args) {
- $('.btn-split-menu.btn').find('span').text(args.text());
+ // MenuButton selection changes the default action
+ SPLIT_BUTTON_MENU_TRIGGER.on('selected', function (e, args) {
+
+ SPLIT_BUTTON_ACTION.find('span').text(args.text());
$(this).trigger('updated');
//Sync the selected items in the two menus...
",7
"diff --git a/components/toolbar/test-disabled-items-in-spillover.html b/components/toolbar/test-disabled-items-in-spillover.html <div class=""row"">
<div class=""twelve columns"">
- <div class=""toolbar"">
+ <div id=""test-toolbar"" class=""toolbar"" data-options='{ ""favorButtonset"": false }'>
<div class=""title"">4 Buttons, No Pre-built More Menu</div>
<div class=""buttonset"">
- <button type=""button"" class=""btn"">
+ <button id=""btn-save"" type=""button"" class=""btn"">
<svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
<use xlink:href=""#icon-save""></use>
</svg>
<span>Save</span>
</button>
- <button type=""button"" class=""btn"">
+ <button id=""btn-category"" type=""button"" class=""btn"">
<svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
<use xlink:href=""#icon-filter""></use>
</svg>
<span>Category</span>
</button>
- <button type=""button"" class=""btn"" disabled>
+ <button id=""btn-disabled"" type=""button"" class=""btn"" disabled>
<svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
<use xlink:href=""#icon-calendar""></use>
</svg>
<span>Disabled</span>
</button>
- <button type=""button"" class=""btn"">
+ <button id=""btn-share"" type=""button"" class=""btn"">
<svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
<use xlink:href=""#icon-mingle-share""></use>
</svg>
<span>Share</span>
</button>
- <button type=""button"" class=""btn"" disabled>
+ <button id=""btn-disabled-again"" type=""button"" class=""btn"" disabled>
<svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
<use xlink:href=""#icon-mingle-share""></use>
</svg>
- <span>Disabled</span>
+ <span>Disabled Again</span>
</button>
</div>
</div>
</div>
</div>
+
+<script type=""text/javascript"">
+ // Event Listener for this code
+ $('#test-toolbar').on('selected.test', function(e, target) {
+ var contents = $(target).text().trim(),
+ id = '#' + $(target).attr('id');
+
+ $('body').toast({
+ title: '<span style=""color: #aa1111; font-weight: bold;"">' + id + '</span> selected!',
+ message: 'Toolbar Item with ID <b>' + id + '</b> selected! It\'s contents are: ""' + contents + '"".'
+ });
+ });
+</script>
",7
"diff --git a/components/toolbar/test-ajax-from-toolbar-on-spillover.html b/components/toolbar/test-ajax-from-toolbar-on-spillover.html </div>
</div>
+<div class=""row"">
+ <div class=""twelve columns"">
+ <button type=""button"" id=""change-ajax"" class=""btn"">
+ <svg class=""icon"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
+ <use xlink:href=""#icon-settings""></use>
+ </svg>
+ <span>Change Ajax Call</span>
+ </button>
+ </div>
+</div>
<script type=""text/javascript"">
var TOP_LEVEL_POPUPMENU_CONTENT = '' +
'<li><a href=""#"">AJAX Sub-option #3</a></li>' +
'<li><a href=""#"">AJAX Sub-option #4</a></li>';
+ var ALTERNATE_TOP_LEVEL_POPUPMENU_CONTENT = '' +
+ '<li><a href=""#"">Different AJAX Option #1</a></li>' +
+ '<li><a href=""#"">Different AJAX Option #2</a></li>' +
+ '<li><a href=""#"">Different AJAX Option #3</a></li>' +
+ '<li><a href=""#"">Different AJAX Option #4</a></li>';
+
// Populate the menu with some fake content for the sake of testing the AJAX call.
function popupmenuBeforeOpen(response, options) {
if (options.contextElement) {
return response( $(TOP_LEVEL_POPUPMENU_CONTENT) );
}
+ // Populate the menu with some fake content for the sake of testing the AJAX call.
+ function popupmenuBeforeOpenTwo(response, options) {
+ console.log('Using different Popupmenu Content...');
+ return response( $(ALTERNATE_TOP_LEVEL_POPUPMENU_CONTENT) );
+ }
+
// Manually invoke the Toolbar.
// (more akin to how the Angular components will deal with the jQuery components)
var toolbarElem = $('#ajax-toolbar');
toolbarElem.toolbar(TOOLBAR_SETTINGS);
toolbarAPI = toolbarElem.data('toolbar');
}
+
+ // Swap out the More Menu's ajax call for a different one.
+ $('#change-ajax').on('click', function () {
+ if (toolbarAPI) {
+ toolbarAPI.updated({
+ maxVisibleButtons: 4,
+ moreMenuSettings: {
+ beforeOpen: popupmenuBeforeOpenTwo
+ }
+ });
+ }
+ });
</script>
",7
"diff --git a/docs/TESTING.md b/docs/TESTING.md @@ -27,7 +27,8 @@ It also may include integration testing which is the phase in software testing i
It also maybe include regression testing, which is a type of software testing which verifies that software which was previously developed and tested still performs the same way after it was changed or interfaced with other software.
- Screen Shots
- We are utilizing a plugin to aide with the collection, and analysis of screenshots. On Chrome only currently, we capture screenshots, and compare them to a baseline(most current and valid) screenshots
+ - We are utilizing a plugin to aide with the collection, and analysis of screenshots. On Chrome only currently, we capture screenshots, and compare them to a baseline(most current and valid) screenshots
+ - The tool will capture screenshots, and save the screenshots to the `../.tmp/actual/` directory. If the screenshot is valid, and can then be moved to the baseline directory where it should be committed, and saved in the git repository.
## Running and Debugging Tests
Run just the api spec, for debugging with Chrome. For debugging use statements in the unit tests, and open Chrome DevTools
",7
"diff --git a/test/components/textarea/textarea.e2e-spec.js b/test/components/textarea/textarea.e2e-spec.js @@ -70,7 +70,9 @@ describe('Textarea size tests', () => {
const responsiveEl = await element(by.id('responsive'));
- expect(await responsiveEl.getCssValue('width')).toBe('1160px');
+ const h = parseInt(await responsiveEl.getCssValue('width'), 10);
+
+ expect(h).toBeGreaterThan(950);
});
});
",7
"diff --git a/test/components/validation/validation.e2e-spec.js b/test/components/validation/validation.e2e-spec.js @@ -273,6 +273,7 @@ describe('No Validation on Readonly', () => {
it('Should not validate when readonly', async () => {
const email = await element(by.id('ro-email-address-ok'));
+ await email.click();
await email.sendKeys(protractor.Key.TAB);
await browser.driver.sleep(config.sleep);
@@ -281,7 +282,8 @@ describe('No Validation on Readonly', () => {
const toggle = await element(by.id('toggle'));
toggle.click();
- await email.clear();
+ await browser.driver.sleep(config.sleep);
+ await email.click();
await email.sendKeys(protractor.Key.TAB);
await browser.driver.sleep(config.sleep);
",7
"diff --git a/test/components/autocomplete/autocomplete.e2e-spec.js b/test/components/autocomplete/autocomplete.e2e-spec.js @@ -24,13 +24,13 @@ describe('Autocomplete example-index tests', () => {
const autocompleteEl = await element(by.id('autocomplete-default'));
await browser.driver.wait(protractor.ExpectedConditions.presenceOf(autocompleteEl), config.waitsFor);
await autocompleteEl.sendKeys('a');
- const autocompleteListEl = await element(by.id('autocomplete-list'));
- await browser.driver.wait(protractor.ExpectedConditions.presenceOf(autocompleteListEl), config.waitsFor);
+ const autocompleteListContainer = await element(by.id('maincontent'));
+ await browser.driver.wait(protractor.ExpectedConditions.presenceOf(autocompleteListContainer), config.waitsFor);
await browser.driver
- .wait(protractor.ExpectedConditions.presenceOf(autocompleteListEl), config.waitsFor);
+ .wait(protractor.ExpectedConditions.presenceOf(autocompleteListContainer), config.waitsFor);
await browser.driver.sleep(config.waitsFor);
- expect(await browser.protractorImageComparison.checkElement(autocompleteListEl, 'autocomplete-open')).toEqual(0);
+ expect(await browser.protractorImageComparison.checkElement(autocompleteListContainer, 'autocomplete-open')).toEqual(0);
});
}
",7
"diff --git a/scripts/build.js b/scripts/build.js @@ -440,19 +440,34 @@ function searchFileNames(files, term) {
}
files.forEach((file) => {
- if (file.indexOf(term) === -1) {
+ const wordBoundaryRegex = new RegExp(`\\b[_.]?${term}\\b`, 'gi');
+ if (!file.match(wordBoundaryRegex)) {
return;
}
- // TODO: More granular sorting of component names (see #850).
- // fx: ""builder"" should not also match ""listbuilder""
-
results.push(file);
});
return results;
}
+/**
+ * Prunes the test results list in specific, tough cases
+ * @private
+ * @param {string} file path to a functional or e2e test
+ * @param {array} components array of requested bundle items
+ * @returns {boolean} whether or not the test should be pruned
+ */
+function pruneTest(file, components) {
+ // If validation component is included but datagrid is not, remove datagrid validation test
+ const datagridValidationTest = path.join('components', 'datagrid', 'datagrid-validation.func-spec.js');
+ if (file === datagridValidationTest && components.indexOf('datagrid') === -1) {
+ return true;
+ }
+
+ return false;
+}
+
/**
* Gets a copy of the standard `index.js` file.
* @param {string} filePath the target file to be read.
@@ -1005,6 +1020,10 @@ cleanAll(true).then(() => {
// Scan for relevant tests
const testResults = searchFileNames(tests, arg);
testResults.forEach((result) => {
+ if (pruneTest(result, requestedComponents)) {
+ return;
+ }
+
if (result.indexOf('func-spec.js') > -1) {
buckets['test-func'].push(result);
}
",7
"diff --git a/test/components/editor/editor-api.func-spec.js b/test/components/editor/editor-api.func-spec.js @@ -18,7 +18,7 @@ describe('Editor API', () => {
});
afterEach(() => {
- cleanup(['.editor', '.svg-icons', '.modal', '.row']);
+ cleanup(['.editor', '.svg-icons', '.modal', '.row', '.modal-page-container']);
});
it('Should be defined on jQuery object', () => {
",7
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -542,7 +542,7 @@ describe('Datagrid paging tests', () => {
beforeEach(async () => {
await utils.setPage('/components/datagrid/example-paging');
- const datagridEl = await element(by.id('datagrid'));
+ const datagridEl = await element(by.css('.pager-toolbar'));
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(datagridEl), config.waitsFor);
});
@@ -605,7 +605,7 @@ describe('Datagrid paging tests', () => {
expect(await element(by.css('tbody tr:nth-child(10) td:nth-child(2) span')).getText()).toEqual('49');
});
- it('Should not move on a page thats more than the max', async () => {
+ it('Should not move on a page thats more than the max', async () => { //eslint-disable-line
expect(await element(by.css('tbody tr:nth-child(1) td:nth-child(2) span')).getText()).toEqual('0');
expect(await element(by.css('tbody tr:nth-child(10) td:nth-child(2) span')).getText()).toEqual('9');
",7
"diff --git a/scripts/verify.js b/scripts/verify.js @@ -66,7 +66,11 @@ function isDirectory(filePath) {
// Main
// -------------------------------------
+if (commandLineArgs.rebuild) {
+ logger('info', `Creating a new ${chalk.yellow('expected-files.json')} list...`);
+} else {
logger('info', 'Verifying the last build...');
+}
// Load expected files list.
// If the file doesn't exist, this script can't continue.
@@ -112,7 +116,6 @@ glob(`${paths.dist}/**/*`, globOptions, (err, files) => {
foundFiles.forEach((file) => {
logger('padded', `${file}`);
});
- logger('\n');
}
// Save a new list, if applicable
@@ -121,7 +124,7 @@ glob(`${paths.dist}/**/*`, globOptions, (err, files) => {
const filesListTxt = JSON.stringify(foundFiles, null, '\t');
// Create Dirs
- const outputPath = path.join(process.cwd(), 'data', 'expected-files.json');
+ const outputPath = path.join(process.cwd(), 'scripts', 'data', 'expected-files.json');
createDirs([
path.join(process.cwd(), 'dist'),
path.join(process.cwd(), 'dist', 'tmp')
@@ -132,6 +135,7 @@ glob(`${paths.dist}/**/*`, globOptions, (err, files) => {
logger('beer', `New file list saved to ""${chalk.yellow(outputPath)}""`);
process.exit(0);
});
+ return;
}
// Get the differnce
",7
"diff --git a/app/views/components/dropdown/test-filter-types.html b/app/views/components/dropdown/test-filter-types.html <div class=""row"">
<div class=""six columns"">
-
<h2>Dropdown Test: Filter Types</h2>
- <p>
- The dropdown on the left/top shows <em>contains</em>-style filtering.<br />
- The dropdown on the right/bottom shows <em>startsWith</em>-style filtering.
- </p>
-
</div>
</div>
-<div class=""row"" style=""margin-top: 20px;"">
+<div class=""row top-padding"">
<div class=""six columns"">
-
<div class=""field"">
<label for=""contains-filter"">Contains Filter</label>
<select id=""contains-filter"" name=""contains-filter"" class=""dropdown"" data-init=""false""></select>
</div>
-
</div>
- <div class=""six columns"">
+</div>
+<div class=""row top-padding"">
+ <div class=""six columns"">
<div class=""field"">
- <label for=""startsWith-filter"">StartsWith Filter</label>
- <select id=""startsWith-filter"" name=""startsWith-filter"" class=""dropdown"" data-init=""false""></select>
+ <label for=""phraseStartsWith-filter"">PhraseStartsWith Filter</label>
+ <select id=""phraseStartsWith-filter"" name=""phraseStartsWith-filter"" class=""dropdown"" data-init=""false""></select>
+ </div>
+ </div>
</div>
+<div class=""row top-padding"">
+ <div class=""six columns"">
+ <div class=""field"">
+ <label for=""wordStartsWith-filter"">WordStartsWith Filter</label>
+ <select id=""wordStartsWith-filter"" name=""wordStartsWith-filter"" class=""dropdown"" data-init=""false""></select>
+ </div>
</div>
</div>
-<script>
+<script id=""test-scripts"">
$('body').on('initialized', function() {
-
function statesSource(response, term) {
$.getJSON('{{basepath}}api/states', function(data, term) {
+ data.unshift({ value: '', label: '' });
response(data);
});
}
source: statesSource
});
- $('#startsWith-filter').dropdown({
- filterMode: 'startsWith',
+ $('#phraseStartsWith-filter').dropdown({
+ filterMode: 'phraseStartsWith',
source: statesSource
});
+ $('#wordStartsWith-filter').dropdown({
+ filterMode: 'wordStartsWith',
+ source: statesSource
+ });
});
</script>
",7
"diff --git a/test/components/multiselect/multiselect.e2e-spec.js b/test/components/multiselect/multiselect.e2e-spec.js @@ -114,7 +114,7 @@ describe('Multiselect example-index tests', () => {
});
// Edited for #920
- fit('Can deselect all items and display an empty pseudo-element', async () => {
+ it('Can deselect all items and display an empty pseudo-element', async () => {
const multiselectEl = await element.all(by.css('div.dropdown')).first();
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(multiselectEl), config.waitsFor);
@@ -126,8 +126,12 @@ describe('Multiselect example-index tests', () => {
await multiselectSearchEl.sendKeys(protractor.Key.ENTER);
await multiselectSearchEl.sendKeys(protractor.Key.ESCAPE);
- expect(['<span class=""audible"">States (Max 10) </span>', ''])
- .toContain(await element.all(by.css('.dropdown span')).first().getText());
+ const acceptableResults = [
+ '', // on CI
+ '<span class=""audible"">States (Max 10) </span>' // on Local
+ ];
+
+ expect(acceptableResults).toContain(await element.all(by.css('.dropdown span')).first().getText());
});
// Edited for #920
@@ -304,7 +308,12 @@ describe('Multiselect typeahead-reloading tests', () => {
await browser.driver.sleep(config.sleep);
- expect(await element(by.css('.dropdown span')).getText()).toEqual('New Jersey, New York');
+ const acceptableResults = [
+ 'New Jersey, New York', // on CI
+ '<span class=""audible"">Typeahead-Reloaded Multiselect </span>New Jersey, New York', // on Local
+ ];
+
+ expect(acceptableResults).toContain(await element(by.css('.dropdown span')).getText());
});
}
});
",7
"diff --git a/test/components/datepicker/datepicker.e2e-spec.js b/test/components/datepicker/datepicker.e2e-spec.js @@ -734,6 +734,10 @@ describe('Datepicker Umalqura Tests', () => {
await utils.setPage('/components/datepicker/example-umalqura');
});
+ it('Should not have errors', async () => {
+ await utils.checkForErrors();
+ });
+
it('Should render Umalqura monthview', async () => {
const datepickerEl = await element(by.id('islamic-date'));
await datepickerEl.sendKeys(protractor.Key.ARROW_DOWN);
@@ -748,7 +752,8 @@ describe('Datepicker Umalqura Tests', () => {
const value = await element(by.id('islamic-date')).getAttribute('value');
- expect(value.substr(0, 2)).toEqual('14');
+ expect(value.length).toEqual(10);
+ await utils.checkForErrors();
});
});
",7
"diff --git a/test/components/datepicker/datepicker.e2e-spec.js b/test/components/datepicker/datepicker.e2e-spec.js @@ -964,7 +964,7 @@ describe('Datepicker Umalqura EG Tests', () => {
describe('Datepicker Gregorian SA Tests', () => { //eslint-disable-line
beforeEach(async () => {
- await utils.setPage('/components/datepicker/test-ar-sa-gregorian');
+ await utils.setPage('/components/datepicker/test-ar-sa-gregorian?locale=ar-SA');
await browser.driver.sleep(config.sleep);
});
",7
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -2130,17 +2130,11 @@ describe('Datagrid paging serverside single select tests', () => {
await element(by.css('.pager-next a')).click();
await browser.driver.sleep(config.sleep);
- await browser.driver
- .wait(protractor.ExpectedConditions.elementToBeClickable(await element(by.css('.pager-prev'))), config.waitsFor);
-
expect(await element.all(by.css('.datagrid-row.is-selected')).count()).toEqual(0);
await element(by.css('.pager-prev a')).click();
await browser.driver.sleep(config.sleep);
- await browser.driver
- .wait(protractor.ExpectedConditions.elementToBeClickable(await element(by.css('.pager-next'))), config.waitsFor);
-
expect(await element.all(by.css('.datagrid-row.is-selected')).count()).toEqual(0);
});
});
",7
"diff --git a/app/views/components/toolbar-flex/test-more-actions-selectable.html b/app/views/components/toolbar-flex/test-more-actions-selectable.html <li><a href=""#"">Sub-Item Two</a></li>
</ul>
</li>
- <li><a href=""#"">More Three</a></li>
+ <li><a href=""#"">More Four</a></li>
</ul>
</div>
</div>
",7
"diff --git a/src/components/personalize/personalize.styles.js b/src/components/personalize/personalize.styles.js @@ -395,14 +395,32 @@ html[class*=""theme-uplift-""] .application-menu.is-personalizable .accordion.pane
color: ${colors.subtext} !important;
}
-html[class*=""theme-uplift-""] .application-menu.is-personalizable .accordion.panel.inverse > .accordion-header.is-expanded.is-selected {
+html[class*=""theme-uplift""] .application-menu.is-personalizable .accordion.panel.inverse > .accordion-header.is-focused:not(.hide-focus):not(.is-expanded) {
+ border-color: ${colors.contrast} !important;
+}
+
+html[class*=""theme-uplift""] .application-menu.is-personalizable .accordion.panel.inverse > .accordion-header.is-focused.is-expanded {
+ border-color: transparent !important;
+}
+
+html[class*=""theme-uplift-""] .application-menu.is-personalizable .accordion.panel.inverse > .accordion-header.is-expanded.is-selected::before {
background-color: ${colors.darker} !important;
+ border-color: ${colors.darker} !important;
+}
+
+html[class*=""theme-uplift-""] .application-menu.is-personalizable .accordion.panel.inverse > .accordion-header.is-expanded.is-focused::before {
+ border-color: ${colors.contrast} !important;
}
html[class*=""theme-uplift-""] .application-menu.is-personalizable .accordion.panel.inverse > .accordion-header.is-expanded + .accordion-pane {
background-color: ${colors.dark} !important;
}
+html[class*=""theme-uplift-""] .application-menu.is-personalizable .accordion.panel.inverse > .accordion-header.is-expanded:hover::before {
+ border-color: ${colors.darkest} !important;
+ background-color: ${colors.darkest} !important;
+}
+
.is-personalizable .personalize-header,
.is-personalizable.tab-container {
background-color: ${colors.base} !important;
",7
"diff --git a/app/views/components/tag/test-taglist-gauntlet.html b/app/views/components/tag/test-taglist-gauntlet.html });
$('body').on('initialized', function () {
+ if ($('#newtag-is-link').prop('checked')) {
+ $('#href-settings-container').removeClass('hidden');
+ }
// Submit
$('#create-tag').on('submit.test', function (e) {
",7
"diff --git a/test/components/searchfield/searchfield.e2e-spec.js b/test/components/searchfield/searchfield.e2e-spec.js @@ -186,11 +186,16 @@ if (utils.isChrome() && utils.isCI()) {
await utils.setPage('/components/searchfield/test-place-on-bottom.html?layout=nofrills');
await browser.driver
.wait(protractor.ExpectedConditions
- .presenceOf(element(by.id('#searchfield-template'))), config.waitsFor);
+ .presenceOf(element(by.id('searchfield-template'))), config.waitsFor);
});
it('should correctly place the results list above the field if it can\'t fit beneath (visual regression)', async () => {
- const searchfieldInputEl = await element(by.id('#searchfield-template'));
+ // shrink the page to check ajax menu button in the overflow
+ const windowSize = await browser.driver.manage().window().getSize();
+ browser.driver.manage().window().setSize(640, 480);
+ await browser.driver.sleep(config.sleep);
+
+ const searchfieldInputEl = await element(by.id('searchfield-template'));
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(searchfieldInputEl), config.waitsFor);
await browser.driver.sleep(config.sleep);
@@ -199,7 +204,9 @@ if (utils.isChrome() && utils.isCI()) {
await browser.driver.sleep(config.sleep);
expect(await browser.protractorImageComparison
- .checkElement(await element(by.id('maincontent')), 'searchfield-open')).toEqual(0);
+ .checkElement(await element(by.css('.container')), 'searchfield-open')).toEqual(0);
+
+ await browser.driver.manage().window().setSize(windowSize.width, windowSize.height);
});
});
}
",7
"diff --git a/test/components/message/message.e2e-spec.js b/test/components/message/message.e2e-spec.js @@ -26,14 +26,18 @@ describe('Message tests', () => {
const modalButtonPrimaryEl = await element(by.css('.btn-modal-primary'));
await modalButtonPrimaryEl.sendKeys(protractor.Key.TAB);
+ const modalButtonPrimaryClasses = await modalButtonPrimaryEl.getAttribute('class');
- expect(['hide-focus', 'btn-modal-primary', 'btn-modal-primary hide-focus']).toContain(await modalButtonPrimaryEl.getAttribute('class'));
+ expect(modalButtonPrimaryClasses).toContain('btn-modal-primary');
+ expect(modalButtonPrimaryClasses).toContain('hide-focus');
const modalButtonEl = await element(by.css('.btn-modal'));
await modalButtonEl.sendKeys(protractor.Key.TAB);
+ const modalButtonClasses = await modalButtonEl.getAttribute('class');
- expect(['hide-focus', 'btn-modal', 'btn-modal hide-focus']).toContain(await modalButtonEl.getAttribute('class'));
+ expect(modalButtonClasses).toContain('btn-modal');
+ expect(modalButtonClasses).toContain('hide-focus');
});
});
",7
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -2487,7 +2487,7 @@ describe('Datagrid disable last page', () => {
});
it('Should be have last and next page disabled', async () => {
- expect(await element.all(by.css('.pager-toolbar .is-disabled')).count()).toEqual(2);
+ expect(await element.all(by.css('.pager-toolbar button.is-disabled')).count()).toEqual(2);
});
});
@@ -2509,12 +2509,12 @@ describe('Datagrid paging force disabled', () => {
await element(by.id('force-disabled')).click();
await browser.driver.sleep(config.sleep);
- expect(await element.all(by.css('.pager-toolbar .is-disabled')).count()).toEqual(4);
+ expect(await element.all(by.css('.pager-toolbar button.is-disabled')).count()).toEqual(4);
await element(by.id('force-enabled')).click();
await browser.driver.sleep(config.sleep);
- expect(await element.all(by.css('.pager-toolbar .is-disabled')).count()).toEqual(0);
+ expect(await element.all(by.css('.pager-toolbar button.is-disabled')).count()).toEqual(0);
});
});
",7
"diff --git a/test/components/swaplist/swaplist-beforeswap.func-spec.js b/test/components/swaplist/swaplist-beforeswap.func-spec.js import { SwapList } from '../../../src/components/swaplist/swaplist';
+import { cleanup } from '../../helpers/func-utils';
const swaplistHTML = require('../../../app/views/components/swaplist/test-beforeswap-with-search.html');
const svg = require('../../../src/components/icons/svg.html');
@@ -20,29 +21,28 @@ dataset.push({ id: 13, value: 'opt-13', text: 'Option MM' });
dataset.push({ id: 14, value: 'opt-14', text: 'Option NN' });
let swaplistEl;
-let svgEl;
let swaplistObj;
describe('SwapList API', () => {
beforeEach(() => {
swaplistEl = null;
- svgEl = null;
swaplistObj = null;
document.body.insertAdjacentHTML('afterbegin', svg);
document.body.insertAdjacentHTML('afterbegin', swaplistHTML);
- svgEl = document.body.querySelector('.svg-icons');
swaplistEl = document.body.querySelector('#example-swaplist-1');
swaplistObj = new SwapList(swaplistEl, { available: dataset, searchable: true });
});
afterEach(() => {
swaplistObj.destroy();
- swaplistEl.parentNode.removeChild(swaplistEl);
- svgEl.parentNode.removeChild(svgEl);
-
- const rowEl = document.body.querySelector('.row');
- rowEl.parentNode.removeChild(rowEl);
+ cleanup([
+ '#swaplist-tmpl',
+ '#swaplist-code',
+ '.svg-icons',
+ '.row',
+ '.page-container'
+ ]);
});
it('Should be defined as an object', () => {
",7
"diff --git a/app/views/components/modal/test-long-title-large-content.html b/app/views/components/modal/test-long-title-large-content.html $(this).focus();
setModal(modals[this.id]);
- if ($('.modal-title').height() > 35) {
+ var sohoTheme = (Soho.theme.currentTheme.name.lastIndexOf('Soho') !== -1 || Soho.theme.currentTheme.name === 'Soho Light') && $('.modal-title')[0].innerHTML.length > 68;
+
+ var upliftTheme = (Soho.theme.currentTheme.name.lastIndexOf('Uplift') !== -1 || Soho.theme.currentTheme.name === 'Soho Uplift') && $('.modal-title')[0].innerHTML.length > 47;
+
setTimeout(function () {
+ if (sohoTheme || upliftTheme) {
$('.modal-title').tooltip(TOOLTIP_OPTIONS);
- }, 500);
}
+ }, 100);
+
});
})
",7
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md - `[Application Menu]` Fixed misalignment/size of bullet icons in the accordion on Android devices. ([#1429](http://localhost:4000/components/applicationmenu/test-six-levels.html))
- `[Application Menu]` Add keyboard support for closing Role Switcher panel ([#3477](https://github.com/infor-design/enterprise/issues/3477))
- `[Autocomplete]` Added a check to prevent the autocomplete from incorrectly stealing form focus, by checking for inner focus before opening a list on typeahead. ([#3639](https://github.com/infor-design/enterprise/issues/3070))
-- `[Autocomplete]` Fixed an issue where an change event was not firing while navigating list. ([#804](https://github.com/infor-design/enterprise/issues/804))
+- `[Autocomplete]` Fixed an issue where an change event was not firing when selecting from the menu. ([#804](https://github.com/infor-design/enterprise/issues/804))
- `[Bubble Chart]` Fixed an issue where an extra axis line was shown when using the domain formatter. ([#501](https://github.com/infor-design/enterprise/issues/501))
- `[Bullet Chart]` Added support to format ranges and difference values. ([#3447](https://github.com/infor-design/enterprise/issues/3447))
- `[Button]` Fixed the button disabled method to no longer use class `is-disabled`. ([#3447](https://github.com/infor-design/enterprise-ng/issues/799))
",7
"diff --git a/app/views/utils/example-color-saturation.html b/app/views/utils/example-color-saturation.html <div class=""six columns"">
<div class=""color-display-square""></div>
</div>
+</div>
+<div class=""row top-padding"">
<div class=""six columns"">
<div class=""field"">
<label for=""hex-value"">Hexidecimal Color Value</label>
",7
"diff --git a/src/components/locale/locale.js b/src/components/locale/locale.js @@ -992,17 +992,22 @@ const Locale = { // eslint-disable-line
dateFormat = dateFormat.replace(',', '');
dateString = dateString.replace(',', '');
- if (dateFormat === 'Mdyyyy' || dateFormat === 'dMyyyy') {
- dateString = `${dateString.substr(0, dateString.length - 4)}/${dateString.substr(dateString.length - 4, dateString.length)}`;
- dateString = `${dateString.substr(0, dateString.indexOf('/') / 2)}/${dateString.substr(dateString.indexOf('/') / 2)}`;
- }
-
- if (dateFormat === 'Mdyyyy') {
- dateFormat = 'M/d/yyyy';
- }
-
- if (dateFormat === 'dMyyyy') {
- dateFormat = 'd/M/yyyy';
+ // Adjust short dates where no separators or special characters are present.
+ const hasMdyyyy = dateFormat.indexOf('Mdyyyy');
+ const hasdMyyyy = dateFormat.indexOf('dMyyyy');
+ let startIndex = -1;
+ let endIndex = -1;
+ if (hasMdyyyy > -1 || hasdMyyyy > -1) {
+ startIndex = hasMdyyyy > -1 ? hasMdyyyy : hasdMyyyy > -1 ? hasdMyyyy : 0;
+ endIndex = startIndex + dateString.indexOf('/') > -1 ? dateString.indexOf('/') : dateString.length;
+ dateString = `${dateString.substr(startIndex, endIndex - 4)}/${dateString.substr(endIndex - 4, dateString.length)}`;
+ dateString = `${dateString.substr(startIndex, dateString.indexOf('/') / 2)}/${dateString.substr(dateString.indexOf('/') / 2, dateString.length)}`;
+ }
+ if (hasMdyyyy > -1) {
+ dateFormat = dateFormat.replace('Mdyyyy', 'M/d/yyyy');
+ }
+ if (hasdMyyyy > -1) {
+ dateFormat = dateFormat.replace('dMyyyy', 'd/M/yyyy');
}
if (dateFormat.indexOf(' ') !== -1) {
",7
"diff --git a/src/components/mask/mask-api.js b/src/components/mask/mask-api.js @@ -280,6 +280,7 @@ MaskAPI.prototype = {
while (rawValueArr.length > 0) {
// Let's retrieve the first user character in the queue of characters we have left
const rawValueChar = rawValueArr.shift();
+ const nextChar = rawValue.slice(l, l + 1);
// If the character we got from the user input is a placeholder character (which happens
// regularly because user input could be something like (540) 90_-____, which includes
@@ -297,19 +298,19 @@ MaskAPI.prototype = {
} else if (
maskObj.literalRegex &&
maskObj.literalRegex.test(rawValueChar.char) &&
- rawValue.slice(l, l + 1) === rawValueChar.char
+ nextChar === rawValueChar.char
) {
// Analyze the number of this particular literal in the value,
// and only add it if we haven't passed the maximum
const thisLiteralRegex = new RegExp(`(${rawValueChar.char})`, 'g');
const numberLiteralsPlaceholder = settings.placeholder.match(thisLiteralRegex).length;
const numberLiteralsRawValue = rawValue.match(thisLiteralRegex).length;
- if (numberLiteralsRawValue < numberLiteralsPlaceholder) {
+ if (numberLiteralsRawValue <= numberLiteralsPlaceholder) {
resultStr += rawValueChar.char;
}
- const rawValueAfterLiteral = rawValue.slice(l + 1, rawValue.length - 1);
- let literalIndex = rawValueAfterLiteral.indexOf(rawValueChar.char);
+ // Fast forward the loop to the after the next instance of this literal.
+ let literalIndex = settings.placeholder.slice(l).indexOf(rawValueChar.char);
while (literalIndex > 0) {
l++;
literalIndex--;
",7
"diff --git a/src/components/tabs-module/_tabs-module-uplift.scss b/src/components/tabs-module/_tabs-module-uplift.scss &.application-menu-trigger {
a {
- padding: 5px 6px 7px;
+ padding: 5px 12px 7px;
width: 100%;
}
}
.icon.app-header {
top: -6px;
+
+ span:not(.audible) {
+ width: 18px;
+ }
}
}
",7
"diff --git a/src/components/colorpicker/_colorpicker.scss b/src/components/colorpicker/_colorpicker.scss // Color Picker
//================================================== //
+$trigger-size: 30px;
+
@import '../icons/icons';
@import '../input/input';
@import '../popupmenu/popupmenu';
}
}
+.colorpicker-input-xs,
+.colorpicker-input-sm,
+.colorpicker-input-md,
+.colorpicker-input-mm,
+.colorpicker-input-lg {
+ flex-shrink: 0;
+ margin-right: $trigger-size;
+}
+
.colorpicker-input-xs {
width: 18px !important;
+
}
.colorpicker-input-sm {
background-color: $input-color-initial-background;
border: 1px solid $input-color-initial-border;
border-radius: 2px;
- display: inline-block;
+ display: inline-flex;
height: $input-size-regular-height;
+ max-width: 100%;
overflow: hidden;
+ position: relative;
width: 150px;
+ .trigger {
+ position: absolute;
+ right: 0;
+ }
+
&.is-focused {
border-color: $input-color-focus-border;
box-shadow: $focus-box-shadow;
display: inline-block;
height: $input-size-regular-height - 0.4;
left: 1px;
+ min-width: $input-size-regular-height - 0.4;
position: relative;
top: 1px;
vertical-align: top;
.trigger {
height: $input-size-compact-height - 0.4;
margin-left: -($input-size-compact-height - 0.4);
+ right: 0;
width: $input-size-compact-height - 0.4;
.icon:not(.icon-error) {
",7
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -6398,7 +6398,7 @@ Datagrid.prototype = {
const isEditable = self.makeCellEditable(self.activeCell.rowIndex, self.activeCell.cell, e);
- if (col.click && typeof col.click === 'function' && target.is('button, input[checkbox], a, a.search-mode i') || target.parent().is('button')) { //eslint-disable-line
+ if (col.click && typeof col.click === 'function' && target.is('button, input[checkbox], a, a.search-mode i') || target.parent().is('button:not(.trigger)')) {
const rowElem = $(this).closest('tr');
let rowIdx = self.actualRowIndex(rowElem);
dataRowIdx = self.dataRowIndex(rowElem);
",7
"diff --git a/src/components/button/button.js b/src/components/button/button.js @@ -166,7 +166,7 @@ Button.prototype = {
// Derive X/Y coordinates from input events
if (e) {
- if (!env.features.touch) {
+ if (e.originalEvent instanceof MouseEvent) {
// Standard Mouse Click
xPos = e.pageX - btnOffset.left;
yPos = e.pageY - btnOffset.top;
@@ -182,8 +182,8 @@ Button.prototype = {
}
// If values have not been defined, simply set them to the center of the element.
- xPos = (xPos < 0) ? this.element.outerWidth() / 2 : xPos;
- yPos = (yPos < 0) ? this.element.outerHeight() / 2 : yPos;
+ if (!xPos) { xPos = this.element.outerWidth() / 2; }
+ if (!yPos) { yPos = this.element.outerHeight() / 2; }
// Create/place the ripple effect
const ripple = $(`<svg class=""ripple-effect"" focusable=""false"" aria-hidden=""true"" role=""presentation"">
",7
"diff --git a/app/views/components/locale/test-format-number-15-decimal.html b/app/views/components/locale/test-format-number-15-decimal.html // transform
var options = {
- decimal: '.',
- group: '',
maximumFractionDigits: 15,
minimumFractionDigits: 15,
- round: true,
- style: 'decimal'
+ round: true
}
var nbr = Soho.Locale.formatNumber(value, options);
$('#parsed-number-field').val(nbr);
",7
"diff --git a/test/components/bar/bar.puppeteer-spec.js b/test/components/bar/bar.puppeteer-spec.js @@ -34,6 +34,7 @@ describe('Bar Chart Puppeteer Tests', () => {
it('should not show pointer as a cursor', async () => {
const checkCursor = async el => page.$eval(el, e => e.style.cursor);
+ await page.waitForSelector('#bar-a-bar', { visible: true });
await page.hover('#bar-a-bar');
await page.waitForTimeout(100);
expect(await checkCursor('#bar-a-bar')).toContain('inherit');
",7
"diff --git a/test/components/input/input.e2e-spec.js b/test/components/input/input.e2e-spec.js @@ -82,6 +82,7 @@ describe('Input Test Reset', () => {
expect(await element.all(by.css('.icon-dirty')).count()).toEqual(4);
await element(by.id('btn-save')).click();
+ await browser.driver.sleep(config.sleepShort);
expect(await element.all(by.css('.icon-dirty')).count()).toEqual(0);
});
@@ -95,10 +96,6 @@ describe('Input tooltip tests', () => {
.presenceOf(element(by.id('first-name'))), config.waitsFor);
});
- it('Should not have errors', async () => {
- await utils.checkForErrors();
- });
-
// This test is more important as a windows test
it('Should be able to select text', async () => {
const inputEl = await element(by.id('first-name'));
",7
"diff --git a/web/examples/composite-brush-multi-dim.html b/web/examples/composite-brush-multi-dim.html <p>Usually sub charts of a composite chart share the dimension of the parent.
However sometimes, especially when scatter plots are composed, the sub charts may
- used different dimensions. This example uses two scatter plots both using array dimensions.
- Typically scatter plots use two dimensional brushing (see <a href=""scatter-brushing.html"">scatter brushing</a>),
- however, composite charts only support one dimensional (along x axis) brushing.</p>
- <p>Try brushing on the chart and see data getting filtered on the right.</p>
- <p>For the curious, you will notice that unlike other charts brushing removes points outside range of the brush
+ use different dimensions. This example uses two scatter plots both using array dimensions.
+ Typically scatter plots use two dimensional brushing (see <a href=""scatter-brushing.html"">scatter brushing</a>);
+ however, composite charts only support one dimensional brushing along the x axis.</p>
+ <p>Try brushing on the chart and see data getting filtered in the table on the right.</p>
+ <p>Notice that unlike in other charts, brushing removes points outside range of the brush
instead of just fading them.
- The three dimensions used by different charts are actually related.
- When brush applies filters on all these three dimensions, all data outside the brush range actually gets removed
- by crossfilter. There is no easy way to currently avoid that.</p>
+ This is because the composite chart uses three different dimensions for the child charts,
+ so each observes the filter applied to the others.</p>
<div id=""test1""></div>
- <div id=""test2""></div>
+ <div id=""test2"" class=""table table-hover"" style=""width:auto""></div>
<script type=""text/javascript"" src=""../js/promise-polyfill.js""></script>
<script type=""text/javascript"" src=""../js/fetch.umd.js""></script>
@@ -93,7 +92,10 @@ chart.width(768)
dataTable
.dimension(dimX)
.group(function (d) { return d.x; })
- .columns(['x', 'y', 'z']);
+ .columns(['x', 'y', 'z'])
+ .on('renderlet', function (table) {
+ table.selectAll('.dc-table-group').classed('info', true);
+ });
dc.renderAll();
",7
"diff --git a/src/base/base-mixin.js b/src/base/base-mixin.js @@ -24,8 +24,10 @@ const _defaultFilterHandler = (dimension, filters) => {
dimension.filterFunction(d => {
for (let i = 0; i < filters.length; i++) {
const filter = filters[i];
- if (filter.isFiltered && filter.isFiltered(d)) {
+ if (filter.isFiltered) {
+ if(filter.isFiltered(d)) {
return true;
+ }
} else if (filter <= d && filter >= d) {
return true;
}
",7
"diff --git a/src/plugins/process-global-plugin.js b/src/plugins/process-global-plugin.js @@ -30,7 +30,7 @@ export default function processGlobalPlugin({ NODE_ENV = 'development' } = {}) {
// if that wasn't the only way `process.env` was referenced...
if (code.match(/[^a-zA-Z0-9]process\.env/)) {
// hack: avoid injecting imports into commonjs modules
- if (!code.match(/require\(/)) {
+ if (/^import[\s{]|^export\s\w/gm.test(code)) {
code = `import process from '\0builtins:process.js';${code}`;
} else {
code = `var process=${processObj};${code}`;
",7
"diff --git a/src/plugins/npm-plugin/registry.js b/src/plugins/npm-plugin/registry.js @@ -201,7 +201,12 @@ export async function loadPackageFiles({ module, version }) {
return await getTarFiles(info.dist.tarball, module, version);
}
-/** @type {Map<string, string>} */
+/**
+ * Cache file contents of package files for quick access.
+ * Example:
+ * `my-module@1.0.0 :: /index.js` -> `console.log(""hello world"")`
+ * @type {Map<string, string>}
+ */
const DISK_CACHE = new Map();
/**
",7
"diff --git a/src/plugins/wmr/client.js b/src/plugins/wmr/client.js @@ -147,11 +147,8 @@ function updateStyleSheet(url) {
const sheets = document.styleSheets;
for (let i = 0; i < sheets.length; i++) {
if (strip(sheets[i].href) === url) {
- const ownerNode = sheets[i].ownerNode;
- if (ownerNode) {
// @ts-ignore
- ownerNode.href = strip(url) + '?t=' + Date.now();
- }
+ sheets[i].ownerNode.href = strip(url) + '?t=' + Date.now();
return true;
}
}
",7
"diff --git a/packages/wmr/src/lib/normalize-options.js b/packages/wmr/src/lib/normalize-options.js @@ -111,13 +111,9 @@ export async function normalizeOptions(options, mode) {
// The execution order is: ""pre"" -> ""normal"" -> ""post""
if (options.plugins) {
options.plugins = options.plugins.flat().sort((a, b) => {
- if (a.enforce === b.enforce) return 0;
- else if ((a.enforce === 'pre' && b.enforce !== 'pre') || b.enforce === 'post') {
- return -1;
- } else if (b.enforce === 'pre' || a.enforce === 'post') {
- return 1;
- }
- return 0;
+ const aScore = a.enforce === 'post' ? 1 : a.enforce === 'pre' ? -1 : 0;
+ const bScore = b.enforce === 'post' ? 1 : b.enforce === 'pre' ? -1 : 0;
+ return aScore - bScore;
});
}
",7
"diff --git a/packages/wmr/src/lib/normalize-options.js b/packages/wmr/src/lib/normalize-options.js @@ -166,11 +166,14 @@ export async function normalizeOptions(options, mode) {
/**
* Deeply merge two config objects
- * @param {Partial<Options>} a
- * @param {Partial<Options>} b
- * @returns {Partial<Options>}
+ * @template {Record<string, any>} T
+ * @template {Record<string, any>} U
+ * @param {T} a
+ * @param {U} b
+ * @returns {T & U}
*/
function mergeConfig(a, b) {
+ /** @type {any} */
const merged = { ...a };
for (const key in b) {
",7
"diff --git a/docs/public/styles/index.css b/docs/public/styles/index.css @@ -337,8 +337,7 @@ h5:hover .anchor {
* Layouts
*/
.sidebar-layout {
- position: absolute;
- grid-template-columns: minmax(min-content, 33.33%) minmax(40rem, 2fr);
+ width: 100%;
}
.sidebar {
@@ -360,7 +359,7 @@ h5:hover .anchor {
@media (min-width: 900px) {
.sidebar-layout {
display: grid;
- grid-template-columns: minmax(min-content, 33.33%) minmax(40rem, 2fr);
+ grid-template-columns: minmax(min-content, 33.33%) minmax(40rem, 110ch);
}
.sidebar {
",7
"diff --git a/docs/public/lib/use-localstorage.js b/docs/public/lib/use-localstorage.js import { useState } from 'preact/hooks';
-const SUPPORTS_LOCAL_STORAGE = window !== undefined && 'localStorage' in window;
+const SUPPORTS_LOCAL_STORAGE = typeof localStorage !== 'undefined';
/**
* @type {<T>(name: string, value: T) => [T, (v: T) => void]}
",7
"diff --git a/docs/public/styles/index.css b/docs/public/styles/index.css --color-bg-code: #1f2427;
--color-info: #d7f1ff;
--color-focus: #ff459c;
+ --color-btn-secondary-hover: rgba(0, 0, 0, 0.1);
--focus-width: 0.25rem;
--header-height: 3.5rem;
--color-bg-code-inline: #66676f;
--color-bg-code: #1f2427;
--color-info: #184c68;
+ --color-btn-secondary-hover: rgba(255, 255, 255, 0.1);
--header-accent-height: 0.1875rem;
}
@@ -59,6 +61,7 @@ html[theme='light'] {
--color-bg-code-inline: #dddddf;
--color-bg-code: #1f2427;
--color-info: #d7f1ff;
+ --color-btn-secondary-hover: rgba(0, 0, 0, 0.1);
--header-height: 3.5rem;
--header-accent-height: 0.125rem;
@@ -320,17 +323,25 @@ h5:hover .anchor {
letter-spacing: 0.5px;
white-space: nowrap;
line-height: 1;
+ transition: background .3s, transform .1s;
+}
+.btn:active {
+ transform: translate3d(0, .2rem, 0);
}
.btn-primary {
- border: 0.1875rem solid var(--color-brand);
background: var(--color-brand);
color: #fff;
}
+.btn-primary:hover {
+ background: rgba(51, 174, 241, .8)
+}
.btn-secondary {
- border: 0.125rem solid var(--color-text);
background: none;
color: var(--color-text);
}
+.btn-secondary:hover {
+ background: var(--color-btn-secondary-hover);
+}
.btn-img-left {
display: block;
float: left;
",7
"diff --git a/packages/wmr/src/lib/prerender.js b/packages/wmr/src/lib/prerender.js @@ -102,6 +102,10 @@ async function workerCode({ cwd, out, publicPath, customRoutes }) {
const doPrerender = m.prerender;
// const App = m.default || m[Object.keys(m)[0]];
+ if (typeof doPrerender !== 'function') {
+ throw Error(`No prerender() function was exported by the first <script src=""...""> in your index.html.`);
+ }
+
/**
* @param {HeadElement|HeadElement[]|Set<HeadElement>} element
* @returns {string} html
",7
"diff --git a/packages/wmr/tools/run-fixture.js b/packages/wmr/tools/run-fixture.js import { spawn } from 'child_process';
+import path from 'path';
+import * as kl from 'kolorist';
+import ncp from 'ncp';
+import { isFile } from '../src/lib/fs-utils.js';
+import { fileURLToPath } from 'url';
-spawn(
- process.execPath,
- ['src/cli.js', 'start', '--cwd', 'test/fixtures/' + process.argv.slice(2)[0], ...process.argv.slice(3)],
- {
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+(async () => {
+ const command = process.argv[2];
+ const name = process.argv[3];
+
+ const commands = ['start', 'serve', 'build'];
+ if (!commands.includes(command)) {
+ // eslint-disable-next-line no-console
+ console.log(
+ kl.red(
+ `Command must be one of ${commands
+ .map(x => `""${x}""`)
+ .join(',')}, but got ""${command}"". Did you mean ""yarn wmr fixture start ${command}"" instead?""`
+ )
+ );
+ process.exit(1);
+ }
+
+ const rest = process.argv.slice(4);
+ const fixture = path.join(__dirname, '..', 'test', 'fixtures', name);
+ const fakeModDir = path.join('fixture', '-node_modules');
+
+ if (await isFile(fakeModDir)) {
+ await new Promise((resolve, reject) =>
+ ncp(fakeModDir, path.join(fixture, 'node_modules'), err => (err ? reject(err) : resolve()))
+ );
+ }
+
+ spawn(process.execPath, ['src/cli.js', command, '--cwd', 'test/fixtures/' + name, ...rest], {
stdio: 'inherit',
env: {
// Package ""application-config-path"" needs this (required by devcert)
@@ -12,5 +43,5 @@ spawn(
DEBUG: 'true',
TERM: 'xterm-256color'
}
- }
-);
+ });
+})();
",7
"diff --git a/index.js b/index.js @@ -13,8 +13,8 @@ function filterTrickle (sdp) {
return sdp.replace(/a=ice-options:trickle\s\n/g, '')
}
-function makeError (message, code) {
- var err = new Error(message)
+function makeError (err, code) {
+ if (!(err instanceof Error)) err = new Error(err)
err.code = code
return err
}
",7
"diff --git a/index.js b/index.js @@ -15,7 +15,8 @@ function filterTrickle (sdp) {
}
function makeError (err, code) {
- if (!(err instanceof Error)) err = new Error(err)
+ if (typeof err === 'string') err = new Error(err)
+ if (err.error instanceof Error) err = err.error
err.code = code
return err
}
",7
"diff --git a/packages/razzle/config/create-config.js b/packages/razzle/config/create-config.js @@ -39,6 +39,7 @@ module.exports = (
const IS_PROD = env === 'prod';
const IS_DEV = env === 'dev';
process.env.NODE_ENV = IS_PROD ? 'production' : 'development';
+
const dotenv = getEnv(target, { clearConsole, host, port });
const devServerPort = parseInt(dotenv.raw.PORT, 10) + 1;
@@ -250,9 +251,17 @@ module.exports = (
config.devServer = {
host: dotenv.raw.HOST,
disableHostCheck: true,
+ // watchContentBase: true,
headers: {
'Access-Control-Allow-Origin': '*',
},
+ // Reportedly, this avoids CPU overload on some systems.
+ // https://github.com/facebookincubator/create-react-app/issues/293
+ watchOptions: {
+ ignored: /node_modules/,
+ },
+ // Enable gzip compression of generated files.
+ compress: true,
port: devServerPort,
noInfo: true,
quiet: true,
",7
"diff --git a/README.md b/README.md @@ -83,19 +83,24 @@ To debug the node server, you can use `razzle start --inspect`. This will start
## Customization
-### Extending Babel Config
+### Customizing Babel Config
Razzle comes with most of ES6 stuff you need. However, if you want to add your own babel transformations, just add a `.babelrc` file to the root of your project.
-```json
+```js
{
""presets"": [
- ""razzle/babel"",
+ ""razzle/babel"", // NEEDED
""stage-0""
+ ],
+ ""plugins"": [
+ // additional plugins
]
}
```
+A word of advice: the `.babelrc` file will replace the internal razzle babelrc template. You must include at the very minimum the default razzle/babel preset.
+
### Extending Webpack
You can also extend the underlying webpack config. Create a file called `razzle.config.js` in your project's root.
",7
"diff --git a/lib/reporters/html/index.js b/lib/reporters/html/index.js @@ -110,9 +110,10 @@ PostmanHTMLReporter = function (newman, options) {
return { folder: item.name, contents: item.items.map(aggregator) };
}
+ // fetch aggregated run times and response sizes for items, (0 for failed requests)
var aggregationMean = executionMeans[item.id],
- meanTime = aggregationMean.time,
- meanSize = aggregationMean.size;
+ meanTime = _.get(aggregationMean, 'time', 0),
+ meanSize = _.get(aggregationMean, 'size', 0);
return _.merge(items[item.id], {
assertions: _.values(assertions[item.id]),
",7
"diff --git a/README.md b/README.md @@ -231,9 +231,9 @@ discontinued. For documentation on the older command options, refer to [README.m
##### Creating and using custom reporters
Newman also supports custom reporters, provided that the reporter works with Newman's event sequence. Working examples on how Newman reporters work can be found in [lib/reporters](https://github.com/postmanlabs/newman/tree/develop/lib/reporters). For instance, to use the [Newman teamcity reporter](https://github.com/leafle/newman-reporter-teamcity):
-- Add and install the reporter package. Note that the name of the package is of the form `newman-reporter-<name>`.<br/>
+- Install the reporter package. Note that the name of the package is of the form `newman-reporter-<name>`. The installation should be global if newman is installed globally, local otherwise. (Replace `-g` from the command below with `-S` for a local installation.<br/>
```terminal
-npm install -S newman-reporter-teamcity
+npm install -g newman-reporter-teamcity
```
- Use the installed reporter, either via the CLI, or programmatic usage. Here, the `newman-reporter` prefix is **not** required while specifying the reporter name in the options.<br/>
",7
"diff --git a/test/integration/request-chaining-test.postman_collection.json b/test/integration/request-chaining-test.postman_collection.json ""script"": {
""type"": ""text/javascript"",
""exec"": [
+ ""var args = JSON.parse(responseBody).args;"",
""tests[\""Status code is 200\""] = responseCode.code === 200;"",
"""",
""tests[\""FOO exists\""] = postman.getEnvironmentVariable(\""FOO\"") === \""alpha\"";"",
- ""tests[\""BAR exists\""] = postman.getEnvironmentVariable(\""BAR\"") === \""beta\"";""
+ ""tests[\""BAR exists\""] = postman.getEnvironmentVariable(\""BAR\"") === \""beta\"";"",
+ """",
+ ""tests[\""val1 query param was sent correctly\""] = args.val === \""alpha\"";"",
+ ""tests[\""val1 query param was sent correctly\""] = args.val2 === \""beta\"";""
]
}
}
",7
"diff --git a/lib/reporters/cli/index.js b/lib/reporters/cli/index.js @@ -132,14 +132,11 @@ PostmanCLIReporter = function (emitter, reporterOptions, options) {
// print out the request name to be executed and start a spinner
emitter.on('beforeRequest', function (err, o) {
- if (err) { return; }
+ if (err || !o.request) { return; }
- if (options.disableUnicode === true) {
- o.request && print(' %s %s ', colors.gray(o.request.method), colors.gray(o.request.url));
- }
- else {
- o.request && print(' %s %s ', colors.gray(o.request.method), colors.gray(o.request.url)).wait(colors.gray);
- }
+ print(' %s %s ', colors.gray(o.request.method), colors.gray(o.request.url));
+
+ !options.disableUnicode && print().wait(colors.gray);
});
// output the response code, reason and time
",7
"diff --git a/npm/postpublish.sh b/npm/postpublish.sh @@ -6,7 +6,7 @@ set -e;
BLUE='\033[0;34m';
NO_COLOUR='\033[0m';
DOCKER_USER=""postman"";
-TAG=$npm_package_version;
+TAG=${npm_package_version};
IMAGES_BASE_PATH=""./docker/images"";
# It's good to be paranoid
@@ -16,26 +16,49 @@ function build_docker_image {
local TAG=""$2"";
local BASENAME=$(basename $1);
local IMAGE_NAME=""newman_$BASENAME"";
+ local GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD);
echo """";
+
+ # Build
+ if [[ ${GIT_BRANCH} = ""master"" ]]; then
echo -e ""$BLUE Building docker image for $DOCKER_USER/$IMAGE_NAME:$TAG, latest $NO_COLOUR"";
+
docker build \
--no-cache --force-rm --squash \
-t ""$DOCKER_USER/$IMAGE_NAME:$TAG"" -t ""$DOCKER_USER/$IMAGE_NAME:latest"" \
--file=""docker/images/$BASENAME/Dockerfile"" --build-arg NEWMAN_VERSION=""$TAG"" .;
echo -e ""$BLUE Running docker image test for $DOCKER_USER/$IMAGE_NAME:$TAG, latest $NO_COLOUR"";
- docker run -v ""$PWD/examples:/etc/newman"" -t ""$DOCKER_USER/$IMAGE_NAME:$TAG"" run ""sample-collection.json"";
+ else
+ echo -e ""$BLUE Building docker image for $DOCKER_USER/$IMAGE_NAME:$TAG $NO_COLOUR"";
- # prepare current images for pushing
- docker tag $DOCKER_USER/$IMAGE_NAME:$TAG $DOCKER_USER/$IMAGE_NAME:$TAG;
- docker tag $DOCKER_USER/$IMAGE_NAME:latest $DOCKER_USER/$IMAGE_NAME:latest;
+ docker build \
+ --no-cache --force-rm --squash \
+ -t ""$DOCKER_USER/$IMAGE_NAME:$TAG"" \
+ --file=""docker/images/$BASENAME/Dockerfile"" --build-arg NEWMAN_VERSION=""$TAG"" .;
+ echo -e ""$BLUE Running docker image test for $DOCKER_USER/$IMAGE_NAME:$TAG $NO_COLOUR"";
+ fi
+
+ # Test
+ docker run -v ""$PWD/examples:/etc/newman"" -t ""$DOCKER_USER/$IMAGE_NAME:$TAG"" run ""sample-collection.json"";
+
+ # Tag
+ if [[ ${GIT_BRANCH} = ""master"" ]]; then
echo -e ""$BLUE Pushing docker image for $DOCKER_USER/$IMAGE_NAME:$TAG, latest $NO_COLOUR"";
- docker push $DOCKER_USER/$IMAGE_NAME:$TAG;
- docker push $DOCKER_USER/$IMAGE_NAME:latest;
+
+ docker tag ""$DOCKER_USER/$IMAGE_NAME:latest"" ""$DOCKER_USER/$IMAGE_NAME:latest"";
+ docker push ""$DOCKER_USER/$IMAGE_NAME:latest"";
+ else
+ echo -e ""$BLUE Pushing docker image for $DOCKER_USER/$IMAGE_NAME:$TAG $NO_COLOUR"";
+ fi
+
+ # Push
+ docker tag ""$DOCKER_USER/$IMAGE_NAME:$TAG"" ""$DOCKER_USER/$IMAGE_NAME:$TAG"";
+ docker push ""$DOCKER_USER/$IMAGE_NAME:$TAG"";
}
-for image in $IMAGES_BASE_PATH/*; do
+for image in ${IMAGES_BASE_PATH}/*; do
build_docker_image ${image} ${TAG};
done
",7
"diff --git a/bin/newman.js b/bin/newman.js @@ -20,7 +20,8 @@ program
.usage('<collection> [options]')
.option('-e, --environment <path>', 'Specify a URL or Path to a Postman Environment.')
.option('-g, --globals <path>', 'Specify a URL or Path to a file containing Postman Globals.')
- .option('--folder <path>', 'Specify folder to run from a collection.', util.cast.memoize, [])
+ // eslint-disable-next-line max-len
+ .option('--folder <path>', 'Specify folder to run from a collection. Can be specified multiple times to run multiple folders', util.cast.memoize, [])
.option('-r, --reporters [reporters]', 'Specify the reporters to use for this run.', util.cast.csvParse, ['cli'])
.option('-n, --iteration-count <n>', 'Define the number of iterations to run.', util.cast.integer)
.option('-d, --iteration-data <path>', 'Specify a data file to use for iterations (either json or csv).')
",7
"diff --git a/src/client/app.js b/src/client/app.js @@ -1676,11 +1676,6 @@ function updateQueueDuration() {
}
}
-function removeSelectedAndCursorClasses(domItem) {
- domItem.classList.remove('selected');
- domItem.classList.remove('cursor');
-}
-
function removeCurrentOldAndRandomClasses(domItem) {
domItem.classList.remove('current');
domItem.classList.remove('old');
@@ -1726,9 +1721,14 @@ function refreshSelection() {
updateQueueDuration();
return;
}
- Array.prototype.forEach.call(queueItemsDom.getElementsByClassName('pl-item'), removeSelectedAndCursorClasses);
- Array.prototype.forEach.call(libraryArtistsDom.getElementsByClassName('clickable'), removeSelectedAndCursorClasses);
- Array.prototype.forEach.call(playlistsListDom.getElementsByClassName('clickable'), removeSelectedAndCursorClasses);
+ [queueItemsDom, libraryArtistsDom, playlistsListDom].forEach(function(domElement) {
+ ['selected', 'cursor'].forEach(function(className) {
+ var elementList = domElement.getElementsByClassName(className);
+ for (var i = elementList.length - 1; i >= 0; i--) {
+ elementList[i].classList.remove(className);
+ }
+ });
+ });
if (selection.cursorType == null) {
updateQueueDuration();
",7
"diff --git a/src/recipes/pear-manhattan-cocktail.json b/src/recipes/pear-manhattan-cocktail.json {
""name"": ""Pear Manhattan Cocktail"",
- ""description"": ""Enjoy a Cocktail of Whiskey mixed with pear and Vodka."",
+ ""description"": ""Enjoy a Cocktail of Whiskey mixed with pear and vodka."",
""github"": ""kevinmel2000"",
""ingredients"": [
""2 fluid ounces rye whiskey"",
""2 fluid ounces pear vodka"",
""1 3/4 fluid ounces sweet vermouth"",
- ""1-2 ice cube"",
+ ""1-2 ice cubes"",
""1 maraschino cherry"",
""1 slice pear""
],
",7
"diff --git a/lib/lexer/match.js b/lib/lexer/match.js @@ -120,8 +120,8 @@ function internalMatch(tokens, syntax, syntaxes) {
var token = moveToNextToken();
var syntaxStack = null;
- var ifStack = null;
- var alternative = null;
+ var thenStack = null;
+ var elseStack = null;
var syntaxNode = syntax;
var LIMIT = 20000;
@@ -133,8 +133,8 @@ function internalMatch(tokens, syntax, syntaxes) {
// '#' + iterationCount,
// require('util').inspect({
// match: mapList(matchStack, 'prev', x => x.type === 'Token' ? x.token && x.token.value : x.syntax ? x.type + '!' + x.syntax.name : null),
- // alternative: mapList(alternative, 'alt', x => x.id),
- // ifStack: mapList(ifStack, 'prev', x => x.id),
+ // elseStack: mapList(elseStack, 'alt', x => x.id),
+ // thenStack: mapList(thenStack, 'prev', x => x.id),
// token: token && token.value,
// tokenCursor,
// syntaxNode
@@ -156,7 +156,7 @@ function internalMatch(tokens, syntax, syntaxes) {
}
if (syntaxNode === MATCH) {
- if (ifStack === null) {
+ if (thenStack === null) {
// turn to MISMATCH when some tokens left unmatched
if (token !== null) {
// doesn't mismatch if just one token left and it's an IE hack
@@ -170,12 +170,12 @@ function internalMatch(tokens, syntax, syntaxes) {
break;
}
- // go to `then` branch
- syntaxNode = ifStack.then;
+ // go to next syntax (`then` branch)
+ syntaxNode = thenStack.nextSyntax;
// check match is not empty
if (syntaxNode === DISALLOW_EMPTY) {
- if (ifStack.matchStack.token === matchStack.token) {
+ if (thenStack.matchStack.token === matchStack.token) {
syntaxNode = MISMATCH;
continue;
} else {
@@ -184,59 +184,59 @@ function internalMatch(tokens, syntax, syntaxes) {
}
// close syntax if needed
- if (syntaxStack !== null && ifStack.syntaxStack !== syntaxStack) {
+ if (syntaxStack !== null && thenStack.syntaxStack !== syntaxStack) {
closeSyntax();
}
- // save if stack top as an alternative for future
- if (alternative === null || alternative.matchStack.size <= ifStack.matchStack.size) {
- ifStack.alt = alternative;
- alternative = ifStack;
- }
-
// pop stack
- ifStack = ifStack.prev;
+ thenStack = thenStack.prev;
continue;
}
if (syntaxNode === MISMATCH) {
- if (ifStack === null) {
- // try alternative match if any
- if (alternative === null) {
+ if (elseStack === null) {
// break the main loop, return a result - MISMATCH
break;
}
- ifStack = alternative;
- alternative = alternative.alt;
- }
-
- // go to `else` branch
- syntaxNode = ifStack.else;
+ // go to next syntax (`else` branch)
+ syntaxNode = elseStack.nextSyntax;
- // restore match stack state
- syntaxStack = ifStack.syntaxStack;
- matchStack = ifStack.matchStack;
+ // restore all the rest stack states
+ thenStack = elseStack.thenStack;
+ syntaxStack = elseStack.syntaxStack;
+ matchStack = elseStack.matchStack;
tokenCursor = matchStack.size === 0 ? -1 : matchStack.tokenCursor;
token = moveToNextToken();
// pop stack
- ifStack = ifStack.prev;
+ elseStack = elseStack.prev;
continue;
}
switch (syntaxNode.type) {
case 'If':
// push new conditional node to stack
- ifStack = {
+ if (syntaxNode.else !== MISMATCH) {
+ elseStack = {
id: syntaxNode.id,
- then: syntaxNode.then,
- else: syntaxNode.else,
+ nextSyntax: syntaxNode.else,
matchStack: matchStack,
syntaxStack: syntaxStack,
- prev: ifStack,
- alt: null
+ thenStack: thenStack,
+ prev: elseStack
};
+ }
+
+ if (syntaxNode.then !== MATCH) {
+ thenStack = {
+ id: syntaxNode.id,
+ nextSyntax: syntaxNode.then,
+ matchStack: matchStack,
+ syntaxStack: syntaxStack,
+ prev: thenStack
+ };
+ }
syntaxNode = syntaxNode.match;
break;
",7
"diff --git a/lib/snarky/README.md b/lib/snarky/README.md @@ -8,25 +8,15 @@ Disclaimer: This code has not been thoroughly audited and should not
be used in production systems.
## Getting started
-First run
+- First install libsnark's dependencies as specified [here](https://github.com/scipr-lab/libsnark#dependencies)
+- Then, make sure you have [opam](https://opam.ocaml.org/doc/Install.html) installed.
+- Then, install `snarky` by running
```bash
-./init.sh
+opam pin add snarky git@github.com:o1-labs/snarky.git
```
-to fetch and build libsnark. If this fails, make sure to install libsnark's dependencies,
-detailed [here](https://github.com/scipr-lab/libsnark#build-instructions).
+and answering yes to the prompts.
-Then, make sure you have the ocaml dependencies installed with
-```bash
-opam install core ctypes-foreign ctypes
-```
-
-Finally, run
-```bash
-cd caml && oasis setup && make
-```
-to build the library and the examples.
-
-The best place to get started learning how to use the library is the [tutorial](caml/test/tutorial.ml),
+The best place to get started learning how to use the library is the [tutorial](bin/tutorial.ml),
which shows a complete sample usage, heavily annotated.
## Design
@@ -69,7 +59,7 @@ computation for computing the implied Merkle root:
The type of this function is
```ocaml
-val implied_root : Hash.var -> Var.t list -> Hash.var list -> (Hash.var, 'prover_state) Checked.t
+val implied_root : Hash.var -> Boolean.var list -> Hash.var list -> (Hash.var, 'prover_state) Checked.t
```
The return type `(Hash.var, 'prover_state) Checked.t` indicates that the function
returns a ""checked computation"" producing a variable containing a hash, and can be
",7
"diff --git a/src/lib/cli_lib/background_daemon.ml b/src/lib/cli_lib/background_daemon.ml @@ -19,7 +19,16 @@ let run ~f port arg =
if has_daemon then go Run_client else go No_daemon
| No_daemon ->
Print.printf
- !""Error: Daemon not running on port %d. See `coda daemon -help`\n""
+ !""Error: Unable to connect to Coda daemon.\n\
+ - The daemon might not be running. See logs (in \
+ `~/.coda-config/coda.log`) for details.\n\
+ \ Run `coda daemon -help` to see how to start daemon.\n\
+ - If you just started the daemon, wait a minute for the RPC \
+ server to start.\n\
+ - Alternatively, the daemon may not be running the RPC server on \
+ port %d.\n\
+ \ If so, add flag `-daemon-port` with correct port when running \
+ this command.\n""
port ;
go Abort
| Run_client ->
",7
"diff --git a/src/lib/rosetta_lib/errors.ml b/src/lib/rosetta_lib/errors.ml @@ -192,37 +192,39 @@ end = struct
(* Unlike message above, description can be updated whenever we see fit *)
let description = function
| `Sql _ ->
- ""SQL failure""
+ ""We encountered a SQL failure.""
| `Json_parse _ ->
- ""JSON parse error""
+ ""We encountered an error while parsing JSON.""
| `Graphql_coda_query _ ->
- ""GraphQL query failed""
+ ""The GraphQL query failed.""
| `Network_doesn't_exist _ ->
- ""Network doesn't exist""
+ ""The network doesn't exist.""
| `Chain_info_missing ->
- ""Chain info missing""
+ ""Some chain info is missing.""
| `Account_not_found _ ->
- ""Account not found""
+ ""That account could not be found.""
| `Invariant_violation ->
- ""Internal invariant violation (you found a bug)""
+ ""One of our internal invariants was violated. (That means you found a \
+ bug!)""
| `Transaction_not_found _ ->
- ""Transaction not found""
+ ""That transaction could not be found.""
| `Block_missing ->
- ""Block not found""
+ ""That block could not be found.""
| `Malformed_public_key ->
- ""Malformed public key""
+ ""The public key you provided was malformed.""
| `Operations_not_valid _ ->
- ""Cannot convert operations to valid transaction""
+ ""We could not convert those operations to a valid transaction.""
| `Public_key_format_not_valid ->
- ""Invalid public key format""
+ ""The public key you provided had an invalid format.""
| `Unsupported_operation_for_construction ->
- ""Unsupported operation for construction""
+ ""An operation you provided isn't supported for construction.""
| `Signature_missing ->
- ""Signature missing""
+ ""Your request is missing a signature.""
| `No_options_provided ->
- ""No options provided""
+ ""Your request is missing options.""
| `Exception _ ->
- ""Exception""
+ ""We encountered an internal exception while processing your request. \
+ (That means you found a bug!)""
let create ?context kind = {extra_context= context; kind}
",7
"diff --git a/src/lib/merkle_mask/masking_merkle_tree_intf.ml b/src/lib/merkle_mask/masking_merkle_tree_intf.ml @@ -57,8 +57,9 @@ module type S = sig
val commit : t -> unit
(** [unset_parent ?trigger_signal ~loc:__LOC__ t] detaches the parent from
- [t] and sets the location string [loc] to display if [t] is used while
- no parent is registered.
+ [t]. The [loc] argument is shown in the [Dangling_parent_reference]
+ exception, which will be raised if [t] is used while no parent is
+ registered.
If the [trigger_signal] optional argument is [true] or omitted,
[detached_signal] for [t] will be resolved. This should only be set to
",7
"diff --git a/src/lib/user_command_input/user_command_input.ml b/src/lib/user_command_input/user_command_input.ml @@ -44,9 +44,11 @@ module Payload = struct
else
Error
(sprintf
- !""Input nonce %s different from inferred nonce %s""
+ !""Input nonce %s either different from inferred nonce %s \
+ or below minimum_nonce %s""
(Account_nonce.to_string nonce)
- (Account_nonce.to_string inferred_nonce))
+ (Account_nonce.to_string inferred_nonce)
+ (Account_nonce.to_string minimum_nonce))
in
{ Signed_command_payload.Common.Poly.fee= t.fee
; fee_token= t.fee_token
",7
"diff --git a/buildkite/src/Command/TestExecutive.dhall b/buildkite/src/Command/TestExecutive.dhall @@ -7,6 +7,7 @@ let Size = ./Size.dhall
let OpamInit = ../Command/OpamInit.dhall
let Cmd = ../Lib/Cmds.dhall
+let SelectFiles = ../Lib/SelectFiles.dhall
let deployEnv = ""DOCKER_DEPLOY_ENV""
@@ -49,9 +50,12 @@ in
""source ${deployEnv} && ./test_executive.exe cloud"" ++
"" --coda-image gcr.io/o1labs-192920/coda-daemon:\\\$CODA_VERSION-\\\$CODA_GIT_HASH"" ++
"" --coda-automation-location ./automation"" ++
- "" ${testName}""
+ "" ${testName}"" ++
+ "" | tee ${testName}.test.log"" ++
+ "" | logproc -i inline -f '!(.level in [\""Spam\"", \""Debug\""])'""
)
],
+ artifact_paths = [SelectFiles.exactly ""."" ""${testName}.test.log""],
label = ""Execute integration test: ${testName}"",
key = ""integration-test-${testName}"",
target = Size.Medium,
",7
"diff --git a/src/app/test_executive/README.md b/src/app/test_executive/README.md # How to Run Integration Tests
-## Prerequisites
+## Prerequisites Environment Setup
-1) Ensure the following environment variables are properly set if not already: `GCLOUD_API_KEY` (relating to the gcloud service account used in step 2), `KUBE_CONFIG_PATH`, any other vars relating to Google cloud access, vars relating to AWS access, vars relating to ocaml compilation.
+Note: this environment setup assumes that one is a member of o(1) labs and has access to organization infrastructure. You will need an o(1) labs GCP account and AWS account.
-2) Log in to Google Cloud, with the correct cluster, and activate the service account
+1) Download the gcloud integration test API key. Go to the API Credentials page (https://console.cloud.google.com/apis/credentials), find ""Integration-tests log-engine"" and copy the key for that onto your clipboard. run `export GCLOUD_API_KEY=<key>` and/or put it in one's bashrc or .profile. Note that this API key is shared by everyone.
-`gcloud auth login --no-launch-browser <personal login name>`
-`gcloud container clusters get-credentials --region us-west1 mina-integration-west1`
-`gcloud auth activate-service-account <name of service account> --key-file=<path to key file>`
+2) Download your key file for the `automated-validation` service account. Go to the IAM Service Accounts page (https://console.cloud.google.com/iam-admin/serviceaccounts), click into the ""automated-validation@<email domain>"" page, click into the ""Keys"" section in the topbar, and create a new key (one may already have one). Download this key and save to one's preferred path, it will be needed in step 4 of this setup. Note that each individual should have their own key.
-If, in the course of other development, one switches to a separate account, one may need to run the last line again in order to switch back to the service account.
+3) Other than `GCLOUD_API_KEY`, ensure the following other environment variables are also properly set: `KUBE_CONFIG_PATH`, any other vars relating to Google cloud access, `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, `AWS_DEFAULT_REGION=us-west-2`, vars relating to ocaml compilation. It's recommened to set all of these in .bashrc or .profile.
-3) OPTIONAL: Set the following aliases in one's .bashrc or .bash_aliases (note that aliases don't work if set in .profile):
+4) Run the following commands in order to log in to Google Cloud, and activate the service account for one's work machine.
-`alias test_executive=./_build/default/src/app/test_executive/test_executive.exe`
-`alias logproc=./_build/default/src/app/logproc/logproc.exe`
+```
+gcloud auth login --no-launch-browser <personal login name>
+gcloud container clusters get-credentials --region us-west1 mina-integration-west1
+gcloud auth activate-service-account automated-validation@<email domain> --key-file=<path to automated-validation key file>
+```
+
+When the service account is activated, one can run the integration tests but it may interfere with other activity on GCP. If, in the course of other development, one switches to a separate account, one may need to run the last line again in order to switch back to the service account.
+
+5) OPTIONAL: Set the following aliases in one's .bashrc or .bash_aliases (note that aliases don't work if set in .profile):
+
+```alias test_executive=./_build/default/src/app/test_executive/test_executive.exe
+alias logproc=./_build/default/src/app/logproc/logproc.exe```
",7
"diff --git a/src/lib/mina_base/parties.ml b/src/lib/mina_base/parties.ml @@ -41,7 +41,25 @@ let fee_lower_bound_exn (t : t) : Currency.Fee.t =
let x = t.fee_payer.data.body.delta in
match x.sgn with
| Neg ->
- Currency.Amount.to_fee x.magnitude
+ (* See what happens if all the parties that use up balance succeed,
+ and all the non-fee-payer parties that contribute balance fail.
+
+ In the future we could have this function take in the current view of the
+ world to get a more accurate lower bound.
+ *)
+ List.fold_until t.other_parties ~init:x.magnitude ~finish:Fn.id
+ ~f:(fun acc p ->
+ let y = p.data.body.delta in
+ match y.sgn with
+ | Neg ->
+ Continue acc
+ | Pos -> (
+ match Currency.Amount.sub acc y.magnitude with
+ | None ->
+ Stop Currency.Amount.zero
+ | Some acc' ->
+ Continue acc' ) )
+ |> Currency.Amount.to_fee
| Pos ->
assert false
",7
"diff --git a/src/lib/consensus/proof_of_stake.ml b/src/lib/consensus/proof_of_stake.ml @@ -1194,7 +1194,7 @@ module Data = struct
between, and not including, prev and next (relative).
*)
let current_sub_window_densities =
- List.mapi prev_sub_window_densities ~f:(fun i length ->
+ List.mapi prev_sub_window_densities ~f:(fun i density ->
let gt_prev_sub_window =
Sub_window.(of_int i > prev_relative_sub_window)
in
@@ -1208,8 +1208,8 @@ module Data = struct
then gt_prev_sub_window && lt_next_sub_window
else gt_prev_sub_window || lt_next_sub_window
in
- if same_sub_window then length
- else if overlapping_window && not within_range then length
+ if same_sub_window then density
+ else if overlapping_window && not within_range then density
else Length.zero)
in
let current_window_density =
@@ -1230,14 +1230,14 @@ module Data = struct
(* Compute the next window by mutating the current window *)
let next_sub_window_densities =
- List.mapi current_sub_window_densities ~f:(fun i length ->
+ List.mapi current_sub_window_densities ~f:(fun i density ->
let is_next_sub_window =
Sub_window.(of_int i = next_relative_sub_window)
in
if is_next_sub_window then
let f = if incr_window then Length.succ else Fn.id in
- if same_sub_window then f length else f Length.zero
- else length)
+ if same_sub_window then f density else f Length.zero
+ else density)
in
(* Final result is the min window density and window for the new (or virtual) block *)
@@ -1276,7 +1276,7 @@ module Data = struct
Length.Checked.if_ cond ~then_ ~else_
in
let%bind current_sub_window_densities =
- Checked.List.mapi prev_sub_window_densities ~f:(fun i length ->
+ Checked.List.mapi prev_sub_window_densities ~f:(fun i density ->
let%bind gt_prev_sub_window =
Sub_window.Checked.(
constant (UInt32.of_int i) > prev_relative_sub_window)
@@ -1298,11 +1298,11 @@ module Data = struct
in
if_
(Checked.return same_sub_window)
- ~then_:(Checked.return length)
+ ~then_:(Checked.return density)
~else_:
(if_
Boolean.(overlapping_window && not within_range)
- ~then_:(Checked.return length)
+ ~then_:(Checked.return density)
~else_:(Checked.return Length.Checked.zero)))
in
let%bind current_window_density =
@@ -1323,7 +1323,7 @@ module Data = struct
(Length.Checked.min current_window_density prev_min_window_density)
in
let%bind next_sub_window_densities =
- Checked.List.mapi current_sub_window_densities ~f:(fun i length ->
+ Checked.List.mapi current_sub_window_densities ~f:(fun i density ->
let%bind is_next_sub_window =
Sub_window.Checked.(
constant (UInt32.of_int i) = next_relative_sub_window)
@@ -1333,9 +1333,9 @@ module Data = struct
~then_:
(if_
(Checked.return same_sub_window)
- ~then_:Length.Checked.(succ length)
+ ~then_:Length.Checked.(succ density)
~else_:Length.Checked.(succ zero))
- ~else_:(Checked.return length))
+ ~else_:(Checked.return density))
in
return (min_window_density, next_sub_window_densities)
end
",7
"diff --git a/scripts/build-snarkyjs-node.sh b/scripts/build-snarkyjs-node.sh @@ -8,6 +8,7 @@ cp _build/default/src/lib/snarky_js_bindings/snarky_js_node*.js ""$SNARKY_JS_PATH
# better error messages
sed -i 's/function failwith(s){throw \[0,Failure,s\]/function failwith(s){throw joo_global_object.Error(s.c)/' ""$SNARKY_JS_PATH""/src/node_bindings/snarky_js_node.bc.js
sed -i 's/function invalid_arg(s){throw \[0,Invalid_argument,s\]/function invalid_arg(s){throw joo_global_object.Error(s.c)/' ""$SNARKY_JS_PATH""/src/node_bindings/snarky_js_node.bc.js
+sed -i 's/return \[0,Exn,t\]/return joo_global_object.Error(t.c)/' ""$SNARKY_JS_PATH""/src/node_bindings/snarky_js_node.bc.js
# pushd ""$SNARKY_JS_PATH""/src/node_bindings
# wasm-opt --detect-features --enable-mutable-globals -O4 plonk_wasm_bg.wasm -o plonk_wasm_bg.wasm.opt
",7
"diff --git a/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml b/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml @@ -160,7 +160,7 @@ module Plonk_constraint = struct
; vc5 : 'v
; vc6 : 'v
; vc7 : 'v (* LSBs *)
- ; coeff : 'f
+ ; compact : 'f
(* Limbs mode: 0 (standard 3-limb) or 1 (compact 2-limb) *)
}
[@@deriving sexp]
@@ -216,7 +216,7 @@ module Plonk_constraint = struct
; vc5
; vc6
; vc7
- ; coeff
+ ; compact
} ->
RangeCheck0
{ v = f v
@@ -1314,7 +1314,7 @@ end = struct
; vc5
; vc6
; vc7
- ; coeff
+ ; compact
} ) ->
(*
//! 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14
",7
"diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md @@ -38,11 +38,12 @@ Issues are tagged with 'good first issue' if we think it's a good beginner task
Our community of contributors is large, and growing fast. We don't have regularly
scheduled working hours dedicated to Cube Cobra. Thus, we can't simply message each
other on Discord to understand the current state of the project. Discord is
-a great tool for synchronous communication, but our project also requires
-a focus on asynchronous methods of communication. The goal is for the current state
-of the project, including features being worked on, issues not yet resolved,
-and near-term roadmap plans, to be fully discoverable by a passerby without
-needing to chat in realtime with anyone else.
+a great tool for synchronous communication, but it falls short at allowing
+community members to discover conversations they didn't participate in. Our project
+also requires a focus on asynchronous methods of communication. The goal is for
+the current state of the project, including features being worked on, issues not
+yet resolved, and near-term roadmap plans, to be fully discoverable by a passerby
+without needing to chat in realtime with anyone else.
GitHub projects, issues, and pull requests serve this purpose beautifully. We
treat the dekkerglen/CubeCobra repository as the source of truth about what
@@ -70,10 +71,8 @@ when learning about the group's thoughts on a given bug or feature request.
When we notice a bug, we first look for an existing open issue that references the
bug. If we find one, we comment on the issue or use a GitHub reaction emoji to
indicate that we have also noticed the bug. If we don't find one, we open a new
-issue about the bug.
-
-When we notice a change in a bug's behavior, or a new case in which the bug
-can be replicated, we leave comments to that effect on the issue.
+issue about the bug. When we notice a change in a bug's behavior, or a new case in
+which the bug can be replicated, we leave comments to that effect on the issue.
When we begin actively working on a feature, we comment to that effect on the
corresponding issue. This comment of ""I'm working on this"" indicates to other
@@ -99,10 +98,6 @@ from the community. When we do this, we're communicating that we'd like others
to be aware of the details of our progress without requesting a detailed code
review just yet.
-Sometimes, WIP pull requests include checklists in their descriptions
-describing work remaining to be done. We use these checklists to indicate
-progress to observers and to keep track of it for ourselves.
-
When we feel that a feature we're working on is ""code complete"", we open pull
requests. These pull requests have descriptions that briefly summarize the
changes, and sometimes include more detailed breakdowns of the architectural
",7
"diff --git a/routes/users_routes.js b/routes/users_routes.js @@ -130,21 +130,35 @@ router.post('/lostpasswordreset', function(req, res) {
User.findOne({
email: req.body.email
}, function(err, user) {
- if (user) {
+ if (err) {
+ console.error('Password reset find user error:', err);
+ res.sendStatus(500);
+ return;
+ }
+ if (!user) {
+ req.flash('danger', 'No user with that email found! Are you sure you created an account?');
+ res.render('user/passwordreset');
+ }
if (req.body.password2 != req.body.password) {
req.flash('danger', 'New passwords don\'t match');
res.render('user/passwordreset');
} else {
bcrypt.genSalt(10, function(err, salt) {
+ if (err) {
+ console.error('Password reset genSalt error:', err);
+ res.sendStatus(500);
+ return;
+ }
bcrypt.hash(req.body.password2, salt, function(err, hash) {
if (err) {
- console.log(err);
+ console.error('Password reset hashing error:', err);
+ res.sendStatus(500);
} else {
user.password = hash;
user.save(function(err) {
if (err) {
- console.log(err)
- return;
+ console.error('Password reset user save error:', err)
+ res.sendStatus(500);
} else {
req.flash('success', 'Password updated succesfully');
return res.redirect('/user/login');
@@ -154,7 +168,6 @@ router.post('/lostpasswordreset', function(req, res) {
});
});
}
- }
});
}
});
",7
"diff --git a/src/analytics/PlaytestData.js b/src/analytics/PlaytestData.js import React, { useMemo } from 'react';
import PropTypes from 'prop-types';
+import { ListGroupItem } from 'reactstrap';
import CardPropType from 'proptypes/CardPropType';
import CubeAnalyticPropType from 'proptypes/CubeAnalyticPropType';
@@ -7,7 +8,23 @@ import CubeAnalyticPropType from 'proptypes/CubeAnalyticPropType';
import { compareStrings, SortableTable } from 'components/SortableTable';
import { fromEntries } from 'utils/Util';
import ErrorBoundary from 'components/ErrorBoundary';
-import { mainboardRate, pickRate } from 'utils/Card';
+import { mainboardRate, pickRate, encodeName } from 'utils/Card';
+
+import withAutocard from 'components/WithAutocard';
+
+const AutocardItem = withAutocard(ListGroupItem);
+
+const renderCardLink = (card) => (
+ <AutocardItem className=""p-0"" key={card.index} card={card} data-in-modal index={card.index}>
+ <a href={`/tool/card/${encodeName(card.cardID)}`} target=""_blank"" rel=""noopener noreferrer"">
+ {card.details.name}
+ </a>
+ </AutocardItem>
+);
+
+const renderPercent = (val) => {
+ return <>{parseInt(val * 1000, 10) / 10}%</>;
+};
const PlaytestData = ({ cards: allCards, cubeAnalytics }) => {
const cardDict = useMemo(() => fromEntries(allCards.map((card) => [card.details.name.toLowerCase(), card])), [
@@ -19,7 +36,7 @@ const PlaytestData = ({ cards: allCards, cubeAnalytics }) => {
cubeAnalytics.cards
.filter((cardAnalytic) => cardDict[cardAnalytic.cardName])
.map(({ cardName, elo, mainboards, sideboards, picks, passes }) => ({
- cardName: cardDict[cardName].details.name,
+ card: cardDict[cardName],
elo: Math.round(elo),
mainboard: mainboardRate({ mainboards, sideboards }),
pickrate: pickRate({ picks, passes }),
@@ -34,11 +51,17 @@ const PlaytestData = ({ cards: allCards, cubeAnalytics }) => {
<ErrorBoundary>
<SortableTable
columnProps={[
- { key: 'cardName', title: 'Card Name', heading: true, sortable: true },
+ {
+ key: 'card',
+ title: 'Card Name',
+ heading: true,
+ sortable: true,
+ renderFn: renderCardLink,
+ },
{ key: 'elo', title: 'Cube Elo', sortable: true, heading: false },
- { key: 'pickrate', title: 'Pick Rate', sortable: true, heading: false },
+ { key: 'pickrate', title: 'Pick Rate', sortable: true, heading: false, renderFn: renderPercent },
{ key: 'picks', title: 'Pick Count', sortable: true, heading: false },
- { key: 'mainboard', title: 'Mainboard Rate', sortable: true, heading: false },
+ { key: 'mainboard', title: 'Mainboard Rate', sortable: true, heading: false, renderFn: renderPercent },
{ key: 'mainboards', title: 'Mainboard Count', sortable: true, heading: false },
]}
data={data}
",7
"diff --git a/src/components/ListView.js b/src/components/ListView.js @@ -104,7 +104,9 @@ const ListViewRow = ({ card, versions, versionsLoading, checked, onCheck, addAle
},
});
if (!response.ok) {
- addAlert('danger', `Failed to update ${card.details.name} (status ${response.statusCode})`);
+ const json = await response.json();
+ const message = json?.message || `status ${response.status}`;
+ addAlert('danger', `Failed to update ${card.details.name} (${message})`);
return;
}
",7
"diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js const index = this.header.fields.indexOf(this.options.sortName)
let timeoutId = 0
- if (this.options.customSort) {
- this.options.customSort.apply(this, [this.options.sortName, this.options.sortOrder])
- return
- }
-
if (index !== -1) {
if (this.options.sortStable) {
this.data.forEach((row, i) => {
})
}
+ if (this.options.customSort) {
+ Utils.calculateObjectValue(this.options, this.options.customSort, [
+ this.options.sortName,
+ this.options.sortOrder,
+ this.data
+ ])
+ } else {
this.data.sort((a, b) => {
if (this.header.sortNames[index]) {
name = this.header.sortNames[index]
if (aa < bb) {
return order * -1
}
+ if (aa > bb) {
return order
}
+ return 0
+ }
if (aa === bb) {
return 0
return order
})
+ }
if (this.options.sortClass !== undefined) {
clearTimeout(timeoutId)
",7
"diff --git a/site/docs/api/table-options.md b/site/docs/api/table-options.md @@ -304,6 +304,10 @@ The table options are defined in `jQuery.fn.bootstrapTable.defaults`.
- **Default:** `undefined`
+- **Error handling**
+
+ To get loading errors please use [onLoadError](https://bootstrap-table.com/docs/api/events/#onloaderror)
+
- **Example:** [From URL](https://examples.bootstrap-table.com/#welcomes/from-url.html)
## method
",7
"diff --git a/src/extensions/copy-rows/bootstrap-table-copy-rows.js b/src/extensions/copy-rows/bootstrap-table-copy-rows.js const Utils = $.fn.bootstrapTable.utils
-const constants = {
- 3: {
- icons: {
- copy: 'glyphicon-copy icon-pencil'
- }
- },
- 4: {
- icons: {
- copy: 'fa-copy'
- }
- }
-}[Utils.bootstrapVersion]
+$.extend($.fn.bootstrapTable.defaults.icons, {
+ copy: {
+ bootstrap3: 'glyphicon-copy icon-pencil',
+ materialize: 'content_copy'
+ }[$.fn.bootstrapTable.theme] || 'fa-copy'
+})
const copyText = text => {
const textField = document.createElement('textarea')
@@ -49,12 +43,12 @@ $.BootstrapTable = class extends $.BootstrapTable {
initToolbar (...args) {
super.initToolbar(...args)
- const $btnGroup = this.$toolbar.find('>.btn-group')
+ const $btnGroup = this.$toolbar.find('>.columns')
if (this.options.showCopyRows && this.header.stateField) {
this.$copyButton = $(`
<button class=""${this.constants.buttonsClass}"">
- <i class=""${this.options.iconsPrefix} ${constants.icons.copy}""></i>
+ ${Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, this.options.icons.copy)}
</button>
`)
$btnGroup.append(this.$copyButton)
",7
"diff --git a/src/extensions/export/bootstrap-table-export.js b/src/extensions/export/bootstrap-table-export.js @@ -207,9 +207,11 @@ $.BootstrapTable = class extends $.BootstrapTable {
? 'post-body.bs.table' : 'page-change.bs.table'
this.$el.one(eventName, () => {
doExport(() => {
+ this.virtualScrollDisabled = false
this.togglePagination()
})
})
+ this.virtualScrollDisabled = true
this.togglePagination()
this.trigger('export-saved', this.getData())
} else if (o.exportDataType === 'selected') {
",7
"diff --git a/src/extensions/export/bootstrap-table-export.js b/src/extensions/export/bootstrap-table-export.js @@ -93,9 +93,9 @@ $.BootstrapTable = class extends $.BootstrapTable {
exportTypes = types.map(t => t.slice(1, -1))
}
- if (exportTypes.length === 1) {
- this.$export = $(`
- <div class=""export"">
+ this.$export = $(exportTypes.length === 1 ? `
+ <div class=""export ${this.constants.classes.buttonsDropdown}""
+ data-type=""${exportTypes[0]}"">
<button class=""${this.constants.buttonsClass}""
aria-label=""Export""
type=""button""
@@ -104,24 +104,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
${o.showButtonText ? o.formatExport() : ''}
</button>
</div>
- `).appendTo($btnGroup)
-
- this.updateExportButton()
-
- $btnGroup.click(e => {
- e.preventDefault()
-
- const type = exportTypes[0]
- const exportOptions = {
- type,
- escape: false
- }
-
- this.exportTable(exportOptions)
- })
- }
- else {
- this.$export = $(`
+ ` : `
<div class=""export ${this.constants.classes.buttonsDropdown}"">
<button class=""${this.constants.buttonsClass} dropdown-toggle""
aria-label=""Export""
@@ -134,9 +117,11 @@ $.BootstrapTable = class extends $.BootstrapTable {
</button>
</div>
`).appendTo($btnGroup)
- this.$export.append($menu)
- this.updateExportButton()
+ let $items = this.$export
+
+ if (exportTypes.length > 1) {
+ this.$export.append($menu)
// themes support
if ($menu.children().length) {
@@ -151,7 +136,12 @@ $.BootstrapTable = class extends $.BootstrapTable {
}
}
- $menu.children().click(e => {
+ $items = $menu.children()
+ }
+
+ this.updateExportButton()
+
+ $items.click(e => {
e.preventDefault()
const type = $(e.currentTarget).data('type')
@@ -162,7 +152,6 @@ $.BootstrapTable = class extends $.BootstrapTable {
this.exportTable(exportOptions)
})
- }
this.handleToolbar()
}
",7
"diff --git a/src/extensions/print/bootstrap-table-print.js b/src/extensions/print/bootstrap-table-print.js @@ -99,11 +99,11 @@ $.BootstrapTable = class extends $.BootstrapTable {
doPrint (data) {
const formatValue = (row, i, column ) => {
- const value = row[column.field]
- if (typeof column.printFormatter === 'function') {
- return column.printFormatter(...[value, row, i])
- }
- return typeof value === 'undefined' ? '-' : value
+ const value = Utils.calculateObjectValue(column, column.printFormatter,
+ [row[column.field], row, i], row[column.field])
+
+ return typeof value === 'undefined' || value === null
+ ? this.options.undefinedText : value
}
const buildTable = (data, columnsArray) => {
",7
"diff --git a/site/docs/extensions/reorder-rows.md b/site/docs/extensions/reorder-rows.md @@ -104,7 +104,9 @@ if you want you can include the bootstrap-table-reorder-rows.css file to use the
- **Detail:**
- This is the cursor to use
+ This is the cursor element.
+
+ **Note: This option is mainly used to adapt to the `TableDnD` plugin. Under no special circumstances, please do not modify the default value.**
- **Default:** `>tbody>tr>td`
",7
"diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js @@ -1951,6 +1951,12 @@ class BootstrapTable {
}
},
error: jqXHR => {
+ // abort ajax by multiple request
+ if (jqXHR && jqXHR.status === 0 && this._xhrAbort) {
+ this._xhrAbort = false
+ return
+ }
+
let data = []
if (this.options.sidePagination === 'server') {
@@ -1968,6 +1974,7 @@ class BootstrapTable {
Utils.calculateObjectValue(this, this.options.ajax, [request], null)
} else {
if (this._xhr && this._xhr.readyState !== 4) {
+ this._xhrAbort = true
this._xhr.abort()
}
this._xhr = $.ajax(request)
",7
"diff --git a/src/extensions/cookie/bootstrap-table-cookie.js b/src/extensions/cookie/bootstrap-table-cookie.js @@ -504,24 +504,24 @@ $.BootstrapTable = class extends $.BootstrapTable {
throw new Error('Could not parse the json of the sortPriority cookie!', sortPriorityCookie)
}
+ // sortOrder
+ this.options.sortOrder = undefined
+ // sortName
+ this.options.sortName = undefined
+
if (!sortPriorityCookie) {
// sortOrder
this.options.sortOrder = sortOrderCookie ? sortOrderCookie : this.options.sortOrder
// sortName
this.options.sortName = sortOrderNameCookie ? sortOrderNameCookie : this.options.sortName
- } else {
- // sortOrder
- this.options.sortOrder = undefined
- // sortName
- this.options.sortName = undefined
}
+ // sortPriority
+ this.options.sortPriority = sortPriorityCookie ? sortPriorityCookie : this.options.sortPriority
+
if (this.options.sortOrder || this.options.sortName) {
// sortPriority
this.options.sortPriority = null
- } else {
- // sortPriority
- this.options.sortPriority = sortPriorityCookie ? sortPriorityCookie : this.options.sortPriority
}
// pageNumber
",7
"diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md -**Bug fix?**
-<!-- yes/no -->
+**Type of Request**
+- [ ] **Bug fix**
+- [ ] **New feature**
+- [ ] **Improvement**
+- [ ] **Documentation**
+- [ ] **Other**
-**New Feature?**
-<!-- yes/no -->
-
-**Resolve an issue?**
+**Resolves an issue?**
<!-- Please prefix each issue number with ""Fix #"" (e.g. Fix #200) -->
**Example(s)?**
",7
"diff --git a/packages/react-dev-utils/getProcessForPort.js b/packages/react-dev-utils/getProcessForPort.js @@ -43,7 +43,7 @@ function getProcessCommand(processId, processDirectory) {
}
function getDirectoryOfProcessById(processId) {
- return execSync('lsof -p '+ processId + ' | grep cwd | awk \'{print $9}\'', execOptions).trim();
+ return execSync('lsof -p '+ processId + ' | awk \'$4==""cwd"" {print $9}\'', execOptions).trim();
}
function getProcessForPort(port) {
",7
"diff --git a/packages/react-scripts/scripts/utils/verifyPackageTree.js b/packages/react-scripts/scripts/utils/verifyPackageTree.js @@ -97,7 +97,7 @@ function verifyPackageTree() {
)}) \n\n` +
`Manually installing incompatible versions is known to cause hard-to-debug issues.\n\n` +
chalk.red(
- `If prefer to ignore this check, add ${chalk.bold(
+ `If you would prefer to ignore this check, add ${chalk.bold(
'SKIP_PREFLIGHT_CHECK=true'
)} to an ${chalk.bold('.env')} file in your project.\n` +
`That will permanently disable this message but you might encounter other issues.\n\n`
",7
"diff --git a/docusaurus/website/static/css/custom.css b/docusaurus/website/static/css/custom.css .homeContainer .button {
background: #24292e;
border-color: white;
+ transition: background 0.3s, color 0.3s;
+}
+
+.homeContainer .button:hover {
+ background: white;
+ color: #282c34;
}
.homeContainer * {
",7
"diff --git a/user.js b/user.js @@ -680,13 +680,12 @@ user_pref(""security.pki.crlite_mode"", 2);
user_pref(""security.mixed_content.block_active_content"", true); // [DEFAULT: true]
/* 1241: disable insecure passive content (such as images) on https pages [SETUP-WEB] ***/
user_pref(""security.mixed_content.block_display_content"", true);
-/* 1244: enable HTTPS-Only mode [FF76+]
- * When ""https_only_mode"" (all windows) is true, ""https_only_mode_pbm"" (private windows only) is ignored
- * [SETTING] to add site exceptions: Padlock>HTTPS-Only mode>On/Off/Off temporarily
- * [SETTING] Privacy & Security>HTTPS-Only Mode
+/* 1244: enable HTTPS-Only mode in all windows [FF76+]
+ * When the top-level is HTTPS, insecure subresources are also upgraded (silent fail)
+ * [SETTING] to add site exceptions: Padlock>HTTPS-Only mode>On (after ""Continue to HTTP Site"")
+ * [SETTING] Privacy & Security>HTTPS-Only Mode (and manage exceptions)
* [TEST] http://example.com [upgrade]
- * [TEST] http://neverssl.org/ [no upgrade]
- * [1] https://bugzilla.mozilla.org/1613063 [META] ***/
+ * [TEST] http://neverssl.org/ [no upgrade] ***/
user_pref(""dom.security.https_only_mode"", true); // [FF76+]
// user_pref(""dom.security.https_only_mode_pbm"", true); // [FF80+]
/* 1245: enable HTTPS-Only mode for local resources [FF77+] ***/
",7
"diff --git a/prefsCleaner.sh b/prefsCleaner.sh @@ -88,6 +88,7 @@ echo -e ""\nThis script should be run from your Firefox profile directory.\n""
echo ""It will remove any entries from prefs.js that also exist in user.js.""
echo ""This will allow inactive preferences to be reset to their default values.""
echo -e ""\nThis Firefox profile shouldn't be in use during the process.\n""
+echo -e ""\nIn order to proceed, select a command below by entering its corresponding number.\n""
[ ""$1"" == '-s' ] && fStart
",7
"diff --git a/components/Form/Input/__tests__/Input.test.js b/components/Form/Input/__tests__/Input.test.js @@ -21,8 +21,8 @@ describe('Input', () => {
createSnapshotTest(<Input {...requiredProps} />);
});
- it('should render with label', () => {
- const wrapper = shallow(<Input {...requiredProps} />);
+ it('should render with label, even if hidden', () => {
+ const wrapper = shallow(<Input {...requiredProps} isLabelHidden />);
expect(wrapper).toContainExactlyOneMatchingElement('Label');
});
",7
"diff --git a/components/Timeline/TimelineNav/TimelineNav.css b/components/Timeline/TimelineNav/TimelineNav.css .timelineNavContainer {
display: flex;
+ padding: 0 4rem;
justify-content: space-around;
}
+@media screen and (--small-viewport) {
+ .timelineNavContainer {
+ padding: 0;
+ }
+}
+
.timelineNavLink {
+ font-weight: 700;
cursor: pointer;
- transition: transform 100ms ease-in-out;
+ transition: transform opacity 100ms ease-in-out;
}
.timelineNavLink:not(:hover) {
- opacity: 0.7;
+ opacity: 0.6;
}
.timelineNavLink:hover {
- text-decoration: underline;
transform: scale(1.1);
}
",7
"diff --git a/scripts/thirdParty/gtag.js b/scripts/thirdParty/gtag.js @@ -6,6 +6,10 @@ const isProduction =
process.env.NODE_ENV === 'production' && window.location.host.includes('operationcode.org');
const isDevelopment = process.env.NODE_ENV === 'development';
+/**
+ * @description dev-only logging of gtag methods
+ * @param {{ methodName: string }} { methodName, ...rest }
+ */
const log = ({ methodName, ...rest }) => {
if (isDevelopment) {
console.log(`gtag.${methodName}\n`, rest); // eslint-disable-line no-console
@@ -15,7 +19,7 @@ const log = ({ methodName, ...rest }) => {
/**
* @description Log a pageview with google tag manager
* @param {string} url
- * @param {boolean} isModalView
+ * @param {boolean?} isModalView
* @see https://developers.google.com/analytics/devguides/collection/gtagjs/pages
*/
const pageView = (url, isModalView = false) => {
@@ -39,7 +43,17 @@ const pageView = (url, isModalView = false) => {
* }}
* @see https://developers.google.com/analytics/devguides/collection/gtagjs/events
*/
-const event = ({ action, category, label, value, callback }) => {
+const event = ({
+ action,
+ category,
+ label = undefined,
+ value = undefined,
+ callback = undefined,
+}) => {
+ if (!action || !category) {
+ throw new Error('Google Events must be called with at least an action and category.');
+ }
+
log({
methodName: 'event',
action,
",7
"diff --git a/sass/components/forms/_input-fields.scss b/sass/components/forms/_input-fields.scss @@ -115,7 +115,8 @@ textarea.materialize-textarea {
display: block;
content: """";
position: absolute;
- top: 60px;
+ bottom: 0;
+ transform: translateY(75%);
opacity: 0;
transition: .2s opacity ease-out, .2s color ease-out;
}
@@ -155,13 +156,14 @@ textarea.materialize-textarea {
position: absolute;
top: 0.8rem;
left: 0;
+ height: 100%;
font-size: 1rem;
cursor: text;
transition: .2s ease-out;
&:not(.label-icon).active {
font-size: $label-font-size;
- transform: translateY(-140%);
+ transform: translateY(-22px);
}
}
",7
"diff --git a/js/sidenav.js b/js/sidenav.js */
_handleDragTargetRelease() {
if (this.isDragged) {
- if (this.percentOpen > .5) {
+ if (this.percentOpen > .2) {
this.open();
} else {
this._animateOut();
*/
_handleCloseRelease() {
if (this.isOpen && this.isDragged) {
- if (this.percentOpen > .5) {
+ if (this.percentOpen > .8) {
this._animateIn();
} else {
this.close();
",7
"diff --git a/modules/google-earth-engine/docker/src/sepal/sentinel2/first_pass.py b/modules/google-earth-engine/docker/src/sepal/sentinel2/first_pass.py @@ -74,6 +74,6 @@ class FirstPass(ImageOperation):
'landCloudScore')
self.set('snow',
- '!i.water and i.ndsi > 0.15 and i.nir > 0.11 and i.green > 0.1')
+ 'i.blue > 0.18 and i.red > 0.07 and i.blue/i.red > 0.85 and i.nir > 0.15 and i.ndsi > 0.2')
return self.image
",7
"diff --git a/modules/google-earth-engine/docker/src/sepal/export/monitor.py b/modules/google-earth-engine/docker/src/sepal/export/monitor.py @@ -43,7 +43,7 @@ class MonitorEarthEngineExportTask(ThreadTask):
self.resolve()
return
else:
- error_message = status['error_message']
+ error_message = status['error_message'] if state == Task.State.FAILED else 'Task was canceled'
self._status = {
'state': State.FAILED,
'message': error_message
",7
"diff --git a/modules/gui-react/frontend/src/widget/button2.module.css b/modules/gui-react/frontend/src/widget/button2.module.css }
.hold:not(:disabled):hover {
- background: hsla(0, 0%, 100%, 20%);
+ /* background: hsla(0, 0%, 100%, 20%); */
}
.hold:before {
z-index: -1;
}
+.hold:not(:disabled):hover:before {
+ top: 75%;
+ background: hsla(0, 0%, 100%, 20%);
+ transition: top 150ms ease-in-out;
+}
+
.hold:not(:disabled):hover:active:before {
animation: fill 750ms ease-out forwards normal;
}
@keyframes fill {
90% {
top: 0;
- background: hsla(0, 0%, 100%, 30%);
+ background: hsla(0, 0%, 100%, 40%);
}
100% {
top: 0;
",7
"diff --git a/modules/gui-react/frontend/src/widget/form.js b/modules/gui-react/frontend/src/widget/form.js +import PropTypes from 'prop-types'
import React from 'react'
import {connect} from 'store'
-import PropTypes from 'prop-types'
import {msg} from 'translate'
import styles from './form.module.css'
export function form(inputs, mapStateToProps) {
return (WrappedComponent) => {
class Form extends React.Component {
+ onDirtyListeners = []
+ onCleanListeners = []
+
constructor(props) {
super(props)
const state = {
- values: props.values || {},
- errors: props.errors || {}
+ initialValues: {...props.values} || {},
+ values: {...props.values} || {},
+ errors: {...props.errors} || {},
+ dirty: false
}
-
Object.keys(inputs).forEach(name => {
+ state.initialValues[name] = name in state.initialValues ? state.initialValues[name] : ''
state.values[name] = name in state.values ? state.values[name] : ''
state.errors[name] = name in state.errors ? state.errors[name] : ''
})
@@ -35,10 +40,10 @@ export function form(inputs, mapStateToProps) {
this.setState((prevState) =>
({...prevState, errors: nextProps.errors})
)
- if ('values' in nextProps)
- this.setState((prevState) =>
- ({...prevState, values: {...prevState.values, ...nextProps.values}})
- )
+ // if ('values' in nextProps)
+ // this.setState((prevState) =>
+ // ({...prevState, values: {...prevState.values, ...nextProps.values}})
+ // )
}
handleChange(e) {
@@ -57,6 +62,11 @@ export function form(inputs, mapStateToProps) {
const state = Object.assign({}, prevState)
state.values[name] = value
state.errors[name] = ''
+ state.dirty = state.initialValues[name] !== value
+ if (state.dirty && !prevState.dirty)
+ this.onDirty()
+ if (!state.dirty && prevState.dirty)
+ this.onClean()
return state
})
return this
@@ -86,6 +96,39 @@ export function form(inputs, mapStateToProps) {
return !!Object.keys(this.state.values).find(name => this.error(name))
}
+ reset() {
+ this.setState((prevState) => {
+ const dirty = !!Object.keys(inputs).find((name) => {
+ this.state.values[name] !== this.state.initialValues
+ }
+ )
+ const state = {...prevState, values: {...prevState.initialValues}, dirty: dirty}
+ if (state.dirty && !prevState.dirty)
+ this.onDirty()
+ if (!state.dirty && prevState.dirty)
+ this.onClean()
+ return state
+ })
+ }
+
+ isValueDirty(name) {
+ const state = this.state
+ return state.values[name] !== state.initialValues[name]
+ }
+
+ isDirty() {
+ return !!Object.keys(this.state.initialValues)
+ .find(this.isValueDirty)
+ }
+
+ onDirty() {
+ this.onDirtyListeners.forEach((listener) => listener())
+ }
+
+ onClean() {
+ this.onCleanListeners.forEach((listener) => listener())
+ }
+
render() {
const formInputs = {}
Object.keys(inputs).forEach(name => {
@@ -96,6 +139,7 @@ export function form(inputs, mapStateToProps) {
errorClass: this.state.errors[name] ? styles.error : null,
set: (value) => this.set(name, value),
handleChange: (e) => this.handleChange(e),
+ isDirty: () => this.isValueDirty(name),
validate: () => this.validate(name)
}
})
@@ -106,6 +150,10 @@ export function form(inputs, mapStateToProps) {
.filter(error => error),
errorClass: styles.error,
hasInvalid: this.hasInvalid,
+ onDirty: (listener) => this.onDirtyListeners.push(listener),
+ onClean: (listener) => this.onCleanListeners.push(listener),
+ reset: () => this.reset(),
+ isDirty: () => this.isDirty,
values: () => this.state.values
},
inputs: formInputs
",7
"diff --git a/modules/gui/frontend/src/action-builder.js b/modules/gui/frontend/src/action-builder.js @@ -62,7 +62,7 @@ const actionBuilder = (type, props) => {
setValueByTemplate(path, template, value) {
operations.push((immutableState, state) => {
const index = select(path, state)
- .findIndex(value => _.isEqual(template, _.pick(value, _.keys(template))))
+ .findIndex(value => _.isEqual(_.merge({}, value, template), value))
return (index !== -1)
? immutableState.set([...toPathList(path), index], value)
: immutableState
@@ -80,7 +80,7 @@ const actionBuilder = (type, props) => {
assignValueByTemplate(path, template, value) {
operations.push((immutableState, state) => {
const index = select(path, state)
- .findIndex(value => _.isEqual(template, _.pick(value, _.keys(template))))
+ .findIndex(value => _.isEqual(_.merge({}, value, template), value))
return (index !== -1)
? immutableState.assign([...toPathList(path), index], value)
: immutableState
@@ -159,7 +159,7 @@ const actionBuilder = (type, props) => {
delValueByTemplate(path, template) {
operations.push((immutableState, state) => {
const index = select(path, state)
- .findIndex(value => _.isEqual(template, _.pick(value, _.keys(template))))
+ .findIndex(value => _.isEqual(_.merge({}, value, template), value))
return (index !== -1)
? immutableState.del([...toPathList(path), index])
: immutableState
",7
"diff --git a/modules/gui/frontend/src/widget/sectionLayout.module.css b/modules/gui/frontend/src/widget/sectionLayout.module.css .bar {
flex-shrink: 0;
height: fit-content;
+ min-height: 3rem;
padding: 0 .8rem;
background-color: rgba(0, 0, 0, .25);
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+}
+
+.bar > * {
+ width: 100%;
}
.padding {
- padding: .5rem .8rem;
+ padding: .3rem .8rem;
color: #ccc;
font-size: .9rem;
}
",7
"diff --git a/modules/gui/frontend/src/widget/button.module.css b/modules/gui/frontend/src/widget/button.module.css .button {
--small-font-size: .8rem;
--normal-font-size: .9rem;
- --large-font-size: 1.1rem;
- --x-large-font-size: 1.3rem;
- --ratio: 2;
+ --large-font-size: 1.0rem;
+ --x-large-font-size: 1.1rem;
+ --ratio: 2.2;
position: relative;
cursor: pointer;
transition: all 100ms ease-in-out;
font-size: var(--font-size);
+ line-height: var(--font-size);
+ min-height: fit-content;
height: calc(var(--ratio) * var(--font-size));
min-width: calc(var(--ratio) * var(--font-size));
width: fit-content;
@media only screen and (max-width: 500px) {
.button {
- --ratio: 1.8;
+ --ratio: 1.9;
}
}
padding: 0;
}
+/* sizes */
+
.button.small {
--font-size: var(--small-font-size);
}
}
.button.x-large {
- /* same size as large, but with padding */
- --font-size: var(--large-font-size);
+ --font-size: var(--x-large-font-size);
}
+/* shapes */
+
.button.rectangle {
border-radius: var(--button-border-radius);
- padding: 0 .8rem;
-}
-
-.button.rectangle.x-large {
- padding: .2rem 1.2rem;
+ padding: 0 calc(var(--font-size) * .8);
}
.button.pill {
border-radius: 500px;
- padding: 0 .8rem;
-}
-
-.button.pill.x-large {
- padding: .2rem 1.2rem;
+ padding: 0 calc(var(--font-size) * .8);
}
.button.circle {
}
}
+/* groups */
+
.group {
--button-spacing: .5rem;
height: fit-content;
",7
"diff --git a/modules/gui/frontend/src/widget/datePicker.js b/modules/gui/frontend/src/widget/datePicker.js @@ -6,19 +6,38 @@ import React, {Component} from 'react'
import {activatable} from 'widget/activation/activatable'
import {Activator} from 'widget/activation/activator'
import {Button} from 'widget/button'
+import {isMobile} from 'widget/userAgent'
import styles from './datePicker.module.css'
-import {Input} from './form'
import Label from './label'
import {Panel, PanelButtons, PanelContent, PanelHeader} from './panel'
import {Scrollable, ScrollableContainer} from './scrollable'
const DATE_FORMAT = 'YYYY-MM-DD'
+export const momentDate = date => _.isString(date) ? moment(date, DATE_FORMAT) : moment(date)
+
+const pickDate = (date1, date2, func) => {
+ date1 = momentDate(date1)
+ date2 = momentDate(date2)
+ if (!date1.isValid())
+ return date2
+ else if (!date2.isValid())
+ return date1
+ else
+ return func(date1, date2)
+}
+
+export const maxDate = (date1, date2) => pickDate(date1, date2, moment.max)
+export const minDate = (date1, date2) => pickDate(date1, date2, moment.min)
+export const constrainDate = (date, min, max) => maxDate(minDate(date, max), min)
+
export default class DatePicker extends React.Component {
id = 'DatePicker-' + guid()
+ inputElement = React.createRef()
render() {
const {input, startDate, endDate, label, autoFocus} = this.props
+ const date = moment(input.value, DATE_FORMAT)
return (
<Activator id={this.id}>
{panel =>
@@ -26,18 +45,30 @@ export default class DatePicker extends React.Component {
<DatePickerPanel
id={this.id}
title={label}
- date={moment(input.value, DATE_FORMAT)}
- startDate={_.isString(startDate) ? moment(startDate, DATE_FORMAT) : moment(startDate)}
- endDate={_.isString(endDate) ? moment(endDate, DATE_FORMAT) : moment(endDate)}
- onSelect={date => input.set(date.format(DATE_FORMAT))}/>
+ date={date.isValid() ? date : moment(startDate, DATE_FORMAT)}
+ startDate={momentDate(startDate)}
+ endDate={momentDate(endDate)}
+ onSelect={date => {
+ const dateString = date.format(DATE_FORMAT)
+ this.inputElement.current.value = dateString
+ input.set(dateString)
+ }}/>
{this.renderLabel()}
<div className={styles.input}>
- <Input
- autoFocus={autoFocus}
- input={input}
+ <input
+ ref={this.inputElement}
+ defaultValue={input.value}
maxLength={10}
+ autoFocus={autoFocus && !isMobile()}
autoComplete='off'
+ autoCorrect='off'
+ autoCapitalize='off'
+ spellCheck='false'
className={styles.input}
+ onChange={e => this.setInput(e.target.value)}
+ onBlur={() => {
+ this.inputElement.current.value = input.value
+ }}
/>
<Button additionalClassName={styles.panelTrigger}
chromeless
@@ -63,21 +94,13 @@ export default class DatePicker extends React.Component {
) : null
}
- componentDidMount() {
- this.setToValidRange()
- }
-
- componentDidUpdate(prevProps, prevState, snapshot) {
- if (prevProps.input.value !== this.props.input.value)
- this.setToValidRange()
- }
-
- setToValidRange() {
+ setInput(value) {
const {input, startDate, endDate} = this.props
- const date = moment(input.value, DATE_FORMAT)
- const validDate = moment.max(moment.min(moment(date), moment(endDate)), moment(startDate))
- if (!date.isSame(validDate))
- input.set(validDate.format(DATE_FORMAT))
+ const date = momentDate(value)
+ const formattedDate = date.isValid()
+ ? constrainDate(date, startDate, endDate).format(DATE_FORMAT)
+ : momentDate(startDate).format(DATE_FORMAT)
+ input.set(formattedDate)
}
}
@@ -223,7 +246,7 @@ class _DatePickerPanel extends React.Component {
toValidRange(date) {
const {startDate, endDate} = this.props
- return moment.max(moment.min(moment(date), moment(endDate)), moment(startDate))
+ return constrainDate(date, startDate, endDate)
}
select() {
",7
"diff --git a/modules/google-earth-engine/docker/sepal-ee/sepal/ee/radar/radar_mosaic.py b/modules/google-earth-engine/docker/sepal-ee/sepal/ee/radar/radar_mosaic.py @@ -25,7 +25,7 @@ def viz_params(bands):
Args:
bands: The bands to get visualization params for. Must be one of the following:
- VV, VH, VV_VH, dayOfYear, daysFromTarget.
+ VV, VH, VV_VH (VV/VH ratio), dayOfYear, daysFromTarget.
Returns:
Dictionary with visualization params.
",7
"diff --git a/modules/gui/frontend/src/widget/combo.js b/modules/gui/frontend/src/widget/combo.js @@ -70,10 +70,16 @@ class Combo extends React.Component {
renderInput() {
const {placeholder, autoFocus, disabled, busy, standalone, inputClassName, input} = this.props
- const {focused, filter, selectedOption} = this.state
+ const {focused, filter, selectedOption, showOptions} = this.state
+ const showOptionsKeyBinding = showOptions ? undefined : () => this.showOptions()
const keymap = {
- ArrowUp: disabled ? null : () => this.showOptions(),
- ArrowDown: disabled ? null : () => this.showOptions(),
+ ArrowUp: showOptionsKeyBinding,
+ ArrowDown: showOptionsKeyBinding,
+ ArrowLeft: showOptionsKeyBinding,
+ ArrowRight: showOptionsKeyBinding,
+ Home: showOptionsKeyBinding,
+ End: showOptionsKeyBinding,
+ Escape: !showOptions ? undefined : () => this.hideOptions(),
}
return (
<Keybinding
@@ -119,6 +125,7 @@ class Combo extends React.Component {
autoCenter={!selected}
tooltipPlacement={optionTooltipPlacement}
autoHighlight
+ keyboard
alignment={alignment}
/>
</FloatingBox>
",7
"diff --git a/modules/gui/frontend/src/widget/elementResizeDetector.js b/modules/gui/frontend/src/widget/elementResizeDetector.js -import {Subject} from 'rxjs'
+import {Subject, concat} from 'rxjs'
import {compose} from 'compose'
-import {debounceTime, distinctUntilChanged} from 'rxjs/operators'
+import {debounceTime, distinctUntilChanged, first} from 'rxjs/operators'
import PropTypes from 'prop-types'
import React from 'react'
import ReactResizeDetector from 'react-resize-detector'
@@ -9,7 +9,7 @@ import withSubscriptions from 'subscription'
const UPDATE_DEBOUNCE_MS = 250
export class _ElementResizeDetector extends React.Component {
- resize$ = new Subject()
+ size$ = new Subject()
render() {
const {children} = this.props
@@ -17,7 +17,7 @@ export class _ElementResizeDetector extends React.Component {
<ReactResizeDetector
handleHeight
handleWidth
- onResize={(width, height) => this.resize$.next({width, height})}>
+ onResize={(width, height) => this.size$.next({width, height})}>
{children || null}
</ReactResizeDetector>
)
@@ -25,11 +25,20 @@ export class _ElementResizeDetector extends React.Component {
componentDidMount() {
const {debounce, onResize, addSubscription} = this.props
- addSubscription(
- this.resize$.pipe(
- debounceTime(debounce),
+ const firstImmediate$ = this.size$.pipe(
+ first()
+ )
+ const subsequentDebounced$ = this.size$.pipe(
+ debounceTime(debounce)
+ )
+ const resize$ = concat(
+ firstImmediate$,
+ subsequentDebounced$
+ ).pipe(
distinctUntilChanged()
- ).subscribe(
+ )
+ addSubscription(
+ resize$.subscribe(
({width, height}) => onResize({width, height})
)
)
",7
"diff --git a/modules/gui/frontend/src/widget/button.module.css b/modules/gui/frontend/src/widget/button.module.css @keyframes fill {
0% {
top: 80%;
- background: hsla(0, 0%, 100%, .2);
+ background-color: hsla(0, 0%, 100%, .1);
}
- 90% {
+ 99% {
top: 0;
- background-color: hsla(0, 0%, 100%, .2);
+ background-color: hsla(0, 0%, 100%, .1);
}
100% {
top: 0;
",7
"diff --git a/modules/gee/docker/src/comm/channel.js b/modules/gee/docker/src/comm/channel.js @@ -25,7 +25,7 @@ const channel = ({transport, channelId = uuid(), direction, in$ = new Subject(),
const inMsg = message => msg(message, 'in')
const next = value => {
- log.debug(inMsg('value:'), value)
+ log.warn(inMsg('value:'), value)
postMessage({value})
}
@@ -46,11 +46,11 @@ const channel = ({transport, channelId = uuid(), direction, in$ = new Subject(),
const stop = () => {
stop$.next()
port.off('message', handleMessage)
- log.trace(`removed listener ${direction}.in`)
+ log.trace(inMsg(`removed <${direction}> listener`))
}
port.on('message', handleMessage)
- log.trace(`added listener ${direction}.in`)
+ log.trace(inMsg(`added <${direction}> listener`))
in$.pipe(
takeUntil(stop$)
@@ -89,11 +89,11 @@ const channel = ({transport, channelId = uuid(), direction, in$ = new Subject(),
const stop = () => {
port.off('message', handleMessage)
- log.trace(`removed listener ${direction}.out`)
+ log.trace(outMsg(`removed <${direction}> listener`))
}
port.on('message', handleMessage)
- log.trace(`added listener ${direction}.out`)
+ log.trace(outMsg(`added <${direction}> listener`))
return out$.pipe(
finalize(() => {
",7
"diff --git a/modules/gui/frontend/src/app/home/body/process/mosaic/panels/aoi/eeTableSection.js b/modules/gui/frontend/src/app/home/body/process/mosaic/panels/aoi/eeTableSection.js @@ -3,7 +3,7 @@ import {Layout} from 'widget/layout'
import {RecipeActions} from '../../mosaicRecipe'
import {Subject} from 'rxjs'
import {compose} from 'compose'
-import {debounceTime, map, takeUntil} from 'rxjs/operators'
+import {debounceTime, distinctUntilChanged, filter, map, takeUntil, tap} from 'rxjs/operators'
import {msg} from 'translate'
import {selectFrom} from 'stateUtils'
import {sepalMap} from 'app/home/map/map'
@@ -32,13 +32,26 @@ class EETableSection extends React.Component {
addSubscription(
this.loadColumns$.pipe(
- debounceTime(1000)
+ debounceTime(750),
+ distinctUntilChanged(),
+ tap(() => this.reset()),
+ filter(tableId => tableId)
).subscribe(
tableId => this.loadColumns(tableId)
)
)
}
+ reset() {
+ const {inputs: {eeTableColumn, eeTableRow}} = this.props
+ eeTableColumn.set('')
+ eeTableRow.set('')
+ this.recipe.setEETableColumns(null).dispatch()
+ this.recipe.setEETableRows(null).dispatch()
+ this.eeTableChanged$.next()
+ this.eeTableColumnChanged$.next()
+ }
+
render() {
const {allowWholeEETable, inputs: {eeTable}} = this.props
return (
@@ -49,7 +62,7 @@ class EETableSection extends React.Component {
input={eeTable}
placeholder={msg('process.mosaic.panel.areaOfInterest.form.eeTable.eeTable.placeholder')}
spellCheck={false}
- onChange={e => this.onEETableChange(e)}
+ onChange={e => this.loadColumns$.next(e.target.value)}
errorMessage
busyMessage={this.props.stream('LOAD_EE_TABLE_COLUMNS').active && msg('widget.loading')}
/>
@@ -139,7 +152,7 @@ class EETableSection extends React.Component {
columns => this.recipe.setEETableColumns(columns).dispatch(),
error => {
return this.props.inputs.eeTable.setInvalid(
- msg(error.response.code, error.response.data)
+ error.response && msg(error.response.code, error.response.data)
)
}
)
@@ -164,17 +177,6 @@ class EETableSection extends React.Component {
return columns && columns.length > 0
}
- onEETableChange(e) {
- const {inputs: {eeTableColumn, eeTableRow}} = this.props
- eeTableColumn.set('')
- eeTableRow.set('')
- this.recipe.setEETableColumns(null).dispatch()
- this.recipe.setEETableRows(null).dispatch()
- this.eeTableChanged$.next()
- this.eeTableColumnChanged$.next()
- this.loadColumns$.next(e.target.value)
- }
-
componentDidMount() {
const {inputs: {eeTable, eeTableColumn}} = this.props
if (eeTable.value)
",7
"diff --git a/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/hostingservice/aws/AwsInstanceProvider.groovy b/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/hostingservice/aws/AwsInstanceProvider.groovy @@ -74,7 +74,7 @@ final class AwsInstanceProvider implements InstanceProvider {
void terminate(String instanceId) {
LOG.info(""Terminating instance "" + instanceId)
- retry(3) {
+ retry(10) {
def request = new TerminateInstancesRequest()
.withInstanceIds(instanceId)
client.terminateInstances(request)
@@ -253,7 +253,7 @@ final class AwsInstanceProvider implements InstanceProvider {
private void tagInstance(String instanceId, Collection<Tag>... tagCollections) {
try {
- retry(3) {
+ retry(10) {
def tags = tagCollections.toList().flatten() as Tag[]
LOG.info(""Tagging instance $instanceId with $tags"")
def request = new CreateTagsRequest()
@@ -261,18 +261,18 @@ final class AwsInstanceProvider implements InstanceProvider {
.withTags(tags)
client.createTags(request)
}
- } catch (AmazonEC2Exception e) {
+ } catch (Exception e) {
terminate()
throw new FailedToTagInstance(""Failed to tag instance $instanceId with $tags"", e)
}
}
private void retry(int tries, Closure<Void> operation) {
- for (def retries = 0; retries - 1 < tries; retries++) {
+ for (int retries = 0; retries - 1 < tries; retries++) {
try {
operation()
return
- } catch (AmazonEC2Exception e) {
+ } catch (Exception e) {
if (retries - 1 < tries) {
backoff(retries)
LOG.warn(""Retry #${retries + 1} after exception: ${e}"")
@@ -283,7 +283,7 @@ final class AwsInstanceProvider implements InstanceProvider {
}
private int backoff(int retries) {
- def millis = (long) Math.pow(2, retries) * 1000
+ def millis = (long) Math.pow(2, retries ?: 0) * 1000
Thread.sleep(millis)
}
",7
"diff --git a/dev-env/sepal.sh b/dev-env/sepal.sh @@ -33,34 +33,37 @@ message () {
local COLOR_NAME=$3
local NO_COLOR='\033[0m'
case ""$COLOR_NAME"" in
- DARK_RED)
+ RED)
COLOR='\033[0;31m'
;;
LIGHT_RED)
COLOR='\033[1;31m'
;;
- DARK_GREEN)
+ GREEN)
COLOR='\033[0;32m'
;;
LIGHT_GREEN)
COLOR='\033[1;32m'
;;
- GREY)
- COLOR='\033[0;37m'
+ YELLOW)
+ COLOR='\033[0;33m'
+ ;;
+ BLUE)
+ COLOR='\033[0;34m'
;;
*)
COLOR=$NO_COLOR # No Color
;;
esac
- echo -e ""[${COLOR}${MESSAGE}${NO_COLOR}] ${MODULE}""
+ printf ""${COLOR}%10s${NO_COLOR} ${MODULE}\n"" ""${MESSAGE}""
}
module_status () {
local MODULE=$1
if is_running $MODULE; then
- message ""RUNNING"" $MODULE DARK_GREEN
+ message ""RUNNING"" $MODULE GREEN
else
- message ""NOT RUNNING"" $MODULE DARK_RED
+ message ""STOPPED"" $MODULE RED
fi
}
@@ -73,7 +76,7 @@ module_start () {
start-stop-daemon --start --oknodo --name $MODULE \
--exec /bin/bash -- $0 run $MODULE >$LOG 2>&1 &
else
- message ""RUNNING"" $MODULE GREY
+ message ""RUNNING"" $MODULE BLUE
fi
}
@@ -81,7 +84,7 @@ module_stop () {
local MODULE=$1
local PID=$(pidof ${MODULE})
if [[ -z ""$PID"" ]]; then
- message ""NOT RUNNING"" $MODULE GREY
+ message ""STOPPED"" $MODULE BLUE
else
message ""STOPPING"" $MODULE LIGHT_RED
start-stop-daemon --stop --oknodo --retry 5 --ppid $PID
@@ -96,7 +99,7 @@ do_with_modules () {
if is_module $MODULE; then
$COMMAND $MODULE
else
- message ""IGNORED"" $MODULE GREY
+ message ""IGNORED"" $MODULE YELLOW
fi
done
}
",7
"diff --git a/dev-env/sepal.sh b/dev-env/sepal.sh @@ -48,9 +48,6 @@ message () {
YELLOW)
COLOR='\033[0;33m'
;;
- BLUE)
- COLOR='\033[0;34m'
- ;;
*)
COLOR=$NO_COLOR # No Color
;;
@@ -61,7 +58,7 @@ message () {
module_status () {
local MODULE=$1
if is_running $MODULE; then
- message ""RUNNING"" $MODULE GREEN
+ message ""STARTED"" $MODULE GREEN
else
message ""STOPPED"" $MODULE RED
fi
@@ -75,7 +72,7 @@ module_start () {
message ""STARTING"" $MODULE LIGHT_GREEN
setsid nohup /bin/bash $0 run $MODULE >$LOG 2>&1 &
else
- message ""RUNNING"" $MODULE BLUE
+ message ""STARTED"" $MODULE GREEN
fi
}
@@ -92,7 +89,7 @@ module_stop () {
local MODULE=$1
local PID=$(pidof $MODULE)
if [[ -z ""$PID"" ]]; then
- message ""STOPPED"" $MODULE BLUE
+ message ""STOPPED"" $MODULE RED
else
message ""STOPPING"" $MODULE LIGHT_RED
pkill -TERM -g $PID
@@ -104,7 +101,7 @@ module_kill () {
local MODULE=$1
local PID=$(pidof $MODULE)
if [[ -z ""$PID"" ]]; then
- message ""STOPPED"" $MODULE BLUE
+ message ""STOPPED"" $MODULE RED
else
message ""KILLING"" $MODULE LIGHT_RED
pkill -KILL -g $PID
",7
"diff --git a/modules/task/docker/src/ee/task.js b/modules/task/docker/src/ee/task.js const ee = require('ee')
const {EMPTY, interval, of, throwError} = require('rxjs')
-const {distinctUntilChanged, exhaustMap, filter, finalize, map, switchMap, take, takeWhile} = require('rxjs/operators')
+const {distinctUntilChanged, exhaustMap, first, finalize, map, switchMap, mapTo, takeWhile} = require('rxjs/operators')
const log = require('sepal/log').getLogger('task')
const progress = require('root/progress')
@@ -10,7 +10,7 @@ const {UNSUBMITTED, READY, RUNNING, FAILED} = ee.data.ExportState
const executeTask$ = task =>
start$(task).pipe(
switchMap(() => monitor$(task)),
- finalize(() => task.id && cancel(task))
+ finalize(() => task.id && cleanup(task))
)
const start$ = task =>
@@ -47,14 +47,21 @@ const status$ = task =>
map(([status]) => status)
)
-const cancel = task =>
+const cleanup = task => {
status$(task).pipe(
- filter(({state}) => isRunning(state)),
- switchMap(() => cancel$(task))
+ map(({state}) => isRunning(state)),
+ switchMap(running => running
+ ? cancel$(task).pipe(
+ mapTo(true)
+ )
+ : of(false)
+ ),
+ first()
).subscribe({
- error: error => log.error('Failed to cancel task', error),
- complete: () => log.debug('Cancelled task', task.id),
+ next: wasRunning => log.debug(`Task ${task.id}: ${wasRunning ? 'cancelled' : 'complete'}`),
+ error: error => log.error('Failed to cancel task', error)
})
+}
const cancel$ = task =>
ee.$('cancel task', (resolve, reject) => {
",7
"diff --git a/modules/gee/docker/src/jobs/ee/authenticate.js b/modules/gee/docker/src/jobs/ee/authenticate.js @@ -29,25 +29,30 @@ const worker$ = ({sepalUser, serviceAccountCredentials}) => {
return millisecondsLeft / 1000
}
- const authenticateServiceAccount$ = credentials =>
+ const authenticateServiceAccount$ = serviceAccountCredentials =>
ee.$({
operation: 'autenticate service account',
- ee: (resolve, reject) => ee.data.authenticateViaPrivateKey(credentials, resolve, reject)
+ ee: (resolve, reject) => {
+ ee.sepal.setAuthType('SERVICE_ACCOUNT')
+ ee.data.authenticateViaPrivateKey(serviceAccountCredentials, resolve, reject)
+ }
})
const authenticateUserAccount$ = googleTokens =>
ee.$({
operation: 'authenticate user account',
- ee: resolve =>
+ ee: (resolve, reject) => {
+ ee.sepal.setAuthType('USER')
ee.data.setAuthToken(
null,
'Bearer',
googleTokens.accessToken,
secondsToExpiration(googleTokens.accessTokenExpiryDate),
null,
- resolve,
+ error => error ? reject(error) : resolve(),
false
)
+ }
})
const authenticate$ = ({sepalUser: {googleTokens}, serviceAccountCredentials}) =>
",7
"diff --git a/dev-env/sepal.sh b/dev-env/sepal.sh @@ -108,6 +108,10 @@ module_kill () {
fi
}
+module_log () {
+ local MODULE=$1
+ less -r +F $(logfile $MODULE)
+}
module_clean () {
local MODULE=$1
@@ -157,14 +161,15 @@ module_clean () {
esac
}
-
do_with_modules () {
- local COMMAND=$1
+ local COMMANDS=$1
shift
local MODULES=${@:-${SEPAL_MODULES[@]}}
for MODULE in $MODULES; do
if is_module $MODULE; then
+ for COMMAND in $COMMANDS; do
$COMMAND $MODULE
+ done
else
message ""IGNORED"" $MODULE YELLOW
fi
@@ -209,20 +214,17 @@ build-debug () {
log() {
local MODULE=$1
- less -r $(logfile $MODULE)
+ do_with_modules ""module_log"" $MODULE
}
startlog () {
local MODULE=$1
- module_start $1
- less -r +F $(logfile $MODULE)
+ do_with_modules ""module_start module_log"" $MODULE
}
restartlog () {
local MODULE=$1
- module_stop $1
- module_start $1
- less -r +F $(logfile $MODULE)
+ do_with_modules ""module_stop module_start module_log"" $MODULE
}
run () {
@@ -290,7 +292,7 @@ run () {
--stacktrace \
:sepal-server:runDev \
-DconfigDir=""$SEPAL_CONFIG/sepal-server""
-# -DskipSceneMetaDataUpdate
+ -DskipSceneMetaDataUpdate
;;
task)
cd $SEPAL/lib/js/shared
@@ -330,7 +332,7 @@ usage () {
echo "" stop [<module>...] stop module(s)""
echo "" restart [<module>...] restart module(s)""
echo "" run <module> run module interactively""
- echo "" log <module> show module log""
+ echo "" log <module> show module log tail""
echo "" startlog <module> start a module and show log tail""
echo "" restartlog <module> restart a module and show log tail""
",7
"diff --git a/dev-env/sepal.sh b/dev-env/sepal.sh @@ -3,17 +3,39 @@ set -e
SEPAL_CONFIG=/etc/sepal/module.d
SEPAL=/usr/local/lib/sepal
-SEPAL_MODULES=(user sepal-server api-gateway task gee gui ceo mongo)
+SEPAL_MODULES=(user sepal-server sepal-server-noindex api-gateway task gee gui ceo mongo)
+SEPAL_GROUPS=(all dev)
+SEPAL_DEFAULT_GROUP=dev
LOG_DIR=/var/log/sepal
is_module () {
- local MODULE=$1
- printf '%s\n' ${SEPAL_MODULES[@]} | grep -qP ""^$MODULE$""
+ local NAME=$1
+ printf '%s\n' ${SEPAL_MODULES[@]} | grep -qP ""^$NAME$""
+}
+
+is_group () {
+ local NAME=$1
+ printf '%s\n' ${SEPAL_GROUPS[@]} | grep -qP ""^$NAME$""
+}
+
+group () {
+ local GROUP=$1
+ case $GROUP in
+ all)
+ echo ""${SEPAL_MODULES[@]}""
+ ;;
+ dev)
+ echo ""user sepal-server-noindex api-gateway task gee gui""
+ ;;
+ *)
+ return 1
+ ;;
+ esac
}
pidof () {
local MODULE=$1
- ps -ef | grep bash | grep ""sepal run $MODULE"" | awk '{ print $2 }'
+ ps -ef | grep bash | egrep ""sepal run ${MODULE}$"" | awk '{ print $2 }'
}
is_running () {
@@ -164,42 +186,48 @@ module_clean () {
do_with_modules () {
local COMMANDS=$1
shift
- local MODULES=${@:-${SEPAL_MODULES[@]}}
- for MODULE in $MODULES; do
- if is_module $MODULE; then
+ local NAMES=$@
+ # local NAMES=${@:-dev}
+ for NAME in $NAMES; do
+ if is_group $NAME; then
+ local GROUP=$NAME
+ local MODULES=""$(group $GROUP)""
+ do_with_modules ""$COMMANDS"" $MODULES
+ elif is_module $NAME; then
+ local MODULE=$NAME
for COMMAND in $COMMANDS; do
$COMMAND $MODULE
done
else
- message ""IGNORED"" $MODULE YELLOW
+ message ""IGNORED"" $NAME YELLOW
fi
done
}
status () {
- do_with_modules ""module_status"" $@
+ do_with_modules ""module_status"" ${@:-all}
}
start () {
- do_with_modules ""module_start"" $@
+ do_with_modules ""module_start"" ${@:-$SEPAL_DEFAULT_GROUP}
}
stop () {
- do_with_modules ""module_stop"" $@
+ do_with_modules ""module_stop"" ${@:-all}
}
force_stop () {
- do_with_modules ""module_kill"" $@
+ do_with_modules ""module_kill"" ${@:-all}
}
restart () {
- do_with_modules ""module_stop"" $@
- do_with_modules ""module_start"" $@
+ do_with_modules ""module_stop"" ${@:-all}
+ do_with_modules ""module_start"" ${@:-SEPAL_DEFAULT_GROUP}
}
clean () {
- do_with_modules ""module_stop"" $@
- do_with_modules ""module_clean"" $@
+ do_with_modules ""module_stop"" ${@:-all}
+ do_with_modules ""module_clean"" ${@:-all}
}
build () {
@@ -286,6 +314,14 @@ run () {
npm start
;;
sepal-server)
+ $SEPAL/gradlew \
+ -p $SEPAL \
+ --no-daemon \
+ --stacktrace \
+ :sepal-server:runDev \
+ -DconfigDir=""$SEPAL_CONFIG/sepal-server""
+ ;;
+ sepal-server-noindex)
$SEPAL/gradlew \
-p $SEPAL \
--no-daemon \
@@ -324,13 +360,13 @@ usage () {
echo ""Usage: $0 <command> [<arguments>]""
echo """"
echo ""Commands:""
- echo "" clean [<module>...] clean module(s)""
echo "" build build SEPAL""
echo "" build-debug build SEPAL w/debug enabled""
- echo "" status [<module>...] check module(s)""
- echo "" start [<module>...] start module(s)""
- echo "" stop [<module>...] stop module(s)""
- echo "" restart [<module>...] restart module(s)""
+ echo "" clean [<module>...] clean module(s)/group(s)""
+ echo "" status [<module>...] check module(s)/group(s)""
+ echo "" start [<module>...] start module(s)/group(s)""
+ echo "" stop [<module>...] stop module(s)/group(s)""
+ echo "" restart [<module>...] restart module(s)/group(s)""
echo "" run <module> run module interactively""
echo "" log <module> show module log tail""
echo "" startlog <module> start a module and show log tail""
@@ -338,6 +374,7 @@ usage () {
echo """"
echo ""Modules: ${SEPAL_MODULES[@]}""
+ echo ""Groups: ${SEPAL_GROUPS[@]}""
echo """"
exit 1
}
",7
"diff --git a/lib/js/shared/src/worker/transport.js b/lib/js/shared/src/worker/transport.js @@ -53,7 +53,10 @@ const transport = ({id = uuid(), port}) => {
messageChannelId === channelId && messageConversationId === conversationId && handler(message)
const channelPort = {
- sendMessage: (end, message) => port.postMessage({channelId, conversationId, end, message}),
+ sendMessage: (end, message) => {
+ log.debug(`Sending message to channel ${channelId}, conversation ${conversationId}:`, message)
+ port.postMessage({channelId, conversationId, end, message})
+ },
addMessageHandler: (end, messageHandler) => {
const key = uuid()
const listener = handleReceivedMessage(messageHandler)
",7
"diff --git a/lib/js/shared/src/worker/channel.js b/lib/js/shared/src/worker/channel.js @@ -15,8 +15,10 @@ const channel = ({channelPort, channelId, conversationId, direction, in$ = new R
const inMsg = message => msg(message, 'in')
const next = value => {
- log.debug(inMsg('value: <omitted>'))
- log.trace(inMsg('value:'), value)
+ log.isTrace()
+ ? log.trace(() => inMsg('value:'), value)
+ : log.debug(() => inMsg('value: <omitted>'))
+
channelPort.sendMessage('out', {next: true, value})
}
@@ -51,8 +53,9 @@ const channel = ({channelPort, channelId, conversationId, direction, in$ = new R
const outMsg = message => msg(message, 'out')
const value = value => {
- log.debug(outMsg('value: <omitted>'))
- log.trace(outMsg('value:'), value)
+ log.isTrace()
+ ? log.trace(() => outMsg('value:'), value)
+ : log.debug(() => outMsg('value: <omitted>'))
out$.next(value)
}
",7
"diff --git a/modules/gui/frontend/src/widget/safetyButton.js b/modules/gui/frontend/src/widget/safetyButton.js @@ -14,12 +14,12 @@ export default class SafetyButton extends React.Component {
}
renderConfirm() {
- const {title, message, label, onConfirm, children} = this.props
+ const {title, message, confirmLabel, onConfirm, children} = this.props
return (
<Confirm
title={title}
message={message}
- label={label || msg('widget.safetyButton.label')}
+ label={confirmLabel || msg('widget.safetyButton.label')}
onConfirm={() => {
this.askConfirmation(false)
onConfirm()
@@ -31,17 +31,14 @@ export default class SafetyButton extends React.Component {
}
render() {
- const {chromeless, shape, icon, skip, onConfirm, ...otherProps} = this.props
+ const {skipConfirmation, onConfirm, onClick, onClickHold, ...otherProps} = this.props
const {askConfirmation} = this.state
return (
<React.Fragment>
<Button
- chromeless={chromeless}
- shape={shape}
- icon={icon}
- {...otherProps}
- onClick={() => skip ? onConfirm() : this.askConfirmation(true)}
+ onClick={() => skipConfirmation ? onConfirm() : this.askConfirmation(true)}
onClickHold={() => onConfirm()}
+ {...otherProps}
/>
{askConfirmation ? this.renderConfirm() : null}
</React.Fragment>
@@ -52,10 +49,7 @@ export default class SafetyButton extends React.Component {
SafetyButton.propTypes = {
message: PropTypes.string.isRequired,
onConfirm: PropTypes.func.isRequired,
-}
-
-SafetyButton.defaultProps = {
- chromeless: true,
- shape: 'circle',
- icon: 'trash'
+ confirmLabel: PropTypes.string,
+ title: PropTypes.string,
+ skipConfirmation: PropTypes.bool
}
",7
"diff --git a/modules/gui/frontend/src/locale/en/translations.json b/modules/gui/frontend/src/locale/en/translations.json ""tooltip"": ""Remove selected items""
},
""showDotFiles"": {
- ""tooltip"": ""Show files beginning with .""
+ ""tooltip"": ""Show files beginning with . (dotfiles)""
}
},
""info"": {
",7
"diff --git a/lib/js/shared/src/worker/pool.js b/lib/js/shared/src/worker/pool.js @@ -66,7 +66,7 @@ const Pool = ({name, maxIdleMilliseconds = 1000, minIdleCount = 0, create$, onCo
const hot$ = instance =>
of(instance).pipe(
- tap(instance => log.debug(msg(instance, 'recycled'))),
+ tap(instance => log.debug(msg(instance, 'recycled existing'))),
tap(instance => onHot && onHot({name, instanceId: instance.id}))
)
@@ -75,7 +75,7 @@ const Pool = ({name, maxIdleMilliseconds = 1000, minIdleCount = 0, create$, onCo
return create$({name, instanceId: id}).pipe(
map(item => ({id, item})),
tap(instance => add(instance)),
- tap(instance => log.debug(msg(instance, 'created'))),
+ tap(instance => log.debug(msg(instance, 'created new'))),
tap(instance => onCold && onCold({name, instanceId: instance.id}))
)
}
",7
"diff --git a/modules/gui/frontend/src/app/home/map/mapScale.module.css b/modules/gui/frontend/src/app/home/map/mapScale.module.css position: absolute;
top: .5rem;
right: .5rem;
+ width: calc(2 * var(--toolbar-button-size) + var(--toolbar-button-spacing));
font-size: .8rem;
line-height: .8rem;
background-color: hsla(0, 0%, 0%, .35);
border: 1px solid var(--wireframe-color);
border-radius: .25rem;
display: flex;
- flex-direction: column;
+ flex-wrap: wrap;
align-items: center;
+ justify-content: center;
}
",7
"diff --git a/modules/gui/frontend/src/widget/superButton.js b/modules/gui/frontend/src/widget/superButton.js import {Button} from 'widget/button'
import {ButtonGroup} from 'widget/buttonGroup'
import {Item} from 'widget/item'
-import {Subject, animationFrameScheduler, fromEvent, interval, timer} from 'rxjs'
+import {Subject, animationFrameScheduler, fromEvent, interval, merge, of, timer} from 'rxjs'
import {compose} from 'compose'
-import {debounceTime, distinctUntilChanged, filter, map, switchMap, takeUntil} from 'rxjs/operators'
+import {debounceTime, distinctUntilChanged, filter, map, mapTo, switchMap, takeUntil} from 'rxjs/operators'
import Hammer from 'hammerjs'
import PropTypes from 'prop-types'
import React from 'react'
@@ -263,19 +263,33 @@ class _SuperButton extends React.Component {
initializeDraggable() {
const {addSubscription} = this.props
const draggable = this.ref.current
- const hammer = new Hammer(draggable)
- hammer.get('pan').set({direction: Hammer.DIRECTION_ALL})
- const pan$ = fromEvent(hammer, 'panstart panmove panend')
- const filterPanEvent = type => pan$.pipe(filter(e => e.type === type))
- const dragStart$ = filterPanEvent('panstart')
- const move$ = filterPanEvent('panmove')
- const dragEnd$ = filterPanEvent('panend')
+
+ const handle = new Hammer(draggable)
+
+ handle.get('pan').set({
+ direction: Hammer.DIRECTION_ALL,
+ threshold: 0
+ })
+
+ const hold$ = merge(
+ fromEvent(draggable, 'mousedown'),
+ fromEvent(draggable, 'touchstart')
+ )
+ const release$ = merge(
+ fromEvent(draggable, 'mouseup'),
+ fromEvent(draggable, 'touchend')
+ )
+ const pan$ = fromEvent(handle, 'panstart panmove panend')
+ const panStart$ = pan$.pipe(filter(e => e.type === 'panstart'))
+ const panMove$ = pan$.pipe(filter(e => e.type === 'panmove'))
+ const panEnd$ = pan$.pipe(filter(e => e.type === 'panend'))
const animationFrame$ = interval(0, animationFrameScheduler)
- const dragMove$ = dragStart$.pipe(
+
+ const dragMove$ = panStart$.pipe(
switchMap(() =>
animationFrame$.pipe(
switchMap(() =>
- move$.pipe(
+ panMove$.pipe(
map(e => e.center)
)),
debounceTime(10),
@@ -284,10 +298,16 @@ class _SuperButton extends React.Component {
)
)
+ const dragging$ = merge(
+ hold$.pipe(mapTo(true)),
+ release$.pipe(mapTo(false)),
+ panStart$.pipe(mapTo(true)),
+ panEnd$.pipe(mapTo(false)),
+ )
+
addSubscription(
- dragStart$.subscribe(() => this.onDragStart()),
+ dragging$.subscribe(dragging => dragging ? this.onDragStart() : this.onDragEnd()),
dragMove$.subscribe(coords => this.onDragMove(coords)),
- dragEnd$.subscribe(() => this.onDragEnd())
)
}
",7
"diff --git a/modules/gui/frontend/src/app/home/map/map.js b/modules/gui/frontend/src/app/home/map/map.js @@ -66,6 +66,14 @@ class _Map extends React.Component {
constructor() {
super()
this.mapDelegate = this.mapDelegate.bind(this)
+
+ this.toggleLinked = this.toggleLinked.bind(this)
+ this.toggleZoomArea = this.toggleZoomArea.bind(this)
+ this.cancelZoomArea = this.cancelZoomArea.bind(this)
+ this.drawPolygon = this.drawPolygon.bind(this)
+ this.disableDrawingMode = this.disableDrawingMode.bind(this)
+ this.setLocationMarker = this.setLocationMarker.bind(this)
+ this.setAreaMarker = this.setAreaMarker.bind(this)
}
withAllMaps(func) {
@@ -153,6 +161,14 @@ class _Map extends React.Component {
return zoomArea
}
+ toggleZoomArea() {
+ this.zoomArea(!this.isZoomArea())
+ }
+
+ cancelZoomArea() {
+ this.zoomArea(false)
+ }
+
setLocationMarker(options) {
const id = uuid()
this.markers[id] = this.withAllMaps(
@@ -604,15 +620,15 @@ class _Map extends React.Component {
const isInitialized = () => bounds
return {
- toggleLinked: () => this.toggleLinked(),
+ toggleLinked: this.toggleLinked,
isLinked: () => this.isLinked(),
canZoomIn: () => !map.isMaxZoom(),
zoomIn: () => map.zoomIn(),
canZoomOut: () => !map.isMinZoom(),
zoomOut: () => map.zoomOut(),
canZoomArea: () => !map.isMaxZoom(),
- toggleZoomArea: () => this.zoomArea(!this.isZoomArea()),
- cancelZoomArea: () => this.zoomArea(false),
+ toggleZoomArea: this.toggleZoomArea,
+ cancelZoomArea: this.cancelZoomArea,
isZoomArea: () => this.isZoomArea(),
canFit: () => isInitialized(),
fit: () => map.fitBounds(bounds),
@@ -621,10 +637,13 @@ class _Map extends React.Component {
setView: ({center, zoom}) => map.setView({center, zoom}),
fitBounds: bounds => map.fitBounds(bounds),
getBounds: () => map.getBounds(),
- drawPolygon: (id, callback) => this.drawPolygon(id, callback),
- disableDrawingMode: () => this.disableDrawingMode(),
- setLocationMarker: options => this.setLocationMarker(options),
- setAreaMarker: options => this.setAreaMarker(options),
+
+ // getScale: () => map.getMetersPerPixel(),
+
+ drawPolygon: this.drawPolygon,
+ disableDrawingMode: this.disableDrawingMode,
+ setLocationMarker: this.setLocationMarker,
+ setAreaMarker: this.setAreaMarker,
setLayer: (...args) => {
log.warn('should we call map.setLayer?')
",7
"diff --git a/modules/gui/frontend/src/app/home/map/sepalMap.js b/modules/gui/frontend/src/app/home/map/sepalMap.js @@ -239,33 +239,36 @@ export class SepalMap {
// Bounds
- fromGoogleBounds(googleBounds) {
- if (googleBounds) {
- const sw = googleBounds.getSouthWest()
- const ne = googleBounds.getNorthEast()
+ fromGoogleBounds(bounds) {
+ const {google} = this
+ if (bounds && bounds instanceof google.maps.LatLngBounds) {
+ const sw = bounds.getSouthWest()
+ const ne = bounds.getNorthEast()
return [
[sw.lng(), sw.lat()],
[ne.lng(), ne.lat()]
]
+ } else {
+ return bounds
}
- return null
}
toGoogleBounds(bounds) {
const {google} = this
+ if (bounds && bounds instanceof google.maps.LatLngBounds) {
+ return bounds
+ } else {
return new google.maps.LatLngBounds(
{lng: bounds[0][0], lat: bounds[0][1]},
{lng: bounds[1][0], lat: bounds[1][1]}
)
}
+ }
fitBounds(bounds) {
- const {google} = this
const PADDING = 2 // compensate for attribution masking
const {googleMap} = this
- const nextBounds = bounds instanceof google.maps.LatLngBounds
- ? bounds
- : this.toGoogleBounds(bounds)
+ const nextBounds = this.toGoogleBounds(bounds)
const currentBounds = googleMap.getBounds()
const boundsChanged = !currentBounds || !currentBounds.equals(nextBounds)
if (boundsChanged) {
",7
"diff --git a/lib/js/shared/src/tag.js b/lib/js/shared/src/tag.js @@ -15,7 +15,7 @@ const toString = value =>
: JSON.stringify(value)
const argsJoiner = args =>
- _.compact(args.map(arg => toString(arg))).join(ARG_DELIMITER)
+ args.filter(arg => !_.isNil(arg)).map(arg => toString(arg)).join(ARG_DELIMITER)
const tag = (tag, ...args) => `${tag}<${argsJoiner(args)}>`
",7
"diff --git a/modules/gui/frontend/src/widget/form/form.js b/modules/gui/frontend/src/widget/form/form.js @@ -210,7 +210,7 @@ export const form = ({fields = {}, constraints = {}, mapStateToProps}) =>
resetValue(name) {
const state = this.state
- state.values[name] = state.initialValues[name]
+ this.set(name, state.initialValues[name])
}
isValueDirty(name) {
",7
"diff --git a/modules/gui/frontend/src/widget/safetyButton.js b/modules/gui/frontend/src/widget/safetyButton.js @@ -104,7 +104,7 @@ export class TooltipConfirmationButton extends React.Component {
renderTooltip() {
const {tooltip} = this.props
const {askConfirmation} = this.state
- return askConfirmation
+ return askConfirmation || isMobile()
? this.renderTooltipConfirmation()
: tooltip
}
",7
"diff --git a/modules/gui/frontend/src/widget/safetyButton.js b/modules/gui/frontend/src/widget/safetyButton.js import {Button} from 'widget/button'
-import {isMobile} from './userAgent'
import {msg} from 'translate'
import Confirm from 'widget/confirm'
import PropTypes from 'prop-types'
@@ -83,7 +82,14 @@ ModalConfirmationButton.propTypes = {
export class TooltipConfirmationButton extends React.Component {
state = {
- askConfirmation: false
+ askConfirmation: false,
+ tooltipVisible: false
+ }
+
+ constructor() {
+ super()
+ this.toggleVisibility = this.toggleVisibility.bind(this)
+ this.onClick = this.onClick.bind(this)
}
askConfirmation(askConfirmation) {
@@ -104,14 +110,36 @@ export class TooltipConfirmationButton extends React.Component {
renderTooltip() {
const {tooltip} = this.props
const {askConfirmation} = this.state
- return askConfirmation || isMobile()
+ return askConfirmation
? this.renderTooltipConfirmation()
: tooltip
}
- render() {
- const {busy, chromeless, disabled, icon, iconType, label, shape, size, skipConfirmation, tooltipPlacement, width, onConfirm} = this.props
+ toggleVisibility(visible) {
+ if (visible) {
+ this.setState({tooltipVisible: true})
+ } else {
+ this.setState({tooltipVisible: false, askConfirmation: false})
+ }
+ }
+
+ toggleConfirmation() {
const {askConfirmation} = this.state
+ if (askConfirmation) {
+ this.setState({askConfirmation: false})
+ } else {
+ this.setState({askConfirmation: true, tooltipVisible: true})
+ }
+ }
+
+ onClick() {
+ const {skipConfirmation, onConfirm} = this.props
+ skipConfirmation ? onConfirm() : this.toggleConfirmation()
+ }
+
+ render() {
+ const {busy, chromeless, disabled, icon, iconType, label, shape, size, tooltipPlacement, width, onConfirm} = this.props
+ const {tooltipVisible} = this.state
return (
<Button
busy={busy}
@@ -125,11 +153,10 @@ export class TooltipConfirmationButton extends React.Component {
disabled={disabled}
tooltip={this.renderTooltip()}
tooltipPlacement={tooltipPlacement}
- tooltipClickTrigger={isMobile()}
- tooltipDelay={500}
- tooltipOnVisible={visible => !visible && this.askConfirmation(false)}
- onClick={() => skipConfirmation ? onConfirm() : this.askConfirmation(!askConfirmation)}
- onClickHold={() => onConfirm && onConfirm()}
+ tooltipOnVisible={this.toggleVisibility}
+ tooltipVisible={tooltipVisible}
+ onClick={this.onClick}
+ onClickHold={onConfirm}
/>
)
}
",7
"diff --git a/modules/gui/frontend/src/widget/safetyButton.js b/modules/gui/frontend/src/widget/safetyButton.js @@ -88,8 +88,9 @@ export class TooltipConfirmationButton extends React.Component {
constructor() {
super()
- this.toggleVisibility = this.toggleVisibility.bind(this)
+ this.setVisibility = this.setVisibility.bind(this)
this.onClick = this.onClick.bind(this)
+ this.onClickHold = this.onClickHold.bind(this)
}
askConfirmation(askConfirmation) {
@@ -115,20 +116,20 @@ export class TooltipConfirmationButton extends React.Component {
: tooltip
}
- toggleVisibility(visible) {
+ setVisibility(visible) {
if (visible) {
this.setState({tooltipVisible: true})
} else {
- this.setState({tooltipVisible: false, askConfirmation: false})
+ this.setState({tooltipVisible: false}, () => this.setState({askConfirmation: false}))
}
}
toggleConfirmation() {
const {askConfirmation} = this.state
if (askConfirmation) {
- this.setState({askConfirmation: false})
+ this.setVisibility(false)
} else {
- this.setState({askConfirmation: true, tooltipVisible: true})
+ this.setState({askConfirmation: true}, () => this.setVisibility(true))
}
}
@@ -137,8 +138,13 @@ export class TooltipConfirmationButton extends React.Component {
skipConfirmation ? onConfirm() : this.toggleConfirmation()
}
+ onClickHold() {
+ const {onConfirm} = this.props
+ onConfirm()
+ }
+
render() {
- const {busy, chromeless, disabled, icon, iconType, label, shape, size, tooltipPlacement, width, onConfirm} = this.props
+ const {busy, chromeless, disabled, icon, iconType, label, shape, size, tooltipPlacement, width} = this.props
const {tooltipVisible} = this.state
return (
<Button
@@ -153,10 +159,10 @@ export class TooltipConfirmationButton extends React.Component {
disabled={disabled}
tooltip={this.renderTooltip()}
tooltipPlacement={tooltipPlacement}
- tooltipOnVisible={this.toggleVisibility}
tooltipVisible={tooltipVisible}
+ tooltipOnVisible={this.setVisibility}
onClick={this.onClick}
- onClickHold={onConfirm}
+ onClickHold={this.onClickHold}
/>
)
}
",7
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipe/opticalMosaic/panels/compositeOptions/compositeOptions.js b/modules/gui/frontend/src/app/home/body/process/recipe/opticalMosaic/panels/compositeOptions/compositeOptions.js @@ -3,6 +3,7 @@ import {Layout} from 'widget/layout'
import {MosaicPreview} from 'app/home/body/process/recipe/mosaic/mosaicPreview'
import {Panel} from 'widget/panel/panel'
import {RecipeFormPanel, recipeFormPanel} from 'app/home/body/process/recipeFormPanel'
+import {Widget} from 'widget/widget'
import {compose} from 'compose'
import {msg} from 'translate'
import {selectFrom} from 'stateUtils'
@@ -55,14 +56,12 @@ class CompositeOptions extends React.Component {
renderContent() {
return (
- <Layout>
+ <Layout type='vertical'>
{this.renderCorrectionOptions()}
- <Layout spacing='compact'>
{this.renderFilterOptions()}
- </Layout>
- <Layout type='horizontal'>
{this.renderCloudMaskingOptions()}
{this.renderCloudBufferOptions()}
+ <Layout type='horizontal'>
{this.renderSnowMaskingOptions()}
{this.renderComposeOptions()}
</Layout>
@@ -101,11 +100,11 @@ class CompositeOptions extends React.Component {
inputs: {corrections, shadowPercentile, hazePercentile, ndviPercentile, dayOfYearPercentile}
} = this.props
return (
- <React.Fragment>
- <Label
- msg={msg('process.mosaic.panel.composite.form.filters.label')}
+ <Widget
+ label={msg('process.mosaic.panel.composite.form.filters.label')}
+ spacing='compact'
tooltip={msg('process.mosaic.panel.composite.form.filters.tooltip')}
- tooltipPlacement='top'/>
+ tooltipPlacement='top'>
<PercentileField
input={shadowPercentile}/>
<PercentileField
@@ -115,7 +114,7 @@ class CompositeOptions extends React.Component {
input={ndviPercentile}/>
<PercentileField
input={dayOfYearPercentile}/>
- </React.Fragment>
+ </Widget>
)
}
",7
"diff --git a/modules/gui/frontend/src/widget/colorElement.css b/modules/gui/frontend/src/widget/colorElement.css /* Small */
.colorPicker .react-colorful {
- width: 8rem;
- height: 8rem;
+ --border-radius: .25rem;
+ width: 10rem;
+ height: 10rem;
+
+}
+
+.colorPicker .react-colorful__saturation {
+ border-top-left-radius: var(--border-radius);
+ border-top-right-radius: var(--border-radius);
+}
+
+.colorPicker .react-colorful__last-control {
+ border-bottom-left-radius: var(--border-radius);
+ border-bottom-right-radius: var(--border-radius);
}
.colorPicker .react-colorful__hue {
",7
"diff --git a/modules/gui/docker/frontend/src/app/home/body/process/recipe/classification/panels/trainingData/trainingData.js b/modules/gui/docker/frontend/src/app/home/body/process/recipe/classification/panels/trainingData/trainingData.js @@ -196,7 +196,7 @@ class TrainingData extends React.Component {
.flat()
.map(point => `${point.x},${point.y},${point.class}`)
].flat().join('\n')
- const filename = `${title}_legend.csv`
+ const filename = `${title}_reference_data.csv`
downloadCsv(csv, filename)
}
",7
"diff --git a/modules/gui/docker/frontend/src/app/home/map/mapInfo.js b/modules/gui/docker/frontend/src/app/home/map/mapInfo.js @@ -31,10 +31,13 @@ class _MapInfoPanel extends React.Component {
view$.pipe(
throttleTime(THROTTLE_TIME_MS, null, {leading: true, trailing: true})
).subscribe(
- view => view && this.setState({view})
+ view => {
+ this.setState({view})
+ this.updateMarker()
+ }
),
view$.pipe(
- debounceTime(250)
+ debounceTime(100)
).subscribe(
({center}) => this.updateMarker(center)
)
",7
"diff --git a/modules/gui/docker/frontend/src/widget/layout.module.css b/modules/gui/docker/frontend/src/widget/layout.module.css flex-grow: 0;
flex-shrink: 0;
overflow: hidden;
+ /* horizontal spacing */
+ --horizontal-spacing-loose: 1.5rem;
+ --horizontal-spacing-normal: 1rem;
+ --horizontal-spacing-compact: .5rem;
+ --horizontal-spacing-tight: 3px; /* under .5rem spacing is not reliable */
+ /* vertical spacing */
+ --vertical-spacing-loose: 3rem;
+ --vertical-spacing-normal: 2rem;
+ --vertical-spacing-compact: 1rem;
+ --vertical-spacing-tight: .5rem;
}
.layout > .content {
/* vertical/spacing */
.layout.vertical.spacing-loose > .content > * + * {
- margin-top: 3rem;
+ margin-top: var(--vertical-spacing-loose);
}
.layout.vertical.spacing-normal > .content > * + * {
- margin-top: 2rem;
+ margin-top: var(--vertical-spacing-normal);
}
.layout.vertical.spacing-normal-separated > .content > * + * {
- margin-top: 2rem;
+ margin-top: var(--vertical-spacing-normal);
overflow: visible;
}
.layout.vertical.spacing-normal-separated > .content > * + *::before {
content: '';
position: absolute;
- top: -1rem;
+ top: calc(-.5 * var(--vertical-spacing-normal));
height: 1px;
left: 0;
right: 0;
}
.layout.vertical.spacing-compact > .content > * + * {
- margin-top: 1rem;
+ margin-top: var(--vertical-spacing-compact);
}
.layout.vertical.spacing-compact-separated > .content > * + * {
- margin-top: 1rem;
+ margin-top: var(--vertical-spacing-compact);
overflow: visible;
}
.layout.vertical.spacing-compact-separated > .content > * + *::before {
content: '';
position: absolute;
- top: -.5rem;
+ top: calc(-.5 * var(--vertical-spacing-compact));
height: 1px;
left: 0;
right: 0;
}
.layout.vertical.spacing-tight > .content > * + * {
- margin-top: .5rem;
+ margin-top: var(--vertical-spacing-tight);
}
.layout.vertical.spacing-none > .content > * + * {
- margin-top: 0rem;
+ margin-top: 0;
}
/* vertical/alignment */
/* horizontal/spacing */
.layout.horizontal.spacing-loose > .content > * {
- margin-bottom: 1.5rem;
- margin-right: 1.5rem;
+ margin-bottom: var(--horizontal-spacing-loose);
+ margin-right: var(--horizontal-spacing-loose);
}
.layout.horizontal.spacing-normal > .content > * {
- margin-bottom: 1rem;
- margin-right: 1rem;
+ margin-bottom: var(--horizontal-spacing-normal);
+ margin-right: var(--horizontal-spacing-normal);
}
.layout.horizontal.spacing-compact > .content > * {
- margin-bottom: .5rem;
- margin-right: .5rem;
+ margin-bottom: var(--horizontal-spacing-compact);
+ margin-right: var(--horizontal-spacing-compact);
}
.layout.horizontal.spacing-tight > .content > * {
- margin-bottom: .25rem;
- margin-right: .25rem;
+ margin-bottom: var(--horizontal-spacing-tight);
+ margin-right: var(--horizontal-spacing-tight);
}
.layout.horizontal.spacing-none > .content > * {
- margin-bottom: 0rem;
- margin-right: 0rem;
+ margin-bottom: 0;
+ margin-right: 0;
}
/* horizontal/spacing: compensate bottom margin */
.layout.horizontal.spacing-loose > .content {
- margin-bottom: -1.5rem;
+ margin-bottom: calc(-1 * var(--horizontal-spacing-loose));
}
.layout.horizontal.spacing-normal > .content {
- margin-bottom: -1rem;
+ margin-bottom: calc(-1 * var(--horizontal-spacing-normal));
}
.layout.horizontal.spacing-compact > .content {
- margin-bottom: -.5rem;
+ margin-bottom: calc(-1 * var(--horizontal-spacing-compact));
}
.layout.horizontal.spacing-tight > .content {
- margin-bottom: -.25rem;
+ margin-bottom: calc(-1 * var(--horizontal-spacing-tight));
}
.layout.horizontal.spacing-none > .content {
- margin-bottom: 0rem;
+ margin-bottom: 0;
}
/* horizontal: compensate right margin */
.layout.horizontal > .content > *:last-child {
- margin-right: 0rem;
+ margin-right: 0;
}
/* horizontal/alignment */
",7
"diff --git a/modules/gui/docker/frontend/src/app/home/map/mapInfo.js b/modules/gui/docker/frontend/src/app/home/map/mapInfo.js @@ -57,7 +57,7 @@ class _MapInfoPanel extends React.Component {
position: center,
label: null,
icon: {
- path: 'm 1 -1 h 20 v 2 h -20 v 20 h -2 v -20 h -20 v -2 h 20 v -20 h 2 v 20',
+ path: 'M 1 -1 H 21 V 1 H 1 V 21 H -1 V 1 H -21 V -1 H -1 V -21 H 1 Z',
fillColor: 'white',
fillOpacity: .75,
strokeColor: 'black',
",7
"diff --git a/modules/gui/docker/frontend/src/locale/en/translations.json b/modules/gui/docker/frontend/src/locale/en/translations.json },
""palette"": {
""label"": ""Palette"",
- ""tooltip"": ""Define a custom palette by picking individual colors, or load a preset palette, which you can further customize. Warning: loading a preset palette will reset any custom colors you might have defined."",
+ ""tooltip"": ""Load a preset palette or create a new one. Use drag and drop for changing the order or removing colors. Warning: loading a palette will overwrite the current one."",
""empty"": ""Empty palette, using gray scale."",
""add"": {
""tooltip"": ""Add a color to the palette.""
",7
"diff --git a/modules/r-proxy/src/R/bundle_package.sh b/modules/r-proxy/src/R/bundle_package.sh @@ -11,9 +11,10 @@ PACKAGE_FILENAME=""${PACKAGE}_${VERSION}.tar.gz""
TMP_PACKAGE_FILENAME=""${PACKAGE_FILENAME}.tmp""
if [[ ! -f ""${PACKAGE_PATH}"" ]]; then
- mkdir -p ${BIN} \
- && rm -f ${BIN}/${TMP_PACKAGE_FILENAME} \
- && tar czf ${BIN}/${TMP_PACKAGE_FILENAME} -C ${LIB} ${PACKAGE} \
+ mkdir -p ${BIN}
+ retVal = $?; [ $retVal -ne 0 ] && exit $retVal
+ rm -f ${BIN}/${TMP_PACKAGE_FILENAME}
+ tar czf ${BIN}/${TMP_PACKAGE_FILENAME} -C ${LIB} ${PACKAGE} \
&& mv ${BIN}/${TMP_PACKAGE_FILENAME} ${BIN}/${PACKAGE_FILENAME} \
&& rm -f ${SRC}/${PACKAGE_FILENAME}
exit $?
",7
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipe/planetMosaic/planetMosaicRecipe.js b/modules/gui/frontend/src/app/home/body/process/recipe/planetMosaic/planetMosaicRecipe.js @@ -15,10 +15,14 @@ export const NICFI_ASSETS = [
'projects/planet-nicfi/assets/basemaps/americas'
]
+const defaultFromDate = moment().subtract(2, 'month').startOf('year')
export const defaultModel = {
dates: {
- fromDate: moment().startOf('year').format(DATE_FORMAT),
- toDate: moment().add(1, 'years').startOf('year').format(DATE_FORMAT)
+ fromDate: defaultFromDate.format(DATE_FORMAT),
+ toDate: moment.min(
+ moment(),
+ defaultFromDate.add(1, 'year')
+ ).format(DATE_FORMAT)
},
sources: {
source: 'BASEMAPS',
",7
"diff --git a/modules/gui/src/app/home/body/process/recipeList/recipeListData.js b/modules/gui/src/app/home/body/process/recipeList/recipeListData.js @@ -91,25 +91,18 @@ class _RecipeListData extends React.Component {
renderEditButtons() {
const {edit} = this.state
- return edit
- ? this.renderActionButtons()
- : (
+ return (
+ <ButtonGroup spacing='none'>
<Button
icon='pen-to-square'
label='Edit'
shape='pill'
- onClick={() => this.setEdit(true)}
+ keybinding={edit ? 'Escape' : ''}
+ onClick={() => this.setEdit(!edit)}
/>
- )
- }
-
- renderActionButtons() {
- return (
- <ButtonGroup spacing='none'>
- {this.renderSelectButton()}
- {this.renderMoveButton()}
- {this.renderRemoveButton()}
- {this.renderExitButton()}
+ {edit && this.renderSelectButton()}
+ {edit && this.renderMoveButton()}
+ {edit && this.renderRemoveButton()}
</ButtonGroup>
)
}
@@ -187,18 +180,6 @@ class _RecipeListData extends React.Component {
)
}
- renderExitButton() {
- return (
- <Button
- icon='times'
- label='Exit'
- shape='pill'
- keybinding='Escape'
- onClick={() => this.setEdit(false)}
- />
- )
- }
-
getDestinations() {
const {recipeListContext: {projects}} = this.props
return projects.map(({id, name}) => ({value: id, label: name}))
",7
"diff --git a/modules/gui/src/app/home/body/process/recipeList/recipeListData.js b/modules/gui/src/app/home/body/process/recipeList/recipeListData.js @@ -182,17 +182,14 @@ class _RecipeListData extends React.Component {
return (
<Confirm
title={msg('process.recipe.move.title')}
- message={
- this.renderConfirmationMessage(
- msg('process.recipe.move.confirm', {count: this.isSelected(), project: projectName})
- )
- }
+ message={msg('process.recipe.move.confirm', {count: this.isSelected(), project: projectName})}
onConfirm={() => {
this.setMove(false)
this.moveSelected(projectId)
}}
- onCancel={() => this.setMove(false)}
- />
+ onCancel={() => this.setMove(false)}>
+ {this.renderSelectedRecipes()}
+ </Confirm>
)
}
@@ -202,36 +199,12 @@ class _RecipeListData extends React.Component {
shape='pill'
icon='trash'
label={msg('process.recipe.remove.label')}
+ message={msg('process.recipe.remove.confirm', {count: this.isSelected()})}
tooltip={msg('process.recipe.remove.tooltip')}
- message={
- this.renderConfirmationMessage(
- msg('process.recipe.remove.confirm', {count: this.isSelected()})
- )
- }
disabled={!this.isSelected()}
- onRemove={this.removeSelected}/>
- )
- }
-
- rendeRemoveConfirmationMessage() {
- return (
- <div>
- <div>
- {msg('process.recipe.remove.confirm', {count: this.isSelected()})}
- </div>
+ onRemove={this.removeSelected}>
{this.renderSelectedRecipes()}
- </div>
- )
- }
-
- renderConfirmationMessage(message) {
- return (
- <div>
- <div>
- {message}
- </div>
- {this.renderSelectedRecipes()}
- </div>
+ </RemoveButton>
)
}
@@ -239,15 +212,23 @@ class _RecipeListData extends React.Component {
const {recipes, selectedIds} = this.props
const selectedRecipes = recipes.filter(({id}) => selectedIds.includes(id))
return (
- <ul>
+ <Layout type='vertical' spacing='tight'>
{selectedRecipes.map(recipe => this.renderSelectedRecipe(recipe))}
- </ul>
+ </Layout>
)
}
renderSelectedRecipe(recipe) {
return (
- <li>{this.getRecipePath(recipe)}</li>
+ <ListItem key={recipe.id}>
+ <CrudItem
+ title={this.getRecipeTypeName(recipe.type)}
+ description={this.getRecipePath(recipe)}
+ timestamp={recipe.updateTime}
+ selected={this.isSelected(recipe.id)}
+ onSelect={() => this.toggleOne(recipe.id)}
+ />
+ </ListItem>
)
}
",7
"diff --git a/modules/gui/src/app/home/body/process/recipeList/recipeListData.js b/modules/gui/src/app/home/body/process/recipeList/recipeListData.js @@ -129,7 +129,8 @@ class _RecipeListData extends React.Component {
{edit && this.renderMoveButton()}
{edit && this.renderRemoveButton()}
<Button
- icon='pen-to-square'
+ look={edit ? 'apply' : 'default'}
+ icon={edit ? 'xmark' : 'pen-to-square'}
label={msg('process.recipe.edit.label')}
shape='pill'
keybinding={edit ? 'Escape' : ''}
",7
"diff --git a/modules/gui/src/widget/confirm.module.css b/modules/gui/src/widget/confirm.module.css align-items: center;
justify-content: center;
font-size: .9rem;
- background-color: rgba(255, 0, 0, .5);
+ background-color: rgba(255, 0, 0, .35);
border-radius: .25rem;
- padding: .25rem;
+ padding: .25rem .5rem;
}
",7
"diff --git a/modules/task/src/jobs/export/toAsset.js b/modules/task/src/jobs/export/toAsset.js @@ -29,22 +29,6 @@ const exportImageToAsset$ = ({
retries = 0
}) => {
crsTransform = crsTransform || undefined
- console.log({
- image,
- description,
- assetId,
- assetType,
- strategy,
- pyramidingPolicy,
- dimensions,
- region,
- scale,
- crs,
- crsTransform,
- maxPixels,
- shardSize,
- tileSize,
- retries})
region = region || image.geometry()
if (ee.sepal.getAuthType() === 'SERVICE_ACCOUNT')
throw new Error('Cannot export to asset using service account.')
@@ -179,7 +163,12 @@ const imageToAssetCollection$ = ({
})
return concat(
- prepareCollection$().pipe(swallow()),
+ progress({
+ defaultMessage: `Prepare image collection '${assetId}'`,
+ messageKey: 'tasks.ee.export.asset.prepareImageCollection',
+ messageArgs: {assetId}
+ }),
+ prepareCollection$(),
tilesToAssets$()
)
}
@@ -188,7 +177,6 @@ const imageToAssetCollection$ = ({
const imageToAsset$ = ({
image, description, assetId, strategy, pyramidingPolicy, dimensions, region, scale, crs, crsTransform, maxPixels, shardSize, retries
}) => {
- console.log('imageToAsset$', {pyramidingPolicy})
const exportToAsset$ = ({task, description, assetId, _retries}) => {
return exportLimiter$(
concat(
@@ -201,7 +189,6 @@ const imageToAsset$ = ({
}
return formatRegion$(region).pipe(
switchMap(region => {
- console.log('switchMap', {pyramidingPolicy})
const serverConfig = ee.batch.Export.convertToServerParams(
_.cloneDeep({image, description, assetId, pyramidingPolicy, dimensions, region, scale, crs, crsTransform, maxPixels, shardSize}), // It seems like EE modifies the pyramidingPolicy
ee.data.ExportDestination.ASSET,
",7
"diff --git a/modules/gui/src/widget/fastList.js b/modules/gui/src/widget/fastList.js import {ElementResizeDetector} from 'widget/elementResizeDetector'
import {Layout} from './layout'
-import {Subject, animationFrames, distinctUntilChanged, fromEvent, map, mergeWith, switchMap, takeUntil, timer} from 'rxjs'
+import {Subject, animationFrames, distinctUntilChanged, fromEvent, map, mergeWith, switchMap, takeUntil, throttleTime, timer} from 'rxjs'
import {compose} from 'compose'
import PropTypes from 'prop-types'
import React from 'react'
@@ -13,8 +13,9 @@ class _FastList extends React.PureComponent {
reset$ = new Subject()
state = {
- singleItemHeight: null,
- spacedItemHeight: null,
+ itemHeight: 0,
+ itemSpacing: 0,
+ spacedItemHeight: 0,
firstVisibleItem: 0,
lastVisibleItem: 0,
marginTop: 0,
@@ -31,27 +32,28 @@ class _FastList extends React.PureComponent {
render() {
const {items} = this.props
return items
- ? this.renderSingleItemSampler() || this.renderSpacedItemSampler() || this.renderList()
+ ? this.renderItemHeightSampler() || this.renderItemSpacingSampler() || this.renderList()
: null
}
- renderSingleItemSampler() {
+ renderItemHeightSampler() {
const {items} = this.props
- const {singleItemHeight} = this.state
- if (items.length > 0 && !singleItemHeight) {
- return this.renderSampler(1, ({height: singleItemHeight}) => {
- this.setState({singleItemHeight})
+ const {itemHeight} = this.state
+ if (items.length > 0 && !itemHeight) {
+ return this.renderSampler(1, ({height: itemHeight}) => {
+ this.setState({itemHeight})
})
}
}
- renderSpacedItemSampler() {
+ renderItemSpacingSampler() {
const {items} = this.props
- const {singleItemHeight, spacedItemHeight} = this.state
- if (items.length > 1 && !spacedItemHeight) {
+ const {itemHeight, itemSpacing} = this.state
+ if (items.length > 1 && !itemSpacing) {
return this.renderSampler(2, ({height}) => {
- const spacedItemHeight = height - singleItemHeight
- this.setState({spacedItemHeight})
+ const itemSpacing = height - 2 * itemHeight
+ const spacedItemHeight = itemHeight + itemSpacing
+ this.setState({itemSpacing, spacedItemHeight})
})
}
}
@@ -82,13 +84,13 @@ class _FastList extends React.PureComponent {
}
renderFiller(height) {
- const itemHeight = this.getItemHeight()
+ const {spacedItemHeight} = this.state
return (
<div
className={styles.filler}
style={{
'--height': height,
- '--itemHeight': itemHeight
+ '--itemHeight': spacedItemHeight
}}/>
)
}
@@ -146,18 +148,13 @@ class _FastList extends React.PureComponent {
}
}
- getItemHeight() {
- const {singleItemHeight, spacedItemHeight} = this.state
- return spacedItemHeight || singleItemHeight
- }
-
update(scrollTop, clientHeight) {
+ const {itemSpacing, spacedItemHeight} = this.state
const {items, overflow} = this.props
- const itemHeight = this.getItemHeight()
- const firstVisibleItem = Math.max(0, Math.ceil(scrollTop / itemHeight) - overflow)
- const lastVisibleItem = Math.min(items.length, Math.floor((scrollTop + clientHeight) / itemHeight) + overflow)
- const marginTop = firstVisibleItem * itemHeight
- const marginBottom = (items.length - lastVisibleItem) * itemHeight
+ const firstVisibleItem = Math.max(0, Math.ceil(scrollTop / spacedItemHeight) - overflow)
+ const lastVisibleItem = Math.min(items.length, Math.floor((scrollTop + clientHeight + itemSpacing) / spacedItemHeight) + overflow)
+ const marginTop = firstVisibleItem * spacedItemHeight
+ const marginBottom = (items.length - lastVisibleItem) * spacedItemHeight
this.setState({firstVisibleItem, lastVisibleItem, marginTop, marginBottom})
}
",7
"diff --git a/modules/gui/src/widget/blurDetector.js b/modules/gui/src/widget/blurDetector.js import {compose} from 'compose'
-import {delay, distinctUntilChanged, filter, fromEvent, map, merge, of, scan, switchMap, takeUntil} from 'rxjs'
+import {delay, distinctUntilChanged, filter, fromEvent, map, merge, of, switchMap, takeUntil} from 'rxjs'
import {withContext} from 'context'
import PropTypes from 'prop-types'
import React from 'react'
@@ -22,8 +22,7 @@ class BlurDetector extends React.Component {
super(props)
this.ref = props.forwardedRef || React.createRef()
this.isEnabled = this.isEnabled.bind(this)
- this.onEvent = this.onEvent.bind(this)
- this.onTimeout = this.onTimeout.bind(this)
+ this.onBlur = this.onBlur.bind(this)
}
render() {
@@ -52,27 +51,27 @@ class BlurDetector extends React.Component {
fromEvent(document, 'focus', {capture: true}),
).pipe(
filter(this.isEnabled),
+ filter(e => !this.isOver(e))
// debounceTime(150) // prevent click-through
- ).subscribe(this.onEvent)
+ ).subscribe(this.onBlur)
)
if (autoBlurTimeout) {
- const inside$ = fromEvent(document, 'mousemove').pipe(
- map(e => this.isRefEvent(e) || this.isExcludedEvent(e)),
+ const over$ = fromEvent(document, 'mousemove').pipe(
+ map(e => this.isOver(e)),
distinctUntilChanged()
)
- const enter$ = inside$.pipe(
- filter(inside => inside)
+ const enter$ = over$.pipe(
+ filter(over => over)
)
- const leave$ = inside$.pipe(
- filter(inside => !inside)
+ const leave$ = over$.pipe(
+ filter(over => !over)
)
addSubscription(
- leave$.pipe(
- switchMap(e => of(e).pipe(
- delay(autoBlurTimeout),
- takeUntil(enter$)
+ enter$.pipe(
+ switchMap(() => leave$.pipe(
+ delay(autoBlurTimeout)
))
- ).subscribe(this.onTimeout)
+ ).subscribe(this.onBlur)
)
}
}
@@ -82,6 +81,13 @@ class BlurDetector extends React.Component {
this.setEnabled(true)
}
+ onBlur(e) {
+ const {onBlur} = this.props
+ if (onBlur) {
+ onBlur(e)
+ }
+ }
+
setEnabled(enabled) {
const {blurDetectorContext} = this.props
if (blurDetectorContext) {
@@ -94,18 +100,8 @@ class BlurDetector extends React.Component {
return enabled
}
- onEvent(e) {
- const {onBlur} = this.props
- if (onBlur && !this.isRefEvent(e) && !this.isExcludedEvent(e)) {
- onBlur(e)
- }
- }
-
- onTimeout(e) {
- const {onBlur} = this.props
- if (onBlur) {
- onBlur(e)
- }
+ isOver(e) {
+ return this.isRefEvent(e) || this.isExcludedEvent(e)
}
isRefEvent(e) {
",7
"diff --git a/modules/gui/src/locale/en/translations.json b/modules/gui/src/locale/en/translations.json ""lock"": {
""label"": ""Lock"",
""tooltip"": ""Lock the user"",
- ""message"": ""The user will be locked and will no longer be able to access SEPAL. Active sessions will be terminated. No user data will be removed."",
+ ""message"": ""The user will be locked and not be able to access SEPAL from now on.|Active sessions will be terminated, but all user data will be retained."",
""error"": ""Could not lock user."",
""success"": ""User has been locked.""
},
""unlock"": {
""label"": ""Unlock"",
""tooltip"": ""Unlock the user"",
- ""message"": ""The user will be unlocked and regain access to SEPAL. A password reset email will be sent to the user for reactivating the account."",
+ ""message"": ""The user will be unlocked.|A password reset email will be sent to the user for reactivating the SEPAL account."",
""error"": ""Could not unlock user."",
""success"": ""User has been unlocked.""
},
",7
"diff --git a/modules/gui/src/locale/en/translations.json b/modules/gui/src/locale/en/translations.json ""success"": ""User details have been updated.""
},
""confirmation"": {
- ""message"": ""User role is being changed to \""{role}\""""
+ ""message"": ""User role will be changed to \""{role}\""""
}
},
""userSession"": {
",7
"diff --git a/modules/gui/src/locale/en/translations.json b/modules/gui/src/locale/en/translations.json ""switchingToSEPALGoogleAccount"": ""Switching to SEPAL's Google Account"",
""title"": ""User details"",
""update"": {
- ""error"": ""Could not update user details."",
- ""success"": ""User details have been updated.""
+ ""error"": ""Could not update user."",
+ ""success"": ""User has been updated.""
},
""confirmation"": {
""message"": ""User role will be changed to \""{role}\""""
",7
"diff --git a/modules/gui/src/widget/split/splitView.module.css b/modules/gui/src/widget/split/splitView.module.css position: absolute;
width: calc(2 * var(--half-area-marker-size) + 1px);
height: calc(2 * var(--half-area-marker-size) + 1px);
- background-color: rgba(255, 0, 0, .6);
- border: 1px solid rgba(0, 0, 0, .9);
+ /* border: 1px solid rgba(0, 0, 0, .9); */
+ background: radial-gradient(
+ circle,
+ transparent,
+ transparent calc(var(--half-center-handle-size) + 1px),
+ rgba(255, 0, 0, .6) calc(var(--half-center-handle-size) + 1px),
+ rgba(255, 0, 0, .6)
+ );
box-sizing: border-box;
border-radius: 100%;
pointer-events: none;
",7
"diff --git a/test/bind.spec.js b/test/bind.spec.js @@ -386,12 +386,13 @@ test('cursor position is preserved on selectable text input', async () => {
Alpine.start()
document.querySelector('input').focus()
- document.querySelector('input').setSelectionRange(0, 3, 'backward')
expect(document.querySelector('input').value).toEqual('bar')
expect(document.querySelector('input').selectionStart).toEqual(0)
- expect(document.querySelector('input').selectionEnd).toEqual(3)
- expect(document.querySelector('input').selectionDirection).toEqual('backward')
+ expect(document.querySelector('input').selectionEnd).toEqual(0)
+ expect(document.querySelector('input').selectionDirection).toEqual('none')
+
+ document.querySelector('input').setSelectionRange(0, 3, 'backward')
await wait(() => {
expect(document.querySelector('input').value).toEqual('baz')
",7
"diff --git a/README.md b/README.md @@ -589,7 +589,27 @@ If you need to access $event inside of a JavaScript function you can pass it in
</div>
```
-Notice that, because of [event bubbling](https://en.wikipedia.org/wiki/Event_bubbling), you'll need to use the [`.window`](https://github.com/alpinejs/alpine#x-on) modifier if you are trying to propagate events between sibling nodes:
+**Note on Event propagation**
+
+Notice that, because of [event bubbling](https://en.wikipedia.org/wiki/Event_bubbling), when you need to capture events dispatched from nodes that are under the same nesting hierarchy, you'll need to use the [`.window`](https://github.com/alpinejs/alpine#x-on) modifier:
+
+**Example:**
+
+```html
+<div>
+ <span @custom-event=""console.log($event.detail.foo)""></span>
+ <button @click=""$dispatch('custom-event', { foo: 'bar' })"">
+<div>
+```
+
+Since both elements are nested under `div`, this won't work.
+The `custom-event` is dispatched from the `button` and will propagate to its ancestor, the `div`.
+
+**Dispatching to components**
+
+You can take advantage of the previous technique to make your components talk to each other:
+
+**Example:**
```html
<div @foo-event.window=""console.log($event.detail.foo)"">
",7
"diff --git a/src/utils.js b/src/utils.js @@ -110,10 +110,9 @@ export function getXAttrs(el, component, type) {
directives = directives.concat(Object.entries(spreadObject).map(([name, value]) => parseHtmlAttribute({ name, value })))
}
- // If no type is passed in for filtering, bypass filter
- if (!type) return directives;
+ if (type) return directives.filter(i => i.type === type)
- return directives.filter(i => i.type === type)
+ return directives;
}
function parseHtmlAttribute({ name, value }) {
",7
"diff --git a/src/component.js b/src/component.js @@ -28,9 +28,7 @@ export default class Component {
Object.defineProperty(dataExtras, `$${name}`, { get: function () { return callback(canonicalComponentElementReference) } });
})
- tryCatch(() => {
- this.unobservedData = componentForClone ? componentForClone.getUnobservedData() : saferEval(dataExpression, dataExtras)
- }, { el, expression: dataExpression })
+ this.unobservedData = componentForClone ? componentForClone.getUnobservedData() : tryCatch(() => saferEval(dataExpression, dataExtras), { el, expression: dataExpression })
/* IE11-ONLY:START */
// For IE11, add our magic properties to the original data for access.
",7
"diff --git a/helpers/index.js b/helpers/index.js export function movePluginBeforeInitAuthPlugin(plugins, pluginName) {
// Moves a plugin that needs access to $this.fireFOO but needs to get run BEFORE nuxt-auth in between the nuxt-fire and the auth plugin.
- // This function needs to be applied in extendPlugins in nuxt.config.js.s
+ // This function needs to be applied in extendPlugins in nuxt.config.js.
+
const fromIndex = plugins.findIndex(x => x.src.includes(pluginName))
- const toIndex = plugins.findIndex(x => x.src.includes('nuxt-fire/main.js'))
- plugins.splice(toIndex + 1, 0, plugins.splice(fromIndex - 1, 1)[0])
- return plugins
+ const toIndex = plugins.findIndex(x => x.src.includes('nuxt-fire/main')) + 1
+
+ if (fromIndex === -1) {
+ const msg = `Nuxt-Fire Helpers: Could not find a plugin that includes the name: ${pluginName}.`
+ throw new Error(msg)
+ }
+
+ if (toIndex === -1) {
+ const msg = `Nuxt-Fire Helpers: Nuxt-Fire plugin is not registered.`
+ throw new Error(msg)
+ }
+
+ if (toIndex > -1 && toIndex < plugins.length) {
+ const removedElement = plugins.splice(fromIndex, 1)[0]
+ plugins.splice(toIndex, 0, removedElement)
+ }
}
",7
"diff --git a/docs/docs/marks.md b/docs/docs/marks.md @@ -67,7 +67,7 @@ There is also a special group mark type (`group`) that can contain other marks,
| on | {% include array t=""[Trigger](../triggers)"" %} | A set of triggers for modifying mark properties in response to signal changes. |
| sort | {% include type t=""Compare"" %} | A comparator for sorting mark items. The sort order will determine the default rendering order. The comparator is defined over generated scenegraph items and sorting is performed after encodings are computed, allowing items to be sorted by size or position. To sort by underlying data properties in addition to mark item properties, use field names such as `""datum.field""`.|
| transform | {% include array t=""[Transform](../transforms)"" %} | A set of post-encoding transforms, applied after any _encode_ blocks, that operate directly on mark scenegraph items (not backing data objects). These can be useful for performing layout with transforms that can set `x`, `y`, `width`, `height`, _etc._ properties. Only data transforms that do not generate or filter data objects may be used.|
-| role | {% include type t=""String"" %} | A metadata string indicating the role of the mark. SVG renderers will add this role value (prepended with the prefix `role-`) as a CSS class name on the enclosing SVG group (`g`) element containing the mark instances. Roles are used internally by Vega to perform custom processing and layout, do not set this property unless you know which layout effect you are trying to achieve.|
+| role | {% include type t=""String"" %} | A metadata string indicating the role of the mark. SVG renderers will add this role value (prepended with the prefix `role-`) as a CSS class name on the enclosing SVG group (`g`) element containing the mark instances. Roles are used internally by Vega to perform custom processing and layout; do not set this property unless you know which layout effect you are trying to achieve!|
## <a name=""from""></a>Mark Data Sources (`from`)
@@ -76,7 +76,7 @@ The `from` property indicates the data source for a set of marks.
| Property | Type | Description |
| :------------ | :----------------------------: | :------------- |
| data | {% include type t=""String"" %} | The name of the data set to draw from.|
-| facet | [Facet](#facet) | An option facet definition for partitioning data across multiple group marks. Only [`group` mark](group) definitions may use the facet directive.|
+| facet | [Facet](#facet) | An optional facet definition for partitioning data across multiple group marks. Only [`group` mark](group) definitions may use the facet directive.|
### <a name=""facet""></a>Faceting
",7
"diff --git a/docs/examples/reorderable-matrix.vg.json b/docs/examples/reorderable-matrix.vg.json ""signals"": [
{ ""name"": ""cellSize"", ""value"": 10 },
+ { ""name"": ""count"", ""update"": ""length(data('nodes'))"" },
{ ""name"": ""width"", ""update"": ""span(range('position'))"" },
{ ""name"": ""height"", ""update"": ""width"" },
{
]
},
{
- ""name"": ""dest"", ""value"": {},
+ ""name"": ""dest"", ""value"": -1,
""on"": [
{
- ""events"": ""[text:mousedown, window:mouseup] > text:mouseover"",
- ""update"": ""src.name != null ? datum : dest""
+ ""events"": ""[@columns:mousedown, window:mouseup] > window:mousemove"",
+ ""update"": ""src.name && datum !== src ? (0.5 + count * clamp(x(), 0, width) / width) : dest""
},
- {""events"": ""text:mouseout"", ""update"": ""{}""}
- ]
+ {
+ ""events"": ""[@rows:mousedown, window:mouseup] > window:mousemove"",
+ ""update"": ""src.name && datum !== src ? (0.5 + count * clamp(y(), 0, height) / height) : dest""
},
- {""name"": ""destOrder"", ""update"": ""dest.order""},
- {""name"": ""dragging"", ""update"": ""src.name && dest.name""}
+ {""events"": ""window:mouseup"", ""update"": ""-1""}
+ ]
+ }
],
""data"": [
""url"": ""data/miserables.json"",
""format"": {""type"": ""json"", ""property"": ""nodes""},
""transform"": [
- { ""type"": ""collect"", ""sort"": {""field"": ""group""} },
- { ""type"": ""window"", ""ops"": [""rank""], ""as"": [""order""] },
{
""type"": ""formula"", ""as"": ""order"",
- ""expr"": ""dragging && datum === dest ? src.order : datum.order""
+ ""expr"": ""datum.group""
},
{
- ""type"": ""formula"", ""as"": ""order"",
- ""expr"": ""dragging && datum === src ? destOrder : datum.order""
+ ""type"": ""formula"", ""as"": ""score"",
+ ""expr"": ""dest >= 0 && datum === src ? dest : datum.order""
+ },
+ {
+ ""type"": ""window"", ""sort"": {""field"": ""score""},
+ ""ops"": [""row_number""], ""as"": [""order""]
}
]
},
""fields"": [""source"", ""target""], ""as"": [""sourceNode"", ""targetNode""]
},
{
- ""type"": ""formula"",
- ""as"": ""group"",
- ""expr"": ""datum.sourceNode.group === datum.targetNode.group ? datum.sourceNode.group : -1""
+ ""type"": ""formula"", ""as"": ""group"",
+ ""expr"": ""datum.sourceNode.group === datum.targetNode.group ? datum.sourceNode.group : count""
}
]
},
""domain"": {
""fields"": [
{""data"": ""nodes"", ""field"": ""group""},
- [-1]
- ]
+ {""signal"": ""count""}
+ ],
+ ""sort"": true
}
- },
- {
- ""name"": ""labels"",
- ""type"": ""ordinal"",
- ""domain"": {""data"": ""nodes"", ""field"": ""order""},
- ""range"": {""data"": ""nodes"", ""field"": ""name""}
}
],
""encode"": {
""update"": {
""x"": {""scale"": ""position"", ""field"": ""targetNode.order""},
- ""width"": {""scale"": ""position"", ""band"": 1, ""offset"": -1},
""y"": {""scale"": ""position"", ""field"": ""sourceNode.order""},
+ ""width"": {""scale"": ""position"", ""band"": 1, ""offset"": -1},
""height"": {""scale"": ""position"", ""band"": 1, ""offset"": -1},
""fill"": {""scale"": ""color"", ""field"": ""group""}
}
},
{
""type"": ""text"",
+ ""name"": ""columns"",
""from"": {""data"": ""nodes""},
""encode"": {
""update"": {
- ""x"": {""scale"": ""position"", ""field"": ""order""},
+ ""x"": {""scale"": ""position"", ""field"": ""order"", ""band"": 0.5},
""y"": {""offset"": -2},
- ""dy"": {""scale"": ""position"", ""band"": 0.5},
""text"": {""field"": ""name""},
""fontSize"": {""value"": 10},
""angle"": {""value"": -90},
},
{
""type"": ""text"",
+ ""name"": ""rows"",
""from"": {""data"": ""nodes""},
""encode"": {
""update"": {
""x"": {""offset"": -2},
- ""y"": {""scale"": ""position"", ""field"": ""order""},
- ""dy"": {""scale"": ""position"", ""band"": 0.5},
+ ""y"": {""scale"": ""position"", ""field"": ""order"", ""band"": 0.5},
""text"": {""field"": ""name""},
""fontSize"": {""value"": 10},
""align"": {""value"": ""right""},
",7
"diff --git a/packages/vega-dataflow/src/dataflow/load.js b/packages/vega-dataflow/src/dataflow/load.js @@ -5,8 +5,11 @@ export function ingest(target, data, format) {
}
function loadPending(df) {
- var pending = new Promise(function(accept) { resolve = accept; }),
- resolve;
+ var accept, reject,
+ pending = new Promise(function(a, r) {
+ accept = a;
+ reject = r;
+ });
pending.requests = 0;
@@ -14,8 +17,12 @@ function loadPending(df) {
if (--pending.requests === 0) {
df.runAfter(function() {
df._pending = null;
+ try {
df.run();
- resolve(df);
+ accept(df);
+ } catch (err) {
+ reject(err);
+ }
});
}
}
@@ -40,7 +47,5 @@ export function request(target, url, format) {
pending.done();
})
.then(pending.done)
- .catch(function(error) {
- df.error(error);
- });
+ .catch(function(error) { df.warn(error); });
}
",7
"diff --git a/packages/vega-scenegraph/src/Scenegraph.js b/packages/vega-scenegraph/src/Scenegraph.js @@ -44,7 +44,7 @@ prototype.mark = function(scenepath, markdef) {
throw n;
} catch (err) {
- error('Invalid scenegraph path: ' + JSON.stringify(scenepath));
+ error('Invalid scenegraph path: ' + scenepath.marks + ' : ' + scenepath.items);
}
};
",7
"diff --git a/packages/vega-encode/src/Encode.js b/packages/vega-encode/src/Encode.js @@ -26,7 +26,7 @@ prototype.transform = function(_, pulse) {
exit = _.encoders.exit || falsy,
set = (encode && !reenter ? _.encoders[encode] : update) || falsy;
- if (enter !== falsy || update !== falsy) {
+ if (pulse.changed(pulse.ADD)) {
pulse.visit(pulse.ADD, function(t) {
enter(t, _);
update(t, _);
@@ -37,7 +37,7 @@ prototype.transform = function(_, pulse) {
if (set !== falsy && set !== update) out.modifies(set.output);
}
- if (exit !== falsy) {
+ if (pulse.changed(pulse.REM) && exit !== falsy) {
pulse.visit(pulse.REM, function(t) { exit(t, _); });
out.modifies(exit.output);
}
@@ -49,13 +49,13 @@ prototype.transform = function(_, pulse) {
var mod = enter(t, _);
if (set(t, _) || mod) out.mod.push(t);
});
- out.modifies(enter.output);
+ if (out.mod.length) out.modifies(enter.output);
} else {
pulse.visit(flag, function(t) {
if (set(t, _)) out.mod.push(t);
});
}
- out.modifies(set.output);
+ if (out.mod.length) out.modifies(set.output);
}
return out;
",7
"diff --git a/packages/vega-parser/src/parsers/transform.js b/packages/vega-parser/src/parsers/transform.js @@ -43,7 +43,9 @@ function parseParameter(def, spec, scope) {
} else {
value = spec[def.name];
if (value === undefined) {
- if (def.required) error('Missing required parameter: ' + def.name);
+ if (def.required) {
+ error('Missing required ' + spec.type + ' parameter: ' + def.name);
+ }
return;
}
",7
"diff --git a/packages/vega-parser/src/parsers/scale.js b/packages/vega-parser/src/parsers/scale.js import {ref, keyFieldRef} from '../util';
import {Collect, Aggregate, MultiExtent, MultiValues, Values} from '../transforms';
-import {error, isArray, isObject, isString, toSet} from 'vega-util';
+import {error, isArray, isObject, isString, stringValue, toSet} from 'vega-util';
var types = [
'identity',
@@ -52,13 +52,22 @@ export default function(spec, scope) {
function parseLiteral(v, scope) {
return !isObject(v) ? v
: v.signal ? scope.signalRef(v.signal)
- : error('Unsupported object: ' + v);
+ : error('Unsupported object: ' + stringValue(v));
+}
+
+function dataLookupError(name) {
+ error('Can not find data set: ' + name);
}
// -- SCALE DOMAIN ----
function parseScaleDomain(domain, spec, scope) {
- if (!domain) return; // default domain
+ if (!domain) {
+ if (spec.domainMin != null || spec.domainMax != null) {
+ error('No scale domain defined for domainMin/domainMax to override.');
+ }
+ return; // default domain
+ }
if (domain.signal) {
return scope.signalRef(domain.signal);
@@ -77,7 +86,7 @@ function explicitDomain(domain, spec, scope) {
function singularDomain(domain, spec, scope) {
var data = scope.getData(domain.data);
- if (!data) error('Can not find data set: ' + domain.data);
+ if (!data) dataLookupError(domain.data);
return isOrdinal(spec.type)
? data.valuesRef(scope, domain.field, parseSort(domain.sort, false))
@@ -102,7 +111,7 @@ function ordinalMultipleDomain(domain, scope, fields) {
// get value counts for each domain field
counts = fields.map(function(f) {
var data = scope.getData(f.data);
- if (!data) error('Can not find data set: ' + f.data);
+ if (!data) dataLookupError(f.data);
return data.countsRef(scope, f.field);
});
@@ -146,7 +155,7 @@ function quantileMultipleDomain(domain, scope, fields) {
// get value arrays for each domain field
var values = fields.map(function(f) {
var data = scope.getData(f.data);
- if (!data) error('Can not find data set: ' + f.data);
+ if (!data) dataLookupError(f.data);
return data.domainRef(scope, f.field);
});
@@ -158,7 +167,7 @@ function numericMultipleDomain(domain, scope, fields) {
// get extents for each domain field
var extents = fields.map(function(f) {
var data = scope.getData(f.data);
- if (!data) error('Can not find data set: ' + f.data);
+ if (!data) dataLookupError(f.data);
return data.extentRef(scope, f.field);
});
",7
"diff --git a/packages/vega-typings/types/runtime/index.d.ts b/packages/vega-typings/types/runtime/index.d.ts @@ -47,17 +47,25 @@ export class View {
signal(name: string, value: any): View;
signal(name: string): any;
container(): HTMLElement | null;
- addEventListener(type: string, handler: Handler): View;
- removeEventListener(type: string, handler: Handler): View;
- addSignalListener(name: string, handler: (name: string, value: any) => void): View;
- removeSignalListener(name: string, handler: (name: string, value: any) => void): View;
- tooltip(handler: any, event: Event, item: any, value: any): View;
+ addEventListener(type: string, handler: EventListenerHandler): View;
+ removeEventListener(type: string, handler: EventListenerHandler): View;
+ addSignalListener(name: string, handler: SignalListenerHandler): View;
+ removeSignalListener(name: string, handler: SignalListenerHandler): View;
+ addResizeListener(handler: ResizeHandler): View;
+ removeResizeListener(handler: ResizeHandler): View;
+ tooltip(handler: TooltipHandler): View;
}
+export type ScenegraphEvent = MouseEvent | TouchEvent | KeyboardEvent;
+
export const Warn: number;
export const changeset: any;
export function loader(opt?: any): Loader;
-export type Handler = (event: Event, item?: Item) => void;
+export type EventListenerHandler = (event: ScenegraphEvent, item?: Item) => void;
+export type SignalListenerHandler = (name: string, value: any) => void;
+export type ResizeHandler = (width: number, height: number) => void;
+export type TooltipHandler = (handler: any, event: MouseEvent, item: Item, value: any) => void;
+
export interface Item<T = any> {
/**
* The underlying data element to which this item corresponds.
",7
"diff --git a/packages/vega-scenegraph/src/util/text.js b/packages/vega-scenegraph/src/util/text.js @@ -6,7 +6,7 @@ import {lru} from './lru';
const TEXT_WIDTH_CACHE_SIZE = 10000;
const widthCache = lru(TEXT_WIDTH_CACHE_SIZE);
-var currFontHeight;
+var currFontHeight, currentFont;
export var textMetrics = {
height: fontSize,
@@ -31,13 +31,14 @@ function estimate(text) {
// measure text width if canvas is available
function measureWidth(item, text) {
return fontSize(item) <= 0 ? 0
- : (context.font = font(item), measure(textValue(item, text)));
+ : (currentFont = font(item), measure(textValue(item, text)));
}
function measure(text) {
- const key = context.font + text;
+ const key = currentFont + text;
let width = widthCache.get(key);
if (width === undefined) {
+ context.font = currentFont;
width = context.measureText(text).width;
widthCache.set(key, width);
}
@@ -86,7 +87,7 @@ function truncate(item, line) {
if (textMetrics.width === measureWidth) {
// we are using canvas
- context.font = font(item);
+ currentFont = font(item);
width = measure;
} else {
// we are relying on estimates
",7
"diff --git a/packages/vega-scale/src/caption.js b/packages/vega-scale/src/caption.js import {labelFormat, labelValues} from './labels';
import {Time, UTC} from './scales/types';
import {isDiscrete, isDiscretizing} from './scales';
-import {peek} from 'vega-util';
+import {isString, peek} from 'vega-util';
function format(scale, specifier, formatType) {
const type = formatType || scale.type;
+
+ // replace abbreviated time specifiers to improve screen reader experience
+ if (isString(specifier) && (type === Time || type === UTC)) {
+ specifier = specifier.replace(/%a/g, '%A').replace(/%b/g, '%B');
+ }
return !specifier && type === Time ? d => new Date(d).toLocaleString()
: !specifier && type === UTC ? d => new Date(d).toUTCString()
: labelFormat(scale, 5, null, specifier, formatType, true);
",7
"diff --git a/packages/vega/test/index.html b/packages/vega/test/index.html .vega-bind { line-height: 18px; margin-bottom: 2px; }
.vega-bind-name { display: inline-block; width: 100px; }
.vega-bind input[type=""range""] { width: 400px; }
- .vega-bind-radio label { margin: 0 0.5em 0 2px; }
+ .vega-bind input[type=""radio""] { margin-right: 0.5em; }
+ .vega-bind input[type=""range""] { margin-right: 0.5em; }
+ .vega-bind-radio label { margin-right: 1em; }
</style>
</head>
<body>
",7
"diff --git a/packages/rnv/src/platformTools/android.js b/packages/rnv/src/platformTools/android.js @@ -42,6 +42,8 @@ import { getMergedPlugin, parsePlugins } from '../pluginTools';
const readline = require('readline');
+let currentDeviceProps = null;
+
const composeDevicesString = (devices, returnArray) => {
logTask(`composeDevicesString:${devices ? devices.length : null}`);
const devicesArray = [];
@@ -146,16 +148,42 @@ const isSquareishDevice = (width, height) => {
return false;
};
+const getRunningDeviceProp = (c, udid, prop) => {
+ // avoid multiple calls to the same device
+ if (currentDeviceProps) {
+ if (!prop) return currentDeviceProps;
+ return currentDeviceProps[prop];
+ }
+ const rawProps = child_process.execSync(`${c.cli[CLI_ANDROID_ADB]} -s ${udid} shell getprop`).toString().trim();
+ const lines = rawProps.trim().split(/\r?\n/);
+ lines.forEach((line) => {
+ const words = line.split(']: [');
+ const key = words[0].slice(1);
+ const value = words[1].slice(0, words[1].length - 1);
+
+ if (!currentDeviceProps) currentDeviceProps = {};
+ currentDeviceProps[key] = value;
+ });
+
+ return getRunningDeviceProp(c, udid, prop);
+};
+
+const decideIfTV = (c, udid) => {
+ const model = getRunningDeviceProp(c, udid, 'ro.product.model');
+ const name = getRunningDeviceProp(c, udid, 'ro.product.name');
+ const flavor = getRunningDeviceProp(c, udid, 'ro.build.flavor');
+ const description = getRunningDeviceProp(c, udid, 'ro.build.description');
+
+ if (model.includes('atv') || name.includes('atv') || flavor.includes('atv') || description.includes('atv')) return true;
+ return false;
+};
+
const getDeviceType = async (device, c) => {
- device.isPhone = true;
- device.isMobile = true;
logDebug('getDeviceType - in', { device });
if (device.udid !== 'unknown') {
- const dumpsysResult = child_process.execSync(`${c.cli[CLI_ANDROID_ADB]} -s ${device.udid} shell dumpsys tv_input`).toString();
const screenSizeResult = child_process.execSync(`${c.cli[CLI_ANDROID_ADB]} -s ${device.udid} shell wm size`).toString();
const screenDensityResult = child_process.execSync(`${c.cli[CLI_ANDROID_ADB]} -s ${device.udid} shell wm density`).toString();
- const arch = child_process.execSync(`${c.cli[CLI_ANDROID_ADB]} -s ${device.udid} shell getprop ro.product.cpu.abi`).toString().trim();
-
+ const arch = getRunningDeviceProp(c, device.udid, 'ro.product.cpu.abi');
let screenProps;
if (screenSizeResult) {
@@ -168,16 +196,17 @@ const getDeviceType = async (device, c) => {
screenProps = { ...screenProps, density: parseInt(density, 10) };
}
+ device.isTV = decideIfTV(c, device.udid);
+
if (screenSizeResult && screenDensityResult) {
const { width, height, density } = screenProps;
const diagonalInches = calculateDeviceDiagonal(width, height, density);
screenProps = { ...screenProps, diagonalInches };
- device.isTablet = diagonalInches > IS_TABLET_ABOVE_INCH;
+ device.isTablet = !device.isTV && diagonalInches > IS_TABLET_ABOVE_INCH && diagonalInches <= 15;
device.isWear = isSquareishDevice(width, height);
}
- device.isTV = !!dumpsysResult;
device.isPhone = !device.isTablet && !device.isWear && !device.isTV;
device.isMobile = !device.isWear && !device.isTV;
device.screenProps = screenProps;
@@ -187,7 +216,6 @@ const getDeviceType = async (device, c) => {
}
if (device.avdConfig) {
- const batteryPresent = device.avdConfig['hw.battery'];
const density = parseInt(device.avdConfig['hw.lcd.density'], 10);
const width = parseInt(device.avdConfig['hw.lcd.width'], 10);
const height = parseInt(device.avdConfig['hw.lcd.height'], 10);
@@ -204,9 +232,18 @@ const getDeviceType = async (device, c) => {
if (string.includes('wear')) device.isWear = true;
});
+ const avdId = device.avdConfig.AvdId;
+ const name = device.avdConfig['hw.device.name'];
+ const skin = device.avdConfig['skin.name'];
+ const image = device.avdConfig['image.sysdir.1'];
+
+ device.isTV = false;
+ [avdId, name, skin, image].forEach((string) => {
+ if (string.includes('tv') || string.includes('TV')) device.isTV = true;
+ });
+
const diagonalInches = calculateDeviceDiagonal(width, height, density);
- device.isTablet = diagonalInches > IS_TABLET_ABOVE_INCH;
- device.isTV = batteryPresent !== 'yes';
+ device.isTablet = !device.isTV && diagonalInches > IS_TABLET_ABOVE_INCH;
device.isPhone = !device.isTablet && !device.isWear && !device.isTV;
device.isMobile = !device.isWear && !device.isTV;
device.arch = arch;
@@ -313,6 +350,7 @@ const _parseDevicesResult = async (devicesString, avdsString, deviceOnly, c) =>
.then(devicesArray => devicesArray.filter((device) => {
// filter devices based on selected platform
const { platform } = c;
+ console.log(device);
const matches = (platform === ANDROID && device.isTablet) || (platform === ANDROID_WEAR && device.isWear) || (platform === ANDROID_TV && device.isTV) || (platform === ANDROID && device.isMobile);
logDebug('getDeviceType - filter', { device, matches, platform });
return matches;
",7
"diff --git a/packages/rnv/src/systemTools/fileutils.js b/packages/rnv/src/systemTools/fileutils.js @@ -191,8 +191,12 @@ export const writeObjectSync = (filePath, obj, spaces, addNewLine = true) => {
};
export const readObjectSync = (filePath, sanitize = false, c) => {
+ if (!filePath) {
+ logWarning('readObjectSync: filePath is undefined');
+ return null;
+ }
if (!fs.existsSync(filePath)) {
- logError(`File at ${filePath} does not exist`);
+ logWarning(`readObjectSync: File at ${filePath} does not exist`);
return null;
}
let obj;
@@ -207,7 +211,7 @@ export const readObjectSync = (filePath, sanitize = false, c) => {
}
}
} catch (e) {
- logError(`Parsing of ${chalk.white(filePath)} failed with ${e}`);
+ logWarning(`readObjectSync: Parsing of ${chalk.white(filePath)} failed with ${e}`);
return null;
}
return obj;
",7
"diff --git a/vault/src/get-operator-events.js b/vault/src/get-operator-events.js @@ -3,6 +3,8 @@ var api = require('./api')
var getDatabase = require('./database')
var defaultStats = require('./queries')
+var NO_PENDING_EVENTS = '__NONEPENDING__'
+
module.exports = getOperatorEvents
function getOperatorEvents (query) {
@@ -20,6 +22,13 @@ function fetchOperatorEvents (accountId, params) {
return api.getAccount(accountId, params)
.then(function (_account) {
account = _account
+ // in case no new events were returned decrypting the private key of the
+ // account can be skipped altogether
+ if (Object.keys(account.events).length === 0) {
+ var err = new Error('No pending events')
+ err.status = NO_PENDING_EVENTS
+ throw err
+ }
return api.decryptPrivateKey(account.encryptedPrivateKey)
})
.then(function (result) {
@@ -64,41 +73,50 @@ function fetchOperatorEvents (accountId, params) {
return Promise.all(eventDecryptions)
})
.then(function (results) {
- return results.filter(function (r) { return r })
+ return {
+ events: results.filter(function (r) {
+ return r
+ }),
+ account: account
+ }
})
- .then(function (results) {
- delete account.events
- return { events: results, account: account }
+ .catch(function (err) {
+ if (err.status === NO_PENDING_EVENTS) {
+ return { events: [], account: account }
+ }
+ throw err
})
}
function ensureSync (accountId) {
var db = getDatabase(accountId)
return db.events.toCollection().keys()
- .then(function (eventIds) {
- return eventIds.length
- ? api.getDeletedEvents({ eventIds: eventIds })
- : null
- })
- .then(function (response) {
- return response
- ? db.events.bulkDelete(response.eventIds)
- : null
- })
- .then(function () {
- return db.events
+ .then(function (knownEventIds) {
+ var fetchNewEvents = db.events
.orderBy('eventId')
.last()
- })
.then(function (latestLocalEvent) {
var params = latestLocalEvent
? { since: latestLocalEvent.eventId }
: null
return fetchOperatorEvents(accountId, params)
})
- .then(function (payload) {
- return db.events.bulkAdd(payload.events).then(function () {
+ var pruneEvents = (knownEventIds.length
+ ? api.getDeletedEvents({ eventIds: knownEventIds })
+ : Promise.resolve({ eventIds: [] })
+ )
+ .then(function (response) {
+ return response
+ ? db.events.bulkDelete(response.eventIds)
+ : null
+ })
+ return Promise.all([fetchNewEvents, pruneEvents])
+ .then(function (results) {
+ var payload = results[0]
+ return db.events.bulkAdd(payload.events)
+ .then(function () {
return payload.account
})
})
+ })
}
",7
"diff --git a/vault/src/get-operator-events.js b/vault/src/get-operator-events.js @@ -47,11 +47,18 @@ function fetchOperatorEvents (accountId, params) {
.then(function (userKey) {
return { userKey: userKey, userId: hashedUserId }
})
+ .catch(function () {
+ return null
+ })
})
return Promise.all(userSecretDecryptions)
})
.then(function (userSecrets) {
- var byHashedUserId = userSecrets.reduce(function (acc, next) {
+ var byHashedUserId = userSecrets
+ .filter(function (v) {
+ return v
+ })
+ .reduce(function (acc, next) {
acc[next.userId] = next.userKey
return acc
}, {})
@@ -68,6 +75,9 @@ function fetchOperatorEvents (accountId, params) {
.then(function (decryptedPayload) {
return Object.assign({}, event, { payload: decryptedPayload })
})
+ .catch(function () {
+ return null
+ })
})
return Promise.all(eventDecryptions)
",7
"diff --git a/packages/vault/index.js b/packages/vault/index.js @@ -58,9 +58,13 @@ function createVault (host) {
})
})
- if (document.body) {
+ switch (document.readyState) {
+ case 'complete':
+ case 'loaded':
+ case 'interactive':
document.body.appendChild(vault)
- } else {
+ break
+ default:
document.addEventListener('DOMContentLoaded', function () {
document.body.appendChild(vault)
})
",7
"diff --git a/auditorium/views/main.js b/auditorium/views/main.js @@ -7,72 +7,6 @@ var Table = require('./../components/table')
module.exports = view
-function keyMetric (name, value) {
- return html`
- <div class=""w-50 w-100-ns mb3 mb4-ns"">
- <p class=""mv0 f2"">${value}</p>
- <p class=""mv0 normal"">${name}</p>
- </div>
- `
-}
-
-function retentionSquare (value) {
- if (value === null) {
- return null
- }
- return html`
- <div title=""${formatNumber(value, 100)}%"">
- <div
- style=""opacity: ${value !== 0 ? (value * 0.75 + 0.25) : 1}""
- class=""${value !== 0 ? 'bg-dark-green' : 'bg-light-gray'} h3 w-100""
- >
- </div>
- </div>
- `
-}
-
-function relativeTime (offset) {
- if (offset === 0) {
- return __('This week')
- }
- return __('%d days earlier', offset * 7)
-}
-
-function retentionTable (matrix) {
- var rows = matrix.map(function (row, index) {
- var elements = row.slice()
- while (elements.length < matrix[0].length) {
- elements.push(null)
- }
- return html`
- <tr>
- <td>${relativeTime(index)}</td>
- ${elements.map(function (element) { return html`<td>${retentionSquare(element)}</td>` })}
- </tr>
- `
- })
- return html`
- <table class=""w-100 collapse mb3 dt--fixed"">
- <thead>
- <tr>
- <td></td>
- ${matrix.map(function (row, index) { return html`<td>${relativeTime(index)}</td>` })}
- </tr>
- </thead>
- <tbody>
- ${rows}
- </tbody>
- </table>
- `
-}
-
-function formatNumber (value, factor) {
- return (value * (factor || 1)).toLocaleString(process.env.LOCALE, {
- maximumFractionDigits: 1,
- minimumFractionDigits: 1
- })
-}
-
function view (state, emit) {
var userHasOptedIn = state.consentStatus && state.consentStatus.status === 'allow'
@@ -265,15 +199,15 @@ function view (state, emit) {
<div class=""w-100 w-25-m w-20-ns pa3 mb2 bt bb ba-ns br0 br2-ns b--black-10 bg-white"">
<h4 class =""f5 normal mt0 mb3 mb4-ns"">Key metrics</h4>
<div class=""flex flex-wrap"">
- ${keyMetric(__('Unique %s', entityName), uniqueEntities)}
- ${keyMetric(__('Unique Sessions'), uniqueSessions)}
+ ${keyMetric(__('Unique %s', entityName), formatCount(uniqueEntities))}
+ ${keyMetric(__('Unique Sessions'), formatCount(uniqueSessions))}
<hr class=""mt0 mb3 w-100 bb bw1 b--black-10"">
${state.model.avgPageDepth ? keyMetric(__('Avg. Page Depth'), formatNumber(state.model.avgPageDepth)) : null}
${keyMetric(__('Bounce Rate'), `${formatNumber(state.model.bounceRate, 100)}%`)}
${isOperator && state.model.loss ? keyMetric(__('Plus'), `${formatNumber(state.model.loss, 100)}%`) : null}
<hr class=""mt0 mb3 w-100 bb bw1 b--black-10"">
${keyMetric(__('Mobile Users'), `${formatNumber(state.model.mobileShare, 100)}%`)}
- ${state.model.avgPageload ? keyMetric(__('Avg. Page Load time'), `${Math.round(state.model.avgPageload)} ms`) : null}
+ ${state.model.avgPageload ? keyMetric(__('Avg. Page Load time'), formatDuration(state.model.avgPageload)) : null}
</div>
</div>
`
@@ -353,3 +287,86 @@ function view (state, emit) {
</div>
`
}
+
+function keyMetric (name, value) {
+ return html`
+ <div class=""w-50 w-100-ns mb3 mb4-ns"">
+ <p class=""mv0 f2"">${value}</p>
+ <p class=""mv0 normal"">${name}</p>
+ </div>
+ `
+}
+
+function retentionSquare (value) {
+ if (value === null) {
+ return null
+ }
+ return html`
+ <div title=""${formatNumber(value, 100)}%"">
+ <div
+ style=""opacity: ${value !== 0 ? (value * 0.75 + 0.25) : 1}""
+ class=""${value !== 0 ? 'bg-dark-green' : 'bg-light-gray'} h3 w-100""
+ >
+ </div>
+ </div>
+ `
+}
+
+function relativeTime (offset) {
+ if (offset === 0) {
+ return __('This week')
+ }
+ return __('%d days earlier', offset * 7)
+}
+
+function retentionTable (matrix) {
+ var rows = matrix.map(function (row, index) {
+ var elements = row.slice()
+ while (elements.length < matrix[0].length) {
+ elements.push(null)
+ }
+ return html`
+ <tr>
+ <td>${relativeTime(index)}</td>
+ ${elements.map(function (element) { return html`<td>${retentionSquare(element)}</td>` })}
+ </tr>
+ `
+ })
+ return html`
+ <table class=""w-100 collapse mb3 dt--fixed"">
+ <thead>
+ <tr>
+ <td></td>
+ ${matrix.map(function (row, index) { return html`<td>${relativeTime(index)}</td>` })}
+ </tr>
+ </thead>
+ <tbody>
+ ${rows}
+ </tbody>
+ </table>
+ `
+}
+
+function formatDuration (valueInMs) {
+ if (valueInMs >= 1000) {
+ return formatNumber(valueInMs / 1000, 1, 2) + __('s')
+ }
+ return Math.round(valueInMs) + __('ms')
+}
+
+function formatCount (count) {
+ if (count > 1000000) {
+ return formatNumber(count / 1000000) + __('M')
+ }
+ if (count > 1000) {
+ return formatNumber(count / 1000) + __('k')
+ }
+ return count
+}
+
+function formatNumber (value, factor, digits) {
+ return (value * (factor || 1)).toLocaleString(process.env.LOCALE, {
+ maximumFractionDigits: digits || 1,
+ minimumFractionDigits: digits || 1
+ })
+}
",7
"diff --git a/auditorium/src/views/components/_shared/new-password-input.js b/auditorium/src/views/components/_shared/new-password-input.js @@ -8,6 +8,7 @@ const { h, Fragment } = require('preact')
const { forwardRef } = require('preact/compat')
const { useState } = require('preact/hooks')
const zxcvbn = require('zxcvbn')
+const classnames = require('classnames')
const strengths = [
__('weak'),
@@ -37,7 +38,7 @@ const NewPasswordInput = forwardRef((props, ref) => {
const { labelClass = null, children, ...otherProps } = props
const [score, setScore] = useState(0)
- const [policyMet, setPolicyMet] = useState(false)
+ const [policyMet, setPolicyMet] = useState(null)
return (
<Fragment>
@@ -51,9 +52,15 @@ const NewPasswordInput = forwardRef((props, ref) => {
oninput={(e) => {
e.target.setCustomValidity('')
const val = e.target.value
+
const { score } = zxcvbn(val)
setScore(score)
+
+ if (val.length === 0) {
+ setPolicyMet(null)
+ } else {
setPolicyMet(val.length >= 8)
+ }
}}
oninvalid={(e) => {
e.target.setCustomValidity(
@@ -63,7 +70,9 @@ const NewPasswordInput = forwardRef((props, ref) => {
{...otherProps}
/>
<p class='mt1 mb3'>
+ <em class={classnames('i', policyMet === false ? 'dark-red' : null)}>
<StrengthMessage score={score} policyMet={policyMet} />
+ </em>
</p>
</label>
</Fragment>
",7
"diff --git a/auditorium/src/views/components/auditorium/range-selector.js b/auditorium/src/views/components/auditorium/range-selector.js @@ -18,7 +18,7 @@ const predefinedRanges = [
{ display: __('30 days'), query: { range: '30', resolution: 'days' } },
{ display: __('6 weeks'), query: { range: '6', resolution: 'weeks' } },
{ display: __('12 weeks'), query: { range: '12', resolution: 'weeks' } },
- { display: __('6 months'), query: { range: '6', resolution: 'months' } }
+ { display: __('6 months'), query: { range: '6', resolution: 'months' }, endsSecondBlock: true }
]
const RangeSelector = (props) => {
@@ -43,8 +43,9 @@ const RangeSelector = (props) => {
key={`fixed-range-${index}`}
class={classnames(
'pr3 bt b--light-gray',
- range.opensSecondBlock ? 'fixed-ranges-start pl4' : null,
- range.endsFirstBlock ? 'br' : null
+ range.opensSecondBlock ? 'fixed-ranges-start pl4-ns' : null,
+ range.endsFirstBlock ? 'br-ns' : null,
+ range.endsSecondBlock ? 'pr4' : null
)}
>
@@ -65,7 +66,7 @@ const RangeSelector = (props) => {
items.push((() => {
const isActive = from && to
return (
- <li key='custom-daterange' class='datepicker-display bt bl b--light-gray pl4 pr3'>
+ <li key='custom-daterange' class='datepicker-display bt b--light-gray pr3'>
<span
class={isActive
? 'pointer dark-green b link dim dib mb2 mr3 pa2 bt bw2 b--dark-green'
@@ -89,11 +90,13 @@ const RangeSelector = (props) => {
<style
dangerouslySetInnerHTML={{
__html: `
+ @media screen and (min-width: 30em) {
.fixed-ranges-start::before {
content: '${__('Last')}';
display: inline-block;
margin-right: 1.5em;
}
+ }
`
}}
/>
",7
"diff --git a/demos/examples/grid/29.html b/demos/examples/grid/29.html }
</style>
<div id=""grid"" style=""width: 100%; height: 350px;""></div>
+<br>
+<button class=""w2ui-btn"" onclick=""style_toggle(2)"">Toggle #2</button>
+<button class=""w2ui-btn"" onclick=""style_toggle(3)"">Toggle #3</button>
+<button class=""w2ui-btn"" onclick=""style_toggle(4)"">Toggle #4</button>
+<button class=""w2ui-btn"" onclick=""style_toggle(5)"">Toggle #5</button>
+<button class=""w2ui-btn"" onclick=""style_toggle(8)"">Toggle #8</button>
+<button class=""w2ui-btn"" onclick=""style_toggle(9)"">Toggle #9</button>
<!--CODE-->
<script>
-$(function () {
- setTimeout( function() {
- w2ui.grid.get(8).w2ui = {
+function style_toggle(recid) {
+ const record = w2ui.grid.get(recid);
+ if(record.w2ui) {
+ delete record.w2ui
+ }
+ else if(recid === 2) {
+ record.w2ui = { style: ""background-color: #C2F5B4"" }
+ }
+ else if(recid === 3) {
+ record.w2ui = { class: ""row"" }
+ }
+ else if(recid === 4) {
+ record.w2ui = { style: { lname: ""background: red;"", email: ""font-weight: bold;"" } }
+ }
+ else if(recid === 5) {
+ record.w2ui = { class: { fname: ""cell1"", sdate: ""cell2"" } }
+ }
+ else if(recid === 8) {
+ record.w2ui = {
style: {
0: 'text-decoration: underline overline;',
1: 'background-color: silver !important; font-weight: bold;',
}
}
- w2ui.grid.get(9).w2ui = {
+ }
+ else if (recid === 9) {
+ record.w2ui = {
class: {
1: 'cell1',
2: 'cell2',
}
}
+ }
w2ui.grid.refresh()
- }, 2000 )
+}
+$(function () {
w2utils.formatters.custom_centered = function(value, params, record) {
if(!value) {
return 'Bad Date!'
@@ -52,6 +79,9 @@ $(function () {
}
$('#grid').w2grid({
name: 'grid',
+ show: {
+ lineNumbers: true,
+ },
columns: [
{ field: 'fname', text: 'First Name', size: '150px', info: true },
{ field: 'lname', text: 'Last Name', size: '150px', render: function(record, index, column_index, value){
@@ -72,8 +102,8 @@ $(function () {
{ recid: 5, fname: ""Kelly"", lname: ""Silver"", email: ""jdoe@gmail.com"", sdate: ""4/3/2012"", comment: 'w2ui: { class: { fname: ""cell1"", sdate: ""cell2"" } }', w2ui: { class: { fname: ""cell1"", sdate: ""cell2"" } } },
{ recid: 6, fname: ""Francis"", lname: ""W2ui"", email: ""jdoe@gmail.com"", sdate: ""4/3/2012"", comment: '""Last Name"" modified by column renderer' },
{ recid: 7, fname: ""Sergei"", lname: ""Rachmaninov"", email: ""jdoe@gmail.com"", sdate: 0, comment: ""not styled"" },
- { recid: 8, fname: ""Mike"", lname: ""Scotty"", email: ""mscotty@gmail.com"", sdate: ""11/11/2022"", comment: ""styled on timer with w2ui.style.column"" },
- { recid: 9, fname: ""Pat"", lname: ""Tobson"", email: ""ptob@gmail.com"", sdate: ""12/12/2012"", comment: ""styled on timer with w2ui.class.column"" },
+ { recid: 8, fname: ""Mike"", lname: ""Scotty"", email: ""mscotty@gmail.com"", sdate: ""11/11/2022"", comment: ""styled on button click with w2ui.style.column #"" },
+ { recid: 9, fname: ""Pat"", lname: ""Tobson"", email: ""ptob@gmail.com"", sdate: ""12/12/2012"", comment: ""styled on button click with w2ui.class.column #"" },
]
});
});
",7
"diff --git a/packages/limit-service/lib/config.js b/packages/limit-service/lib/config.js @@ -23,7 +23,11 @@ module.exports = {
},
customIntegrations: {
currentCountQuery: async (db) => {
- let result = await db.knex('integrations').count('id', {as: 'count'}).whereNotIn('type', ['internal', 'builtin']).first();
+ let result = await db.knex('integrations')
+ .count('id', {as: 'count'})
+ .whereNotIn('type', ['internal', 'builtin'])
+ .first();
+
return result.count;
}
},
",7
"diff --git a/packages/url-utils/lib/url-utils.js b/packages/url-utils/lib/url-utils.js @@ -173,15 +173,16 @@ module.exports = class UrlUtils {
urlPath = urlPath.replace(/\/$/, '');
}
} else if (context === 'admin') {
- urlPath = this.getAdminUrl() || this.getSiteUrl();
+ let adminUrl = this.getAdminUrl() || this.getSiteUrl();
+ let adminPath = '/ghost/';
if (absolute) {
- urlPath += 'ghost/';
+ urlPath = this.urlJoin(adminUrl, adminPath);
} else {
- urlPath = '/ghost/';
+ urlPath = adminPath;
}
} else if (context === 'api') {
- urlPath = this.getAdminUrl() || this.getSiteUrl();
+ let adminUrl = this.getAdminUrl() || this.getSiteUrl();
let apiPath = this._config.baseApiPath + '/';
if (data.type && ['admin', 'content'].includes(data.type)) {
@@ -190,10 +191,13 @@ module.exports = class UrlUtils {
apiPath += this._config.defaultApiType;
}
+ // Ensure we end with a trailing slash
+ apiPath += '/';
+
if (absolute) {
- urlPath = urlPath.replace(/\/$/, '') + apiPath + '/';
+ urlPath = this.urlJoin(adminUrl, apiPath);
} else {
- urlPath = apiPath + '/';
+ urlPath = apiPath;
}
} else if (_.isString(context) && _.indexOf(_.keys(knownPaths), context) !== -1) {
// trying to create a url for a named path
",7
"diff --git a/packages/cli/lib/lib/webpack/render-html-plugin.js b/packages/cli/lib/lib/webpack/render-html-plugin.js @@ -72,7 +72,7 @@ module.exports = function(config) {
pages = result;
}
} catch (error) {
- warn(error.message);
+ warn(`Failed to load prerenderUrls file, using default!\n${error.stack}`);
}
}
",7
"diff --git a/examples/docs/en-US/upload.md b/examples/docs/en-US/upload.md url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
status: 'finished'
}],
- imageUrl: ''
+ fileList2: [{
+ name: 'food.jpeg',
+ url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
+ status: 'finished'
+ }, {
+ name: 'food2.jpeg',
+ url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
+ status: 'finished'
+ }],
+ fileList3: [{
+ name: 'food.jpeg',
+ url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
+ status: 'finished'
+ }, {
+ name: 'food2.jpeg',
+ url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
+ status: 'finished'
+ }],
+ imageUrl: '',
+ dialogImageUrl: '',
+ dialogVisible: false
};
},
methods: {
handlePreview(file) {
console.log(file);
},
+ handlePictureCardPreview(file) {
+ this.dialogImageUrl = file.url;
+ this.dialogVisible = true;
+ },
submitUpload() {
this.$refs.upload.submit();
},
this.$message.error('Avatar picture size can not exceed 2MB!');
}
return isJPG && isLt2M;
+ },
+ handleChange(file, fileList) {
+ this.fileList3 = fileList.slice(-3);
}
}
}
@@ -88,7 +115,7 @@ Upload files by clicking or drag-and-drop
### User avatar upload
-Use beforeUpload hook to limit the upload file format and size.
+Use `before-upload` hook to limit the upload file format and size.
::: demo
```html
@@ -132,25 +159,35 @@ Use beforeUpload hook to limit the upload file format and size.
### Photo Wall
-Use listType to change the fileList style.
+Use `list-type` to change the fileList style.
::: demo
```html
<el-upload
action=""http://localhost:9000/upload""
list-type=""picture-card""
- :on-preview=""handlePreview""
+ :on-preview=""handlePictureCardPreview""
:on-remove=""handleRemove"">
<i class=""el-icon-plus""></i>
</el-upload>
+<el-dialog v-model=""dialogVisible"" size=""tiny"">
+ <img width=""100%"" :src=""dialogImageUrl"" alt="""">
+</el-dialog>
<script>
export default {
+ data() {
+ return {
+ dialogImageUrl: '',
+ dialogVisible: false
+ };
+ },
methods: {
handleRemove(file, fileList) {
console.log(file, fileList);
},
- handlePreview(file) {
- console.log(file);
+ handlePictureCardPreview(file) {
+ this.dialogImageUrl = file.url;
+ this.dialogVisible = true;
}
}
}
@@ -167,7 +204,7 @@ Use listType to change the fileList style.
action=""http://localhost:9000/upload""
:on-preview=""handlePreview""
:on-remove=""handleRemove""
- :file-list=""fileList""
+ :file-list=""fileList2""
list-type=""picture"">
<el-button size=""small"" type=""primary"">Click to upload</el-button>
<div slot=""tip"" class=""el-upload__tip"">jpg/png files with a size less than 500kb</div>
@@ -176,7 +213,7 @@ Use listType to change the fileList style.
export default {
data() {
return {
- fileList: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
+ fileList2: [{name: 'food.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}, {name: 'food2.jpeg', url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100'}]
};
},
methods: {
@@ -192,6 +229,45 @@ Use listType to change the fileList style.
```
:::
+### File list control
+
+Use `on-change` hook function to control upload file list
+
+::: demo
+```html
+<el-upload
+ class=""upload-demo""
+ action=""http://localhost:9000/upload""
+ :on-change=""handleChange""
+ :file-list=""fileList3"">
+ <el-button size=""small"" type=""primary"">Click to upload</el-button>
+ <div slot=""tip"" class=""el-upload__tip"">jpg/png files with a size less than 500kb</div>
+</el-upload>
+<script>
+ export default {
+ data() {
+ return {
+ fileList3: [{
+ name: 'food.jpeg',
+ url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
+ status: 'finished'
+ }, {
+ name: 'food2.jpeg',
+ url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
+ status: 'finished'
+ }]
+ };
+ },
+ methods: {
+ handleChange(file, fileList) {
+ this.fileList3 = fileList.slice(-3);
+ }
+ }
+ }
+</script>
+```
+:::
+
### Drag to upload
You can drag your file to a certain area to upload it.
",7
"diff --git a/packages/theme-default/src/color-picker.css b/packages/theme-default/src/color-picker.css height: 180px;
@descendent white, black {
- cursor: pointer;
position: absolute;
top: 0;
left: 0;
}
@descendent cursor {
- cursor: pointer;
position: absolute;
> div {
",7
"diff --git a/docs/4.0/components/card.md b/docs/4.0/components/card.md @@ -33,14 +33,14 @@ Below is an example of a basic card with mixed content and a fixed width. Cards
Cards support a wide variety of content, including images, text, list groups, links, and more. Below are examples of what's supported.
-### Blocks
+### Body
The building block of a card is the `.card-body`. Use it whenever you need a padded section within a card.
{% example html %}
<div class=""card"">
<div class=""card-body"">
- This is some text within a card block.
+ This is some text within a card body.
</div>
</div>
{% endexample %}
",7
"diff --git a/scss/_functions.scss b/scss/_functions.scss @function theme-color-level($color-name: ""primary"", $level: 0) {
$color: theme-color($color-name);
$color-base: if($level > 0, #000, #fff);
+ $level: abs($level);
- @if $level < 0 {
- // Lighter values need a quick double negative for the Sass math to work
- @return mix($color-base, $color, $level * -1 * $theme-color-interval);
- } @else {
@return mix($color-base, $color, $level * $theme-color-interval);
}
-}
",7
"diff --git a/docs/4.0/utilities/display.md b/docs/4.0/utilities/display.md @@ -35,13 +35,13 @@ The media queries effect screen widths with the given breakpoint *or larger*. Fo
## Examples
{% example html %}
-<div class=""d-inline bg-success"">d-inline</div>
-<div class=""d-inline bg-success"">d-inline</div>
+<div class=""d-inline p-2 bg-primary text-white"">d-inline</div>
+<div class=""d-inline p-2 bg-dark text-white"">d-inline</div>
{% endexample %}
{% example html %}
-<span class=""d-block bg-primary"">d-block</span>
-<span class=""d-block bg-primary"">d-block</span>
+<span class=""d-block p-2 bg-primary text-white"">d-block</span>
+<span class=""d-block p-2 bg-dark text-white"">d-block</span>
{% endexample %}
## Hiding Elements
",7
"diff --git a/build/lint-vars.js b/build/lint-vars.js @@ -44,7 +44,7 @@ function findUnusedVars(dir) {
// Array of all Sass variables
const variables = sassFilesString.match(/(^\$[a-zA-Z0-9_-]+[^:])/gm)
- console.log(`There's a total of ${variables.length} variables.`)
+ console.log(`Found ${variables.length} total variables.`)
// Loop through each variable
variables.forEach((variable) => {
@@ -52,7 +52,7 @@ function findUnusedVars(dir) {
const count = (sassFilesString.match(re) || []).length
if (count === 1) {
- console.log(`Variable ""${variable}"" is only used once!`)
+ console.log(`Variable ""${variable}"" is not being used.`)
unusedVarsFound = true
globalSuccess = false
}
",7
"diff --git a/site/docs/4.1/content/tables.md b/site/docs/4.1/content/tables.md @@ -764,8 +764,10 @@ Across every breakpoint, use `.table-responsive` for horizontally scrolling tabl
Use `.table-responsive{-sm|-md|-lg|-xl}` as needed to create responsive tables up to a particular breakpoint. From that breakpoint and up, the table will behave normally and not scroll horizontally.
-<div class=""bd-example"">
+**These tables may appear broken until their responsive styles apply at specific viewport widths.**
+
{% for bp in site.data.breakpoints %}{% unless bp.breakpoint == ""xs"" %}
+<div class=""bd-example"">
<div class=""table-responsive{{ bp.abbr }}"">
<table class=""table"">
<thead>
@@ -818,15 +820,12 @@ Use `.table-responsive{-sm|-md|-lg|-xl}` as needed to create responsive tables u
</tbody>
</table>
</div>
-{% endunless %}{% endfor %}
</div>
-
{% highlight html %}
-{% for bp in site.data.breakpoints %}{% unless bp.breakpoint == ""xs"" %}
<div class=""table-responsive{{ bp.abbr }}"">
<table class=""table"">
...
</table>
</div>
-{% endunless %}{% endfor %}
{% endhighlight %}
+{% endunless %}{% endfor %}
",7
"diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -7,7 +7,7 @@ defaults: &defaults
default_filters: &default_filters
tags:
- only: '^v.*'
+ only: '/v[0-9]+(\.[0-9]+)*/'
jobs:
install:
@@ -139,3 +139,5 @@ workflows:
- build
filters:
<<: *default_filters
+ branches:
+ ignore: '/.*/'
",8
"diff --git a/pages/search.js b/pages/search.js @@ -77,7 +77,9 @@ class SearchPage extends React.Component {
.filter(([name]) => name !== 'keyword')
.map(([name, values]) => ({
name,
- values: values.filter(v => !query.facets.some(a => a.name === name && a.value === v.value))
+ values: values.filter(v => (
+ v.count !== count && !query.facets.some(a => a.name === name && a.value === v.value)
+ ))
}))
.filter(group => group.values.length > 1)
}
",8
"diff --git a/MaterialSkin/HTML/material/html/js/main.js b/MaterialSkin/HTML/material/html/js/main.js @@ -49,6 +49,9 @@ var app = new Vue({
},
methods: {
swipe(ev, direction) {
+ if (this.$store.state.visibleMenus.size>0) {
+ return;
+ }
if (this.openDialogs.size>1 ||
(this.openDialogs.size==1 && (this.$store.state.page=='now-playing' ||
(!this.openDialogs.has('np-viewer') && !this.openDialogs.has('info-dialog'))))) {
",8
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -46,7 +46,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
<v-btn :title=""trans.cancel"" flat icon class=""toolbar-button"" @click=""clearSelection()""><v-icon>cancel</v-icon></v-btn>
</v-layout>
<v-layout v-else>
- <v-btn flat icon @click=""goHome()"" class=""toolbar-button"" id=""home-button""><v-icon>home</v-icon></v-btn>
+ <v-btn flat icon @click=""homeBtnPressed()"" class=""toolbar-button"" id=""home-button""><v-icon>home</v-icon></v-btn>
<v-btn flat icon @click=""backBtnPressed()"" class=""toolbar-button"" id=""back-button""><v-icon>arrow_back</v-icon></v-btn>
<v-layout row wrap @click=""showHistory($event)"" v-if=""headerSubTitle"" v-bind:class=""{pointer : history.length>1}"">
<v-flex xs12 class=""ellipsis subtoolbar-title subtoolbar-pad"">{{headerTitle}}</v-flex>
@@ -1266,6 +1266,11 @@ var lmsBrowse = Vue.component(""lms-browse"", {
this.fetchingItems = false;
});
},
+ homeBtnPressed() {
+ if (this.$store.state.visibleMenus.size<1) {
+ this.goHome();
+ }
+ },
goHome() {
if (this.fetchingItems) {
//if (lmsListSource) {
@@ -1314,8 +1319,10 @@ var lmsBrowse = Vue.component(""lms-browse"", {
}
},
backBtnPressed() {
+ if (this.$store.state.visibleMenus.size<1) {
this.lastBackBtnPress = new Date();
this.goBack();
+ }
},
goBack(refresh) {
if (this.fetchingItems) {
",8
"diff --git a/MaterialSkin/HTML/material/html/js/nowplaying-page.js b/MaterialSkin/HTML/material/html/js/nowplaying-page.js @@ -1108,6 +1108,9 @@ var lmsNowPlaying = Vue.component(""lms-now-playing"", {
}
},
touchStart(event) {
+ if (event.srcElement.classList.contains(""np-title"") || event.srcElement.classList.contains(""np-text"") || event.srcElement.classList.contains(""np-text-landscape"")) {
+ return;
+ }
if (this.$store.state.swipeVolume && !this.menu.show && event.touches && event.touches.length>0 && this.playerStatus.dvc) {
this.touch={x:event.touches[0].clientX, y:event.touches[0].clientY, moving:false};
this.lastSentVolume=-1;
",8
"diff --git a/MaterialSkin/HTML/material/html/js/browse-functions.js b/MaterialSkin/HTML/material/html/js/browse-functions.js @@ -674,7 +674,9 @@ function browseItemAction(view, act, item, index, event) {
if (item.presetParams && item.presetParams.favorites_url) {
favUrl = item.presetParams.favorites_url;
favIcon = item.presetParams.icon;
+ if (SECTION_PODCASTS!=item.section) {
favType = item.presetParams.favorites_type;
+ }
if (item.presetParams.favorites_title) {
favTitle = item.presetParams.favorites_title;
}
",8
"diff --git a/MaterialSkin/HTML/material/html/js/server.js b/MaterialSkin/HTML/material/html/js/server.js @@ -496,13 +496,21 @@ var lmsServer = Vue.component('lms-server', {
player.model = this.$store.state.player.model;
this.isPlaying = player.isplaying;
} else {
+ let found = false;
for (var i=0, len=this.$store.state.players.length; i<len; ++i) {
if (this.$store.state.players[i].id == playerId) {
player.isgroup = this.$store.state.players[i].isgroup;
player.icon = this.$store.state.players[i].icon;
player.link = this.$store.state.players[i].link;
player.model = this.$store.state.players[i].model;
+ found = true;
+ break;
+ }
}
+ // Ignore status for players that we don't know about. When deleting a group player in 'Manage players' we get
+ // a status message for this removed player, whcich causes it to be re-added...
+ if (!found) {
+ return;
}
}
",8
"diff --git a/js/tabs.js b/js/tabs.js // element so that tabs can be added/removed/hidden/shown without needing to change event bindings.
this.tablist
.on('mousedown.tabs', '> li', function(e) {
+ // let right click pass through
+ if (e.which !== 3) {
return self.handleTabClick(e, $(this));
+ }
})
.on('click.tabs', 'a', routeAnchorClick)
.on('click.tabs', '.icon', handleIconClick)
",8
"diff --git a/components/datepicker/datepicker.js b/components/datepicker/datepicker.js @@ -1494,7 +1494,7 @@ DatePicker.prototype = {
if ((new Date(year, month, dayCnt))
.setHours(tHours, tMinutes, tSeconds, 0) === elementDate
- .setHours(tHours, tMinutes, tSeconds, 0)) {
+ .setHours(tHours, tMinutes, tSeconds, 0)) { //eslint-disable-line
th.addClass(`is-selected${(s.range.useRange ? ' range' : '')}`).attr('aria-selected', 'true');
}
}
",8
"diff --git a/test/components/popupmenu/popupmenu.e2e-spec.js b/test/components/popupmenu/popupmenu.e2e-spec.js @@ -48,7 +48,7 @@ describe('Popupmenu example-selectable tests', () => {
});
if (utils.isChrome() && utils.isCI()) {
- it('Should not visual regress on example-selectable', async () => {
+ xit('Should not visual regress on example-selectable', async () => {
const popupmenuSection = await element(by.id('maincontent'));
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(popupmenuSection), config.waitsFor);
",8
"diff --git a/test/components/applicationmenu/applicationmenu.e2e-spec.js b/test/components/applicationmenu/applicationmenu.e2e-spec.js @@ -133,9 +133,9 @@ describe('Applicationmenu accordion truncated text tooltip tests', () => {
});
});
-describe('Applicationmenu Personalization tests', () => {
+fdescribe('Applicationmenu Personalization tests', () => {
beforeEach(async () => {
- await utils.setPage('/components/applicationmenu/example-personalized?colors=7025B6');
+ await utils.setPage('/components/applicationmenu/example-personalized.html?colors=7025B6');
await browser.driver.sleep(config.sleepLonger);
});
",8
"diff --git a/test/components/applicationmenu/applicationmenu.e2e-spec.js b/test/components/applicationmenu/applicationmenu.e2e-spec.js @@ -148,7 +148,7 @@ describe('Applicationmenu Personalization tests', () => {
});
if (utils.isChrome() && utils.isCI()) {
- fit('Should not visual regress on personalize', async () => {
+ xit('Should not visual regress on personalize', async () => {
const windowSize = await browser.driver.manage().window().getSize();
await browser.driver.manage().window().setSize(1280, 720);
const section = await element(by.css('body.no-scroll'));
",8
"diff --git a/test/components/locale/locale.func-spec.js b/test/components/locale/locale.func-spec.js @@ -900,7 +900,7 @@ describe('Locale API', () => {
expect(Locale.formatDate('00000000')).toEqual('');
});
- it('Should format dates with short timezones', () => {
+ xit('Should format dates with short timezones', () => {
Locale.set('en-US');
expect(['3/22/2018 8:11 PM EST', '3/22/2018 8:11 PM EDT']).toContain(Locale.formatDate(new Date(2018, 2, 22, 20, 11, 12), { date: 'timezone' }));
",8
"diff --git a/gulpfile.js b/gulpfile.js @@ -19,6 +19,7 @@ const defaultAutoRestVersion = '1.2.2';
var usingAutoRestVersion;
const specRoot = args['spec-root'] || ""https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/specification"";
const project = args['project'];
+const use = args['use'];
var language = 'Azure.NodeJS';
var modeler = 'Swagger';
const regexForExcludedServices = /\/(intune|documentdbManagement|insightsManagement|insights|search)\//i;
@@ -89,13 +90,14 @@ function generateProject(projectObj, specRoot, autoRestVersion) {
}
let packageName = projectObj.packageName;
console.log(`\n>>>>>>>>>>>>>>>>>>>Start: ""${packageName}"" >>>>>>>>>>>>>>>>>>>>>>>>>`);
- let outputDir = `lib/services/${projectObj.dir}`;
+ let outputDir = `${__dirname}/lib/services/${projectObj.dir}`;
let cmd = 'autorest';
if (projectObj.batchGeneration) {
- cmd += `--nodejs-sdks-folder=${__dirname}/${outputDir} --package-name=${packageName} --nodejs --license-header=MICROSOFT_MIT_NO_VERSION`;
+ cmd += ` --nodejs-sdks-folder=${outputDir}`;
} else {
- cmd += `--nodejs.output-folder=${__dirname}/${outputDir} --package-name=${packageName} --nodejs --license-header=MICROSOFT_MIT_NO_VERSION`;
+ cmd += ` --nodejs.output-folder=${outputDir}`;
}
+ cmd += ` --package-name=${packageName} --nodejs --license-header=MICROSOFT_MIT_NO_VERSION`;
// if using azure template, pass in azure-arm argument. otherwise, get the generic template by not passing in anything.
if (language === azureTemplate) cmd += ' --azure-arm ';
@@ -106,11 +108,15 @@ function generateProject(projectObj, specRoot, autoRestVersion) {
cmd += ` ${specPath}`;
}
+ if (use) {
+ cmd += ` --use=${use}`;
+ }
+
if (projectObj.ft !== null && projectObj.ft !== undefined) cmd += ' --payload-flattening-threshold=' + projectObj.ft;
if (projectObj.clientName !== null && projectObj.clientName !== undefined) cmd += ' --override-client-name=' + projectObj.clientName;
if (projectObj.tag !== null && projectObj.tag !== undefined) cmd += `--tag=${projectObj.tag}`;
if (projectObj.args !== undefined) {
- cmd = cmd + ' ' + args;
+ cmd += ` ${args}`;
}
try {
@@ -188,9 +194,11 @@ function codegen(projectObj, index) {
}
gulp.task('default', function () {
- console.log(""Usage: gulp codegen [--spec-root <swagger specs root>] [--project <project name>]\n"");
+ console.log(""Usage: gulp codegen [--spec-root <swagger specs root>] [--use <autorest.nodejs root> [--project <project name>]\n"");
console.log(""--spec-root"");
- console.log(""\tRoot location of Swagger API specs, default value is \""https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master\"""");
+ console.log(""\tRoot location of Swagger API specs, default value is \""https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/specification"");
+ console.log(""--use"");
+ console.log(""\tRoot location of autorest.nodejs repository. If this is not specified, then the latest install generator for NodeJS will be used."");
console.log(""--project\n\tProject to regenerate, default is all. List of available project names:"");
Object.keys(mappings).forEach(function (i) {
console.log('\t' + i.magenta);
@@ -305,7 +313,7 @@ gulp.task('sync-mappings-with-repo', (cb) => {
const dirs = fs.readdirSync(specRoot).filter(f => fs.statSync(`${specRoot}/${f}`).isDirectory());
let newlyAdded = [];
let originalProjectCount = Object.keys(mappings).length;
- const resourceProvidersToIgnore = ['common-types', 'intune', 'azsadmin', 'timeseriesinsights'];
+ const resourceProvidersToIgnore = ['azsadmin', 'common-types', 'databricks', 'intune', 'timeseriesinsights'];
const resourceProviderDataPlanesToIgnore = ['applicationinsights', 'operationalinsights'];
for (let rp of dirs) {
if (resourceProvidersToIgnore.indexOf(rp.toLowerCase()) === -1) {
",8
"diff --git a/src/wmr-middleware.js b/src/wmr-middleware.js @@ -13,14 +13,16 @@ import { compileSingleModule } from './lib/compile-single-module.js';
* @param {object} [options]
* @param {string} [options.cwd]
* @param {string} [options.out = '.dist']
+ * @param {string} [options.distDir] if set, ignores watch events within this directory
* @param {boolean} [options.sourcemap]
* @param {boolean} [options.profile] Enable bundler performance profiling
* @param {(error: Error & { clientMessage?: string })=>void} [options.onError]
* @param {(event: { changes: string[], duration: number })=>void} [options.onChange]
* @returns {import('polka').Middleware}
*/
-export default function wmrMiddleware({ cwd, out = '.dist', onError, onChange } = {}) {
+export default function wmrMiddleware({ cwd, out = '.dist', distDir = 'dist', onError, onChange } = {}) {
cwd = resolve(process.cwd(), cwd || '.');
+ distDir = resolve(dirname(out), distDir);
let useFsEvents = false;
try {
@@ -31,7 +33,7 @@ export default function wmrMiddleware({ cwd, out = '.dist', onError, onChange }
const watcher = chokidar.watch(cwd, {
cwd,
disableGlobbing: true,
- ignored: /(^|[/\\])node_modules[/\\]/,
+ ignored: [/(^|[/\\])(node_modules|\.git|\.DS_Store)([/\\]|$)/, resolve(cwd, out), resolve(cwd, distDir)],
useFsEvents
});
const pendingChanges = new Set();
",8
"diff --git a/packages/wmr/test/test-helpers.js b/packages/wmr/test/test-helpers.js @@ -140,6 +140,17 @@ const stripColors = str => str.replace(/\x1b\[(?:[0-9]{1,3}(?:;[0-9]{1,3})*)?[m|
*/
export const wait = ms => new Promise(r => setTimeout(r, ms));
+/**
+ * Pupppeteer often throws when the pages is navigated and we try
+ * to assert something. Ignore any errors when that happens.
+ * See: https://github.com/boxine/pentf/blob/c046f5275ae7201a427b9dc30965d633855bb3be/src/utils.js#L259
+ * @param {Error} err
+ * @returns {boolean}
+ */
+function ignoreError(err) {
+ return /Execution context was destroyed|(Session|Connection|Target) closed/.test(err.message);
+}
+
/**
* @param {() => boolean | Promise<boolean>} fn
* @param {number} timeout
@@ -149,8 +160,14 @@ export async function waitFor(fn, timeout = 2000) {
const start = Date.now();
while (start + timeout >= Date.now()) {
+ try {
const result = await fn();
if (result) return true;
+ } catch (err) {
+ if (!ignoreError(err)) {
+ throw err;
+ }
+ }
// Wait a little before the next iteration
await wait(10);
",8
"diff --git a/packages/wmr/test/boot.test.js b/packages/wmr/test/boot.test.js @@ -46,7 +46,9 @@ describe('boot', () => {
await waitForMessage(instance.output, /Wrote/);
- const files = (await fs.readdir(env.tmp.path)).filter(file => !file.startsWith('.env') && file !== 'wmr-main.mjs');
+ const files = (await fs.readdir(env.tmp.path)).filter(
+ file => !file.startsWith('.env') && !file.includes('node_modules')
+ );
expect(files).toEqual(['dist', 'public']);
const dist = await fs.readdir(path.join(env.tmp.path, 'dist'));
",8
"diff --git a/src/components/layout/NpmDownloadCount.js b/src/components/layout/NpmDownloadCount.js @@ -54,6 +54,7 @@ const NpmDownloadCount = ({ loading, npmDownloads, ...props }) => {
status=""secondary""
countLink={url.npm}
loading={loading}
+ className=""chromatic-ignore""
{...props}
/>
);
",8
"diff --git a/src/components/screens/IndexScreen/Share/Player.js b/src/components/screens/IndexScreen/Share/Player.js @@ -127,6 +127,7 @@ export const Player = ({ x, y, type, delay, count }) => (
transition={{ type: 'pop', delay, duration: 0.4 }}
>
<Wave
+ data-chromatic=""ignore""
color={type}
size=""big""
style={{ x: '-50%', y: '-50%' }}
@@ -137,6 +138,7 @@ export const Player = ({ x, y, type, delay, count }) => (
transition={transition(delay, count)}
/>
<Wave
+ data-chromatic=""ignore""
color={type}
size=""medium""
style={{ x: '-50%', y: '-50%' }}
@@ -147,6 +149,7 @@ export const Player = ({ x, y, type, delay, count }) => (
transition={transition(delay, count)}
/>
<Wave
+ data-chromatic=""ignore""
color={type}
size=""small""
style={{ x: '-50%', y: '-50%' }}
",8
"diff --git a/src/lib/mina_state/local_state.ml b/src/lib/mina_state/local_state.ml @@ -88,7 +88,7 @@ let to_input
; excess
; ledger
; success
- ; failure_status
+ ; failure_status = _
} :
t) =
let open Random_oracle.Input in
@@ -100,7 +100,6 @@ let to_input
; Amount.to_input excess
; Ledger_hash.to_input ledger
; bitstring [ success ]
- ; Transaction_status.Failure.option_to_input failure_status
|]
module Checked = struct
",8
"diff --git a/src/app/rosetta/lib/network.ml b/src/app/rosetta/lib/network.ml @@ -387,7 +387,8 @@ end
module Options = struct
module Impl (M : Monad_fail.S) = struct
- let handle (network : Network_request.t) =
+ (* Currently, mainnet, testnet, devnet etc don't affect Rosetta options *)
+ let handle (_network : Network_request.t) =
M.return @@
{ Network_options_response.version=
Version.create ""1.4.9"" ""v1.0""
",8
"diff --git a/src/lib/ledger_catchup/super_catchup.ml b/src/lib/ledger_catchup/super_catchup.ml @@ -945,6 +945,12 @@ let setup_state_machine_runner ~t ~verifier ~downloader ~logger
step (Deferred.map ~f:Result.return s)
with
| Error e ->
+ (* TODO consider rejecting the callback in some cases,
+ see https://github.com/MinaProtocol/mina/issues/11087 *)
+ Option.value_map valid_cb ~default:ignore
+ ~f:
+ Mina_net2.Validation_callback.fire_if_not_already_fired
+ `Ignore ;
ignore
( Cached.invalidate_with_failure c
: Mina_block.almost_valid_block Envelope.Incoming.t ) ;
",8
"diff --git a/src/lib/snarky_js_bindings/lib/snarky_js_bindings_lib.ml b/src/lib/snarky_js_bindings/lib/snarky_js_bindings_lib.ml @@ -30,7 +30,7 @@ let log_and_raise_error_with_message ~exn ~msg =
(Core_kernel.Exn.to_string exn)
stack
in
- raise_error msg
+ ignore (raise_error msg)
class type field_class =
object
",8
"diff --git a/src/lib/transaction_snark_scan_state/transaction_snark_scan_state.ml b/src/lib/transaction_snark_scan_state/transaction_snark_scan_state.ml @@ -372,7 +372,7 @@ struct
(*TODO: fold over the pending_coinbase tree and validate the statements?*)
let scan_statement ~constraint_constants
- ({ scan_state = tree; previous_incomplete_zkapp_updates } : t)
+ ({ scan_state = tree; previous_incomplete_zkapp_updates = _ } : t)
~statement_check ~verifier :
( Transaction_snark.Statement.t
, [ `Error of Error.t | `Empty ] )
@@ -514,11 +514,7 @@ struct
check_base (acc_statement, acc_pc) transaction
in
let%bind.Deferred res =
- let%bind previous_zkapp_updates =
- Deferred.Or_error.List.fold ~init:(None, None)
- previous_incomplete_zkapp_updates ~f:check_base
- in
- Fold.fold_chronological_until tree ~init:previous_zkapp_updates
+ Fold.fold_chronological_until tree ~init:(None, None)
~f_merge:(fun acc (_weight, job) ->
let open Container.Continue_or_stop in
match%map.Deferred fold_step_a acc job with
",8
"diff --git a/package.json b/package.json ""prettier-master"": ""prettier --write $(git diff master --name-only | grep -E '.js$')"",
""prettier-head"": ""prettier --write $(git diff HEAD --name-only | grep -E '.js$')"",
""lint"": ""prettier --check {__tests__,fixtures,models,one_shot_scripts,public,routes,serverjs,src,views}'/**/*.js' && eslint app.js models public/js routes serverjs src"",
- ""nodemon"": ""nodemon --ignore src --ignore public"",
+ ""nodemon"": ""nodemon --ignore src --ignore public --ignore private --ignore dist/pages --ignore __tests__"",
""webpack-dev-server"": ""webpack-dev-server --config webpack.dev.js"",
""build"": ""webpack --mode production --config webpack.prod.js --progress"",
- ""start"": ""nodemon --ignore src --ignore public --ignore dist/pages & webpack-dev-server --config webpack.dev.js & webpack --mode development --config webpack.server.js --watch"",
+ ""start"": ""npm run nodemon & webpack-dev-server --config webpack.dev.js & webpack --mode development --config webpack.server.js --watch"",
""test"": ""jest --silent --detectOpenHandles --coverage"",
""setup"": ""webpack --mode development --config webpack.server.js --progress && node --max-old-space-size=4096 force_update.js""
},
",8
"diff --git a/src/utils/Sort.js b/src/utils/Sort.js @@ -716,8 +716,8 @@ export function cardGetLabels(card, sort) {
}
if (sort === 'Legality') {
return Object.entries(card.details.legalities)
- .filter(([k, v]) => ['legal', 'banned'].includes(v))
- .map(([k, v]) => k);
+ .filter(([k, v]) => ['legal', 'banned'].includes(v)) // eslint-disable-line no-unused-vars
+ .map(([k, v]) => k); // eslint-disable-line no-unused-vars
}
if (sort === 'Power') {
if (card.details.power) {
@@ -875,7 +875,7 @@ export function sortDeep(cards, ...sorts) {
export function countGroup(group) {
if (Array.isArray(group[0])) {
- const counts = group.map(([label, group2]) => countGroup(group2));
+ const counts = group.map(([label, group2]) => countGroup(group2)); // eslint-disable-line no-unused-vars
return counts.reduce((a, b) => a + b, 0);
}
return group.length;
",8
"diff --git a/__tests__/routes/cube/download.test.js b/__tests__/routes/cube/download.test.js @@ -79,10 +79,43 @@ test('MTGO download', () => {
});
test('csv download', () => {
- const headerLine =
- 'Name,CMC,Type,Color,Set,Collector Number,Rarity,Color Category,Status,Finish,Maybeboard,Image URL,Image Back URL,Tags,Notes,MTGO ID';
- const faerieGuidemotherLine =
- '""Faerie Guidemother"",1,""Creature - Faerie"",W,""eld"",""11"",common,w,Not Owned,Non-foil,false,,,""New"","""",78110';
+ const headerFields = [
+ 'Name',
+ 'CMC',
+ 'Type',
+ 'Color',
+ 'Set',
+ 'Collector Number',
+ 'Rarity',
+ 'Color Category',
+ 'Status',
+ 'Finish',
+ 'Maybeboard',
+ 'Image URL',
+ 'Image Back URL',
+ 'Tags',
+ 'Notes',
+ 'MTGO ID',
+ ];
+
+ const faerieGuidemotherData = {
+ Name: 'Faerie Guidemother',
+ CMC: '1',
+ Type: 'Creature - Faerie',
+ Color: 'W',
+ Set: 'eld',
+ 'Collector Number': '11',
+ Rarity: 'common',
+ 'Color Category': 'w',
+ Status: 'Not Owned',
+ Finish: 'Non-foil',
+ Maybeboard: 'false',
+ 'Image URL': '',
+ 'Image Back URL': '',
+ Tags: 'New',
+ Notes: '',
+ 'MTGO ID': '78110',
+ };
return request(app)
.get('/csv/' + cubeID)
@@ -90,15 +123,12 @@ test('csv download', () => {
.expect('Content-Type', 'text/plain')
.expect('Content-disposition', 'attachment; filename=' + sanitizedCubeName + '.csv')
.expect((res) => {
- // Verify CSV format is valid
const parsed = Papa.parse(res.text.trim(), { header: true });
expect(parsed.errors).toEqual([]);
- const lines = splitText(res.text);
- expect(lines[0]).toEqual(headerLine);
- expect(lines[1]).toEqual(faerieGuidemotherLine);
- // Extra line expected for header
- expect(lines.length).toEqual(exampleCube.cards.length + 1);
+ expect(parsed.meta.fields.sort()).toEqual(headerFields.sort());
+ expect(parsed.data[0]).toEqual(faerieGuidemotherData);
+ expect(parsed.data.length).toEqual(exampleCube.cards.length);
});
});
",8
"diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js @@ -26,7 +26,18 @@ module.exports = (resolve, rootDir, isEjecting) => {
setupFiles: [resolve('config/polyfills.js')],
setupTestFrameworkScriptFile: setupTestsFile,
testPathIgnorePatterns: [
- '<rootDir>[/\\\\](build|docs|node_modules|scripts)[/\\\\]',
+ // Ignore the following directories:
+ // build
+ // - the build output directory
+ // .cache
+ // - the yarn module cache on Ubuntu if $HOME === rootDir
+ // docs
+ // - often used to publish to Github Pages
+ // node_modules
+ // - ignore tests in dependencies
+ // scripts
+ // - directory generated upon eject
+ '<rootDir>[/\\\\](build|\\.cache|docs|node_modules|scripts)[/\\\\]',
],
testEnvironment: 'node',
testURL: 'http://localhost',
",8
"diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js @@ -748,7 +748,6 @@ function isSafeToCreateProjectIn(root, name) {
'.idea',
'README.md',
'LICENSE',
- 'web.iml',
'.hg',
'.hgignore',
'.hgcheck',
@@ -764,6 +763,8 @@ function isSafeToCreateProjectIn(root, name) {
const conflicts = fs
.readdirSync(root)
.filter(file => !validFiles.includes(file))
+ // IntelliJ IDEA creates module files before CRA is launched
+ .filter(file => !/\.iml$/.test(file))
// Don't treat log files from previous installation as conflicts
.filter(
file => !errorLogFilePatterns.some(pattern => file.indexOf(pattern) === 0)
",8
"diff --git a/jest.config.js b/jest.config.js @@ -29,7 +29,10 @@ module.exports = {
// An array of regexp pattern strings used to skip coverage collection
coveragePathIgnorePatterns: [
'<rootDir>/node_modules',
- '<rootDir>/pages/_*.js', // Ignore Next.js files
+ // Ignore Next.js files
+ '<rootDir>/pages/_*.js',
+ '<rootDir>/components/head.js',
+ '<rootDir>/components/nav.js',
],
// A list of reporter names that Jest uses when writing coverage reports
",8
"diff --git a/jest.config.js b/jest.config.js @@ -29,6 +29,7 @@ module.exports = {
// An array of regexp pattern strings used to skip coverage collection
coveragePathIgnorePatterns: [
'<rootDir>/node_modules',
+ '<rootDir>/common/config',
// Ignore Next.js files
'<rootDir>/pages/_*.js',
'<rootDir>/components/head.js',
",8
"diff --git a/jest.config.js b/jest.config.js @@ -34,6 +34,9 @@ module.exports = {
'<rootDir>/common/constants',
'<rootDir>/test-utils',
+ // No real logic to test here
+ '<rootDir>/common/utils/api-utils.js',
+
// Ignore Next.js files
'<rootDir>/components/head.js',
'<rootDir>/components/nav.js',
",8
"diff --git a/jest.config.js b/jest.config.js @@ -33,6 +33,7 @@ module.exports = {
'<rootDir>/common/styles',
'<rootDir>/common/constants',
'<rootDir>/scripts',
+ '<rootDir>/test-utils',
// No real logic to test here
'<rootDir>/common/utils/api-utils.js',
",8
"diff --git a/jest.config.js b/jest.config.js @@ -35,6 +35,10 @@ module.exports = {
'<rootDir>/scripts',
'<rootDir>/test-utils',
+ // import/export mappers
+ '<rootDir>/components/**/index.js',
+ '<rootDir>/common/**/index.js',
+
// No real logic to test here
'<rootDir>/common/utils/api-utils.js',
'<rootDir>/components/FAQ/questions.js',
",8
"diff --git a/jest.config.js b/jest.config.js @@ -21,7 +21,12 @@ module.exports = {
// collectCoverage: true,
// An array of glob patterns indicating a set of files for which coverage information should be collected
- collectCoverageFrom: ['<rootDir>/common/**/*.js', '<rootDir>/components/**/*.js'],
+ collectCoverageFrom: [
+ '<rootDir>/common/**/*.js',
+ '<rootDir>/components/**/*.js',
+ '!<rootDir>/common/**/index.js',
+ '!<rootDir>/components/**/index.js',
+ ],
// The directory where Jest should output its coverage files
coverageDirectory: '<rootDir>/coverage',
@@ -35,10 +40,6 @@ module.exports = {
'<rootDir>/scripts',
'<rootDir>/test-utils',
- // import/export mappers
- '<rootDir>/components/**/index.js',
- '<rootDir>/common/**/index.js',
-
// No real logic to test here
'<rootDir>/common/utils/api-utils.js',
'<rootDir>/components/FAQ/questions.js',
",8
"diff --git a/jest.config.js b/jest.config.js @@ -47,6 +47,10 @@ module.exports = {
'<rootDir>/components/FAQ/questions.js',
'<rootDir>/components/ZipRecruiterJobs/ZipRecruiterJobs.js',
'<rootDir>/components/Press/PressLinks/Articles.js',
+ '<rootDir>/store/store',
+ '<rootDir>/store/initialState',
+ '<rootDir>/store/**/types',
+ '<rootDir>/store/**/actions',
// Ignore Next.js files
'<rootDir>/components/head.js',
",8
"diff --git a/jest.config.js b/jest.config.js @@ -41,6 +41,7 @@ module.exports = {
// No real logic to test here
'<rootDir>/common/utils/api-utils.js',
+ '<rootDir>/common/utils/cookie-utils.js',
'<rootDir>/components/FAQ/questions.js',
'<rootDir>/components/ZipRecruiterJobs/ZipRecruiterJobs.js',
'<rootDir>/components/Press/PressLinks/Articles.js',
",8
"diff --git a/.mergify.yml b/.mergify.yml @@ -2,6 +2,7 @@ pull_request_rules:
- name: Auto-merge successful Dependabot upgrades
conditions:
- author=dependabot-preview[bot]
+ - ""#changes-requested-reviews-by=0""
- status-success=now
- status-success=deploy/netlify
- ""status-success=ci/circleci: build_and_test""
",8
"diff --git a/pages/search.js b/pages/search.js @@ -139,13 +139,25 @@ class SearchPage extends React.Component {
getQueryFacets = () => {
const {router: {query}} = this.props
- return Object
- .entries(query)
- .filter(([name]) => facetTypes.includes(name))
- .map(([name, value]) => ({
+ const facets = []
+
+ for (const [name, value] of Object.entries(query)) {
+ if (facetTypes.includes(name)) {
+ if (Array.isArray(value)) {
+ facets.push(...value.map(v => ({
+ name,
+ value: v
+ })))
+ } else {
+ facets.push({
name,
value
- }))
+ })
+ }
+ }
+ }
+
+ return facets
}
toggleFacets = () => {
",9
"diff --git a/MaterialSkin/HTML/material/js/browse-resp.js b/MaterialSkin/HTML/material/js/browse-resp.js @@ -258,7 +258,24 @@ function parseBrowseResp(data, parent, artistImages) {
} else if (data.result.loop_loop) {
var topLevelFavourites = parent.id===undefined && ""favorites""===parent.type;
data.result.loop_loop.forEach(i => {
- if (i.hasitems>0) {
+ if (""text""===i.type || ""textarea""===i.type) {
+ resp.items.push({
+ title: i.name ? i.name : i.title,
+ type: ""text"",
+ id: i.id
+ });
+ } else if (""search""===i.type) {
+ resp.items.push({
+ title: i.name,
+ command: [i.cmd ? i.cmd : parent.command[0], ""items""],
+ image: resolveImage(i.icon, i.image),
+ icon: ""search"",
+ params: [""want_url:1"", ""item_id:""+i.id, ""search:""+TERM_PLACEHOLDER],
+ type: ""xmlsearch"", // Hack, so that we don't think this is library search...
+ url: parent.url+i.cmd+i.id,
+ app: parent.app
+ });
+ } else if (i.hasitems>0) {
resp.items.push({
title: i.name,
command: parent.command,
@@ -288,23 +305,6 @@ function parseBrowseResp(data, parent, artistImages) {
app: parent.app,
id: i.id
});
- } else if (""text""===i.type) {
- resp.items.push({
- title: i.name ? i.name : i.title,
- type: ""text"",
- id: i.id
- });
- } else if (""search""===i.type) {
- resp.items.push({
- title: i.name,
- command: [i.cmd ? i.cmd : parent.command[0], ""items""],
- image: resolveImage(i.icon, i.image),
- icon: ""search"",
- params: [""want_url:1"", ""item_id:""+i.id, ""search:""+TERM_PLACEHOLDER],
- type: ""xmlsearch"", // Hack, so that we don't think this is library search...
- url: parent.url+i.cmd+i.id,
- app: parent.app
- });
}
});
",9
"diff --git a/MaterialSkin/HTML/material/html/js/store.js b/MaterialSkin/HTML/material/html/js/store.js @@ -113,9 +113,9 @@ function updateUiSettings(state, val) {
}
function convertGridConfigItem(val) {
- if ('true'==val) {
+ if ('true'==val || true==val) {
return 'always';
- } else if ('false'==val) {
+ } else if ('false'==val || false==val) {
return 'never';
}
return val;
",9
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -250,6 +250,9 @@ function parseBrowseResp(data, parent, options, idStart, cacheKey) {
} else if (i.presetParams.icon==""html/images/radio.png"") {
i.svg=""radio-tower"";
i.image=undefined;
+ } else if (i['icon-id']==""html/images/favorites.png"") {
+ i.icon=""favorite"";
+ i.image=undefined;
}
} else if (i['icon-id']==""html/images/favorites.png"") {
i.icon=""favorite"";
",9
"diff --git a/MaterialSkin/HTML/material/html/js/server.js b/MaterialSkin/HTML/material/html/js/server.js @@ -127,6 +127,10 @@ async function lmsListFragment(playerid, command, params, start, fagmentSize, ba
} else {
return lmsListFragment(playerid, command, params, start+fagmentSize, fagmentSize, batchSize, accumulated);
}
+ } else {
+ return new Promise(function(resolve, reject) {
+ resolve({data:accumulated});
+ });
}
});
}
",9
"diff --git a/MaterialSkin/HTML/material/html/js/manage-players.js b/MaterialSkin/HTML/material/html/js/manage-players.js @@ -265,6 +265,20 @@ Vue.component('lms-manage-players', {
}
}
}.bind(this));
+
+ bus.$on('playerIconSet', function(playerId, icon) {
+ if (playerId==this.playerId) {
+ this.playerIcon = icon;
+ }
+ for (var i=0, len=this.players.length; i<len; ++i) {
+ if (this.players[i].id==playerId) {
+ let p = his.players[i];
+ p.icon = icon;
+ this.$set(this.players, i, p);
+ break;
+ }
+ }
+ }.bind(this));
},
methods: {
initItems() {
",9
"diff --git a/MaterialSkin/HTML/material/html/js/iframe-dialog.js b/MaterialSkin/HTML/material/html/js/iframe-dialog.js @@ -262,19 +262,35 @@ function hideClassicSkinElems(page, textCol) {
if (undefined!=statusarea) {
var rescanWarning = content.getElementById('rescanWarning');
var restartWarning = content.getElementById('restartWarning');
+ var msg = undefined;
+ var href = undefined;
+ var doBtn = undefined;
if (undefined!=rescanWarning || undefined!=restartWarning) {
var elem = undefined!=rescanWarning ? rescanWarning : restartWarning;
var parts = elem.innerHTML.split(""<a"");
if (parts.length>1) {
- var href = undefined!=elem.firstElementChild ? elem.firstElementChild.href : undefined;
+ href = undefined!=elem.firstElementChild ? elem.firstElementChild.href : undefined;
+ msg = parts[0];
+ doBtn = undefined!=rescanWarning ? i18n(""Rescan"") : i18n(""Restart"");
+ }
+ } else if (undefined!=content.querySelector('[name=""checkForUpdateNow""]')) { // Handle new LMS version...
+ var parts = statusarea.innerHTML.split(""<a"");
+ if (2==parts.length) {
+ href = undefined!=statusarea.firstElementChild ? statusarea.firstElementChild.href : undefined;
+ msg = parts[0];
if (undefined!=href) {
- confirm(parts[0], undefined!=rescanWarning ? i18n(""Rescan"") : i18n(""Restart"")).then(res => {
+ doBtn = i18n(""Download"");
+ }
+ }
+ }
+
+ if (undefined!=msg && undefined!=href && undefined!=doBtn) {
+ confirm(msg, doBtn).then(res => {
bus.$emit('iframe-href', href, false);
});
return;
}
- }
- }
+
var msg = statusarea.innerText;
if (msg!=undefined && msg.length>0) {
bus.$emit('showMessage', msg);
",9
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -84,7 +84,7 @@ function parseBrowseResp(data, parent, options, cacheKey, parentCommand, parentG
var maybeAllowGrid = command!=""trackstat""; // && !isFavorites; // && command!=""playhistory"";
var numImages = 0;
- resp.isMusicMix = (command == ""musicsimilarity"" || command == ""musicip"") && data.params[1].length>0 && (data.params[1][1]==""mix"" || data.params[1][1]==""list"");
+ resp.isMusicMix = (command == ""musicsimilarity"" || command == ""musicip"" || command == ""blissmixer"") && data.params[1].length>0 && (data.params[1][1]==""mix"" || data.params[1][1]==""list"");
resp.canUseGrid = maybeAllowGrid && (isRadiosTop || isBmf || (data.result.window && data.result.window.windowStyle && (data.result.window.windowStyle==""icon_list"" || data.result.window.windowStyle==""home_menu""))) ? true : false;
resp.canDrop = isFavorites;
",9
"diff --git a/MaterialSkin/HTML/material/html/js/player-settings-plugin.js b/MaterialSkin/HTML/material/html/js/player-settings-plugin.js @@ -38,6 +38,7 @@ Vue.component('lms-player-settings-plugin', {
<text-field :focus=""index==0 && !IS_MOBILE"" :title=""item.title"" :type=""item.type"" @value=""entry(item, $event)""></text-field>
</v-list-tile-content>
</v-list-tile>
+ <v-list-tile v-else-if=""item.type=='html' || item.type=='text'"" class=""lms-list-item browse-html"" v-html=""item.title""></v-list-tile>
<v-list-tile v-else @click=""fetch(item)"" class=""lms-list-item"">
<v-list-tile-avatar :tile=""true"" class=""lms-avatar"" v-if=""undefined!=item.radio""><v-icon>{{1==item.radio ? ""radio_button_checked"" : ""radio_button_unchecked""}}</v-icon></v-list-tile-avatar>
<v-list-tile-avatar :tile=""true"" class=""lms-avatar"" v-else-if=""undefined!=item.checkbox""><v-icon>{{1==item.checkbox ? ""check_box"" : ""check_box_outline_blank""}}</v-icon></v-list-tile-avatar>
",9
"diff --git a/app/routes/project.js b/app/routes/project.js @@ -5,7 +5,14 @@ import ScrollTracker from 'ember-api-docs/mixins/scroll-tracker';
export default Route.extend(ScrollTracker, {
model({project: projectName}) {
- return this.store.findRecord('project', projectName, { includes: 'project-version' });
+ let projectNameToLookUp = 'ember';
+
+ // Accounts for old references to ember-data API docs
+ if (projectName.indexOf('data') !== -1) {
+ projectNameToLookUp = 'ember-data';
+ }
+
+ return this.store.findRecord('project', projectNameToLookUp, { includes: 'project-version' });
},
// Using redirect instead of afterModel so transition succeeds and returns 307 in fastboot
",9
"diff --git a/src/components/personalize/personalize.js b/src/components/personalize/personalize.js @@ -52,7 +52,7 @@ Personalize.prototype = {
this.handleEvents();
}
- // On derive theme form stylesheet if
+ // Only derive theme form stylesheet if
// one isn't specified in settings
if (this.settings.theme) {
this.setTheme(this.settings.theme);
@@ -357,10 +357,15 @@ Personalize.prototype = {
return;
}
+ // Since its become habit to init personalize.js mutliple times
+ // on one page for some reason, the pageOverlay might not be
+ // defined when one personalize instance tries to ""fadeOut""
+ if (self.pageOverlay) {
self.pageOverlay.fadeOut(300, () => {
self.pageOverlay.remove();
self.pageOverlay = undefined;
});
+ }
},
/**
",9
"diff --git a/app/src/js/middleware/option-handler-themes.js b/app/src/js/middleware/option-handler-themes.js @@ -41,6 +41,12 @@ module.exports = function (app) {
theme: 'soho',
variant: req.query.theme
}};
+
+ // Translate legacy ""high-contrast"" into ""contrast""
+ if (q.variant.indexOf('high-') !== -1) {
+ q.variant = q.variant.replace('high-', '');
+ }
+
const theUrl = URL.format({ query: q });
logger('info', `Redirecting legacy query string params to ""${theUrl}""`);
return res.redirect(theUrl);
",9
"diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js @@ -1103,7 +1103,7 @@ Modal.prototype = {
});
// Cache tab fields and update them if the DOM changes
- const selector = ':focusable, [contenteditable], iframe';
+ const selector = ':focusable, [contenteditable]';
let tabbableElements = self.element.find(selector);
let firstTabbable = tabbableElements.first();
let lastTabbable = tabbableElements.last();
@@ -1133,6 +1133,15 @@ Modal.prototype = {
}
}
});
+
+ // In some cases, the `body` tag becomes the `document.activeElement` if the Overlay,
+ // or a wrapping iframe element is clicked. This will reset the focus.
+ $('body').on(`focusin.${self.namespace}`, (e) => {
+ const focusedIsTabbable = tabbableElements.filter($(e.target));
+ if (!(focusedIsTabbable).length) {
+ firstTabbable.removeClass('hide-focus').focus();
+ }
+ });
},
/**
@@ -1167,7 +1176,7 @@ Modal.prototype = {
if (this.mainContent && this.removeNoScroll) {
this.mainContent.removeClass('no-scroll');
}
- $('body').off(`resize.${this.namespace}`);
+ $('body').off(`resize.${this.namespace} focusin.${self.namespace}`);
this.element.off(`keypress.${this.namespace} keydown.${this.namespace}`);
this.element.removeClass('is-visible');
",9
"diff --git a/test/components/about/about-api.func-spec.js b/test/components/about/about-api.func-spec.js -import { About } from '../../../src/components/about/about';
import { cleanup } from '../../helpers/func-utils';
const aboutHTML = require('../../../app/views/components/about/example-index.html');
const svg = require('../../../src/components/icons/svg.html');
-let aboutEl;
let aboutObj;
describe('About API', () => {
const Locale = window.Soho.Locale;
beforeEach(() => {
- aboutEl = null;
aboutObj = null;
document.body.insertAdjacentHTML('afterbegin', svg);
document.body.insertAdjacentHTML('afterbegin', aboutHTML);
- aboutEl = document.body.querySelector('.about');
Locale.addCulture('en-US', Soho.Locale.cultures['en-US'], Soho.Locale.languages['en']); //eslint-disable-line
Locale.set('en-US');
-
- aboutObj = new About(aboutEl);
});
afterEach((done) => {
@@ -28,10 +22,6 @@ describe('About API', () => {
if (aboutObj) {
aboutObj.destroy();
}
- const modalAPI = $('body').data('modal');
- if (modalAPI && typeof modalAPI.destroy === 'function') {
- modalAPI.destroy();
- }
cleanup([
'.row',
@@ -41,7 +31,7 @@ describe('About API', () => {
]);
setTimeout(() => {
done();
- }, 500);
+ }, 650);
});
it('Should show on page via API', (done) => {
@@ -51,6 +41,7 @@ describe('About API', () => {
version: 'ver. {{version}}',
content: '<p>Fashionable components for fashionable applications.</p>'
});
+ aboutObj = $('body').data('about');
setTimeout(() => {
expect(document.body.querySelector('#about-modal').classList.contains('is-visible')).toBeTruthy();
@@ -65,6 +56,7 @@ describe('About API', () => {
version: 'ver. {{version}}',
content: '<p>Fashionable components for fashionable applications.</p>'
});
+ aboutObj = $('body').data('about');
const spyEvent = spyOnEvent('body', 'close');
",9
"diff --git a/src/legend.js b/src/legend.js @@ -44,7 +44,7 @@ dc.legend = function () {
.attr('transform', 'translate(' + _x + ',' + _y + ')');
var legendables = _parent.legendables();
- if (_maxItems) {
+ if (_maxItems !== undefined) {
legendables = legendables.slice(0, _maxItems);
}
@@ -285,9 +285,7 @@ dc.legend = function () {
if (!arguments.length) {
return _maxItems;
}
- //TODO maybe check if maxItems is a number?
- _maxItems = maxItems;
-
+ _maxItems = dc.utils.isNumber(maxItems) ? maxItems : undefined;
return _legend;
};
",9
"diff --git a/index.js b/index.js @@ -303,6 +303,13 @@ Peer.prototype._destroy = function (err, onclose) {
Peer.prototype._setupData = function (event) {
var self = this
+ if (!event.channel) {
+ // In some situations `pc.createDataChannel()` returns `undefined` (in wrtc),
+ // which is invalid behavior. Handle it gracefully.
+ // See: https://github.com/feross/simple-peer/issues/163
+ return self._onError(new Error('Data channel event is missing `channel` property'))
+ }
+
self._channel = event.channel
self._channel.binaryType = 'arraybuffer'
",9
"diff --git a/index.js b/index.js @@ -92,7 +92,12 @@ function Peer (opts) {
self._cb = null
self._interval = null
+ try {
self._pc = new (self._wrtc.RTCPeerConnection)(self.config, self.constraints)
+ } catch (err) {
+ self.destroy(err)
+ }
+
if (self._isChromium || (self._wrtc && self._wrtc.electronDaemon)) { // HACK: Electron and Chromium need a promise shim
shimPromiseAPI(self._wrtc.RTCPeerConnection, self._pc)
}
",9
"diff --git a/packages/razzle-dev-utils/webpackHotDevClient.js b/packages/razzle-dev-utils/webpackHotDevClient.js @@ -16,13 +16,29 @@ var launchEditorEndpoint = require('react-dev-utils/launchEditorEndpoint');
var formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
var ErrorOverlay = require('react-error-overlay');
+// To get the server port, prefer the env var if available
+// If it's not set, (e.g. for a Docker image that has to run in multiple environments)
+// use window.location.port in client-side code like this.
+// Note that window.location.port is '' if the port is not part of the url (it can be inferred from
+// window.location.protocol)
+var serverPort = process.env.PORT
+ ? parseInt(process.env.PORT, 10)
+ : window.location.port
+ ? parseInt(window.location.port, 10)
+ : window.location.protocol === 'http:'
+ ? 80
+ : 443;
+
+// the client-side build (webpack-dev-server) is on a different port
+var sockJsPort = serverPort + 1;
+
ErrorOverlay.setEditorHandler(function editorHandler(errorLocation) {
// Keep this sync with errorOverlayMiddleware.js
fetch(
url.format({
protocol: window.location.protocol,
hostname: window.location.hostname,
- port: parseInt(process.env.PORT || window.location.port, 10) + 1,
+ port: sockJsPort,
pathname: launchEditorEndpoint,
search:
'?fileName=' +
@@ -62,7 +78,7 @@ var connection = new SockJS(
url.format({
protocol: window.location.protocol,
hostname: window.location.hostname,
- port: parseInt(process.env.PORT || window.location.port, 10) + 1,
+ port: sockJsPort,
// Hardcoded in WebpackDevServer
pathname: '/sockjs-node',
})
",9
"diff --git a/src/lib/project-loader-hoc.jsx b/src/lib/project-loader-hoc.jsx @@ -27,7 +27,9 @@ const ProjectLoaderHOC = function (WrappedComponent) {
if (this.state.projectId !== prevState.projectId) {
storage
.load(storage.AssetType.Project, this.state.projectId, storage.DataFormat.JSON)
- .then(projectAsset => this.setState({projectData: JSON.stringify(projectAsset.data)}))
+ .then(projectAsset => projectAsset && this.setState({
+ projectData: JSON.stringify(projectAsset.data)
+ }))
.catch(err => log.error(err));
}
}
",9
"diff --git a/src/lib/project-loader-hoc.jsx b/src/lib/project-loader-hoc.jsx import React from 'react';
+import PropTypes from 'prop-types';
import analytics from './analytics';
import log from './log';
import storage from './storage';
/* Higher Order Component to provide behavior for loading projects by id from
- * the window's hash (#this part in the url)
+ * the window's hash (#this part in the url) or by projectId prop passed in from
+ * the parent (i.e. scratch-www)
* @param {React.Component} WrappedComponent component to receive projectData prop
* @returns {React.Component} component with project loading behavior
*/
@@ -45,7 +47,7 @@ const ProjectLoaderHOC = function (WrappedComponent) {
return window.location.hash.substring(1);
}
updateProject () {
- let projectId = this.fetchProjectId();
+ let projectId = this.props.projectId || this.fetchProjectId();
if (projectId !== this.state.projectId) {
if (projectId.length < 1) projectId = 0;
this.setState({projectId: projectId});
@@ -61,21 +63,27 @@ const ProjectLoaderHOC = function (WrappedComponent) {
}
}
render () {
+ const {
+ projectId, // eslint-disable-line no-unused-vars
+ ...componentProps
+ } = this.props;
if (!this.state.projectData) return null;
return (
<WrappedComponent
fetchingProject={this.state.fetchingProject}
projectData={this.state.projectData}
- {...this.props}
+ {...componentProps}
/>
);
}
}
+ ProjectLoaderComponent.propTypes = {
+ projectId: PropTypes.string
+ };
return ProjectLoaderComponent;
};
-
export {
ProjectLoaderHOC as default
};
",9
"diff --git a/src/app/cli/src/coda.ml b/src/app/cli/src/coda.ml @@ -193,14 +193,31 @@ let daemon (type ledger_proof) (module Kernel
[]
in
let%bind initial_peers =
- Deferred.List.map ~how:(`Max_concurrent_jobs 8) initial_peers_raw ~f:
- (fun addr ->
- let%map inet_addr =
- Unix.Inet_addr.of_string_or_getbyname (Host_and_port.host addr)
- in
- Host_and_port.create
+ Deferred.List.filter_map ~how:(`Max_concurrent_jobs 8)
+ initial_peers_raw ~f:(fun addr ->
+ let host = Host_and_port.host addr in
+ match%bind
+ Monitor.try_with_or_error (fun () ->
+ Unix.Inet_addr.of_string_or_getbyname host )
+ with
+ | Ok inet_addr ->
+ return
+ @@ Some
+ (Host_and_port.create
~host:(Unix.Inet_addr.to_string inet_addr)
~port:(Host_and_port.port addr))
+ | Error e ->
+ Logger.trace log ""getaddr exception: %s""
+ (Error.to_string_mach e) ;
+ Logger.error log ""failed to look up address for %s, skipping""
+ host ;
+ return None )
+ in
+ let%bind () =
+ if List.length peers <> 0 && List.length initial_peers = 0 then (
+ eprintf ""Error: failed to connect to any peers\n"" ;
+ exit 1 )
+ else Deferred.unit
in
let%bind ip =
match ip with None -> Find_ip.find () | Some ip -> return ip
",9
"diff --git a/src/app/cli/src/client.ml b/src/app/cli/src/client.ml @@ -206,9 +206,20 @@ let dispatch_with_message rpc arg port ~success ~error =
eprintf ""%s\n"" (error e) ;
exit 1
+let handle_exception_nicely (type a) (f : unit -> a Deferred.t) () :
+ a Deferred.t =
+ match%bind Deferred.Or_error.try_with ~extract_exn:true f with
+ | Ok e -> return e
+ | Error e ->
+ eprintf ""Error: %s"" (Error.to_string_hum e) ;
+ exit 1
+
let read_keypair path =
+ handle_exception_nicely
+ (fun () ->
read_keypair_exn ~privkey_path:path
- ~password:(lazy (read_password_exn ""Secret key password: ""))
+ ~password:(lazy (read_password_exn ""Secret key password: "")) )
+ ()
let batch_send_payments =
let module Payment_info = struct
@@ -309,14 +320,14 @@ let wrap_key =
Command.async ~summary:""Wrap a private key into a private key file""
(let open Command.Let_syntax in
let%map_open privkey_path = privkey_path_flag in
- fun () ->
+ handle_exception_nicely
+ @@ fun () ->
let open Deferred.Let_syntax in
let%bind privkey =
hidden_line_or_env ""Private key: "" ~env:""CODA_PRIVKEY""
in
let pk =
- Private_key.of_base64_exn
- (privkey |> Or_error.ok_exn |> Bytes.to_string)
+ Private_key.of_base64_exn (privkey |> Or_error.ok_exn |> Bytes.to_string)
in
let kp = Keypair.of_private_key_exn pk in
write_keypair_exn kp ~privkey_path
@@ -326,32 +337,31 @@ let dump_keypair =
Command.async ~summary:""Print out a keypair from a private key file""
(let open Command.Let_syntax in
let%map_open privkey_path = privkey_read_path_flag in
- fun () ->
+ handle_exception_nicely
+ @@ fun () ->
let open Deferred.Let_syntax in
let%map kp =
read_keypair_exn ~privkey_path
~password:(lazy (read_password_exn ""Password for private key file: ""))
in
printf ""Public key: %s\nPrivate key: %s\n""
- ( kp.public_key |> Public_key.compress
- |> Public_key.Compressed.to_base64 )
+ (kp.public_key |> Public_key.compress |> Public_key.Compressed.to_base64)
(kp.private_key |> Private_key.to_base64))
let generate_keypair =
Command.async ~summary:""Generate a new public-key/private-key pair""
(let open Command.Let_syntax in
let%map_open privkey_path = privkey_path_flag in
- fun () ->
+ handle_exception_nicely
+ @@ fun () ->
let open Deferred.Let_syntax in
let kp = Keypair.create () in
let%bind () =
write_keypair_exn kp ~privkey_path
- ~password:
- (lazy (prompt_password ""Password for new private key file: ""))
+ ~password:(lazy (prompt_password ""Password for new private key file: ""))
in
printf ""Public key: %s\n""
- ( kp.public_key |> Public_key.compress
- |> Public_key.Compressed.to_base64 ) ;
+ (kp.public_key |> Public_key.compress |> Public_key.Compressed.to_base64) ;
exit 0)
let dump_ledger =
",9
"diff --git a/src/lib/gossip_net/gossip_net.ml b/src/lib/gossip_net/gossip_net.ml @@ -44,6 +44,10 @@ module type S = sig
type msg
+ module Connection_with_state : sig
+ type t = Banned | Allowed of Rpc.Connection.t Ivar.t
+ end
+
type t =
{ timeout: Time.Span.t
; logger: Logger.t
@@ -55,7 +59,7 @@ module type S = sig
; peers: Peer.Hash_set.t
; connections:
( Unix.Inet_addr.t
- , (Uuid.t, Rpc.Connection.t Ivar.t) Hashtbl.t )
+ , (Uuid.t, Connection_with_state.t) Hashtbl.t )
Hashtbl.t
; max_concurrent_connections: int option }
@@ -86,6 +90,13 @@ end
module Make (Message : Message_intf) :
S with type msg := Message.msg and type content := Message.content = struct
+ module Connection_with_state = struct
+ type t = Banned | Allowed of Rpc.Connection.t Ivar.t
+
+ let value_map ~when_allowed ~when_banned t =
+ match t with Allowed c -> when_allowed c | _ -> when_banned
+ end
+
type t =
{ timeout: Time.Span.t
; logger: Logger.t
@@ -97,7 +108,7 @@ module Make (Message : Message_intf) :
; peers: Peer.Hash_set.t
; connections:
( Unix.Inet_addr.t
- , (Uuid.t, Rpc.Connection.t Ivar.t) Hashtbl.t )
+ , (Uuid.t, Connection_with_state.t) Hashtbl.t )
Hashtbl.t
(**mapping a Uuid to a connection to be able to remove it from the hash
*table since Rpc.Connection.t doesn't have the socket information*)
@@ -242,17 +253,26 @@ module Make (Message : Message_intf) :
don't_wait_for
(Strict_pipe.Reader.iter (Trust_system.ban_pipe config.trust_system)
~f:(fun addr ->
- match Hashtbl.find_and_remove t.connections addr with
+ match Hashtbl.find t.connections addr with
| None ->
Deferred.unit
- | Some conn_list ->
+ | Some conn_tbl ->
Logger.debug t.logger ~module_:__MODULE__ ~location:__LOC__
!""Peer %{sexp: Unix.Inet_addr.t} banned, disconnecting.""
addr ;
- Deferred.List.iter (Hashtbl.to_alist conn_list)
- ~f:(fun (_, conn_ivar) ->
+ let%map () =
+ Deferred.List.iter (Hashtbl.to_alist conn_tbl)
+ ~f:(fun (_, conn_state) ->
+ Connection_with_state.value_map conn_state
+ ~when_allowed:(fun conn_ivar ->
let%bind conn = Ivar.read conn_ivar in
- Rpc.Connection.close conn ) )) ;
+ Rpc.Connection.close conn )
+ ~when_banned:Deferred.unit )
+ in
+ Hashtbl.map_inplace conn_tbl ~f:(fun conn_state ->
+ Connection_with_state.value_map conn_state
+ ~when_allowed:(fun _ -> Connection_with_state.Banned)
+ ~when_banned:Banned ) )) ;
trace_task ""rebroadcasting messages"" (fun () ->
don't_wait_for
(Linear_pipe.iter_unordered ~max_concurrency:64 broadcast_reader
@@ -321,7 +341,8 @@ module Make (Message : Message_intf) :
Reader.close reader >>= fun _ -> Writer.close writer )
else
let conn_id = Uuid_unix.create () in
- Hashtbl.add_exn conn_map ~key:conn_id ~data:(Ivar.create ()) ;
+ Hashtbl.add_exn conn_map ~key:conn_id
+ ~data:(Allowed (Ivar.create ())) ;
Hashtbl.set t.connections
~key:(Socket.Address.Inet.addr client)
~data:conn_map ;
@@ -333,8 +354,10 @@ module Make (Message : Message_intf) :
when connecting to the server over TCP; the ephemeral
port is distinct from the client's discovery and
communication ports *)
- let ivar = Hashtbl.find_exn conn_map conn_id in
- Ivar.fill ivar conn ;
+ Connection_with_state.value_map
+ (Hashtbl.find_exn conn_map conn_id)
+ ~when_allowed:(fun ivar -> Ivar.fill ivar conn)
+ ~when_banned:() ;
Hashtbl.set t.connections
~key:(Socket.Address.Inet.addr client)
~data:conn_map ;
",9
"diff --git a/src/lib/transaction_snark/transaction_snark.ml b/src/lib/transaction_snark/transaction_snark.ml @@ -1445,6 +1445,7 @@ module Base = struct
in
Amount.Checked.sub base_amount coinbase_receiver_fee)
in
+ let receiver_overflow = ref Boolean.false_ in
let%bind root_after_receiver_update =
[%with_label ""Update receiver""]
(Frozen_ledger_hash.modify_account_recv
@@ -1538,11 +1539,34 @@ module Base = struct
~then_:Amount.(var_of_t zero)
~else_:amount_for_new_account
in
- (* TODO: This case can be contrived using minted tokens, handle
- it in the transaction logic and add a case for it to
- [User_command_failure.t].
+ (* NOTE: Instead of capturing this as part of the user command
+ failures, we capture it inline here and bubble it out to a
+ reference. This behavior is still in line with the
+ out-of-snark transaction logic.
+
+ Updating [user_command_fails] to include this value from here
+ onwards will ensure that we do not update the source or
+ receiver accounts. The only places where [user_command_fails]
+ may have already affected behaviour are
+ * when the fee-payer is paying the account creation fee, and
+ * when a new token is created.
+ In both of these, this account is new, and will have a
+ balance of 0, so we can guarantee that there is no overflow.
*)
- Balance.Checked.(account.balance + receiver_amount)
+ let%bind balance, `Overflow overflow =
+ Balance.Checked.add_amount_flagged account.balance
+ receiver_amount
+ in
+ let%bind () =
+ [%with_label ""Overflow error only occurs in user commands""]
+ Boolean.(Assert.any [is_user_command; not overflow])
+ in
+ receiver_overflow := overflow ;
+ Balance.Checked.if_ overflow ~then_:account.balance
+ ~else_:balance
+ in
+ let%bind user_command_fails =
+ Boolean.(!receiver_overflow || user_command_fails)
in
let%bind is_empty_and_writeable =
(* Do not create a new account if the user command will fail. *)
@@ -1581,6 +1605,9 @@ module Base = struct
; voting_for= account.voting_for
; timing= account.timing } ))
in
+ let%bind user_command_fails =
+ Boolean.(!receiver_overflow || user_command_fails)
+ in
let%bind fee_payer_is_source = Account_id.Checked.equal fee_payer source in
let%bind root_after_source_update =
[%with_label ""Update source""]
",9
"diff --git a/src/lib/network_pool/transaction_pool.ml b/src/lib/network_pool/transaction_pool.ml @@ -612,6 +612,7 @@ struct
match frontier_opt with
| None -> (
[%log debug] ""no frontier"" ;
+ t.best_tip_ledger <- None ;
(* Sanity check: the view pipe should have been closed before
the frontier was destroyed. *)
match t.best_tip_diff_relay with
@@ -619,7 +620,6 @@ struct
Deferred.unit
| Some hdl ->
let is_finished = ref false in
- t.best_tip_ledger <- None ;
Deferred.any_unit
[ (let%map () = hdl in
t.best_tip_diff_relay <- None ;
",9
"diff --git a/src/app/genesis_ledger_from_tsv/genesis_ledger_from_tsv.ml b/src/app/genesis_ledger_from_tsv/genesis_ledger_from_tsv.ml @@ -29,7 +29,7 @@ let add_account pk =
let valid_pk pk = Or_error.is_ok @@ Public_key.Compressed.of_base58_check pk
let is_pending pk =
- List.mem [""pending""; ""finoa""; ""secret""] pk ~equal:String.Caseless.equal
+ List.mem [""pending""; ""finoa""; ""topsecret""] pk ~equal:String.Caseless.equal
let no_delegatee pk = String.is_empty pk || String.equal pk ""0""
@@ -142,6 +142,8 @@ let runtime_config_account ~logger ~wallet_pk ~amount ~initial_min_balance
let account_of_tsv ~logger tsv dummy_pks =
match String.split tsv ~on:'\t' with
+ | ""skip"" :: _ ->
+ None
| [ wallet_pk
; amount
; initial_min_balance
@@ -150,9 +152,10 @@ let account_of_tsv ~logger tsv dummy_pks =
; unlock_frequency
; unlock_amount
; delegatee_pk ] ->
- runtime_config_account ~logger ~wallet_pk ~amount ~initial_min_balance
+ Some
+ (runtime_config_account ~logger ~wallet_pk ~amount ~initial_min_balance
~cliff_time_months ~cliff_amount ~unlock_frequency ~unlock_amount
- ~delegatee_pk ~dummy_pks
+ ~delegatee_pk ~dummy_pks)
| _ ->
(* should not occur, we've already validated the record *)
failwithf ""TSV line does not contain expected number of fields: %s"" tsv
@@ -205,6 +208,8 @@ let validate_fields ~wallet_pk ~amount ~initial_min_balance ~cliff_time_months
let validate_record tsv =
match String.split tsv ~on:'\t' with
+ | ""skip"" :: _ ->
+ None
| [ wallet_pk
; amount
; initial_min_balance
@@ -264,12 +269,13 @@ let main ~tsv_file ~output_file () =
~metadata:[(""tsv_file"", `String tsv_file)] ;
let rec go accounts num_accounts dummy_pks =
match In_channel.input_line in_channel with
- | Some line ->
+ | Some line -> (
let underscored_line = remove_commas line in
- let account, dummy_pks' =
- account_of_tsv ~logger underscored_line dummy_pks
- in
+ match account_of_tsv ~logger underscored_line dummy_pks with
+ | Some (account, dummy_pks') ->
go (account :: accounts) (num_accounts + 1) dummy_pks'
+ | None ->
+ go accounts num_accounts dummy_pks )
| None ->
(List.rev accounts, num_accounts)
in
",9
"diff --git a/src/lib/verifier/prod.ml b/src/lib/verifier/prod.ml @@ -216,7 +216,10 @@ module Worker = struct
include Rpc_parallel.Make (T)
end
-type worker = {connection: Worker.Connection.t; process: Process.t}
+type worker =
+ { connection: Worker.Connection.t
+ ; process: Process.t
+ ; exit_or_signal: Unix.Exit_or_signal.t Deferred.Or_error.t }
type t = {worker: worker Ivar.t ref; logger: Logger.Stable.Latest.t}
@@ -225,6 +228,37 @@ let plus_or_minus initial ~delta =
let min_expected_lifetime = Time.Span.of_min 1.
+(** Call this as early as possible after the process is known, and store the
+ resulting [Deferred.t] somewhere to be used later.
+*)
+let wait_safe process =
+ (* This is a little more nuanced than it may initially seem.
+ - The initial call to [Process.wait] runs a wait syscall -- with the
+ NOHANG flag -- synchronously.
+ * This may raise an error (WNOHANG or otherwise) that we have to handle
+ synchronously at call time.
+ - The [Process.wait] then returns a [Deferred.t] that resolves when a
+ second syscall returns.
+ * This may throw its own errors, so we need to ensure that this is also
+ wrapped to catch them.
+ - Once the child process has died and one or more wait syscalls have
+ resolved, the operating system will drop the process metadata. This
+ means that our wait may hang forever if 1) the process has already died
+ and 2) there was a wait call issued by some other code before we have a
+ chance.
+ * Thus, we should make this initial call while the child process is
+ still alive, preferably on startup, to avoid this hang.
+ *)
+ match
+ Or_error.try_with (fun () ->
+ let deferred_wait = Process.wait process in
+ Deferred.Or_error.try_with (fun () -> deferred_wait) )
+ with
+ | Ok x ->
+ x
+ | Error err ->
+ Deferred.Or_error.fail err
+
(* TODO: investigate why conf_dir wasn't being used *)
let create ~logger ~proof_level ~pids ~conf_dir : t Deferred.t =
let on_failure err =
@@ -244,6 +278,7 @@ let create ~logger ~proof_level ~pids ~conf_dir : t Deferred.t =
~on_failure ~shutdown_on:Disconnect ~connection_state_init_arg:()
{conf_dir; logger; proof_level}
in
+ let exit_or_signal = wait_safe process in
[%log info]
""Daemon started process of kind $process_kind with pid $verifier_pid""
~metadata:
@@ -268,19 +303,16 @@ let create ~logger ~proof_level ~pids ~conf_dir : t Deferred.t =
return
@@ [%log error] ""Verifier stderr: $stderr""
~metadata:[(""stderr"", `String stderr)] ) ;
- {connection; process}
+ {connection; process; exit_or_signal}
in
let%map worker = create_worker () in
let worker_ref = ref (Ivar.create_full worker) in
- let wait_safe process =
- Deferred.Or_error.try_with (fun () -> Process.wait process)
- in
- let rec on_worker {connection= _; process} =
+ let rec on_worker {connection= _; process; exit_or_signal} =
let restart_after = Time.Span.(of_min (15. |> plus_or_minus ~delta:2.5)) in
let finished =
Deferred.any
[ (after restart_after >>| fun () -> `Time_to_restart)
- ; ( wait_safe process
+ ; ( exit_or_signal
>>| function
| Ok _ ->
`Unexpected_termination
@@ -317,7 +349,7 @@ let create ~logger ~proof_level ~pids ~conf_dir : t Deferred.t =
worker_ref := new_worker ;
don't_wait_for
@@ let%bind exit_metadata =
- match%map wait_safe process with
+ match%map exit_or_signal with
| Ok res ->
[ ( ""exit_status""
, `String (Unix.Exit_or_signal.to_string_hum res) ) ]
",9
"diff --git a/src/lib/marlin_plonk_bindings/stubs/src/bigint_256.rs b/src/lib/marlin_plonk_bindings/stubs/src/bigint_256.rs @@ -114,7 +114,7 @@ pub fn caml_bigint_256_to_bytes(x: ocaml::Pointer<BigInteger256>) -> ocaml::Valu
let x_ptr: *const BigInteger256 = x.as_ref();
unsafe {
let mut input_bytes = vec![];
- (*x_ptr).serialize(&mut input_bytes).expect(""serialize failed"");
+ (*x_ptr).serialize(&mut input_bytes).expect(""caml_bigint_256_to_bytes, serialize failed"");
core::ptr::copy_nonoverlapping(input_bytes.as_ptr(), ocaml::sys::string_val(str), input_bytes.len());
}
ocaml::Value(str)
@@ -126,8 +126,10 @@ pub fn caml_bigint_256_of_bytes(x: &[u8]) -> Result<BigInteger256, ocaml::Error>
if x.len() != len {
ocaml::Error::failwith(""caml_bigint_256_of_bytes"")?;
};
- let x = BigInteger256::deserialize(&mut &x[..]).expect(""deserialize failed"");
- Ok(x)
+ match BigInteger256::deserialize(&mut &x[..]) {
+ Ok(b) => Ok(b),
+ Err(_) => Err(ocaml::Error::invalid_argument(""caml_bigint_256_of_bytes, deserialize failed"").err().unwrap())
+ }
}
#[ocaml::func]
",9
"diff --git a/src/app/replayer/replayer.ml b/src/app/replayer/replayer.ml @@ -382,7 +382,8 @@ let verify_account_creation_fee ~logger ~pool ~receiver_account_creation_fee
in
let balance_uint64 = Currency.Balance.to_uint64 claimed_balance in
let fee_uint64 = Currency.Fee.to_uint64 fee in
- if Unsigned_extended.UInt64.( >= ) fee_uint64 account_creation_fee_uint64 then
+ if Unsigned_extended.UInt64.( >= ) fee_uint64 account_creation_fee_uint64 then (
+ (* account may have been created *)
let fee_less_account_creation_fee_uint64 =
Unsigned.UInt64.sub fee_uint64 account_creation_fee_uint64
in
@@ -419,7 +420,7 @@ let verify_account_creation_fee ~logger ~pool ~receiver_account_creation_fee
, Currency.Fee.to_yojson
constraint_constants.account_creation_fee )
; ( ""receiver_account_creation_fee""
- , `Int (Int64.to_int_exn amount_int64) )
+ , `String (Int64.to_string amount_int64) )
] ;
if continue_on_error then incr error_count else Core_kernel.exit 1 )
else
@@ -438,7 +439,27 @@ let verify_account_creation_fee ~logger ~pool ~receiver_account_creation_fee
, Currency.Fee.to_yojson
constraint_constants.account_creation_fee )
; ( ""receiver_account_creation_fee""
- , `Int (Int64.to_int_exn amount_int64) )
+ , `String (Int64.to_string amount_int64) )
+ ] ;
+ if continue_on_error then incr error_count else Core_kernel.exit 1 )
+ else
+ (* fee less than account creation fee *)
+ match receiver_account_creation_fee with
+ | None ->
+ ()
+ | Some amount_int64 ->
+ [%log error]
+ ""The internal command fee is less than the account creation fee, so \
+ no account should have been created, but in the archive database, \
+ the receiver account creation fee is not NULL""
+ ~metadata:
+ [ (""account_balance"", Currency.Balance.to_yojson claimed_balance)
+ ; (""fee"", Currency.Fee.to_yojson fee)
+ ; ( ""constraint_constants.account_creation_fee""
+ , Currency.Fee.to_yojson constraint_constants.account_creation_fee
+ )
+ ; ( ""receiver_account_creation_fee""
+ , `String (Int64.to_string amount_int64) )
] ;
if continue_on_error then incr error_count else Core_kernel.exit 1
",9
"diff --git a/src/lib/child_processes/child_processes.ml b/src/lib/child_processes/child_processes.ml @@ -174,9 +174,12 @@ let reader_to_strict_pipe reader name output_type =
in
don't_wait_for
(let%map () =
- Pipe.iter_without_pushback pipe ~f:(Strict_pipe.Writer.write w)
+ Pipe.iter_without_pushback pipe ~f:(fun msg ->
+ if not (Strict_pipe.Writer.is_closed w) then
+ try Strict_pipe.Writer.write w msg
+ with Strict_pipe.Overflow _ -> Strict_pipe.Writer.close w)
in
- Strict_pipe.Writer.close w) ;
+ if not (Strict_pipe.Writer.is_closed w) then Strict_pipe.Writer.close w) ;
r
type output_type = [ `Chunks | `Lines ]
",9
"diff --git a/src/lib/ppx_annot/ppx_annot.ml b/src/lib/ppx_annot/ppx_annot.ml @@ -19,9 +19,9 @@ let extract_string_attrs (attributes : attributes) =
; _
}
] ->
- Some (attr.attr_name.txt, str)
+ Some (attr.attr_name.txt, Some str)
| PStr [] ->
- Some (attr.attr_name.txt, """")
+ Some (attr.attr_name.txt, None)
| _ ->
None)
@@ -38,11 +38,17 @@ let annot_str :
-> rec_flag * type_declaration list
-> structure =
fun ~loc ~path:_ (_rec_flag, type_decls) ->
+ let lift_optional_string ~loc = function
+ | None ->
+ [%expr None]
+ | Some str ->
+ [%expr Some [%e Ppxlib.Ast_builder.Default.estring ~loc str]]
+ in
let lift_string_tuples ~loc xs =
List.map xs ~f:(fun (a, b) ->
Ppxlib.Ast_builder.Default.pexp_tuple ~loc
[ Ppxlib.Ast_builder.Default.estring ~loc a
- ; Ppxlib.Ast_builder.Default.estring ~loc b
+ ; lift_optional_string ~loc b
])
in
let type_decl = expect_single_decl ~loc type_decls in
@@ -69,10 +75,14 @@ let annot_str :
]
in
[%str
- let [%p Ppxlib.Ast_builder.Default.pvar ~loc fields_name] = fun str ->
+ let ([%p Ppxlib.Ast_builder.Default.pvar ~loc fields_name] :
+ string -> (string * string option) list) =
+ fun str ->
[%e Ppxlib.Ast_builder.Default.pexp_match ~loc [%expr str] field_branches]
- let [%p Ppxlib.Ast_builder.Default.pvar ~loc toplevel_name] =
+ let ([%p Ppxlib.Ast_builder.Default.pvar ~loc toplevel_name] :
+ unit -> (string * string option) list) =
+ fun () ->
[%e
Ppxlib.Ast_builder.Default.elist ~loc
(lift_string_tuples top_attributes ~loc)]]
@@ -85,10 +95,16 @@ let annot_sig :
fun ~loc ~path:_ (_rec_flag, type_decls) ->
let type_decl = expect_single_decl ~loc type_decls in
let loc = type_decl.ptype_loc in
- let name = type_decl.ptype_name.txt ^ ""_annots"" in
- let type_ = [%type: string -> string] in
+ let fields_name = type_decl.ptype_name.txt ^ ""_fields_annots"" in
+ let toplevel_name = type_decl.ptype_name.txt ^ ""_toplevel_annots"" in
[ psig_value ~loc
- (value_description ~loc ~name:(Located.mk ~loc name) ~type_ ~prim:[])
+ (value_description ~loc
+ ~name:(Located.mk ~loc fields_name)
+ ~type_:[%type: string -> (string * string option) list] ~prim:[])
+ ; psig_value ~loc
+ (value_description ~loc
+ ~name:(Located.mk ~loc toplevel_name)
+ ~type_:[%type: unit -> (string * string option) list] ~prim:[])
]
let ann =
",9
"diff --git a/src/lib/transaction_snark/test/account_timing/account_timing.ml b/src/lib/transaction_snark/test/account_timing/account_timing.ml @@ -482,9 +482,11 @@ let%test_module ""account timing check"" =
( match With_status.status txn_applied.common.user_command with
| Applied _ ->
()
- | Failed (failure, _balance_data) ->
+ | Failed (failures, _balance_data) ->
failwithf ""Transaction failed: %s""
- (Transaction_status.Failure.to_string failure)
+ ( List.map (List.concat failures) ~f:(fun failure ->
+ Transaction_status.Failure.to_string failure)
+ |> String.concat ~sep:"","" )
() ) ;
check_transaction_snark ~txn_global_slot:slot ledger_copy txn
| Error err ->
",9
"diff --git a/src/components/DraftView.js b/src/components/DraftView.js @@ -24,12 +24,13 @@ export const subtitle = (cards) => {
(type) => !type.includes('land') && !/^(plane|phenomenon|vanguard|scheme|conspiracy)$/.test(type),
).length;
const numCreatures = allTypes.filter((type) => type.includes('creature')).length;
+ const numNonCreatures = numNonlands - numCreatures;
return (
`${numCards} card${numCards === 1 ? '' : 's'}: ` +
`${numLands} land${numLands === 1 ? '' : 's'}, ` +
`${numNonlands} nonland: ` +
- `${numCreatures} creatures, ` +
- `${numNonlands - numCreatures} noncreatures`
+ `${numCreatures} creature${numCreatures === 1 ? '' : 's'}, ` +
+ `${numNonCreatures} noncreature${numNonCreatures === 1 ? '' : 's'}`
);
};
",9
"diff --git a/src/topcards.js b/src/topcards.js @@ -3,15 +3,16 @@ import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
import URLSearchParams from 'core-js-pure/features/url-search-params';
-import { encodeName } from 'utils/Card';
-import { makeFilter } from 'filtering/FilterCards';
-
import DynamicFlash from 'components/DynamicFlash';
import ErrorBoundary from 'components/ErrorBoundary';
import FilterCollapse from 'components/FilterCollapse';
import SortableTable from 'components/SortableTable';
import withAutocard from 'components/WithAutocard';
+import { makeFilter } from 'filtering/FilterCards';
+import { encodeName } from 'utils/Card';
+import Query from 'utils/Query';
+
const AutocardA = withAutocard('a');
class TopCards extends Component {
@@ -21,7 +22,7 @@ class TopCards extends Component {
const { defaultData, defaultNumResults, defaultFilterText } = props;
this.state = {
- filter: (defaultFilterText && makeFilter(defaultFilterText).filter) || null,
+ filter: defaultFilterText,
data: defaultData || [],
numResults: defaultNumResults || 0,
};
@@ -29,16 +30,24 @@ class TopCards extends Component {
this.setFilter = this.setFilter.bind(this);
}
- async setFilter(filter, filterInput) {
+ componentDidMount() {
+ const queryFilter = Query.get('f');
+ if (queryFilter) {
+ this.setFilter(null, queryFilter);
+ }
+ }
+
+ async setFilter(_, filterInput) {
const params = new URLSearchParams([['f', filterInput]]);
- this.setState({ filter });
const response = await fetch(`/tool/api/topcards?${params.toString()}`);
if (!response.ok) {
return;
}
+ Query.set('f', filterInput);
const json = await response.json();
this.setState({
+ filter: filterInput,
data: json.data,
numResults: json.numResults,
});
@@ -46,7 +55,7 @@ class TopCards extends Component {
render() {
const { defaultFilterText } = this.props;
- const { data, numResults } = this.state;
+ const { data, filter, numResults } = this.state;
const rowF = ([name, img, imgFlip, rating, picks, elo, cubes]) => (
<tr key={name}>
@@ -69,7 +78,7 @@ class TopCards extends Component {
<FilterCollapse
isOpen
defaultFilterText={defaultFilterText}
- filter
+ filter={filter}
setFilter={this.setFilter}
numCards={numResults}
numShown={data.length}
",9
"diff --git a/packages/react-dev-utils/openBrowser.js b/packages/react-dev-utils/openBrowser.js @@ -26,6 +26,9 @@ function getBrowserEnv() {
// It is specific to the operating system.
// See https://github.com/sindresorhus/open#app for documentation.
const value = process.env.BROWSER;
+ const args = process.env.BROWSER_ARGS
+ ? process.env.BROWSER_ARGS.split(' ')
+ : [];
let action;
if (!value) {
// Default.
@@ -37,7 +40,7 @@ function getBrowserEnv() {
} else {
action = Actions.BROWSER;
}
- return { action, value };
+ return { action, value, args };
}
function executeNodeScript(scriptPath, url) {
@@ -61,7 +64,7 @@ function executeNodeScript(scriptPath, url) {
return true;
}
-function startBrowserProcess(browser, url) {
+function startBrowserProcess(browser, url, args) {
// If we're on OS X, the user hasn't specifically
// requested a different browser, we can try opening
// Chrome with AppleScript. This lets us reuse an
@@ -93,6 +96,11 @@ function startBrowserProcess(browser, url) {
browser = undefined;
}
+ // If there are arguments, they must be passed as array with the browser
+ if (typeof browser === 'string' && args.length > 0) {
+ browser = [browser].concat(args);
+ }
+
// Fallback to open
// (It will always open new tab)
try {
@@ -109,7 +117,7 @@ function startBrowserProcess(browser, url) {
* true if it opened a browser or ran a node.js script, otherwise false.
*/
function openBrowser(url) {
- const { action, value } = getBrowserEnv();
+ const { action, value, args } = getBrowserEnv();
switch (action) {
case Actions.NONE:
// Special case: BROWSER=""none"" will prevent opening completely.
@@ -117,7 +125,7 @@ function openBrowser(url) {
case Actions.SCRIPT:
return executeNodeScript(value, url);
case Actions.BROWSER:
- return startBrowserProcess(value, url);
+ return startBrowserProcess(value, url, args);
default:
throw new Error('Not implemented.');
}
",9
"diff --git a/modules/google-earth-engine/docker/src/sepal/landsat/analyze.py b/modules/google-earth-engine/docker/src/sepal/landsat/analyze.py @@ -8,7 +8,7 @@ class Analyze(ImageOperation):
super(Analyze, self).__init__(image)
self.bands = bands
self.surface_reflectance = mosaic_spec.surface_reflectance
- self.selected_bands = mosaic_spec.bands
+ self.selected_bands = mosaic_spec.bands if mosaic_spec.bands else []
self.pan_sharpen = mosaic_spec.pan_sharpen if 'pan' in bands and len(self.selected_bands) == 3 else False
def apply(self):
",9
"diff --git a/modules/gui-react/frontend/src/widget/selectable.js b/modules/gui-react/frontend/src/widget/selectable.js @@ -27,23 +27,30 @@ Select.childContextTypes = {
export class Selectable extends React.Component {
constructor(props) {
super(props)
- console.log('active', this.props.active)
+ this.active = false
if (this.props.active) {
this.hasBeenActive = true
+ this.active = true
this.className = props.classNames.in
}
}
+ getChildContext() {
+ return {active: this.active}
+ }
+
componentWillReceiveProps(nextProps) {
if (this.props.active && !nextProps.active) {
this.className = this.props.classNames.out
- console.log('out', document.activeElement, document.activeElement && document.activeElement.id)
+ this.active = false
this.activeElement = document.activeElement
- }
- if (!this.props.active && nextProps.active) {
+ } else if (!this.props.active && nextProps.active) {
this.className = this.props.classNames.in
this.hasBeenActive = true
+ this.active = true
this.activeElement && this.context.focus(this.activeElement)
+ } else {
+ this.active = false
}
}
@@ -59,3 +66,6 @@ export class Selectable extends React.Component {
Selectable.contextTypes = {
focus: PropTypes.func
}
+Selectable.childContextTypes = {
+ active: PropTypes.boolean
+}
\ No newline at end of file
",9
"diff --git a/modules/gui/frontend/src/app/home/body/process/processMenu.js b/modules/gui/frontend/src/app/home/body/process/processMenu.js @@ -56,7 +56,7 @@ class ProcessMenu extends React.Component {
isRecipeUnsaved() {
const {recipe, recipes} = this.props
- return !recipes.find(saved => saved.id === recipe.id)
+ return !(recipes && recipes.find(saved => saved.id === recipe.id))
}
duplicateRecipe() {
",9
"diff --git a/modules/gui/frontend/src/app/home/body/process/mosaic/mosaicPreview.js b/modules/gui/frontend/src/app/home/body/process/mosaic/mosaicPreview.js @@ -42,7 +42,7 @@ class MosaicPreview extends React.Component {
Notifications.error({
title: msg('gee.error.title'),
message: msg('process.mosaic.preview.error'),
- error: msg(e.response.code, e.response.data),
+ error: e.response ? msg(e.response.code, e.response.data) : null,
timeout: 0,
content: dismiss =>
<Button
",9
"diff --git a/modules/gui/frontend/src/widget/notifications.js b/modules/gui/frontend/src/widget/notifications.js -import {Subject, merge, timer} from 'rxjs'
-import {connect, select} from 'store'
+import actionBuilder from 'action-builder'
+import PropTypes from 'prop-types'
+import React from 'react'
+import {merge, Subject, timer} from 'rxjs'
import {delay, filter, map, mergeMap} from 'rxjs/operators'
+import {connect, select} from 'store'
import {msg} from 'translate'
import {v4 as uuid} from 'uuid'
-import PropTypes from 'prop-types'
-import React from 'react'
-import actionBuilder from 'action-builder'
import styles from './notifications.module.css'
const PATH = 'Notifications'
@@ -69,9 +69,10 @@ class __Notifications extends React.Component {
}
renderError(error) {
+ const errorMessage = typeof error === 'string' ? error : error.message
return (
<div className={styles.error}>
- {error}
+ {errorMessage}
</div>
)
}
",9
"diff --git a/modules/gui/frontend/src/widget/userAgent.js b/modules/gui/frontend/src/widget/userAgent.js @@ -12,5 +12,5 @@ export const isMobile = () => {
return true
const dimensions = select('dimensions')
- return dimensions.width < 500 || dimensions.height < 500
+ return dimensions.width < 500 || (dimensions.height < 500 && dimensions.height > 0)
}
",9
"diff --git a/modules/google-earth-engine/docker/src/sepalinternal/radar/__init__.py b/modules/google-earth-engine/docker/src/sepalinternal/radar/__init__.py @@ -11,7 +11,7 @@ class RadarMosaic(ImageSpec):
self.spec = spec
self.model = spec['recipe']['model']
self.aoi = Aoi.create(spec['recipe']['model']['aoi'])
- self.bands = spec['bands']
+ self.bands = spec.get('bands', [])
self.time_scan = not self.model['dates'].get('targetDate')
self.harmonics_dependents = [
dependent
",9
"diff --git a/modules/google-earth-engine/docker/sepal-ee/sepal/ee/rx/drive.py b/modules/google-earth-engine/docker/sepal-ee/sepal/ee/rx/drive.py @@ -3,14 +3,15 @@ from threading import local
from apiclient import discovery
from apiclient.http import MediaIoBaseDownload
-from rx import Callable, concat, from_callable, of, throw
-from rx.operators import do_action, flat_map, filter, first, map, reduce, take_while
+from rx import Callable, concat, empty, from_callable, of, throw
+from rx.operators import do_action, expand, flat_map, filter, first, map, reduce, scan, take_while
from sepal.ee.rx import get_credentials
from sepal.rx import forever, using_file
from sepal.rx.workqueue import WorkQueue
CHUNK_SIZE = 10 * 1024 * 1024
+PAGE_SIZE = 100
class Drive(local):
@@ -44,15 +45,28 @@ class Drive(local):
)
def list_folder(self, folder, name_filter=None):
- def action():
+ def next_page(acc):
+ def load_page():
if name_filter:
q = ""'{0}' in parents and name = '{1}'"".format(folder['id'], name_filter)
else:
q = ""'{0}' in parents"".format(folder['id'])
- files = self.service.files().list(
+ page = self.service.files().list(
q=q,
- fields=""files(id, name, size, mimeType, modifiedTime)""
- ).execute().get('files', [])
+ fields=""nextPageToken, files(id, name, size, mimeType, modifiedTime)"",
+ pageSize=PAGE_SIZE,
+ pageToken=acc.get('nextPageToken')).execute()
+ return page
+
+ return _execute(load_page, retries=0).pipe(
+ map(lambda page: {
+ 'files': acc['files'] + page.get('files', []),
+ 'nextPageToken': page.get('nextPageToken')
+ })
+ )
+
+ def extract_files(result):
+ files = result.get('files', [])
for file in files:
file['path'] = '{}{}{}'.format(
folder['path'],
@@ -61,9 +75,10 @@ class Drive(local):
)
return files
- # TODO: Deal with pagination
-
- return _execute(action)
+ return next_page({'files': [], 'nextPageToken': None}).pipe(
+ expand(lambda acc: next_page(acc) if acc.get('nextPageToken') else empty()),
+ map(extract_files)
+ )
def list_folder_recursively(self, folder):
def recurse(file):
@@ -78,7 +93,7 @@ class Drive(local):
return self.list_folder(folder).pipe(
flat_map(lambda files: of(*files)),
flat_map(recurse),
- reduce(lambda acc, files: acc + files, [])
+ reduce(lambda acc, files: acc + files, []),
)
def download(self, file, destination):
@@ -125,12 +140,38 @@ class Drive(local):
)
return next_destination
+ def seed_stats(files):
+ return {
+ 'progress': 0,
+ 'total_files': len(files),
+ 'total_bytes': sum([int(f.get('size', 0)) for f in files]),
+ 'downloaded_files': 0,
+ 'downloaded_bytes': 0
+ }
+
+ def update_stats(stats, download):
+ downloaded_files = stats['downloaded_files'] + (0 if download['progress'] < 1 else 1)
+ downloaded_bytes = stats['downloaded_bytes'] + download['downloaded_bytes']
+ progress = downloaded_bytes / stats['total_bytes']
+ return {
+ 'progress': progress,
+ 'total_files': stats['total_files'],
+ 'total_bytes': stats['total_bytes'],
+ 'downloaded_files': downloaded_files,
+ 'downloaded_bytes': downloaded_bytes
+ }
+
if _is_folder(file):
return self.list_folder_recursively(file).pipe(
- flat_map(lambda files: of(*files)),
+ flat_map(
+ lambda files: of(True).pipe(
+ flat_map(lambda _: of(*files).pipe(
filter(lambda f: not _is_folder(f)),
- # TODO: Come up with a new destination based on f['path'] and file['path'] difference
flat_map(lambda f: self.download(f, get_destination(f)))
+ )),
+ scan(update_stats, seed_stats(files))
+ )
+ )
)
else:
return self.download(file, destination)
",9
"diff --git a/modules/google-earth-engine/docker/sepal-ee/sepal/drive/rx/download.py b/modules/google-earth-engine/docker/sepal-ee/sepal/drive/rx/download.py @@ -154,7 +154,7 @@ def download(
flat_map(
lambda files: combine_latest(
*[download_file(f, get_file_destination(f)) for f in files]
- )
+ ) if files else empty()
),
flat_map(aggregate_progress)
)
",9
"diff --git a/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/task/endpoint/TaskEndpoint.groovy b/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/task/endpoint/TaskEndpoint.groovy @@ -98,7 +98,7 @@ class TaskEndpoint {
submit(new UpdateTaskProgress(
taskId: taskId,
state: Task.State.ACTIVE,
- statusDescription: description,
+ statusDescription: toJson(description),
username: currentUser.username
))
}
",9
"diff --git a/lib/js/shared/src/ee/aoi.js b/lib/js/shared/src/ee/aoi.js @@ -24,12 +24,15 @@ const polygon = ({path}) =>
const eeTable = ({id, keyColumn, key}) => {
const table = ee.FeatureCollection(id)
+ if (keyColumn) {
const filters = [ee.Filter.eq(keyColumn, key)]
if (_.isFinite(key))
filters.push(ee.Filter.eq(keyColumn, _.toNumber(key)))
-
return table
.filter(ee.Filter.or(...filters))
+ } else {
+ return table
+ }
}
module.exports = {toGeometry, toFeatureCollection}
",9
"diff --git a/modules/gui/frontend/src/app/home/map/tileProvider/monitoringTileProvider.js b/modules/gui/frontend/src/app/home/map/tileProvider/monitoringTileProvider.js +import {BehaviorSubject} from 'rxjs'
import {DelegatingTileProvider} from './delegatingTileProvider'
-import {Subject} from 'rxjs'
-import {finalize, scan} from 'rxjs/operators'
+import {debounceTime, finalize} from 'rxjs/operators'
export class MonitoringTileProvider extends DelegatingTileProvider {
constructor(nextTileProvider, progress$) {
- super()
- this.nextTileProvider = nextTileProvider
- this.requestById = {}
- this.pending$ = new Subject()
+ super(nextTileProvider)
+ this.pending$ = new BehaviorSubject(0)
this.pending$.pipe(
- scan((pending, current) => pending += current)
+ debounceTime(200)
).subscribe(
pending => progress$ && progress$.next({loading: pending})
)
- }
-
- addRequest(requestId) {
- this.requestById[requestId] = Date.now()
- this.pending$.next(1)
- }
-
- removeRequest(requestId) {
- delete this.requestById[requestId]
- this.pending$.next(-1)
+ this.requests = {}
}
loadTile$(tileRequest) {
- const requestId = tileRequest.id
- this.addRequest(requestId)
- return this.nextTileProvider.loadTile$(tileRequest).pipe(
- finalize(() => this.removeRequest(requestId))
+ this.pending$.next(this.pending$.value + 1)
+ return super.loadTile$(tileRequest).pipe(
+ finalize(() => {
+ this.requests[tileRequest.id] = true
+ this.pending$.next(this.pending$.value - 1)
+ })
)
}
- releaseTile(tileElement) {
- return this.nextTileProvider.releaseTile(tileElement)
+ releaseTile(requestId) {
+ if (!this.requests[requestId]) {
+ super.releaseTile(requestId)
+ this.pending$.next(this.pending$.value - 1)
+ }
+ delete this.requests[requestId]
}
}
",9
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipe/opticalMosaic/opticalMosaicRecipe.js b/modules/gui/frontend/src/app/home/body/process/recipe/opticalMosaic/opticalMosaicRecipe.js @@ -107,7 +107,7 @@ export const RecipeActions = id => {
}
export const getAllVisualizations = recipe => [
- ...Object.values((recipe.layers.userDefinedVisualizations['this-recipe'] || {})),
+ ...Object.values((selectFrom(recipe, ['layers.userDefinedVisualizations', 'this-recipe']) || {})),
...visualizations[reflectance(recipe)],
...visualizations.indexes,
...(median(recipe) ? visualizations.metadata : [])
",9
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipe/classification/panels/trainingData/sampleClassificationSection.js b/modules/gui/frontend/src/app/home/body/process/recipe/classification/panels/trainingData/sampleClassificationSection.js @@ -152,7 +152,8 @@ class SampleClassificationSection extends Component {
}
},
error => {
- const {response: {defaultMessage, messageKey, messageArgs} = {}} = error
+ const response = error.response || {}
+ const {defaultMessage, messageKey, messageArgs} = response
this.props.inputs.assetToSample.setInvalid(
messageKey
? msg(messageKey, messageArgs, defaultMessage)
",9
"diff --git a/modules/gateway/docker/src/proxy.js b/modules/gateway/docker/src/proxy.js @@ -20,14 +20,15 @@ const logLevel = sepalLogLevel === 'trace'
: sepalLogLevel
const proxy = app =>
- ({path, target, authenticate, cache, noCache, rewrite}) => {
- const proxyMiddleware = createProxyMiddleware({
+ ({path, target, prefix, authenticate, cache, noCache, rewrite}) => {
+ const proxyMiddleware = createProxyMiddleware(path, {
target,
logProvider,
logLevel,
proxyTimeout: 0,
timeout: 0,
pathRewrite: {[`^${path}`]: ''},
+ ignorePath: !prefix,
changeOrigin: true,
ws: true,
onOpen: () => {
@@ -42,10 +43,10 @@ const proxy = app =>
onProxyReq: (proxyReq, req) => {
const user = req.session.user
const username = user ? user.username : 'not-authenticated'
- req.socket.on('close', () => {
- log.trace(`[${username}] [${req.originalUrl}] Response closed`)
- proxyReq.destroy()
- })
+ // req.socket.on('close', () => {
+ // log.trace(`[${username}] [${req.originalUrl}] Response closed`)
+ // proxyReq.destroy()
+ // })
if (authenticate && user) {
log.trace(`[${username}] [${req.originalUrl}] Setting sepal-user header`)
proxyReq.setHeader('sepal-user', JSON.stringify(user))
@@ -81,5 +82,3 @@ const proxy = app =>
}
module.exports = {proxyEndpoints}
-
-// TODO: Non-prefix endpoints
",9
"diff --git a/modules/gui/frontend/src/sources.js b/modules/gui/frontend/src/sources.js @@ -37,7 +37,7 @@ export const getAvailableBands = ({
include = ['class', 'regression', 'class_probability', 'probabilities']
} = {}
}) => {
- const dataSetIds = dataSets || [dataSetId]
+ const dataSetIds = dataSets || dataSetId ? [dataSetId] : []
const dataSetBands = Object.keys(
dataSetIds.find(dataSetId => isOpticalDataSet(dataSetId))
? getAvailableOpticalBands(
@@ -63,7 +63,7 @@ export const groupedBandOptions = ({
include = ['class', 'regression', 'class_probability', 'probabilities']
} = {}
}) => {
- const dataSetIds = dataSets || [dataSetId]
+ const dataSetIds = dataSets || dataSetId ? [dataSetId] : []
const dataSetOptions = dataSetIds.find(dataSetId => isOpticalDataSet(dataSetId))
? getGroupedOpticalBandOptions(
toOpticalRecipe({dataSetIds, corrections}),
",9
"diff --git a/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/hostingservice/aws/AwsInstanceProvider.groovy b/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/hostingservice/aws/AwsInstanceProvider.groovy @@ -62,8 +62,13 @@ final class AwsInstanceProvider implements InstanceProvider {
LOG.debug(""Getting instance $instance.id to see if the public ID is assigned yet, "" +
""instanceType: $instanceType, reservation: $reservation"")
+ try {
instance = getInstance(instance.id)
LOG.debug(""Got instance $instance"")
+ } catch (AmazonEC2Exception ignore) {
+ // Instance might not be available straight away
+ LOG.warn(""Failed to get instance $instance.id. Will still keep on waiting for it to become available."")
+ }
Thread.sleep(1000)
}
if (!instance.host)
@@ -256,17 +261,17 @@ final class AwsInstanceProvider implements InstanceProvider {
private void tagInstance(String instanceId, Collection<Tag>... tagCollections) {
try {
- retry(10) {
+ retry(10, ({
def tags = tagCollections.toList().flatten() as Tag[]
LOG.info(""Tagging instance $instanceId with $tags"")
def request = new CreateTagsRequest()
.withResources(instanceId)
.withTags(tags)
client.createTags(request)
- }
+ } as Closure<Void>))
} catch (Exception e) {
- terminate()
- throw new FailedToTagInstance(""Failed to tag instance $instanceId with $tags"", e)
+ terminate(instanceId)
+ throw new FailedToTagInstance(""Failed to tag instance $instanceId with $tagCollections"", e)
}
}
@@ -285,7 +290,7 @@ final class AwsInstanceProvider implements InstanceProvider {
}
}
- private int backoff(int retries) {
+ private void backoff(int retries) {
def millis = (long) Math.pow(2, retries ?: 0) * 1000
Thread.sleep(millis)
}
",9
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipe/classChange/panels/inputImage/imageForm.js b/modules/gui/frontend/src/app/home/body/process/recipe/classChange/panels/inputImage/imageForm.js @@ -26,7 +26,9 @@ class ImageForm extends Component {
{React.createElement(inputComponent, {
input,
onLoading: () => {
+ band.set(null)
bands.set({})
+ legendEntries.set(null)
},
onLoaded: ({id, bands, metadata, visualizations, recipe}) => this.onLoaded(id, bands, metadata, visualizations, recipe)
})}
@@ -81,7 +83,11 @@ class ImageForm extends Component {
const bandNames = Object.keys(loadedBands)
const selectedBand = band.value
if (!selectedBand || !bandNames.includes(selectedBand)) {
- const defaultBand = bandNames.find(bandName => loadedBands[bandName].values.length)
+ const defaultBand = bandNames
+ .find(bandName => {
+ const values = loadedBands[bandName].values
+ return values && values.length
+ })
|| bandNames[0]
band.set(defaultBand)
}
",9
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipe/recipeImageLayerSource.js b/modules/gui/frontend/src/app/home/body/process/recipe/recipeImageLayerSource.js @@ -54,7 +54,7 @@ class _RecipeImageLayerSource extends React.Component {
const {currentUserDefinedVisualizations, recipeId, source, recipeActionBuilder} = this.props
const description = toDescription(recipe)
if (recipeId !== source.sourceConfig.recipeId) {
- const userDefinedVisualizations = selectFrom(recipe, 'layers.userDefinedVisualizations.this-recipe')
+ const userDefinedVisualizations = selectFrom(recipe, 'layers.userDefinedVisualizations.this-recipe') || []
const currentVisualizationIds = currentUserDefinedVisualizations.map(({id}) => id)
userDefinedVisualizations
.reduce(
",9
"diff --git a/modules/gee/src/jobs/ee/ccdc/loadSegments.js b/modules/gee/src/jobs/ee/ccdc/loadSegments.js @@ -27,7 +27,10 @@ const worker$ = ({recipe, latLng, bands}) => {
)
const assetSegments$ = () =>
- of(new ee.Image(recipe.id))
+ imageFactory({
+ type: 'ASSET',
+ id: recipe.id
+ }).getImage$()
const recipeRef$ = () => imageFactory(recipe, {selection: bands}).getRecipe$()
",9
"diff --git a/modules/gui/src/app/home/map/imageLayerSource/planetImageLayer.js b/modules/gui/src/app/home/map/imageLayerSource/planetImageLayer.js @@ -166,9 +166,13 @@ class _PlanetImageLayer extends React.Component {
)
return filtered.length
? this.selectUrlTemplate(filtered[0].urlTemplate)
- : this.selectUrlTemplate(mosaics[0].urlTemplate)
+ : mosaics.length
+ ? this.selectUrlTemplate(mosaics[0].urlTemplate)
+ : null
} else {
- return this.selectUrlTemplate(mosaics[0].urlTemplate)
+ return mosaics.length
+ ? this.selectUrlTemplate(mosaics[0].urlTemplate)
+ : null
}
}
",9
"diff --git a/packages/vega-scenegraph/src/render/svg/SVGRenderer.js b/packages/vega-scenegraph/src/render/svg/SVGRenderer.js @@ -192,23 +192,31 @@ prototype._dirtyCheck = function(items) {
if (!items) return true;
var id = ++this._dirtyID,
- item, mark, mdef, i, n;
+ item, mark, mdef, i, n, o;
for (i=0, n=items.length; i<n; ++i) {
item = items[i];
+ mark = item.mark;
+ mdef = marks[mark.marktype];
if (item.status === 'exit') { // EXIT
if (item._svg) {
+ if (mdef.nest && item.mark.items.length) {
+ // if nested mark with remaining points, update instead
+ this._update(mdef, item._svg, item.mark.items[0]);
+ o = item.mark.items[0];
+ o._svg = item._svg;
+ o._update = id;
+ } else {
+ // otherwise remove from DOM
DOM.remove(item._svg);
+ }
item._svg = null;
}
continue;
}
- mark = item.mark;
- mdef = marks[mark.marktype];
item = (mdef.nest ? mark.items[0] : item);
-
if (item._update === id) { // Already processed
continue;
} else if (item._svg) { // UPDATE
",9
"diff --git a/packages/vega-geo/src/GeoPoint.js b/packages/vega-geo/src/GeoPoint.js @@ -29,8 +29,8 @@ prototype.transform = function(_, pulse) {
function set(t) {
var xy = proj([lon(t), lat(t)]);
- t[x] = xy[0];
- t[y] = xy[1];
+ if (xy) t[x] = xy[0], t[y] = xy[1];
+ else t[x] = undefined, t[y] = undefined;
}
if (_.modified()) {
",9
"diff --git a/rnv-cli/src/platformTools/android.js b/rnv-cli/src/platformTools/android.js @@ -35,11 +35,11 @@ import { copyFolderContentsRecursiveSync, copyFileSync, mkdirSync } from '../fil
const readline = require('readline');
-const launchAndroidSimulator = (c, platform, target, isIndependentThread = false) => new Promise((resolve, reject) => {
+const launchAndroidSimulator = (c, platform, target, isIndependentThread = false) => {
logTask(`launchAndroidSimulator:${platform}:${target}`);
if (target === '?' || target === undefined || target === '') {
- _listAndroidTargets(c, true, false)
+ return _listAndroidTargets(c, true, false)
.then((devicesArr) => {
let devicesString = '\n';
@@ -56,39 +56,25 @@ const launchAndroidSimulator = (c, platform, target, isIndependentThread = false
if (isIndependentThread) {
// const child = require('child_process').spawn(c.cli[CLI_ANDROID_EMULATOR], [
// '-avd', `""${selectedDevice.name}""`]);
- execCLI(c, CLI_ANDROID_EMULATOR, `-avd ""${selectedDevice.name}""`);
- resolve();
- } else {
- execCLI(c, CLI_ANDROID_EMULATOR, `-avd ""${selectedDevice.name}""`)
- .then(() => resolve())
- .catch(e => reject(e));
+ return execCLI(c, CLI_ANDROID_EMULATOR, `-avd ""${selectedDevice.name}""`).catch(logError);
}
- } else {
- logError(`Wrong choice ${v}! Ingoring`);
+ return execCLI(c, CLI_ANDROID_EMULATOR, `-avd ""${selectedDevice.name}""`);
}
+ logError(`Wrong choice ${v}! Ingoring`);
+ });
});
- })
- .catch(e => reject(e));
-
- return;
}
if (target) {
if (isIndependentThread) {
// const child = require('child_process').spawn(c.cli[CLI_ANDROID_EMULATOR], [
// '-avd', `""${target}""`]);
- execCLI(c, CLI_ANDROID_EMULATOR, `-avd ""${target}""`);
- resolve();
- } else {
- execCLI(c, CLI_ANDROID_EMULATOR, `-avd ""${target}""`)
- .then(() => resolve())
- .catch(e => reject(e));
+ return execCLI(c, CLI_ANDROID_EMULATOR, `-avd ""${target}""`).catch(logError);
}
-
- return;
+ return execCLI(c, CLI_ANDROID_EMULATOR, `-avd ""${target}""`);
}
- reject('No simulator -t target name specified!');
-});
+ return Promise.reject('No simulator -t target name specified!');
+};
const listAndroidTargets = c => new Promise((resolve, reject) => {
logTask('listAndroidTargets');
@@ -212,14 +198,16 @@ const _askForNewEmulator = (c, platform) => new Promise((resolve, reject) => {
);
});
-const _createEmulator = (c, apiVersion, emuPlatform, emuName) => new Promise((resolve, reject) => {
+const _createEmulator = (c, apiVersion, emuPlatform, emuName) => {
logTask('_createEmulator');
- return execCLI(c, CLI_ANDROID_SDKMANAGER, `""system-images;android-${apiVersion};${emuPlatform};x86""`).then(() => execCLI(
+ return execCLI(c, CLI_ANDROID_SDKMANAGER, `""system-images;android-${apiVersion};${emuPlatform};x86""`)
+ .then(() => execCLI(
c,
CLI_ANDROID_AVDMANAGER,
`create avd -n ${emuName} -k ""system-images;android-${apiVersion};${emuPlatform};x86"" `,
- ));
-});
+ ))
+ .catch(e => logError(e, true));
+};
const copyAndroidAssets = (c, platform) => new Promise((resolve) => {
logTask('copyAndroidAssets');
",9
"diff --git a/server/persistence/login.go b/server/persistence/login.go package persistence
import (
+ ""context""
""encoding/base64""
""fmt""
+ ""sync""
""github.com/lestrrat-go/jwx/jwk""
""github.com/offen/offen/server/keys""
@@ -274,11 +276,26 @@ func (p *persistenceLayer) findAccountUser(emailAddress string, includeRelations
}
func selectAccountUser(available []AccountUser, email string) (*AccountUser, error) {
- // TODO: run this concurrently without leaking goroutines
- for _, accountUser := range available {
+ ctx, cancel := context.WithCancel(context.Background())
+ match := make(chan AccountUser)
+ wg := sync.WaitGroup{}
+ for _, a := range available {
+ wg.Add(1)
+ go func(accountUser AccountUser) {
if err := keys.CompareString(email, accountUser.HashedEmail); err == nil {
- return &accountUser, nil
- }
- }
+ match <- accountUser
+ }
+ wg.Done()
+ }(a)
+ }
+ go func() {
+ wg.Wait()
+ cancel()
+ }()
+ select {
+ case result := <-match:
+ return &result, nil
+ case <-ctx.Done():
return nil, fmt.Errorf(""persistence: no account user found for %s"", email)
}
+}
",9
"diff --git a/src/commands/watch.js b/src/commands/watch.js @@ -43,6 +43,8 @@ export default asyncCommand({
async handler(argv) {
argv.production = false;
+ if (process.env.HTTPS) argv.https = true;
+
if (argv.https) {
let ssl = await getSslCert();
if (!ssl) {
",9
"diff --git a/html/src/app.js b/html/src/app.js @@ -1863,9 +1863,12 @@ speechSynthesis.getVoices();
}
*/
API.getInstanceShortName = function (params) {
- return this.call(`instances/${params.worldId}:${params.instanceId}/shortName`, {
+ return this.call(
+ `instances/${params.worldId}:${params.instanceId}/shortName`,
+ {
method: 'GET'
- }).then((json) => {
+ }
+ ).then((json) => {
var args = {
json,
params
@@ -6952,7 +6955,9 @@ speechSynthesis.getVoices();
$app.data.showUserDialogHistory = new Set();
$app.methods.quickSearchUserHistory = function () {
- var userHistory = Array.from(this.showUserDialogHistory.values()).reverse().slice(0, 5);
+ var userHistory = Array.from(this.showUserDialogHistory.values())
+ .reverse()
+ .slice(0, 5);
var results = [];
userHistory.forEach((userId) => {
var ref = API.cachedUsers.get(userId);
@@ -10183,16 +10188,23 @@ speechSynthesis.getVoices();
var input = instance.inputValue;
var testUrl = input.substring(0, 15);
if (testUrl === 'https://vrch.at') {
- AppApi.FollowUrl(input).then((url) => {
+ AppApi.FollowUrl(input).then((output) => {
+ var url = output;
// /home/launch?worldId=wrld_f20326da-f1ac-45fc-a062-609723b097b1&instanceId=33570~region(jp)&shortName=cough-stockinglinz-ddd26
// https://vrch.at/wrld_f20326da-f1ac-45fc-a062-609723b097b1
- if (url.substring(0, 18) === 'https://vrchat.com') {
+ if (
+ url.substring(0, 18) ===
+ 'https://vrchat.com'
+ ) {
url = url.substring(18);
}
if (url.substring(0, 13) === '/home/launch?') {
- var urlParams = new URLSearchParams(url.substring(13));
+ var urlParams = new URLSearchParams(
+ url.substring(13)
+ );
var worldId = urlParams.get('worldId');
- var instanceId = urlParams.get('instanceId');
+ var instanceId =
+ urlParams.get('instanceId');
if (instanceId) {
var location = `${worldId}:${instanceId}`;
this.showWorldDialog(location);
@@ -12721,7 +12733,10 @@ speechSynthesis.getVoices();
}
D.url = getLaunchURL(L.worldId, L.instanceId);
D.visible = true;
- API.getInstanceShortName({worldId: L.worldId, instanceId: L.instanceId});
+ API.getInstanceShortName({
+ worldId: L.worldId,
+ instanceId: L.instanceId
+ });
};
$app.methods.locationToLaunchArg = function (location) {
",9
"diff --git a/src/browser/errorParser.js b/src/browser/errorParser.js @@ -61,7 +61,9 @@ function Stack(exception) {
}
var name = exception.constructor && exception.constructor.name;
- name = name || exception.name;
+ if (!name || !name.length || name.length < 3) {
+ name = exception.name;
+ }
return {
stack: getStack(),
",9
"diff --git a/src/server/rollbar.js b/src/server/rollbar.js @@ -263,8 +263,15 @@ Rollbar.errorHandler = function() {
};
Rollbar.prototype.lambdaHandler = function(handler, timeoutHandler) {
+ if (handler.length <= 2) {
+ return this.asyncLambdaHandler(handler, timeoutHandler);
+ }
+ return this.syncLambdaHandler(handler, timeoutHandler);
+};
+
+Rollbar.prototype.asyncLambdaHandler = function(handler, timeoutHandler) {
var self = this;
- var _timeoutHandler = function(event, context, cb) {
+ var _timeoutHandler = function(event, context) {
var message = 'Function timed out';
var custom = {
originalEvent: event,
@@ -273,25 +280,43 @@ Rollbar.prototype.lambdaHandler = function(handler, timeoutHandler) {
self.error(message, custom);
};
var shouldReportTimeouts = self.options.captureLambdaTimeouts;
- return function(event, context, callback) {
+ return function(event, context) {
+ return new Promise(function(resolve, reject) {
self.lambdaContext = context;
if (shouldReportTimeouts) {
- var timeoutCb = (timeoutHandler || _timeoutHandler).bind(null, event, context, callback);
+ var timeoutCb = (timeoutHandler || _timeoutHandler).bind(null, event, context);
self.lambdaTimeoutHandle = setTimeout(timeoutCb, context.getRemainingTimeInMillis() - 1000);
}
- try {
- if (handler.length <= 2) {
- // handler is async
handler(event, context)
- .then(function(resp) { return callback(null, resp); })
+ .then(function(resp) { resolve(resp); })
.catch(function(err) {
self.error(err);
self.wait(function() {
clearTimeout(self.lambdaTimeoutHandle);
- callback(err);
+ reject(err);
});
});
- } else {
+ });
+ };
+};
+Rollbar.prototype.syncLambdaHandler = function(handler, timeoutHandler) {
+ var self = this;
+ var _timeoutHandler = function(event, context, cb) {
+ var message = 'Function timed out';
+ var custom = {
+ originalEvent: event,
+ originalRequestId: context.awsRequestId,
+ };
+ self.error(message, custom);
+ };
+ var shouldReportTimeouts = self.options.captureLambdaTimeouts;
+ return function(event, context, callback) {
+ self.lambdaContext = context;
+ if (shouldReportTimeouts) {
+ var timeoutCb = (timeoutHandler || _timeoutHandler).bind(null, event, context, callback);
+ self.lambdaTimeoutHandle = setTimeout(timeoutCb, context.getRemainingTimeInMillis() - 1000);
+ }
+ try {
handler(event, context, function(err, resp) {
if (err) {
self.error(err);
@@ -301,7 +326,6 @@ Rollbar.prototype.lambdaHandler = function(handler, timeoutHandler) {
callback(err, resp);
});
});
- }
} catch (err) {
self.error(err);
self.wait(function() {
",9
"diff --git a/bin/cordova b/bin/cordova @@ -26,7 +26,8 @@ const cli = require('../src/cli');
cli(process.argv).catch(err => {
if (!(err instanceof Error)) {
- throw new CordovaError('Promise rejected with non-error: ' + util.inspect(err));
+ const errorOutput = typeof err === 'string' ? err : util.inspect(err);
+ throw new CordovaError('Promise rejected with non-error: ' + errorOutput);
}
process.exitCode = err.code || 1;
",9
"diff --git a/scss/_functions.scss b/scss/_functions.scss @@ -181,6 +181,14 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
@return $value1 + $value2;
}
+ @if type-of($value1) != number {
+ $value1: unquote(""("") + $value1 + unquote("")"");
+ }
+
+ @if type-of($value2) != number {
+ $value2: unquote(""("") + $value2 + unquote("")"");
+ }
+
@return if($return-calc == true, calc(#{$value1} + #{$value2}), $value1 + unquote("" + "") + $value2);
}
@@ -201,5 +209,13 @@ $_luminance-list: .0008 .001 .0011 .0013 .0015 .0017 .002 .0022 .0025 .0027 .003
@return $value1 - $value2;
}
+ @if type-of($value1) != number {
+ $value1: unquote(""("") + $value1 + unquote("")"");
+ }
+
+ @if type-of($value2) != number {
+ $value2: unquote(""("") + $value2 + unquote("")"");
+ }
+
@return if($return-calc == true, calc(#{$value1} - #{$value2}), $value1 + unquote("" - "") + $value2);
}
",9
"diff --git a/modules/helpers/modifiers.js b/modules/helpers/modifiers.js @@ -71,7 +71,7 @@ export default class ModifierHelpers {
});
}
}
- } else if (item.type === ""forcepower"" || item.type === ""specialization"") {
+ } else if (item.type === ""forcepower"" || item.type === ""specialization"" || item.type === ""signatureability"") {
// apply basic force power/specialization modifiers
if (attrsToApply.length > 0) {
attrsToApply.forEach((attr) => {
@@ -89,7 +89,7 @@ export default class ModifierHelpers {
});
}
let upgrades;
- if (item.type === ""forcepower"") {
+ if (item.type === ""forcepower"" || item.type === ""signatureability"") {
// apply force power upgrades
upgrades = Object.keys(item.data.upgrades)
.filter((k) => item.data.upgrades[k].islearned)
",9
"diff --git a/modules/ffg-destiny-tracker.js b/modules/ffg-destiny-tracker.js @@ -101,7 +101,7 @@ export default class DestinyTracker extends FormApplication {
const pointType = event.currentTarget.dataset.group;
var typeName = null;
const add = event.shiftKey;
- const remove = event.ctrlKey;
+ const remove = event.ctrlKey || event.metaKey;
var flipType = null;
var actionType = null;
if (pointType == ""dPoolLight"") {
",9
"diff --git a/src/text-editor-component.js b/src/text-editor-component.js @@ -29,6 +29,9 @@ class TextEditorComponent {
this.horizontalPixelPositionsByScreenLineId = new Map() // Values are maps from column to horiontal pixel positions
this.lineNodesByScreenLineId = new Map()
this.textNodesByScreenLineId = new Map()
+ this.lastKeydown = null
+ this.lastKeydownBeforeKeypress = null
+ this.openedAccentedCharacterMenu = false
this.cursorsToRender = []
if (this.props.model) this.observeModel()
@@ -350,7 +353,13 @@ class TextEditorComponent {
ref: 'hiddenInput',
key: 'hiddenInput',
className: 'hidden-input',
- on: {blur: this.didBlur},
+ on: {
+ blur: this.didBlur,
+ textInput: this.didTextInput,
+ keydown: this.didKeydown,
+ keyup: this.didKeyup,
+ keypress: this.didKeypress
+ },
tabIndex: -1,
style: {
position: 'absolute',
@@ -491,6 +500,72 @@ class TextEditorComponent {
}
}
+ didTextInput (event) {
+ event.stopPropagation()
+
+ // WARNING: If we call preventDefault on the input of a space character,
+ // then the browser interprets the spacebar keypress as a page-down command,
+ // causing spaces to scroll elements containing editors. This is impossible
+ // to test.
+ if (event.data !== ' ') event.preventDefault()
+
+ // if (!this.isInputEnabled()) return
+
+ // Workaround of the accented character suggestion feature in macOS. This
+ // will only occur when the user is not composing in IME mode. When the user
+ // selects a modified character from the macOS menu, `textInput` will occur
+ // twice, once for the initial character, and once for the modified
+ // character. However, only a single keypress will have fired. If this is
+ // the case, select backward to replace the original character.
+ if (this.openedAccentedCharacterMenu) {
+ this.getModel().selectLeft()
+ this.openedAccentedCharacterMenu = false
+ }
+
+ this.getModel().insertText(event.data, {groupUndo: true})
+ }
+
+ // We need to get clever to detect when the accented character menu is
+ // opened on macOS. Usually, every keydown event that could cause input is
+ // followed by a corresponding keypress. However, pressing and holding
+ // long enough to open the accented character menu causes additional keydown
+ // events to fire that aren't followed by their own keypress and textInput
+ // events.
+ //
+ // Therefore, we assume the accented character menu has been deployed if,
+ // before observing any keyup event, we observe events in the following
+ // sequence:
+ //
+ // keydown(keyCode: X), keypress, keydown(keyCode: X)
+ //
+ // The keyCode X must be the same in the keydown events that bracket the
+ // keypress, meaning we're *holding* the _same_ key we intially pressed.
+ // Got that?
+ didKeydown (event) {
+ if (this.lastKeydownBeforeKeypress != null) {
+ if (this.lastKeydownBeforeKeypress.keyCode === event.keyCode) {
+ this.openedAccentedCharacterMenu = true
+ }
+ this.lastKeydownBeforeKeypress = null
+ } else {
+ this.lastKeydown = event
+ }
+ }
+
+ didKeypress () {
+ this.lastKeydownBeforeKeypress = this.lastKeydown
+ this.lastKeydown = null
+
+ // This cancels the accented character behavior if we type a key normally
+ // with the menu open.
+ this.openedAccentedCharacterMenu = false
+ }
+
+ didKeyup () {
+ this.lastKeydownBeforeKeypress = null
+ this.lastKeydown = null
+ }
+
performInitialMeasurements () {
this.measurements = {}
this.staleMeasurements = {}
@@ -628,7 +703,9 @@ class TextEditorComponent {
observeModel () {
const {model} = this.props
- this.disposables.add(model.selectionsMarkerLayer.onDidUpdate(this.scheduleUpdate.bind(this)))
+ const scheduleUpdate = this.scheduleUpdate.bind(this)
+ this.disposables.add(model.selectionsMarkerLayer.onDidUpdate(scheduleUpdate))
+ this.disposables.add(model.displayLayer.onDidChangeSync(scheduleUpdate))
}
isVisible () {
",9
"diff --git a/src/text-editor-component.js b/src/text-editor-component.js @@ -36,7 +36,7 @@ class TextEditorComponent {
this.previousScrollHeight = 0
this.lastKeydown = null
this.lastKeydownBeforeKeypress = null
- this.openedAccentedCharacterMenu = false
+ this.accentedCharacterMenuIsOpen = false
this.decorationsToRender = {
lineNumbers: new Map(),
lines: new Map(),
@@ -368,7 +368,10 @@ class TextEditorComponent {
textInput: this.didTextInput,
keydown: this.didKeydown,
keyup: this.didKeyup,
- keypress: this.didKeypress
+ keypress: this.didKeypress,
+ compositionstart: this.didCompositionStart,
+ compositionupdate: this.didCompositionUpdate,
+ compositionend: this.didCompositionEnd
},
tabIndex: -1,
style: {
@@ -643,17 +646,12 @@ class TextEditorComponent {
// to test.
if (event.data !== ' ') event.preventDefault()
+ // TODO: Deal with disabled input
// if (!this.isInputEnabled()) return
- // Workaround of the accented character suggestion feature in macOS. This
- // will only occur when the user is not composing in IME mode. When the user
- // selects a modified character from the macOS menu, `textInput` will occur
- // twice, once for the initial character, and once for the modified
- // character. However, only a single keypress will have fired. If this is
- // the case, select backward to replace the original character.
- if (this.openedAccentedCharacterMenu) {
- this.getModel().selectLeft()
- this.openedAccentedCharacterMenu = false
+ if (this.compositionCheckpoint) {
+ this.getModel().revertToCheckpoint(this.compositionCheckpoint)
+ this.compositionCheckpoint = null
}
this.getModel().insertText(event.data, {groupUndo: true})
@@ -678,7 +676,8 @@ class TextEditorComponent {
didKeydown (event) {
if (this.lastKeydownBeforeKeypress != null) {
if (this.lastKeydownBeforeKeypress.keyCode === event.keyCode) {
- this.openedAccentedCharacterMenu = true
+ this.accentedCharacterMenuIsOpen = true
+ this.getModel().selectLeft()
}
this.lastKeydownBeforeKeypress = null
} else {
@@ -686,20 +685,44 @@ class TextEditorComponent {
}
}
- didKeypress () {
+ didKeypress (event) {
this.lastKeydownBeforeKeypress = this.lastKeydown
this.lastKeydown = null
// This cancels the accented character behavior if we type a key normally
// with the menu open.
- this.openedAccentedCharacterMenu = false
+ this.accentedCharacterMenuIsOpen = false
}
- didKeyup () {
+ didKeyup (event) {
this.lastKeydownBeforeKeypress = null
this.lastKeydown = null
}
+ // The IME composition events work like this:
+ //
+ // User types 's', chromium pops up the completion helper
+ // 1. compositionstart fired
+ // 2. compositionupdate fired; event.data == 's'
+ // User hits arrow keys to move around in completion helper
+ // 3. compositionupdate fired; event.data == 's' for each arry key press
+ // User escape to cancel
+ // 4. compositionend fired
+ // OR User chooses a completion
+ // 4. compositionend fired
+ // 5. textInput fired; event.data == the completion string
+ didCompositionStart (event) {
+ this.compositionCheckpoint = this.getModel().createCheckpoint()
+ }
+
+ didCompositionUpdate (event) {
+ this.getModel().insertText(event.data, {select: true})
+ }
+
+ didCompositionEnd (event) {
+ event.target.value = ''
+ }
+
didRequestAutoscroll (autoscroll) {
this.pendingAutoscroll = autoscroll
this.scheduleUpdate()
",9
"diff --git a/script/lib/generate-startup-snapshot.js b/script/lib/generate-startup-snapshot.js @@ -43,6 +43,9 @@ module.exports = function (packagedAppPath) {
relativePath == path.join('..', 'node_modules', 'glob', 'glob.js') ||
relativePath == path.join('..', 'node_modules', 'graceful-fs', 'graceful-fs.js') ||
relativePath == path.join('..', 'node_modules', 'htmlparser2', 'lib', 'index.js') ||
+ relativePath == path.join('..', 'node_modules', 'markdown-preview', 'node_modules', 'htmlparser2', 'lib', 'index.js') ||
+ relativePath == path.join('..', 'node_modules', 'roaster', 'node_modules', 'htmlparser2', 'lib', 'index.js') ||
+ relativePath == path.join('..', 'node_modules', 'task-lists', 'node_modules', 'htmlparser2', 'lib', 'index.js') ||
relativePath == path.join('..', 'node_modules', 'iconv-lite', 'encodings', 'index.js') ||
relativePath == path.join('..', 'node_modules', 'less', 'index.js') ||
relativePath == path.join('..', 'node_modules', 'less', 'lib', 'less', 'fs.js') ||
",9
"diff --git a/src/grammar-registry.js b/src/grammar-registry.js @@ -236,7 +236,7 @@ class GrammarRegistry extends FirstMate.GrammarRegistry {
grammarForLanguageName (languageName) {
const lowercaseLanguageName = languageName.toLowerCase()
- return this.getGrammars().find(grammar => grammar.name.toLowerCase() === lowercaseLanguageName)
+ return this.getGrammars().find(({name}) => name && name.toLowerCase() === lowercaseLanguageName)
}
grammarAddedOrUpdated (grammar) {
",9
"diff --git a/src/ipc-helpers.js b/src/ipc-helpers.js @@ -3,6 +3,8 @@ let ipcRenderer = null
let ipcMain = null
let BrowserWindow = null
+let nextResponseChannelId = 0
+
exports.on = function (emitter, eventName, callback) {
emitter.on(eventName, callback)
return new Disposable(() => emitter.removeListener(eventName, callback))
@@ -14,7 +16,7 @@ exports.call = function (channel, ...args) {
ipcRenderer.setMaxListeners(20)
}
- const responseChannel = getResponseChannel(channel)
+ const responseChannel = `ipc-helpers-response-${nextResponseChannelId++}`
return new Promise(resolve => {
ipcRenderer.on(responseChannel, (event, result) => {
@@ -22,7 +24,7 @@ exports.call = function (channel, ...args) {
resolve(result)
})
- ipcRenderer.send(channel, ...args)
+ ipcRenderer.send(channel, responseChannel, ...args)
})
}
@@ -33,15 +35,9 @@ exports.respondTo = function (channel, callback) {
BrowserWindow = electron.BrowserWindow
}
- const responseChannel = getResponseChannel(channel)
-
- return exports.on(ipcMain, channel, async (event, ...args) => {
+ return exports.on(ipcMain, channel, async (event, responseChannel, ...args) => {
const browserWindow = BrowserWindow.fromWebContents(event.sender)
const result = await callback(browserWindow, ...args)
event.sender.send(responseChannel, result)
})
}
-
-function getResponseChannel (channel) {
- return 'ipc-helpers-' + channel + '-response'
-}
",9
"diff --git a/src/menu-helpers.js b/src/menu-helpers.js @@ -26,7 +26,7 @@ function merge (menu, item, itemSpecificity = Infinity) {
for (let submenuItem of item.submenu) {
merge(matchingItem.submenu, submenuItem, itemSpecificity)
}
- } else if (itemSpecificity >= ItemSpecificities.get(matchingItem)) {
+ } else if (itemSpecificity && itemSpecificity >= ItemSpecificities.get(matchingItem)) {
menu[matchingItemIndex] = item
}
}
",9
"diff --git a/src/workspace.js b/src/workspace.js @@ -507,10 +507,13 @@ module.exports = class Workspace extends Model {
// It's important to call handleGrammarUsed after emitting the did-add event:
// if we activate a package between adding the editor to the registry and emitting
// the package may receive the editor twice from `observeTextEditors`.
+ // (Note that the item can be destroyed by an `observeTextEditors` handler.)
+ if (!item.isDestroyed()) {
subscriptions.add(
item.observeGrammar(this.handleGrammarUsed.bind(this))
)
}
+ }
})
}
",9
"diff --git a/script/lib/generate-startup-snapshot.js b/script/lib/generate-startup-snapshot.js @@ -37,6 +37,7 @@ module.exports = function (packagedAppPath) {
requiredModuleRelativePath.endsWith(path.join('node_modules', 'minimatch', 'minimatch.js')) ||
requiredModuleRelativePath.endsWith(path.join('node_modules', 'request', 'index.js')) ||
requiredModuleRelativePath.endsWith(path.join('node_modules', 'request', 'request.js')) ||
+ requiredModuleRelativePath.endsWith(path.join('node_modules', 'temp', 'lib', 'temp.js')) ||
requiredModuleRelativePath === path.join('..', 'exports', 'atom.js') ||
requiredModuleRelativePath === path.join('..', 'src', 'electron-shims.js') ||
requiredModuleRelativePath === path.join('..', 'node_modules', 'atom-keymap', 'lib', 'command-event.js') ||
@@ -60,7 +61,6 @@ module.exports = function (packagedAppPath) {
requiredModuleRelativePath === path.join('..', 'node_modules', 'spelling-manager', 'node_modules', 'natural', 'lib', 'natural', 'index.js') ||
requiredModuleRelativePath === path.join('..', 'node_modules', 'tar', 'tar.js') ||
requiredModuleRelativePath === path.join('..', 'node_modules', 'ls-archive', 'node_modules', 'tar', 'tar.js') ||
- requiredModuleRelativePath === path.join('..', 'node_modules', 'temp', 'lib', 'temp.js') ||
requiredModuleRelativePath === path.join('..', 'node_modules', 'tmp', 'lib', 'tmp.js') ||
requiredModuleRelativePath === path.join('..', 'node_modules', 'tree-sitter', 'index.js') ||
requiredModuleRelativePath === path.join('..', 'node_modules', 'yauzl', 'index.js') ||
",9
"diff --git a/src/panel-container-element.js b/src/panel-container-element.js @@ -54,7 +54,7 @@ class PanelContainerElement extends HTMLElement {
if (visible) { this.hideAllPanelsExcept(panel) }
}))
- if (panel.autoFocus !== false) {
+ if (panel.autoFocus) {
const focusOptions = {
// focus-trap will attempt to give focus to the first tabbable element
// on activation. If there aren't any tabbable elements,
",9
"diff --git a/v3/src/input/components/PointWithinGameObject.js b/v3/src/input/components/PointWithinGameObject.js @@ -8,6 +8,10 @@ var PointWithinGameObject = function (gameObject, x, y)
return false;
}
+ // Normalize the origin
+ x += gameObject.displayOriginX;
+ y += gameObject.displayOriginY;
+
return gameObject.hitAreaCallback(gameObject.hitArea, x, y);
};
",9
"diff --git a/v3/src/loader/filetypes/AudioFile.js b/v3/src/loader/filetypes/AudioFile.js @@ -14,7 +14,7 @@ var AudioFile = new Class({
function AudioFile (key, url, path, xhrSettings, soundManager)
{
- this.sound = soundManager;
+ this.soundManager = soundManager;
var fileConfig = {
type: 'audio',
@@ -33,12 +33,28 @@ var AudioFile = new Class({
{
this.state = CONST.FILE_PROCESSING;
- // TODO handle decoding
- this.data = this.xhrLoader.response;
+ var _this = this;
- this.onComplete();
+ // interesting read https://github.com/WebAudio/web-audio-api/issues/1305
+ this.soundManager.context.decodeAudioData(this.xhrLoader.response,
+ function (audioBuffer)
+ {
+ this.data = audioBuffer;
+
+ _this.onComplete();
- callback(this);
+ callback(_this);
+ },
+ function (e)
+ {
+ // TODO properly log decoding error
+ console.error('Error with decoding audio data for \'' + this.key + '\':', e.message);
+
+ _this.state = CONST.FILE_ERRORED;
+
+ callback(_this);
+ }
+ );
}
});
",9
"diff --git a/v3/src/sound/BaseSound.js b/v3/src/sound/BaseSound.js @@ -114,6 +114,10 @@ var BaseSound = new Class({
},
play: function (marker, config) {
if (marker === void 0) { marker = ''; }
+ if (typeof marker === 'object') {
+ config = marker;
+ marker = '';
+ }
if (typeof marker !== 'string') {
console.error('Sound marker name has to be a string!');
return null;
",9
"diff --git a/v3/src/sound/webaudio/WebAudioSound.js b/v3/src/sound/webaudio/WebAudioSound.js @@ -65,18 +65,25 @@ var WebAudioSound = new Class({
this.source.buffer = this.audioBuffer;
this.source.connect(this.muteNode);
this.applyConfig();
- this.source.start();
+ this.source.start(0, 0, this.currentConfig.duration);
this.startTime = this.manager.context.currentTime;
this.pausedTime = 0;
return this;
},
pause: function () {
BaseSound.prototype.pause.call(this);
+ this.source.stop();
+ this.source = null;
this.pausedTime = this.manager.context.currentTime - this.startTime;
return this;
},
resume: function () {
BaseSound.prototype.resume.call(this);
+ this.source = this.manager.context.createBufferSource();
+ this.source.buffer = this.audioBuffer;
+ this.source.connect(this.muteNode);
+ this.applyConfig();
+ this.source.start(0, this.pausedTime, this.currentConfig.duration - this.pausedTime);
this.startTime = this.manager.context.currentTime - this.pausedTime;
this.pausedTime = 0;
return this;
",9
"diff --git a/v3/src/gameobjects/text/static/Text.js b/v3/src/gameobjects/text/static/Text.js @@ -4,6 +4,7 @@ var Class = require('../../../utils/Class');
var Components = require('../../components');
var GameObject = require('../../GameObject');
var GetTextSize = require('../GetTextSize');
+var GetValue = require('../../../utils/object/GetValue');
var RemoveFromDOM = require('../../../dom/RemoveFromDOM');
var TextRender = require('./TextRender');
var TextStyle = require('../TextStyle');
@@ -68,10 +69,10 @@ var Text = new Class({
/**
* Specify a padding value which is added to the line width and height when calculating the Text size.
- * Allows you to add extra spacing if Phaser is unable to accurately determine the true font dimensions.
+ * Allows you to add extra spacing if the browser is unable to accurately determine the true font dimensions.
* @property {Phaser.Point} padding
*/
- this.padding = { x: 0, y: 0 };
+ this.padding = { left: 0, right: 0, top: 0, bottom: 0 };
this.width = 1;
this.height = 1;
@@ -81,6 +82,11 @@ var Text = new Class({
this.initRTL();
+ if (style && style.padding)
+ {
+ this.setPadding(style.padding);
+ }
+
this.setText(text);
var _this = this;
@@ -145,6 +151,21 @@ var Text = new Class({
return this.style.setFont(font);
},
+ setFontFamily: function (family)
+ {
+ return this.style.setFontFamily(family);
+ },
+
+ setFontSize: function (size)
+ {
+ return this.style.setFontSize(size);
+ },
+
+ setFontStyle: function (style)
+ {
+ return this.style.setFontStyle(style);
+ },
+
setFixedSize: function (width, height)
{
return this.style.setFixedSize(width, height);
@@ -155,9 +176,9 @@ var Text = new Class({
return this.style.setBackgroundColor(color);
},
- setFill: function (color)
+ setColor: function (color)
{
- return this.style.setFill(color);
+ return this.style.setColor(color);
},
setStroke: function (color, thickness)
@@ -200,6 +221,59 @@ var Text = new Class({
return this.style.setAlign(align);
},
+ // 'left' can be an object
+ // if only 'left' and 'top' are given they are treated as 'x' and 'y'
+ setPadding: function (left, top, right, bottom)
+ {
+ if (typeof left === 'object')
+ {
+ var config = left;
+
+ // If they specify x and/or y this applies to all
+ var x = GetValue(config, 'x', null);
+
+ if (x !== null)
+ {
+ left = x;
+ right = x;
+ }
+ else
+ {
+ left = GetValue(config, 'left', 0);
+ right = GetValue(config, 'right', left);
+ }
+
+ var y = GetValue(config, 'y', null);
+
+ if (y !== null)
+ {
+ top = y;
+ bottom = y;
+ }
+ else
+ {
+ top = GetValue(config, 'top', 0);
+ bottom = GetValue(config, 'bottom', top);
+ }
+ }
+ else
+ {
+ if (left === undefined) { left = 0; }
+ if (top === undefined) { top = left; }
+ if (right === undefined) { right = left; }
+ if (bottom === undefined) { bottom = top; }
+ }
+
+ this.padding.left = left;
+ this.padding.top = top;
+ this.padding.right = right;
+ this.padding.bottom = bottom;
+
+ console.log(this.padding);
+
+ return this.updateText();
+ },
+
setMaxLines: function (max)
{
return this.style.setMaxLines(max);
@@ -238,8 +312,8 @@ var Text = new Class({
var padding = this.padding;
- var w = (textSize.width + (padding.x * 2)) * this.resolution;
- var h = (textSize.height + (padding.y * 2)) * this.resolution;
+ var w = (textSize.width + padding.left + padding.right) * this.resolution;
+ var h = (textSize.height + padding.top + padding.bottom) * this.resolution;
if (canvas.width !== w || canvas.height !== h)
{
@@ -262,7 +336,7 @@ var Text = new Class({
context.textBaseline = 'alphabetic';
// Apply padding
- context.translate(padding.x, padding.y);
+ context.translate(padding.left, padding.top);
var linePositionX;
var linePositionY;
@@ -282,9 +356,7 @@ var Text = new Class({
{
linePositionX = w - linePositionX;
}
- else
- {
- if (style.align === 'right')
+ else if (style.align === 'right')
{
linePositionX += textSize.width - textSize.lineWidths[i];
}
@@ -292,7 +364,6 @@ var Text = new Class({
{
linePositionX += (textSize.width - textSize.lineWidths[i]) / 2;
}
- }
if (this.autoRound)
{
@@ -307,7 +378,7 @@ var Text = new Class({
context.strokeText(lines[i], linePositionX, linePositionY);
}
- if (style.fill)
+ if (style.color)
{
this.style.syncShadow(context, style.shadowFill);
@@ -337,8 +408,10 @@ var Text = new Class({
style: this.style.toJSON(),
resolution: this.resolution,
padding: {
- x: this.padding.x,
- y: this.padding.y
+ left: this.padding.left,
+ right: this.padding.right,
+ top: this.padding.top,
+ bottom: this.padding.bottom
}
};
",9
"diff --git a/src/sound/html5/HTML5AudioSound.js b/src/sound/html5/HTML5AudioSound.js @@ -126,7 +126,16 @@ var HTML5AudioSound = new Class({
BaseSound.prototype.stop.call(this);
},
update: function (time, delta) {
-
+ if (this.isPlaying) {
+ // handling delayed playback
+ if (this.startTime > 0) {
+ if (this.startTime < time) {
+ this.audio.currentTime += (time - this.startTime) / 1000;
+ this.startTime = 0;
+ this.audio.play();
+ }
+ }
+ }
},
destroy: function () {
BaseSound.prototype.destroy.call(this);
",9
"diff --git a/test/PullPayment.js b/test/PullPayment.js @@ -2,10 +2,10 @@ var PullPaymentMock = artifacts.require(""./helpers/PullPaymentMock.sol"");
contract('PullPayment', function(accounts) {
let ppce;
- let tAMOUNT = 17*1e18;
+ let amount = 17*1e18;
beforeEach(async function() {
- ppce = await PullPaymentMock.new({value: tAMOUNT});
+ ppce = await PullPaymentMock.new({value: amount});
});
it(""can't call asyncSend externally"", async function() {
@@ -50,13 +50,13 @@ contract('PullPayment', function(accounts) {
let payee = accounts[1];
let initialBalance = web3.eth.getBalance(payee);
- let call1 = await ppce.callSend(payee, tAMOUNT);
+ let call1 = await ppce.callSend(payee, amount);
let payment1 = await ppce.payments(payee);
- assert.equal(payment1, tAMOUNT);
+ assert.equal(payment1, amount);
let totalPayments = await ppce.totalPayments();
- assert.equal(totalPayments, tAMOUNT);
+ assert.equal(totalPayments, amount);
let withdraw = await ppce.withdrawPayments({from: payee});
let payment2 = await ppce.payments(payee);
@@ -66,7 +66,7 @@ contract('PullPayment', function(accounts) {
assert.equal(totalPayments, 0);
let balance = web3.eth.getBalance(payee);
- assert(Math.abs(balance-initialBalance-tAMOUNT) < 1e16);
+ assert(Math.abs(balance-initialBalance-amount) < 1e16);
});
});
",10
"diff --git a/contracts/governance/TimelockController.sol b/contracts/governance/TimelockController.sol @@ -131,7 +131,7 @@ contract TimelockController is AccessControl, IERC721Receiver, IERC1155Receiver
* @dev Returns whether an id correspond to a registered operation. This
* includes both Pending, Ready and Done operations.
*/
- function isOperation(bytes32 id) public view virtual returns (bool pending) {
+ function isOperation(bytes32 id) public view virtual returns (bool registered) {
return getTimestamp(id) > 0;
}
",10
"diff --git a/contracts/token/ERC721/IERC721.sol b/contracts/token/ERC721/IERC721.sol @@ -112,7 +112,7 @@ interface IERC721 is IERC165 {
*
* Emits an {ApprovalForAll} event.
*/
- function setApprovalForAll(address operator, bool _approved) external;
+ function setApprovalForAll(address operator, bool approved) external;
/**
* @dev Returns the account approved for `tokenId` token.
",10
"diff --git a/contracts/token/common/ERC2981.sol b/contracts/token/common/ERC2981.sol @@ -40,14 +40,14 @@ abstract contract ERC2981 is IERC2981, ERC165 {
/**
* @inheritdoc IERC2981
*/
- function royaltyInfo(uint256 _tokenId, uint256 _salePrice) public view virtual override returns (address, uint256) {
- RoyaltyInfo memory royalty = _tokenRoyaltyInfo[_tokenId];
+ function royaltyInfo(uint256 tokenId, uint256 salePrice) public view virtual override returns (address, uint256) {
+ RoyaltyInfo memory royalty = _tokenRoyaltyInfo[tokenId];
if (royalty.receiver == address(0)) {
royalty = _defaultRoyaltyInfo;
}
- uint256 royaltyAmount = (_salePrice * royalty.royaltyFraction) / _feeDenominator();
+ uint256 royaltyAmount = (salePrice * royalty.royaltyFraction) / _feeDenominator();
return (royalty.receiver, royaltyAmount);
}
",10
"diff --git a/build/webpack.config.js b/build/webpack.config.js @@ -313,8 +313,8 @@ config.module.rules.push({
test: new RegExp(`\\.${extension}$`),
loader: 'url-loader',
options: {
- name: 'fonts/[name].[ext]',
- limit: 10000,
+ name: __DEV__ ? 'fonts/[name].[ext]' : 'fonts/[name].[hash].[ext]',
+ limit: 8192,
mimetype
}
})
",10
"diff --git a/MaterialSkin/HTML/material/html/js/server.js b/MaterialSkin/HTML/material/html/js/server.js @@ -142,7 +142,7 @@ var lmsServer = Vue.component('lms-server', {
if (this.cometd) {
this.cometd.disconnect();
}
- this.cancelTimers();
+ this.cancelServerStatusTimer();
this.subscribedPlayers = new Set();
this.cometd = new org.cometd.CometD();
this.cometd.init({url: '/cometd', logLevel:'off'});
@@ -160,8 +160,8 @@ var lmsServer = Vue.component('lms-server', {
{data:{response:'/'+this.cometd.getClientId()+'/slim/favorites', request:['favorites', ['changed']]}});
this.updateFavorites();
// If we don't get a statu supdate within 5 seconds, assume something wrong and reconnect
- this.statusTimer = setTimeout(function () {
- this.statusTimer = undefined;
+ this.serverStatusTimer = setTimeout(function () {
+ this.serverStatusTimer = undefined;
this.connectToCometD();
}.bind(this), 5000);
}
@@ -184,7 +184,7 @@ var lmsServer = Vue.component('lms-server', {
},
handleServerStatus(data) {
logCometdMessage(""SERVER"", data);
- this.cancelTimers();
+ this.cancelServerStatusTimer();
var players = [];
if (lmsLastScan!=data.lastscan) {
lmsLastScan = data.lastscan;
@@ -337,10 +337,10 @@ var lmsServer = Vue.component('lms-server', {
}
});
},
- cancelTimers() {
- if (undefined!==this.statusTimer) {
- clearTimeout(this.statusTimer);
- this.statusTimer = undefined;
+ cancelServerStatusTimer() {
+ if (undefined!==this.serverStatusTimer) {
+ clearTimeout(this.serverStatusTimer);
+ this.serverStatusTimer = undefined;
}
}
},
@@ -416,7 +416,7 @@ var lmsServer = Vue.component('lms-server', {
}.bind(this));
},
beforeDestroy() {
- this.cancelTimers();
+ this.cancelServerStatusTimer();
},
watch: {
'$store.state.player': function (newVal) {
",10
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -311,7 +311,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
}
},
created() {
- this.serverMyMusic=[];
+ this.myMusic=[];
this.history=[];
this.fetchingItems = false;
this.current = null;
@@ -383,7 +383,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
this.refreshList();
} else if ((this.current && this.current.id == TOP_MYMUSIC_ID) ||
(this.history.length>1 && this.history[1].current && this.history[1].current.id==TOP_MYMUSIC_ID)) {
- this.serverMyMusicMenu();
+ this.myMusicMenu();
}
}.bind(this));
@@ -849,8 +849,8 @@ var lmsBrowse = Vue.component(""lms-browse"", {
if (TOP_MYMUSIC_ID==item.id) {
this.addHistory();
- this.items = this.serverMyMusic;
- this.serverMyMusicMenu();
+ this.items = this.myMusic;
+ this.myMusicMenu();
this.headerTitle = item.title;
this.headerSubTitle = i18n(""Browse music library"");
this.current = item;
@@ -1867,11 +1867,11 @@ var lmsBrowse = Vue.component(""lms-browse"", {
}
});
},
- serverMyMusicMenu() {
+ myMusicMenu() {
this.fetchingItems=true;
lmsCommand("""", [""material-skin"", ""browsemodes""]).then(({data}) => {
if (data && data.result) {
- this.serverMyMusic = [];
+ this.myMusic = [];
// Get basic, configurable, browse modes...
if (data && data.result && data.result.modes_loop) {
for (var idx=0, loop=data.result.modes_loop, loopLen=loop.length; idx<loopLen; ++idx) {
@@ -1920,7 +1920,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
item.icon = ""arrow_downward"";
}
item.params.push(""menu:1"");
- this.serverMyMusic.push(item);
+ this.myMusic.push(item);
}
}
// Now get standard menu, for extra (e.g. CustomBrowse) entries...
@@ -1931,7 +1931,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
var c = loop[idx];
if (c.node==""myMusic"" && c.id) {
if (c.id==""randomplay"") {
- this.serverMyMusic.push({ title: i18n(""Random Mix""),
+ this.myMusic.push({ title: i18n(""Random Mix""),
svg: ""dice-multiple"",
id: RANDOM_MIX_ID,
type: ""app"",
@@ -1987,18 +1987,18 @@ var lmsBrowse = Vue.component(""lms-browse"", {
if (getField(item, ""genre_id:"")>=0) {
item['mapgenre']=true;
}
- this.serverMyMusic.push(item);
+ this.myMusic.push(item);
}
}
}
- this.serverMyMusic.sort(function(a, b) { return a.weight!=b.weight ? a.weight<b.weight ? -1 : 1 : titleSort(a, b); });
- for (var i=0, len=this.serverMyMusic.length; i<len; ++i) {
- this.serverMyMusic[i].menu=[this.options.pinned.has(this.serverMyMusic[i].id) ? UNPIN_ACTION : PIN_ACTION];
+ this.myMusic.sort(function(a, b) { return a.weight!=b.weight ? a.weight<b.weight ? -1 : 1 : titleSort(a, b); });
+ for (var i=0, len=this.myMusic.length; i<len; ++i) {
+ this.myMusic[i].menu=[this.options.pinned.has(this.myMusic[i].id) ? UNPIN_ACTION : PIN_ACTION];
}
if (this.current && TOP_MYMUSIC_ID==this.current.id) {
- this.items = this.serverMyMusic;
+ this.items = this.myMusic;
} else if (this.history.length>1 && this.history[1].current && this.history[1].current.id==TOP_MYMUSIC_ID) {
- this.history[1].items = this.serverMyMusic;
+ this.history[1].items = this.myMusic;
}
}
this.fetchingItems=false;
@@ -2050,8 +2050,8 @@ var lmsBrowse = Vue.component(""lms-browse"", {
if (this.history.length<1) {
this.items = this.top;
}
- for (var i=0, len=this.serverMyMusic.length; i<len; ++i) {
- this.serverMyMusic[i].menu=[this.options.pinned.has(this.serverMyMusic[i].id) ? UNPIN_ACTION : PIN_ACTION];
+ for (var i=0, len=this.myMusic.length; i<len; ++i) {
+ this.myMusic[i].menu=[this.options.pinned.has(this.myMusic[i].id) ? UNPIN_ACTION : PIN_ACTION];
}
this.saveTopList();
removeLocalStorage(""pinned"");
@@ -2117,8 +2117,8 @@ var lmsBrowse = Vue.component(""lms-browse"", {
}
}
if (item.id.startsWith(TOP_ID_PREFIX)) {
- for (var i=0, len=this.serverMyMusic.length; i<len; ++i) {
- this.serverMyMusic[i].menu=[this.options.pinned.has(this.serverMyMusic[i].id) ? UNPIN_ACTION : PIN_ACTION];
+ for (var i=0, len=this.myMusic.length; i<len; ++i) {
+ this.myMusic[i].menu=[this.options.pinned.has(this.myMusic[i].id) ? UNPIN_ACTION : PIN_ACTION];
}
}
}
",10
"diff --git a/ChangeLog b/ChangeLog 1. Fix toggling of power when power button replaces player icon.
2. Show ESP32 and pCP configuration button in 'Player settings' dialog when
called from 'Information' and 'Manage players' dialogs.
+3. Rename ""Alt"" keyboard shortcuts to ""Option"" for macOS.
3.0.1
-----
",10
"diff --git a/components/dropdown/dropdown.js b/components/dropdown/dropdown.js //handle events while search is focus'd
handleSearchEvents: function () {
- var self = this, timer, tmrDelay;
+ var self = this, timer, timerDelay;
if (this.settings.noSearch) {
this.searchInput.prop('readonly', true);
if (self.settings.noSearch === false && !self.settings.source) {
clearTimeout(timer);
- clearTimeout(tmrDelay);
+ clearTimeout(timerDelay);
timer = setTimeout(function () {
if (searchInput.val() === '') {
self.resetList();
}
}, 100);
- tmrDelay = setTimeout(function () {
+ timerDelay = setTimeout(function () {
searchInput.val('');
}, 600);
}
",10
"diff --git a/gruntfile.js b/gruntfile.js @@ -19,11 +19,11 @@ module.exports = function (grunt) {
const run = require('./scripts/configs/run.js');
let selectedControls = dependencyBuilder(grunt);
- let bannerText = '/**\n* Soho XI Controls v<%= pkg.version %>\n* Date: <%= grunt.template.today(""dd/mm/yyyy h:MM:ss TT"") %>\n* Revision: <%= meta.revision %>\n* <%= meta.copyright %>\n*/\n';
+ let bannerText = '/**\n* IDS Enterprise Components v<%= pkg.version %>\n* Date: <%= grunt.template.today(""dd/mm/yyyy h:MM:ss TT"") %>\n* Revision: <%= meta.revision %>\n* <%= meta.copyright %>\n*/\n';
if (selectedControls) {
const bannerList = strBanner(selectedControls);
- bannerText = `/**\n* Soho XI Controls v<%= pkg.version %>\n* ${bannerList}\n* Date: <%= grunt.template.today(""dd/mm/yyyy h:MM:ss TT"") %>\n* Revision: <%= meta.revision %>\n* <%= meta.copyright %>\n*/ \n`;
+ bannerText = `/**\n* IDS Enterprise Components v<%= pkg.version %>\n* ${bannerList}\n* Date: <%= grunt.template.today(""dd/mm/yyyy h:MM:ss TT"") %>\n* Revision: <%= meta.revision %>\n* <%= meta.copyright %>\n*/ \n`;
} else {
selectedControls = controls;
}
",10
"diff --git a/src/components/dropdown/dropdown.js b/src/components/dropdown/dropdown.js @@ -311,7 +311,7 @@ Dropdown.prototype = {
this.setDisplayedValues();
this.setInitial();
this.setWidth();
- this.initTooltip();
+ this.setTooltip();
this.element.triggerHandler('rendered');
@@ -492,7 +492,7 @@ Dropdown.prototype = {
/**
* Triggers tooltip in multiselect
*/
- initTooltip() {
+ setTooltip() {
const opts = this.element.find('option:selected');
const optText = this.getOptionText(opts);
@@ -2369,7 +2369,7 @@ Dropdown.prototype = {
this.element.trigger('change').triggerHandler('selected', [option, isAdded]);
if (this.pseudoElem.find('span').width() >= this.pseudoElem.width()) {
- this.initTooltip();
+ this.setTooltip();
} else if (this.tooltipApi) {
this.tooltipApi.destroy();
",10
"diff --git a/app/views/components/listview/test-remove-clear.html b/app/views/components/listview/test-remove-clear.html <div class=""five columns"">
<div class=""card"">
- <div class=""card-header"" style=""padding-top: 0;"">
+ <div class=""card-header"">
<div class=""toolbar"" role=""toolbar"">
<div class=""title"">My Tasks</div>
<div class=""buttonset"">
",10
"diff --git a/test/components/listview/listview.e2e-spec.js b/test/components/listview/listview.e2e-spec.js @@ -575,7 +575,7 @@ describe('Listview with indeterminate paging inside of List/Detail Pattern', ()
describe('Listview flex card empty tests', () => {
beforeEach(async () => {
- await utils.setPage('/components/listview/test-empty-message-no-card?layout=nofrills');
+ await utils.setPage('/components/listview/test-empty-message-flex-container?layout=nofrills');
const emptyMessage = await element(by.css('.empty-message'));
await browser.driver
.wait(protractor.ExpectedConditions.presenceOf(emptyMessage), config.waitsFor);
",10
"diff --git a/test/components/form/form.e2e-spec.js b/test/components/form/form.e2e-spec.js @@ -55,7 +55,7 @@ describe('Form Tests', () => {
await utils.checkForErrors();
- expect(await browser.protractorImageComparison.checkElement(containerEl, 'form-compact-fields')).toEqual(0);
+ expect(await browser.protractorImageComparison.checkElement(containerEl, 'form-compact-mode')).toEqual(0);
});
it('Should not visual regress on compact/short fields in RTL', async () => {
@@ -65,7 +65,7 @@ describe('Form Tests', () => {
await utils.checkForErrors();
- expect(await browser.protractorImageComparison.checkElement(containerEl, 'form-compact-fields')).toEqual(0);
+ expect(await browser.protractorImageComparison.checkElement(containerEl, 'form-compact-mode-rtl')).toEqual(0);
});
}
});
",10
"diff --git a/test/components/button/button-api.func-spec.js b/test/components/button/button-api.func-spec.js @@ -36,7 +36,7 @@ describe('Button API', () => {
expect(buttonAPI).toEqual(jasmine.any(Object));
});
- it('Should destroy button', (done) => {
+ it('can be destroyed', (done) => {
const spyEvent = spyOnEvent(buttonEl, 'click.button');
buttonAPI.destroy();
buttonEl.click();
@@ -48,7 +48,7 @@ describe('Button API', () => {
expect($(buttonEl).data('button')).toBeFalsy();
});
- it('Should set settings', () => {
+ it('has default settings', () => {
const settings = {
replaceText: false,
toggleOffIcon: null,
@@ -59,7 +59,7 @@ describe('Button API', () => {
expect(buttonAPI.settings).toEqual(settings);
});
- it('Should update settings via parameter', () => {
+ it('can update settings via the `updated()` method', () => {
const settings = {
replaceText: true,
toggleOffIcon: null,
@@ -71,7 +71,7 @@ describe('Button API', () => {
expect(buttonAPI.settings.replaceText).toEqual(settings.replaceText);
});
- it('Should update menu icon setting via parameter', () => {
+ it('should properly update the `hideMenuArrow` setting via the `updated()` method', () => {
const settings = {
replaceText: false,
toggleOffIcon: null,
@@ -83,7 +83,7 @@ describe('Button API', () => {
expect(buttonAPI.settings.hideMenuArrow).toEqual(settings.hideMenuArrow);
});
- it('Should remove menu icon if hideMenuArrow set to true', () => {
+ it('should remove menu icon if hideMenuArrow set to true', () => {
const elem = buttonAPI.element[0];
buttonAPI.updated({ hideMenuArrow: true });
",10
"diff --git a/test/components/datagrid/datagrid.e2e-spec.js b/test/components/datagrid/datagrid.e2e-spec.js @@ -2028,7 +2028,7 @@ describe('Datagrid Frozen Column Card (auto) tests', () => {
describe('Datagrid Frozen Column Card (fixed) tests', () => {
beforeEach(async () => {
- await utils.setPage('/components/datagrid/test-frozen-columns-fixed-row-height?layout=nofrills');
+ await utils.setPage('/components/datagrid/test-card-frozen-columns-fixed-row-height?layout=nofrills');
const datagridEl = await element(by.css('#datagrid tbody tr:nth-child(1)'));
await browser.driver
",10
"diff --git a/client/src/js/djng-forms.js b/client/src/js/djng-forms.js // module: djng.forms
// Correct Angular's form.FormController behavior after rendering bound forms.
// Additional validators for form elements.
-var djng_forms_module = angular.module('djng.forms', []);
+var djngModule = angular.module('djng.forms', []);
+
// create a simple hash code for the given string
function hashCode(s) {
@@ -42,7 +43,7 @@ function addNgModelDirective() {
// Bound fields with invalid input data, shall be marked as ng-invalid-bound, so that
// the input field visibly contains invalid data, even if pristine
-djng_forms_module.directive('djngError', function() {
+djngModule.directive('djngError', function() {
return {
restrict: 'A',
require: '?^form',
@@ -68,7 +69,7 @@ djng_forms_module.directive('djngError', function() {
// This directive overrides some of the internal behavior on forms if used together with AngularJS.
// Otherwise, the content of bound forms is not displayed, because AngularJS does not know about
// the concept of bound forms and thus hides values preset by Django while rendering HTML.
-djng_forms_module.directive('ngModel', ['$log', function($log) {
+djngModule.directive('ngModel', ['$log', function($log) {
function restoreInputField(field) {
// restore the field's content from the rendered content of bound fields
switch (field.type) {
@@ -134,9 +135,8 @@ djng_forms_module.directive('ngModel', ['$log', function($log) {
var curModelValue = scope.$eval(attrs.ngModel);
// if model already has a value defined, don't set the default
- if (!field || !formCtrl || angular.isDefined(curModelValue)) {
+ if (!field || !formCtrl || angular.isDefined(curModelValue))
return;
- }
switch (field.tagName) {
case 'INPUT':
@@ -163,7 +163,7 @@ djng_forms_module.directive('ngModel', ['$log', function($log) {
// This directive is added automatically by django-angular for widgets of type RadioSelect and
// CheckboxSelectMultiple. This is necessary to adjust the behavior of a collection of input fields,
// which forms a group for one `django.forms.Field`.
-djng_forms_module.directive('validateMultipleFields', function() {
+djngModule.directive('validateMultipleFields', function() {
return {
restrict: 'A',
require: '^?form',
@@ -218,7 +218,7 @@ djng_forms_module.directive('validateMultipleFields', function() {
// <input ng-model=""a_date"" type=""text"" validate-date=""^(\d{4})-(\d{1,2})-(\d{1,2})$"" />
// Now, such an input field is only considered valid, if the date is a valid date and if it matches
// against the given regular expression.
-djng_forms_module.directive('validateDate', function() {
+djngModule.directive('validateDate', function() {
var validDatePattern = null;
function validateDate(date) {
@@ -260,7 +260,7 @@ djng_forms_module.directive('validateDate', function() {
// This directive can be added to an input field to validate emails using a similar regex to django
-djng_forms_module.directive('validateEmail', function() {
+djngModule.directive('validateEmail', function() {
return {
require: '?ngModel',
restrict: 'A',
@@ -286,7 +286,7 @@ djng_forms_module.directive('validateEmail', function() {
// djangoForm.setErrors($scope.form, data.errors);
// });
// djangoForm.setErrors returns false, if no errors have been transferred.
-djng_forms_module.factory('djangoForm', function() {
+djngModule.factory('djangoForm', function() {
var NON_FIELD_ERRORS = '__all__';
function isNotEmpty(obj) {
@@ -380,7 +380,7 @@ djng_forms_module.factory('djangoForm', function() {
// Directive <ANY djng-bind-if=""any_variable""> behaves similar to `ng-bind` but leaves the elements
// content as is, if the value to bind is undefined. This allows to set a default value in case the
// scope variables are not ready yet.
-djng_forms_module.directive('djngBindIf', function() {
+djngModule.directive('djngBindIf', function() {
return {
restrict: 'A',
compile: function(templateElement) {
",10
"diff --git a/client/src/js/djng-forms.js b/client/src/js/djng-forms.js @@ -164,33 +164,34 @@ djngModule.directive('validateMultipleFields', function() {
return {
restrict: 'A',
require: '^?form',
- link: function(scope, element, attrs, formCtrl) {
+ link: function(scope, element, attrs, controller) {
var subFields, checkboxElems = [];
+ if (!controller)
+ return;
+
function validate(event) {
var valid = false;
angular.forEach(checkboxElems, function(checkbox) {
valid = valid || checkbox.checked;
});
- formCtrl.$setValidity('required', valid);
+ controller.$setValidity('required', valid);
if (event) {
- formCtrl.$dirty = true;
- formCtrl.$pristine = false;
+ controller.$dirty = true;
+ controller.$pristine = false;
// element.on('change', validate) is jQuery and runs outside of Angular's digest cycle.
// Therefore Angular does not get the end-of-digest signal and $apply() must be invoked manually.
scope.$apply();
}
}
- if (!formCtrl)
- return;
try {
subFields = angular.fromJson(attrs.validateMultipleFields);
} catch (SyntaxError) {
if (!angular.isString(attrs.validateMultipleFields))
return;
subFields = [attrs.validateMultipleFields];
- formCtrl = formCtrl[subFields];
+ controller = controller[subFields];
}
angular.forEach(element.find('input'), function(elem) {
if (subFields.indexOf(elem.name) >= 0) {
",10
"diff --git a/runtime/ms-rest-azure/lib/cloudError.js b/runtime/ms-rest-azure/lib/cloudError.js *
* @member {array} [details] An array of CloudError objects specifying the details
*
- * @member {Object} [innerError] The inner error parsed from the body of the http error response
+ * @member {Object} [innererror] The inner error parsed from the body of the http error response
*/
class CloudError extends Error {
constructor(parameters) {
@@ -46,8 +46,8 @@ class CloudError extends Error {
this.details = tempDetails;
}
- if (parameters.innerError) {
- this.innerError = JSON.parse(JSON.stringify(parameters.innerError));
+ if (parameters.innererror) {
+ this.innererror = JSON.parse(JSON.stringify(parameters.innererror));
}
}
}
@@ -102,9 +102,9 @@ class CloudError extends Error {
}
}
},
- innerError: {
+ innererror: {
required: false,
- serializedName: 'innerError',
+ serializedName: 'innererror',
type: {
name: 'Object'
}
@@ -145,8 +145,8 @@ class CloudError extends Error {
payload.error.details = deserializedArray;
}
- if (this.innerError) {
- payload.error.innerError = JSON.parse(JSON.stringify(this.innerError));
+ if (this.innererror) {
+ payload.error.innererror = JSON.parse(JSON.stringify(this.innererror));
}
return payload;
}
@@ -185,8 +185,8 @@ class CloudError extends Error {
this.details = deserializedArray;
}
- if (instance.error.innerError) {
- this.innerError = JSON.parse(JSON.stringify(instance.error.innerError));
+ if (instance.error.innererror) {
+ this.innererror = JSON.parse(JSON.stringify(instance.error.innererror));
}
}
}
",10
"diff --git a/src/lib/default-project/project.json b/src/lib/default-project/project.json -{""targets"":[{""id"":""`jEk@4|i[#Fk?(8x)AV."",""name"":""Stage"",""isStage"":true,""x"":0,""y"":0,""size"":100,""direction"":90,""draggable"":false,""currentCostume"":0,""costume"":{""name"":""backdrop1"",""bitmapResolution"":1,""rotationCenterX"":240,""rotationCenterY"":180,""skinId"":2,""dataFormat"":""png"",""assetId"":""739b5e2a2435f6e1ec2993791b423146""},""costumeCount"":1,""visible"":true,""rotationStyle"":""all around"",""blocks"":{},""variables"":{""`jEk@4|i[#Fk?(8x)AV.-my variable"":{""id"":""`jEk@4|i[#Fk?(8x)AV.-my variable"",""name"":""my variable"",""type"":"""",""isCloud"":false,""value"":0}},""lists"":{},""costumes"":[{""name"":""backdrop1"",""bitmapResolution"":1,""rotationCenterX"":240,""rotationCenterY"":180,""skinId"":2,""dataFormat"":""png"",""assetId"":""739b5e2a2435f6e1ec2993791b423146""}],""sounds"":[{""name"":""pop"",""format"":"""",""rate"":11025,""sampleCount"":258,""soundID"":1,""md5"":""83a9787d4cb6f3b7632b4ddfebf74367.wav"",""data"":null,""dataFormat"":""wav"",""assetId"":""83a9787d4cb6f3b7632b4ddfebf74367"",""soundId"":""p=i?*Zt*I]@]x_*V`mut""}]},{""id"":""9xJ@2eKXvx:/*Q^3Rib#"",""name"":""Sprite1"",""isStage"":false,""x"":0,""y"":0,""size"":100,""direction"":90,""draggable"":false,""currentCostume"":0,""costume"":{""name"":""costume1"",""bitmapResolution"":1,""rotationCenterX"":47,""rotationCenterY"":55,""skinId"":0,""dataFormat"":""svg"",""assetId"":""09dc888b0b7df19f70d81588ae73420e""},""costumeCount"":2,""visible"":true,""rotationStyle"":""all around"",""blocks"":{},""variables"":{},""lists"":{},""costumes"":[{""name"":""costume1"",""bitmapResolution"":1,""rotationCenterX"":47,""rotationCenterY"":55,""skinId"":0,""dataFormat"":""svg"",""assetId"":""09dc888b0b7df19f70d81588ae73420e""},{""name"":""costume2"",""bitmapResolution"":1,""rotationCenterX"":47,""rotationCenterY"":55,""skinId"":1,""dataFormat"":""svg"",""assetId"":""3696356a03a8d938318876a593572843""}],""sounds"":[{""name"":""Meow"",""format"":"""",""rate"":22050,""sampleCount"":18688,""soundID"":0,""md5"":""83c36d806dc92327b9e7049a565c6bff.wav"",""data"":null,""dataFormat"":""wav"",""assetId"":""83c36d806dc92327b9e7049a565c6bff"",""soundId"":""]z6@jLeJ2W%gr/eA1HB+""}]}],""meta"":{""semver"":""3.0.0"",""vm"":""0.1.0"",""agent"":""Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.186 Safari/537.36""}}
\ No newline at end of file
+{""targets"":[{""id"":""`jEk@4|i[#Fk?(8x)AV."",""name"":""Stage"",""isStage"":true,""x"":0,""y"":0,""size"":100,""direction"":90,""draggable"":false,""currentCostume"":0,""costume"":{""name"":""backdrop1"",""bitmapResolution"":1,""rotationCenterX"":240,""rotationCenterY"":180,""skinId"":2,""dataFormat"":""png"",""assetId"":""739b5e2a2435f6e1ec2993791b423146""},""costumeCount"":1,""visible"":true,""rotationStyle"":""all around"",""blocks"":{},""variables"":{""`jEk@4|i[#Fk?(8x)AV.-my variable"":{""id"":""`jEk@4|i[#Fk?(8x)AV.-my variable"",""name"":""my variable"",""type"":"""",""isCloud"":false,""value"":0}},""lists"":{},""costumes"":[{""name"":""backdrop1"",""bitmapResolution"":1,""rotationCenterX"":240,""rotationCenterY"":180,""skinId"":2,""dataFormat"":""png"",""assetId"":""739b5e2a2435f6e1ec2993791b423146""}],""sounds"":[{""name"":""pop"",""format"":"""",""rate"":11025,""sampleCount"":258,""soundID"":1,""md5ext"":""83a9787d4cb6f3b7632b4ddfebf74367.wav"",""data"":null,""dataFormat"":""wav"",""assetId"":""83a9787d4cb6f3b7632b4ddfebf74367"",""soundId"":""p=i?*Zt*I]@]x_*V`mut""}]},{""id"":""9xJ@2eKXvx:/*Q^3Rib#"",""name"":""Sprite1"",""isStage"":false,""x"":0,""y"":0,""size"":100,""direction"":90,""draggable"":false,""currentCostume"":0,""costume"":{""name"":""costume1"",""bitmapResolution"":1,""rotationCenterX"":47,""rotationCenterY"":55,""skinId"":0,""dataFormat"":""svg"",""assetId"":""09dc888b0b7df19f70d81588ae73420e""},""costumeCount"":2,""visible"":true,""rotationStyle"":""all around"",""blocks"":{},""variables"":{},""lists"":{},""costumes"":[{""name"":""costume1"",""bitmapResolution"":1,""rotationCenterX"":47,""rotationCenterY"":55,""skinId"":0,""dataFormat"":""svg"",""assetId"":""09dc888b0b7df19f70d81588ae73420e""},{""name"":""costume2"",""bitmapResolution"":1,""rotationCenterX"":47,""rotationCenterY"":55,""skinId"":1,""dataFormat"":""svg"",""assetId"":""3696356a03a8d938318876a593572843""}],""sounds"":[{""name"":""Meow"",""format"":"""",""rate"":22050,""sampleCount"":18688,""soundID"":0,""md5ext"":""83c36d806dc92327b9e7049a565c6bff.wav"",""data"":null,""dataFormat"":""wav"",""assetId"":""83c36d806dc92327b9e7049a565c6bff"",""soundId"":""]z6@jLeJ2W%gr/eA1HB+""}]}],""meta"":{""semver"":""3.0.0"",""vm"":""0.1.0"",""agent"":""Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.186 Safari/537.36""}}
",10
"diff --git a/src/containers/costume-tab.jsx b/src/containers/costume-tab.jsx @@ -63,7 +63,7 @@ const messages = defineMessages({
id: 'gui.costumeTab.addFileCostume'
},
addCameraCostumeMsg: {
- defaultMessage: 'Coming Soon',
+ defaultMessage: 'Camera',
description: 'Button to use the camera to create a costume costume in the editor tab',
id: 'gui.costumeTab.addCameraCostume'
}
",10
"diff --git a/src/lib/file-uploader.js b/src/lib/file-uploader.js @@ -51,7 +51,7 @@ const handleFileUpload = function(fileInput, onload) {
*/
/**
- * Cache an asset (costume, sound) in storage and return an object representation
+ * Create an asset (costume, sound) with storage and return an object representation
* of the asset to track in the VM.
* @param {ScratchStorage} storage The storage to cache the asset in
* @param {string} fileName The name of the asset
@@ -62,7 +62,7 @@ const handleFileUpload = function(fileInput, onload) {
* @return {VMAsset} An object representing this asset and relevant information
* which can be used to look up the data in storage
*/
-const cacheAsset = function(storage, fileName, assetType, dataFormat, data) {
+const createVMAsset = function(storage, fileName, assetType, dataFormat, data) {
const asset = storage.createAsset(
assetType,
dataFormat,
@@ -117,7 +117,7 @@ const costumeUpload = function(fileData, fileType, costumeName, storage, handleC
const bitmapAdapter = new BitmapAdapter();
const addCostumeFromBuffer = function(dataBuffer) {
- const vmCostume = cacheAsset(
+ const vmCostume = createVMAsset(
storage,
costumeName,
assetType,
@@ -173,7 +173,7 @@ const soundUpload = function(fileData, fileType, soundName, storage, handleSound
return;
}
- const vmSound = cacheAsset(
+ const vmSound = createVMAsset(
storage,
soundName,
storage.AssetType.Sound,
",10
"diff --git a/lib/run/index.js b/lib/run/index.js @@ -54,7 +54,7 @@ var fs = require('fs'),
* @private
* @type {Object}
*/
- knownReporters = {
+ knownReporterErrorMessages = {
teamcity: ' run `npm install teamcity`'
};
@@ -349,8 +349,8 @@ module.exports = function (options, callback) {
// @todo: route this via print module to respect silent flags
console.warn(`newman warning: ""${reporterName}"" reporter could not be loaded.`);
// print install instruction in case a known reporter is missing
- if (knownReporters[reporterName]) {
- console.warn(knownReporters[reporterName]);
+ if (knownReporterErrorMessages[reporterName]) {
+ console.warn(knownReporterErrorMessages[reporterName]);
}
else {
console.warn(' please install reporter using npm');
",10
"diff --git a/lib/run/secure-fs.js b/lib/run/secure-fs.js @@ -60,7 +60,7 @@ const fs = require('fs'),
* @param {*} [insecureFileRead=false] - If true, allow reading files outside working directory
* @param {*} [fileWhitelist=[]] - List of allowed files outside of working directory
*/
-function SecureFs (workingDir, insecureFileRead = false, fileWhitelist = []) {
+function SecureFS (workingDir, insecureFileRead = false, fileWhitelist = []) {
this._fs = fs;
this._path = path;
this.constants = this._fs.constants;
@@ -80,7 +80,7 @@ function SecureFs (workingDir, insecureFileRead = false, fileWhitelist = []) {
*
* @returns {String} The resolved path
*/
-SecureFs.prototype._resolve = function (relOrAbsPath, whiteList) {
+SecureFS.prototype._resolve = function (relOrAbsPath, whiteList) {
// Special handling for windows absolute paths to work cross platform
this.isWindows && isWindowsRoot(relOrAbsPath) && (relOrAbsPath = relOrAbsPath.substring(1));
@@ -106,7 +106,7 @@ SecureFs.prototype._resolve = function (relOrAbsPath, whiteList) {
* @param {Array} [whiteList] - A optional list of additional absolute path to whitelist
* @param {Function} callback -
*/
-SecureFs.prototype.resolvePath = function (relOrAbsPath, whiteList, callback) {
+SecureFS.prototype.resolvePath = function (relOrAbsPath, whiteList, callback) {
if (!callback && typeof whiteList === FUNCTION) {
callback = whiteList;
whiteList = [];
@@ -129,7 +129,7 @@ SecureFs.prototype.resolvePath = function (relOrAbsPath, whiteList, callback) {
*
* @returns {String} The resolved path
*/
-SecureFs.prototype.resolvePathSync = function (relOrAbsPath, whiteList) {
+SecureFS.prototype.resolvePathSync = function (relOrAbsPath, whiteList) {
// Resolve the path from the working directory
const resolvedPath = this._resolve(relOrAbsPath, _.concat(this.fileWhitelist, whiteList));
@@ -147,11 +147,11 @@ Object.getOwnPropertyNames(fs).map((prop) => {
return;
}
- SecureFs.prototype[prop] = fs[prop];
+ SecureFS.prototype[prop] = fs[prop];
});
// Override the required functions
-SecureFs.prototype.stat = function (path, callback) {
+SecureFS.prototype.stat = function (path, callback) {
this.resolvePath(path, (err, resolvedPath) => {
if (err) {
return callback(err);
@@ -161,7 +161,7 @@ SecureFs.prototype.stat = function (path, callback) {
});
};
-SecureFs.prototype.createReadStream = function (path, options) {
+SecureFS.prototype.createReadStream = function (path, options) {
try {
return this._fs.createReadStream(this.resolvePathSync(path), options);
}
@@ -184,4 +184,4 @@ SecureFs.prototype.createReadStream = function (path, options) {
}
};
-module.exports = SecureFs;
+module.exports = SecureFS;
",10
"diff --git a/lib/syntax/node/AttributeSelector.js b/lib/syntax/node/AttributeSelector.js @@ -77,19 +77,19 @@ function getOperator() {
}
// '[' S* attrib_name ']'
-// '[' S* attrib_name S* attrib_match S* [ IDENT | STRING ] S* attrib_flags? S* ']'
+// '[' S* attrib_name S* attrib_matcher S* [ IDENT | STRING ] S* attrib_flags? S* ']'
module.exports = {
name: 'AttributeSelector',
structure: {
name: 'Identifier',
- operator: [String, null],
+ matcher: [String, null],
value: ['String', 'Identifier', null],
flags: [String, null]
},
parse: function() {
var start = this.scanner.tokenStart;
var name;
- var operator = null;
+ var matcher = null;
var value = null;
var flags = null;
@@ -102,7 +102,7 @@ module.exports = {
if (this.scanner.tokenType !== RIGHTSQUAREBRACKET) {
// avoid case `[name i]`
if (this.scanner.tokenType !== IDENTIFIER) {
- operator = getOperator.call(this);
+ matcher = getOperator.call(this);
this.scanner.skipSC();
@@ -128,7 +128,7 @@ module.exports = {
type: 'AttributeSelector',
loc: this.getLocation(start, this.scanner.tokenStart),
name: name,
- operator: operator,
+ matcher: matcher,
value: value,
flags: flags
};
@@ -139,8 +139,8 @@ module.exports = {
processChunk('[');
this.generate(processChunk, node.name);
- if (node.operator !== null) {
- processChunk(node.operator);
+ if (node.matcher !== null) {
+ processChunk(node.matcher);
if (node.value !== null) {
this.generate(processChunk, node.value);
",10
"diff --git a/lib/testbridge/bridge/src/main.ml b/lib/testbridge/bridge/src/main.ml @@ -19,17 +19,17 @@ let rec zip4_exn xs ys zs ws =
| _ -> failwith ""lists not same length""
;;
-let get_old_pods (nodes: Kubernetes.Node.t List.t) (pods: Kubernetes.Pod.t List.t) =
- let old_pods =
+let get_misassigned_pods (nodes: Kubernetes.Node.t List.t) (pods: Kubernetes.Pod.t List.t) =
+ let misassigned_pods =
List.filter_map pods ~f:(fun pod ->
if List.exists nodes ~f:(fun node -> node.hostname = pod.node_selector)
then None
else Some (pod.container_name ^ "" -> "" ^ pod.node_selector)
)
in
- match old_pods with
+ match misassigned_pods with
| [] -> None
- | _ -> Some (""Old Pods:\n"" ^ String.concat ~sep:""\n"" old_pods)
+ | _ -> Some (""Old Pods:\n"" ^ String.concat ~sep:""\n"" misassigned_pods)
let get_pods
image_host
@@ -76,8 +76,8 @@ let get_pods
printf ""%s\n"" (String.concat ~sep:"", "" (List.map pods ~f:(fun pod ->
Sexp.to_string_hum ([%sexp_of: Kubernetes.Pod.t] pod))));*)
let () =
- match get_old_pods nodes pods with
- | Some err -> printf ""%s\n"" err; failwith ""Pods are old run cleanup.sh"";
+ match get_misassigned_pods nodes pods with
+ | Some err -> printf ""%s\n"" err; failwith ""Pods are old/misassigned... run cleanup.sh"";
| None -> printf ""F R E S H pods, good to go.\n""
in
",10
"diff --git a/src/lib/coda_graphql/coda_graphql.ml b/src/lib/coda_graphql/coda_graphql.ml @@ -431,15 +431,15 @@ module Types = struct
~doc:""Status for whenever the blockchain is reorganized""
~values:[enum_value ""CHANGED"" ~value:`Changed]
- let protocol_amounts =
- obj ""ProtocolAmounts"" ~fields:(fun _ ->
+ let genesis_constants =
+ obj ""GenesisConstants"" ~fields:(fun _ ->
[ field ""accountCreationFee"" ~typ:(non_null uint64)
~doc:""The fee charged to create a new account""
~args:Arg.[]
~resolve:(fun {ctx= coda; _} () ->
(Coda_lib.config coda).precomputed_values.constraint_constants
.account_creation_fee |> Currency.Fee.to_uint64 )
- ; field ""coinbaseReward"" ~typ:(non_null uint64)
+ ; field ""coinbase"" ~typ:(non_null uint64)
~doc:
""The amount received as a coinbase reward for producing a block""
~args:Arg.[]
@@ -2610,11 +2610,13 @@ module Queries = struct
| None ->
[] )
- let protocol_amounts =
- field ""protocolAmounts""
- ~doc:""The currency amounts for different events in the protocol""
+ let genesis_constants =
+ field ""genesisConstants""
+ ~doc:
+ ""The constants used to determine the configuration of the genesis \
+ block and all of its transitive dependencies""
~args:Arg.[]
- ~typ:(non_null Types.protocol_amounts)
+ ~typ:(non_null Types.genesis_constants)
~resolve:(fun _ () -> ())
let commands =
@@ -2639,7 +2641,7 @@ module Queries = struct
; trust_status_all
; snark_pool
; pending_snark_work
- ; protocol_amounts ]
+ ; genesis_constants ]
end
let schema =
",10
"diff --git a/src/app/test_executive/test_executive.ml b/src/app/test_executive/test_executive.ml @@ -116,9 +116,9 @@ let main inputs =
| Some deferred ->
[%log error]
""additional call to cleanup testnet while already cleaning up \
- ($reason, $hard_error)""
+ ($reason, $error)""
~metadata:
- [(""reason"", `String reason); (""hard_error"", `String test_error_str)] ;
+ [(""reason"", `String reason); (""error"", `String test_error_str)] ;
deferred
| None ->
[%log info] ""cleaning up testnet ($reason, $error)""
",10
"diff --git a/src/lib/marlin_plonk_bindings/types/marlin_plonk_bindings_types.ml b/src/lib/marlin_plonk_bindings/types/marlin_plonk_bindings_types.ml @@ -12,17 +12,17 @@ end
module Plonk_verification_evals = struct
type 'poly_comm t =
- { sigma_comm0: 'poly_comm
- ; sigma_comm1: 'poly_comm
- ; sigma_comm2: 'poly_comm
+ { sigma_comm_0: 'poly_comm
+ ; sigma_comm_1: 'poly_comm
+ ; sigma_comm_2: 'poly_comm
; ql_comm: 'poly_comm
; qr_comm: 'poly_comm
; qo_comm: 'poly_comm
; qm_comm: 'poly_comm
; qc_comm: 'poly_comm
- ; rcm_comm0: 'poly_comm
- ; rcm_comm1: 'poly_comm
- ; rcm_comm2: 'poly_comm
+ ; rcm_comm_0: 'poly_comm
+ ; rcm_comm_1: 'poly_comm
+ ; rcm_comm_2: 'poly_comm
; psm_comm: 'poly_comm
; add_comm: 'poly_comm
; mul1_comm: 'poly_comm
",10
"diff --git a/src/app/test_executive/test_executive.ml b/src/app/test_executive/test_executive.ml @@ -126,7 +126,7 @@ let main inputs =
let net_manager_ref : Engine.Network_manager.t option ref = ref None in
let log_engine_ref : Engine.Log_engine.t option ref = ref None in
let cleanup_deferred_ref = ref None in
- let dispatch_cleanup_PARTIAL =
+ let f_dispatch_cleanup =
dispatch_cleanup ~logger ~cleanup_func:Engine.Network_manager.cleanup
~destroy_func:Engine.Log_engine.destroy ~net_manager_ref ~log_engine_ref
~cleanup_deferred_ref
@@ -139,7 +139,7 @@ let main inputs =
@@ Printf.sprintf ""received signal %s"" (Signal.to_string signal)
in
don't_wait_for
- (dispatch_cleanup_PARTIAL ""signal received""
+ (f_dispatch_cleanup ""signal received""
(Malleable_error.of_error_hard error)) ) ;
let%bind monitor_test_result =
Monitor.try_with ~extract_exn:true (fun () ->
@@ -158,7 +158,7 @@ let main inputs =
Engine.Log_engine.create ~logger ~network
~on_fatal_error:(fun message ->
don't_wait_for
- (dispatch_cleanup_PARTIAL
+ (f_dispatch_cleanup
(sprintf
!""log engine fatal error: %s""
(Yojson.Safe.to_string (Logger.Message.to_yojson message)))
@@ -174,7 +174,7 @@ let main inputs =
| Error exn ->
Malleable_error.of_error_hard (Error.of_exn exn)
in
- let%bind () = dispatch_cleanup_PARTIAL ""test completed"" test_result in
+ let%bind () = f_dispatch_cleanup ""test completed"" test_result in
exit 0
let start inputs =
",10
"diff --git a/src/lib/gossip_net/libp2p.ml b/src/lib/gossip_net/libp2p.ml @@ -62,7 +62,8 @@ module Make (Rpc_intf : Mina_base.Rpc_intf.Rpc_interface_intf) :
(Message.msg Envelope.Incoming.t * Coda_net2.Validation_callback.t)
Strict_pipe.Reader.t
; subscription:
- Message.msg Coda_net2.Pubsub.Subscription.t Deferred.t ref }
+ Message.msg Coda_net2.Pubsub.Subscription.t Deferred.t ref
+ ; restart_helper: unit -> unit }
let create_rpc_implementations
(Rpc_handler {rpc; f= handler; cost; budget}) =
@@ -416,6 +417,10 @@ module Make (Rpc_intf : Mina_base.Rpc_intf.Rpc_interface_intf) :
in
let net2_ref = ref (Deferred.never ()) in
let subscription_ref = ref (Deferred.never ()) in
+ let restarts_r, restarts_w =
+ Strict_pipe.create ~name:""libp2p-restarts""
+ (Strict_pipe.Buffered (`Capacity 0, `Overflow Strict_pipe.Drop_head))
+ in
let%bind () =
let rec on_libp2p_create res =
net2_ref :=
@@ -464,6 +469,12 @@ module Make (Rpc_intf : Mina_base.Rpc_intf.Rpc_interface_intf) :
high_connectivity_ivar ~on_unexpected_termination
in
on_libp2p_create res ;
+ don't_wait_for
+ (Strict_pipe.Reader.iter restarts_r ~f:(fun () ->
+ let%bind n = !net2_ref in
+ let%bind () = Coda_net2.shutdown n in
+ let%bind () = on_unexpected_termination () in
+ !net2_ref >>| ignore )) ;
let%map _ = res in
()
in
@@ -513,7 +524,8 @@ module Make (Rpc_intf : Mina_base.Rpc_intf.Rpc_interface_intf) :
; high_connectivity_ivar
; subscription= subscription_ref
; message_reader
- ; ban_reader }
+ ; ban_reader
+ ; restart_helper= (fun () -> Strict_pipe.Writer.write restarts_w ()) }
let peers t = !(t.net2) >>= Coda_net2.peers
@@ -681,10 +693,10 @@ module Make (Rpc_intf : Mina_base.Rpc_intf.Rpc_interface_intf) :
(peer_id : Peer.Id.t) (rpc : (q, r) rpc) (qs : q list) =
let%bind net2 = !(t.net2) in
match%bind
- Mina_net2.open_stream net2 ~protocol:rpc_transport_proto peer_id
+ Coda_net2.open_stream net2 ~protocol:rpc_transport_proto peer_id
with
| Ok stream ->
- let peer = Mina_net2.Stream.remote_peer stream in
+ let peer = Coda_net2.Stream.remote_peer stream in
let transport = prepare_stream_transport stream in
let (module Impl) = implementation_of_rpc rpc in
try_call_rpc_with_dispatch ?heartbeat_timeout ?timeout
@@ -731,6 +743,8 @@ module Make (Rpc_intf : Mina_base.Rpc_intf.Rpc_interface_intf) :
let set_connection_gating t config =
let%bind net2 = !(t.net2) in
Coda_net2.set_connection_gating_config net2 config
+
+ let restart_helper t = t.restart_helper ()
end
include T
",10
"diff --git a/automation/terraform/modules/kubernetes/testnet/helm.tf b/automation/terraform/modules/kubernetes/testnet/helm.tf @@ -29,13 +29,13 @@ locals {
""/dns4/seed-node.${var.testnet_name}/tcp/${var.seed_port}/p2p/${split("","", var.seed_discovery_keypairs[0])[2]}""
]
- all_seed_peers = [ for name in keys(data.local_file.libp2p_peers) : ""/dns4/${name}.${var.testnet_name}/tcp/10501/p2p/${trimspace(data.local_file.libp2p_peers[name].content)}""]
+ static_peers = [ for name in keys(data.local_file.libp2p_peers) : ""/dns4/${name}.${var.testnet_name}/tcp/10501/p2p/${trimspace(data.local_file.libp2p_peers[name].content)}""]
coda_vars = {
runtimeConfig = var.generate_and_upload_artifacts ? data.local_file.genesis_ledger.content : var.runtime_config
image = var.coda_image
privkeyPass = var.block_producer_key_pass
- seedPeers = concat(var.additional_seed_peers, local.seed_peers)
+ seedPeers = concat(var.additional_seed_peers, local.seed_peers, local.static_peers)
logLevel = var.log_level
logSnarkWorkGossip = var.log_snark_work_gossip
uploadBlocksToGCloud = var.upload_blocks_to_gcloud
@@ -109,7 +109,6 @@ locals {
libp2pSecret = config.libp2p_secret
enablePeerExchange = config.enable_peer_exchange
isolated = config.isolated
- seedPeers = local.all_seed_peers
}
]
}
@@ -172,8 +171,8 @@ locals {
}
-output all_seed_peers {
- value = local.all_seed_peers
+output static_peers {
+ value = local.static_peers
}
# Cluster-Local Seed Node
",10
"diff --git a/src/app/libp2p_helper/src/codanet.go b/src/app/libp2p_helper/src/codanet.go @@ -153,30 +153,30 @@ func (cm *CodaConnectionManager) GetInfo() p2pconnmgr.CMInfo {
type CodaGatingState struct {
logger logging.EventLogger
KnownPrivateAddrFilters *ma.Filters
- DeniedAddrFilters *ma.Filters
- AllowedAddrFilters *ma.Filters
- DeniedPeers *peer.Set
- AllowedPeers *peer.Set
+ BannedAddrFilters *ma.Filters
+ TrustedAddrFilters *ma.Filters
+ BannedPeers *peer.Set
+ TrustedPeers *peer.Set
}
// NewCodaGatingState returns a new CodaGatingState
-func NewCodaGatingState(deniedAddrFilters *ma.Filters, allowedAddrFilters *ma.Filters, deniedPeers *peer.Set, allowedPeers *peer.Set) *CodaGatingState {
+func NewCodaGatingState(bannedAddrFilters *ma.Filters, trustedAddrFilters *ma.Filters, bannedPeers *peer.Set, trustedPeers *peer.Set) *CodaGatingState {
logger := logging.Logger(""codanet.CodaGatingState"")
- if deniedAddrFilters == nil {
- deniedAddrFilters = ma.NewFilters()
+ if bannedAddrFilters == nil {
+ bannedAddrFilters = ma.NewFilters()
}
- if allowedAddrFilters == nil {
- allowedAddrFilters = ma.NewFilters()
+ if trustedAddrFilters == nil {
+ trustedAddrFilters = ma.NewFilters()
}
- if deniedPeers == nil {
- deniedPeers = peer.NewSet()
+ if bannedPeers == nil {
+ bannedPeers = peer.NewSet()
}
- if allowedPeers == nil {
- allowedPeers = peer.NewSet()
+ if trustedPeers == nil {
+ trustedPeers = peer.NewSet()
}
// we initialize the known private addr filters to reject all ip addresses initially
@@ -185,17 +185,17 @@ func NewCodaGatingState(deniedAddrFilters *ma.Filters, allowedAddrFilters *ma.Fi
return &CodaGatingState{
logger: logger,
- DeniedAddrFilters: deniedAddrFilters,
- AllowedAddrFilters: allowedAddrFilters,
+ BannedAddrFilters: bannedAddrFilters,
+ TrustedAddrFilters: trustedAddrFilters,
KnownPrivateAddrFilters: knownPrivateAddrFilters,
- DeniedPeers: deniedPeers,
- AllowedPeers: allowedPeers,
+ BannedPeers: bannedPeers,
+ TrustedPeers: trustedPeers,
}
}
func (gs *CodaGatingState) MarkPrivateAddrAsKnown(addr ma.Multiaddr) {
if isPrivateAddr(addr) && gs.KnownPrivateAddrFilters.AddrBlocked(addr) {
- gs.logger.Infof(""marking private addr %v as known"", addr)
+ gs.logger.Debugf(""marking private addr %v as known"", addr)
ip, err := manet.ToIP(addr)
if err != nil {
@@ -211,36 +211,36 @@ func (gs *CodaGatingState) MarkPrivateAddrAsKnown(addr ma.Multiaddr) {
}
}
-func (gs *CodaGatingState) isPeerWhitelisted(p peer.ID) bool {
- return gs.AllowedPeers.Contains(p)
+func (gs *CodaGatingState) isPeerTrusted(p peer.ID) bool {
+ return gs.TrustedPeers.Contains(p)
}
-func (gs *CodaGatingState) isPeerBlacklisted(p peer.ID) bool {
- return gs.DeniedPeers.Contains(p)
+func (gs *CodaGatingState) isPeerBanned(p peer.ID) bool {
+ return gs.BannedPeers.Contains(p)
}
// checks if a peer id is allowed to dial/accept
func (gs *CodaGatingState) isAllowedPeer(p peer.ID) bool {
- return gs.isPeerWhitelisted(p) || !gs.isPeerBlacklisted(p)
+ return gs.isPeerTrusted(p) || !gs.isPeerBanned(p)
}
-func (gs *CodaGatingState) isAddrWhitelisted(addr ma.Multiaddr) bool {
- return !gs.AllowedAddrFilters.AddrBlocked(addr)
+func (gs *CodaGatingState) isAddrTrusted(addr ma.Multiaddr) bool {
+ return !gs.TrustedAddrFilters.AddrBlocked(addr)
}
-func (gs *CodaGatingState) isAddrBlacklisted(addr ma.Multiaddr) bool {
- return gs.DeniedAddrFilters.AddrBlocked(addr)
+func (gs *CodaGatingState) isAddrBanned(addr ma.Multiaddr) bool {
+ return gs.BannedAddrFilters.AddrBlocked(addr)
}
// checks if an address is allowed to dial/accept
func (gs *CodaGatingState) isAllowedAddr(addr ma.Multiaddr) bool {
publicOrKnownPrivate := !isPrivateAddr(addr) || !gs.KnownPrivateAddrFilters.AddrBlocked(addr)
- return gs.isAddrWhitelisted(addr) || (!gs.isAddrBlacklisted(addr) && publicOrKnownPrivate)
+ return gs.isAddrTrusted(addr) || (!gs.isAddrBanned(addr) && publicOrKnownPrivate)
}
-// checks if a peer is allowed to dial/accept; if the peer is in the whitelist, the address checks are overriden
+// checks if a peer is allowed to dial/accept; if the peer is in the trustlist, the address checks are overriden
func (gs *CodaGatingState) isAllowedPeerWithAddr(p peer.ID, addr ma.Multiaddr) bool {
- return gs.isPeerWhitelisted(p) || (gs.isAllowedPeer(p) && gs.isAllowedAddr(addr))
+ return gs.isPeerTrusted(p) || (gs.isAllowedPeer(p) && gs.isAllowedAddr(addr))
}
func (gs *CodaGatingState) logGate() {
@@ -283,7 +283,7 @@ func (gs *CodaGatingState) InterceptAddrDial(id peer.ID, addr ma.Multiaddr) (all
// Bluetooth), straight after it has accepted a connection from its socket.
func (gs *CodaGatingState) InterceptAccept(addrs network.ConnMultiaddrs) (allow bool) {
remoteAddr := addrs.RemoteMultiaddr()
- allow = gs.isAddrWhitelisted(remoteAddr) || !gs.isAddrBlacklisted(remoteAddr)
+ allow = gs.isAddrTrusted(remoteAddr) || !gs.isAddrBanned(remoteAddr)
if !allow {
gs.logger.Infof(""refusing to accept inbound connection from addr: %v"", remoteAddr)
",10
"diff --git a/src/lib/child_processes/child_processes.ml b/src/lib/child_processes/child_processes.ml @@ -379,9 +379,10 @@ let kill : t -> Unix.Exit_or_signal.t Deferred.Or_error.t =
| Some _ ->
Deferred.Or_error.error_string ""already terminated""
-let register_process ?termination_expected (t : Termination.t) (process : t)
- kind =
- Termination.register_process ?termination_expected t process.process kind
+let register_process ?termination_expected (termination : Termination.t)
+ (process : t) kind =
+ Termination.register_process ?termination_expected termination
+ process.process kind
let%test_module _ =
( module struct
",10
"diff --git a/scripts/rebuild-deb.sh b/scripts/rebuild-deb.sh @@ -19,10 +19,10 @@ PVKEYHASH=$(./default/src/app/cli/src/mina.exe internal snark-hashes | sort | md
# TODO: be smarter about this when we introduce a devnet package
#if [[ ""$GITBRANCH"" == ""master"" ]] ; then
-DUNE_PROFILE=""testnet_postake_medium_curves""
+DUNE_PROFILE=""mainnet""
#fi
-PROJECT=""mina-$(echo ""$DUNE_PROFILE"" | tr _ -)""
+PROJECT=""mina-dev""
BUILD_NUM=${BUILDKITE_BUILD_NUM}
BUILD_URL=${BUILDKITE_BUILD_URL}
",10
"diff --git a/src/lib/cli_lib/flag.ml b/src/lib/cli_lib/flag.ml @@ -273,7 +273,7 @@ module Uri = struct
(Resolve_with_default default)
let rest_graphql_opt =
- create ~name:""rest-server"" ~aliases:[""rest-server""]
+ create ~name:""--rest-server"" ~aliases:[""rest-server""]
~arg_type:(arg_type ~path:""graphql"") doc_builder Optional
end
",10
"diff --git a/src/lib/mina_lib/mina_lib.ml b/src/lib/mina_lib/mina_lib.ml @@ -908,9 +908,9 @@ let add_full_transactions t user_command =
|> Deferred.don't_wait_for ;
Ivar.read result_ivar
-let add_snapp_transactions t (snapp_parties : Parties.t list) =
+let add_snapp_transactions t (snapp_txns : Parties.t list) =
let result_ivar = Ivar.create () in
- let cmd_inputs = Snapp_command_inputs snapp_parties in
+ let cmd_inputs = Snapp_command_inputs snapp_txns in
Strict_pipe.Writer.write t.pipes.user_command_input_writer
(cmd_inputs, Ivar.fill result_ivar, get_current_nonce t, get_account t)
|> Deferred.don't_wait_for ;
@@ -1585,13 +1585,14 @@ let create ?wallets (config : Config.t) =
~metadata:[ (""error"", Error_json.error_to_yojson e) ] ;
result_cb (Error e) ;
Deferred.unit )
- | Snapp_command_inputs parties ->
+ | Snapp_command_inputs snapp_txns ->
(* TODO: here, submit a Parties.t, which includes a nonce
allow the nonce to be omitted, and infer it, as done
for user command inputs
*)
Strict_pipe.Writer.write local_txns_writer
- ( List.map parties ~f:(fun cmd -> User_command.Parties cmd)
+ ( List.map snapp_txns ~f:(fun cmd ->
+ User_command.Parties cmd)
, result_cb ))
|> Deferred.don't_wait_for ;
let ((most_recent_valid_block_reader, _) as most_recent_valid_block) =
",10
"diff --git a/src/lib/crypto/kimchi_backend/common/plonk_dlog_proof.ml b/src/lib/crypto/kimchi_backend/common/plonk_dlog_proof.ml @@ -210,8 +210,8 @@ module Make (Inputs : Inputs_intf) = struct
Array.iter arr ~f:(fun fe -> Fq.Vector.emplace_back vec fe) ;
vec
- (** Note that this function will panic if some of the points are points at infinity *)
- let opening_proof_of_backend (t : Opening_proof_backend.t) =
+ (** This function will panic if any of the points are the point at infinity *)
+ let opening_proof_of_backend_exn (t : Opening_proof_backend.t) =
let g (x : G.Affine.Backend.t) : G.Affine.t =
G.Affine.of_backend x |> Pickles_types.Or_infinity.finite_exn
in
@@ -229,7 +229,7 @@ module Make (Inputs : Inputs_intf) = struct
}
let of_backend (t : Backend.t) : t =
- let proof = opening_proof_of_backend t.proof in
+ let proof = opening_proof_of_backend_exn t.proof in
let evals =
(fst t.evals, snd t.evals)
|> Tuple_lib.Double.map ~f:(fun e ->
",10
"diff --git a/src/lib/transaction_snark/transaction_snark.ml b/src/lib/transaction_snark/transaction_snark.ml @@ -4718,13 +4718,13 @@ let%test_module ""transaction_snark"" =
{ pk = acct1.account.public_key
; update = Party.Update.noop
; token_id = Token_id.default
- ; delta =
+ ; balance_change =
Amount.Signed.(of_unsigned receiver_amount |> negate)
; increment_nonce = true
; events = []
; sequence_events = []
; call_data = Field.zero
- ; depth = 0
+ ; call_depth = 0
}
; predicate = Accept
}
",10
"diff --git a/src/app/archive/archive_lib/processor.ml b/src/app/archive/archive_lib/processor.ml @@ -2114,7 +2114,7 @@ module Block = struct
; next_available_token : int64
; ledger_hash : string
; height : int64
- ; global_slot_since_hard_fork : int64
+ ; global_slot : int64
; global_slot_since_genesis : int64
; timestamp : int64
}
@@ -2240,7 +2240,7 @@ module Block = struct
consensus_state
|> Consensus.Data.Consensus_state.blockchain_length
|> Unsigned.UInt32.to_int64
- ; global_slot_since_hard_fork =
+ ; global_slot =
Consensus.Data.Consensus_state.curr_global_slot consensus_state
|> Unsigned.UInt32.to_int64
; global_slot_since_genesis =
@@ -2557,7 +2557,7 @@ module Block = struct
|> Unsigned.UInt64.to_int64
; ledger_hash = block.ledger_hash |> Ledger_hash.to_base58_check
; height = block.height |> Unsigned.UInt32.to_int64
- ; global_slot_since_hard_fork =
+ ; global_slot =
block.global_slot_since_hard_fork |> Unsigned.UInt32.to_int64
; global_slot_since_genesis =
block.global_slot_since_genesis |> Unsigned.UInt32.to_int64
",10
"diff --git a/src/lib/staged_ledger_diff/staged_ledger_diff.ml b/src/lib/staged_ledger_diff/staged_ledger_diff.ml @@ -78,7 +78,7 @@ module Pre_diff_two = struct
module Stable = struct
[@@@no_toplevel_latest_type]
- module V1 = struct
+ module V2 = struct
type ('a, 'b) t =
{ completed_works : 'a list
; commands : 'b list
@@ -107,7 +107,7 @@ module Pre_diff_one = struct
module Stable = struct
[@@@no_toplevel_latest_type]
- module V1 = struct
+ module V2 = struct
type ('a, 'b) t =
{ completed_works : 'a list
; commands : 'b list
@@ -140,7 +140,7 @@ module Pre_diff_with_at_most_two_coinbase = struct
type t =
( Transaction_snark_work.Stable.V2.t
, User_command.Stable.V2.t With_status.Stable.V2.t )
- Pre_diff_two.Stable.V1.t
+ Pre_diff_two.Stable.V2.t
[@@deriving compare, sexp, yojson]
let to_latest = Fn.id
@@ -159,7 +159,7 @@ module Pre_diff_with_at_most_one_coinbase = struct
type t =
( Transaction_snark_work.Stable.V2.t
, User_command.Stable.V2.t With_status.Stable.V2.t )
- Pre_diff_one.Stable.V1.t
+ Pre_diff_one.Stable.V2.t
[@@deriving compare, sexp, yojson]
let to_latest = Fn.id
",10
"diff --git a/src/app/archive/zkapp_tables.sql b/src/app/archive/zkapp_tables.sql @@ -112,7 +112,7 @@ CREATE TABLE zkapp_nonce_bounds
, nonce_upper_bound bigint NOT NULL
);
-CREATE TYPE zkapp_account_precondition_type AS ENUM ('full', 'nonce', 'accept');
+CREATE TYPE zkapp_precondition_type AS ENUM ('full', 'nonce', 'accept');
/* NULL convention */
CREATE TABLE zkapp_precondition_accounts
@@ -132,7 +132,7 @@ CREATE TABLE zkapp_precondition_accounts
*/
CREATE TABLE zkapp_account_precondition
( id serial PRIMARY KEY
-, kind zkapp_account_precondition_type NOT NULL
+, kind zkapp_precondition_type NOT NULL
, precondition_account_id int REFERENCES zkapp_precondition_accounts(id)
, nonce bigint
);
@@ -235,7 +235,7 @@ CREATE TABLE zkapp_party_body
);
CREATE TABLE zkapp_party
-( id serial NOT NULL PRIMARY KEY
+( id serial PRIMARY KEY
, body_id int NOT NULL REFERENCES zkapp_party_body(id)
, account_precondition_id int NOT NULL REFERENCES zkapp_account_precondition(id)
, authorization_kind zkapp_authorization_kind_type NOT NULL
",10
"diff --git a/src/lib/crypto/kimchi_bindings/wasm/src/plonk_verifier_index.rs b/src/lib/crypto/kimchi_bindings/wasm/src/plonk_verifier_index.rs @@ -224,7 +224,7 @@ macro_rules! impl_verification_key {
pub domain: WasmDomain,
pub max_poly_size: i32,
pub max_quot_size: i32,
- pub public: i32,
+ pub public_: i32,
#[wasm_bindgen(skip)]
pub srs: $WasmSrs,
#[wasm_bindgen(skip)]
@@ -241,7 +241,7 @@ macro_rules! impl_verification_key {
domain: &WasmDomain,
max_poly_size: i32,
max_quot_size: i32,
- public: i32,
+ public_: i32,
srs: &$WasmSrs,
evals: &WasmPlonkVerificationEvals,
shifts: &WasmShifts,
@@ -250,7 +250,7 @@ macro_rules! impl_verification_key {
domain: domain.clone(),
max_poly_size,
max_quot_size,
- public,
+ public_,
srs: srs.clone(),
evals: evals.clone(),
shifts: shifts.clone(),
@@ -289,7 +289,7 @@ macro_rules! impl_verification_key {
},
max_poly_size: vi.max_poly_size as i32,
max_quot_size: vi.max_quot_size as i32,
- public: vi.public as i32,
+ public_: vi.public as i32,
srs: srs.into(),
evals: WasmPlonkVerificationEvals {
sigma_comm: IntoIterator::into_iter(vi.sigma_comm).map(From::from).collect(),
@@ -363,7 +363,7 @@ macro_rules! impl_verification_key {
pub fn of_wasm(
max_poly_size: i32,
max_quot_size: i32,
- public: i32,
+ public_: i32,
log_size_of_group: i32,
srs: &$WasmSrs,
evals: &WasmPlonkVerificationEvals,
@@ -410,7 +410,7 @@ macro_rules! impl_verification_key {
endo: endo_q,
max_poly_size: max_poly_size as usize,
max_quot_size: max_quot_size as usize,
- public: public as usize,
+ public: public_ as usize,
zkpm: {
let res = once_cell::sync::OnceCell::new();
res.set(zk_polynomial(domain)).unwrap();
@@ -443,7 +443,7 @@ macro_rules! impl_verification_key {
of_wasm(
index.max_poly_size,
index.max_quot_size,
- index.public,
+ index.public_,
index.domain.log_size_of_group,
&index.srs,
&index.evals,
@@ -582,7 +582,7 @@ macro_rules! impl_verification_key {
},
max_poly_size: 0,
max_quot_size: 0,
- public: 0,
+ public_: 0,
srs: $WasmSrs(Arc::new(SRS::create(0))),
evals: WasmPlonkVerificationEvals {
sigma_comm: vec_comm(PERMUTS),
",10
"diff --git a/packages/jss-preset-default/src/index.js b/packages/jss-preset-default/src/index.js -import functionPlugin from 'jss-plugin-syntax-rule-value-function'
-import observablePlugin from 'jss-plugin-syntax-rule-value-observable'
+import functions from 'jss-plugin-syntax-rule-value-function'
+import observable from 'jss-plugin-syntax-rule-value-observable'
import template from 'jss-plugin-syntax-template'
import global from 'jss-plugin-syntax-global'
import extend from 'jss-plugin-syntax-extend'
@@ -13,8 +13,8 @@ import propsSort from 'jss-plugin-props-sort'
export default (options = {}) => ({
plugins: [
- functionPlugin(options.function),
- observablePlugin(options.observable),
+ functions(options.function),
+ observable(options.observable),
template(options.template),
global(options.global),
extend(options.extend),
",10
"diff --git a/src/utils/Card.js b/src/utils/Card.js @@ -95,7 +95,7 @@ export const cardRarity = (card) => card.rarity ?? card.details.rarity;
export const cardAddedTime = (card) => card.addedTmsp;
-export const cardImg = (card) => card.imgUrl ?? card.details.image_normal ?? card.details.image_small;
+export const cardImageUrl = (card) => card.imgUrl ?? card.details.image_normal ?? card.details.image_small;
export const cardNotes = (card) => card.notes;
@@ -178,7 +178,7 @@ export default {
cardType,
cardRarity,
cardAddedTime,
- cardImg,
+ cardImageUrl,
cardNotes,
cardColorCategory,
cardCost,
",10
"diff --git a/index.html b/index.html this.state.login.trim(),
this.state.password.trim(),
vcard(this.state.fn, this.state.imageDataUrl),
- {""type"": ""email"", ""val"": this.state.email});
+ {""meth"": ""email"", ""val"": this.state.email});
}
},
render: function() {
",10
"diff --git a/index.html b/index.html <title>Tinode</title>
<meta charset=""utf-8"">
<meta name=""viewport"" content=""width=device-width, initial-scale=1"">
- <meta name=""application-name"" content=""Tinode"">
- <meta name=""description"" content=""Instant messaging"">
+ <meta name=""application-name"" content=""TinodeWeb"">
+ <meta name=""description"" content=""Tinode instant messaging"">
<meta name=""application-url"" content=""https://api.tinode.co/"">
<!-- Browser styling for Chrome, FF, Opera -->
<meta name=""theme-color"" content=""#3949AB"">
",10
"diff --git a/src/widgets/contact-list.jsx b/src/widgets/contact-list.jsx @@ -48,14 +48,14 @@ class ContactList extends React.Component {
// If filter function is provided, filter out the items
// which don't satisfy the condition.
if (this.props.filterFunc && this.props.filter) {
- let content = [key];
+ const filterOn = [key];
if (c.private && c.private.comment) {
- content.push(('' + c.private.comment).toLowerCase());
+ filterOn.push(('' + c.private.comment).toLowerCase());
}
if (c.public && c.public.fn) {
- content.push(('' + c.public.fn).toLowerCase());
+ filterOn.push(('' + c.public.fn).toLowerCase());
}
- if (!this.props.filterFunc(this.props.filter, content)) {
+ if (!this.props.filterFunc(this.props.filter, filterOn)) {
return;
}
}
",10
"diff --git a/src/widgets/audio-player.jsx b/src/widgets/audio-player.jsx @@ -39,7 +39,7 @@ export default class AudioPlayer extends React.PureComponent {
this.initAudio = this.initAudio.bind(this);
this.initCanvas = this.initCanvas.bind(this);
- this.calcPreviewBars = this.calcPreviewBars.bind(this);
+ this.resampleBars = this.resampleBars.bind(this);
this.visualize = this.visualize.bind(this);
this.handlePlay = this.handlePlay.bind(this);
@@ -106,7 +106,7 @@ export default class AudioPlayer extends React.PureComponent {
this.canvasContext = this.canvasRef.current.getContext('2d');
this.canvasContext.lineCap = 'round';
- this.viewBuffer = this.calcPreviewBars(this.state.preview);
+ this.viewBuffer = this.resampleBars(this.state.preview);
this.visualize();
}
@@ -172,7 +172,7 @@ export default class AudioPlayer extends React.PureComponent {
}
// Quick and dirty downsampling of the original preview bars into a smaller (or equal) number of bars we can display here.
- calcPreviewBars(original) {
+ resampleBars(original) {
const barCount = Math.min(original.length, ((this.canvasRef.current.width - SPACING) / (LINE_WIDTH + SPACING)) | 0);
const factor = original.length / barCount;
let amps = [];
",10
"diff --git a/package.json b/package.json ""test:ci"": ""NODE_ENV=test BABEL_ENV=test jest --ci --coverage"",
""test:update-snaps"": ""NODE_ENV=test BABEL_ENV=test jest -u"",
""test"": ""NODE_ENV=test BABEL_ENV=test jest"",
- ""component"": ""node scripts/create_component.js""
+ ""create-common-component"": ""node scripts/create_component.js""
},
""lint-staged"": {
""*.js"": [
",10
"diff --git a/components/Press/PressLinks/ArticleGroup/ArticleGroup.js b/components/Press/PressLinks/ArticleGroup/ArticleGroup.js @@ -4,7 +4,7 @@ import OutboundLink from 'components/_common_/OutboundLink/OutboundLink';
import Button from 'components/_common_/Button/Button';
import styles from './ArticleGroup.css';
-class ArticleItem extends Component {
+class ArticleGroup extends Component {
static propTypes = {
links: PropTypes.arrayOf(
PropTypes.shape({
@@ -57,4 +57,4 @@ class ArticleItem extends Component {
}
}
-export default ArticleItem;
+export default ArticleGroup;
",10
"diff --git a/components/HeroBanner/__stories__/HeroBanner.stories.js b/components/HeroBanner/__stories__/HeroBanner.stories.js @@ -12,7 +12,7 @@ storiesOf('Common/HeroBanner', module)
'default',
withInfo()(() => (
<HeroBanner
- backgroundImageSource={text('imageSource', `${s3}heroBanners/stock_family-2.jpg`)}
+ backgroundImageSource={text('backgroundImageSource', `${s3}heroBanners/stock_family-2.jpg`)}
isFullViewportHeight={boolean('isFullViewportHeight', false)}
title={text('title', 'Hero Banner')}
>
",10
"diff --git a/components/SocialMedia/SocialMedia.js b/components/SocialMedia/SocialMedia.js import React from 'react';
import FacebookLogo from 'static/images/icons/facebook_logo.svg';
import TwitterLogo from 'static/images/icons/twitter_logo.svg';
-import GithubLogoCircle from 'static/images/icons/github_logo_circle.svg';
+import GitHubLogo from 'static/images/icons/github_logo_circle.svg';
import InstagramLogo from 'static/images/icons/instagram_logo.svg';
import SocialMediaContainer from './SocialMediaContainer/SocialMediaContainer';
import SocialMediaItem from './SocialMediaItem/SocialMediaItem';
@@ -28,7 +28,7 @@ function SocialMedia() {
<SocialMediaItem
href=""https://github.com/OperationCode/""
name=""GitHub""
- svg={<GithubLogoCircle className={styles.logo} />}
+ svg={<GitHubLogo className={styles.logo} />}
/>
</SocialMediaContainer>
);
",10
"diff --git a/common/constants/partners.js b/common/constants/partners.js @@ -74,9 +74,9 @@ const partners = [
type: PARTNER_TYPES.KIND,
},
{
- name: 'Zeit',
- logoSource: `${s3}partnerLogos/zeit.png`,
- url: 'https://zeit.co/home',
+ name: 'Vercel',
+ logoSource: `${s3}partnerLogos/vercel.png`,
+ url: 'https://vercel.com/home',
type: PARTNER_TYPES.KIND,
},
];
",10
"diff --git a/package.json b/package.json ""name"": ""materialize-css"",
""description"": ""Builds Materialize distribution packages"",
""author"": ""Alvin Wang, Alan Chang"",
- ""url"": ""http://materializecss.com/"",
+ ""homepage"": ""http://materializecss.com/"",
""version"": ""0.98.2"",
""main"": ""dist/js/materialize.js"",
""style"": ""dist/css/materialize.css"",
",10
"diff --git a/jade/page-contents/helpers_content.html b/jade/page-contents/helpers_content.html </div><!-- End Valign Section -->
- <!-- Hiding Section-->
+ <!-- Hiding/Showing Section-->
<div id=""hiding"" class=""section scrollspy"">
- <h2 class=""header"">Hiding Content</h2>
- <p>We provide easy to use classes to hide content on specific screen sizes. </p>
+ <h2 class=""header"">Hiding/Showing Content</h2>
+ <p>We provide easy to use classes to hide/show content on specific screen sizes. </p>
<table class=""striped"">
<thead>
<tr>
",10
"diff --git a/jade/_navbar.jade b/jade/_navbar.jade @@ -77,7 +77,7 @@ header
a(href='pagination.html') Pagination
li(class=(page == ""Preloader"" ? ""active"" : """"))
a(href='preloader.html') Preloader
- li.bold(class=(page == ""Dialogs"" || page == ""Modals"" || page == ""Dropdown"" || page == ""FeatureDiscovery"" || page == ""Tabs"" || page == ""ScrollFire"" || page == ""Scrollspy"" || page == ""SideNav"" || page == ""Pushpin"" || page == ""Waves"" || page == ""Media"" || page == ""Transitions"" || page == ""Parallax"" || page == ""Collapsible"" ? ""active"" : """" || page == ""Carousel"" ? ""active"" : """"))
+ li.bold(class=(page == ""Dialogs"" || page == ""Modals"" || page == ""Dropdown"" || page == ""FeatureDiscovery"" || page == ""Tabs"" || page == ""ScrollFire"" || page == ""Scrollspy"" || page == ""Sidenav"" || page == ""Pushpin"" || page == ""Waves"" || page == ""Media"" || page == ""Transitions"" || page == ""Parallax"" || page == ""Collapsible"" ? ""active"" : """" || page == ""Carousel"" ? ""active"" : """"))
a.collapsible-header(class=""waves-effect waves-teal"")
| JavaScript
.collapsible-body
",10
"diff --git a/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/datasearch/adapter/CsvBackedUsgsGateway.groovy b/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/datasearch/adapter/CsvBackedUsgsGateway.groovy @@ -110,7 +110,7 @@ class CsvBackedUsgsGateway implements DataSetMetadataGateway {
}
private Double cloudCover(Sensor sensor, data) {
- def result = data.cloudCoverFull.toDouble() as Double
+ def result = data.cloudCover.toDouble() as Double
// LANDSAT_7 with SLC off always miss about 22% of its data. Consider that cloud cover.
if (result && sensor == LANDSAT_7 && data.SCAN_GAP_INTERPOLATION)
result = Math.min(100, result + 22)
@@ -121,7 +121,7 @@ class CsvBackedUsgsGateway implements DataSetMetadataGateway {
def prefix = (data.sceneID as String).substring(0, 3)
return data.COLLECTION_CATEGORY in ['T1', 'T2'] &&
data.dayOrNight == 'DAY' &&
- data.cloudCoverFull.toDouble() >= 0d &&
+ data.cloudCover.toDouble() >= 0d &&
prefix in ['LT4', 'LT5', 'LE7', 'LC8']
}
",10
"diff --git a/modules/gui-react/frontend/src/backend.js b/modules/gui-react/frontend/src/backend.js @@ -256,9 +256,9 @@ const transformAoi = (aoi) => {
case 'fusionTable':
return {
type: 'fusionTable',
- tableName: aoi.id,
+ id: aoi.id,
keyColumn: aoi.keyColumn,
- keyValue: aoi.key
+ key: aoi.key
}
case 'polygon':
return {
",10
"diff --git a/modules/gui-react/frontend/src/locale/en/translations.json b/modules/gui-react/frontend/src/locale/en/translations.json },
""typology"": {
""title"": ""Typology"",
- ""button"": ""TOP"",
+ ""button"": ""TYP"",
""tooltip"": ""Select typology""
},
""trainingData"": {
",10
"diff --git a/modules/gui/frontend/src/locale/en/translations.json b/modules/gui/frontend/src/locale/en/translations.json ""type"": {
""label"": ""Scene selection"",
""all.label"": ""Use all scenes"",
- ""select.label"": ""Select individual scenes""
+ ""select.label"": ""Select scenes""
},
""targetDateWeight"": {
""label"": ""Priority"",
",10
"diff --git a/modules/gui/frontend/src/locale/en/translations.json b/modules/gui/frontend/src/locale/en/translations.json ""tooltip"":""Remove image from classification""
},
""sections"": {
- ""title"": ""Add image to classify""
+ ""title"": ""Image to classify""
},
""recipe"": {
- ""title"": ""Add saved Sepal recipe""
+ ""title"": ""Saved Sepal recipe""
},
""asset"": {
- ""title"": ""Add Earth Engine asset""
+ ""title"": ""Earth Engine asset""
},
""form"": {
""section"": {
",10
"diff --git a/hosting-services/aws/sepal/monit/config.template b/hosting-services/aws/sepal/monit/config.template @@ -8,4 +8,4 @@ set mailserver {{ smtp_host }} port {{ smtp_port }}
set mail-format { from: {{ smtp_from }} }
-set alert {{ sepal_operator_email }}
+set alert {{ sepal_monitoring_email }}
",10
"diff --git a/plugin.js b/plugin.js @@ -14,23 +14,23 @@ export default function({ app }, inject) {
}
let _fireStore, _fireFunc, _fireStorage, _fireAuth
- if (!options.use || options.use.includes('firestore')) {
+ if (!options.useOnly || options.useOnly.includes('firestore')) {
firebase.firestore().settings({ timestampsInSnapshots: true })
_fireStore = firebase.firestore()
inject('fireStore', _fireStore)
}
- if (!options.use || options.use.includes('functions')) {
+ if (!options.useOnly || options.useOnly.includes('functions')) {
_fireFunc = firebase.functions()
inject('fireFunc', _fireFunc)
}
- if (!options.use || options.use.includes('storage')) {
+ if (!options.useOnly || options.useOnly.includes('storage')) {
_fireStorage = firebase.storage()
inject('fireStorage', _fireStorage)
}
- if (!options.use || options.use.includes('auth')) {
+ if (!options.useOnly || options.useOnly.includes('auth')) {
const _fireAuth = firebase.auth()
inject('fireAuth', _fireAuth)
}
",10
"diff --git a/README.md b/README.md @@ -44,7 +44,7 @@ modules: [
#### useOnly
-By default, all supported services are loaded. If you only wish to load certain services (recommended!), add this `useOnly` option.
+By default, all supported Firebase products are loaded. If you only wish to load certain products (recommended!), add this `useOnly` option.
- type: `Array<string>`
- default: `null`
@@ -75,11 +75,11 @@ Same es `config`, but applies when `NODE_ENV === 'development'`.
## Usage
-You can access the various Firebase services with **\$foo** in almost any context using `app.$foo` or `this.$foo`, including store actions. Make sure to replace the _foo_ with a shortcut from the table below.
+You can access the various Firebase products with **\$foo** in almost any context using `app.$foo` or `this.$foo`, including store actions. Make sure to replace the _foo_ with a shortcut from the table below.
-Services supported by nuxt-fire so far:
+Firebase products supported by nuxt-fire so far:
-| Firebase Service | Shortcut |
+| Firebase Product | Shortcut |
| ----------------- | --------------- |
| Authentication | \$fireAuth |
| RealTime Database | \$fireDb |
",10
"diff --git a/README.md b/README.md @@ -82,12 +82,12 @@ You can access the various Firebase products with **\$foo** in almost any contex
Firebase products supported by nuxt-fire so far:
| Firebase Product | Shortcut |
-| ----------------- | --------------- |
+| ----------------- | ------------- |
| Authentication | \$fireAuth |
| RealTime Database | \$fireDb |
| Firestore | \$fireStore |
| Storage | \$fireStorage |
-| Functions | \$fireFunctions |
+| Functions | \$fireFunc |
See [Firebase's official docs](https://firebase.google.com/docs/) for more usage information.
",10
"diff --git a/plugin.js b/plugin.js @@ -50,8 +50,8 @@ export default (ctx, inject) => {
}
if(process.browser && options.useOnly.includes('performance')){
- const perf = firebase.performance()
- inject('perf', perf)
+ const firePerf = firebase.performance()
+ inject('firePerf', firePerf)
}
}
",10
"diff --git a/packages/docs/options/README.md b/packages/docs/options/README.md @@ -113,7 +113,7 @@ All services mentioned below can have the following options:
#### static
-By default, each service gets imported dynamically, which splits them into separate chunks. If `static = true` however, we import them statically, so the services are bundled into `vendor.js`.
+By default, each service gets imported dynamically, which splits them into separate chunks. If `static = true` however, we import them statically, so the services are bundled into `vendors.app.js`.
```js
// static: false (default)
",10
"diff --git a/docs/examples/u-district-cuisine.md b/docs/examples/u-district-cuisine.md @@ -5,6 +5,6 @@ permalink: /examples/u-district-cuisine/index.html
spec: u-district-cuisine
---
-A [joy plot](http://blog.revolutionanalytics.com/2017/07/joyplots.html) showing the prevalence of various food and beverage categories in Seattle's University District. One never has to go far for coffee! Similar to a [violin plot](../violin-plot), this plot uses a continuous approximation of discrete data computed using [kernel density estimation (KDE)](https://en.wikipedia.org/wiki/Kernel_density_estimation). This graphic originally appeared in [Alaska Airlines Beyond Magazine (Sep 2017, p. 120)](http://www.paradigmcg.com/digitaleditions/abm-0917/html5/).
+A [ridgeline plot](http://blog.revolutionanalytics.com/2017/07/joyplots.html) showing the prevalence of various food and beverage categories in Seattle's University District. One never has to go far for coffee! Similar to a [violin plot](../violin-plot), this plot uses a continuous approximation of discrete data computed using [kernel density estimation (KDE)](https://en.wikipedia.org/wiki/Kernel_density_estimation). This graphic originally appeared in [Alaska Airlines Beyond Magazine (Sep 2017, p. 120)](http://www.paradigmcg.com/digitaleditions/abm-0917/html5/).
{% include example spec=page.spec %}
",10
"diff --git a/packages/vega-scenegraph/src/ImageLoader.js b/packages/vega-scenegraph/src/ImageLoader.js import Image from './util/canvas/image';
import {load} from 'vega-loader';
-export default function ImageLoader(loadConfig) {
+export default function ImageLoader(loadOptions) {
this._pending = 0;
- this._config = loadConfig || ImageLoader.Config;
+ this._options = loadOptions || ImageLoader.Options;
}
// Overridable global default load configuration
-ImageLoader.Config = {};
+ImageLoader.Options = {};
var prototype = ImageLoader.prototype;
@@ -16,7 +16,7 @@ prototype.pending = function() {
};
prototype.imageURL = function(uri) {
- return load.sanitize(uri, this._config);
+ return load.sanitize(uri, this._options);
};
prototype.loadImage = function(uri) {
",10
"diff --git a/packages/vega-encode/src/Scale.js b/packages/vega-encode/src/Scale.js @@ -17,8 +17,8 @@ var SKIP = {
'zero': 1,
'range': 1,
+ 'rangeStep': 1,
'round': 1,
- 'bandSize': 1,
'reverse': 1
};
@@ -89,11 +89,15 @@ function configureRange(scale, _, count) {
var type = scale.type,
range = _.range;
- if (_.bandSize != null) {
+ if (_.rangeStep != null) {
if (type !== 'band' && type !== 'point') {
- error('Only band and point scales support bandSize.');
+ error('Only band and point scales support rangeStep.');
}
- range = [0, _.bandSize * count];
+ // calculate full range based on requested step size and padding
+ // Mirrors https://github.com/d3/d3-scale/blob/master/src/band.js#L23
+ var inner = (_.paddingInner != null ? _.paddingInner : _.padding) || 0,
+ outer = (_.paddingOuter != null ? _.paddingOuter : _.padding) || 0;
+ range = [0, _.rangeStep * (count - (count > 1 ? inner : 0) + outer * 2)];
}
if (range) {
",10
"diff --git a/packages/vega-runtime/test/expression-test.js b/packages/vega-runtime/test/expression-test.js @@ -15,7 +15,7 @@ tape('Parser parses expressions', function(test) {
{id:0, type:'Operator', value: 50},
{id:1, type:'Operator', update: '2 * _.foo', params: {foo:{$ref:0}}},
{id:2, type:'Collect', value: {$ingest: values}},
- {id:3, type:'Apply', params: {
+ {id:3, type:'Formula', params: {
expr: {
$expr: 'datum.x * datum.y',
$fields: ['x', 'y']
",10
"diff --git a/packages/vega-typings/types/spec/scale.d.ts b/packages/vega-typings/types/spec/scale.d.ts @@ -114,23 +114,23 @@ export interface SequentialScale extends BaseScale {
range: RangeScheme;
clamp?: boolean | SignalRef;
zero?: boolean | SignalRef;
- nice?: boolean | Nice | SignalRef;
+ nice?: boolean | TimeInterval | SignalRef;
}
-export type Nice = 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year';
+export type TimeInterval = 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year';
export interface TimeScale extends BaseScale {
type: 'time' | 'utc';
range?: RangeScheme;
clamp?: boolean | SignalRef;
- nice?: boolean | Nice | SignalRef;
+ nice?: boolean | TimeInterval | SignalRef;
}
export interface IdentityScale extends BaseScale {
type: 'identity';
- nice?: Nice;
+ nice?: TimeInterval;
}
export interface DiscretizingScale extends BaseScale {
type: DiscreteScaleType;
range?: RangeScheme;
- nice?: boolean | Nice | SignalRef;
+ nice?: boolean | TimeInterval | SignalRef;
zero?: boolean | SignalRef;
}
export interface LinearScale extends BaseScale {
",10
"diff --git a/plugins/candela/web_client/views/CandelaWidget.js b/plugins/candela/web_client/views/CandelaWidget.js @@ -6,7 +6,6 @@ import CandelaWidgetTemplate from '../templates/candelaWidget.pug';
import '../stylesheets/candelaWidget.styl';
import candela from 'candela';
-import d3 from 'd3';
import datalib from 'datalib';
var CandelaWidget = View.extend({
@@ -46,8 +45,30 @@ var CandelaWidget = View.extend({
components: this._components
}));
this.parametersView.setElement($('.g-item-candela-parameters'));
- d3.csv('/api/v1/item/' + this.item.get('_id') + '/download', (error, data) => {
+ datalib.csv('/api/v1/item/' + this.item.get('_id') + '/download', (error, data) => {
datalib.read(data, {parse: 'auto'});
+
+ // Vega has issues with empty-string fields and fields with dots, so rename those.
+ let rename = [];
+ for (let key in data.__types__) {
+ if (data.__types__.hasOwnProperty(key)) {
+ if (key === '') {
+ rename.push(['', 'id']);
+ } else if (key.indexOf('.') >= 0) {
+ rename.push([key, key.replace(/\./g, '_')]);
+ }
+ }
+ }
+
+ rename.forEach(d => {
+ data.__types__[d[1]] = data.__types__[d[0]];
+ delete data.__types__[d[0]];
+ data.forEach(row => {
+ row[d[1]] = row[d[0]];
+ delete row[d[0]];
+ });
+ });
+
let columns = [];
for (let key in data.__types__) {
if (data.__types__.hasOwnProperty(key)) {
",10
"diff --git a/plugins/candela/girder_candela/web_client/package.json b/plugins/candela/girder_candela/web_client/package.json ""peerDependencies"": {
""@girder/item_tasks"": ""*""
},
- ""girder-plugin"": {
+ ""girderPlugin"": {
""name"": ""candela"",
""main"": ""./main.js"",
""dependencies"": [""item_tasks""],
",10
"diff --git a/html/app.js b/html/app.js @@ -123,21 +123,21 @@ if (window.CefSharp) {
Vue.filter('commaNumber', commaNumber);
var formatDate = (s, format) => {
- var ctx = new Date(s);
- if (isNaN(ctx)) {
+ var dt = new Date(s);
+ if (isNaN(dt)) {
return escapeTag(s);
}
- var hours = ctx.getHours();
+ var hours = dt.getHours();
var map = {
- 'YYYY': String(10000 + ctx.getFullYear()).substr(-4),
- 'MM': String(101 + ctx.getMonth()).substr(-2),
- 'DD': String(100 + ctx.getDate()).substr(-2),
+ 'YYYY': String(10000 + dt.getFullYear()).substr(-4),
+ 'MM': String(101 + dt.getMonth()).substr(-2),
+ 'DD': String(100 + dt.getDate()).substr(-2),
'HH24': String(100 + hours).substr(-2),
'HH': String(100 + (hours > 12
? hours - 12
: hours)).substr(-2),
- 'MI': String(100 + ctx.getMinutes()).substr(-2),
- 'SS': String(100 + ctx.getSeconds()).substr(-2),
+ 'MI': String(100 + dt.getMinutes()).substr(-2),
+ 'SS': String(100 + dt.getSeconds()).substr(-2),
'AMPM': hours >= 12
? 'PM'
: 'AM'
",10
"diff --git a/html/app.js b/html/app.js @@ -206,11 +206,11 @@ if (window.CefSharp) {
var API = {};
- API.$eventHandlers = new Map();
+ API.eventHandlers = new Map();
API.$emit = function (name, ...args) {
// console.log(name, ...args);
- var handlers = this.$eventHandlers.get(name);
+ var handlers = this.eventHandlers.get(name);
if (handlers === undefined) {
return;
}
@@ -225,16 +225,16 @@ if (window.CefSharp) {
};
API.$on = function (name, fx) {
- var handlers = this.$eventHandlers.get(name);
+ var handlers = this.eventHandlers.get(name);
if (handlers === undefined) {
handlers = [];
- this.$eventHandlers.set(name, handlers);
+ this.eventHandlers.set(name, handlers);
}
handlers.push(fx);
};
API.$off = function (name, fx) {
- var handlers = this.$eventHandlers.get(name);
+ var handlers = this.eventHandlers.get(name);
if (handlers === undefined) {
return;
}
@@ -244,14 +244,14 @@ if (window.CefSharp) {
if (length > 1) {
handlers.splice(i, 1);
} else {
- this.$eventHandlers.delete(name);
+ this.eventHandlers.delete(name);
}
break;
}
}
};
- API.$pendingGetRequests = new Map();
+ API.pendingGetRequests = new Map();
API.call = function (endpoint, options) {
var input = `https://api.vrchat.cloud/api/1/${endpoint}`;
@@ -276,7 +276,7 @@ if (window.CefSharp) {
}
delete init.body;
// merge requests
- var request = this.$pendingGetRequests.get(input);
+ var request = this.pendingGetRequests.get(input);
if (request) {
return request;
}
@@ -324,15 +324,15 @@ if (window.CefSharp) {
if (isGetRequest) {
req.finally(() => {
- this.$pendingGetRequests.delete(input);
+ this.pendingGetRequests.delete(input);
});
- this.$pendingGetRequests.set(input, req);
+ this.pendingGetRequests.set(input, req);
}
return req;
};
- API.$status = {
+ API.statusCodes = {
100: 'Continue',
101: 'Switching Protocols',
102: 'Processing',
@@ -410,7 +410,7 @@ if (window.CefSharp) {
API.$throw = function (code, error, extra) {
var text = [];
if (code) {
- var status = this.$status[code];
+ var status = this.statusCodes[code];
if (status) {
text.push(`${code} ${status}`);
} else {
",10
"diff --git a/html/app.js b/html/app.js @@ -798,12 +798,12 @@ CefSharp.BindObjectAsync(
};
var applyUserTrustLevel = function (ref) {
- ref.$isVIP = ref.developerType &&
+ ref.$isModerator = ref.developerType &&
ref.developerType !== 'none';
ref.$isTroll = false;
var { tags } = ref;
if (tags.includes('admin_moderator')) {
- ref.$isVIP = true;
+ ref.$isModerator = true;
}
if (tags.includes('system_troll') ||
tags.includes('system_probable_troll')) {
@@ -831,7 +831,7 @@ CefSharp.BindObjectAsync(
ref.$trustLevel = 'Visitor';
ref.$trustClass = 'x-tag-untrusted';
}
- if (ref.$isVIP) {
+ if (ref.$isModerator) {
ref.$trustLevel = 'VRChat Team';
ref.$trustClass = 'x-tag-vip';
} else if (ref.$isTroll) {
@@ -876,7 +876,7 @@ CefSharp.BindObjectAsync(
offlineFriends: [],
// VRCX
$homeLocation: {},
- $isVIP: false,
+ $isModerator: false,
$isTroll: false,
$trustLevel: 'Visitor',
$trustClass: 'x-tag-untrusted',
@@ -956,7 +956,7 @@ CefSharp.BindObjectAsync(
// VRCX
$location: {},
$location_at: Date.now(),
- $isVIP: false,
+ $isModerator: false,
$isTroll: false,
$trustLevel: 'Visitor',
$trustClass: 'x-tag-untrusted',
",10
"diff --git a/html/src/app.js b/html/src/app.js @@ -10912,9 +10912,9 @@ speechSynthesis.getVoices();
$app.data.VRChatConfigFile = {};
$app.data.VRChatConfigList = {
- cache_size: { name: 'Max Cache Size in Gigabytes (minimum 20)', default: '20' },
- cache_expiry_delay: { name: 'Expire Cache in Days (minimum 30)', default: '30' },
- cache_directory: { name: 'Custom Cache Directory Location', default: '%AppData%\\..\\LocalLow\\VRChat\\vrchat' },
+ cache_size: { name: 'Max Cache Size [GB] (minimum 20)', default: '20' },
+ cache_expiry_delay: { name: 'Cache Expiry [Days] (minimum 30)', default: '30' },
+ cache_directory: { name: 'Custom Cache Folder Location', default: '%AppData%\\..\\LocalLow\\VRChat\\vrchat' },
dynamic_bone_max_affected_transform_count: { name: 'Dynamic Bones Limit Max Transforms (0 disables all components)', default: '32' },
dynamic_bone_max_collider_check_count: { name: 'Dynamic Bones Limit Max Collider Collisions (0 disables all components)', default: '8' }
};
",10
"diff --git a/src/browser/telemetry.js b/src/browser/telemetry.js @@ -87,8 +87,8 @@ Instrumenter.prototype.instrumentNetwork = function() {
method: method,
url: url,
status_code: null,
- open_time_ms: _.now(),
- done_time_ms: null
+ start_time_ms: null,
+ end_time_ms: null
};
}
return orig.apply(this, arguments);
@@ -102,9 +102,14 @@ Instrumenter.prototype.instrumentNetwork = function() {
var xhr = this;
function onreadystatechangeHandler() {
- if (xhr.__rollbar_xhr && xhr.readyState === 4) {
+ // FIXME: This may create two identical events because of JS references
+ if (xhr.__rollbar_xhr && (xhr.readState === 1 || xhr.readyState === 4)) {
try {
- xhr.__rollbar_xhr.done_time_ms = _.now();
+ if (xhr.readState === 1) {
+ xhr.__rollbar_xhr.start_time_ms = _.now();
+ } else {
+ xhr.__rollbar_xhr.end_time_ms = _.now();
+ }
xhr.__rollbar_xhr.status_code = xhr.status;
} catch (e) {
/* ignore possible exception from xhr.status */
@@ -156,12 +161,12 @@ Instrumenter.prototype.instrumentNetwork = function() {
method: method,
url: url,
status_code: null,
- open_time_ms: _.now(),
- done_time_ms: null
+ start_time_ms: _.now(),
+ end_time_ms: null
};
self.telemeter.captureNetwork(metadata, 'fetch');
return orig.apply(this, args).then(function (resp) {
- metadata.done_time_ms = _.now();
+ metadata.end_time_ms = _.now();
metadata.status_code = resp.status;
return resp;
});
",10
"diff --git a/src/browser/transforms.js b/src/browser/transforms.js @@ -309,12 +309,12 @@ function errorClass(stackInfo, guess, options) {
}
}
-function addScrubber(scrub) {
+function addScrubber(scrubFn) {
return function (item, options, callback) {
- if (scrub) {
+ if (scrubFn) {
var scrubFields = options.scrubFields || [];
var scrubPaths = options.scrubPaths || [];
- item.data = scrub(item.data, scrubFields, scrubPaths);
+ item.data = scrubFn(item.data, scrubFields, scrubPaths);
}
callback(null, item);
}
",10
"diff --git a/package.json b/package.json ""scripts"": {
""db"": ""nodemon ./db"",
""build"": ""webpack --config webpack_config/webpack.prod.js"",
- ""build:demo"": ""BUILD_GH_PAGES=true webpack --config webpack_config/webpack.prod.js"",
- ""jest"": ""jest"",
- ""test"": ""jest --config=jest_config/jest.config.json --coverage"",
+ ""build:demo"": ""BUILD_DEMO=true webpack --config webpack_config/webpack.prod.js"",
+ ""test"": ""jest --config=jest_config/jest.config.json --coverage --forceExit"",
""dev"": ""node webpack_config/server.js"",
""ssr"": ""nodemon --exec REACT_WEBPACK_ENV='dev' babel-node ./common/server""
},
",10
"diff --git a/docs/components/forms.md b/docs/components/forms.md @@ -189,7 +189,7 @@ Here are examples of `.form-control` applied to each textual HTML5 `<input>` `ty
| `time` | <input class=""form-control"" type=""time"" value=""13:45:00"" id=""example-time-input""> |
| `color` | <input class=""form-control"" type=""color"" value=""#563d7c"" id=""example-color-input""> |
-## Form layouts
+## Layout
Since Bootstrap applies `display: block` and `width: 100%` to almost all our form controls, forms will by default stack vertically. Additional classes can be used to vary this layout on a per-form basis.
",10
"diff --git a/build/saucelabs-unit-test.js b/build/saucelabs-unit-test.js @@ -17,13 +17,12 @@ const jsUnitSaucelabs = new JSUnitSaucelabs({
const testURL = 'http://localhost:3000/js/tests/index.html?hidepassed'
const browsersFile = require(path.resolve(__dirname, './sauce_browsers.json'))
let jobsDone = 0
-let jobsSuccess = 0
+let jobsSucceeded = 0
const waitingCallback = (error, body, id) => {
if (error) {
console.error(error)
process.exit(1)
- return
}
if (typeof body !== 'undefined') {
@@ -55,14 +54,14 @@ const waitingCallback = (error, body, id) => {
}
if (passed) {
- jobsSuccess++
+ jobsSucceeded++
}
jobsDone++
// Exit
if (jobsDone === browsersFile.length - 1) {
jsUnitSaucelabs.stop()
- process.exit(jobsDone === jobsSuccess ? 0 : 1)
+ process.exit(jobsDone === jobsSucceeded ? 0 : 1)
}
}
}
@@ -70,9 +69,10 @@ const waitingCallback = (error, body, id) => {
jsUnitSaucelabs.on('tunnelCreated', () => {
browsersFile.forEach((tmpBrowser) => {
- const broPlatform = typeof tmpBrowser.platform === 'undefined' ? tmpBrowser.platformName : tmpBrowser.platform
- const arrayBro = [broPlatform, tmpBrowser.browserName, tmpBrowser.version]
- jsUnitSaucelabs.start([arrayBro], testURL, 'qunit', (error, success) => {
+ const browsersPlatform = typeof tmpBrowser.platform === 'undefined' ? tmpBrowser.platformName : tmpBrowser.platform
+ const browsersArray = [browsersPlatform, tmpBrowser.browserName, tmpBrowser.version]
+
+ jsUnitSaucelabs.start([browsersArray], testURL, 'qunit', (error, success) => {
if (typeof success !== 'undefined') {
const taskIds = success['js tests']
@@ -91,4 +91,5 @@ jsUnitSaucelabs.on('tunnelCreated', () => {
})
})
})
+
jsUnitSaucelabs.initTunnel()
",10
"diff --git a/scss/_variables.scss b/scss/_variables.scss @@ -530,9 +530,9 @@ $navbar-padding-x: $spacer !default;
$navbar-brand-font-size: $font-size-lg !default;
// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
-$nav-link-height: $navbar-brand-font-size * $line-height-base !default;
-$navbar-brand-height: ($font-size-base * $line-height-base + $nav-link-padding-y * 2) !default;
-$navbar-brand-padding-y: ($navbar-brand-height - $nav-link-height) / 2 !default;
+$nav-link-height: ($font-size-base * $line-height-base + $nav-link-padding-y * 2) !default;
+$navbar-brand-height: $navbar-brand-font-size * $line-height-base !default;
+$navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) / 2 !default;
$navbar-toggler-padding-y: .25rem !default;
$navbar-toggler-padding-x: .75rem !default;
",10
"diff --git a/package.json b/package.json ""docs-lint-vnu-jar"": ""node build/vnu-jar.js"",
""docs-serve"": ""bundle exec jekyll serve"",
""docs-workbox-precache"": ""node build/workbox.js"",
- ""maintenance-dependencies"": ""ncu -a -x jquery && npm update && bundle update && shx echo \""Manually update site/docs/4.1/assets/js/vendor/*, js/tests/vendor/* and .travis.yml\"""",
+ ""update-deps"": ""ncu -a -x jquery -x bundlesize && npm update && bundle update && shx echo Manually update \""site/docs/4.1/assets/js/vendor/\"""",
""release-sri"": ""node build/generate-sri.js"",
""release-version"": ""node build/change-version.js"",
""release-zip"": ""cross-env-shell \""shx cp -r dist/ bootstrap-$npm_package_version-dist && zip -r9 bootstrap-$npm_package_version-dist.zip bootstrap-$npm_package_version-dist && shx rm -rf bootstrap-$npm_package_version-dist\"""",
",10
"diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss --#{$variable-prefix}dropdown-inner-border: #{$dropdown-inner-border-radius};
--#{$variable-prefix}dropdown-divider-bg: #{$dropdown-divider-bg};
--#{$variable-prefix}dropdown-divider-margin-y: #{$dropdown-divider-margin-y};
- --#{$variable-prefix}dropdown-shadow: #{$dropdown-box-shadow};
+ --#{$variable-prefix}dropdown-box-shadow: #{$dropdown-box-shadow};
--#{$variable-prefix}dropdown-link-color: #{$dropdown-link-color};
--#{$variable-prefix}dropdown-link-hover-color: #{$dropdown-link-hover-color};
--#{$variable-prefix}dropdown-link-hover-bg: #{$dropdown-link-hover-bg};
background-clip: padding-box;
border: var(--#{$variable-prefix}dropdown-border-width) solid var(--#{$variable-prefix}dropdown-border-color);
@include border-radius(var(--#{$variable-prefix}dropdown-border-radius));
- @include box-shadow(var(--#{$variable-prefix}dropdown-shadow));
+ @include box-shadow(var(--#{$variable-prefix}dropdown-box-shadow));
&[data-bs-popper] {
top: 100%;
--#{$variable-prefix}dropdown-color: #{$dropdown-dark-color};
--#{$variable-prefix}dropdown-bg: #{$dropdown-dark-bg};
--#{$variable-prefix}dropdown-border-color: #{$dropdown-dark-border-color};
- --#{$variable-prefix}dropdown-shadow: #{$dropdown-dark-box-shadow};
+ --#{$variable-prefix}dropdown-box-shadow: #{$dropdown-dark-box-shadow};
--#{$variable-prefix}dropdown-link-color: #{$dropdown-dark-link-color};
--#{$variable-prefix}dropdown-link-hover-color: #{$dropdown-dark-link-hover-color};
--#{$variable-prefix}dropdown-divider-bg: #{$dropdown-dark-divider-bg};
",10
"diff --git a/src/components/CenteredMap.js b/src/components/CenteredMap.js @@ -40,7 +40,7 @@ class CenteredMap extends React.PureComponent {
minZoom={zoom}
dragging={!frozen}
scrollWheelZoom={false}
- doubleClickZoom={false}
+ doubleClickZoom={!frozen}
zoomControl={!frozen}
>
<TileLayer
",11
"diff --git a/components/button.js b/components/button.js import React from 'react'
import PropTypes from 'prop-types'
-const Button = ({ children, type, name, onClick, disabled, size }) => (
- <button type={type} name={name} onClick={onClick} disabled={disabled} className={size}>
- {children}
+const Button = ({ children, type, size, href, ...props }) => {
+ const buttonProps = href ? {} : props
+
+ return (
+ <button type={type} className={size} {...buttonProps}>
+ {href ? (
+ <a href={href} {...props}>{children}</a>
+ ) : children}
<style jsx>{`
@import 'colors';
@@ -19,7 +24,7 @@ const Button = ({ children, type, name, onClick, disabled, size }) => (
cursor: pointer;
&:hover {
- background-color: $highlight-blue;
+ background-color: darken($blue, 7%);
}
&:disabled {
@@ -29,20 +34,32 @@ const Button = ({ children, type, name, onClick, disabled, size }) => (
}
}
+ a {
+ display: block;
+ margin: -6px -8px;
+ padding: 6px 8px;
+ color: inherit;
+ }
+
.large {
font-size: 1.2em;
padding: 12px 16px;
+
+ a {
+ display: block;
+ margin: -12px -16px;
+ padding: 12px 16px;
+ }
}
`}</style>
</button>
)
+}
Button.propTypes = {
children: PropTypes.node,
type: PropTypes.string,
- name: PropTypes.string,
- onClick: PropTypes.func,
- disabled: PropTypes.bool,
+ href: PropTypes.string,
size: PropTypes.oneOf([
'large'
])
@@ -50,7 +67,7 @@ Button.propTypes = {
Button.defaultProps = {
type: 'button',
- disabled: false
+ href: null
}
export default Button
",11
"diff --git a/components/box.js b/components/box.js import React from 'react'
import PropTypes from 'prop-types'
-const Box = ({ children, title, color }) => (
+const Box = ({ children, title, subtitle, color }) => (
<div className='wrapper'>
- {title && <h3 className={color}>{title}</h3>}
+ {(title || subtitle) && (
+ <div className={`header ${color}`}>
+ {title && <h3>{title}</h3>}
+ {subtitle && <div className='subtitle'>{subtitle}</div>}
+ </div>
+ )}
<div className='inner'>
{children}
</div>
@@ -19,16 +24,23 @@ const Box = ({ children, title, color }) => (
overflow: hidden;
}
+ .header {
+ padding: 0.6em 0.75em 0.55em;
+ }
+
h3 {
font-size: 1.1em;
margin: 0;
- padding: 0.6em 0.75em 0.55em;
max-width: 100%;
overflow: hidden;
text-overflow: ellipsis;
font-weight: normal;
}
+ .subtitle {
+ font-size: 0.9em;
+ }
+
.inner {
padding: 1.5em 1.7em;
@@ -41,11 +53,19 @@ const Box = ({ children, title, color }) => (
.grey {
background-color: $lightgrey;
+
+ .subtitle {
+ color: $grey;
+ }
}
.blue {
background-color: $blue;
color: $white;
+
+ .subtitle {
+ color: lighten($blue, 35%);
+ }
}
`}</style>
</div>
@@ -54,6 +74,7 @@ const Box = ({ children, title, color }) => (
Box.propTypes = {
children: PropTypes.node,
title: PropTypes.string,
+ subtitle: PropTypes.string,
color: PropTypes.oneOf([
'grey',
'blue'
",11
"diff --git a/MaterialSkin/HTML/material/html/js/queue-page.js b/MaterialSkin/HTML/material/html/js/queue-page.js @@ -83,10 +83,10 @@ var lmsQueue = Vue.component(""LmsQueue"", {
</v-dialog>
<v-snackbar v-model=""snackbar.show"" :multi-line=""true"" :timeout=""2500"" :color=""snackbar.color"" top>{{ snackbar.msg }}</v-snackbar>
<v-card class=""subtoolbar pq-details"">
- <v-layout v-if=""playerIsOn"">
+ <v-layout>
<v-flex class=""pq-text"" v-if=""trackCount>0"">{{trackCount | displayCount}} {{duration | displayTime(true)}}</v-flex>
<v-spacer></v-spacer>
- <v-btn flat icon @click.stop=""scrollToCurrent()"" class=""toolbar-button""><v-icon>queue_music</v-icon></v-btn>
+ <v-btn flat icon v-if=""playerIsOn"" @click.stop=""scrollToCurrent()"" class=""toolbar-button""><v-icon>queue_music</v-icon></v-btn>
<v-btn flat icon @click.stop=""save()"" class=""toolbar-button""><v-icon>save</v-icon></v-btn>
<v-btn flat icon @click.stop=""clear()"" class=""toolbar-button""><v-icon>clear_all</v-icon></v-btn>
</v-layout>
@@ -108,7 +108,7 @@ var lmsQueue = Vue.component(""LmsQueue"", {
<v-list-tile-sub-title>{{item.subtitle}}</v-list-tile-sub-title>
</v-list-tile-content>
<v-list-tile-action v-if=""item.duration>0"" class=""pq-time"">{{item.duration | displayTime}}</v-list-tile-action>
- <v-list-tile-action v-if=""playerIsOn && item.actions && item.actions.length>1"" @click.stop=""itemMenu(item, index, $event)"">
+ <v-list-tile-action v-if=""item.actions && item.actions.length>0"" @click.stop=""itemMenu(item, index, $event)"">
<v-btn icon>
<v-icon>more_vert</v-icon>
</v-btn>
",11
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -58,10 +58,10 @@ Vue.component('lms-toolbar', {
<v-btn icon :title=""trans.info"" v-if=""!desktop && infoPlugin && !infoOpen && $route.path=='/nowplaying'"" @click.native=""bus.$emit('info')"" class=""toolbar-button"">
<v-icon>info</v-icon>
</v-btn>
- <v-btn icon v-else-if=""!desktop && playerStatus.ison && playerStatus.isplaying"" @click.native=""doAction(['pause', '1'])"" class=""toolbar-button"">
+ <v-btn icon v-else-if=""!desktop && playerStatus.isplaying"" @click.native=""doAction(['pause', '1'])"" class=""toolbar-button"">
<v-icon>pause_circle_outline</v-icon>
</v-btn>
- <v-btn icon v-else-if=""!desktop && playerStatus.ison"" @click.native=""doAction(['play'])"" class=""toolbar-button"">
+ <v-btn icon v-else-if=""!desktop"" @click.native=""doAction(['play'])"" class=""toolbar-button"">
<v-icon>play_circle_outline</v-icon>
</v-btn>
<v-btn v-if=""desktop && playerStatus.ison"" icon flat class=""toolbar-button"" @click=""volumeDown""><v-icon>volume_down</v-icon></v-btn>
",11
"diff --git a/MaterialSkin/HTML/material/html/js/store.js b/MaterialSkin/HTML/material/html/js/store.js @@ -145,7 +145,7 @@ const store = new Vuex.Store({
var config = getLocalStorageVal('player');
if (config) {
state.players.forEach(p => {
- if (p.id === config) {
+ if (p.id === config || p.name == config) {
state.player = p;
}
});
",11
"diff --git a/MaterialSkin/HTML/material/html/css/mobile.css b/MaterialSkin/HTML/material/html/css/mobile.css .np-image {
display: block;
object-fit: contain;
- height:calc((var(--vh, 1vh)*100) - (var(--main-toolbar-height) + var(--bottom-nav-height) - 24px));
+ height:calc((var(--vh, 1vh)*100) - (var(--main-toolbar-height) + var(--bottom-nav-height) - 32px));
width:calc(100vw - 16px);
margin-left: auto;
margin-right: auto;
",11
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -959,20 +959,35 @@ var lmsBrowse = Vue.component(""lms-browse"", {
}
},
itemAction(act, item, index, suppressNotification) {
- if (!this.playerId()) {
- bus.$emit('showError', undefined, i18n(""No Player""));
- return;
+ if (act==SEARCH_LIB_ACTION) {
+ this.dialog = { show:true, title:i18n(""Search library""), ok: i18n(""Search""), cancel:undefined,
+ command:[""search""], params:[""tags:jlyAdt"", ""extended:1"", ""term:""+TERM_PLACEHOLDER], item:{title:i18n(""Search""), id:TOP_SEARCH_ID}};
+ } else if (act===MORE_ACTION) {
+ this.fetchItems(this.buildCommand(item, B_ACTIONS[act].cmd), item);
+ } else if (act===MORE_LIB_ACTION) {
+ if (item.id) {
+ if (item.id.startsWith(""artist_id:"")) {
+ this.fetchItems({command: [""artistinfo"", ""items""], params: [""menu:1"", item.id, ""html:1""]}, item);
+ } else if (item.id.startsWith(""album_id:"")) {
+ this.fetchItems({command: [""albuminfo"", ""items""], params: [""menu:1"", item.id, ""html:1""]}, item);
+ } else if (item.id.startsWith(""track_id:"")) {
+ this.fetchItems({command: [""trackinfo"", ""items""], params: [""menu:1"", item.id, ""html:1""]}, item);
+ } else if (item.id.startsWith(""genre_id:"")) {
+ this.fetchItems({command: [""genreinfo"", ""items""], params: [""menu:1"", item.id, ""html:1""]}, item);
}
-
- if (act===RENAME_PL_ACTION) {
+ }
+ } else if (act===PIN_ACTION) {
+ this.pin(item, true);
+ } else if (act===UNPIN_ACTION) {
+ this.pin(item, false);
+ } else if (!this.playerId()) { // *************** NO PLAYER ***************
+ bus.$emit('showError', undefined, i18n(""No Player""));
+ } else if (act===RENAME_PL_ACTION) {
this.dialog = { show:true, title:i18n(""Rename playlist""), hint:item.value, value:item.title, ok: i18n(""Rename""), cancel:undefined,
command:[""playlists"", ""rename"", item.id, ""newname:""+TERM_PLACEHOLDER]};
} else if (act==RENAME_FAV_ACTION) {
this.dialog = { show:true, title:i18n(""Rename favorite""), hint:item.value, value:item.title, ok: i18n(""Rename""), cancel:undefined,
command:[""favorites"", ""rename"", item.id, ""title:""+TERM_PLACEHOLDER]};
- } else if (act==SEARCH_LIB_ACTION) {
- this.dialog = { show:true, title:i18n(""Search library""), ok: i18n(""Search""), cancel:undefined,
- command:[""search""], params:[""tags:jlyAdt"", ""extended:1"", ""term:""+TERM_PLACEHOLDER], item:{title:i18n(""Search""), id:TOP_SEARCH_ID}};
} else if (act==ADD_FAV_ACTION) {
bus.$emit('dlg.open', 'favorite', 'add');
} else if (act==EDIT_FAV_ACTION) {
@@ -1074,24 +1089,6 @@ var lmsBrowse = Vue.component(""lms-browse"", {
}).catch(err => {
logAndShowError(err, undefined, [""albums""], params, 0, 1);
});
- } else if (act===MORE_ACTION) {
- this.fetchItems(this.buildCommand(item, B_ACTIONS[act].cmd), item);
- } else if (act===MORE_LIB_ACTION) {
- if (item.id) {
- if (item.id.startsWith(""artist_id:"")) {
- this.fetchItems({command: [""artistinfo"", ""items""], params: [""menu:1"", item.id, ""html:1""]}, item);
- } else if (item.id.startsWith(""album_id:"")) {
- this.fetchItems({command: [""albuminfo"", ""items""], params: [""menu:1"", item.id, ""html:1""]}, item);
- } else if (item.id.startsWith(""track_id:"")) {
- this.fetchItems({command: [""trackinfo"", ""items""], params: [""menu:1"", item.id, ""html:1""]}, item);
- } else if (item.id.startsWith(""genre_id:"")) {
- this.fetchItems({command: [""genreinfo"", ""items""], params: [""menu:1"", item.id, ""html:1""]}, item);
- }
- }
- } else if (act===PIN_ACTION) {
- this.pin(item, true);
- } else if (act===UNPIN_ACTION) {
- this.pin(item, false);
} else if (SELECT_ACTION===act) {
var idx=this.selection.indexOf(index);
if (idx<0) {
",11
"diff --git a/MaterialSkin/HTML/material/html/css/classic-skin-mods.css b/MaterialSkin/HTML/material/html/css/classic-skin-mods.css @@ -124,7 +124,8 @@ select option[value=INTERFACE_SETTINGS] {
.homeMenuSection div, .settingSection .groupHead, .settingSection .prefHead {
background-color: transparent;
- height: 15px;
+ min-height: 15px;
+ height: auto !important;
padding: 8px 6px 4px 0px;
font-weight: bold;
}
",11
"diff --git a/MaterialSkin/HTML/material/html/js/server.js b/MaterialSkin/HTML/material/html/js/server.js @@ -761,7 +761,7 @@ var lmsServer = Vue.component('lms-server', {
bindKey('left');
bindKey('right');
bus.$on('keyboard', function(key) {
- if (!this.$store.state.keyboardControl || this.$store.state.visibleMenus.size>0 || this.$store.state.openDialogs.length>0 || !this.$store.state.player) {
+ if (!this.$store.state.keyboardControl || !this.$store.state.player || this.$store.state.visibleMenus.size>0 || (this.$store.state.openDialogs.length>0 && this.$store.state.openDialogs[0]!='info-dialog')) {
return;
}
var command = undefined;
",11
"diff --git a/MaterialSkin/HTML/material/html/js/utils.js b/MaterialSkin/HTML/material/html/js/utils.js @@ -19,7 +19,7 @@ function logJsonMessage(type, msg) {
function logCometdMessage(type, msg) {
if (debug && (debug.has(""cometd"") || debug.has(""true""))) {
- console.log(""["" + new Date().toLocaleTimeString()+""] COMETED ""+type+"": ""+JSON.stringify(msg));
+ console.log(""["" + new Date().toLocaleTimeString()+""] COMETED ""+type+(msg ? ("": ""+JSON.stringify(msg)) : """"));
}
}
",11
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -39,7 +39,7 @@ Vue.component('lms-toolbar', {
</v-list-tile-content>
<v-list-tile-action v-if=""index<10 && keyboardControl"" class=""menu-shortcut"" v-bind:class=""{'menu-shortcut-player':item.canpoweroff}"">{{index|playerShortcut}}</v-list-tile-action>
<v-list-tile-action>
- <v-layout v-if=""!IS_MOBILE && desktopLayout && players.length>1"">
+ <v-layout v-if=""!IS_MOBILE && desktopLayout"">
<v-flex xs6 style=""margin-left:6px"">
<v-btn icon class=""hide-for-mini"" small :title=""trans.openmini"" @click.stop=""openMiniPlayer(item)""><v-icon small>open_in_new</v-icon></v-btn>
</v-flex>
",11
"diff --git a/MaterialSkin/HTML/material/html/js/randommix-dialog.js b/MaterialSkin/HTML/material/html/js/randommix-dialog.js @@ -20,7 +20,7 @@ Vue.component('lms-randommix', {
</v-list-tile>
<v-divider slot=""prepend-item""></v-divider>
<template v-slot:selection=""{ item, index }"">
- <v-chip v-if=""(index < 5) || chosenGenres.length==6"">
+ <v-chip v-if=""(index < 5) || chosenGenres.length==6"" close @input=""chosenGenres.splice(index, 1)"">
<span>{{ item }}</span>
</v-chip>
<span v-if=""index == 5 && chosenGenres.length>6"" class=""subtext"">{{i18n(""(+%1 others)"", chosenGenres.length - 5) }}</span>
",11
"diff --git a/MaterialSkin/HTML/material/html/js/icon-mapping.js b/MaterialSkin/HTML/material/html/js/icon-mapping.js @@ -101,6 +101,16 @@ function mapIconType(item, app, type) {
if (undefined==lmsIcon || (typeof lmsIcon !== 'string')) {
return false;
}
+ if (lmsIcon.includes(""MTL_icon_"")) {
+ item.image=item.svg=undefined;
+ item.icon=lmsIcon.split(""MTL_icon_"").pop().split(""_MTL_end"")[0];
+ return true;
+ }
+ if (lmsIcon.includes(""MTL_svg_"")) {
+ item.image=item.icon=undefined;
+ item.svg=lmsIcon.split(""MTL_svg_"").pop().split(""_MTL_end"")[0];
+ return true;
+ }
for (const [key, value] of Object.entries(iconMap[""endsWith""])) {
if (lmsIcon.endsWith(key) || (lmsIcon.indexOf('imageproxy')>0 && lmsIcon.endsWith(key.substring(1)+""/image.png""))) {
let entry = undefined!=app && undefined!=value[app] ? value[app] : value;
",11
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -1309,10 +1309,13 @@ progress {
margin-top:8px;
margin-bottom:8px;
min-height:58px;
- max-height:232px;
height:auto;
}
+.v-dialog .v-list__tile__sub-title {
+ white-space:normal; /* Allow sub-titles in dialogs to span multiple lines */
+}
+
.v-tabs__slider-wrapper .accent {
background-color: var(--active-color) !important;
border-color: var(--active-color) !important;
",11
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -498,6 +498,9 @@ var lmsBrowse = Vue.component(""lms-browse"", {
this.tbarActions.unshift(SAVE_VLIB_ACTION);
}
}.bind(this));
+ bus.$on('pluginListResponse', function(item, command, resp) {
+ this.handleListResponse(item, command, resp);
+ }.bind(this));
},
methods: {
initItems() {
",11
"diff --git a/mkrel.py b/mkrel.py @@ -447,7 +447,7 @@ def updateRepoXml(repoFile, version, zipFile, sha1, pluginName=None):
if 1==len(sys.argv):
usage()
version=sys.argv[1]
-if version!=""test"" and (len(sys.argv)<3 or ""--nocheck"" != sys.argv[2]):
+if (not version.startswith(""test"")) and (len(sys.argv)<3 or ""--nocheck"" != sys.argv[2]):
checkVersion(version)
checkVersionExists(version)
prepare()
",11
"diff --git a/js/autocomplete.js b/js/autocomplete.js }
// Default Autocomplete Result Item Template
- var resultTemplate = '<li id=""{{listItemId}}"" {{#hasValue}}data-value=""{{value}}""{{/hasValue}} role=""listitem"">' + '\n\n' +
+ var resultTemplate = '<li id=""{{listItemId}}"" data-index=""{{index}}"" {{#hasValue}}data-value=""{{value}}""{{/hasValue}} role=""listitem"">' + '\n\n' +
'<a href=""#"" tabindex=""-1"">' + '\n\n' +
'<span>{{{label}}}</span>' + '\n\n' +
'</a>' + '\n\n' +
// Build the dataset that will be submitted to the template
dataset.listItemId = 'ac-list-option' + i;
+ dataset.index = i;
if (this.settings.filterMode === 'contains') {
dataset.label = dataset.label.replace(new RegExp('(' + term + ')', 'ig'), '<i>$1</i>');
} else {
var listItem = $('<li role=""listitem""></li>');
listItem.attr('id', dataset.listItemId);
+ listItem.attr('data-index', dataset.index);
listItem.attr('data-value', dataset.value);
listItem.append('<a href=""#"" tabindex=""-1""><span>' + dataset.label + '</span></a>');
self.list.append($.sanitizeHTML(listItem));
},
select: function(anchorOrEvent, items) {
- var a, li, ret, dataValue,
+ var a, li, ret, dataIndex, dataValue,
isEvent = false;
// Initial Values
li = a.parent('li');
ret = a.text().trim();
+ dataIndex = li.attr('data-index');
dataValue = li.attr('data-value');
this.element.attr('aria-activedescendant', li.attr('id'));
- if (items && items.length && dataValue) {
+ if (items && items.length) {
+ // If the data-index attr is supplied, use it to get the item (since two items could have same value)
+ if (dataIndex) {
+ ret = items[parseInt(dataIndex, 10)];
+ } else if (dataValue) {
+ // Otherwise use data-value to get the item (a custom template may not supply data-index)
for (var i = 0, value; i < items.length; i++) {
value = items[i].value.toString();
if (value === dataValue) {
}
}
}
+ }
this.closeList();
this.highlight(a);
",11
"diff --git a/js/datagrid.js b/js/datagrid.js @@ -2077,7 +2077,6 @@ $.fn.datagrid = function(options) {
var checkRow = function (rowData) {
var isMatch = true;
-
for (var i = 0; i < conditions.length; i++) {
var columnDef = self.columnById(conditions[i].columnId)[0],
field = columnDef.field,
@@ -2141,13 +2140,13 @@ $.fn.datagrid = function(options) {
break;
case 'does-not-equal':
- isMatch = (rowValue !== conditionValue && rowValue !== '');
+ isMatch = (rowValue !== conditionValue);
break;
case 'contains':
isMatch = (rowValueStr.indexOf(conditionValue) > -1 && rowValue.toString() !== '');
break;
case 'does-not-contain':
- isMatch = (rowValueStr.indexOf(conditionValue) === -1 && rowValue.toString() !== '');
+ isMatch = (rowValueStr.indexOf(conditionValue) === -1);
break;
case 'end-with':
isMatch = (rowValueStr.lastIndexOf(conditionValue) === (rowValueStr.length - conditionValue.toString().length) && rowValueStr !== '' && (rowValueStr.length >= conditionValue.toString().length));
",11
"diff --git a/js/modal.js b/js/modal.js //Fire Events
self.element.trigger('close', self.isCancelled);
- if (this.oldActive && $(this.oldActive).is('button:visible')) {
+ // Restore focus
+ if (this.oldActive && $(this.oldActive).is('a:visible, button:visible, input:visible, textarea:visible')) {
this.oldActive.focus();
this.oldActive = null;
} else if (this.trigger.parents('.toolbar, .formatter-toolbar').length < 1) {
",11
"diff --git a/src/patterns/stepprocess/stepprocess.js b/src/patterns/stepprocess/stepprocess.js @@ -19,6 +19,7 @@ const STEPPROCESS_DEFAULTS = {
stepFolder: '.js-step-folder',
btnPrev: '.js-step-link-prev',
btnNext: '.js-step-link-next',
+ btnSaveClose: '.js-btn-save-changes',
beforeSelectStep: null,
};
@@ -385,9 +386,13 @@ Stepprocess.prototype = {
* @returns {void}
*/
goToNextStep() {
- const stepLink = this.getNextStep();
+ const self = this;
+ const stepLink = self.getNextStep();
if (stepLink.length) {
- this.selectStep(stepLink, 'next');
+ self.selectStep(stepLink, 'next');
+ } else if (typeof self.settings.beforeSelectStep === 'function') {
+ const args = { isStepping: 'next' };
+ self.settings.beforeSelectStep(args);
}
},
",11
"diff --git a/app/src/js/middleware/option-handler-themes.js b/app/src/js/middleware/option-handler-themes.js @@ -10,12 +10,16 @@ const URL = require('url');
module.exports = function (app) {
return function optionHandler(req, res, next) {
- if (!req.url.includes('api/')) {
+ // NOTE: Ignore theming if the client doesn't accept HTML
+ if (req.url.includes('api/') && !req.accepts('html')) {
+ next();
+ return;
+ }
/**
* Set the theme, theme variant, icons, and colorScheme
* Example: http://localhost:4000/controls/modal?theme=soho&variant=dark
-
+ * ====================================================================================
* Note: We have a prop called ""isSohoUseLegacyNaming"" becasue we can't rename the
* original soho css files and our templating system (hogan/mustache) doesn't do logic.
*/
@@ -50,7 +54,6 @@ module.exports = function (app) {
const theUrl = URL.format({ query: q });
logger('info', `Redirecting legacy query string params to ""${theUrl}""`);
return res.redirect(theUrl);
-
} else {
// Set the theme
res.opts.theme.name = req.query.theme.toLowerCase();
@@ -63,11 +66,10 @@ module.exports = function (app) {
}
logger('info', `Setting theme to ""theme-${res.opts.theme.name}-${res.opts.theme.variant}""`);
- const svgHtmlPartial = fs.readFileSync(`${iconsPath}/theme-${res.opts.theme.name}-svg.html`).toString()
+ const svgHtmlPartial = fs.readFileSync(`${iconsPath}/theme-${res.opts.theme.name}-svg.html`).toString();
// Set icons to the partials in hopes its cached
app.locals.partials = { svgIcons: svgHtmlPartial };
logger('info', `Setting icons to ""theme-${res.opts.theme.name}-svg.html""`);
- }
next();
};
",11
"diff --git a/src/components/images/_images.scss b/src/components/images/_images.scss @@ -26,6 +26,12 @@ $images-size: (
@each $key, $value in $images-size {
.image-#{$key} {
+ border: 1px solid transparent; // to prevent jump on focus
+
+ &:focus {
+ @include focus-state();
+ }
+
img {
border: 1px solid transparent; // to prevent jump on focus
max-height: nth($value, 2);
@@ -43,7 +49,14 @@ $images-size: (
}
.image-auto {
+ border: 1px solid transparent; // to prevent jump on focus
+
+ &:focus {
+ @include focus-state();
+ }
+
img {
+ border: 1px solid transparent; // to prevent jump on focus
&:focus {
@include focus-state();
}
",11
"diff --git a/src/components/header/header.js b/src/components/header/header.js @@ -528,6 +528,13 @@ Header.prototype = {
}
this.changer.on('selected.header', (e, link) => {
+ e.preventDefault();
+
+ // handle `ToolbarFlexItem` types
+ if (link !== undefined && !(link instanceof $) && link.element instanceof HTMLElement) {
+ link = $(link.element);
+ }
+
// Change Theme with Variant
const themeNameAttr = link.attr('data-theme-name');
const themeVariantAttr = link.attr('data-theme-variant');
",11
"diff --git a/package.json b/package.json ""e2e:local:bs"": ""npm run webdriver:update && npx protractor test/protractor.local.bs.conf.js"",
""e2e:local:debug"": ""npm run webdriver:update && npx protractor test/protractor.local.debug.conf.js"",
""webdriver:clean"": ""npx webdriver-manager clean"",
- ""webdriver:update"": ""npx webdriver-manager update --versions.chrome 89.0.4389.128 --standalone false --quiet --gecko=false"",
+ ""webdriver:update"": ""npx webdriver-manager update --standalone false --quiet --gecko=false"",
""zip-dist"": ""npx grunt zip-dist"",
""documentation"": ""node ./scripts/deploy-documentation.js"",
""release:dev"": ""node scripts/publish-nightly-manual"",
",11
"diff --git a/src/components/tree/_tree.scss b/src/components/tree/_tree.scss line-height: 28px;
padding: 6px 5px 3px;
text-decoration: none;
- white-space: nowrap;
//Badge in the tree items
.tree-badge {
ul {
display: none;
left: 13px;
+ width: calc(100% - 13px);
overflow: hidden;
position: relative;
top: -7px;
ul {
left: 15px;
+ width: calc(100% - 15px);
}
li:first-child {
.sidebar .tree {
min-width: 200px;
padding: 20px;
-
- a {
- white-space: normal;
- }
}
//IE
",11
"diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md ## v4.68.0 Fixes
- `[Datagrid]` Fixed alignment issues in trigger fields. ([#6678](https://github.com/infor-design/enterprise/issues/6678))
+- `[Datagrid]` Allow beforeCommitCellEdit event to be sent for Editors.Fileupload. ([#6821](https://github.com/infor-design/enterprise/issues/6821))
## v4.67.0
",11
"diff --git a/examples/server/settings.py b/examples/server/settings.py @@ -8,6 +8,8 @@ DEBUG = True
PROJECT_DIR = os.path.dirname(__file__)
BASE_DIR = os.path.abspath(os.path.join(PROJECT_DIR, os.pardir, os.pardir))
+ALLOWED_HOSTS = ['*']
+
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
",11
"diff --git a/client/src/js/djng-forms.js b/client/src/js/djng-forms.js @@ -510,28 +510,29 @@ djngModule.directive('ngModel', ['djangoForm', function(djangoForm) {
restrict: 'A',
require: ['^?djngFormsSet', '^?form', '^?djngEndpoint'],
link: function(scope, element, attrs, controllers) {
- var formController, digestUploadScope, scopePrefix;
+ var formController = controllers[1], digestUploadScope, scopePrefix;
+ if (!formController)
+ return; // outside of neither <djng-forms-set /> nor <form djng-endpoint=""..."" />
+
+ scopePrefix = djangoForm.getScopePrefix(attrs.ngModel);
if (controllers[0]) {
// inside <djng-forms-set>...</djng-forms-set>
- formController = controllers[1];
- digestUploadScope = controllers[0].digestUploadScope;
- } else if (controllers[2]) {
+ digestUploadScope(controllers[0]);
+ }
+ if (controllers[2]) {
// inside <form djng-endpoint=""..."">...</form>
- formController = controllers[1];
- digestUploadScope = controllers[2].digestUploadScope;
+ digestUploadScope(controllers[2]);
}
- if (!formController)
- return; // outside of neither <djng-forms-set /> nor <form djng-endpoint=""..."" />
- if (!angular.isArray(digestUploadScope[formController.$name])) {
- digestUploadScope[formController.$name] = [];
+ function digestUploadScope(controller) {
+ if (!angular.isArray(controller.digestUploadScope[formController.$name])) {
+ controller.digestUploadScope[formController.$name] = [];
+ }
+ if (scopePrefix && controller.digestUploadScope[formController.$name].indexOf(scopePrefix) === -1) {
+ controller.digestUploadScope[formController.$name].push(scopePrefix);
}
- scopePrefix = djangoForm.getScopePrefix(attrs.ngModel);
- if (scopePrefix && digestUploadScope[formController.$name].indexOf(scopePrefix) === -1) {
- digestUploadScope[formController.$name].push(scopePrefix);
}
-
}
};
}]);
",11
"diff --git a/src/plugins/npm-plugin/resolve.js b/src/plugins/npm-plugin/resolve.js @@ -77,7 +77,7 @@ function getLegacyEntry(pkg) {
return '/' + entry.replace(/^\.?\//, '');
}
-const ENV_KEYS = ['esmodules', 'import', 'require', 'browser', 'node', 'default'];
+const ENV_KEYS = ['esmodules', 'import', 'module', 'require', 'browser', 'node', 'default'];
/** Get the best resolution for an entry from an Export Map
* @param {Object} exp `package.exports`
",11
"diff --git a/packages/razzle/config/createJestConfig.js b/packages/razzle/config/createJestConfig.js @@ -46,6 +46,7 @@ module.exports = (resolve, rootDir) => {
'testMatch',
'transform',
'transformIgnorePatterns',
+ 'testResultsProcessor',
];
if (overrides) {
supportedKeys.forEach(key => {
",11
"diff --git a/packages/razzle/config/createJestConfig.js b/packages/razzle/config/createJestConfig.js @@ -42,11 +42,12 @@ module.exports = (resolve, rootDir) => {
'coverageThreshold',
'moduleFileExtensions',
'moduleNameMapper',
+ 'modulePaths',
'snapshotSerializers',
'testMatch',
+ 'testResultsProcessor',
'transform',
'transformIgnorePatterns',
- 'testResultsProcessor',
];
if (overrides) {
supportedKeys.forEach(key => {
",11
"diff --git a/packages/razzle/config/createJestConfig.js b/packages/razzle/config/createJestConfig.js @@ -68,6 +68,7 @@ module.exports = (resolve, rootDir) => {
'transform',
'transformIgnorePatterns',
'reporters',
+ 'watchPlugins',
];
if (overrides) {
supportedKeys.forEach(key => {
",11
"diff --git a/src/containers/gui.jsx b/src/containers/gui.jsx @@ -36,6 +36,7 @@ class GUI extends React.Component {
}
render () {
const {
+ children,
projectData, // eslint-disable-line no-unused-vars
vm,
...componentProps
@@ -46,7 +47,9 @@ class GUI extends React.Component {
vm={vm}
onTabSelect={this.handleTabSelect}
{...componentProps}
- />
+ >
+ {children}
+ </GUIComponent>
);
}
}
",11
"diff --git a/.travis.yml b/.travis.yml @@ -38,7 +38,9 @@ deploy:
api_key: $NPM_TOKEN
- provider: s3
on:
- branch: master
+ branch:
+ - master
+ - $PREVIEW_BRANCH
access_key_id: $AWS_ACCESS_KEY_ID
secret_access_key: $AWS_SECRET_ACCESS_KEY
bucket: $AWS_BUCKET_NAME
",11
"diff --git a/src/containers/import-modal.jsx b/src/containers/import-modal.jsx @@ -50,7 +50,7 @@ class ImportModal extends React.Component {
this.setState({inputValue: e.target.value, hasValidationError: false});
}
validate (input) {
- const urlMatches = input.match(/^(https:\/\/)?scratch\.mit\.edu\/projects\/(\d+)(\/?|(\/#editor)?)$/);
+ const urlMatches = input.match(/^(https:\/\/)?scratch\.mit\.edu\/projects\/(\d+)(\/?|(\/#((editor)|(fullscreen)|(player)))?)$/);
if (urlMatches && urlMatches.length > 0) {
return urlMatches[2];
}
",11
"diff --git a/src/containers/import-modal.jsx b/src/containers/import-modal.jsx @@ -51,7 +51,7 @@ class ImportModal extends React.Component {
this.setState({inputValue: e.target.value, hasValidationError: false});
}
validate (input) {
- const urlMatches = input.match(/^(?:https:\/\/)?scratch\.mit\.edu\/projects\/(\d+)/);
+ const urlMatches = input.match(/^(?:https?:\/\/)?scratch\.mit\.edu\/projects\/(\d+)/);
if (urlMatches && urlMatches.length > 0) {
return urlMatches[1];
}
",11
"diff --git a/src/containers/target-pane.jsx b/src/containers/target-pane.jsx @@ -74,8 +74,10 @@ class TargetPane extends React.Component {
const emptyItem = spriteLibraryContent.find(item => item.name === 'Empty');
if (emptyItem) {
this.props.vm.addSprite2(JSON.stringify(emptyItem.json)).then(() => {
+ setTimeout(() => { // Wait for targets update to propagate before tab switching
this.props.onActivateTab(COSTUMES_TAB_INDEX);
});
+ });
}
}
handleBlockDragEnd (blocks) {
",11
"diff --git a/src/lib/file-uploader.js b/src/lib/file-uploader.js @@ -144,11 +144,15 @@ const costumeUpload = function (fileData, fileType, costumeName, storage, handle
const soundUpload = function (fileData, fileType, soundName, storage, handleSound) {
let soundFormat;
switch (fileType) {
- case 'audio/mp3': {
+ case 'audio/mp3':
+ case 'audio/mpeg': {
soundFormat = storage.DataFormat.MP3;
break;
}
- case 'audio/wav': { // TODO support audio/x-wav? Do we see this in the wild?
+ case 'audio/wav':
+ case 'audio/wave':
+ case 'audio/x-wav':
+ case 'audio/x-pn-wav': {
soundFormat = storage.DataFormat.WAV;
break;
}
",11
"diff --git a/src/components/screens/AddonScreen/AddonList.js b/src/components/screens/AddonScreen/AddonList.js @@ -80,9 +80,9 @@ const Layout = styled.div`
`};
`;
-export default function AddonList({ appearance, children }) {
+export default function AddonList({ appearance, children, ...props }) {
return (
- <Layout appearance={appearance}>
+ <Layout appearance={appearance} {...props}>
{appearance === 'official' ? <Grid>{children}</Grid> : <List>{children}</List>}
</Layout>
);
",11
"diff --git a/src/components/screens/CommunityScreen/CommunityHero.js b/src/components/screens/CommunityScreen/CommunityHero.js @@ -8,7 +8,7 @@ import { Cardinal, styles, site } from '../../basics';
import ConfirmedMailingList from '../../layout/ConfirmedMailingList';
import { Heading, Title, Desc } from '../../layout/PageTitle';
-const { background, typography, pageMargins, breakpoint } = styles;
+const { pageMargins, breakpoint } = styles;
const { url } = site;
const Image = styled.img``;
@@ -127,16 +127,6 @@ const Stats = styled.div`
}
`;
-const MailingListConfirm = styled.div`
- font-size: ${typography.size.s2}px;
- line-height: 20px;
- background: ${background.positive};
- padding: 10px;
- text-align: center;
- border-radius: 4px;
- max-width: 340px;
-`;
-
const MailingListForm = styled(ConfirmedMailingList)`
min-width: 280px;
width: 100%;
@@ -151,7 +141,7 @@ const MailingListWrapper = styled.div`
margin-bottom: 2rem;
}
- ${MailingListConfirm}, ${MailingListForm} {
+ ${MailingListForm} {
margin: 0 auto;
@media (min-width: ${breakpoint}px) {
margin: 0;
@@ -171,7 +161,7 @@ export default function CommunityHero(props) {
get help, and develop UIs faster.
</Desc>
<MailingListWrapper>
- <ConfirmedMailingList />
+ <MailingListForm />
</MailingListWrapper>
<Stats>
<Stat
",11
"diff --git a/src/components/basics/Video.js b/src/components/basics/Video.js @@ -8,12 +8,12 @@ const StyledVideo = styled.video`
height: auto;
`;
-const Video = ({ src, shouldChangeSize, alt }) => {
+const Video = ({ src, shouldChangeSize, alt, ...props }) => {
const videoSize = shouldChangeSize && window.innerWidth < 600 ? 'sm' : 'lg';
const videoSrc = videoSize === 'sm' ? src.replace('lg', 'sm') : src;
return (
- <StyledVideo autoPlay muted loop playsInline alt={alt}>
+ <StyledVideo autoPlay muted loop playsInline alt={alt} {...props}>
<source src={videoSrc} type=""video/mp4"" />
</StyledVideo>
);
",11
"diff --git a/src/components/screens/ReleasesScreen/Release.js b/src/components/screens/ReleasesScreen/Release.js @@ -45,9 +45,9 @@ const StyledConfirmedMailingList = styled(ConfirmedMailingList)`
min-width: auto;
`;
-function Release({ title, html }) {
+function Release({ title, html, ...props }) {
return (
- <Wrapper>
+ <Wrapper {...props}>
<Title>{title}</Title>
<Highlight>{html}</Highlight>
<EmailWrapper>
",11
"diff --git a/src/hooks/use-addons-search.js b/src/hooks/use-addons-search.js @@ -3,6 +3,7 @@ import { useState, useEffect, useLayoutEffect, useRef } from 'react';
import buildTagLinks from '../util/build-tag-links';
const initalValue = { search: [], relatedTags: [] };
+const minQueryLength = 2;
export function useAddonsSearch() {
const [query, setQuery] = useState('');
@@ -20,14 +21,14 @@ export function useAddonsSearch() {
if (query === '') {
setIsSearching(false);
setResults(initalValue);
- } else if (query !== '' && query.length > 3 && isSearching === false) {
+ } else if (query !== '' && query.length > minQueryLength && isSearching === false) {
setIsSearching(true);
}
}, [query]);
// Fetch search results with a debounce
useEffect(() => {
- if (debouncedSearchTerm && debouncedSearchTerm.length >= 3) {
+ if (debouncedSearchTerm && debouncedSearchTerm.length > 2) {
searchAddons(debouncedSearchTerm).then((resultsData) => {
setIsSearchLoading(false);
setResults(resultsData);
",11
"diff --git a/frontend/wallet/src/render/Apollo.re b/frontend/wallet/src/render/Apollo.re @@ -9,7 +9,7 @@ external createRetryLink: retryOptions => ReasonApolloTypes.apolloLink =
let client = {
let inMemoryCache = ApolloInMemoryCache.createInMemoryCache();
- let uri = ""http://localhost:49370/graphql"";
+ let uri = ""http://localhost:3085/graphql"";
let codaLink =
ApolloLinks.createHttpLink(~uri, ~fetch=Bindings.Fetch.fetch, ());
",11
"diff --git a/src/lib/ppx_coda/versioned.ml b/src/lib/ppx_coda/versioned.ml @@ -182,7 +182,11 @@ let generate_version_number_decl inner3_modules loc generation_kind =
String.sub module_name ~pos:1 ~len:(String.length module_name - 1)
|> int_of_string
in
- [%stri let version = [%e eint version]]
+ [%str
+ let version = [%e eint version]
+
+ (* to prevent unused value warnings *)
+ let _ = version]
let ocaml_builtin_types =
[""bytes""; ""int""; ""int32""; ""int64""; ""float""; ""char""; ""string""; ""bool""; ""unit""]
@@ -467,18 +471,15 @@ let generate_let_bindings_for_type_decl_str ~options ~path type_decls =
generate_versioned_decls ~asserted generation_kind type_decl
in
let type_name = type_decl.ptype_name.txt in
- let has_type_params = not (List.is_empty type_decl.ptype_params) in
(* generate version number for Rpc response, but not for query, so we
don't get an unused value
*)
- if
- unnumbered || has_type_params
- || (generation_kind = Rpc && String.equal type_name ""query"")
+ if unnumbered || (generation_kind = Rpc && String.equal type_name ""query"")
then versioned_decls
else
generate_version_number_decl inner3_modules type_decl.ptype_loc
generation_kind
- :: versioned_decls
+ @ versioned_decls
let generate_val_decls_for_type_decl type_decl ~numbered =
match type_decl.ptype_kind with
",11
"diff --git a/src/lib/account_config/account_config.ml b/src/lib/account_config/account_config.ml @@ -2,11 +2,22 @@ open Core_kernel
type account_data =
{ pk: Signature_lib.Public_key.Compressed.t
- ; sk: Signature_lib.Private_key.t option
+ ; sk: Signature_lib.Private_key.t option [@default None]
; balance: Currency.Balance.t
- ; delegate: Signature_lib.Public_key.Compressed.t option }
+ ; delegate: Signature_lib.Public_key.Compressed.t option [@default None] }
[@@deriving yojson]
+let account_data_of_yojson = function
+ | `Assoc l ->
+ account_data_of_yojson
+ (`Assoc
+ (List.filter l ~f:(fun (key, _) ->
+ Array.mem ~equal:String.equal
+ [|""pk""; ""sk""; ""balance""; ""delegate""|]
+ key )))
+ | json ->
+ account_data_of_yojson json
+
type t = account_data list [@@deriving yojson]
module Fake_accounts = struct
",11
"diff --git a/src/lib/mina_net2/mina_net2.ml b/src/lib/mina_net2/mina_net2.ml @@ -1147,7 +1147,9 @@ module Multiaddr = struct
let to_peer t =
match String.split ~on:'/' t with
- | [""""; ""ip4""; ip4_str; ""tcp""; tcp_str; ""p2p""; peer_id] -> (
+ | [""""; protocol; ip4_str; ""tcp""; tcp_str; ""p2p""; peer_id]
+ when List.mem [""ip4""; ""ip6""; ""dns4""; ""dns6""] protocol ~equal:String.equal
+ -> (
try
let host = Unix.Inet_addr.of_string ip4_str in
let libp2p_port = Int.of_string tcp_str in
",11
"diff --git a/src/app/cli/src/coda.ml b/src/app/cli/src/coda.ml @@ -963,11 +963,12 @@ let setup_daemon logger =
in
if enable_tracing then Coda_tracing.start conf_dir |> don't_wait_for ;
if is_seed then [%log info] ""Starting node as a seed node""
- else if List.is_empty initial_peers then
+ else if List.is_empty initial_peers && Option.is_none seed_peer_list_url
+ then
Mina_user_error.raise
{|No peers were given.
-Pass one of -peer, -peer-list-file, -seed.|} ;
+Pass one of -peer, -peer-list-file, -seed, -peer-list-url.|} ;
let chain_id =
chain_id ~genesis_state_hash
~genesis_constants:precomputed_values.genesis_constants
",11
"diff --git a/src/app/genesis_ledger_from_tsv/genesis_ledger_from_tsv.ml b/src/app/genesis_ledger_from_tsv/genesis_ledger_from_tsv.ml @@ -39,6 +39,8 @@ let slot_duration_ms =
(* a month = 30 days, for purposes of vesting *)
let slots_per_month = 30 * 24 * 60 * 60 * 1000 / slot_duration_ms
+let slots_per_month_float = Float.of_int slots_per_month
+
let valid_mina_amount amount =
let is_num_string s = String.for_all s ~f:Char.is_digit in
match String.split ~on:'.' amount with
@@ -92,7 +94,11 @@ let runtime_config_account ~logger ~wallet_pk ~amount ~initial_min_balance
else Currency.Balance.of_formatted_string initial_min_balance
in
let cliff_time =
- Global_slot.of_int (Int.of_string cliff_time_months * slots_per_month)
+ let num_slots_float =
+ Float.of_string cliff_time_months *. slots_per_month_float
+ in
+ (* if there's a fractional slot, wait until next slot by rounding up *)
+ Global_slot.of_int (Float.iround_up_exn num_slots_float)
in
let cliff_amount = Currency.Amount.of_formatted_string cliff_amount in
let vesting_period =
@@ -163,8 +169,8 @@ let validate_fields ~wallet_pk ~amount ~initial_min_balance ~cliff_time_months
in
let valid_cliff_time_months =
try
- let n = Int.of_string cliff_time_months in
- n >= 0
+ let n = Float.of_string cliff_time_months in
+ n >= 0.0
with _ -> false
in
let valid_cliff_amount = valid_mina_amount cliff_amount in
",11
"diff --git a/src/lib/child_processes/child_processes.ml b/src/lib/child_processes/child_processes.ml @@ -279,7 +279,8 @@ let start_custom :
[ Unix.getenv @@ ""CODA_"" ^ String.uppercase name ^ ""_PATH""
; relative_to_root
; Some (Filename.dirname mina_binary_path ^/ name)
- ; Some (""mina-"" ^ name) ])
+ ; Some (""mina-"" ^ name)
+ ; Some (""coda-"" ^ name) ])
~f:(fun prog -> Process.create ~stdin:"""" ~prog ~args ())
in
[%log info] ""Custom child process $name started with pid $pid""
",11
"diff --git a/src/app/cli/src/cli_entrypoint/mina_cli_entrypoint.ml b/src/app/cli/src/cli_entrypoint/mina_cli_entrypoint.ml @@ -378,11 +378,21 @@ let setup_daemon logger =
and uptime_url_string =
flag ""--uptime-url"" ~aliases:[""uptime-url""] (optional string)
~doc:""URL URL of the uptime service of the Mina delegation program""
- and uptime_submitter_string =
- flag ""--uptime-submitter"" ~aliases:[""uptime-submitter""] (optional string)
+ and uptime_submitter_key =
+ flag ""--uptime-submitter-key"" ~aliases:[""uptime-submitter-key""]
~doc:
- ""PUBLICKEY Public key of the submitter to the uptime service of the \
- Mina delegation program""
+ ""KEYFILE Private key file for the uptime submitter. You cannot \
+ provide both `uptime-submitter-key` and `uptime-submitter-pubkey`.""
+ (optional string)
+ and uptime_submitter_pubkey =
+ flag ""--uptime-submitter-pubkey""
+ ~aliases:[""uptime-submitter-pubkey""]
+ (optional string)
+ ~doc:
+ ""PUBLICKEY Public key of the submitter to the Mina delegation \
+ program, for the associated private key that is being tracked by \
+ this daemon. You cannot provide both `uptime-submitter-key` and \
+ `uptime-submitter-pubkey`.""
in
fun () ->
let open Deferred.Let_syntax in
@@ -1115,17 +1125,20 @@ Pass one of -peer, -peer-list-file, -seed, -peer-list-url.|} ;
Coda_run.get_proposed_protocol_version_opt ~conf_dir ~logger
proposed_protocol_version
in
- ( match (uptime_url_string, uptime_submitter_string) with
- | Some _, Some _ | None, None ->
+ ( match
+ (uptime_url_string, uptime_submitter_key, uptime_submitter_pubkey)
+ with
+ | Some _, Some _, None | Some _, None, Some _ | None, None, None ->
()
| _ ->
Mina_user_error.raise
- ""Must provide both --uptime-url and --uptime-submitter"" ) ;
+ ""Must provide both --uptime-url and exactly one of \
+ --uptime-submitter-key or --uptime-submitter-pubkey"" ) ;
let uptime_url =
Option.map uptime_url_string ~f:(fun s -> Uri.of_string s)
in
- let uptime_submitter =
- Option.map uptime_submitter_string ~f:(fun s ->
+ let uptime_submitter_opt =
+ Option.map uptime_submitter_pubkey ~f:(fun s ->
match Public_key.Compressed.of_base58_check s with
| Ok pk -> (
match Public_key.decompress pk with
@@ -1142,10 +1155,10 @@ Pass one of -peer, -peer-list-file, -seed, -peer-list-url.|} ;
(Error.to_string_hum err) () )
in
let%bind uptime_submitter_keypair =
- match uptime_submitter with
- | None ->
+ match (uptime_submitter_key, uptime_submitter_opt) with
+ | None, None ->
return None
- | Some pk ->
+ | None, Some pk ->
let%map kp =
Secrets.Wallets.get_tracked_keypair ~logger
~which:""uptime submitter keypair""
@@ -1154,6 +1167,17 @@ Pass one of -peer, -peer-list-file, -seed, -peer-list-url.|} ;
~conf_dir pk
in
Some kp
+ | Some sk_file, None ->
+ let%map kp =
+ Secrets.Uptime_keypair.Terminal_stdin.read_from_env_exn ~logger
+ ~which:""uptime submitter keypair"" sk_file
+ in
+ Some kp
+ | _ ->
+ (* unreachable, because of earlier check *)
+ failwith
+ ""Cannot provide both uptime submitter public key and uptime \
+ submitter keyfile""
in
let start_time = Time.now () in
let%map coda =
",11
"diff --git a/src/app/cli/src/cli_entrypoint/mina_cli_entrypoint.ml b/src/app/cli/src/cli_entrypoint/mina_cli_entrypoint.ml @@ -378,8 +378,9 @@ let setup_daemon logger =
if is_background then (
Core.printf ""Starting background mina daemon. (Log Dir: %s)\n%!""
conf_dir ;
- Daemon.daemonize ~redirect_stdout:`Dev_null ?cd:working_dir
- ~redirect_stderr:`Dev_null () )
+ Daemon.daemonize ~allow_threads_to_have_been_created:true
+ ~redirect_stdout:`Dev_null ?cd:working_dir ~redirect_stderr:`Dev_null
+ () )
else ignore (Option.map working_dir ~f:Caml.Sys.chdir)
in
Stdout_log.setup log_json log_level ;
",11
"diff --git a/src/lib/transaction_snark/transaction_snark.ml b/src/lib/transaction_snark/transaction_snark.ml @@ -537,13 +537,10 @@ module Parties_segment = struct
failwith ""Parties_segment.Basic.of_controls: Unsupported combination""
let opt_signed ~is_start : Spec.single =
- { predicate_type = `Nonce_or_accept; auth_type = Signature; is_start }
+ { predicate_type = `Full; auth_type = Signature; is_start }
let unsigned : Spec.single =
- { predicate_type = `Nonce_or_accept
- ; auth_type = None_given
- ; is_start = `No
- }
+ { predicate_type = `Full; auth_type = None_given; is_start = `No }
let opt_signed = opt_signed ~is_start:`Compute_in_circuit
",11
"diff --git a/src/app/replayer/replayer.ml b/src/app/replayer/replayer.ml @@ -1402,8 +1402,9 @@ let parties_of_snapp_command ~pool (cmd : Sql.Snapp_command.t) :
""Expected account id for account precondition of kind \
Full""
| Some account_id ->
- query_db pool ~item:""Snapp account"" ~f:(fun db ->
- Processor.Zkapp_account.load db account_id)
+ query_db pool ~item:""Zkapp account"" ~f:(fun db ->
+ Processor.Zkapp_precondition_account.load db
+ account_id)
in
let%map zkapp_account =
let%bind balance =
",11
"diff --git a/src/lib/mina_base/fee_excess.ml b/src/lib/mina_base/fee_excess.ml @@ -73,16 +73,30 @@ module Poly = struct
]
let of_yojson token_of_yojson fee_of_yojson = function
- | `List
- [ `Assoc [ (""token"", fee_token_l); (""amount"", fee_excess_l) ]
- ; `Assoc [ (""token"", fee_token_r); (""amount"", fee_excess_r) ]
- ] ->
+ | `List [ `Assoc [ left0; left1 ]; `Assoc [ right0; right1 ] ] -> (
+ (* allow for reversed field order: ""be liberal in what you accept"" *)
+ let token_and_excess pair0 pair1 =
+ match (pair0, pair1) with
+ | (""token"", token), (""amount"", excess) ->
+ Some (token, excess)
+ | (""amount"", excess), (""token"", token) ->
+ Some (token, excess)
+ | _ ->
+ None
+ in
+ let left = token_and_excess left0 left1 in
+ let right = token_and_excess right0 right1 in
+ match (left, right) with
+ | Some (fee_token_l, fee_excess_l), Some (fee_token_r, fee_excess_r)
+ ->
let open Result.Let_syntax in
let%map fee_token_l = token_of_yojson fee_token_l
and fee_excess_l = fee_of_yojson fee_excess_l
and fee_token_r = token_of_yojson fee_token_r
and fee_excess_r = fee_of_yojson fee_excess_r in
{ fee_token_l; fee_excess_l; fee_token_r; fee_excess_r }
+ | _ ->
+ Error ""Fee_excess.Poly.Stable.V1.t, unexpected JSON field"" )
| _ ->
Error ""Fee_excess.Poly.Stable.V1.t""
end
",11
"diff --git a/src/lib/snarky_js_bindings/lib/snarky_js_bindings_lib.ml b/src/lib/snarky_js_bindings/lib/snarky_js_bindings_lib.ml @@ -2905,11 +2905,11 @@ module Ledger = struct
}
let apply_parties_transaction l (txn : Parties.t)
- (account_creation_fee : string) =
+ (account_creation_fee : string) (network_state : Mina_base.Zkapp_precondition.Protocol_state.View.t) =
check_party_signatures txn ;
let ledger = l##.value in
let applied_exn =
- T.apply_parties_unchecked ~state_view:dummy_state_view
+ T.apply_parties_unchecked ~state_view:network_state
~constraint_constants:
{ Genesis_constants.Constraint_constants.compiled with
account_creation_fee = Currency.Fee.of_string account_creation_fee
@@ -2935,11 +2935,14 @@ module Ledger = struct
Js.array @@ Array.of_list account_list
let apply_json_transaction l (tx_json : Js.js_string Js.t)
- (account_creation_fee : Js.js_string Js.t) =
+ (account_creation_fee : Js.js_string Js.t) (network_json : Js.js_string Js.t) =
let txn =
Parties.of_json @@ Yojson.Safe.from_string @@ Js.to_string tx_json
in
- apply_parties_transaction l txn (Js.to_string account_creation_fee)
+ let network_state =
+ protocol_state_of_json network_json
+ in
+ apply_parties_transaction l txn (Js.to_string account_creation_fee) network_state
let create_token_account pk token =
account_id pk token |> Mina_base.Account_id.public_key
",11
"diff --git a/src/lib/mina_lib/mina_lib.ml b/src/lib/mina_lib/mina_lib.ml @@ -8,7 +8,8 @@ open Pipe_lib
open Strict_pipe
open Signature_lib
open Network_peer
-open Inline_test_quiet_logs
+
+(* open Inline_test_quiet_logs *)
module Archive_client = Archive_client
module Config = Config
module Conf_dir = Conf_dir
",11
"diff --git a/packages/jss/src/index.d.ts b/packages/jss/src/index.d.ts @@ -34,7 +34,7 @@ export type JssValue =
| null
| false
-export type InsertionPoint = string | HTMLElement
+export type InsertionPoint = string | HTMLElement | Comment
export interface UpdateOptions {
process?: boolean
",11
"diff --git a/public/js/editcube.js b/public/js/editcube.js @@ -31,7 +31,11 @@ cube.forEach(function(card, index) {
$('#compareButton').click(function(e) {
const id_a = $('#cubeID').val();
- const id_b = $('#compareInput').val();
+ let id_b = $('#compareInput').val();
+ if (id_b.includes('/')) {
+ let parts = id_b.split('/');
+ id_b = parts[parts.length - 1];
+ }
if (id_b) window.location.href = '/cube/compare/' + id_a + '/to/' + id_b;
});
",11
"diff --git a/serverjs/updatecards.js b/serverjs/updatecards.js @@ -285,9 +285,9 @@ function convertLegalities(card, isExtra) {
} else {
return {
Legacy: card.legalities.legacy == 'legal',
- Modern: card.legalities.modern == 'legal',
- Standard: card.legalities.standard == 'legal',
- Pauper: card.legalities.pauper == 'legal'
+ Modern: card.legalities.modern == 'legal' || card.legalities.modern == 'banned',
+ Standard: card.legalities.standard == 'legal' || card.legalities.standard == 'banned',
+ Pauper: card.legalities.pauper == 'legal' || card.legalities.pauper == 'banned',
};
}
}
",11
"diff --git a/src/util/Filter.js b/src/util/Filter.js @@ -250,9 +250,13 @@ const verifyTokens = (tokens) => {
return false;
}
break;
- case 'cmc':
case 'power':
case 'toughness':
+ if (token(i).arg.search(/^[-\+]?((\d+(\.5)?)|(\.5))$/) < 0) return false;
+ break;
+ case 'cmc':
+ if (token(i).arg.search(/^\+?((\d+(\.5)?)|(\.5))$/) < 0) return false;
+ break;
case 'loyalty':
if (token(i).arg.search(/^\d+$/) < 0) return false;
break;
",11
"diff --git a/nearley/values.ne b/nearley/values.ne @@ -48,7 +48,7 @@ rarityOpValue -> anyOperator rarityValue {% ([op, value]) => rarityOperation(op,
rarityValue -> (""s""i | ""special""i | ""m""i | ""mythic""i | ""r""i | ""rare""i | ""u""i | ""uncommon""i | ""common""i | ""c""i) {% ([[rarity]]) => rarity %}
-alphaNumericValue -> [a-zA-Z]:+ {% ([letters]) => letters.join('').toLowerCase() %}
+alphaNumericValue -> [a-zA-Z0-9]:+ {% ([letters]) => letters.join('').toLowerCase() %}
alphaNumericOpValue -> equalityOperator alphaNumericValue {% ([op, value]) => equalityOperation(op, value) %}
",11
"diff --git a/routes/tools_routes.js b/routes/tools_routes.js @@ -223,14 +223,25 @@ router.get('/api/downloadcubes/:page/:key', async (req, res) => {
});
}
- const cubes = await Cube.find({}, 'cards')
+ let cubeQ;
+ if (req.query.maxShortId) {
+ cubeQ = Deck.find({ shortID: { $gt: req.query.maxShortId } }, 'cards shortID')
+ .sort({ shortID: 1 })
+ .limit(cubePageSize)
+ .lean();
+ } else {
+ cubeQ = Deck.find({}, 'cards shortID')
.sort({ shortID: 1 })
.skip(req.params.page * cubePageSize)
.limit(cubePageSize)
.lean();
+ }
+ const cubes = await cubeQ;
+ const maxShortId = cubes[cubes.length - 1].shortID;
return res.status(200).send({
success: 'true',
+ maxShortId,
pages: Math.ceil(count / cubePageSize),
cubes: cubes.map((cube) => cube.cards.map((card) => carddb.cardFromId(card.cardID).name_lower)),
});
@@ -260,14 +271,26 @@ router.get('/api/downloaddecks/:page/:key', async (req, res) => {
});
}
- const decks = await Deck.find({}, 'seats')
+ let deckQ;
+ if (req.query.maxDate) {
+ deckQ = Deck.find({ date: { $gt: req.query.maxDate } }, 'seats date')
+ .sort({ date: 1 })
+ .limit(deckPageSize)
+ .lean();
+ } else {
+ deckQ = Deck.find({}, 'seats date')
.sort({ date: 1 })
.skip(req.params.page * deckPageSize)
.limit(deckPageSize)
.lean();
+ }
+ const decks = await deckQ;
+
+ const maxDate = decks[decks.length - 1].date;
return res.status(200).send({
success: 'true',
+ maxDate,
pages: Math.ceil(count / deckPageSize),
decks: decks.map((deck) => {
const main = [];
",11
"diff --git a/src/library/js_interface.js b/src/library/js_interface.js @@ -25,7 +25,7 @@ define_libfunc(""js-eval"", 1, 1, function(ar){
return eval2(ar[0]);
});
define_libfunc(""js-ref"", 2, 2, function(ar){
- if(typeof ar[1] === ""string""){
+ if(typeof ar[1] === ""string"" || Number.isInteger(ar[1)){
return ar[0][ar[1]];
}
else{
",11
"diff --git a/src/extensions/filter-control/bootstrap-table-filter-control.js b/src/extensions/filter-control/bootstrap-table-filter-control.js @@ -206,17 +206,39 @@ $.BootstrapTable = class extends $.BootstrapTable {
if ($.inArray(key, that.header.fields) !== -1) {
if (value === undefined || value === null) {
tmpItemIsExpected = false
+ } else if (typeof value === 'object') {
+ value.forEach((objectValue) => {
+ if (tmpItemIsExpected) {
+ return
+ }
+ tmpItemIsExpected = that.isValueExpected(fval, objectValue, thisColumn, key)
+ })
} else if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
- if (thisColumn.filterStrictSearch) {
- tmpItemIsExpected = value.toString().toLowerCase() === fval.toString().toLowerCase()
- } else if (thisColumn.filterStartsWithSearch) {
- tmpItemIsExpected = (`${value}`).toLowerCase().indexOf(fval) === 0
+ tmpItemIsExpected = that.isValueExpected(fval, value, thisColumn, key)
+ }
+ }
+ }
+
+ itemIsExpected.push(tmpItemIsExpected)
+ })
+
+ return !itemIsExpected.includes(false)
+ })
+ : that.data
+ }
+
+ isValueExpected (searchValue, value, column, key) {
+ let tmpItemIsExpected = false
+ if (column.filterStrictSearch) {
+ tmpItemIsExpected = value.toString().toLowerCase() === searchValue.toString().toLowerCase()
+ } else if (column.filterStartsWithSearch) {
+ tmpItemIsExpected = (`${value}`).toLowerCase().indexOf(searchValue) === 0
} else {
- tmpItemIsExpected = (`${value}`).toLowerCase().includes(fval)
+ tmpItemIsExpected = (`${value}`).toLowerCase().includes(searchValue)
}
const largerSmallerEqualsRegex = /(?:(<=|=>|=<|>=|>|<)(?:\s+)?(\d+)?|(\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm
- const matches = largerSmallerEqualsRegex.exec(fval)
+ const matches = largerSmallerEqualsRegex.exec(searchValue)
if (matches) {
const operator = matches[1] || `${matches[5]}l`
@@ -250,22 +272,14 @@ $.BootstrapTable = class extends $.BootstrapTable {
}
}
- if (thisColumn.filterCustomSearch) {
- const customSearchResult = Utils.calculateObjectValue(that, thisColumn.filterCustomSearch, [fval, value, key, that.options.data], true)
+ if (column.filterCustomSearch) {
+ const customSearchResult = Utils.calculateObjectValue(this, column.filterCustomSearch, [searchValue, value, key, this.options.data], true)
if (customSearchResult !== null) {
tmpItemIsExpected = customSearchResult
}
}
- }
- }
- }
- itemIsExpected.push(tmpItemIsExpected)
- })
-
- return !itemIsExpected.includes(false)
- })
- : that.data
+ return tmpItemIsExpected
}
initColumnSearch (filterColumnsDefaults) {
",11
"diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js @@ -441,7 +441,7 @@ function getPackageName(installPackage) {
// git+https://github.com/mycompany/react-scripts.git
// git+ssh://github.com/mycompany/react-scripts.git#v1.2.3
return Promise.resolve(installPackage.match(/([^\/]+)\.git(#.*)?$/)[1]);
- } else if (installPackage.indexOf('@') > 0) {
+ } else if (installPackage.match(/.+@/)) {
// Do not match @scope/ when stripping off @version or @tag
return Promise.resolve(
installPackage.charAt(0) + installPackage.substr(1).split('@')[0]
",11
"diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js @@ -315,7 +315,7 @@ module.exports = {
// Minify the code.
new UglifyJsPlugin({
uglifyOptions: {
- ecma: 5,
+ ecma: 8,
compress: {
warnings: false,
// Disabled because of an issue with Uglify breaking seemingly valid code:
",11
"diff --git a/packages/babel-preset-react-app/dependencies.js b/packages/babel-preset-react-app/dependencies.js @@ -87,6 +87,8 @@ module.exports = function(api, opts) {
async: false,
},
],
+ // Adds syntax support for import()
+ require('@babel/plugin-syntax-dynamic-import').default,
].filter(Boolean),
};
};
",11
"diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js @@ -74,15 +74,25 @@ module.exports = (resolve, rootDir, isEjecting) => {
'extraGlobals',
'globalSetup',
'globalTeardown',
+ 'moduleNameMapper',
'resetMocks',
'resetModules',
'snapshotSerializers',
+ 'transform',
+ 'transformIgnorePatterns',
'watchPathIgnorePatterns',
];
if (overrides) {
supportedKeys.forEach(key => {
if (overrides.hasOwnProperty(key)) {
+ if (Array.isArray(config[key]) || typeof config[key] !== 'object') {
+ // for arrays or primitive types, directly override the config key
config[key] = overrides[key];
+ } else {
+ // for object types, extend gracefully
+ config[key] = Object.assign({}, config[key], overrides[key]);
+ }
+
delete overrides[key];
}
});
",11
"diff --git a/index.html b/index.html function(err) {
this.props.onError(err, ""err"");
});
+ // Clear the value so the same file can be uploaded again.
+ e.target.value = '';
},
render: function() {
return (
});
}
}
+ // Clear the value so the same file can be uploaded again.
+ e.target.value = '';
},
handleAttachFile: function(e) {
}, false);
reader.readAsDataURL(file);
}
+ // Clear the value so the same file can be uploaded again.
+ e.target.value = '';
},
handleSend: function() {
var promise = null;
var token = Tinode.getLoginToken();
- if (token) {
- promise = Tinode.loginToken(token.token, cred);
- } else if (password) {
+ if (login && password) {
this.setState({password: null});
promise = Tinode.loginBasic(login, password, cred);
+ } else if (token) {
+ promise = Tinode.loginToken(token.token, cred);
} else {
this.setState({loginDisabled: false});
}
",11
"diff --git a/components/Form/Select/ThemedReactSelect.js b/components/Form/Select/ThemedReactSelect.js @@ -15,6 +15,7 @@ ThemedReactSelect.propTypes = {
disabled: bool,
hasErrors: bool,
id: string,
+ instanceId: string,
// TODO: Resolve why multiselects can end up with touched: { key: array }
// see ThemedReactSelect as well
// isTouched: bool,
@@ -25,10 +26,11 @@ ThemedReactSelect.defaultProps = {
disabled: false,
hasErrors: false,
id: undefined,
+ instanceId: undefined,
isTouched: false,
};
-function ThemedReactSelect({ disabled, hasErrors, id, ...props }) {
+function ThemedReactSelect({ disabled, hasErrors, id, instanceId, ...props }) {
// See TODO in propTypes definition
// eslint-disable-next-line react/destructuring-assignment
const isTouched = Array.isArray(props.isTouched) ? true : props.isTouched; // coerce to boolean
@@ -44,7 +46,7 @@ function ThemedReactSelect({ disabled, hasErrors, id, ...props }) {
return (
<ReactSelect
{...props}
- instanceId={id}
+ instanceId={instanceId || id}
disabled={disabled}
styles={{
control: base => {
",11
"diff --git a/components/Container/Container.js b/components/Container/Container.js import React from 'react';
import { bool, node, number, oneOf, oneOfType, string } from 'prop-types';
import classNames from 'classnames';
+import { getDataAttributes } from 'common/utils/prop-utils';
import styles from './Container.css';
Container.propTypes = {
@@ -28,6 +29,7 @@ function Container({
id,
isFullViewportHeight,
theme,
+ ...props
}) {
// See https://css-tricks.com/tinted-images-multiple-backgrounds/ for explanation
const darkOverlay = 'linear-gradient(rgba(33, 48, 69, 0.65),rgba(33, 48, 69, 0.65))';
@@ -37,6 +39,8 @@ function Container({
}
: undefined;
+ const customDataAttributes = getDataAttributes(props);
+
return (
<div
className={classNames(className, styles.Container, styles[theme], {
@@ -44,6 +48,7 @@ function Container({
})}
id={id}
style={dynamicBackgroundImage}
+ {...customDataAttributes}
>
<div className={styles.content}>{children}</div>
</div>
",11
"diff --git a/sass/components/forms/_select.scss b/sass/components/forms/_select.scss @@ -13,6 +13,20 @@ select {
height: $input-height;
}
+
+.input-field {
+ select {
+ display: block;
+ position: absolute;
+ width: 0;
+ pointer-events: none;
+ height: 0;
+ top: 0;
+ left: 0;
+ opacity: 0;
+ }
+}
+
.select-label {
position: absolute;
}
",11
"diff --git a/modules/user/src/main/groovy/org/openforis/sepal/component/user/endpoint/UserEndpoint.groovy b/modules/user/src/main/groovy/org/openforis/sepal/component/user/endpoint/UserEndpoint.groovy @@ -206,6 +206,8 @@ class UserEndpoint {
post('/google/revoke-access') {
response.contentType = 'application/json'
+ if (!sepalUser.googleTokens)
+ return send(toJson([status: 'success', message: 'No tokens to revoke']))
component.submit(
new RevokeGoogleAccountAccess(
username: sepalUser.username,
",11
"diff --git a/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/files/query/GbUsed.groovy b/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/files/query/GbUsed.groovy package org.openforis.sepal.component.files.query
+import org.apache.commons.lang.SystemUtils
import org.openforis.sepal.query.Query
import org.openforis.sepal.query.QueryHandler
import org.openforis.sepal.util.Terminal
@@ -20,11 +21,16 @@ class GbUsedHandler implements QueryHandler<Double, GbUsed> {
Double execute(GbUsed query) {
def userDir = new File(homeDir, query.username)
userDir.mkdirs()
+ double bytes
+ if (SystemUtils.IS_OS_WINDOWS)
+ bytes = userDir.directorySize()
+ else {
def du = Terminal.execute(userDir,
'/bin/bash', '-c',
'command -v ionice >/dev/null 2>&1 && ionice -c 2 -n 7 nice -n 19 du -sk . || nice -n 19 du -sk .'
)
- def bytes = du.split(/\W/).first() as double
+ bytes = du.split(/\W/).first() as double
+ }
return bytes / 1000 / 1000
}
}
",11
"diff --git a/modules/gui-react/frontend/src/widget/form.js b/modules/gui-react/frontend/src/widget/form.js @@ -96,6 +96,20 @@ export function form(inputs, mapStateToProps) {
return !!Object.keys(this.state.values).find(name => this.error(name))
}
+ setInitialValues(values) {
+ this.setState((prevState) => {
+ const state = {...prevState, dirty: false}
+ Object.keys(inputs).forEach(name => {
+ state.initialValues[name] = name in values ? values[name] : ''
+ state.values[name] = name in values ? values[name] : ''
+ state.errors[name] = ''
+ })
+ if (prevState.dirty)
+ this.onClean()
+ return state
+ })
+ }
+
reset() {
this.setState((prevState) => {
const dirty = !!Object.keys(inputs).find((name) => {
@@ -152,6 +166,7 @@ export function form(inputs, mapStateToProps) {
hasInvalid: this.hasInvalid,
onDirty: (listener) => this.onDirtyListeners.push(listener),
onClean: (listener) => this.onCleanListeners.push(listener),
+ setInitialValues: (values) => this.setInitialValues(values),
reset: () => this.reset(),
isDirty: () => this.isDirty,
values: () => this.state.values
",11
"diff --git a/modules/gui-react/frontend/src/widget/form.js b/modules/gui-react/frontend/src/widget/form.js @@ -241,7 +241,7 @@ export const ErrorMessage = ({input}) =>
export class Input extends React.Component {
render() {
- const {input, validate = 'onBlur', onChange, onBlur, ...props} = this.props
+ const {input, validate = 'onBlur', onChange, className, onBlur, ...props} = this.props
return (
<input
{...props}
@@ -260,7 +260,7 @@ export class Input extends React.Component {
if (validate === 'onBlur')
input.validate()
}}
- className={input.errorClass}
+ className={[input.errorClass, className].join(' ')}
/>
)
}
@@ -274,4 +274,5 @@ Input.propTypes = {
placeholder: PropTypes.string,
tabIndex: PropTypes.number,
autoComplete: PropTypes.string,
+ className: PropTypes.string
}
",11
"diff --git a/modules/gui-react/frontend/src/widget/datePicker.js b/modules/gui-react/frontend/src/widget/datePicker.js @@ -55,12 +55,13 @@ class DatePicker extends React.Component {
}
render() {
- const {input, fromYear, toYear, className} = this.props
+ const {input, fromYear, toYear, className, ...props} = this.props
const {edit} = this.state
return (
<div className={className}>
<div className={styles.input}>
<Input
+ {...props}
input={input}
maxLength={10}
onFocus={() => this.editDate(true)}
",11
"diff --git a/modules/gui/frontend/src/widget/button.js b/modules/gui/frontend/src/widget/button.js @@ -145,7 +145,7 @@ export const Button = ({
)
Button.propTypes = {
- children: PropTypes.array,
+ children: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
className: PropTypes.string,
disabled: PropTypes.any,
icon: PropTypes.string,
",11
"diff --git a/modules/gui/frontend/src/widget/panelButtons.js b/modules/gui/frontend/src/widget/panelButtons.js @@ -35,7 +35,7 @@ class PanelButtons extends React.Component {
apply() {
const {form, onApply} = this.props
- onApply(form.values())
+ onApply(form && form.values())
}
closePanel() {
@@ -209,8 +209,7 @@ class PanelButtons extends React.Component {
renderCancelButton() {
const {isActionForm, cancelLabel = msg('button.cancel'), form} = this.props
- const dirty = form.isDirty()
- const showCancelButton = isActionForm || dirty
+ const showCancelButton = isActionForm || form.isDirty()
return (
<Button
look='cancel'
@@ -229,17 +228,16 @@ class PanelButtons extends React.Component {
renderOkButton() {
const {isActionForm, applyLabel = msg('button.ok'), form} = this.props
- const dirty = form.isDirty()
return (
<Button
- type='submit'
+ type={isActionForm ? 'button' : 'submit'}
look='apply'
icon='check'
label={applyLabel}
- disabled={form.isInvalid()}
+ disabled={!isActionForm && form.isInvalid()}
onClick={e => {
e.preventDefault()
- dirty || isActionForm ? this.ok() : this.cancel()
+ isActionForm || form.isDirty() ? this.ok() : this.cancel()
}}
onMouseDown={e => e.preventDefault()} // Prevent onBlur validation before canceling
/>
@@ -247,17 +245,17 @@ class PanelButtons extends React.Component {
}
renderFormButtons() {
+ const {isActionForm, onApply, onCancel} = this.props
return (
<ButtonGroup>
- {this.renderCancelButton()}
- {this.renderOkButton()}
+ {!isActionForm || onCancel ? this.renderCancelButton() : null}
+ {!isActionForm || onApply ? this.renderOkButton() : null}
</ButtonGroup>
)
}
}
PanelButtons.propTypes = {
- form: PropTypes.object.isRequired,
statePath: PropTypes.string.isRequired,
additionalButtons: PropTypes.arrayOf(
PropTypes.shape({
@@ -269,6 +267,7 @@ PanelButtons.propTypes = {
),
applyLabel: PropTypes.string,
cancelLabel: PropTypes.string,
+ form: PropTypes.object,
initialized: PropTypes.any,
isActionForm: PropTypes.any,
modalOnDirty: PropTypes.any,
",11
"diff --git a/modules/gui/frontend/src/widget/slider.js b/modules/gui/frontend/src/widget/slider.js @@ -69,13 +69,14 @@ class SliderContainer extends React.Component {
}
renderDynamics() {
- const {input, width, range, ticks, snap, minValue, maxValue} = this.props
+ const {input, width, range, float, ticks, snap, minValue, maxValue} = this.props
return (
<SliderDynamics
input={input}
minValue={minValue}
maxValue={maxValue}
width={width}
+ float={float}
ticks={ticks}
snap={snap}
range={range}
@@ -114,6 +115,7 @@ SliderContainer.propTypes = {
maxValue: PropTypes.number,
minValue: PropTypes.number,
normalize: PropTypes.func,
+ float: PropTypes.bool,
snap: PropTypes.bool,
ticks: PropTypes.oneOfType([
PropTypes.number,
@@ -346,8 +348,11 @@ class SliderDynamics extends React.Component {
position = Math.round(position)
if (position !== this.state.position) {
this.setState(prevState => ({...prevState, position}))
+ const value = this.toValue(this.snapPosition(position))
this.props.input.set(
- Math.round(this.toValue(this.snapPosition(position)))
+ this.props.float
+ ? value
+ : Math.round(value)
)
}
}
@@ -386,6 +391,7 @@ SliderDynamics.propTypes = {
maxValue: PropTypes.number.isRequired,
minValue: PropTypes.number.isRequired,
normalize: PropTypes.func.isRequired,
+ float: PropTypes.bool,
snap: PropTypes.bool,
ticks: PropTypes.array,
width: PropTypes.number
@@ -456,13 +462,14 @@ export default class Slider extends React.Component {
}
renderContainer() {
- const {input, logScale, snap, range = 'left', info, disabled} = this.props
+ const {input, logScale, float = false, snap, range = 'left', info, disabled} = this.props
const {ticks, minValue, maxValue, width} = this.state
return (
<SliderContainer
input={input}
minValue={minValue}
maxValue={maxValue}
+ float={float}
ticks={ticks}
snap={snap}
range={range}
@@ -516,6 +523,7 @@ Slider.propTypes = {
maxValue: PropTypes.number,
minValue: PropTypes.number,
range: PropTypes.oneOf(['none', 'left', 'right']),
+ float: PropTypes.any,
snap: PropTypes.any,
ticks: PropTypes.oneOfType([
// PropTypes.number,
",11
"diff --git a/modules/terminal/docker/Dockerfile b/modules/terminal/docker/Dockerfile @@ -8,7 +8,11 @@ ENV PORT 8000
WORKDIR ${ROOT}
ADD package.json ${ROOT}/package.json
-RUN npm install
+RUN apt-get update && \
+ apt-get install sudo && \
+ adduser node sudo && \
+ echo -e ""\nnode ALL = (root) NOPASSWD: /usr/bin/ssh\n"" >> /etc/sudoers && \
+ npm install
ADD src ${ROOT}/src
",11
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipeFormPanel.js b/modules/gui/frontend/src/app/home/body/process/recipeFormPanel.js @@ -24,6 +24,7 @@ export const recipeFormPanel = ({
modelToValues = model => ({...model}),
valuesToModel = values => ({...values}),
policy = defaultPolicy,
+ additionalPolicy = () => ({})
}) => {
const createMapRecipeToProps = mapRecipeToProps =>
recipe => {
@@ -65,10 +66,11 @@ export const recipeFormPanel = ({
}
}
+ const policyToApply = props => ({...policy(props), ...additionalPolicy(props)})
return (
withRecipe(createMapRecipeToProps(mapRecipeToProps))(
withPanelWizardContext()(
- activatable({id, policy})(
+ activatable({id, policy: policyToApply})(
initValues(valuesSpec)(
form({fields, constraints})(
HigherOrderComponent
",11
"diff --git a/modules/gui/frontend/src/widget/activation/activatable.js b/modules/gui/frontend/src/widget/activation/activatable.js @@ -89,8 +89,9 @@ export const activatable = ({id, policy, alwaysAllow}) => {
return WrappedComponent => {
class HigherOrderComponent extends React.Component {
render() {
+ const activatableId = _.isFunction(id) ? id(this.props) : id
return (
- <Activatable id={id} policy={policy} alwaysAllow={alwaysAllow} otherProps={this.props}>
+ <Activatable id={activatableId} policy={policy} alwaysAllow={alwaysAllow} otherProps={this.props}>
{activatable =>
React.createElement(
WrappedComponent,
",11
"diff --git a/modules/gui/frontend/src/widget/list.js b/modules/gui/frontend/src/widget/list.js @@ -67,7 +67,7 @@ export default class List extends React.Component {
handleHeight
onResize={() => this.scrollHighlighted$.next()}>
<ScrollableContainer className={className}>
- <Scrollable className={styles.options}>
+ <Scrollable className={styles.options} direction='xy'>
{scrollableContainerHeight => this.renderList(scrollableContainerHeight)}
</Scrollable>
</ScrollableContainer>
",11
"diff --git a/modules/gui/frontend/src/widget/formPanel.js b/modules/gui/frontend/src/widget/formPanel.js @@ -138,12 +138,8 @@ export class FormPanelButtons extends React.Component {
invalid
? null
: onOk
- const onEscape =
- invalid
- ? null
- : canSubmit
- ? onCancel
- : onOk
+ const onEscape = invalid || canSubmit ? onCancel : onOk
+ console.log({invalid, canSubmit, onEscape})
return (
<PanelButtons
onEnter={onEnter}
",11
"diff --git a/modules/gui/frontend/src/stateUtils.js b/modules/gui/frontend/src/stateUtils.js @@ -47,7 +47,7 @@ export const resolve = (object, path, createTemplates = false) =>
}
return value[index]
}
- if (_.isPlainObject(value)) {
+ if (_.isObjectLike(value)) {
// match object property
if (value[pathElement] !== undefined) {
return value[pathElement]
",11
"diff --git a/modules/google-earth-engine/docker/src/sepalinternal/classification/__init__.py b/modules/google-earth-engine/docker/src/sepalinternal/classification/__init__.py @@ -25,7 +25,7 @@ class Classification(ImageSpec):
return image_spec
self.images = [to_image_spec(image) for image in model['inputImagery']['images']]
- self.auxiliary_imagery = model['auxiliaryImagery']
+ self.auxiliary_imagery = model.get('auxiliaryImagery', [])
self.aoi = self.images[0].aoi
self.scale = min([image.scale for image in self.images])
self.bands = ['class']
",11
"diff --git a/modules/gui/frontend/src/widget/button.js b/modules/gui/frontend/src/widget/button.js @@ -328,7 +328,7 @@ Button.propTypes = {
size: PropTypes.oneOf(['small', 'normal', 'large', 'x-large', 'xx-large']),
stopPropagation: PropTypes.any,
tabIndex: PropTypes.number,
- tooltip: PropTypes.string,
+ tooltip: PropTypes.any,
tooltipDisabled: PropTypes.any,
tooltipPlacement: PropTypes.oneOf(['top', 'bottom', 'left', 'right']),
type: PropTypes.oneOf(['button', 'submit', 'reset']),
",11
"diff --git a/modules/gui/frontend/src/widget/viewportResizeDetector.js b/modules/gui/frontend/src/widget/viewportResizeDetector.js @@ -14,11 +14,13 @@ class ViewportResizeDetector extends React.Component {
}
render() {
- return null
+ const {children} = this.props
+ return children
}
}
ViewportResizeDetector.propTypes = {
+ children: PropTypes.any,
dimensions: PropTypes.object,
onChange: PropTypes.func
}
",11
"diff --git a/dev-env/sepal.sh b/dev-env/sepal.sh @@ -108,6 +108,56 @@ module_kill () {
fi
}
+
+module_clean () {
+ local MODULE=$1
+ message ""CLEANING"" $MODULE YELLOW
+ case $MODULE in
+ api-gateway)
+ $SEPAL/gradlew \
+ -p $SEPAL \
+ --no-daemon \
+ :sepal-api-gateway:clean &>/dev/null
+ ;;
+ mongo)
+ ;;
+ ceo)
+ ;;
+ gee)
+ cd $SEPAL/lib/js/shared
+ rm -rf node_modules package-lock.json
+ cd $SEPAL/modules/gee/docker
+ rm -rf node_modules package-lock.json
+ ;;
+ gui)
+ cd $SEPAL/modules/gui/frontend
+ rm -rf node_modules package-lock.json
+ ;;
+ sepal-server)
+ $SEPAL/gradlew \
+ -p $SEPAL \
+ --no-daemon \
+ :sepal-server:clean &>/dev/null
+ ;;
+ task)
+ cd $SEPAL/lib/js/shared
+ rm -rf node_modules package-lock.json
+ cd $SEPAL/modules/task/docker
+ rm -rf node_modules package-lock.json
+ ;;
+ user)
+ $SEPAL/gradlew \
+ -p $SEPAL \
+ --no-daemon \
+ :sepal-user:clean &>/dev/null
+ ;;
+ *)
+ return 1
+ ;;
+ esac
+}
+
+
do_with_modules () {
local COMMAND=$1
shift
@@ -143,8 +193,8 @@ restart () {
}
clean () {
- stop
- $SEPAL/gradlew clean -p $SEPAL
+ do_with_modules ""module_stop"" $@
+ do_with_modules ""module_clean"" $@
}
build () {
@@ -272,7 +322,7 @@ usage () {
echo ""Usage: $0 <command> [<arguments>]""
echo """"
echo ""Commands:""
- echo "" clean clean SEPAL""
+ echo "" clean [<module>...] clean module(s)""
echo "" build build SEPAL""
echo "" build-debug build SEPAL w/debug enabled""
echo "" status [<module>...] check module(s)""
@@ -299,7 +349,7 @@ no_one_argument () {
case ""$1"" in
clean)
shift
- clean
+ clean $@
;;
build)
shift
",11
"diff --git a/common/src/main/groovy/org/openforis/sepal/user/User.groovy b/common/src/main/groovy/org/openforis/sepal/user/User.groovy @@ -49,7 +49,7 @@ class User implements groovymvc.security.User {
updateTime: updateTime)
}
- User withDetails(String name, String email, String organization) {
+ User withDetails(String name, String email, String organization, boolean admin) {
new User(
id: id,
name: name,
@@ -57,7 +57,7 @@ class User implements groovymvc.security.User {
email: email,
organization: organization,
status: status,
- roles: roles,
+ roles: admin ? [Roles.ADMIN] : [],
creationTime: creationTime,
updateTime: updateTime)
}
",11
"diff --git a/hosting-services/aws/sepal/rsyslog.conf b/hosting-services/aws/sepal/rsyslog.conf @@ -89,3 +89,6 @@ local7.* /var/log/boot.log
# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
#*.* @@remote-host:514
# ### end of the forwarding rule ###
+
+# Allow ANSI color sequences
+$EscapeControlCharactersOnReceive off
",11
"diff --git a/modules/gui/frontend/src/widget/tabs/tabs.js b/modules/gui/frontend/src/widget/tabs/tabs.js @@ -32,8 +32,8 @@ export const addTab = statePath => {
return tab
}
-export const closeTab = (id, statePath) => {
- close$.next({id, statePath})
+export const closeTab = (id, statePath, nextId) => {
+ close$.next({id, statePath, nextId})
actionBuilder('CLOSING_TAB')
.set([statePath, 'tabs', {id}, 'closing'], true)
.dispatch()
@@ -255,12 +255,12 @@ class _Tabs extends React.Component {
close$.pipe(
delay(CLOSE_ANIMATION_DURATION_MS * 1.2)
).subscribe(
- ({id, statePath}) => this.finalizeCloseTab(id, statePath)
+ ({id, statePath, nextId}) => this.finalizeCloseTab(id, statePath, nextId)
)
)
}
- finalizeCloseTab(id, statePath) {
+ finalizeCloseTab(id, statePath, nextId) {
const nextSelectedTabId = () => {
const tabs = select([statePath, 'tabs'])
const tabIndex = tabs.findIndex(tab => tab.id === id)
@@ -276,7 +276,7 @@ class _Tabs extends React.Component {
}
actionBuilder('CLOSE_TAB')
- .set([statePath, 'selectedTabId'], nextSelectedTabId())
+ .set([statePath, 'selectedTabId'], nextId || nextSelectedTabId())
.del([statePath, 'tabs', {id}])
.dispatch()
}
",11
"diff --git a/modules/gui/frontend/src/app/home/body/apps/appList/appListData.js b/modules/gui/frontend/src/app/home/body/apps/appList/appListData.js @@ -115,7 +115,7 @@ export class AppListData extends React.Component {
{({tagFilter, setTagFilter}) => (
<Buttons
chromeless
- layout='horizontal-nowrap'
+ layout='horizontal-wrap'
spacing='tight'
options={options}
selected={tagFilter}
",11
"diff --git a/modules/gui/frontend/src/widget/input.js b/modules/gui/frontend/src/widget/input.js @@ -207,7 +207,7 @@ Input.propTypes = {
autoCorrect: PropTypes.any,
autoFocus: PropTypes.any,
border: PropTypes.any,
- busyMessage: PropTypes.string,
+ busyMessage: PropTypes.any,
className: PropTypes.string,
disabled: PropTypes.any,
errorMessage: PropTypes.string,
",11
"diff --git a/modules/gui/frontend/src/widget/form/datePicker.js b/modules/gui/frontend/src/widget/form/datePicker.js @@ -39,10 +39,12 @@ export const constrainDate = (date, min, max) => maxDate(minDate(date, max), min
export class FormDatePicker extends React.Component {
id = `DatePicker-${guid()}`
inputElement = React.createRef()
+ state = {value: ''}
render() {
const {input, startDate, endDate, label, autoFocus, tooltip, tooltipPlacement} = this.props
- const date = moment(input.value, DATE_FORMAT)
+ const {value} = this.state
+ const date = moment(value, DATE_FORMAT)
return (
<Activator id={this.id}>
{panel =>
@@ -57,20 +59,26 @@ export class FormDatePicker extends React.Component {
startDate={momentDate(startDate)}
endDate={momentDate(endDate)}
onSelect={date => {
- const dateString = date.format(DATE_FORMAT)
- this.inputElement.current.value = dateString
- input.set(dateString)
+ const value = date.format(DATE_FORMAT)
+ this.setState({value})
+ input.set(value)
}}/>
<div className={styles.input}>
<Input
ref={this.inputElement}
- value={input.value}
+ value={value}
type='text'
maxLength={10}
autoFocus={autoFocus}
className={styles.input}
- onChange={e => this.setInput(e.target.value)}
- onBlur={() => this.inputElement.current.value = input.value}
+ onChange={e => this.updateValue(e.target.value)}
+ onBlur={() => {
+ const date = momentDate(value)
+ const formattedDate = date.isValid()
+ ? constrainDate(date, startDate, endDate).format(DATE_FORMAT)
+ : this.state.lastValidValue
+ this.updateValue(formattedDate)
+ }}
/>
<Button
additionalClassName={styles.panelTrigger}
@@ -87,16 +95,21 @@ export class FormDatePicker extends React.Component {
)
}
- setInput(value) {
+ componentDidMount() {
+ const value = this.props.input.value
+ this.setState({value, lastValidValue: value})
+ }
+
+ updateValue(value) {
const {input, startDate, endDate} = this.props
const date = momentDate(value)
- // const formattedDate = date.isValid()
- // ? constrainDate(date, startDate, endDate).format(DATE_FORMAT)
- // : momentDate(startDate).format(DATE_FORMAT)
- // input.set(formattedDate)
- if (date.isValid()) {
- const formattedDate = constrainDate(date, startDate, endDate).format(DATE_FORMAT)
- input.set(formattedDate)
+ const validDate = date.isValid() && constrainDate(date, startDate, endDate).isSame(date)
+ if (validDate) {
+ input.set(date.format(DATE_FORMAT))
+ this.setState({value, lastValidValue: value})
+ } else {
+ input.set('')
+ this.setState({value})
}
}
}
",11
"diff --git a/modules/gui/frontend/src/widget/label.js b/modules/gui/frontend/src/widget/label.js @@ -43,7 +43,7 @@ export default class Label extends React.Component {
Label.propTypes = {
alignment: PropTypes.oneOf(['left', 'center', 'right']),
- children: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+ children: PropTypes.any,
className: PropTypes.string,
disabled: PropTypes.any,
msg: PropTypes.string,
",11
"diff --git a/modules/gui/frontend/src/app/home/body/process/classification/classifier/classifier.js b/modules/gui/frontend/src/app/home/body/process/classification/classifier/classifier.js import {Form} from 'widget/form/form'
import {Layout} from 'widget/layout'
import {Panel} from 'widget/panel/panel'
-import {RecipeActions, defaultModel} from '../classificationRecipe'
+import {RecipeActions} from '../classificationRecipe'
import {RecipeFormPanel, recipeFormPanel} from 'app/home/body/process/recipeFormPanel'
import {compose} from 'compose'
import {msg} from 'translate'
@@ -11,6 +11,7 @@ import styles from './classifier.module.css'
import {Button} from 'widget/button'
import {selectFrom} from 'stateUtils'
import _ from 'lodash'
+import {FileSelect} from '../../../../../../widget/fileSelect'
const mapRecipeToProps = recipe => ({
legend: selectFrom(recipe, 'model.legend')
@@ -265,7 +266,7 @@ class Classifier extends React.Component {
value: 'MINIMUM_DISTANCE',
label: msg('process.classification.panel.classifier.form.minimumDistance.label')
},
- {value: 'DECISION_TREE', label: msg('process.classification.panel.classifier.form.decisionTree.label')},
+ {value: 'DECISION_TREE', label: msg('process.classification.panel.classifier.form.decisionTree.label')}
]
return (
<Form.Buttons
@@ -638,6 +639,7 @@ class Classifier extends React.Component {
return
return (
+ <React.Fragment>
<Form.Input
label={msg('process.classification.panel.classifier.form.decisionTree.label')}
tooltip={msg('process.classification.panel.classifier.form.decisionTree.tooltip')}
@@ -646,11 +648,16 @@ class Classifier extends React.Component {
textArea
errorMessage
/>
+ <FileSelect
+ single
+ onSelect={file => file.text().then(text => decisionTree.set(text))}
+ />
+ </React.Fragment>
)
}
componentDidMount() {
- const {recipeId, form, inputs: {advanced}} = this.props
+ const {recipeId} = this.props
RecipeActions(recipeId).hidePreview().dispatch()
}
@@ -710,3 +717,4 @@ export default compose(
Classifier,
recipeFormPanel({id: 'classifier', fields, valuesToModel, mapRecipeToProps})
)
+
",11
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipe/classification/legend/legend.js b/modules/gui/frontend/src/app/home/body/process/recipe/classification/legend/legend.js @@ -220,7 +220,7 @@ const COLORS = [
]
const isValid = entry => {
- const validValue = _.inRange(entry.value, 0, 99)
+ const validValue = _.inRange(entry.value, 0, 100)
const validColor = !!entry.color
const validLabel = !!entry.label
return validValue && validColor && validLabel
",11
"diff --git a/lib/js/shared/src/ee/optical/mosaic.js b/lib/js/shared/src/ee/optical/mosaic.js @@ -106,7 +106,9 @@ const extractDataSets = sources =>
.flat()
const extractScenes = scenes =>
- Object.values(scenes).flat()
+ scenes
+ ? Object.values(scenes).flat()
.map(scene => toDataSets(scene.dataSet).map(dataSet => ({...scene, dataSet})))
.flat()
+ : []
",11
"diff --git a/modules/gui/frontend/src/widget/blurDetector.js b/modules/gui/frontend/src/widget/blurDetector.js @@ -20,7 +20,7 @@ class BlurDetector extends React.Component {
const {addSubscription} = this.props
addSubscription(
merge(
- fromEvent(document, 'click'),
+ fromEvent(document, 'mousedown'),
fromEvent(document, 'focus'),
).subscribe(
e => this.onEvent(e)
",11
"diff --git a/modules/gui/frontend/src/app/home/map/legendBuilder.js b/modules/gui/frontend/src/app/home/map/legendBuilder.js @@ -28,7 +28,7 @@ export class LegendBuilder extends React.Component {
}
render() {
- const {entries} = this.props
+ const {entries, locked} = this.props
const {show} = this.state
return (
<Widget label={msg('map.legendBuilder.label')} labelButtons={this.labelButtons()}>
@@ -41,10 +41,12 @@ export class LegendBuilder extends React.Component {
onChange={this.updateEntry}
onValidate={this.updateValidation}
onSwap={color => this.swap(color, entry.color)}
+ locked={locked}
/>
<RemoveButton
message={msg('map.legendBuilder.entry.confirmation')}
size='small'
+ disabled={locked}
onRemove={() => this.removeEntry(entry)}/>
</Layout>
)}
@@ -196,7 +198,7 @@ class _Entry extends React.Component {
state = {invalid: true}
render() {
- const {form, entry, entries, mode, hasTrainingData, inputs: {value, color, label}, onSwap} = this.props
+ const {form, entry, entries, mode, locked, inputs: {value, color, label}, onSwap} = this.props
const otherColors = entries
.filter(({id}) => entry.id !== id)
.map(({color}) => color)
@@ -210,6 +212,7 @@ class _Entry extends React.Component {
onChange={color => this.notifyChange({color})}
onSwap={color => onSwap(color)}
invalid={!!form.errors.colorUnique}
+ disabled={locked}
/>
)
: (
@@ -218,6 +221,7 @@ class _Entry extends React.Component {
input={color}
errorMessage={[color, 'colorUnique']}
autoComplete={false}
+ disabled={locked}
onChange={e => this.notifyChange({color: e.target.value})}
/>
)}
@@ -227,7 +231,7 @@ class _Entry extends React.Component {
input={value}
errorMessage={[value, 'valueUnique']}
autoComplete={false}
- disabled={hasTrainingData}
+ disabled={locked}
onChange={e => this.notifyChange({value: e.target.value})}
/>
@@ -297,10 +301,19 @@ class ColorInput extends React.Component {
colorInputRef = React.createRef()
render() {
- const {input, invalid, onChange} = this.props
+ const {input, invalid, disabled, onChange} = this.props
const {swap} = this.state
return (
<div className={styles.colorContainer}>
+ {disabled
+ ? (
+ <div
+ className={[styles.color, invalid ? styles.invalid : ''].join(' ')}
+ style={{'--color': input.value}}
+ />
+ )
+ : (
+ <React.Fragment>
<input
type='color'
className={styles.colorInput}
@@ -322,6 +335,9 @@ class ColorInput extends React.Component {
style={{'--color': input.value}}
/>
</Tooltip>
+ </React.Fragment>
+ )
+ }
</div>
)
}
",11
"diff --git a/modules/gee/docker/src/jobs/ee/image/histogram.js b/modules/gee/docker/src/jobs/ee/image/histogram.js @@ -9,7 +9,7 @@ const worker$ = ({recipe, band, aoi}) => {
const {switchMap} = require('rx/operators')
const {toGeometry} = require('sepal/ee/aoi')
- const {getImage$} = ImageFactory(recipe, {selection: [band]})
+ const {getImage$, histogramMaxPixels = MAX_PIXELS} = ImageFactory(recipe, {selection: [band]})
const histogram = image => {
const geometry = aoi
? toGeometry(aoi)
@@ -19,7 +19,7 @@ const worker$ = ({recipe, band, aoi}) => {
geometry,
scale: 1,
bestEffort: true,
- maxPixels: MAX_PIXELS
+ maxPixels: histogramMaxPixels
}).get(band)
}
",11
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipe/classification/panels/auxiliaryImagery/auxiliaryImagery.js b/modules/gui/frontend/src/app/home/body/process/recipe/classification/panels/auxiliaryImagery/auxiliaryImagery.js import {Form} from 'widget/form/form'
import {Layout} from 'widget/layout'
-import {MosaicPreview} from '../../../mosaic/mosaicPreview'
+import {MosaicPreview} from 'app/home/body/process/recipe/mosaic/mosaicPreview'
import {Panel} from 'widget/panel/panel'
-import {RecipeActions} from '../../classificationRecipe'
+import {RecipeActions} from 'app/home/body/process/recipe/classification/classificationRecipe'
import {RecipeFormPanel, recipeFormPanel} from 'app/home/body/process/recipeFormPanel'
import {compose} from 'compose'
import {msg} from 'translate'
@@ -12,7 +12,6 @@ import styles from './auxiliaryImagery.module.css'
const fields = {
included: new Form.Field()
- .notBlank('process.classification.panel.auxiliaryImagery.form.required')
}
class AuxiliaryImagery extends React.Component {
",11
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipe/indexChange/panels/inputImage/inputImage.js b/modules/gui/frontend/src/app/home/body/process/recipe/indexChange/panels/inputImage/inputImage.js @@ -23,8 +23,7 @@ export const fields = {
.notEmpty(),
band: new Form.Field()
.notBlank(),
- errorBand: new Form.Field()
- .notBlank(),
+ errorBand: new Form.Field(),
bandMin: new Form.Field(),
bandMax: new Form.Field(),
errorBandMax: new Form.Field(),
",11
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipe/indexChange/panels/options/options.js b/modules/gui/frontend/src/app/home/body/process/recipe/indexChange/panels/options/options.js @@ -46,6 +46,7 @@ class Options extends React.Component {
input={minConfidence}
minValue={0}
maxValue={5}
+ decimals={1}
ticks={[0, 1, 2, 3, 4, 5]}
info={value => msg('process.indexChange.panel.options.minConfidence.value', {value})}
disabled={!hasError(recipe)}
",11
"diff --git a/modules/gui/frontend/src/widget/buttonSelect.js b/modules/gui/frontend/src/widget/buttonSelect.js @@ -116,7 +116,7 @@ class ButtonSelect extends React.Component {
getLabel() {
const {label} = this.props
const {selectedOption} = this.state
- return (selectedOption && selectedOption.buttonLabel) || label
+ return (selectedOption && (selectedOption.buttonLabel || selectedOption.label)) || label
}
getChevronIcon() {
",11
"diff --git a/modules/haproxy/docker-compose.yml b/modules/haproxy/docker-compose.yml @@ -8,8 +8,8 @@ services:
image: ""${SEPAL_DOCKER_REPOSITORY:-localhost}/openforis/haproxy:${SEPAL_VERSION:-latest}""
container_name: haproxy
ports:
- - ""${SEPAL_IP_ADDRESS:-127.0.0.1}:80:80""
- - ""${SEPAL_IP_ADDRESS:-127.0.0.1}:443:443""
+ - ""${SEPAL_IP_ADDRESS:-0.0.0.0}:${SEPAL_HTTP_PORT:-80}:80""
+ - ""${SEPAL_IP_ADDRESS:-0.0.0.0}:${SEPAL_HTTPS_PORT:-443}:443""
volumes:
- ""${SEPAL_DATA_DIR}/letsencrypt:/etc/letsencrypt""
environment:
",11
"diff --git a/modules/r-proxy/src/filesystem.js b/modules/r-proxy/src/filesystem.js @@ -20,7 +20,7 @@ const getRepoPath = path => {
const getPackageInfo = path => {
const {dir, base} = Path.parse(path)
- const VERSION_REGEX = /(.*?)(?:_([\d\.]+))?(\..*)/
+ const VERSION_REGEX = /(.*?)(?:_([\d\.-]+))?(\..*)/
const result = base.match(VERSION_REGEX)
return result ? {
path,
",11
"diff --git a/src/i18n/index.js b/src/i18n/index.js -import i18n from 'i18next'
+import i18next from 'i18next'
import LanguageDetector from 'i18next-browser-languagedetector'
+import moment from 'moment'
-export default () => i18n
+
+export default () => {
+ const i18n = i18next
.use(LanguageDetector)
.init({
resources: {
@@ -30,3 +33,8 @@ export default () => i18n
wait: true
}
})
+
+ moment.locale(i18n.language)
+
+ return i18n
+}
",12
"diff --git a/components/hoc/with-errors.js b/components/hoc/with-errors.js @@ -42,16 +42,22 @@ export default Page => {
}
}, Page)
- if (Page.getInitialProps) {
Extended.getInitialProps = async context => {
+ if (Page.getInitialProps) {
try {
return await Page.getInitialProps(context)
} catch (error) {
+ if (context.res) {
+ context.res.statusCode = error.code || 500
+ }
+
return {
error
}
}
}
+
+ return {}
}
return Extended
",12
"diff --git a/jest.setup.js b/jest.setup.js @@ -5,5 +5,12 @@ import 'mock-local-storage'
import {configure} from 'enzyme'
import Adapter from 'enzyme-adapter-react-16'
+import {setConfig} from 'next/config'
configure({adapter: new Adapter()})
+
+// Initialize Next.js configuration with empty values.
+setConfig({
+ publicRuntimeConfig: {},
+ secretRuntimeConfig: {}
+})
",12
"diff --git a/README.md b/README.md **NOTE** This is currently under development, and is not ready for regular
usage.
-![Browse](screenshots/browse.png)
-![Now Playing](screenshots/now-playing.png)
-![Queue](screenshots/queue.png)
+![Browse](screenshots/browse.png =270x)
+![Now Playing](screenshots/now-playing.png =270x)
+![Queue](screenshots/queue.png =270x)
## Features
",12
"diff --git a/MaterialSkin/HTML/material/js/browse-page.js b/MaterialSkin/HTML/material/js/browse-page.js @@ -480,7 +480,7 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
} else {
var command = [];
if (item.url) {
- command = [""playlist"", act==""load"" ? ""play"" : ""add"", item.url];
+ command = [""playlist"", act==""load"" ? ""play"" : ""add"", item.url, item.title];
} else if (item.app && item.id) {
command = [item.app, ""playlist"", act, ""item_id:""+item.id];
}
",12
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -183,6 +183,9 @@ var lmsBrowse = Vue.component(""LmsBrowse"", {
this.items.push(i);
});
}
+ if (data && data.result && data.result.count) {
+ this.listSize = data.result.count;
+ }
}).catch(err => {
this.fetchingItems = false;
});
",12
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -165,6 +165,7 @@ Vue.component('lms-toolbar', {
this.playerVolume.muted != muted ||
((val!=this.playerVolume.val && val!=this.playerVolume.prev &&
(!this.playerVolume.lastUpdate || ((new Date())-this.playerVolume.lastUpdate)>500)))) {
+ this.playerVolume.current = val;
this.playerVolume.val = val;
this.playerVolume.muted = muted;
this.playerVolume.lastUpdate = new Date();
",12
"diff --git a/MaterialSkin/HTML/material/html/js/utils.js b/MaterialSkin/HTML/material/html/js/utils.js @@ -190,6 +190,7 @@ function removeUniqueness(id) {
function setBgndCover(elem, coverUrl, isDark) {
if (elem) {
+ elem.style.backgroundColor = isDark ? ""#424242"" : ""#fff"";
elem.style.backgroundImage = ""url('""+(undefined==coverUrl || coverUrl.endsWith(DEFAULT_COVER) || coverUrl.endsWith(""/music/undefined/cover"")
? undefined : coverUrl)+""')"";
if (isDark) {
",12
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -28,8 +28,8 @@ var initMediaSessionAudio = function() {
setInterval(function() {
audio.play().then(_ => {
audio.currentTime = 0; // Go back to start
- navigator.mediaSession.playbackState = toolbarComponent.playerStatus && toolbarComponent.playerStatus.isplaying ? ""playing"" : ""paused"";
audio.pause();
+ navigator.mediaSession.playbackState = toolbarComponent.playerStatus && toolbarComponent.playerStatus.isplaying ? ""playing"" : ""paused"";
});
}, 15*1000);
});
",12
"diff --git a/MaterialSkin/HTML/material/html/js/queue-page.js b/MaterialSkin/HTML/material/html/js/queue-page.js @@ -176,7 +176,7 @@ var lmsQueue = Vue.component(""lms-queue"", {
<v-divider v-if=""(index+1 < items.length) && (index!==currentIndex && (index+1)!==currentIndex)""></v-divider>
<!-- </div></recycle-list></template> -->
</template>
- <RecycleScroller v-else :items=""items"" :item-size=""56"" page-mode><div slot-scope=""{item, index}"">
+ <RecycleScroller v-else :items=""items"" :item-size=""56"" page-mode><div slot-scope=""{item, index}"" key-field=""key"">
<v-list-tile :key=""item.key"" avatar v-bind:class=""{'pq-current': index==currentIndex}"" @dragstart=""dragStart(index, $event)"" @dragend=""dragEnd()"" @dragover=""dragOver($event)"" @drop=""drop(index, $event)"" draggable @click=""click(item, index, $event)"">
<v-list-tile-avatar v-if=""item.selected"" :tile=""true"" class=""lms-avatar"">
<v-icon>check_box</v-icon>
",12
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -13,6 +13,13 @@ function parseBrowseResp(data, parent, options, idStart, cacheKey) {
try {
if (data && data.result) {
resp.total = data.result.count;
+ if (resp.total>LMS_BATCH_SIZE) {
+ resp.total = 1;
+ resp.subtitle=i18n(""%1 Items"", data.result.count);
+ resp.items.push({title:i18n(""ERROR: Too many items. A maximum of %1 items can be handled. Please use A..Z groups""), type: 'text', id:'error'});
+ return resp;
+ }
+
resp.useScroller = (parent && parent.range ? parent.range.count : resp.total) >= LMS_MIN_LIST_SCROLLER_ITEMS;
logJsonMessage(""RESP"", data);
if (parent.id && TOP_SEARCH_ID===parent.id) {
",12
"diff --git a/MaterialSkin/HTML/material/html/js/utils.js b/MaterialSkin/HTML/material/html/js/utils.js @@ -268,8 +268,11 @@ function fixId(id, prefix) {
function setBgndCover(elem, coverUrl, isDark) {
if (elem) {
elem.style.backgroundColor = isDark ? ""#424242"" : ""#fff"";
- elem.style.backgroundImage = ""url('""+(undefined==coverUrl || coverUrl.endsWith(DEFAULT_COVER) || coverUrl.endsWith(""/music/undefined/cover"")
- ? undefined : coverUrl)+""')"";
+ if (undefined==coverUrl || coverUrl.endsWith(DEFAULT_COVER) || coverUrl.endsWith(""/music/undefined/cover"")) {
+ elem.style.backgroundImage = ""url()"";
+ } else {
+ elem.style.backgroundImage = ""url('""+coverUrl+""')"";
+ }
if (isDark) {
//if (coverUrl) {
elem.style.boxShadow = ""inset 0 0 120vw 120vh rgba(72,72,72,0.9)"";
",12
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -10,6 +10,9 @@ const MORE_COMMANDS = new Set([""item_add"", ""item_insert"", ""itemplay"", ""item_fav""
function parseBrowseResp(data, parent, options, idStart, cacheKey) {
// NOTE: If add key to resp, then update addToCache in utils.js
var resp = {items: [], baseActions:[], useGrid: false, total: 0, useScroller: false, jumplist:[] };
+ if (undefined==idStart) {
+ idStart = 0;
+ }
try {
if (data && data.result) {
@@ -431,9 +434,6 @@ function parseBrowseResp(data, parent, options, idStart, cacheKey) {
}
if (!i.id) {
- if (undefined==idStart) {
- idStart = 0;
- }
if (parent.id.startsWith(TOP_ID_PREFIX)) {
i.id=""item_id:""+idStart;
} else {
@@ -721,7 +721,7 @@ function parseBrowseResp(data, parent, options, idStart, cacheKey) {
var isFolder = i.type===""folder"";
var key = i.textkey;
if (undefined!=key && (resp.jumplist.length==0 || resp.jumplist[resp.jumplist.length-1].key!=key)) {
- resp.jumplist.push({key: key, index: resp.items.length+idStart, title});
+ resp.jumplist.push({key: key, index: resp.items.length+idStart});
}
resp.items.push({
id: (isFolder ? ""folder_id:"" : ""track_id:"") + i.id,
",12
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css .v-list__tile__title, .v-select__selection, .v-select__selection--comma {
font-size:var(--std-font-size);
+ font-weight:var(--std-weight);
}
.v-list__tile__sub-title, .v-btn__content, .v-select__slot .v-label {
font-size:var(--small-font-size);
+ font-weight:var(--std-weight);
}
.v-text-field, .v-select__slot .v-label, .v-input .v-label {
@@ -44,6 +46,7 @@ html {
overflow-y:hidden;
margin:0px;
font-size:var(--std-font-size);
+ font-weight:var(--std-weight);
}
body {
@@ -371,6 +374,7 @@ a {
.maintoolbar-title {
font-size:var(--std-font-size) !important;
+ font-weight:var(--bold-weight);
}
.noplayer-title {
",12
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -131,7 +131,7 @@ Vue.component('lms-toolbar', {
<v-btn icon v-if=""!desktop && ( (isNowPlayingPage && (infoOpen || !infoPlugin)) || !isNowPlayingPage)"" @click.stop=""playPauseButton"" class=""toolbar-button"" id=""pp"">
<v-icon>{{playerStatus.isplaying ? 'pause_circle_outline' : 'play_circle_outline'}}</v-icon>
</v-btn>
- <v-btn icon :title=""trans.info"" v-if=""desktop && infoPlugin && !mini && !nowplaying"" @click.native=""emitInfo"" class=""toolbar-button"">
+ <v-btn icon :title=""trans.info | tooltip(trans.infoShortcut,keyboardControl)"" v-if=""desktop && infoPlugin && !mini && !nowplaying"" @click.native=""emitInfo"" class=""toolbar-button"">
<v-icon>info_outline</v-icon>
</v-btn>
<v-btn icon :title=""trans.showLarge"" v-if=""desktop && !largeView && !mini && !nowplaying"" @click.native=""toggleLargeView(true)"" class=""toolbar-button"">
",12
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -270,7 +270,7 @@ Vue.component('lms-toolbar', {
if (this.desktop) {
bus.$on('playerChanged', function() {
// Ensure we update volume when player changes.
- this.playerVolume.id = undefined;
+ this.playerVolume = undefined;
}.bind(this));
}
",12
"diff --git a/MaterialSkin/HTML/material/html/js/main.js b/MaterialSkin/HTML/material/html/js/main.js @@ -316,6 +316,7 @@ var app = new Vue({
var that = this;
this.splitter = Split([that.$refs.left, that.$refs.right], {
sizes: [this.splitterPercent, 100-this.splitterPercent],
+ minSize: Math.floor(LMS_MIN_DESKTOP_WIDTH/2),
gutterSize: 3,
gutterAlign: 'center',
snapOffset: 5,
",12
"diff --git a/MaterialSkin/HTML/material/html/js/queue-page.js b/MaterialSkin/HTML/material/html/js/queue-page.js @@ -399,6 +399,9 @@ var lmsQueue = Vue.component(""lms-queue"", {
this.playlistName=playerStatus.playlist.name;
if (playerStatus.playlist.timestamp!=this.timestamp || (playerStatus.playlist.timestamp>0 && this.items.length<1) ||
(playerStatus.playlist.timestamp<=0 && this.items.length>0) || this.listSize!=playerStatus.playlist.count) {
+ if (playerStatus.playlist.current!=this.currentIndex) {
+ this.autoScrollRequired = true;
+ }
this.currentIndex = playerStatus.playlist.current;
this.timestamp = playerStatus.playlist.timestamp;
this.updateItems();
",12
"diff --git a/MaterialSkin/HTML/material/html/css/style.css b/MaterialSkin/HTML/material/html/css/style.css @@ -162,6 +162,14 @@ html, .mini-player {
max-width:10px;
}
+::-webkit-scrollbar-thumb:vertical {
+ min-height:64px;
+}
+
+::-webkit-scrollbar-thumb:horizontal {
+ min-width:64px;
+}
+
html {
overflow-y:hidden;
margin:0px;
",12
"diff --git a/MaterialSkin/HTML/material/html/js/constants.js b/MaterialSkin/HTML/material/html/js/constants.js const LMS_BATCH_SIZE = 25000;
const LMS_QUEUE_BATCH_SIZE = 500;
-const LMS_MAX_NON_SCROLLER_ITEMS = 200;
+const LMS_MAX_NON_SCROLLER_ITEMS = 75;
const LMS_MAX_PLAYERS = 100;
const LMS_IMAGE_SZ = 300
const LMS_IMAGE_SIZE = ""_""+LMS_IMAGE_SZ+""x""+LMS_IMAGE_SZ+""_f"";
",12
"diff --git a/MaterialSkin/HTML/material/html/js/constants.js b/MaterialSkin/HTML/material/html/js/constants.js const LMS_BATCH_SIZE = 25000;
const LMS_QUEUE_BATCH_SIZE = 500;
-const LMS_MAX_NON_SCROLLER_ITEMS = 75;
+const LMS_MAX_NON_SCROLLER_ITEMS = 100;
const LMS_MAX_PLAYERS = 100;
const LMS_IMAGE_SZ = 300
const LMS_IMAGE_SIZE = ""_""+LMS_IMAGE_SZ+""x""+LMS_IMAGE_SZ+""_f"";
",12
"diff --git a/MaterialSkin/HTML/material/html/js/manage-players.js b/MaterialSkin/HTML/material/html/js/manage-players.js @@ -96,7 +96,7 @@ Vue.component('lms-manage-players', {
<img :key=""player.image"" v-lazy=""player.image""></img>
</v-list-tile-avatar>
<v-list-tile-content>
- <v-list-tile-title style=""cursor:pointer"" @click=""setActive(player.id)""><v-icon v-if=""player.icon.icon"" class=""pmgr-icon"" v-bind:class=""{'active-btn':currentPlayer && currentPlayer.id==player.id}"">{{player.icon.icon}}</v-icon><img v-else class=""pmgr-icon svg-img"" :src=""player.icon.svg | svgIcon(darkUi, currentPlayer && currentPlayer.id==player.id)""></img>
+ <v-list-tile-title style=""cursor:pointer"" @click=""setActive(player.id)""><v-icon v-if=""player.icon.icon"" class=""pmgr-icon"" v-bind:class=""{'active-btn':currentPlayer && currentPlayer.id==player.id}"" :id=""'pmgr-player-'+index"">{{player.icon.icon}}</v-icon><img v-else class=""pmgr-icon svg-img"" :src=""player.icon.svg | svgIcon(darkUi, currentPlayer && currentPlayer.id==player.id)"" :id=""'pmgr-player-'+index""></img>
{{player.name}}<v-icon v-if=""player.id==defaultPlayer"" class=""player-status-icon"">check</v-icon><v-icon v-if=""player.will_sleep_in"" class=""player-status-icon"">hotel</v-icon></v-list-tile-title>
<v-list-tile-sub-title v-if=""isMainPlayer(player)"" v-bind:class=""{'dimmed': !player.ison}"">{{player.track}}</v-list-tile-sub-title>
</v-list-tile-content>
@@ -571,6 +571,7 @@ Vue.component('lms-manage-players', {
dragStart(which, ev) {
ev.dataTransfer.dropEffect = 'move';
ev.dataTransfer.setData('Text', ""player:""+which);
+ ev.dataTransfer.setDragImage(document.getElementById(""pmgr-player-""+which), 0, 0);
this.dragIndex = which;
this.stopScrolling = false;
this.draggingSyncedPlayer = this.players[which].issyncmaster || undefined!=this.players[which].syncmaster;
",12
"diff --git a/MaterialSkin/HTML/material/html/js/search-field.js b/MaterialSkin/HTML/material/html/js/search-field.js @@ -55,7 +55,7 @@ Vue.component('lms-search-field', {
stopDebounce() {
if (undefined!=this.debounceTimer) {
clearTimeout(this.debounceTimer);
- this.debounceTimer;
+ this.debounceTimer = undefined;
}
},
advanced() {
",12
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -145,6 +145,7 @@ function parseBrowseResp(data, parent, options, cacheKey, parentCommand, parentG
i.text = undefined;
i.image = resolveImage(i.icon ? i.icon : i[""icon-id""], undefined, LMS_IMAGE_SIZE);
+ i.icon = undefined;
if (!i.image && i.commonParams && i.commonParams.album_id) {
i.image = resolveImage(""music/0/cover"" + LMS_IMAGE_SIZE);
",12
"diff --git a/MaterialSkin/Plugin.pm b/MaterialSkin/Plugin.pm @@ -72,6 +72,8 @@ sub initPlugin {
if (my $bandgenres = $prefs->get('bandgenres')) {
$prefs->set('bandgenres', $DEFAULT_BAND_GENRES) if $bandgenres eq '';
+ } else {
+ $prefs->set('bandgenres', $DEFAULT_BAND_GENRES);
}
$prefs->init({
",12
"diff --git a/MaterialSkin/HTML/material/html/js/iframe-dialog.js b/MaterialSkin/HTML/material/html/js/iframe-dialog.js @@ -165,7 +165,7 @@ function hideClassicSkinElems(page, textCol) {
selector.addEventListener(""change"", selectChanged);
selectChanged();
}
- } else if ('other'==page || 'extra'==page) {
+ } else if ('other'==page || 'lms'==page) {
if (content) {
if (content.addEventListener) {
content.addEventListener('click', otherClickHandler);
@@ -252,8 +252,8 @@ Vue.component('lms-iframe-dialog', {
? ""player""
: page.indexOf(""server/basic.html"")>0
? ""server""
- : page.startsWith(""plugins/"") && (page.indexOf(""?player="")>0 || page.indexOf(""&player="")>0)
- ? ""extra""
+ : (page == '/material/html/docs/index.html') || (page.startsWith(""plugins/"") && (page.indexOf(""?player="")>0 || page.indexOf(""&player="")>0))
+ ? ""lms"" // tech info, or 'extra' entry
: ""other"";
this.show = true;
this.showMenu = false;
",12
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -1555,7 +1555,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
var len = this.history.length;
this.click(item);
if (this.history.length>len) {
- this.prevPage = NP_INFO;
+ this.prevPage = page;
}
} else {
this.fetchItems(this.replaceCommandTerms({command:cmd, params:params}), {cancache:false, id:params[0], title:title, stdItem:params[0].startsWith(""artist_id:"") ? STD_ITEM_ARTIST : STD_ITEM_ALBUM}, page);
",12
"diff --git a/MaterialSkin/HTML/material/standardheader.html b/MaterialSkin/HTML/material/standardheader.html <title>[% IF pagetitle %][% pagetitle | html -%][% ELSE %][% ""SQUEEZEBOX_SERVER"" | string %][% END -%]</title>
-<link rel=""shortcut icon"" href=""[% webroot %]favicon.ico"" type=""image/x-icon""/>
-<link rel=""icon"" href=""[% webroot %]favicon.ico"" type=""image/x-icon""/>
+<link href=""/material/icon.png"" rel=""icon shortcut"" sizes=""128x128"">
+<link href=""/material/icon.png"" rel=""apple-touch-icon"" sizes=""128x128"">
<meta http-equiv=""Content-Type"" content=""text/html; charset=[% LOCALE %]""/>
<link rel=""stylesheet"" type=""text/css"" href=""[% webroot %]slimserver.css?r=[% revision %]""/>
<link rel=""stylesheet"" type=""text/css"" href=""[% webroot %]html/font/font.css?r=49""/>
",12
"diff --git a/MaterialSkin/HTML/material/index.html b/MaterialSkin/HTML/material/index.html <meta name=""mobile-web-app-capable"" content=""yes"">
<meta name=""apple-mobile-web-app-capable"" content=""yes"">
<meta name=""apple-mobile-web-app-status-bar-style"" content=""black"">
+ <meta name=""apple-mobile-web-app-title"" content=""Logitech Media Server"">
<meta name=""application-name"" content=""Logitech Media Server"">
</head>
<body>
",12
"diff --git a/MaterialSkin/HTML/material/index.html b/MaterialSkin/HTML/material/index.html <head>
<meta charset=""utf-8"" />
<meta name=""viewport"" content=""width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui"">
- <title>Logitech Media Server</title>
<link href=""html/font/font.css?r=49"" rel=""stylesheet"">
<!--CSS start-->
<link href=""html/lib/vuetify.min.css?r=1.5.24trim"" rel=""stylesheet"">
<!--CSS end-->
[% PERL %]
my $version=Plugins::MaterialSkin::Plugin->pluginVersion();
+ my $windowTitle=Plugins::MaterialSkin::Plugin->windowTitle();
my $ua=$stash->get('userAgent');
print(""<link href=\""html/css/themes/"");
# Keep in sync with store.js (defaultTheme)
print("" <link href=\""html/css/variant/standard.css?r=$version\"" rel=\""stylesheet\"" id=\""variantcss\"">\n"");
print("" <link href=\""html/css/colors/blue.css?r=$version\"" rel=\""stylesheet\"" id=\""colorcss\"">\n"");
print("" <link href=\""html/css/style.css?r=$version\"" rel=\""stylesheet\"">\n"");
- print("" <link href=\""html/css/mobile.css?r=$version\"" rel=\""stylesheet\"" id=\""layoutcss\"">"");
+ print("" <link href=\""html/css/mobile.css?r=$version\"" rel=\""stylesheet\"" id=\""layoutcss\"">\n"");
+ print("" <title>${windowTitle}</title>\n"");
+ print("" <meta name=\""apple-mobile-web-app-title\"" content=\""${windowTitle}\"">\n"");
+ print("" <meta name=\""application-name\"" content=\""${windowTitle}\"">"");
[% END %]
<link href=""/material/customcss/mobile"" rel=""stylesheet"" id=""customcss"">
<link href=""/material/material.webmanifest"" rel=""manifest"">
<meta name=""mobile-web-app-capable"" content=""yes"">
<meta name=""apple-mobile-web-app-capable"" content=""yes"">
<meta name=""apple-mobile-web-app-status-bar-style"" content=""black"">
- <meta name=""apple-mobile-web-app-title"" content=""Logitech Media Server"">
- <meta name=""application-name"" content=""Logitech Media Server"">
</head>
<body>
<div id=""app"" v-cloak>
[% PERL %]
my $version=Plugins::MaterialSkin::Plugin->pluginVersion();
my $windowTitle=Plugins::MaterialSkin::Plugin->windowTitle();
- print(""<script>const LMS_MATERIAL_REVISION=\""$version\""; const LMS_WINDOW_TITLE=\""$windowTitle\""; document.title = LMS_WINDOW_TITLE;</script>\n"");
+ print(""<script>const LMS_MATERIAL_REVISION=\""$version\""; const LMS_WINDOW_TITLE=\""$windowTitle\"";</script>\n"");
print("" <script src=\""html/lib/longpress.min.js?r=$version\""></script>\n"");
print("" <script src=\""html/js/actions.js?r=$version\""></script>\n"");
print("" <script src=\""html/js/constants.js?r=$version\""></script>\n"");
",12
"diff --git a/MaterialSkin/HTML/material/html/js/browse-page.js b/MaterialSkin/HTML/material/html/js/browse-page.js @@ -181,7 +181,7 @@ var lmsBrowse = Vue.component(""lms-browse"", {
</v-list-tile>
<v-list-tile v-else-if=""item.type=='search' || item.type=='entry'"" avatar :key=""item.id"" class=""lms-avatar lms-list-item"" :id=""'item'+index"" v-bind:class=""{'list-active': (menu.show && index==menu.index) || (fetchingItem==item.id)}"">
<v-list-tile-content>
- <text-field :focus=""index==0 && !IS_MOBILE"" :title=""item.title"" @value=""entry(item, $event)""></text-field>
+ <text-field :focus=""index==0 && !IS_MOBILE"" :title=""item.title"" :type=""item.type"" @value=""entry(item, $event)""></text-field>
</v-list-tile-content>
</v-list-tile>
<v-list-tile v-else-if=""!(isTop && (disabled.has(item.id) || hidden.has(item.id)))"" avatar @click=""click(item, index, $event)"" :key=""item.id"" class=""lms-avatar lms-list-item"" :id=""'item'+index"" @dragstart=""dragStart(index, $event)"" @dragend=""dragEnd()"" @dragover=""dragOver(index, $event)"" @drop=""drop(index, $event)"" :draggable=""(isTop && !sortHome) || (item.draggable && (current.section!=SECTION_FAVORITES || 0==selection.size))"" @contextmenu.prevent=""itemMenu(item, index, $event)"" v-bind:class=""{'drop-target': dragActive && index==dropIndex, 'list-active': (menu.show && index==menu.index) || (fetchingItem==item.id)}"">
",12
"diff --git a/MaterialSkin/HTML/material/html/js/browse-resp.js b/MaterialSkin/HTML/material/html/js/browse-resp.js @@ -184,7 +184,7 @@ function parseBrowseResp(data, parent, options, cacheKey, parentCommand, parentG
if (!i.type && !i.style && i.actions && i.actions.go && i.actions.go.params) {
for (var key in i.actions.go.params) {
if (i.actions.go.params[key]==TERM_PLACEHOLDER) {
- i.type = ""entry"";
+ i.type = key==""search"" ? key : ""entry"";
}
}
}
",12
"diff --git a/app/templates/components/payments/funds-recipient/details-form.hbs b/app/templates/components/payments/funds-recipient/details-form.hbs <div class=""input-section__label"">SSN Last 4</div>
<div class=""input-section__content"">
<div class=""input-group"">
- {{input type=""text"" name=""legal-entity-ssn-last-4"" value=stripeConnectAccount.legalEntitySsnLast4}}
+ {{input type=""text"" name=""legal-entity-ssn-last-4"" maxlength=""4"" value=stripeConnectAccount.legalEntitySsnLast4}}
</div>
</div>
</div>
",12
"diff --git a/app/routes/project-version/namespaces/namespace.js b/app/routes/project-version/namespaces/namespace.js import ClassRoute from '../classes/class';
export default ClassRoute.extend({
- templateName: 'project-version/class',
+ templateName: 'project-version/classes/class',
model(params, transition) {
return this.getModel('namespace', params, transition);
",12
"diff --git a/bin/ember-fastboot b/bin/ember-fastboot const FastBootAppServer = require('fastboot-app-server');
const ExpressHTTPServer = require('fastboot-app-server/src/express-http-server');
const parseArgs = require('minimist');
+const express = require('express');
const { URL } = require('url');
// Provide a title to the process in `ps`
@@ -26,7 +27,6 @@ if (!distPath) {
}
const serverOptions = {
- // assetsCacheControl: 'max-age=365000000, immutable',
distPath,
gzip: false, // Let Fastly take care of compression, reducing load on the fastboot
};
@@ -35,6 +35,12 @@ const httpServer = new ExpressHTTPServer(serverOptions);
const app = httpServer.app;
+app.use(express.static(distPath, {
+ setHeaders(res, path, stat) {
+ res.setHeader('Cache-Control', 'public, max-age=365000000, immutable');
+ }
+}));
+
/** We rewrite the 307 location header into a relativeURL so that our special setup is handled */
app.use(function(req, res, next) {
const originalSendFn = res.send;
",12
"diff --git a/.travis.yml b/.travis.yml @@ -12,7 +12,7 @@ cache:
yarn: true
before_install:
- - curl -o- -L https://yarnpkg.com/install.sh | bash
+ - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1
- export PATH=$HOME/.yarn/bin:$PATH
- yarn global add bower
",12
"diff --git a/test/protractor.ci.bs.conf.js b/test/protractor.ci.bs.conf.js @@ -40,6 +40,7 @@ exports.config = {
'browserstack.video': true,
'browserstack.local': false,
'browserstack.networkLogs': false,
+ 'browserstack.timezone': 'America/New_York',
build: browserstackBuildID,
name: `${theme} theme ci:bs e2e tests`,
project: 'ids-enterprise-e2e-ci'
",12
"diff --git a/.travis.yml b/.travis.yml @@ -19,6 +19,7 @@ install:
- npm install -g grunt-cli
- npm install
before_script:
+ - export TZ=America/New_York
- if [ $TEST_SUITE != lint ]; then npm run build; fi
script:
- if [ $TEST_SUITE = e2e ]; then (npm run quickstart &) && sleep 5; fi
",12
"diff --git a/src/components/tabs/tabs.js b/src/components/tabs/tabs.js @@ -2500,12 +2500,12 @@ Tabs.prototype = {
*/
this.element.trigger('close', [targetLi]);
- // If any tabs are left in the list, set the previous tab as the currently selected one.
+ // If any tabs are left in the list, set the first available tab as the currently selected one.
let count = targetLiIndex - 1;
while (count > -1) {
count = -1;
if (prevLi.is(notATab)) {
- prevLi = prevLi.prev();
+ prevLi = this.tablist.children('li').not(notATab)[0];
count -= 1;
}
}
@@ -2538,6 +2538,7 @@ Tabs.prototype = {
}
}
+ console.log(prevLi);
this.focusBar(prevLi);
a.focus();
",12
"diff --git a/package.json b/package.json {
""name"": ""ids-enterprise"",
""slug"": ""ids-enterprise"",
- ""version"": ""4.22.0-rc.0"",
+ ""version"": ""4.23.0-dev"",
""description"": ""Infor Design System (IDS) Enterprise Components for the web"",
""repository"": {
""type"": ""git"",
",12
"diff --git a/src/components/homepage/homepage.js b/src/components/homepage/homepage.js @@ -25,6 +25,7 @@ const HOMEPAGE_DEFAULTS = {
animate: true,
columns: 3,
editable: true,
+ editing = false, // Private
easing: 'blockslide', // Private
gutterSize: 20, // Private
widgetWidth: 360, // Private
@@ -34,7 +35,6 @@ const HOMEPAGE_DEFAULTS = {
function Homepage(element, settings) {
this.settings = utils.mergeSettings(element, settings, HOMEPAGE_DEFAULTS);
- this.editing = true; // Private
this.element = $(element);
debug.logTimeStart(COMPONENT_NAME);
this.init();
",12
"diff --git a/src/components/checkboxes/_checkboxes.scss b/src/components/checkboxes/_checkboxes.scss input.checkbox,
span.checkbox > input {
- left: -99999px;
+ left: 0;
opacity: 0;
- position: fixed;
+ position: absolute;
top: 0;
width: 16px;// use fixed, to prevent page jump on click
",12
"diff --git a/src/components/mask/masks.js b/src/components/mask/masks.js @@ -129,6 +129,8 @@ function addThousandsSeparator(n, thousands, options, localeStringOpts) {
zeros -= 1;
formatted = `0${formatted}`;
}
+ } else {
+ formatted = n;
}
return formatted;
@@ -170,6 +172,12 @@ masks.numberMask = function sohoNumberMask(rawValue, options) {
if (!options.locale || !options.locale.length) {
options.locale = Locale.currentLocale.name;
}
+
+ const dSeparator = Locale.getSeparator(options.locale, 'decimal');
+ if (dSeparator === ',') {
+ options.symbols.decimal = ',';
+ }
+
// Deprecated in v4.25.1
if (options.allowLeadingZeroes) {
warnAboutDeprecation('allowLeadingZeros', 'allowLeadingZeroes', 'Number Mask');
@@ -185,6 +193,9 @@ masks.numberMask = function sohoNumberMask(rawValue, options) {
const suffixLength = SUFFIX && SUFFIX.length || 0;
const thousandsSeparatorSymbolLength = THOUSANDS && THOUSANDS.length || 0;
+ console.log(THOUSANDS);
+ console.log(DECIMAL);
+
function numberMask(thisRawValue) {
if (typeof thisRawValue !== 'string') {
thisRawValue = masks.EMPTY_STRING;
@@ -249,6 +260,7 @@ masks.numberMask = function sohoNumberMask(rawValue, options) {
style: 'decimal',
useGrouping: true
};
+
integer = (options.allowThousandsSeparator) ?
addThousandsSeparator(integer, THOUSANDS, options, localeOptions) : integer;
",12
"diff --git a/src/utils/environment.js b/src/utils/environment.js @@ -273,6 +273,7 @@ const Environment = {
if (Environment.browser.isIPad()) {
const osVersionStr = nUAgent.substr(nUAgent.indexOf('Version'), nUAgent.substr(nUAgent.indexOf('Version')).indexOf(' '));
osVersion = osVersionStr.replace('Version/', '');
+ os = 'IOS';
}
this.devicespecs = {
",12
"diff --git a/package.json b/package.json ""e2e:puppeteer"": ""npx --no-install jest --config=test/jest.config.js --runInBand --detectOpenHandles --forceExit"",
""e2e:update-imagesnapshots"": ""npx --no-install jest --config=test/jest.config.js --updateSnapshot --runInBand --detectOpenHandles --forceExit"",
""webdriver:clean"": ""npx webdriver-manager clean"",
- ""webdriver:update"": ""npx webdriver-manager update --standalone false --quiet --gecko=false"",
+ ""webdriver:update"": ""npx webdriver-manager update --versions.chrome=98.0.4758.102 --standalone false --quiet --gecko=false"",
""zip-dist"": ""npx grunt zip-dist"",
""documentation"": ""node ./scripts/deploy-documentation.js"",
""release:dev"": ""node scripts/publish-nightly-manual"",
""node-version-check"": ""npx check-node-version --node 14"",
""node-updates-check"": ""npx ncu""
},
- ""chrome-version"": ""99"",
+ ""chrome-version"": ""98"",
""dependencies"": {
""d3"": ""^5.16.0"",
""ids-identity"": ""4.11.3"",
",12
"diff --git a/examples/manage.py b/examples/manage.py @@ -6,6 +6,7 @@ sys.path[0:0] = [os.path.abspath('..'), os.path.abspath('../../django-websocket-
if __name__ == ""__main__"":
os.environ.setdefault(""DJANGO_SETTINGS_MODULE"", ""server.settings"")
+ os.environ.setdefault('DJANGO_STATIC_ROOT', '/web/production/managed/djangular/static')
from django.core.management import execute_from_command_line
",12
"diff --git a/djng/forms/fields.py b/djng/forms/fields.py @@ -277,6 +277,11 @@ class MultipleFieldMixin(DefaultFieldMixin):
class ChoiceField(MultipleFieldMixin, fields.ChoiceField):
+ def __init__(self, *args, **kwargs):
+ super(ChoiceField, self).__init__(*args, **kwargs)
+ if isinstance(self.widget, widgets.Select) and self.initial is None and len(self.choices):
+ self.initial = self.choices[0][0]
+
def has_subwidgets(self):
return isinstance(self.widget, widgets.RadioSelect)
",12
"diff --git a/examples/server/forms/combined_validation.py b/examples/server/forms/combined_validation.py @@ -33,7 +33,9 @@ class SubscribeForm(NgModelFormMixin, NgFormValidationMixin, Bootstrap3Form):
sex = fields.ChoiceField(
choices=(('m', 'Male'), ('f', 'Female')),
widget=widgets.RadioSelect,
- error_messages={'invalid_choice': 'Please select your sex'})
+ required=True,
+ error_messages={'invalid_choice': 'Please select your sex'},
+ )
email = fields.EmailField(
label='E-Mail',
@@ -81,8 +83,10 @@ class SubscribeForm(NgModelFormMixin, NgFormValidationMixin, Bootstrap3Form):
notifyme = fields.MultipleChoiceField(
label='Notify by',
choices=NOTIFY_BY,
- widget=widgets.CheckboxSelectMultiple, required=True,
- help_text='Must choose at least one type of notification')
+ widget=widgets.CheckboxSelectMultiple,
+ required=True,
+ help_text='Must choose at least one type of notification',
+ )
annotation = fields.CharField(
label='Annotation',
@@ -98,6 +102,7 @@ class SubscribeForm(NgModelFormMixin, NgFormValidationMixin, Bootstrap3Form):
label='Password',
widget=widgets.PasswordInput,
validators=[validate_password],
+ min_length=6,
help_text='The password is ""secret""')
confirmation_key = fields.CharField(
@@ -126,4 +131,5 @@ default_subscribe_data = {
'notifyme': ['email', 'sms'],
'annotation': ""Lorem ipsum dolor sit amet, consectetur adipiscing elit."",
'agree': True,
+ 'password': '',
}
",12
"diff --git a/src/epics/fetch-dataset-epic.js b/src/epics/fetch-dataset-epic.js @@ -17,8 +17,7 @@ const fetchDatasetEpic = (action$, store) => {
return Observable
.ajax({ url: url, crossDomain: true, responseType: 'json' })
.map((result) => result.response )
- // .of(fakeData.slice(0, size)).delay(1000) // Fake AJAX call for now
- .map((data) => setDataset({ dataset: data }) )
+ .map((data) => setDataset({ dataset: data.dataset, configuration: data.configuration }) )
.concat(Observable.of(setHierarchyConfig([])))
// Ignore result if another request has started.
",12
"diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx @@ -210,6 +210,8 @@ class Blocks extends React.Component {
const dynamicBlocksXML = this.props.vm.runtime.getBlocksXML();
const toolboxXML = makeToolboxXML(dynamicBlocksXML);
this.props.onExtensionAdded(toolboxXML);
+ const categoryName = blocksInfo[0].json.category;
+ this.workspace.toolbox_.setSelectedCategoryByName(categoryName);
}
setBlocks (blocks) {
this.blocks = blocks;
",12
"diff --git a/src/components/sprite-info/sprite-info.jsx b/src/components/sprite-info/sprite-info.jsx @@ -56,6 +56,7 @@ class SpriteInfo extends React.Component {
<img
className={classNames(styles.xIcon, styles.icon)}
src={xIcon}
+ aria-hidden=""true""
/>
</div>
</MediaQuery>
@@ -78,6 +79,7 @@ class SpriteInfo extends React.Component {
<img
className={classNames(styles.yIcon, styles.icon)}
src={yIcon}
+ aria-hidden=""true""
/>
</div>
</MediaQuery>
",12
"diff --git a/.travis.yml b/.travis.yml @@ -36,3 +36,13 @@ deploy:
skip_cleanup: true
email: $NPM_EMAIL
api_key: $NPM_TOKEN
+- provider: s3
+ on:
+ branch: master
+ access_key_id: $AWS_ACCESS_KEY_ID
+ secret_access_key: $AWS_SECRET_ACCESS_KEY
+ bucket: $AWS_BUCKET_NAME
+ acl: public_read
+ detect_encoding: true
+ skip_cleanup: true
+ local_dir: build
",12
"diff --git a/.travis.yml b/.travis.yml @@ -6,7 +6,9 @@ addons:
node_js:
- 8
env:
+ global:
- NODE_ENV=production
+ - SMOKE_URL=https://llk.github.io/scratch-gui/$TRAVIS_PULL_REQUEST_BRANCH
cache:
directories:
- node_modules
@@ -19,7 +21,7 @@ before_deploy:
- git config --global user.name $(git log --pretty=format:""%an"" -n1)
script:
- npm test
-- if [ ""$TRAVIS_PULL_REQUEST"" != ""false"" ] && [ ""$TRAVIS_BRANCH"" == ""master"" ]; then npm run test:smoke; fi
+- if [ ""$TRAVIS_EVENT_TYPE"" == ""pull_request"" ] && [ ""$TRAVIS_BRANCH"" == ""master"" ]; then npm run test:smoke; fi
deploy:
- provider: script
on:
",12
"diff --git a/sheets/wsl.md b/sheets/wsl.md @@ -23,6 +23,15 @@ Change between WSL versions
wsl --set-version Debian 2
```
+## Set the default version of WSL
+
+When installing new Linux distros you can default them all to be WSL2
+or or one:
+
+```bash
+wsl --set-default-version 2
+```
+
## List installed WSL Distros
```bash
",12
"diff --git a/package.json b/package.json ""build"": ""npm run gen:syntax && browserify --standalone csstree lib/index.js | uglifyjs --compress --mangle -o dist/csstree.js"",
""codestyle-and-test"": ""npm run codestyle && npm test"",
""codestyle"": ""jscs data lib scripts test && eslint data lib scripts test"",
- ""test"": ""mocha --reporter dot"",
- ""coverage"": ""istanbul cover _mocha -- -R dot"",
+ ""test"": ""mocha --reporter progress"",
+ ""coverage"": ""istanbul cover _mocha -- -R min"",
""prepublish"": ""npm run build"",
""travis"": ""npm run codestyle-and-test && npm run coveralls"",
- ""coveralls"": ""istanbul cover _mocha --report lcovonly -- -R dot && cat ./coverage/lcov.info | coveralls"",
+ ""coveralls"": ""istanbul cover _mocha --report lcovonly -- -R min && cat ./coverage/lcov.info | coveralls"",
""hydrogen"": ""node --trace-hydrogen --trace-phase=Z --trace-deopt --code-comments --hydrogen-track-positions --redirect-code-traces --redirect-code-traces-to=code.asm --trace_hydrogen_file=code.cfg --print-opt-code bin/parse --stat -o /dev/null""
},
""dependencies"": {
",12
"diff --git a/package.json b/package.json ""test"": ""mocha --reporter progress"",
""gen:syntax"": ""node scripts/gen-syntax-data"",
""coverage"": ""istanbul cover _mocha -- -R min"",
- ""prepublish"": ""npm run build"",
+ ""prepublishOnly"": ""npm run build"",
""travis"": ""npm run lint-and-test && npm run coveralls"",
""coveralls"": ""istanbul cover _mocha --report lcovonly -- -R min && cat ./coverage/lcov.info | coveralls"",
""hydrogen"": ""node --trace-hydrogen --trace-phase=Z --trace-deopt --code-comments --hydrogen-track-positions --redirect-code-traces --redirect-code-traces-to=code.asm --trace_hydrogen_file=code.cfg --print-opt-code bin/parse --stat -o /dev/null""
",12
"diff --git a/package.json b/package.json ""format"": ""prettier --write \""src/**/*.js\"""",
""lint"": ""eslint ."",
""test"": ""echo \""Error: no test specified\"" && exit 1"",
- ""storybook"": ""start-storybook -p 6006 -s static"",
- ""build-storybook"": ""build-storybook -s static"",
+ ""storybook"": ""NODE_ENV=production start-storybook -p 6006 -s static"",
+ ""build-storybook"": ""NODE_ENV=production build-storybook -s static"",
""chromatic"": ""CHROMATIC_APP_CODE=dd2oqshntir chromatic test""
},
""devDependencies"": {
",12
"diff --git a/buildkite/src/Jobs/Lint/ValidationService.dhall b/buildkite/src/Jobs/Lint/ValidationService.dhall @@ -58,7 +58,7 @@ in Pipeline.build Pipeline.Config::{
commands = commands,
label = ""Validation service lint steps; employs various forms static analysis on the elixir codebase"",
key = ""lint"",
- target = Size.Large,
+ target = Size.Small,
docker = None Docker.Type
}
]
",12
"diff --git a/buildkite/src/Jobs/LintOpt.dhall b/buildkite/src/Jobs/LintOpt.dhall @@ -26,7 +26,9 @@ Pipeline.build
, steps =
[ Command.build
Command.Config::
- { commands = OpamInit.andThenRunInDocker [""CI=true"", ""BASE_BRANCH_NAME=$BUILDKITE_PULL_REQUEST_BASE_BRANCH"" ] ""./scripts/compare_ci_diff_types.sh""
+ { commands = [ Cmd.run ""git config http.sslVerify false"" ] # OpamInit.andThenRunInDocker
+ ([""CI=true"", ""BASE_BRANCH_NAME=$BUILDKITE_PULL_REQUEST_BASE_BRANCH"" ])
+ (""./scripts/compare_ci_diff_types.sh"")
, label = ""Compare CI diff types""
, key = ""lint-diff-types""
, target = Size.Medium
@@ -34,7 +36,9 @@ Pipeline.build
},
Command.build
Command.Config::
- { commands = OpamInit.andThenRunInDocker [""CI=true"", ""BASE_BRANCH_NAME=$BUILDKITE_PULL_REQUEST_BASE_BRANCH"" ] ""./scripts/compare_ci_diff_binables.sh""
+ { commands = [ Cmd.run ""git config http.sslVerify false"" ] # OpamInit.andThenRunInDocker
+ ([""CI=true"", ""BASE_BRANCH_NAME=$BUILDKITE_PULL_REQUEST_BASE_BRANCH"" ])
+ (""./scripts/compare_ci_diff_binables.sh"")
, label = ""Compare CI diff binables""
, key = ""lint-diff-binables""
, target = Size.Medium
",12
"diff --git a/scripts/archive/build-release-archives.sh b/scripts/archive/build-release-archives.sh @@ -98,7 +98,7 @@ if [ -n ""${BUILDKITE+x}"" ]; then
set -x
# Export variables for use with downstream steps
echo ""export CODA_SERVICE=coda-archive"" >> ./ARCHIVE_DOCKER_DEPLOY
- echo ""export CODA_VERSION=${VERSION}"" >> ./ARCHIVE_DOCKER_DEPLOY
+ echo ""export CODA_VERSION=${DOCKER_TAG}"" >> ./ARCHIVE_DOCKER_DEPLOY
echo ""export CODA_DEB_VERSION=${VERSION}"" >> ./ARCHIVE_DOCKER_DEPLOY
echo ""export CODA_DEB_REPO=${CODENAME}"" >> ./ARCHIVE_DOCKER_DEPLOY
echo ""export CODA_GIT_HASH=${GITHASH}"" >> ./ARCHIVE_DOCKER_DEPLOY
",12
"diff --git a/src/app/archive/archive_lib/processor.ml b/src/app/archive/archive_lib/processor.ml @@ -810,6 +810,15 @@ module Block = struct
~protocol_state:t.protocol_state ~staged_ledger_diff:t.staged_ledger_diff
~hash:(Protocol_state.hash t.protocol_state)
+ let set_parent_id_if_null (module Conn : CONNECTION) ~parent_hash
+ ~(parent_id : int) =
+ Conn.exec
+ (Caqti_request.exec
+ Caqti_type.(tup2 int string)
+ ""UPDATE blocks SET parent_id = ? WHERE parent_hash = ? AND parent_id \
+ IS NULL"")
+ (parent_id, State_hash.to_base58_check parent_hash)
+
let delete_if_older_than ?height ?num_blocks ?timestamp
(module Conn : CONNECTION) =
let open Deferred.Result.Let_syntax in
@@ -897,11 +906,19 @@ let run (module Conn : CONNECTION) reader ~constraint_constants ~logger
match%bind
let open Deferred.Result.Let_syntax in
let%bind () = Conn.start () in
- let%bind _ =
+ let%bind block_id =
Block.add_if_doesn't_exist ~constraint_constants
(module Conn)
block
in
+ (* if an existing block has a parent hash that's for the block just added,
+ set its parent id
+ *)
+ let%bind () =
+ Block.set_parent_id_if_null
+ (module Conn)
+ ~parent_hash:block.hash ~parent_id:block_id
+ in
match delete_older_than with
| Some num_blocks ->
Block.delete_if_older_than ~num_blocks (module Conn)
",12
"diff --git a/automation/terraform/modules/kubernetes/testnet/helm.tf b/automation/terraform/modules/kubernetes/testnet/helm.tf @@ -22,7 +22,7 @@ data ""local_file"" ""libp2p_peers"" {
}
locals {
- use_local_charts = true
+ use_local_charts = false
mina_helm_repo = ""https://coda-charts.storage.googleapis.com""
seed_peers = [
",12
"diff --git a/buildkite/src/Command/DeployTestnet.dhall b/buildkite/src/Command/DeployTestnet.dhall @@ -34,8 +34,8 @@ let testnetArtifactPath = ""/tmp/artifacts"" in
),
Cmd.run (
-- upload/cache testnet genesis_ledger
- ""BUILDKITE_ARTIFACT_UPLOAD_DESTINATION=gs://buildkite_k8s/coda/shared/\\\${BUILDKITE_JOB_ID}"" ++
- "" pushd ${testnetArtifactPath} && buildkite-agent artifact upload \""genesis_ledger.json\"" && popd""
+ ""pushd ${testnetArtifactPath} && BUILDKITE_ARTIFACT_UPLOAD_DESTINATION=gs://buildkite_k8s/coda/shared/\\\${BUILDKITE_JOB_ID}"" ++
+ "" buildkite-agent artifact upload \""genesis_ledger.json\"" && popd""
),
Cmd.run (
-- always execute post-deploy operation
",12
"diff --git a/automation/terraform/modules/o1-testnet/testnet.tf b/automation/terraform/modules/o1-testnet/testnet.tf @@ -54,7 +54,24 @@ module ""kubernetes_testnet"" {
seed_zone = var.seed_zone
seed_region = var.seed_region
- archive_configs = var.archive_configs
+ archive_configs = length(var.archive_configs) != 0 ? var.archive_configs : concat(
+ # by default, deploy a single local daemon and associated PostgresDB enabled archive server
+ [
+ {
+ name = ""archive-1""
+ enableLocalDaemon = true
+ enablePostgresDB = true
+ }
+ ],
+ # in addition to stand-alone archive servers upto the input archive node count
+ [
+ for i in range(2, var.archive_node_count + 1) : {
+ name = ""archive-${i}""
+ enableLocalDaemon = false
+ enablePostgresDB = false
+ }
+ ]
+ )
mina_archive_schema = var.mina_archive_schema
snark_worker_replicas = var.snark_worker_replicas
",12
"diff --git a/automation/terraform/testnets/mainnet/main.tf b/automation/terraform/testnets/mainnet/main.tf @@ -55,8 +55,8 @@ variable ""seed_count"" {
locals {
testnet_name = ""mainnet""
- coda_image = ""TODO"" # TODO
- coda_archive_image = ""TODO"" # TODO
+ coda_image = ""gcr.io/o1labs-192920/coda-daemon-baked:1.1.1-06691e3-mainnet-ffbe7e0""
+ coda_archive_image = ""gcr.io/o1labs-192920/coda-archive:1.1.1-06691e3""
seed_region = ""us-east4""
seed_zone = ""us-east4-b""
",12
"diff --git a/src/app/archive/archive_lib/metrics.ml b/src/app/archive/archive_lib/metrics.ml @@ -15,7 +15,7 @@ let default_missing_blocks_width = 2000
module Max_block_height = struct
let query =
Caqti_request.find Caqti_type.unit Caqti_type.int
- ""SELECT MAX(height) FROM blocks""
+ ""SELECT GREATEST(0, MAX(height)) FROM blocks""
let update (module Conn : Caqti_async.CONNECTION) metric_server =
time ~label:""max_block_height"" (fun () ->
",12
"diff --git a/src/app/archive/archive_lib/processor.ml b/src/app/archive/archive_lib/processor.ml @@ -1628,6 +1628,18 @@ module Block = struct
(Caqti_request.find Caqti_type.unit Caqti_type.(tup2 int int64)
""SELECT id,height FROM blocks WHERE chain_status='canonical' ORDER BY height DESC LIMIT 1"")
+ let get_nearest_canonical_block_above (module Conn : CONNECTION) height =
+ Conn.find
+ (Caqti_request.find Caqti_type.int64 Caqti_type.(tup2 int int64)
+ ""SELECT id,height FROM blocks WHERE chain_status='canonical' AND height > ? ORDER BY height ASC LIMIT 1"")
+ height
+
+ let get_nearest_canonical_block_below (module Conn : CONNECTION) height =
+ Conn.find
+ (Caqti_request.find Caqti_type.int64 Caqti_type.(tup2 int int64)
+ ""SELECT id,height FROM blocks WHERE chain_status='canonical' AND height < ? ORDER BY height DESC LIMIT 1"")
+ height
+
let mark_as_canonical (module Conn : CONNECTION) ~state_hash =
Conn.exec
(Caqti_request.exec Caqti_type.string
@@ -1651,18 +1663,27 @@ module Block = struct
let%bind highest_canonical_block_id,greatest_canonical_height =
get_highest_canonical_block (module Conn) () in
if Int64.(>) block.height (Int64.(+) greatest_canonical_height k_int64) then
- (* subchain between new block and highest canonical block *)
+ (* a new block, allows marking some pending blocks as canonical *)
let%bind subchain_blocks = get_subchain (module Conn) ~start_block_id:highest_canonical_block_id ~end_block_id:block_id in
let block_height_less_k_int64 = Int64.(-) block.height k_int64 in
(* mark canonical, orphaned blocks in subchain at least k behind the new block *)
let canonical_blocks = List.filter subchain_blocks ~f:(fun subchain_block ->
Int64.(<=) subchain_block.height block_height_less_k_int64) in
- let%map () = deferred_result_list_fold canonical_blocks ~init:() ~f:(fun () block ->
+ deferred_result_list_fold canonical_blocks ~init:() ~f:(fun () block ->
+ let%bind () = mark_as_canonical (module Conn) ~state_hash:block.state_hash in
+ mark_as_orphaned (module Conn) ~state_hash:block.state_hash ~height:block.height)
+ else if Int64.(<) block.height greatest_canonical_height then
+ (* a missing block added in the middle of canonical chain *)
+ let%bind canonical_block_above_id,_above_height = get_nearest_canonical_block_above (module Conn) block.height in
+ let%bind canonical_block_below_id,_below_height = get_nearest_canonical_block_below (module Conn) block.height in
+ (* we can always find this chain: the genesis block should be marked as canonical, and we've found a
+ canonical block above this one *)
+ let%bind canonical_blocks = get_subchain (module Conn) ~start_block_id:canonical_block_below_id ~end_block_id:canonical_block_above_id in
+ deferred_result_list_fold canonical_blocks ~init:() ~f:(fun () block ->
let%bind () = mark_as_canonical (module Conn) ~state_hash:block.state_hash in
mark_as_orphaned (module Conn) ~state_hash:block.state_hash ~height:block.height)
- in
- ()
else
+ (* a block at or above highest canonical block, not high enough to mark any blocks as canonical *)
Deferred.Result.return ()
let delete_if_older_than ?height ?num_blocks ?timestamp
",12
"diff --git a/src/lib/transaction_snark/test/zkapps_examples/initialize_state/initialize_state.ml b/src/lib/transaction_snark/test/zkapps_examples/initialize_state/initialize_state.ml @@ -60,6 +60,20 @@ let%test_module ""Initialize state test"" =
*)
Zkapp_account.digest_vk vk
}
+ ; permissions =
+ Set
+ { edit_state = Proof
+ ; send = Proof
+ ; receive = Proof
+ ; set_delegate = Proof
+ ; set_permissions = Proof
+ ; set_verification_key = Proof
+ ; set_zkapp_uri = Proof
+ ; edit_sequence_state = Proof
+ ; set_token_symbol = Proof
+ ; increment_nonce = Proof
+ ; set_voting_for = Proof
+ }
}
; use_full_commitment = true
; account_precondition = Accept
",12
"diff --git a/src/lib/mina_wire_types/mina_base/mina_base_signed_command.mli b/src/lib/mina_wire_types/mina_base/mina_base_signed_command.mli @@ -27,7 +27,7 @@ module With_valid_signature : sig
module M : sig
module Stable : sig
module V2 : sig
- type t = Stable.V2.t
+ type t = private Stable.V2.t
end
end
end
",12
"diff --git a/src/lib/transaction_snark/test/zkapps_examples/big_circuit/big_circuit.ml b/src/lib/transaction_snark/test/zkapps_examples/big_circuit/big_circuit.ml @@ -46,6 +46,7 @@ let deploy_account_update_body : Account_update.Body.t =
{ Account_update.Preconditions.network =
Zkapp_precondition.Protocol_state.accept
; account = Accept
+ ; valid_while = Ignore
}
; call_type = Call
; use_full_commitment = true
",12
"diff --git a/serverjs/util.js b/serverjs/util.js @@ -68,7 +68,8 @@ function addCardToCube(cube, card_details, idOverride) {
colors: card_details.color_identity,
cmc: card_details.cmc,
cardID: idOverride === undefined ? card_details._id : idOverride,
- type: card_details.type
+ type: card_details.type,
+ addedTmsp: new Date()
});
}
",12
"diff --git a/__tests__/serverjs/cubefn.test.js b/__tests__/serverjs/cubefn.test.js +var sinon = require(""sinon"");
const cubefn = require(""../../serverjs/cubefn"");
const carddb = require(""../../serverjs/cards"");
const cubefixture = require(""../../fixtures/examplecube"");
@@ -163,9 +164,14 @@ const exampleBasics = {
}
};
-beforeEach(() => {});
+beforeEach(() => {
+ sinon.stub(Cube, ""findOne"");
+});
-afterEach(() => {});
+afterEach(() => {
+ Cube.findOne.restore();
+ carddb.unloadCardDb();
+});
test(""get_cube_id returns urlAlias when defined"", () => {
const testCube = {
@@ -337,4 +343,17 @@ test(""setCubeType correctly sets the type and card_count of its input cube"", ()
test(""sanitize"", () => {});
test(""addAutocard"", () => {});
-test(""generatePack"", () => {});
\ No newline at end of file
+
+test(""generatePack"", () => {
+ expect.assertions(1);
+ const seed = new Date();
+ var exampleCube = JSON.parse(JSON.stringify(cubefixture.exampleCube));
+ var expected = {};
+ Cube.findOne.yields(null, exampleCube);
+ var callback = sinon.stub();
+ var promise = carddb.initializeCardDb(fixturesPath, true);
+ return promise.then(function() {
+ cubefn.generatePack('', carddb, seed, callback);
+ sinon.assert.calledWith(callback, expected)
+ });
+});
\ No newline at end of file
",12
"diff --git a/src/pages/BrowsePackagesPage.js b/src/pages/BrowsePackagesPage.js @@ -45,7 +45,7 @@ const BrowsePackagesPage = ({ user, loginCallback }) => {
const [alerts, setAlerts] = useState([]);
const [page, setPage] = useQueryParam('p', 0);
const [filter, setFilter] = useQueryParam('f', '');
- const [filterTemp, setFilterTemp] = useState(filter);
+ const [filterTemp, setFilterTemp] = useState('');
const [sort, setSort] = useQueryParam('s', 'votes');
const [sortDirection, setSortDirection] = useQueryParam('d', '-1');
const [selectedTab, setSelectedTab] = useQueryParam('tab', '0');
@@ -82,7 +82,7 @@ const BrowsePackagesPage = ({ user, loginCallback }) => {
}
return [];
};
- fetchData();
+ fetchData().then(() => setFilterTemp(filter));
}, [filter, page, sort, sortDirection, selectedTab, refresh, setRefresh]);
return (
",12
"diff --git a/src/pages/CubePlaytestPage.js b/src/pages/CubePlaytestPage.js @@ -585,7 +585,20 @@ CubePlaytestPage.propTypes = {
defaultDraftFormat: PropTypes.number,
_id: PropTypes.string.isRequired,
owner: PropTypes.string.isRequired,
- draft_formats: PropTypes.arrayOf(PropTypes.object),
+ draft_formats: PropTypes.shape({
+ title: PropTypes.string,
+ multiples: PropTypes.bool,
+ markdown: PropTypes.string.isRequired,
+ packs: PropTypes.arrayOf(
+ PropTypes.shape({
+ slots: PropTypes.arrayOf(PropTypes.string.isRequired).isRequired,
+ steps: PropTypes.shape({
+ action: PropTypes.oneOf(['pass', 'pick', 'trash', 'pickrandom', 'trashrandom']),
+ amount: PropTypes.number,
+ }),
+ }).isRequired,
+ ).isRequired,
+ }).isRequired,
}).isRequired,
decks: PropTypes.arrayOf(DeckPropType).isRequired,
user: UserPropType,
",12
"diff --git a/src/extensions/export/bootstrap-table-export.js b/src/extensions/export/bootstrap-table-export.js @@ -86,6 +86,41 @@ $.BootstrapTable = class extends $.BootstrapTable {
let $menu = $(this.constants.html.toolbarDropdown.join(''))
+ let exportTypes = o.exportTypes
+
+ if (typeof exportTypes === 'string') {
+ const types = exportTypes.slice(1, -1).replace(/ /g, '').split(',')
+ exportTypes = types.map(t => t.slice(1, -1))
+ }
+
+ if (exportTypes.length === 1) {
+ this.$export = $(`
+ <div class=""export"">
+ <button class=""${this.constants.buttonsClass}""
+ aria-label=""Export""
+ type=""button""
+ title=""${o.formatExport()}"">
+ ${o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.export) : ''}
+ ${o.showButtonText ? o.formatExport() : ''}
+ </button>
+ </div>
+ `).appendTo($btnGroup)
+
+ this.updateExportButton()
+
+ $btnGroup.click(e => {
+ e.preventDefault()
+
+ const type = exportTypes[0]
+ const exportOptions = {
+ type,
+ escape: false
+ }
+
+ this.exportTable(exportOptions)
+ })
+ }
+ else {
this.$export = $(`
<div class=""export ${this.constants.classes.buttonsDropdown}"">
<button class=""${this.constants.buttonsClass} dropdown-toggle""
@@ -103,13 +138,6 @@ $.BootstrapTable = class extends $.BootstrapTable {
this.updateExportButton()
- let exportTypes = o.exportTypes
-
- if (typeof exportTypes === 'string') {
- const types = exportTypes.slice(1, -1).replace(/ /g, '').split(',')
- exportTypes = types.map(t => t.slice(1, -1))
- }
-
// themes support
if ($menu.children().length) {
$menu = $menu.children().eq(0)
@@ -134,6 +162,7 @@ $.BootstrapTable = class extends $.BootstrapTable {
this.exportTable(exportOptions)
})
+ }
this.handleToolbar()
}
",12
"diff --git a/src/extensions/filter-control/bootstrap-table-filter-control.js b/src/extensions/filter-control/bootstrap-table-filter-control.js @@ -67,9 +67,7 @@ const UtilsFilterControl = {
$selectControl.append($opts)
},
existOptionInSelectControl (selectControl, value) {
- const options = UtilsFilterControl.getOptionsFromSelectControl(
- selectControl
- )
+ const options = UtilsFilterControl.getOptionsFromSelectControl(selectControl)
for (let i = 0; i < options.length; i++) {
if (options[i].value === value.toString()) {
// The value is not valid to add
@@ -245,7 +243,7 @@ const UtilsFilterControl = {
const uniqueValues = {}
for (let i = 0; i < z; i++) {
// Added a new value
- const fieldValue = data[i][field]
+ let fieldValue = data[i][field]
const formatter = that.options.editable && column.editable ? column._formatter : that.header.formatters[j]
let formattedValue = Utils.calculateObjectValue(that.header, formatter, [fieldValue, data[i], i], fieldValue)
@@ -253,10 +251,12 @@ const UtilsFilterControl = {
formattedValue = Utils.calculateObjectValue(that.header, column.filterDataCollector, [fieldValue, data[i], formattedValue], formattedValue)
}
+ if (column.searchFormatter) {
+ fieldValue = formattedValue
+ }
uniqueValues[formattedValue] = fieldValue
if (typeof formattedValue === 'object' && formattedValue !== null) {
-
formattedValue.forEach((value) => {
UtilsFilterControl.addOptionToSelectControl(selectControl, value, value, column.filterDefault)
})
@@ -269,7 +269,6 @@ const UtilsFilterControl = {
}
UtilsFilterControl.sortSelectControl(selectControl, column.filterOrderBy)
-
if (that.options.hideUnusedSelectOptions) {
UtilsFilterControl.hideUnusedSelectOptions(selectControl, uniqueValues)
}
",12
"diff --git a/src/extensions/filter-control/bootstrap-table-filter-control.js b/src/extensions/filter-control/bootstrap-table-filter-control.js @@ -290,7 +290,10 @@ $.BootstrapTable = class extends $.BootstrapTable {
isValueExpected (searchValue, value, column, key) {
let tmpItemIsExpected = false
- if (column.filterStrictSearch) {
+ if (
+ column.filterStrictSearch ||
+ (column.filterControl === 'select' && column.passed.filterStrictSearch !== false)
+ ) {
tmpItemIsExpected = value.toString().toLowerCase() === searchValue.toString().toLowerCase()
} else if (column.filterStartsWithSearch) {
tmpItemIsExpected = (`${value}`).toLowerCase().indexOf(searchValue) === 0
",12
"diff --git a/src/extensions/filter-control/utils.js b/src/extensions/filter-control/utils.js @@ -411,8 +411,10 @@ export function createControls (that, header) {
that.filterColumnsPartial = {}
}
+ if (!(column.field in that.filterColumnsPartial)) {
that.filterColumnsPartial[column.field] = column.filterDefault
}
+ }
$.each(header.find('th'), (_, th) => {
const $th = $(th)
",12
"diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md @@ -269,7 +269,7 @@ Then add the block below to your `launch.json` file and put it inside the `.vsco
""request"": ""launch"",
""url"": ""http://localhost:3000"",
""webRoot"": ""${workspaceRoot}/src"",
- ""userDataDir"": ""${workspaceRoot}/.chrome"",
+ ""userDataDir"": ""${workspaceRoot}/.vscode/chrome"",
""sourceMapPathOverrides"": {
""webpack:///src/*"": ""${webRoot}/*""
}
",12
"diff --git a/packages/react-scripts/config/webpack.config.js b/packages/react-scripts/config/webpack.config.js @@ -75,6 +75,13 @@ module.exports = function(webpackEnv) {
? workspacesMainFields
: undefined;
+ const includePaths =
+ isEnvDevelopment && workspacesConfig.development
+ ? [paths.appSrc, ...workspacesConfig.paths]
+ : isEnvProduction && workspacesConfig.production
+ ? [paths.appSrc, ...workspacesConfig.paths]
+ : paths.appSrc;
+
// Webpack uses `publicPath` to determine where the app is being served from.
// It requires a trailing slash, or the file assets will get an incorrect path.
// In development, we always serve from the root. This makes config easier.
@@ -347,11 +354,7 @@ module.exports = function(webpackEnv) {
loader: require.resolve('eslint-loader'),
},
],
- include: isEnvDevelopment && workspacesConfig.development
- ? [paths.appSrc, workspacesConfig.paths]
- : isEnvProduction && workspacesConfig.production
- ? [paths.appSrc, workspacesConfig.paths]
- : paths.appSrc,
+ include: includePaths,
},
{
// ""oneOf"" will traverse all following loaders until one will
@@ -373,12 +376,7 @@ module.exports = function(webpackEnv) {
// The preset includes JSX, Flow, TypeScript, and some ESnext features.
{
test: /\.(js|mjs|jsx|ts|tsx)$/,
- include:
- isEnvDevelopment && workspacesConfig.development
- ? [paths.appSrc, workspacesConfig.paths]
- : isEnvProduction && workspacesConfig.production
- ? [paths.appSrc, workspacesConfig.paths]
- : paths.appSrc,
+ include: includePaths,
loader: require.resolve('babel-loader'),
options: {
customize: require.resolve(
@@ -661,6 +659,10 @@ module.exports = function(webpackEnv) {
typescript: resolve.sync('typescript', {
basedir: paths.appNodeModules,
}),
+ compilerOptions: {
+ skipLibCheck: true,
+ suppressOutputPathCheck: true,
+ },
async: isEnvDevelopment,
useTypescriptIncrementalApi: true,
checkSyntacticErrors: true,
@@ -672,7 +674,7 @@ module.exports = function(webpackEnv) {
'!**/src/setupProxy.*',
'!**/src/setupTests.*',
],
- watch: paths.appSrc,
+ watch: includePaths,
silent: true,
// The formatter is invoked directly in WebpackDevServerUtils during development
formatter: isEnvProduction ? typescriptFormatter : undefined,
",12
"diff --git a/packages/react-scripts/config/webpack.config.js b/packages/react-scripts/config/webpack.config.js @@ -39,6 +39,8 @@ const getCacheIdentifier = require('react-dev-utils/getCacheIdentifier');
// @remove-on-eject-end
const postcssNormalize = require('postcss-normalize');
+const appPackageJson = require(paths.appPackageJson);
+
// Source maps are resource heavy and can cause out of memory issue for large source files.
const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
// Some apps do not need the benefits of saving a web request, so not inlining the chunk
@@ -189,6 +191,9 @@ module.exports = function(webpackEnv) {
.replace(/\\/g, '/')
: isEnvDevelopment &&
(info => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')),
+ // Prevents conflicts when multiple Webpack runtimes (from different apps)
+ // are used on the same page.
+ jsonpFunction: `webpackJsonp${appPackageJson.name}`,
},
optimization: {
minimize: isEnvProduction,
@@ -197,7 +202,7 @@ module.exports = function(webpackEnv) {
new TerserPlugin({
terserOptions: {
parse: {
- // we want terser to parse ecma 8 code. However, we don't want it
+ // We want terser to parse ecma 8 code. However, we don't want it
// to apply any minification steps that turns valid ecma 5 code
// into invalid ecma 5 code. This is why the 'compress' and 'output'
// sections only apply transformations that are ecma 5 safe
",12
"diff --git a/packages/react-scripts/config/webpack.config.js b/packages/react-scripts/config/webpack.config.js @@ -62,7 +62,7 @@ module.exports = function(webpackEnv) {
const isEnvDevelopment = webpackEnv === 'development';
const isEnvProduction = webpackEnv === 'production';
- const workspacesMainFields = [workspacesConfig.packageEntry, 'main'];
+ const workspacesMainFields = [workspacesConfig.packageEntry, 'browser', 'module', 'main'];
const mainFields =
isEnvDevelopment && workspacesConfig.development
? workspacesMainFields
",12
"diff --git a/packages/react-scripts/config/webpack.config.js b/packages/react-scripts/config/webpack.config.js @@ -202,6 +202,9 @@ module.exports = function(webpackEnv) {
// Prevents conflicts when multiple Webpack runtimes (from different apps)
// are used on the same page.
jsonpFunction: `webpackJsonp${appPackageJson.name}`,
+ // this defaults to 'window', but by setting it to 'this' then
+ // module chunks which are built will work in web workers as well.
+ globalObject: 'this',
},
optimization: {
minimize: isEnvProduction,
",12
"diff --git a/packages/react-scripts/config/webpack.config.js b/packages/react-scripts/config/webpack.config.js @@ -62,6 +62,10 @@ const sassModuleRegex = /\.module\.(scss|sass)$/;
const workspacesConfig = yarnWorkspaces.init(paths);
+// Change directory to the workspace root, to resolve file paths in relation
+// to the workspace. Useful for backtracking errors, in context of the workspace root!
+process.chdir(workspacesConfig.root);
+
// This is the production and development configuration.
// It is focused on developer experience, fast rebuilds, and a minimal bundle.
module.exports = function(webpackEnv) {
",12
"diff --git a/pages/_document.js b/pages/_document.js @@ -6,7 +6,7 @@ import Document, { Head, Main, NextScript } from 'next/document';
export default class MyDocument extends Document {
render() {
return (
- <html>
+ <html lang=""en"">
<Head>
<link rel=""stylesheet"" href=""/_next/static/style.css"" />
</Head>
",12
"diff --git a/common/utils/cookie-utils.js b/common/utils/cookie-utils.js import jwt_decode from 'jwt-decode'; // eslint-disable-line camelcase
+const isProd = process.env.NODE_ENV !== 'development';
+
const cookieOptions = {
path: '/',
- domain: process.env.NODE_ENV === 'development' ? 'localhost' : 'operation-code.now.sh',
- httpOnly: true,
- sameSite: true,
- secure: true,
+ domain: isProd ? 'operation-code.now.sh' : 'localhost',
+ httpOnly: isProd,
+ sameSite: isProd,
+ secure: isProd,
};
export const setAuthCookies = (cookies, { token, user }) => {
",12
"diff --git a/common/utils/api-utils.js b/common/utils/api-utils.js import axios from 'axios';
+import cookie from 'js-cookie';
import { apiUrl } from 'common/config/environment';
export const OperationCodeAPI = axios.create({ baseURL: apiUrl });
-// TODO: Use cookies programatically in all HTTP requests
-// const setAuthorizationHeader = () => {
-// const cookies = new Cookies();
+const setAuthorizationHeader = () => {
+ const token = cookie.get('token');
-// const token = cookies.get('token');
+ if (token) {
+ return { Authorization: `bearer ${token}` };
+ }
-// if (token) {
-// return { Authorization: `bearer ${cookies.get('token')}` };
-// }
-
-// return {};
-// };
+ return {};
+};
export const get = async path => {
const result = await OperationCodeAPI.get(`/${path}`, {
- // headers: setAuthorizationHeader(),
+ headers: setAuthorizationHeader(),
});
+
return result;
};
export const post = async (path, body) => {
const result = await OperationCodeAPI.post(`/${path}`, body, {
- // headers: setAuthorizationHeader(),
+ headers: setAuthorizationHeader(),
});
+
return result;
};
export const patch = async (path, body) => {
const result = await OperationCodeAPI.patch(`/${path}`, body, {
- // headers: setAuthorizationHeader(),
+ headers: setAuthorizationHeader(),
});
+
return result;
};
",12
"diff --git a/components/Cards/SchoolCard/SchoolCard.js b/components/Cards/SchoolCard/SchoolCard.js @@ -56,7 +56,7 @@ export default class SchoolCard extends Component {
static defaultProps = {
hasHousing: false,
- isVetTecApproved: true,
+ isVetTecApproved: false,
};
toggleModalClick = () => {
",12
"diff --git a/js/cards.js b/js/cards.js $(document).on('click.card', '.card', function (e) {
if ($(this).find('> .card-reveal').length) {
+ if($(e.target).closest('.card').data('initialOverflow') === undefined){
+ $(e.target).closest('.card').data(
+ 'initialOverflow',
+ $(e.target).closest('.card').css('overflow') === undefined ? '' :$(e.target).closest('.card').css('overflow')
+ );
+ }
if ($(e.target).is($('.card-reveal .card-title')) || $(e.target).is($('.card-reveal .card-title i'))) {
// Make Reveal animate down and display none
$(this).find('.card-reveal').velocity(
duration: 225,
queue: false,
easing: 'easeInOutQuad',
- complete: function() { $(this).css({ display: 'none'}); }
+ complete: function() {
+ $(this).css({ display: 'none'});
+ $(e.target).closest('.card').css('overflow', $(e.target).closest('.card').data('initialOverflow'));
+ }
}
);
}
",12
"diff --git a/modules/geospatial-toolkit/docker/script/init_post.sh b/modules/geospatial-toolkit/docker/script/init_post.sh @@ -12,6 +12,7 @@ printf '%s\n' \
'PATH=""usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/lib/orfeo/bin""' \
'JAVA_HOME=""/usr/lib/jvm/java-8-oracle""' \
'GDAL_DATA=""/usr/share/gdal/2.1""' \
+ 'SEPAL=""true""' \
>> /etc/environment
# Remove redundant files
",12
"diff --git a/modules/geospatial-toolkit/docker/script/init_post.sh b/modules/geospatial-toolkit/docker/script/init_post.sh @@ -13,6 +13,17 @@ printf '%s\n' \
'JAVA_HOME=""/usr/lib/jvm/java-8-oracle""' \
'GDAL_DATA=""/usr/share/gdal/2.1""' \
'SEPAL=""true""' \
+ 'LC_ALL=""en_US.UTF-8""' \
+ 'LC_PAPER=""en_US.UTF-8""' \
+ 'LC_ADDRESS=""en_US.UTF-8""' \
+ 'LC_MONETARY=""en_US.UTF-8""' \
+ 'LC_NUMERIC=""en_US.UTF-8""' \
+ 'LC_TELEPHONE=""en_US.UTF-8""' \
+ 'LC_IDENTIFICATION=""en_US.UTF-8""' \
+ 'LC_MEASUREMENT=""en_US.UTF-8""' \
+ 'LC_TIME=""en_US.UTF-8""' \
+ 'LC_NAME=""en_US.UTF-8""' \
+ 'LANG=""en_US.UTF-8""' \
>> /etc/environment
# Remove redundant files
",12
"diff --git a/modules/google-earth-engine/docker/src/sepal/timeseries/download.py b/modules/google-earth-engine/docker/src/sepal/timeseries/download.py @@ -199,7 +199,10 @@ class DownloadFeature(ThreadTask):
tile_dirs = sorted([d for d in glob(join(self.feature_dir, '*')) if isdir(d)])
for tile_dir in tile_dirs:
self._tile_to_vrt(tile_dir)
- vrt = osgeo.gdal.BuildVRT(self.feature_dir + '/stack.vrt', sorted(glob(join(self.feature_dir, '*.vrt'))))
+ vrt = osgeo.gdal.BuildVRT(
+ self.feature_dir + '/stack.vrt', sorted(glob(join(self.feature_dir, '*.vrt'))),
+ VRTNodata=0
+ )
if vrt:
vrt.FlushCache()
@@ -211,12 +214,18 @@ class DownloadFeature(ThreadTask):
if tif_file:
for band_index in range(1, tif_file.RasterCount + 1):
tif_vrt_path = '{0}_{1}.vrt'.format(tif_path_no_extension, str(band_index).zfill(10))
- vrt = osgeo.gdal.BuildVRT(tif_vrt_path, tif_path, bandList=[band_index])
+ vrt = osgeo.gdal.BuildVRT(
+ tif_vrt_path, tif_path,
+ bandList=[band_index],
+ VRTNodata=0)
if vrt:
vrt.FlushCache()
stack_vrt_path = tile_dir + '_stack.vrt'
vrt_paths = sorted(glob(join(tile_dir, '*.vrt')))
- vrt = osgeo.gdal.BuildVRT(stack_vrt_path, vrt_paths, separate=True)
+ vrt = osgeo.gdal.BuildVRT(
+ stack_vrt_path, vrt_paths,
+ separate=True,
+ VRTNodata=0)
if vrt:
vrt.FlushCache()
@@ -351,12 +360,8 @@ class ProcessYear(ProcessTask):
tile_dir = abspath(join(parent_dir, tile))
subprocess.check_call(['mkdir', '-p', tile_dir])
subprocess.check_call(
- 'gdal_translate '
- '-co BIGTIFF=IF_NEEDED '
- '-a_nodata 0 '
- '{0} '
- '{1}'
- .format(abspath(join(self._year_dir, tif_name)), abspath(join(tile_dir, tif_name))).split(' '))
+ 'mv {0} {1}'.format(abspath(join(self._year_dir, tif_name)), abspath(join(tile_dir, tif_name))),
+ shell=True)
subprocess.check_call('mv {0} {1}'.format(join(self._year_dir, '*.csv'), parent_dir), shell=True)
subprocess.check_call('rm -rf {0}'.format(self._year_dir).split(' '))
",12
"diff --git a/modules/gui-react/frontend/src/user.js b/modules/gui-react/frontend/src/user.js @@ -6,7 +6,6 @@ import rx from 'rxjs'
export const loadingCurrentUser$ = named('LOADING_CURRENT_USER', new rx.Subject())
export const currentUser$ = named('CURRENT_USER', new rx.ReplaySubject(1))
export const loggingIn$ = named('LOGGING_IN', new rx.Subject())
-export const loggedIn$ = named('LOGGED_IN', new rx.Subject())
export const invalidCredentials$ = named('INVALID_CREDENTIALS', new rx.Subject())
export const loadCurrentUser = () => {
@@ -25,7 +24,7 @@ export const login = (username, password) => {
username: username,
password: password,
handle: {
- 200: (user) => loggedIn$.next(user),
+ 200: (user) => currentUser$.next(user),
401: () => invalidCredentials$.next()
},
}).catch((error) => httpCallFailed(error))
",12
"diff --git a/modules/google-earth-engine/docker/src/sepal/mosaic/analyze.py b/modules/google-earth-engine/docker/src/sepal/mosaic/analyze.py @@ -67,7 +67,7 @@ class _Analyze(ImageOperation):
'max(100 * pow(i.aerosol - 0.15, 2), 0)')
if self.mosaic_def.surface_reflectance:
- self.set('hazeScore', 0)
+ self.set('hazeScore', 1)
else:
self.set('hazeScore',
'max(1 - (i.hazeProbability + i.variabilityProbability + i.cirrusCloudProbability + i.aerosolProbability) / 10, 0)')
",12
"diff --git a/modules/gui-react/frontend/src/backend.js b/modules/gui-react/frontend/src/backend.js @@ -17,13 +17,14 @@ const transformRecipeForPreview = (recipe) => {
sensors: toSensors(recipe.sources),
targetDayOfYearWeight: 0,
shadowTolerance: 1,
- hazeTolerance: 0.5,
+ hazeTolerance: 1,
greennessWeight: 0,
bands: ['red', 'green', 'blue'],
- medianComposite: true,
+ surfaceReflectance: true,
+ medianComposite: false,
brdfCorrect: false,
maskClouds: false,
- maskSnow: true,
+ maskSnow: false,
type: 'automatic'
}
}
",12
"diff --git a/modules/gui-react/frontend/src/app/home/body/process/mosaic/panels/dates/dates.module.css b/modules/gui-react/frontend/src/app/home/body/process/mosaic/panels/dates/dates.module.css }
}
+.simpleLayout {
+ min-height: 9rem;
+}
+
.targetDateLabel {
grid-area: targetDateLabel;
margin-top: 0.2rem;
",12
"diff --git a/modules/gui-react/frontend/src/app/home/body/process/mosaic/mosaicRecipe.js b/modules/gui-react/frontend/src/app/home/body/process/mosaic/mosaicRecipe.js @@ -168,10 +168,13 @@ export const RecipeActions = (id) => {
setAutoSelectingScenes(selecting) {
return set('SET_AUTO_SELECTING_SCENES', 'ui.autoSelectingScenes', selecting, {selecting})
},
+ setAutoSelectSceneCount(sceneCount) {
+ return set('SET_SCENE_COUNT', 'ui.sceneCount', sceneCount, {sceneCount})
+ },
autoSelectScenes(sceneCount) {
this.setAutoSelectingScenes(true).dispatch()
RecipeEvents(id).autoSelectScenes$.next(sceneCount)
- return set('SET_SCENE_COUNT', 'ui.sceneCount', sceneCount, {sceneCount})
+ return this.setAutoSelectSceneCount(sceneCount)
}
}
}
@@ -215,7 +218,7 @@ const initRecipe = (recipe) => {
actions.setLabelsShown(false).dispatch()
actions.setSceneAreasShown(true).dispatch()
actions.setBands('red, green, blue').dispatch()
- actions.autoSelectScenes({min: 1, max: 99}).dispatch()
+ actions.setAutoSelectSceneCount({min: 1, max: 99}).dispatch()
}
const createAoi = (aoiForm) => {
",12
"diff --git a/hosting-services/vagrant/sepal/Vagrantfile b/hosting-services/vagrant/sepal/Vagrantfile @@ -6,6 +6,7 @@ project_dir = '../../..'
Vagrant.configure(2) do |config|
config.vm.network 'private_network', ip: ""#{ENV['VAGRANT_IP']}""
config.vm.box = 'ubuntu/trusty64'
+ config.disksize.size = ""64GB""
config.vm.synced_folder project_dir, '/opt/sepal/'
config.vm.provider 'virtualbox' do |v|
",12
"diff --git a/modules/gui/frontend/src/style/look.module.css b/modules/gui/frontend/src/style/look.module.css }
.look.default.chromeless {
+ color: var(--look-default-color);
background-color: transparent;
border-style: none;
}
}
.look.transparent.chromeless {
+ color: var(--look-default-color);
background-color: transparent;
border-style: none;
}
}
.look.highlight.chromeless {
+ color: var(--look-default-color);
background-color: transparent;
border-style: none;
}
}
.look.apply.chromeless {
+ color: var(--look-default-color);
background-color: transparent;
border-style: none;
}
}
.look.cancel.chromeless {
+ color: var(--look-default-color);
background-color: transparent;
border-style: none;
}
",12
"diff --git a/modules/sepal-server/src/main/resources/logback.xml b/modules/sepal-server/src/main/resources/logback.xml </encoder>
</appender>
- <logger name=""org.openforis"" additivity=""false"" level=""INFO"">
+ <logger name=""org.openforis"" additivity=""false"" level=""DEBUG"">
<appender-ref ref=""STDOUT""/>
</logger>
",12
"diff --git a/modules/google-earth-engine/docker/src/sepal/image/build_vrt.py b/modules/google-earth-engine/docker/src/sepal/image/build_vrt.py from glob import glob
-import osgeo.gdal
+from osgeo import gdal
from ..task.task import ThreadTask
@@ -16,7 +16,8 @@ class BuildVrt(ThreadTask):
files = glob(self.files)
else:
files = self.files
- vrt = osgeo.gdal.BuildVRT(self.output_file, files)
+ gdal.SetConfigOption('VRT_SHARED_SOURCE', '0')
+ vrt = gdal.BuildVRT(self.output_file, files)
if vrt:
vrt.FlushCache()
self.resolve()
",12
"diff --git a/modules/google-earth-engine/docker/sepal-ee/sepal/drive/__init__.py b/modules/google-earth-engine/docker/sepal-ee/sepal/drive/__init__.py +import logging
from threading import local
from apiclient import discovery
_local = local()
+logging.getLogger('googleapiclient').setLevel(logging.WARNING)
def get_service(credentials):
",12
"diff --git a/modules/google-earth-engine/docker/sepal-ee/sepal/ee/temporal_segmentation/segment.py b/modules/google-earth-engine/docker/sepal-ee/sepal/ee/temporal_segmentation/segment.py @@ -5,7 +5,7 @@ from . import date_conversion, harmonic_fit
class Segment(object):
- def __init__(self, segmentImage, dateFormat, defaultDate):
+ def __init__(self, segmentImage, dateFormat, defaultDate=None):
self.segmentImage = segmentImage
self.dateFormat = dateFormat
self.defaultDate = defaultDate
",12
"diff --git a/modules/google-earth-engine/docker/sepal-ee/sepal/ee/temporal_segmentation/segment.py b/modules/google-earth-engine/docker/sepal-ee/sepal/ee/temporal_segmentation/segment.py @@ -5,7 +5,7 @@ from . import date_conversion, harmonic_fit
class Segment(object):
- def __init__(self, segmentImage, dateFormat, defaultDate):
+ def __init__(self, segmentImage, dateFormat=0, defaultDate=None):
self.segmentImage = segmentImage
self.dateFormat = dateFormat
self.defaultDate = defaultDate
",12
"diff --git a/modules/ceo/docker/script/init_image.sh b/modules/ceo/docker/script/init_image.sh #!/usr/bin/env bash
set -e
-
-apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get install -y\
+export DEBIAN_FRONTEND=noninteractive
+apt-get -y update && apt-get install -y\
curl\
python3\
python3-pip\
",12
"diff --git a/lib/js/shared/src/terminal.js b/lib/js/shared/src/terminal.js @@ -2,10 +2,9 @@ const {spawn} = require('child_process')
const {Subject} = require('rxjs')
const log = require('sepal/log').getLogger('terminal')
-const terminal$ = (command, args = [], options) => {
+const terminal$ = (command, args = [], options = {encoding: 'utf8'}) => {
var subject = new Subject()
const buffer = !options || !options.encoding || options.encoding === 'buffer'
- console.log('****** buffer', buffer)
const toValue = data => buffer ? data : data.toString(options.encoding)
try {
const process = spawn(command, args, options)
",12
"diff --git a/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/apps/endpoint/AppsEndpoint.groovy b/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/apps/endpoint/AppsEndpoint.groovy @@ -49,6 +49,7 @@ class AppsEndpoint {
def lastModifiedDate = new Date(file.lastModified())
def lastModified = format.format(lastModifiedDate)
response.addHeader('Last-Modified', lastModified)
+ response.addHeader('Cache-Control', 'max-age=10, must-revalidate')
def ifModifiedSince = request.getHeader('If-Modified-Since')
if (ifModifiedSince && !lastModifiedDate.after(format.parse(ifModifiedSince))) {
response.status = 304
",12
"diff --git a/modules/sandbox/docker/script/start-jupyter.sh b/modules/sandbox/docker/script/start-jupyter.sh @@ -16,7 +16,7 @@ else
echo ""User $sandbox_user initialized""
fi
-sudo -iu $sandbox_user NODE_PATH=$NODE_PATH:`npm root -g`:`npm root` python3 /usr/local/bin/jupyter-notebook\
+sudo -iu $sandbox_user PROJ_LIB=/usr/share/proj NODE_PATH=$NODE_PATH:`npm root -g`:`npm root` python3 /usr/local/bin/jupyter-notebook\
--no-browser\
--allow-root\
--ip=0.0.0.0\
",12
"diff --git a/modules/geospatial-toolkit/docker/script/init_post.sh b/modules/geospatial-toolkit/docker/script/init_post.sh @@ -15,6 +15,7 @@ printf '%s\n' \
'GDAL_DATA=""/usr/share/gdal""' \
'SHELL=""/bin/bash""' \
'SEPAL=""true""' \
+ 'PROJ_LIB=""/usr/share/proj""' \
>> /etc/environment
# Remove redundant files
",12
"diff --git a/modules/gui/frontend/src/app/home/map/map.js b/modules/gui/frontend/src/app/home/map/map.js @@ -170,7 +170,7 @@ class _Map extends React.Component {
}
// used by aoi, map, collectPanel
- fitBounds(bounds, padding) {
+ fitBounds(bounds, padding = 0) {
const {googleMap} = this.state
const nextBounds = this.toGoogleBounds(bounds)
const currentBounds = googleMap.getBounds()
",12
"diff --git a/modules/gui/frontend/src/widget/searchBox.js b/modules/gui/frontend/src/widget/searchBox.js @@ -110,8 +110,9 @@ class _SearchBox extends React.Component {
}
componentDidMount() {
- const {onSearchValue, onSearchValues, debounce, addSubscription} = this.props
+ const {value, onSearchValue, onSearchValues, debounce, addSubscription} = this.props
const {search$, showOptions$} = this
+ this.setValue(value)
const debouncedShowOptions$ = merge(
showOptions$.pipe(
",12
"diff --git a/modules/gateway/docker/src/main.js b/modules/gateway/docker/src/main.js @@ -15,7 +15,7 @@ const sessionParser = session({
cookie: {
httpOnly: true,
maxAge: 1000 * 60 * 30,
- sameSite: true,
+ sameSite: false,
secure: false
},
proxy: true,
",12
"diff --git a/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/workerinstance/adapter/DockerInstanceProvisioner.groovy b/modules/sepal-server/src/main/groovy/org/openforis/sepal/component/workerinstance/adapter/DockerInstanceProvisioner.groovy @@ -102,7 +102,8 @@ class DockerInstanceProvisioner implements InstanceProvisioner {
},
Memory: memoryBytes,
MemorySwap: memoryBytes,
- KernelMemory: memoryBytes
+ KernelMemory: memoryBytes,
+ ShmSize: (long) instanceType.ramBytes / 2
],
ExposedPorts: image.exposedPorts.collectEntries {
[""$it/tcp"", [:]]
",12
"diff --git a/modules/app-manager/docker/src/apps.js b/modules/app-manager/docker/src/apps.js @@ -23,11 +23,12 @@ const apps$ = () =>
fileToJson$('/var/sepal/app-manager/apps.json').pipe(
switchMap(({apps}) => from(apps)),
filter(({repository}) => repository),
- map(({endpoint = 'shiny', repository, branch}) => {
+ map(({endpoint = 'shiny', label, repository, branch}) => {
const name = basename(repository)
return {
endpoint,
name,
+ label,
path: endpoint === 'jupyter'
? `/var/sepal/app-manager/apps/${name}`
: `/shiny/${name}`,
@@ -61,21 +62,22 @@ const useCustomKernel$ = ({endpoint, path}) =>
? exists$({path: join(path, 'requirements.txt')})
: of(false)
-const updateKernel$ = ({name, path}) => {
+const updateKernel$ = ({name, path, label}) => {
const kernelPath = join('/usr/local/share/jupyter/kernels', `venv-${name}`)
const venvPath = join(kernelPath, 'venv')
return exists$({path: kernelPath}).pipe(
- switchMap(kernelExists => kernelExists ? of(true) : createKernel$({path: kernelPath})),
+ switchMap(kernelExists => kernelExists ? of(true) : createKernel$({path: kernelPath, label})),
switchMap(() => exists$(venvPath)),
switchMap(venvExists => venvExists ? of(true) : createVenv$({path: venvPath})),
switchMap(() => installRequirements$({venvPath, requirementsPath: join(path, 'requirements.txt')}))
)
}
-const createKernel$ = ({path}) => {
+const createKernel$ = ({path, label}) => {
const venvPath = join(path, 'venv')
const kernel = {
'argv': [join(venvPath, 'bin/python3'), '-m', 'ipykernel_launcher', '-f', '{connection_file}'],
+ 'display_name': `App: ${label}`,
'language': 'python'
}
",12
"diff --git a/modules/gui/frontend/src/app/home/map/layer/googleMapsOverlay.js b/modules/gui/frontend/src/app/home/map/layer/googleMapsOverlay.js import {BalancingTileProvider} from '../tileProvider/balancingTileProvider'
-import {MAX_ZOOM, MIN_ZOOM} from '../maps'
+import {MAX_ZOOM} from '../maps'
import guid from 'guid'
// implements google.maps.MapType
@@ -7,7 +7,7 @@ export class GoogleMapsOverlay {
constructor(tileProvider, {
google,
name,
- minZoom = MIN_ZOOM,
+ minZoom = 0,
maxZoom = MAX_ZOOM,
} = {}, busy$) {
this.tileProvider = new BalancingTileProvider({tileProvider, retries: 3, busy$})
",12
"diff --git a/modules/gui/frontend/src/app/home/body/process/recipe/mosaic/panels/aoi/previewMap.js b/modules/gui/frontend/src/app/home/body/process/recipe/mosaic/panels/aoi/previewMap.js @@ -12,7 +12,7 @@ import styles from './previewMap.module.css'
const log = getLogger('previewMap')
const PREVIEW_MAP_OPTIONS = {
- minZoom: 1,
+ minZoom: 0,
zoom: 1,
gestureHandling: 'none',
draggableCursor: 'default'
",12
"diff --git a/modules/sandbox/script/start-jupyter.sh b/modules/sandbox/script/start-jupyter.sh @@ -33,4 +33,5 @@ sudo -iu $sandbox_user PATH=$PATH PROJ_LIB=/usr/share/proj NODE_PATH=$NODE_PATH:
--NotebookApp.base_url='/api/sandbox/jupyter/'\
--NotebookApp.notebook_dir=""/home/$sandbox_user""\
--FileContentsManager.delete_to_trash=False\
- --VoilaConfiguration.enable_nbextensions=True
+ --VoilaConfiguration.enable_nbextensions=True\
+ --VoilaConfiguration.show_tracebacks=True
",12
"diff --git a/packages/vega-view/src/transforms/Render.js b/packages/vega-view/src/transforms/Render.js @@ -25,4 +25,10 @@ prototype.transform = function(_, pulse) {
if (pulse.changed(pulse.MOD)) {
view.enqueue(pulse.materialize(pulse.MOD).mod);
}
+
+ // set z-index dirty flag as needed
+ if (pulse.fields && pulse.fields['zindex']) {
+ var item = pulse.source && pulse.source[0];
+ if (item) item.mark.zdirty = true;
+ }
};
",12
"diff --git a/packages/vega/package.json b/packages/vega/package.json ""vega-scenegraph"": ""^4.1.0"",
""vega-statistics"": ""^1.3.1"",
""vega-transforms"": ""^4.0.2"",
- ""vega-typings"": ""*"",
+ ""vega-typings"": ""^0.6.2"",
""vega-util"": ""^1.10.0"",
""vega-view"": ""^5.2.1"",
""vega-view-transforms"": ""^4.3.0"",
",12
"diff --git a/rnv-cli/src/platformTools/apple.js b/rnv-cli/src/platformTools/apple.js @@ -68,7 +68,7 @@ const _runXcodeProject = (c, platform, target) => new Promise((resolve, reject)
const appPath = getAppFolder(c, platform);
const device = c.program.device;
- const appFolderName = _getAppFolderName(platform);
+ const appFolderName = _getAppFolderName(c, platform);
const scheme = getConfigProp(c, platform, 'scheme');
const runScheme = getConfigProp(c, platform, 'runScheme');
const bundleIsDev = getConfigProp(c, platform, 'bundleIsDev') === true;
@@ -173,7 +173,7 @@ const _runXcodeProject = (c, platform, target) => new Promise((resolve, reject)
const archiveXcodeProject = (c, platform) => new Promise((resolve, reject) => {
logTask(`archiveXcodeProject:${platform}`);
- const appFolderName = _getAppFolderName(platform);
+ const appFolderName = _getAppFolderName(c, platform);
const sdk = platform === IOS ? 'iphoneos' : 'tvos';
const appPath = getAppFolder(c, platform);
@@ -236,7 +236,7 @@ const exportXcodeProject = (c, platform) => new Promise((resolve, reject) => {
const packageBundleForXcode = (c, platform, isDev = false) => {
logTask(`packageBundleForXcode:${platform}`);
- const appFolderName = _getAppFolderName(platform);
+ const appFolderName = _getAppFolderName(c, platform);
const appPath = path.join(getAppFolder(c, platform), appFolderName);
return executeAsync('react-native', [
@@ -257,7 +257,7 @@ const prepareXcodeProject = (c, platform) => new Promise((resolve, reject) => {
const device = c.program.device;
const ip = device ? getIP() : 'localhost';
const appFolder = getAppFolder(c, platform);
- const appFolderName = _getAppFolderName(platform);
+ const appFolderName = _getAppFolderName(c, platform);
const bundleAssets = getConfigProp(c, platform, 'bundleAssets') === true;
// CHECK TEAM ID IF DEVICE
@@ -296,7 +296,7 @@ const configureXcodeProject = (c, platform, ip, port) => new Promise((resolve, r
if (process.platform !== 'darwin') return;
if (!isPlatformActive(c, platform, resolve)) return;
- const appFolderName = _getAppFolderName(platform);
+ const appFolderName = _getAppFolderName(c, platform);
// configureIfRequired(c, platform)
// .then(() => copyAppleAssets(c, platform, appFolderName))
@@ -480,7 +480,13 @@ const _preConfigureProject = (c, platform, appFolderName, ip = 'localhost', port
});
});
-const _getAppFolderName = platform => (platform === IOS ? 'RNVApp' : 'RNVAppTVOS');
+const _getAppFolderName = (c, platform) => {
+ const projectFolder = getConfigProp(c, platform, 'projectFolder');
+ if (projectFolder) {
+ return projectFolder;
+ }
+ return (platform === IOS ? 'RNVApp' : 'RNVAppTVOS');
+};
const listAppleDevices = (c, platform) => new Promise((resolve, reject) => {
logTask(`listAppleDevices:${platform}`);
",12
"diff --git a/packages/app/renative.json b/packages/app/renative.json ]
},
""androidtv"": {
+ ""engine"": ""engine-rn-tvos"",
""includedPermissions"": [
""INTERNET""
]
},
""firetv"": {
+ ""engine"": ""engine-rn-tvos"",
""includedPermissions"": [
""INTERNET""
]
",12
"diff --git a/server/router/setup.go b/server/router/setup.go @@ -55,6 +55,7 @@ func (rt *router) postSetup(c *gin.Context) {
{
Email: req.EmailAddress,
Password: req.Password,
+ AdminLevel: persistence.AccountUserAdminLevelSuperAdmin,
Accounts: []string{accountID.String()},
},
},
",12
"diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -62,6 +62,14 @@ jobs:
steps:
- checkout
- setup_remote_docker
+ - run:
+ name: Set revision
+ command: |
+ if [ -z ""$CIRCLE_TAG"" ]; then
+ echo 'export OFFEN_GIT_REVISION=$(git rev-parse --short HEAD)' >> $BASH_ENV
+ else
+ echo 'export OFFEN_GIT_REVISION=$CIRCLE_TAG' >> $BASH_ENV
+ fi
- run:
name: Build binaries
command: |
@@ -152,17 +160,15 @@ jobs:
- attach_workspace:
at: ~/offen
- run:
- name: Set build environment
+ name: Set image tag
command: |
if [ -z ""$CIRCLE_TAG"" ]; then
- echo 'export OFFEN_GIT_REVISION=$(git rev-parse --short HEAD)' >> $BASH_ENV
if [ ""${CIRCLE_BRANCH}"" == ""master"" ]; then
echo 'export DOCKER_IMAGE_TAG=""stable""' >> $BASH_ENV
else
echo 'export DOCKER_IMAGE_TAG=""latest""' >> $BASH_ENV
fi
else
- echo 'export OFFEN_GIT_REVISION=$CIRCLE_TAG' >> $BASH_ENV
echo 'export DOCKER_IMAGE_TAG=$CIRCLE_TAG' >> $BASH_ENV
fi
- run:
",12
"diff --git a/src/commands/watch.js b/src/commands/watch.js @@ -19,7 +19,8 @@ export default asyncCommand({
},
host: {
description: 'Hostname to start a server on',
- default: '0.0.0.0'
+ default: '0.0.0.0',
+ alias: 'H'
},
https: {
description: 'Use HTTPS?',
",12
"diff --git a/Program.cs b/Program.cs using CefSharp;
using CefSharp.WinForms;
using System;
+using System.IO;
using System.Windows.Forms;
namespace VRCX
@@ -19,7 +20,7 @@ namespace VRCX
{
var settings = new CefSettings
{
- CachePath = ""cache"",
+ CachePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ""cache""),
PersistUserPreferences = true,
PersistSessionCookies = true,
WindowlessRenderingEnabled = true
",12
"diff --git a/contracts/token/VestedToken.sol b/contracts/token/VestedToken.sol @@ -45,7 +45,8 @@ contract VestedToken is StandardToken {
throw;
}
- TokenGrant memory grant = TokenGrant({start: _start, value: _value, cliff: _cliff, vesting: _vesting, granter: msg.sender});
+
+ TokenGrant memory grant = TokenGrant(msg.sender, _value, _cliff, _vesting, _start);
grants[_to].push(grant);
transfer(_to, _value);
",13
"diff --git a/app/styles/base/_grid-settings.scss b/app/styles/base/_grid-settings.scss @import ""neat-helpers""; // or ""../neat/neat-helpers"" when not in Rails
-
// Neat Overrides
// $column: 90px;
// $gutter: 30px;
// $grid-columns: 12;
// $max-width: 1088px;
-
// Neat Breakpoints
-$mobile-portrait-screen: em(480);
-$medium-screen: em(640);
-$large-screen: em(860);
-
+$mobile-portrait-screen: 30em; // 480px
+$medium-screen: 40em; // 640px
+$large-screen: 54em; // 864px
$medium-screen-up: new-breakpoint(min-width $medium-screen 4);
$medium-large-screen-up: new-breakpoint(min-width $medium-screen 8);
$large-screen-up: new-breakpoint(min-width $large-screen 8);
\ No newline at end of file
",13
"diff --git a/app/styles/components/_highlight.scss b/app/styles/components/_highlight.scss table {
border: none;
margin: 0;
+ table-layout: auto;
overflow: auto;
width: 100%;
z-index: auto;
@include size(52px 20px);
background: 0 0 no-repeat;
background-size: 52px 20px;
- background-color: $code-background;
z-index: 9;
}
",13
"diff --git a/src/components/colorpicker/colorpicker.js b/src/components/colorpicker/colorpicker.js @@ -114,7 +114,7 @@ const COLORPICKER_DEFAULTS = {
{ label: 'Azure', number: '05', value: '4EA0D1' },
{ label: 'Azure', number: '04', value: '69B5DD' },
{ label: 'Azure', number: '03', value: '8DC9E6' },
- { label: 'Azure', number: '02', value: 'ADDBEB' },
+ { label: 'Azure', number: '02', value: 'ADD8EB' },
{ label: 'Azure', number: '01', value: 'C8E9F4' }
],
placeIn: null, // null|'editor'
",13
"diff --git a/src/components/accordion/_accordion.scss b/src/components/accordion/_accordion.scss > [class^=""btn""] {
@include btn-chevron-style;
- &:focus:not(.hide-focus) {
- border-color: transparent;
- box-shadow: none;
- }
}
> [class^=""btn""],
// Selected color scheme
&.is-focused:not(.hide-focus) {
- border-color: none;
- box-shadow: none;
+ border-color: $accordion-focused-border-color;
+ box-shadow: $focus-box-shadow;
}
&.has-chevron {
",13
"diff --git a/src/components/trackdirty/trackdirty.js b/src/components/trackdirty/trackdirty.js @@ -184,10 +184,10 @@ Trackdirty.prototype = {
if (!d.icon.is('.icon-dirty')) {
if (input.is('[type=""checkbox""]')) {
d.rect = this.getAbsolutePosition(label);
- d.style = `left:${d.rect.left}px; top:${d.rect.top}px`;
+ d.style = `left:${d.rect.left}px; top:${d.rect.top}px;`;
} else if (input.is('.colorpicker') && !Locale.isRTL()) {
d.rect = this.getAbsolutePosition(input);
- d.style = `left:${d.rect.left}px; top:${d.rect.top}px`;
+ d.style = `left:${d.rect.left}px; top:${d.rect.top}px;`;
}
d.icon = `<span class=""icon-dirty${d.class}""></span>`;
d.msg = Locale.translate('MsgDirty') || '';
",13
"diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js @@ -594,14 +594,19 @@ Modal.prototype = {
$(this.element).on('keypress.modal', (e) => {
const target = $(e.target);
- if (target.is('editor, .searchfield, textarea, :button') || target.closest('.tab-list').length || $('#dropdown-list').length) {
+ if (target.is('.editor, .searchfield, textarea, :button') || target.closest('.tab-list').length || $('#dropdown-list').length) {
return;
}
if (e.which === 13 && this.isOnTop() &&
!target.closest('form').find(':submit').length &&
this.element.find('.btn-modal-primary:enabled').length) {
- return;
+ e.stopPropagation();
+ e.preventDefault();
+
+ if ((!target.hasClass('fileupload') && !$(target).is(':input')) || target.hasClass('colorpicker')) {
+ this.element.find('.btn-modal-primary:enabled').trigger('click');
+ }
}
});
",13
"diff --git a/src/components/monthview/monthview.js b/src/components/monthview/monthview.js @@ -56,6 +56,7 @@ const COMPONENT_NAME_DEFAULTS = {
* @param {number} [settings.isPopup] Is it in a popup (datepicker using it)
* @param {number} [settings.headerStyle] Configure the header, this can be 'simple' or 'full'. Full adds a picker and today link.
* @param {number} [settings.firstDayOfWeek=null] Set first day of the week. '1' would be Monday.
+ * @param {object} [settings.disable] Disable dates in various ways.
* For example `{minDate: 'M/d/yyyy', maxDate: 'M/d/yyyy'}`. Dates should be in format M/d/yyyy
* or be a Date() object or string that can be converted to a date with new Date().
* @param {array} [settings.disable.dates] Disable specific dates.
",13
"diff --git a/test/components/tabs/tabs-api.func-spec.js b/test/components/tabs/tabs-api.func-spec.js @@ -323,8 +323,8 @@ describe('Tabs API', () => {
expect(allVisibleTabs.length).toEqual(4);
});
- it('Should not return overflowed tabs at 320px', () => {
- tabsEl.style.width = '320px';
+ it('Should not return overflowed tabs at 300px', () => {
+ tabsEl.style.width = '300px';
$('body').triggerHandler('resize');
const tab = tabsObj.getOverflowTabs();
",13
"diff --git a/src/components/expandablearea/_expandablearea.scss b/src/components/expandablearea/_expandablearea.scss //Icon on the header
.title {
color: $expandable-area-title-color;
- font-size: $theme-size-font-lg;
- font-weight: $theme-number-font-weight-bold;
-
- span {
- font-weight: $theme-number-font-weight-bold;
- }
+ font-size: $theme-size-font-md;
}
//Push the switch out a bit, qualified to panes only not nested children
",13
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -4183,6 +4183,7 @@ Datagrid.prototype = {
widthPercent: this.widthPercent
};
this.totalMinWidths[container] = this.totalWidths[container];
+ this.totalWidths[container] = this.isInModal ? this.elemWidth : '100%';
}
if (diff > 0 && diff < colWidth && !this.widthPercent && !col.width) {
colWidth += diff;
@@ -4203,9 +4204,9 @@ Datagrid.prototype = {
if ((diff2 > 0) && !stretchColumn[0].widthPercent) {
stretchColumn[0].width += diff2 - 2;
}
+ this.totalWidths[container] = this.isInModal ? this.elemWidth : '100%';
}
- this.totalWidths.center = this.isInModal ? this.elemWidth : '100%';
if (this.widthPercent) {
this.table.css('width', '100%');
",13
"diff --git a/app/src/js/utils.js b/app/src/js/utils.js @@ -5,9 +5,12 @@ const commandLineArgs = require('yargs').argv;
const utils = {};
+// Returns only the filename from the specified request
utils.getFileName = function getFileName(filePath) {
filePath = utils.getPathWithoutQuery(filePath);
- let sepIndex = filePath.lastIndexOf(path.sep);
+
+ // NOTE: `path.sep` is not used on purpose, since this is a URL.
+ let sepIndex = filePath.lastIndexOf('/');
sepIndex = sepIndex === -1 ? 0 : sepIndex + 1;
return filePath.substring(sepIndex, filePath.length);
",13
"diff --git a/app/views/components/editor/example-dirty-tracking.html b/app/views/components/editor/example-dirty-tracking.html </div>
</div>
-
-<script>
- $('body').one('initialized', function () {
- $('#editor1').editor().on('change.editor', function (e) {
- console.log(""Change detected"");
- });
- });
-</script>
",13
"diff --git a/src/components/datagrid/datagrid.js b/src/components/datagrid/datagrid.js @@ -7374,10 +7374,6 @@ Datagrid.prototype = {
// Sync the Ui and call the events
this.dontSyncUi = false;
- // It should not clear the selectedRows in lookup
- const isLookup = $('.lookup');
- this._selectedRows = !isLookup.length ? [] : this._selectedRows;
-
// Update the display counts when unselecting all rows
this.displayCounts();
",13
"diff --git a/test/components/applicationmenu/applicationmenu.puppeteer-spec.js b/test/components/applicationmenu/applicationmenu.puppeteer-spec.js @@ -102,7 +102,7 @@ describe('Application Menu Puppeteer Test', () => {
.then(boundingBox => expect(boundingBox.width).toEqual(menuSize.width));
});
- it('should resize at the near end of the page', async () => {
+ it.skip('should resize at the near end of the page', async () => {
const windowSize = await page.viewport();
const location = [{ y: 0, x: windowSize.width - (windowSize.width * 0.1) }];
@@ -128,7 +128,7 @@ describe('Application Menu Puppeteer Test', () => {
.then(boundingBox => expect(boundingBox.width).toEqual(menuSize.width));
});
- it('should save last resize', async () => {
+ it.skip('should save last resize', async () => {
const windowSize = await page.viewport();
const location = [{ y: 0, x: windowSize.width - (windowSize.width * 0.1) }];
",13
"diff --git a/package.json b/package.json ""e2e:puppeteer"": ""npx --no-install jest --config=test/jest.config.js --runInBand --detectOpenHandles --forceExit"",
""e2e:update-imagesnapshots"": ""npx --no-install jest --config=test/jest.config.js --updateSnapshot --runInBand --detectOpenHandles --forceExit"",
""webdriver:clean"": ""npx webdriver-manager clean"",
- ""webdriver:update"": ""npx webdriver-manager update --versions.chrome=99.0.4844.35 --standalone false --quiet --gecko=false"",
+ ""webdriver:update"": ""npx webdriver-manager update --standalone false --quiet --gecko=false"",
""zip-dist"": ""npx grunt zip-dist"",
""documentation"": ""node ./scripts/deploy-documentation.js"",
""release:dev"": ""node scripts/publish-nightly-manual"",
",13
"diff --git a/src/components/datagrid/_datagrid.scss b/src/components/datagrid/_datagrid.scss @@ -2822,10 +2822,12 @@ $datagrid-small-row-height: 25px;
}
}
- //Cell Editting
+ //Cell Editing
&.is-editing {
background-color: $datagrid-cell-editing-bg-color;
position: relative;
+ outline: 1px solid $ids-color-brand-primary-base;
+ outline-offset: -1px;
&.has-singlecolumn {
display: block;
@@ -2833,7 +2835,6 @@ $datagrid-small-row-height: 25px;
}
.datagrid-cell-wrapper {
- border: 1px solid $ids-color-brand-primary-base;
left: 0;
position: absolute;
text-overflow: clip;
",13
"diff --git a/test/components/datagrid/datagrid-validation.func-spec.js b/test/components/datagrid/datagrid-validation.func-spec.js @@ -15,23 +15,23 @@ let datagridObj;
// Define Columns for the Grid.
const columns = [];
-columns.push({ id: 'selectionCheckbox', sortable: false, resizable: false, formatter: Soho.Formatters.SelectionCheckbox, align: 'center' });
-columns.push({ id: 'productId', name: 'Id', field: 'productId', reorderable: true, formatter: Soho.Formatters.Text, width: 100, filterType: 'Text' });
+columns.push({ id: 'selectionCheckbox', sortable: false, resizable: false, formatter: Formatters.SelectionCheckbox, align: 'center' });
+columns.push({ id: 'productId', name: 'Id', field: 'productId', reorderable: true, formatter: Formatters.Text, width: 100, filterType: 'Text' });
columns.push({
- id: 'productName', name: 'Product Name', field: 'productName', reorderable: true, formatter: Soho.Formatters.Hyperlink, width: 300, filterType: 'Text', editor: Editors.Input
+ id: 'productName', name: 'Product Name', field: 'productName', reorderable: true, formatter: Formatters.Hyperlink, width: 300, filterType: 'Text', editor: Editors.Input
});
columns.push({
id: 'activity', name: 'Activity', field: 'activity', reorderable: true, filterType: 'Text', required: true, validate: 'required', editor: Editors.Input
});
columns.push({ id: 'hidden', hidden: true, name: 'Hidden', field: 'hidden', filterType: 'Text' });
columns.push({
- id: 'price', align: 'right', name: 'Actual Price', field: 'price', reorderable: true, formatter: Soho.Formatters.Decimal, validate: 'required', numberFormat: { minimumFractionDigits: 0, maximumFractionDigits: 0, style: 'currency', currencySign: '$' }, editor: Editors.Input
+ id: 'price', align: 'right', name: 'Actual Price', field: 'price', reorderable: true, formatter: Formatters.Decimal, validate: 'required', numberFormat: { minimumFractionDigits: 0, maximumFractionDigits: 0, style: 'currency', currencySign: '$' }, editor: Editors.Input
});
-columns.push({ id: 'percent', align: 'right', name: 'Actual %', field: 'percent', reorderable: true, formatter: Soho.Formatters.Decimal, numberFormat: { minimumFractionDigits: 0, maximumFractionDigits: 0, style: 'percent' } });
+columns.push({ id: 'percent', align: 'right', name: 'Actual %', field: 'percent', reorderable: true, formatter: Formatters.Decimal, numberFormat: { minimumFractionDigits: 0, maximumFractionDigits: 0, style: 'percent' } });
columns.push({
- id: 'orderDate', name: 'Order Date', field: 'orderDate', reorderable: true, formatter: Soho.Formatters.Date, dateFormat: 'M/d/yyyy', validate: 'required date', editor: Editors.Date
+ id: 'orderDate', name: 'Order Date', field: 'orderDate', reorderable: true, formatter: Formatters.Date, dateFormat: 'M/d/yyyy', validate: 'required date', editor: Editors.Date
});
-columns.push({ id: 'phone', name: 'Phone', field: 'phone', reorderable: true, filterType: 'Text', formatter: Soho.Formatters.Text });
+columns.push({ id: 'phone', name: 'Phone', field: 'phone', reorderable: true, filterType: 'Text', formatter: Formatters.Text });
describe('Datagrid Validation API', () => {
const Locale = window.Soho.Locale;
",13
"diff --git a/test/components/cards/cards.puppeteer-spec.js b/test/components/cards/cards.puppeteer-spec.js @@ -248,22 +248,22 @@ describe('Cards', () => {
expect(await page.$eval('.card:nth-child(2)', el => el.getAttribute('class'))).toBe('card auto-height is-selectable is-selected');
});
- // it.skip('should not visual regress', async () => {
- // await page.waitForSelector('.card', { visible: true })
- // .then(element => expect(element).toBeTruthy());
+ it.skip('should not visual regress', async () => {
+ await page.waitForSelector('.card', { visible: true })
+ .then(element => expect(element).toBeTruthy());
- // const button1 = await page.$('.card:nth-child(1)');
- // await button1.click();
+ const button1 = await page.$('.card:nth-child(1)');
+ await button1.click();
- // const button2 = await page.$('.card:nth-child(2)');
- // await button2.click();
+ const button2 = await page.$('.card:nth-child(2)');
+ await button2.click();
- // const window = await page.$('#cardlist');
- // const image = await window.screenshot();
- // const config = getConfig('cards-multi-select');
+ const window = await page.$('#cardlist');
+ const image = await window.screenshot();
+ const config = getConfig('cards-multi-select');
- // expect(image).toMatchImageSnapshot(config);
- // });
+ expect(image).toMatchImageSnapshot(config);
+ });
});
describe('Actionable', () => {
",13
"diff --git a/web/stock.js b/web/stock.js @@ -411,7 +411,7 @@ d3.csv('ndx.csv').then(function (data) {
// [Line Chart](https://github.com/dc-js/dc.js/blob/master/web/docs/api-latest.md#line-chart)
moveChart /* dc.lineChart('#monthly-move-chart', 'chartGroup') */
.renderArea(true)
- .width(300)
+ .width(990)
.height(200)
.transitionDuration(1000)
.margins({top: 30, right: 50, bottom: 25, left: 40})
",13
"diff --git a/package.json b/package.json ""adal-node"": ""^0.1.17"",
""azure-storage-legacy"": ""0.9.14"",
""glob"": ""^7.1.1"",
- ""grunt"": ""^1.0.1"",
- ""grunt-contrib-connect"": ""^1.0.2"",
- ""grunt-contrib-symlink"": ""^1.0.0"",
- ""grunt-devserver"": ""^0.6.0"",
- ""grunt-jsdoc"": ""^2.1.0"",
+ ""grunt"": ""~0.4"",
+ ""grunt-contrib-connect"": ""^0.10.1"",
+ ""grunt-contrib-symlink"": ""^0.3.0"",
+ ""grunt-devserver"": ""~0.6"",
+ ""grunt-jsdoc"": ""~0.6"",
""grunt-gh-pages"": ""1.1.0"",
""jshint"": ""2.9.4"",
""minami"": ""git://github.com/devigned/minami#master"",
",13
"diff --git a/package.json b/package.json ""bin"": ""wmr.cjs"",
""type"": ""module"",
""scripts"": {
- ""demo"": ""cd demo && node --experimental-modules ../src/cli.js build 2>&1 | grep -v ExperimentalWarning"",
+ ""demo"": ""cd demo && node --experimental-modules ../src/cli.js 2>&1 | grep -v ExperimentalWarning"",
+ ""demo:prod"": ""cd demo && node --experimental-modules ../src/cli.js build 2>&1 | grep -v ExperimentalWarning"",
""dev"": ""PROFILE=true nodemon -w src --exec \""npm run -s demo\"""",
""build"": ""rollup -c"",
""test"": ""eslint && jest --runInBand""
",13
"diff --git a/packages/create-wmr/tpl/tsconfig.json b/packages/create-wmr/tpl/tsconfig.json ""allowSyntheticDefaultImports"": true,
""downlevelIteration"": true
},
- ""include"": [""node_modules/wmr/types.d.ts""],
+ ""include"": [""node_modules/wmr/types.d.ts"", ""**/*""],
""typeAcquisition"": {
""enable"": true
}
",13
"diff --git a/examples/demo/package.json b/examples/demo/package.json ""private"": true,
""type"": ""module"",
""scripts"": {
- ""start"": ""cross-env DEBUG=false node ../../packages/wmr/src/cli.js"",
+ ""start"": ""cross-env DEBUG=true node ../../packages/wmr/src/cli.js"",
""build"": ""yarn start build --prerender"",
""serve"": ""yarn start serve"",
""start:prod"": ""cross-env DEBUG=true wmr"",
",13
"diff --git a/src/features/visualization/d3-viz/setup-annotations.js b/src/features/visualization/d3-viz/setup-annotations.js @@ -39,7 +39,7 @@ const setupAnnotations = ({packedData, annotationRoot}) =>{
.append('text')
.classed('svg-icon', true)
.classed('nag', true)
- .style('font-size', (d) => (3 * d.height * fontScale) + ""%"")
+ .style('font-size', (d) => (4 * d.height * fontScale) + ""%"")
.text('\uf06a');//font-awesome
annotations
",13
"diff --git a/test/common.js b/test/common.js @@ -4,7 +4,7 @@ var thunky = require('thunky')
exports.getConfig = thunky(function (cb) {
// Includes TURN -- needed for tests to pass on Sauce Labs
// https://github.com/feross/simple-peer/issues/41
- get.concat('https://instant.io/__rtcConfig__', function (err, res, data) {
+ get.concat('https://instant.io/_rtcConfig', function (err, res, data) {
if (err) return cb(err)
data = data.toString()
try {
",13
"diff --git a/src/containers/stage.jsx b/src/containers/stage.jsx @@ -179,7 +179,7 @@ class Stage extends React.Component {
this.updateRect();
const {x, y} = getEventXY(e);
const mousePosition = [x - this.rect.left, y - this.rect.top];
- if (e.which === 1) {
+ if (true) {
this.setState({
mouseDown: true,
mouseDownPosition: mousePosition,
",13
"diff --git a/src/components/library-item/library-item.jsx b/src/components/library-item/library-item.jsx @@ -46,7 +46,7 @@ class LibraryItem extends React.PureComponent {
</div>
</div>
) : (
- <div
+ <Box
className={styles.libraryItem}
role=""button""
tabIndex=""0""
@@ -64,7 +64,7 @@ class LibraryItem extends React.PureComponent {
</Box>
</Box>
<span className={styles.libraryItemName}>{this.props.name}</span>
- </div>
+ </Box>
);
}
}
",13
"diff --git a/src/lib/blocks.js b/src/lib/blocks.js @@ -126,16 +126,9 @@ export default function (vm) {
};
ScratchBlocks.Blocks.sensing_of_object_menu.init = function () {
- const start = [
+ const json = jsonForMenuBlock('OBJECT', spriteMenu, sensingColors, [
['Stage', '_stage_']
- ];
- if (vm.editingTarget) {
- start.splice(0, 0,
- [vm.editingTarget.sprite.name, vm.editingTarget.sprite.name]
- );
- }
-
- const json = jsonForMenuBlock('OBJECT', spriteMenu, sensingColors, start);
+ ]);
this.jsonInit(json);
};
",13
"diff --git a/src/components/layout/FeaturesLayout.js b/src/components/layout/FeaturesLayout.js import React from 'react';
import PropTypes from 'prop-types';
-import styled from 'styled-components';
+import styled, { css } from 'styled-components';
import { styles } from '@storybook/design-system';
@@ -26,7 +26,7 @@ const Layout = styled.div`
${(props) =>
props.columns === 2 &&
- `
+ css`
${pageMargins};
@media (min-width: ${breakpoint * 1}px) {
margin: 0 ${pageMargin * 3}%;
@@ -41,7 +41,7 @@ const Layout = styled.div`
${(props) =>
props.columns === 3 &&
- `
+ css`
${pageMargins};
@media (min-width: ${breakpoint * 1}px) {
> * {
",13
"diff --git a/buildkite/src/Pipeline/TriggerCommand.dhall b/buildkite/src/Pipeline/TriggerCommand.dhall @@ -3,5 +3,5 @@ in
(
\(dhallPipelineRelativeToBuildKiteDir : Text) ->
- Cmd.quietly ""dhall-to-yaml --quoted <<< '(./buildkite/${dhallPipelineRelativeToBuildKiteDir}).pipeline' | BUILDKITE_AGENT_META_DATA_SIZE=small buildkite-agent pipeline upload""
+ Cmd.quietly ""dhall-to-yaml --quoted <<< '(./buildkite/${dhallPipelineRelativeToBuildKiteDir}).pipeline' | buildkite-agent pipeline upload""
) : Text -> Cmd.Type
",13
"diff --git a/buildkite/src/Jobs/Lint/Fast.dhall b/buildkite/src/Jobs/Lint/Fast.dhall @@ -44,7 +44,7 @@ Pipeline.build
(""./scripts/compare_ci_diff_types.sh"")
, label = ""Optional fast lint steps; versions compatability changes""
, key = ""lint-optional-types""
- , target = Size.Large
+ , target = Size.Medium
, soft_fail = Some (Command.SoftFail.Boolean True)
, docker = None Docker.Type
},
@@ -55,7 +55,7 @@ Pipeline.build
(""./scripts/compare_ci_diff_binables.sh"")
, label = ""Optional fast lint steps; binable compatability changes""
, key = ""lint-optional-binable""
- , target = Size.Large
+ , target = Size.Medium
, soft_fail = Some (Command.SoftFail.Boolean True)
, docker = None Docker.Type
}
",13
"diff --git a/src/lib/integration_test_cloud_engine/coda_automation.ml b/src/lib/integration_test_cloud_engine/coda_automation.ml @@ -76,7 +76,7 @@ module Network_config = struct
in
let testnet_name = ""integration-test-"" ^ test_name in
(* HARD CODED NETWORK VALUES *)
- let coda_automation_location = ""/home/steck/tmp/coda-automation"" in
+ let coda_automation_location = ""../automation"" in
let project_id = ""o1labs-192920"" in
let cluster_id = ""gke_o1labs-192920_us-east1_coda-infra-east"" in
let cluster_name = ""coda-infra-east"" in
",13
"diff --git a/src/lib/genesis_ledger_helper/genesis_ledger_helper.ml b/src/lib/genesis_ledger_helper/genesis_ledger_helper.ml @@ -482,7 +482,7 @@ module Ledger = struct
| Ok () ->
file_exists filename Cache_dir.s3_install_path
| Error e ->
- [%log info] ""Could not download $ledger from $uri""
+ [%log info] ""Could not download $ledger from $uri: $error""
~metadata:
[ (""ledger"", `String ledger_name_prefix)
; (""uri"", `String s3_path)
@@ -886,7 +886,8 @@ module Genesis_proof = struct
| Ok () ->
file_exists filename Cache_dir.s3_install_path
| Error e ->
- [%log info] ""Could not download genesis proof file from $uri""
+ [%log info]
+ ""Could not download genesis proof file from $uri: $error""
~metadata:
[ (""uri"", `String s3_path)
; (""error"", Error_json.error_to_yojson e) ] ;
",13
"diff --git a/scripts/run_local_network.sh b/scripts/run_local_network.sh @@ -210,8 +210,6 @@ for i in $(seq 1 $nodes); do
metrics_port=$(echo $node_start_port + 3 + $i*5 | bc)
libp2p_metrics_port=$(echo $node_start_port + 4 + $i*5 | bc)
- echo ""rest port"" $rest_port
-
CODA_PRIVKEY_PASS=""naughty blue worm"" $CODA daemon -peer ""/ip4/127.0.0.1/tcp/3002/p2p/12D3KooWAFFq2yEQFFzhU5dt64AWqawRuomG9hL8rSmm5vxhAsgr"" -client-port $client_port -rest-port $rest_port -external-port $ext_port -metrics-port $metrics_port -libp2p-metrics-port $libp2p_metrics_port -config-directory $folder -config-file $daemon -generate-genesis-proof true -log-json -log-level Trace &> $logfile &
node_pids[${i}]=$!
node_logfiles[${i}]=$logfile
",13
"diff --git a/scripts/run_local_network.sh b/scripts/run_local_network.sh @@ -146,7 +146,7 @@ mkdir -p $nodesfolder
mkdir $nodesfolder/seed
-$CODA daemon -seed -client-port 3000 -rest-port 3001 -external-port 3002 -metrics-port 3003 -libp2p-metrics-port 3004 -config-directory $nodesfolder/seed -config-file $daemon -generate-genesis-proof true -discovery-keypair CAESQNf7ldToowe604aFXdZ76GqW/XVlDmnXmBT+otorvIekBmBaDWu/6ZwYkZzqfr+3IrEh6FLbHQ3VSmubV9I9Kpc=,CAESIAZgWg1rv+mcGJGc6n6/tyKxIehS2x0N1Uprm1fSPSqX,12D3KooWAFFq2yEQFFzhU5dt64AWqawRuomG9hL8rSmm5vxhAsgr -log-json -log-level Trace -archive-address 3086 &> $nodesfolder/seed/log.txt &
+$CODA daemon -seed -client-port 3000 -rest-port 3001 -external-port 3002 -metrics-port 3003 -libp2p-metrics-port 3004 -config-directory $nodesfolder/seed -config-file $daemon -generate-genesis-proof true -discovery-keypair CAESQNf7ldToowe604aFXdZ76GqW/XVlDmnXmBT+otorvIekBmBaDWu/6ZwYkZzqfr+3IrEh6FLbHQ3VSmubV9I9Kpc=,CAESIAZgWg1rv+mcGJGc6n6/tyKxIehS2x0N1Uprm1fSPSqX,12D3KooWAFFq2yEQFFzhU5dt64AWqawRuomG9hL8rSmm5vxhAsgr -log-json -log-level Trace &> $nodesfolder/seed/log.txt &
seed_pid=$!
echo 'waiting for seed to go up...'
",13
"diff --git a/src/app/rosetta/rosetta.conf b/src/app/rosetta/rosetta.conf ""network"": ""mainnet""
},
""online_url"": ""http://localhost:3087"",
- ""data_directory"": ""rosetta-cli"",
+ ""data_directory"": ""/data/rosetta-cli"",
""http_timeout"": 500,
""max_sync_concurrency"": 64,
""retry_elapsed_time"": 0,
""inactive_discrepency_search_disabled"": false,
""balance_tracking_disabled"": false,
""coin_tracking_disabled"": false,
- ""results_output_file"": ""rosetta-cli/results"",
+ ""results_output_file"": ""/data/rosetta-cli/results"",
""end_conditions"": {
""tip"": true
}
",13
"diff --git a/src/lib/mina_base/zkapp_precondition.ml b/src/lib/mina_base/zkapp_precondition.ml @@ -186,8 +186,11 @@ module Numeric = struct
open Fields_derivers_zkapps.Derivers
let block_time_inner obj =
+ let ( ^^ ) = Fn.compose in
iso_string ~name:""BlockTime"" ~js_type:UInt64
- ~of_string:Block_time.of_string_exn ~to_string:Block_time.to_string obj
+ ~of_string:(Block_time.of_uint64 ^^ Unsigned_extended.UInt64.of_string)
+ ~to_string:(Unsigned_extended.UInt64.to_string ^^ Block_time.to_uint64)
+ obj
let nonce obj = deriver ""Nonce"" uint32 obj
@@ -227,14 +230,6 @@ module Numeric = struct
|> finish ""T"" ~t_toplevel_annots
end
- let%test_unit ""to string"" =
- [%test_eq: string] Block_time.(to_string max_value) ""-1""
-
- let%test_unit ""of string"" =
- [%test_eq: Block_time.t]
- Block_time.(of_string_exn ""-1"")
- Block_time.max_value
-
let%test_unit ""roundtrip json"" =
let open Fields_derivers_zkapps.Derivers in
let full = o () in
",13
"diff --git a/src/lib/integration_test_lib/wait_condition.ml b/src/lib/integration_test_lib/wait_condition.ml @@ -280,7 +280,7 @@ struct
in
let soft_timeout_in_slots = 4 in
{ id = Persisted_frontier_loaded
- ; description = ""persisted transition frontier loaded""
+ ; description = ""persisted transition frontier to load""
; predicate =
Event_predicate (Event_type.Persisted_frontier_loaded, (), check)
; soft_timeout = Slots soft_timeout_in_slots
",13
"diff --git a/buildkite/scripts/replayer-test.sh b/buildkite/scripts/replayer-test.sh @@ -38,4 +38,4 @@ cd /workdir
echo ""Running replayer""
mina-replayer --archive-uri postgres://postgres:$PGPASSWORD@localhost:5432/archive \
- --input-file $TEST_DIR/input.json --output-file /dev/null
+ --input-file $TEST_DIR/input.json --output-file /dev/null --continue-on-error
",13
"diff --git a/src/app/test_executive/zkapps.ml b/src/app/test_executive/zkapps.ml @@ -529,7 +529,7 @@ module Make (Inputs : Intf.Test.Inputs_intf) = struct
, zkapp_command_token_transfer2 )
in
let with_timeout =
- let soft_slots = 6 in
+ let soft_slots = 4 in
let soft_timeout = Network_time_span.Slots soft_slots in
let hard_timeout = Network_time_span.Slots (soft_slots * 2) in
Wait_condition.with_timeouts ~soft_timeout ~hard_timeout
",13
"diff --git a/src/lib/crypto/kimchi_bindings/js/bindings.js b/src/lib/crypto/kimchi_bindings/js/bindings.js @@ -2124,12 +2124,6 @@ var caml_pasta_fq_plonk_proof_verify = function (index, proof) {
return plonk_wasm.caml_pasta_fq_plonk_proof_verify(index, proof);
};
-// Provides: prover_to_json
-// Requires: plonk_wasm
-var prover_to_json = function (prover_index) {
- return plonk_wasm.prover_to_json(prover_index);
-};
-
// Provides: caml_pasta_fq_plonk_proof_batch_verify
// Requires: plonk_wasm, caml_array_to_rust_vector, caml_pallas_poly_comm_to_rust, caml_pasta_fq_plonk_verifier_index_to_rust, caml_pasta_fq_proof_to_rust
var caml_pasta_fq_plonk_proof_batch_verify = function(indexes, proofs) {
@@ -2315,3 +2309,9 @@ function caml_pasta_fp_plonk_proof_example_with_lookup() {
// This is only used in the pickles unit tests
throw new Error(""Unimplemented caml_pasta_fp_plonk_proof_example_with_lookup"");
}
+
+// Provides: prover_to_json
+// Requires: plonk_wasm
+var prover_to_json = function (prover_index) {
+ return plonk_wasm.prover_to_json(prover_index);
+};
",13
"diff --git a/src/lib/crypto/kimchi_bindings/stubs/kimchi_types.ml b/src/lib/crypto/kimchi_bindings/stubs/kimchi_types.ml @@ -16,8 +16,10 @@ type nonrec 'caml_f random_oracles =
; v_chal : 'caml_f scalar_challenge
; u_chal : 'caml_f scalar_challenge
}
+[@@boxed]
type nonrec 'evals point_evaluations = { zeta : 'evals; zeta_omega : 'evals }
+[@@boxed]
type nonrec 'caml_f lookup_evaluations =
{ sorted : 'caml_f array point_evaluations array
@@ -25,6 +27,7 @@ type nonrec 'caml_f lookup_evaluations =
; table : 'caml_f array point_evaluations
; runtime : 'caml_f array point_evaluations option
}
+[@@boxed]
type nonrec 'caml_f proof_evaluations =
{ w :
@@ -71,21 +74,26 @@ type nonrec 'caml_f proof_evaluations =
; generic_selector : 'caml_f array point_evaluations
; poseidon_selector : 'caml_f array point_evaluations
}
+[@@boxed]
type nonrec 'caml_g poly_comm =
{ unshifted : 'caml_g array; shifted : 'caml_g option }
+[@@boxed]
type nonrec ('caml_g, 'caml_f) recursion_challenge =
{ chals : 'caml_f array; comm : 'caml_g poly_comm }
+[@@boxed]
type nonrec ('g, 'f) opening_proof =
{ lr : ('g * 'g) array; delta : 'g; z1 : 'f; z2 : 'f; sg : 'g }
+[@@boxed]
type nonrec 'caml_g lookup_commitments =
{ sorted : 'caml_g poly_comm array
; aggreg : 'caml_g poly_comm
; runtime : 'caml_g poly_comm option
}
+[@@boxed]
type nonrec 'caml_g prover_commitments =
{ w_comm :
@@ -108,6 +116,7 @@ type nonrec 'caml_g prover_commitments =
; t_comm : 'caml_g poly_comm
; lookup : 'caml_g lookup_commitments option
}
+[@@boxed]
type nonrec ('caml_g, 'caml_f) prover_proof =
{ commitments : 'caml_g prover_commitments
@@ -117,8 +126,9 @@ type nonrec ('caml_g, 'caml_f) prover_proof =
; public : 'caml_f array
; prev_challenges : ('caml_g, 'caml_f) recursion_challenge array
}
+[@@boxed]
-type nonrec wire = { row : int; col : int }
+type nonrec wire = { row : int; col : int } [@@boxed]
type nonrec gate_type =
| Zero
@@ -155,6 +165,7 @@ type nonrec 'f circuit_gate =
; wires : wire * wire * wire * wire * wire * wire * wire
; coeffs : 'f array
}
+[@@boxed]
type nonrec curr_or_next = Curr | Next
@@ -164,6 +175,7 @@ type nonrec 'f oracles =
; opening_prechallenges : 'f array
; digest_before_evaluations : 'f
}
+[@@boxed]
module VerifierIndex = struct
module Lookup = struct
@@ -182,6 +194,7 @@ module VerifierIndex = struct
; max_joint_size : int
; uses_runtime_tables : bool
}
+ [@@boxed]
type nonrec 't lookup_selectors = { lookup_gate : 't option } [@@boxed]
@@ -193,9 +206,11 @@ module VerifierIndex = struct
; lookup_info : lookup_info
; runtime_tables_selector : 'poly_comm option
}
+ [@@boxed]
end
type nonrec 'fr domain = { log_size_of_group : int; group_gen : 'fr }
+ [@@boxed]
type nonrec 'poly_comm verification_evals =
{ sigma_comm : 'poly_comm array
@@ -208,6 +223,7 @@ module VerifierIndex = struct
; endomul_scalar_comm : 'poly_comm
; chacha_comm : 'poly_comm array option
}
+ [@@boxed]
type nonrec ('fr, 'srs, 'poly_comm) verifier_index =
{ domain : 'fr domain
@@ -220,4 +236,5 @@ module VerifierIndex = struct
; shifts : 'fr array
; lookup_index : 'poly_comm Lookup.t option
}
+ [@@boxed]
end
",13
"diff --git a/changelog.md b/changelog.md @@ -2,6 +2,10 @@ Since you are interested in what happens next, in case, you work for a for-profi
## Next (version and date will be generated, add changes below)
+### Bug fixes
+
+- Reverting [1563](https://github.com/cssinjs/jss/pull/1563) because of regression [1565](https://github.com/cssinjs/jss/issues/1565)
+
## 10.8.1 (2021-10-16)
### Bug fixes
",13
"diff --git a/public/js/editcube.js b/public/js/editcube.js @@ -635,7 +635,7 @@ function getLabels(sort) {
}
else if (sort == 'Supertype')
{
- return ['Basic','Elite','Host','Legendary','Ongoing','Tribal','World','Snow'];
+ return ['Snow','Legendary','Tribal','Basic','Elite','Host','Ongoing','World'];
}
else if (sort == 'Tags')
{
",13
"diff --git a/contracts/token/StandardToken.sol b/contracts/token/StandardToken.sol @@ -26,7 +26,7 @@ contract StandardToken is ERC20, BasicToken {
function transferFrom(address _from, address _to, uint256 _value) public returns (bool) {
require(_to != address(0));
- var _allowance = allowed[_from][msg.sender];
+ uint256 _allowance = allowed[_from][msg.sender];
// Check is not needed because sub(_allowance, _value) will already throw if this condition is not met
// require (_value <= _allowance);
",14
"diff --git a/src/components/Home/Home.css b/src/components/Home/Home.css }
}
-.events {
- display: flex;
- justify-content: center;
- flex-wrap: wrap;
+.events a {
+ color: #fff;
}
-.events iframe {
- margin: 1em;
+.events a:hover {
+ color: #fff;
+ text-decoration: underline;
}
.catalogs {
",14
"diff --git a/src/routes/Dataset/components/DatasetView/DatasetView.js b/src/routes/Dataset/components/DatasetView/DatasetView.js @@ -22,6 +22,8 @@ import DatasetContactList from '../DatasetContactList'
import styles from './DatasetView.scss'
+const { INSPIRE_API_URL } = process.env
+
class DatasetView extends React.PureComponent {
static propTypes = {
dataset: PropTypes.shape({
@@ -79,9 +81,13 @@ class DatasetView extends React.PureComponent {
<Helmet title={dataset.metadata.title}>
<meta name='twitter:title' content={dataset.metadata.title} />
<meta name='twitter:description' content={dataset.metadata.description} />
- { hasThumbnails && <meta name='twitter:image' content={`https://inspire.data.gouv.fr/api/geogw/records/${dataset.recordId}/thumbnails/${dataset.metadata.thumbnails[0].originalUrlHash}`} />}
+ {hasThumbnails && (
+ <meta name='twitter:image' content={`${INSPIRE_API_URL}/records/${dataset.recordId}/thumbnails/${dataset.metadata.thumbnails[0].originalUrlHash}`} />
+ )}
<meta property='og:title' content={dataset.metadata.title} />
- { hasThumbnails && <meta name='og:image' content={`https://inspire.data.gouv.fr/api/geogw/records/${dataset.recordId}/thumbnails/${dataset.metadata.thumbnails[0].originalUrlHash}`} />}
+ {hasThumbnails && (
+ <meta name='og:image' content={`${INSPIRE_API_URL}/records/${dataset.recordId}/thumbnails/${dataset.metadata.thumbnails[0].originalUrlHash}`} />
+ )}
<meta property='og:description' content={dataset.metadata.description} />
</Helmet>
{i18n.exists(`Dataset:components.DatasetView.consequences.${status}`) && (
",14
"diff --git a/src/routes/Dataset/components/DatasetHeader/DatasetHeader.js b/src/routes/Dataset/components/DatasetHeader/DatasetHeader.js @@ -12,12 +12,17 @@ import styles from './DatasetHeader.scss'
const DatasetHeader = ({ dataset, t }) => {
const { title, description, type, purpose, lineage, inspireTheme } = dataset.metadata
- const revisionDate = doneSince(dataset.revisionDate)
const license = getLicense(dataset.metadata.license)
const dataType = t(`Common:enums.dataTypes.${type}`, {
defaultValue: type
})
+ const { creationDate, revisionDate } = dataset.metadata
+ const updatedAt = revisionDate || creationDate
+ const updatedAtLabel = updatedAt
+ ? doneSince(updatedAt)
+ : t('Common:enums.unknownData.unknown', { context: 'female' })
+
return (
<div className={styles.container}>
<div className={styles.inspireThemeHead}>
@@ -34,7 +39,7 @@ const DatasetHeader = ({ dataset, t }) => {
) : license}</span>
</div>
<div>
- {t('components.DatasetHeader.lastUpdate')} : <span>{revisionDate}</span>
+ {t('components.DatasetHeader.lastUpdate')} : <span>{updatedAtLabel}</span>
</div>
</div>
</div>
",14
"diff --git a/src/components/Markdown/Markdown.js b/src/components/Markdown/Markdown.js @@ -7,7 +7,7 @@ import styles from './Markdown.scss'
const Markdown = ({ markdown, renderer }) => {
const md = marked(markdown, { renderer })
return (
- <p
+ <div
className={`${styles.wrapper}`}
dangerouslySetInnerHTML={{ __html : md }}
/>
",14
"diff --git a/src/components/Dropdown/Dropdown.scss b/src/components/Dropdown/Dropdown.scss position: absolute;
background-color: #fff;
text-align: left;
- margin-left: -100%;
+ margin-left: -90px;
box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2);
z-index: 1;
",14
"diff --git a/MaterialSkin/HTML/material/html/js/toolbar.js b/MaterialSkin/HTML/material/html/js/toolbar.js @@ -41,11 +41,10 @@ function startMediaSession() {
}
function stopMediaSession() {
- if (!mediaInterval) {
+ if (!mediaStarted) {
return;
}
- clearInterval(mediaInterval);
- mediaInterval = undefined;
+ mediaStarted = false;
if (mediaAudio.src) {
mediaAudio.src = undefined;
}
",14
"diff --git a/MaterialSkin/HTML/material/html/js/ui-settings.js b/MaterialSkin/HTML/material/html/js/ui-settings.js @@ -459,7 +459,9 @@ Vue.component('lms-ui-settings', {
}
}
if (data && data.result && data.result.themes) {
- this.themes.push.apply(this.themes, data.result.themes);
+ for (var i=0, list=data.result.themes, len=list.length; i<len; ++i) {
+ this.themes.push({label:list[i].label.replace('-', ' '), key:list[i].key});
+ }
}
}).catch(err => {
});
",14
"diff --git a/MaterialSkin/HTML/material/html/js/customactions.js b/MaterialSkin/HTML/material/html/js/customactions.js @@ -122,6 +122,7 @@ function doReplacements(string, player, item) {
}
}
}
+ val=val.replace(""$HOST"", window.location.hostname);
for (var i=0, len=ACTION_KEYS.length; i<len; ++i) {
val = val.replace(""+$""+ACTION_KEYS[i], """").replace(""$""+ACTION_KEYS[i]+""+"", """").replace(""$""+ACTION_KEYS[i], """");
}
",14
"diff --git a/.travis.yml b/.travis.yml @@ -9,19 +9,15 @@ addons:
- google-chrome
packages:
- google-chrome-stable
-cache:
- yarn: true
before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm config set spin false
-- curl -o- -L https://yarnpkg.com/install.sh | bash
-- export PATH=$HOME/.yarn/bin:$PATH
install:
-- yarn install
+- npm install
- bower install
script:
-- yarn test
+- npm test
deploy:
provider: heroku
buildpack: https://codon-buildpacks.s3.amazonaws.com/buildpacks/hone/emberjs.tgz
",14
"diff --git a/lib/types/index.js b/lib/types/index.js @@ -8,7 +8,7 @@ var protocolVersion = require('./protocol-version');
/** @module types */
/**
- * Long constructor, wrapper of the internal library used: {@link http://docs.closure-library.googlecode.com/git/class_goog_math_Long.html Google Closure Long}.
+ * Long constructor, wrapper of the internal library used: {@link https://github.com/dcodeIO/long.js Long.js}.
* @constructor
*/
var Long = require('long');
",14
"diff --git a/src/core/_config.scss b/src/core/_config.scss @@ -73,7 +73,7 @@ $hyperlink-disabled-color: $link-disabled-color;
$hyperlink-hover-color: $link-hover-color;
// Rules
-$hr-top-color: $graphite03;
+$hr-top-color: $color-default;
$hr-bottom-color: $white;
// Circle Pager
@@ -288,7 +288,7 @@ $swaplist-text-color-selected: $white;
//Date Picker
$datepicker-icon-active-color: $trigger-active-color;
$datepicker-month-year-color: $graphite10;
-$datepicker-alternate-month-color: $graphite03;
+$datepicker-alternate-month-color: $color-default;
$datepicker-day-color: $graphite06;
$datepicker-focus-border-color: $color-primary;
$datepicker-selected-bg-color: $color-primary;
@@ -308,7 +308,7 @@ $timepicker-disabled-color: $graphite03;
// Color Picker
$colorpicker-is-empty-bg-color: $white;
-$colorpicker-initial-bg-color: $graphite03;
+$colorpicker-initial-bg-color: $color-default;
$colorpicker-swatch-border-color: $graphite02;
$colorpicker-checkmark-one-color: $graphite05;
$colorpicker-checkmark-two-color: $white;
@@ -599,12 +599,12 @@ $datagrid-list-header-border-color: $graphite03;
$datagrid-list-header-color: $graphite06;
$datagrid-list-header-hover-color: $list-hover-color;
$datagrid-list-row-hover-color: transparent;
-$datagrid-list-sort-icon-color: $graphite03;
+$datagrid-list-sort-icon-color: $color-default;
$datagrid-list-sort-icon-hover-color: $graphite05;
$datagrid-header-focus-bg-color: $datagrid-header-bg-color;
$datagrid-header-focus-border-color: $white;
$datagrid-list-header-checkbox-border-color: $graphite04;
-$datagrid-list-header-active-color: $graphite03;
+$datagrid-list-header-active-color: $color-default;
$datagrid-filter-border-color: $slate04;
$datagrid-filter-hover-border-color: $slate02;
@@ -654,16 +654,16 @@ $progress-border-color: $graphite04;
$progress-bar-bg-color: $color-primary;
//Chart Progress Bar
-$chart-progressbar-bg-color: $graphite03;
+$chart-progressbar-bg-color: $color-default;
$chart-progressbar-bg-color-dark: $graphite04;
$chart-progressbar-completed-fill: $emerald07;
$chart-progressbar-target-fill: $graphite04;
$chart-progressbar-primary-fill: $color-primary;
$chart-progressbar-dark-fill: $graphite06;
-$chart-targeted-achievement-bg-color: $graphite03;
+$chart-targeted-achievement-bg-color: $color-default;
//Timeline
-$timeline-indicator-color: $graphite03;
+$timeline-indicator-color: $color-default;
$timeline-indicator-processing-color: $color-primary;
$timeline-indicator-complete-color: $color-primary;
$timeline-line-color: $graphite04;
@@ -671,7 +671,7 @@ $timeline-header-color: $color-primary;
//Wizard
$wizard-default-bg: $body-bg-color-primary;
-$wizard-bar-bg: $graphite03;
+$wizard-bar-bg: $color-default;
$wizard-color: $graphite06;
$wizard-disabled-color: $graphite04;
$wizard-active-color: $color-primary;
@@ -707,7 +707,7 @@ $searchfield-context-text-color: $font-color;
$searchfield-card-bg-color: $graphite01;
$searchfield-card-border-color: $graphite02;
-$searchfield-card-icon-color: $graphite03;
+$searchfield-card-icon-color: $color-default;
$searchfield-card-text-color: $font-color;
$searchfield-header-bg-color: $slate08;
",14
"diff --git a/src/core/_config.scss b/src/core/_config.scss @@ -50,7 +50,7 @@ $inverse-color: $button-primary-text-color;
// Text Color
// These are Deprecated. Use ""Default, Descriptive, Link, Muted, Alert"" ect going forward
$font-color-extrahighcontrast: $graphite10;
-$font-color-highcontrast: $graphite08;
+$font-color-highcontrast: $color-default-contrast;
$font-color: $graphite06;
$font-color-lowcontrast: $color-default-alt;
$label-color: $graphite06;
@@ -80,7 +80,7 @@ $hr-bottom-color: $white;
$circlepager-bg-color: transparent;
$circlepager-border-color: $color-default-alt;
$circlepager-hover-bg-color: transparent;
-$circlepager-hover-border-color: $graphite08;
+$circlepager-hover-border-color: $color-default-contrast;
$circlepager-focus-bg-color: transparent;
$circlepager-focus-border-color: $color-primary;
@@ -251,7 +251,7 @@ $listbuilder-input-selection-bg-color: $azure08;
// Toolbar
$toolbar-standalone-bg-color: $graphite02;
$toolbar-standalone-border-color: $graphite03;
-$toolbar-standalone-disabled-color: $graphite08;
+$toolbar-standalone-disabled-color: $color-default-contrast;
$toolbar-separator-color: $graphite03;
// Field Filter
@@ -560,7 +560,7 @@ $mutlitabs-section-alt-border-color: $graphite02;
$chart-line-color: $graphite02;
$chart-line-color-axis: $color-default-alt;
$chart-font-color: $graphite06;
-$chart-font-color-inverse: $graphite08;
+$chart-font-color-inverse: $color-default-contrast;
$chart-bar-stroke: $white;
$chart-arc-stroke: $white;
@@ -571,8 +571,8 @@ $datagrid-header-bg-color: $slate06;
$datagrid-nested-header-bg-color: $slate05;
$datagrid-nested-header-border-color: $graphite03;
$datagrid-header-border-color: $graphite03;
-$datagrid-header-hover-color: $graphite08;
-$datagrid-header-active-color: $graphite08;
+$datagrid-header-hover-color: $color-default-contrast;
+$datagrid-header-active-color: $color-default-contrast;
$datagrid-header-checkbox-border-color: $graphite03;
$datagrid-sort-icon-color: $color-default-alt;
$datagrid-sort-icon-sorted-color: $white;
@@ -814,7 +814,7 @@ $calendar-selected-border-color: $color-primary;
$calendar-selected-bg-color: $graphite01;
$calendar-hover-bg-color: $graphite01;
$calendar-disabled-bg-color: $graphite01;
-$calendar-disabled-color: $graphite08;
+$calendar-disabled-color: $color-default-contrast;
// Breakpoint sizes - Grid
$breakpoint-phone: 320px;
",14
"diff --git a/src/core/_config.scss b/src/core/_config.scss @@ -43,7 +43,6 @@ $focus-box-shadow-spinbox-up: 0 -3px 3px 0 $focus-box-shadow-color,
3px 0 3px 0 $focus-box-shadow-color;
// Base Colors
-$color-primary: $color-primary;
$inverse-color: $button-primary-text-color;
// Text Color
",14
"diff --git a/app/views/components/personalize/example-state.html b/app/views/components/personalize/example-state.html <div class=""page-container no-scroll"">
+
<header class=""header is-personalizable"">
<div class=""toolbar"">
<div class=""title"">
</header>
<div id=""maincontent"" class=""page-container scrollable"" role=""main"">
+
<div class=""row"">
+ <div class=""six columns"">
+ <p>This example tests state maintenance for personalization of colors and theme. Personalizations should maintain upon reinitialization of elements after having chosen a theme or color from the ""..."" button in the header.</p>
+ <p>Personalization button will set all colors to defaults as declared in HTML <em>script</em> tag, regardless of theme.</p><br><br>
+ </div>
+ </div>
+ <div class=""row"">
<div class=""one columns"">
- <button id=""reinitialize"" class=""btn btn-secondary"">Reinitialize</button>
+ <button id=""reinitialize"" class=""btn-secondary"">Reinitialize</button>
<br></br>
- <button id=""personalize"" class=""btn btn-secondary"">Personalize</button>
+ <button id=""personalize"" class=""btn-secondary"">Personalize Colors to Defaults</button>
</div>
-
</div>
+
</div>
</div>
<script>
- // these are random colors for example purposes only
+ // component defaults
var colors = {
- header: '#800000',
- subheader: '#700000',
- text: '#000000',
- verticalBorder: '#000000',
- horizontalBorder: '#000000',
- inactive: '#CCCCCC',
- hover: '#CCCCCC'
+ header: '2578A9',
+ subheader: '1d5f8a',
+ text: 'ffffff',
+ verticalBorder: '133C59',
+ horizontalBorder: '134D71',
+ inactive: '1d5f8a',
+ hover: '133C59',
+ btnColorHeader: '368AC0',
+ btnColorSubheader: '54a1d3'
};
$('html').personalize({colors: colors});
",14
"diff --git a/src/components/modal/_modal.scss b/src/components/modal/_modal.scss }
.hyperlink {
- color: darken($hyperlink-color, 5%);
+ color: $theme-color-palette-azure-70;
}
}
}
.btn-modal-primary {
- color: darken($modal-btn-primary-color, 5%);
+ color: $theme-color-palette-azure-70;
&:hover {
color: $modal-btn-primary-hover-color;
",14
"diff --git a/app/views/components/pie/example-index.html b/app/views/components/pie/example-index.html <h2 class=""widget-title"">Pie Chart Title</h2>
</div>
<div class=""widget-content"">
- <div id=""example-1"" class=""chart-container"">
+ <div id=""pie-chart-example"" class=""chart-container"">
</div>
</div>
</div>
@@ -77,25 +77,12 @@ $('body').on('initialized', function () {
}]
}];
- // $('#pie-chart-example').chart({type: 'bar-stacked', dataset: pieData})
- // .on('selected', function(e, args) {
- // if (args[0] && args[0].data) {
- // console.log(args[0].data, args[0].data.url);
- // }
- // });
-
-
- var dataset1 = [{
- data: [{
- name: {text: 'Label A'},
- completed: {text: '50K of 250K', value: 50000, format: '.2s', color: 'primary'},
- remaining: {value: 20000, format: '.2s', text: ' To Target'},
- total: {value: 250000, format: '.2s'},
- }]
-}];
-
-var api1 = $('#example-1').chart({dataset: dataset1, type: 'targeted-achievement'}).data('chart');
-
+ $('#pie-chart-example').chart({type: 'pie', dataset: pieData})
+ .on('selected', function(e, args) {
+ if (args[0] && args[0].data) {
+ console.log(args[0].data, args[0].data.url);
+ }
+ });
});
</script>
",14
"diff --git a/src/components/lookup/lookup.js b/src/components/lookup/lookup.js @@ -1086,7 +1086,7 @@ Lookup.prototype = {
*/
enable() {
this.element.prop('disabled', false).prop('readonly', false).removeClass('is-not-editable');
- this.element.parent().removeClass('is-disabled');
+ this.element.closest('.field').removeClass('is-disabled');
this.icon.prop('disabled', false);
},
",14
"diff --git a/spec/heatmap-spec.js b/spec/heatmap-spec.js @@ -228,7 +228,7 @@ describe('dc.heatmap', () => {
p.cols.add(d.colData);
p.rows.add(d.rowData);
return p;
- }, {cols: d3.set(), rows: d3.set()});
+ }, {cols: new Set(), rows: new Set()});
};
beforeEach(() => {
@@ -245,21 +245,21 @@ describe('dc.heatmap', () => {
it('should have the correct number of columns', () => {
chart.selectAll('.box-group').each(d => {
- expect(originalDomain.cols.has(d.key[0])).toBeTruthy();
+ expect(originalDomain.cols.has(`${d.key[0]}`)).toBeTruthy();
});
chart.selectAll('.cols.axis text').each(d => {
- expect(originalDomain.cols.has(d)).toBeTruthy();
+ expect(originalDomain.cols.has(`${d}`)).toBeTruthy();
});
});
it('should have the correct number of rows', () => {
chart.selectAll('.box-group').each(d => {
- expect(originalDomain.rows.has(d.key[1])).toBeTruthy();
+ expect(originalDomain.rows.has(`${d.key[1]}`)).toBeTruthy();
});
chart.selectAll('.rows.axis text').each(d => {
- expect(originalDomain.rows.has(d)).toBeTruthy();
+ expect(originalDomain.rows.has(`${d}`)).toBeTruthy();
});
});
});
",14
"diff --git a/gulpfile.js b/gulpfile.js @@ -22,32 +22,8 @@ const use = args['use'];
const regexForExcludedServices = /\/(intune|documentdbManagement|insightsManagement|insights|search)\//i;
function findReadmeNodejsMdFilePaths(azureRestAPISpecsRoot) {
- const nodejsReadmeFilePaths = [];
-
- // Find all of the readme.nodejs.md files within the azure-rest-api-specs/specification folder.
const specificationFolderPath = path.resolve(azureRestAPISpecsRoot, 'specification');
-
- const folderPathsToSearch = [specificationFolderPath];
- while (folderPathsToSearch.length > 0) {
- const folderPathToSearch = folderPathsToSearch.pop();
-
- const folderEntryPaths = fs.readdirSync(folderPathToSearch);
- for (let i = 0; i < folderEntryPaths.length; ++i) {
- const folderEntryPath = path.resolve(folderPathToSearch, folderEntryPaths[i]);
- const folderEntryStats = fs.lstatSync(folderEntryPath);
- if (folderEntryStats.isDirectory()) {
- folderPathsToSearch.push(folderEntryPath);
- }
- else if (folderEntryStats.isFile()) {
- const fileName = path.basename(folderEntryPath);
- if (fileName === 'readme.nodejs.md') {
- nodejsReadmeFilePaths.push(folderEntryPath);
- }
- }
- }
- }
-
- return nodejsReadmeFilePaths;
+ return glob.sync('**/readme.nodejs.md', { absolute: true, cwd: specificationFolderPath });
}
function getPackageNameFromReadmeNodejsMdFileContents(readmeNodejsMdFileContents) {
@@ -243,6 +219,8 @@ gulp.task('publish-packages', (cb) => {
for (let i = 0; i < nodejsReadmeFilePaths.length; ++i) {
const nodejsReadmeFilePath = nodejsReadmeFilePaths[i];
+ // console.log(`INFO: Processing ${nodejsReadmeFilePath}`);
+
const nodejsReadmeFileContents = fs.readFileSync(nodejsReadmeFilePath, 'utf8');
const relativeOutputFolderPath = nodejsReadmeFileContents.match(/output\-folder: \$\(node\-sdks\-folder\)\/(lib\/services\/\S+)/)[1];
const packageFolderPath = path.resolve(azureSDKForNodeRepoRoot, relativeOutputFolderPath);
",14
"diff --git a/runtime/ms-rest/lib/serialization.js b/runtime/ms-rest/lib/serialization.js @@ -75,7 +75,8 @@ exports.serialize = function (mapper, object, objectName) {
// false || X | undefined
// undefined || X | undefined/null
- const { required, nullable } = mapper;
+ const required = mapper.required;
+ const nullable = mapper.nullable;
if (required && nullable && object === undefined) {
throw new Error(`${objectName} cannot be undefined.`);
",14
"diff --git a/packages/wmr/src/wmr-middleware.js b/packages/wmr/src/wmr-middleware.js @@ -10,8 +10,6 @@ import { debug, formatPath } from './lib/output-utils.js';
import { getPlugins } from './lib/plugins.js';
import { watch } from './lib/fs-watcher.js';
import { matchAlias, resolveAlias } from './lib/aliasing.js';
-import { modularizeCss } from './plugins/wmr/styles/css-modules.js';
-import { processSass } from './plugins/wmr/styles/sass.js';
const NOOP = () => {};
@@ -237,17 +235,15 @@ export default function wmrMiddleware(options) {
} else if (queryParams.has('asset')) {
cacheKey += '?asset';
transform = TRANSFORMS.asset;
- } else if (prefix || hasIdPrefix || isModule || /\.([mc]js|[tj]sx?)$/.test(file)) {
+ } else if (prefix || hasIdPrefix || isModule || /\.([mc]js|[tj]sx?)$/.test(file) || /\.(css|s[ac]ss)$/.test(file)) {
transform = TRANSFORMS.js;
- } else if (/\.(css|s[ac]ss)$/.test(file)) {
- transform = TRANSFORMS.css;
} else {
transform = TRANSFORMS.generic;
}
try {
const start = Date.now();
- const result = await transform({
+ let result = await transform({
req,
res,
id,
@@ -266,6 +262,20 @@ export default function wmrMiddleware(options) {
// return a value to use it as the response:
if (result != null) {
+ // Grab the asset id out of the compiled js
+ // TODO: Wire this up into Style-Plugin by passing the
+ // import type through resolution somehow
+ if (!isModule && /\.(css|s[ac]ss)$/.test(file) && typeof result === 'string') {
+ const match = result.match(/style\([""']\/([^""']+?)[""'].*?\);/m);
+
+ if (match) {
+ if (WRITE_CACHE.has(match[1])) {
+ result = /** @type {string} */ WRITE_CACHE.get(match[1]);
+ res.setHeader('Content-Type', 'text/css;charset=utf-8');
+ }
+ }
+ }
+
log(`<-- ${kl.cyan(formatPath(id))} as ${kl.dim('' + res.getHeader('Content-Type'))}`);
const time = Date.now() - start;
res.writeHead(200, {
@@ -554,41 +564,6 @@ export const TRANSFORMS = {
}
},
- // Handles CSS Modules (the actual CSS)
- async css({ id, path, file, root, out, res, alias, cacheKey }) {
- if (!/\.(css|s[ac]ss)$/.test(path)) throw null;
-
- const isModular = /\.module\.(css|s[ac]ss)$/.test(path);
-
- const isSass = /\.(s[ac]ss)$/.test(path);
-
- res.setHeader('Content-Type', 'text/css;charset=utf-8');
-
- if (WRITE_CACHE.has(id)) return WRITE_CACHE.get(id);
-
- const idAbsolute = resolveFile(file, root, alias);
- let code = await fs.readFile(idAbsolute, 'utf-8');
-
- if (isModular) {
- code = await modularizeCss(code, id.replace(/^\.\//, ''), undefined, idAbsolute);
- } else if (isSass) {
- code = processSass(code);
- }
-
- // const plugin = wmrStylesPlugin({ cwd, hot: false, fullPath: true });
- // let code;
- // const context = {
- // emitFile(asset) {
- // code = asset.source;
- // }
- // };
- // await plugin.load.call(context, file);
-
- writeCacheFile(out, cacheKey, code);
-
- return code;
- },
-
// Falls through to sirv
async generic(ctx) {
// Serve ~/200.html fallback for requests with no extension
",14
"diff --git a/index.js b/index.js @@ -199,7 +199,7 @@ Peer.prototype.signal = function (data) {
self._pendingCandidates = []
if (self._pc.remoteDescription.type === 'offer') self._createAnswer()
- }, function (err) { self._onError(err) })
+ }, function (err) { self._destroy(err) })
}
if (!data.sdp && !data.candidate) {
self._destroy(new Error('signal() called with invalid signal data'))
@@ -212,7 +212,7 @@ Peer.prototype._addIceCandidate = function (candidate) {
self._pc.addIceCandidate(
new self._wrtc.RTCIceCandidate(candidate),
noop,
- function (err) { self._onError(err) }
+ function (err) { self._destroy(err) }
)
} catch (err) {
self._destroy(new Error('error adding candidate: ' + err.message))
@@ -245,7 +245,7 @@ Peer.prototype._destroy = function (err, onclose) {
if (self.destroyed) return
if (onclose) self.once('close', onclose)
- self._debug('destroy (error: %s)', err && err.message)
+ self._debug('destroy (error: %s)', err && (err.message || err))
self.readable = self.writable = false
@@ -307,7 +307,7 @@ Peer.prototype._setupData = function (event) {
// In some situations `pc.createDataChannel()` returns `undefined` (in wrtc),
// which is invalid behavior. Handle it gracefully.
// See: https://github.com/feross/simple-peer/issues/163
- return self._onError(new Error('Data channel event is missing `channel` property'))
+ return self._destroy(new Error('Data channel event is missing `channel` property'))
}
self._channel = event.channel
@@ -343,7 +343,7 @@ Peer.prototype._write = function (chunk, encoding, cb) {
try {
self.send(chunk)
} catch (err) {
- return self._onError(err)
+ return self._destroy(err)
}
if (self._channel.bufferedAmount > MAX_BUFFERED_AMOUNT) {
self._debug('start backpressure: bufferedAmount %d', self._channel.bufferedAmount)
@@ -386,7 +386,7 @@ Peer.prototype._createOffer = function () {
self._pc.createOffer(function (offer) {
if (self.destroyed) return
offer.sdp = self.sdpTransform(offer.sdp)
- self._pc.setLocalDescription(offer, noop, function (err) { self._onError(err) })
+ self._pc.setLocalDescription(offer, noop, function (err) { self._destroy(err) })
var sendOffer = function () {
var signal = self._pc.localDescription || offer
self._debug('signal')
@@ -397,7 +397,7 @@ Peer.prototype._createOffer = function () {
}
if (self.trickle || self._iceComplete) sendOffer()
else self.once('_iceComplete', sendOffer) // wait for candidates
- }, function (err) { self._onError(err) }, self.offerConstraints)
+ }, function (err) { self._destroy(err) }, self.offerConstraints)
}
Peer.prototype._createAnswer = function () {
@@ -407,7 +407,7 @@ Peer.prototype._createAnswer = function () {
self._pc.createAnswer(function (answer) {
if (self.destroyed) return
answer.sdp = self.sdpTransform(answer.sdp)
- self._pc.setLocalDescription(answer, noop, function (err) { self._onError(err) })
+ self._pc.setLocalDescription(answer, noop, function (err) { self._destroy(err) })
if (self.trickle || self._iceComplete) sendAnswer()
else self.once('_iceComplete', sendAnswer)
@@ -419,7 +419,7 @@ Peer.prototype._createAnswer = function () {
sdp: signal.sdp
})
}
- }, function (err) { self._onError(err) }, self.answerConstraints)
+ }, function (err) { self._destroy(err) }, self.answerConstraints)
}
Peer.prototype._onIceConnectionStateChange = function () {
@@ -594,7 +594,7 @@ Peer.prototype._maybeReady = function () {
try {
self.send(self._chunk)
} catch (err) {
- return self._onError(err)
+ return self._destroy(err)
}
self._chunk = null
self._debug('sent chunk from ""write before connect""')
@@ -696,13 +696,6 @@ Peer.prototype._onTrack = function (event) {
self.emit('stream', event.streams[0])
}
-Peer.prototype._onError = function (err) {
- var self = this
- if (self.destroyed) return
- self._debug('error %s', err.message || err)
- self._destroy(err)
-}
-
Peer.prototype._debug = function () {
var self = this
var args = [].slice.call(arguments)
",14
"diff --git a/index.js b/index.js @@ -553,15 +553,9 @@ Peer.prototype._maybeReady = function () {
self._connecting = true
- var withinIntervalCallback = false
// We can't rely on order here, for details see https://github.com/js-platform/node-webrtc/issues/339
- var interval = setInterval(function () {
- if (self.destroyed) {
- clearInterval(interval)
- return
- }
- if (withinIntervalCallback) return
- withinIntervalCallback = true
+ function findCandidatePair () {
+ if (self.destroyed) return
self.getStats(function (err, items) {
if (self.destroyed) return
@@ -647,10 +641,8 @@ Peer.prototype._maybeReady = function () {
)
}
- withinIntervalCallback = false
- if (self.connected) {
- clearInterval(interval)
- } else {
+ if (!self.connected) {
+ setTimeout(findCandidatePair, 100)
return
}
@@ -682,7 +674,8 @@ Peer.prototype._maybeReady = function () {
self._earlyMessage = null
}
})
- }, 100)
+ }
+ findCandidatePair()
}
Peer.prototype._onInterval = function () {
",14
"diff --git a/test/multistream.js b/test/multistream.js @@ -12,6 +12,11 @@ test('get config', function (t) {
})
test('multistream', function (t) {
+ if (common.isBrowser('ios')) {
+ t.pass('Skip on iOS emulator which does not support this reliably') // iOS emulator issue #486
+ t.end()
+ return
+ }
t.plan(20)
var peer1 = new Peer({
@@ -54,6 +59,49 @@ test('multistream', function (t) {
})
})
+test('multistream (track event)', function (t) {
+ t.plan(20)
+
+ var peer1 = new Peer({
+ config: config,
+ initiator: true,
+ wrtc: common.wrtc,
+ streams: (new Array(5)).fill(null).map(function () { return common.getMediaStream() })
+ })
+ var peer2 = new Peer({
+ config: config,
+ wrtc: common.wrtc,
+ streams: (new Array(5)).fill(null).map(function () { return common.getMediaStream() })
+ })
+
+ peer1.on('signal', function (data) { if (!peer2.destroyed) peer2.signal(data) })
+ peer2.on('signal', function (data) { if (!peer1.destroyed) peer1.signal(data) })
+
+ var receivedIds = {}
+
+ peer1.on('track', function (track) {
+ t.pass('peer1 got track')
+ if (receivedIds[track.id]) {
+ t.fail('received one unique track per event')
+ } else {
+ receivedIds[track.id] = true
+ }
+ })
+ peer2.on('track', function (track) {
+ t.pass('peer2 got track')
+ if (receivedIds[track.id]) {
+ t.fail('received one unique track per event')
+ } else {
+ receivedIds[track.id] = true
+ }
+ })
+
+ t.on('end', () => {
+ peer1.destroy()
+ peer2.destroy()
+ })
+})
+
test('multistream on non-initiator only', function (t) {
t.plan(30)
@@ -135,6 +183,11 @@ test('delayed stream on non-initiator', function (t) {
})
test('incremental multistream', function (t) {
+ if (common.isBrowser('ios')) {
+ t.pass('Skip on iOS emulator which does not support this reliably') // iOS emulator issue #486
+ t.end()
+ return
+ }
t.plan(12)
var peer1 = new Peer({
@@ -197,7 +250,75 @@ test('incremental multistream', function (t) {
})
})
+test('incremental multistream (track event)', function (t) {
+ t.plan(22)
+
+ var peer1 = new Peer({
+ config: config,
+ initiator: true,
+ wrtc: common.wrtc,
+ streams: []
+ })
+ var peer2 = new Peer({
+ config: config,
+ wrtc: common.wrtc,
+ streams: []
+ })
+
+ peer1.on('signal', function (data) { if (!peer2.destroyed) peer2.signal(data) })
+ peer2.on('signal', function (data) { if (!peer1.destroyed) peer1.signal(data) })
+
+ peer1.on('connect', function () {
+ t.pass('peer1 connected')
+ peer1.addStream(common.getMediaStream())
+ })
+ peer2.on('connect', function () {
+ t.pass('peer2 connected')
+ peer2.addStream(common.getMediaStream())
+ })
+
+ var receivedIds = {}
+
+ var count1 = 0
+ peer1.on('track', function (track) {
+ t.pass('peer1 got track')
+ if (receivedIds[track.id]) {
+ t.fail('received one unique track per event')
+ } else {
+ receivedIds[track.id] = true
+ }
+ count1++
+ if (count1 % 2 === 0 && count1 < 10) {
+ peer1.addStream(common.getMediaStream())
+ }
+ })
+
+ var count2 = 0
+ peer2.on('track', function (track) {
+ t.pass('peer2 got track')
+ if (receivedIds[track.id]) {
+ t.fail('received one unique track per event')
+ } else {
+ receivedIds[track.id] = true
+ }
+ count2++
+ if (count2 % 2 === 0 && count2 < 10) {
+ peer2.addStream(common.getMediaStream())
+ }
+ })
+
+ t.on('end', () => {
+ peer1.destroy()
+ peer2.destroy()
+ })
+})
+
test('incremental multistream on non-initiator only', function (t) {
+ if (common.isBrowser('ios')) {
+ t.pass('Skip on iOS emulator which does not support this reliably') // iOS emulator issue #486
+ t.end()
+ return
+ }
t.plan(7)
var peer1 = new Peer({
@@ -245,6 +366,54 @@ test('incremental multistream on non-initiator only', function (t) {
})
})
+test('incremental multistream on non-initiator only (track event)', function (t) {
+ t.plan(12)
+
+ var peer1 = new Peer({
+ config: config,
+ initiator: true,
+ wrtc: common.wrtc,
+ streams: []
+ })
+ var peer2 = new Peer({
+ config: config,
+ wrtc: common.wrtc,
+ streams: []
+ })
+
+ peer1.on('signal', function (data) { if (!peer2.destroyed) peer2.signal(data) })
+ peer2.on('signal', function (data) { if (!peer1.destroyed) peer1.signal(data) })
+
+ peer1.on('connect', function () {
+ t.pass('peer1 connected')
+ })
+ peer2.on('connect', function () {
+ t.pass('peer2 connected')
+ peer2.addStream(common.getMediaStream())
+ })
+
+ var receivedIds = {}
+
+ var count = 0
+ peer1.on('track', function (track) {
+ t.pass('peer1 got track')
+ if (receivedIds[track.id]) {
+ t.fail('received one unique track per event')
+ } else {
+ receivedIds[track.id] = true
+ }
+ count++
+ if (count % 2 === 0 && count < 10) {
+ peer2.addStream(common.getMediaStream())
+ }
+ })
+
+ t.on('end', () => {
+ peer1.destroy()
+ peer2.destroy()
+ })
+})
+
test('addStream after removeStream', function (t) {
if (common.isBrowser('safari') || common.isBrowser('ios')) {
t.pass('Skip on Safari and iOS which do not support this reliably') // TODO: Enable in Safari 12.2
",14
"diff --git a/src/lib/default-project/project.json b/src/lib/default-project/project.json ""currentCostume"": 0,
""costumes"": [
{
- ""assetId"": ""739b5e2a2435f6e1ec2993791b423146"",
+ ""assetId"": ""cd21514d0531fdffb22204e0ec5ed84a"",
""name"": ""backdrop1"",
- ""bitmapResolution"": 1,
- ""md5ext"": ""739b5e2a2435f6e1ec2993791b423146.png"",
- ""dataFormat"": ""png"",
+ ""md5ext"": ""cd21514d0531fdffb22204e0ec5ed84a.svg"",
+ ""dataFormat"": ""svg"",
""rotationCenterX"": 240,
""rotationCenterY"": 180
}
",14
"diff --git a/sheets/javascript.md b/sheets/javascript.md @@ -224,3 +224,39 @@ axios({
console.log(result.data);
});
```
+
+## Remove vowels from string
+
+Use a regular expression:
+
+```js
+'replace vowels from string'.replace(/[aeiou]/gi, '');
+```
+
+Output:
+
+```bash
+""rplc vwls frm strng""
+```
+
+With JavaScript functions:
+
+```js
+'replace vowels from string'
+ .split('a')
+ .join('')
+ .split('e')
+ .join('')
+ .split('i')
+ .join('')
+ .split('o')
+ .join('')
+ .split('u')
+ .join('');
+```
+
+Output:
+
+```bash
+""rplc vwls frm strng""
+```
",14
"diff --git a/lib/run/index.js b/lib/run/index.js @@ -112,7 +112,7 @@ module.exports = function (options, callback) {
},
certificates: options.sslClientCert && new sdk.CertificateList({}, [{
name: 'client-cert',
- matches: ['<all_urls>'], // todo - expose this as a constant from the SDK.
+ matches: [sdk.UrlMatchPattern.MATCH_ALL_URLS],
key: { src: options.sslClientKey },
cert: { src: options.sslClientCert },
passphrase: options.sslClientPassphrase
",14
"diff --git a/lib/cli/index.js b/lib/cli/index.js @@ -6,6 +6,22 @@ var _ = require('lodash'),
colors = require('colors'),
version = require('../../package.json').version,
+ /**
+ * A CLI parser helper to process stringified numbers into integers, perform safety checks, and return the result.
+ *
+ * @param {String} arg - The stringified number argument pulled from the CLI arguments list.
+ * @returns {Number} - The supplied argument, casted to an integer.
+ */
+ Integer = (arg) => {
+ var num = Number(arg);
+
+ if (!_.isSafeInteger(num)) {
+ throw new Error('The value must be an integer.');
+ }
+
+ return num.valueOf();
+ },
+
/**
* Separates reporter specific arguments from the rest.
*
@@ -55,6 +71,7 @@ var _ = require('lodash'),
* @returns {{key, value}} - The object representation of the current CLI variable.
*/
function collect (val, memo) {
+ console.log(""Val : "", val);
var arg = val,
eqIndex = arg.indexOf('='),
hasEq = eqIndex !== -1;
@@ -73,27 +90,27 @@ var _ = require('lodash'),
.option('-g, --globals <path>', 'Specify a URL or Path to a file containing Postman Globals.')
.option('--folder <path>', 'Run a single folder from a collection.')
.option('-r, --reporters [reporters]', 'Specify the reporters to use for this run.', 'cli')
- .option('-n, --iteration-count <n>', 'Define the number of iterations to run.', parseInt)
+ .option('-n, --iteration-count <n>', 'Define the number of iterations to run.', Integer)
.option('-d, --iteration-data <path>', 'Specify a data file to use for iterations (either json or csv).')
.option('--export-environment <path>', 'Exports the environment to a file after completing the run.')
.option('--export-globals <path>', 'Specify an output file to dump Globals before exiting.')
- .option('--export-collection', 'Specify an output file to save the executed collection')
- .option('--delay-request [n]', 'Specify the extent of delay between requests (milliseconds)', parseInt, 0)
+ .option('--export-collection <path>', 'Specify an output file to save the executed collection')
+ .option('--delay-request [n]', 'Specify the extent of delay between requests (milliseconds)', Integer)
.option('--bail',
- 'Specify whether or not to gracefully stop a collection run on encountering the first error', false)
+ 'Specify whether or not to gracefully stop a collection run on encountering the first error.')
.option('-x , --suppress-exit-code',
- 'Specify whether or not to override the default exit code for the current run', false)
- .option('--silent', 'Prevents newman from showing output to CLI', false)
+ 'Specify whether or not to override the default exit code for the current run.')
+ .option('--silent', 'Prevents newman from showing output to CLI.')
.option('--disable-unicode',
'Forces unicode compliant symbols to be replaced by their plain text equivalents')
- .option('--global-var [value]',
+ .option('--global-var <value>',
'Allows the specification of global variables via the command line, in a key=value format', collect, [])
// commander had some issue with flags starting with --no, thus camelCased
// resolved https://github.com/tj/commander.js/pull/709
.option('--no-color', 'Disable colored output.')
.option('--color', 'Force colored output (for use in CI environments).')
- .option('--timeout-request <n>', 'Specify a timeout for requests (in milliseconds).', parseInt)
- .option('--timeout-script <n>', 'Specify a timeout for script (in milliseconds).', parseInt)
+ .option('--timeout-request <n>', 'Specify a timeout for requests (in milliseconds).', Integer)
+ .option('--timeout-script <n>', 'Specify a timeout for script (in milliseconds).', Integer)
.option('--ignore-redirects', 'If present, Newman will not follow HTTP Redirects.')
.option('-k, --insecure', 'Disables SSL validations.')
.option('--ssl-client-cert <path>',
@@ -166,7 +183,7 @@ var _ = require('lodash'),
var command = options._name,
optionsObj = { [command]: {} };
- optionsObj[command].version = options.version || false;
+ optionsObj[command].version = options._version || false;
optionsObj[command].noColor = !options.color || false;
optionsObj[command].color = options.color || false;
optionsObj[command].timeoutRequest = options.timeoutRequest || null;
",14
"diff --git a/package.json b/package.json ""eslint-plugin-mocha"": ""4.11.0"",
""eslint-plugin-security"": ""1.4.0"",
""expect.js"": ""0.3.1"",
- ""istanbul"": ""0.4.5"",
""js-yaml"": ""3.10.0"",
""jsdoc"": ""3.5.5"",
""jsdoc-to-markdown"": ""3.0.1"",
""mocha"": ""4.0.1"",
""nsp"": ""2.8.1"",
+ ""nyc"": ""11.3.0"",
""packity"": ""0.3.2"",
""parse-gitignore"": ""0.4.0"",
""postman-jsdoc-theme"": ""0.0.3"",
",14
"diff --git a/package.json b/package.json ""dependencies"": {
""async"": ""2.6.1"",
""cli-progress"": ""1.8.0"",
- ""cli-table2"": ""0.2.0"",
+ ""cli-table3"": ""0.4.0"",
""colors"": ""1.3.0"",
""commander"": ""2.15.1"",
""csv-parse"": ""1.3.3"",
",14
"diff --git a/lib/reporters/cli/index.js b/lib/reporters/cli/index.js var _ = require('lodash'),
colors = require('colors/safe'),
- Table = require('cli-table2'),
+ Table = require('cli-table3'),
format = require('util').format,
util = require('../../util'),
",14
"diff --git a/lib/syntax/index.js b/lib/syntax/index.js @@ -21,7 +21,13 @@ function createParseContext(name) {
}
function isValidNumber(value) {
- return Number.isInteger(value) && value >= 0;
+ // Number.isInteger(value) && value >= 0
+ return (
+ typeof value === 'number' &&
+ isFinite(value) &&
+ Math.floor(value) === value &&
+ value >= 0
+ );
}
function isValidLocation(loc) {
",14
"diff --git a/src/components/screens/IndexScreen/Hero.js b/src/components/screens/IndexScreen/Hero.js @@ -374,7 +374,7 @@ export default function Hero({
title=""Chromatic intro video""
width=""560""
height=""315""
- src=""https://www.youtube.com/embed/dQw4w9WgXcQ?autoplay=1&rel=0&amp;showinfo=0""
+ src=""https://www.youtube.com/embed/wj9tcB5CGxI?autoplay=1&rel=0&amp;showinfo=0""
frameBorder=""0""
allow=""autoplay; encrypted-media""
allowFullScreen
",14
"diff --git a/README.md b/README.md -<a href=""https://codaprotocol.org"">
+<a href=""https://codaprotocol.com"">
<img width=""200"" src=""./frontend/website/static/img/coda-logo@3x.png"" alt=""Coda Logo"" />
</a>
<hr/>
-Coda is the first cryptocurrency with a lightweight, constant-sized blockchain. This is the main source code repository for the Coda project. It contains code for the OCaml protocol implementation, [website](https://codaprotocol.org), and wallet.
+Coda is the first cryptocurrency with a lightweight, constant-sized blockchain. This is the main source code repository for the Coda project. It contains code for the OCaml protocol implementation, [website](https://codaprotocol.com), and wallet.
## Notes
",14
"diff --git a/scripts/pin-external-packages.sh b/scripts/pin-external-packages.sh PACKAGES=""ocaml-sodium rpc_parallel ocaml-extlib digestif ocaml-extlib async_kernel coda_base58 graphql_ppx""
-git package sync && git package update --init --recursive
+git submodule sync && git submodule update --init --recursive
for pkg in $PACKAGES; do
echo ""Pinning package"" $pkg
",14
"diff --git a/buildkite/src/Jobs/LintOpt.dhall b/buildkite/src/Jobs/LintOpt.dhall @@ -24,7 +24,7 @@ Pipeline.build
, steps =
[ Command.build
Command.Config::
- { commands = OpamInit.andThenRunInDocker ([] : List Text) ""CI=true BASE_BRANCH_NAME=$(pipeline.git.base_revision) ./scripts/compare_ci_diff_types.sh""
+ { commands = OpamInit.andThenRunInDocker ([] : List Text) ""CI=true BASE_BRANCH_NAME=$BUILDKITE_PULL_REQUEST_BASE_BRANCH ./scripts/compare_ci_diff_types.sh""
, label = ""Compare CI diff types""
, key = ""lint-diff-types""
, target = Size.Medium
@@ -32,7 +32,7 @@ Pipeline.build
},
Command.build
Command.Config::
- { commands = OpamInit.andThenRunInDocker ([] : List Text) ""CI=true BASE_BRANCH_NAME=$(pipeline.git.base_revision) ./scripts/compare_ci_diff_binables.sh""
+ { commands = OpamInit.andThenRunInDocker ([] : List Text) ""CI=true BASE_BRANCH_NAME=$BUILDKITE_PULL_REQUEST_BASE_BRANCH ./scripts/compare_ci_diff_binables.sh""
, label = ""Compare CI diff binables""
, key = ""lint-diff-binables""
, target = Size.Medium
",14
"diff --git a/src/lib/zexe_backend/zexe_backend_common/plonk_dlog_keypair.ml b/src/lib/zexe_backend/zexe_backend_common/plonk_dlog_keypair.ml @@ -102,9 +102,9 @@ module Make (Inputs : Inputs_intf) = struct
let urs = ref None in
let degree = 1 lsl Pickles_types.Nat.to_int Rounds.n in
(* TODO *)
- let public_inputs = Unsigned.Size_t.of_int 0 in
+ let public_inputs = failwith ""TODO"" in
(* TODO *)
- let size = Unsigned.Size_t.of_int 0 in
+ let size = failwith ""TODO"" in
let set_urs_info specs =
Set_once.set_exn urs_info Lexing.dummy_pos specs
in
",14
"diff --git a/src/lib/staged_ledger/staged_ledger.ml b/src/lib/staged_ledger/staged_ledger.ml @@ -1910,7 +1910,7 @@ let%test_module ""test"" =
| (cmd : User_command.Valid.t) :: cmds ->
let%bind _ =
Ledger.apply_transaction ~constraint_constants test_ledger
- ~txn_state_view:(failwith ""TODO"")
+ ~txn_state_view:(dummy_state_view ())
(Command (cmd :> User_command.t))
in
apply_cmds cmds
",14
"diff --git a/rfcs/0039-snark-keys-management.md b/rfcs/0039-snark-keys-management.md @@ -52,7 +52,12 @@ JSON format before the actual contents, specifying
zexe repos used when generating the keys
* the length of the binary data following the header, so that we can validate
that the file was successfully downloaded in full, where applicable
-* the date when the file's contents were created
+* the date associated with the current commit
+ - we don't chose the file generation time, in order to make the header
+ reproducible
+ - it is helpful to have some notion of date, so that we can build a simple
+ `ls`-style tool that we can use to identify out-of-date keys in the local
+ cache etc.
* the type of the file's contents
* the constraint system hash (for keys) or domain size (for URS)
* any other input information
@@ -82,7 +87,7 @@ For example, a header for the transaction snark key file might look like:
, ""marlin"": ""COMMIT_SHA_HERE""
, ""zexe"": ""COMMIT_SHA_HERE"" }
, ""length"": 1000000000
-, ""date"": ""1970-01-01 00:00:00""
+, ""commit_date"": ""1970-01-01 00:00:00""
, ""constraint_system_hash"": ""MD5_HERE""
, ""identifying_hash"": ""HASH_HERE"" }
```
",14
"diff --git a/automation/terraform/modules/kubernetes/testnet/helm.tf b/automation/terraform/modules/kubernetes/testnet/helm.tf @@ -119,13 +119,13 @@ locals {
# in addition to stand-alone servers up to input count
[
for index in range(2, var.archive_node_count + 1):
- defaults(
+ merge(
+ local.default_archive_node,
{
name = ""archive-${index}"",
enableLocalDaemon = false,
enablePostgresDB = false
- },
- local.default_archive_node
+ }
)
]
)
",14
"diff --git a/src/lib/genesis_ledger_helper/lib/genesis_ledger_helper_lib.ml b/src/lib/genesis_ledger_helper/lib/genesis_ledger_helper_lib.ml @@ -129,29 +129,9 @@ module Accounts = struct
t (List.length state)
else Ok (Snapp_state.V.of_list_exn state)
in
- let%bind verification_key =
- (* Use a URI-safe alphabet to make life easier for maintaining json
- We prefer this to base58-check here because users should not
- be manually entering verification keys.
- *)
- Option.value_map ~default:(Ok None) verification_key
- ~f:(fun verification_key ->
- let%map vk =
- Base64.decode ~alphabet:Base64.uri_safe_alphabet
- verification_key
- |> Result.map_error ~f:(function `Msg s ->
- Error.createf
- !""Could not parse verification key account \
- %{sexp:Runtime_config.Accounts.Single.t}: %s""
- t s)
- |> Result.map
- ~f:
- (Binable.of_string
- ( module Pickles.Side_loaded.Verification_key
- .Stable
- .Latest ))
- in
- Some (With_hash.of_data ~hash_data:Snapp_account.digest_vk vk))
+ let verification_key =
+ Option.map verification_key
+ ~f:(With_hash.of_data ~hash_data:Snapp_account.digest_vk)
in
let%map rollup_state =
if
@@ -288,12 +268,7 @@ module Accounts = struct
->
let state = Snapp_state.V.to_list app_state in
let verification_key =
- Option.map verification_key ~f:(fun vk ->
- With_hash.data vk
- |> Binable.to_string
- ( module Pickles.Side_loaded.Verification_key.Stable
- .Latest )
- |> Base64.encode_exn ~alphabet:Base64.uri_safe_alphabet)
+ Option.map verification_key ~f:With_hash.data
in
let rollup_state = Pickles_types.Vector.to_list rollup_state in
let last_rollup_slot =
",14
"diff --git a/src/lib/crypto/kimchi_bindings/stubs/README.md b/src/lib/crypto/kimchi_bindings/stubs/README.md @@ -28,7 +28,12 @@ There are two ways of dealing with types:
The first option is the easiest one, unless there are some foreign types in there. (Because of Rust's [*orphan rule*](https://github.com/Ixrec/rust-orphan-rules)) you can't implement the ToValue and FromValue traits on foreign types.)
-This means that you'll have to use the second option anytime you're dealing with foreign types, by wrapping them into a local type and using `custom!`.
+You should use a custom type where OCaml doesn't need to access the internal
+fields of the type (or if it is itself a primitive, such as a field element or
+bigint); otherwise, you must create the desired OCaml structure/enum as a rust
+structure and perform a conversion between this new type and the original
+foreign rust type. In general, the choice of which to use should be governed by
+what's required in OCaml, **not** by limitations in the rust language.
### The ToValue and FromValue traits
",14
"diff --git a/src/lib/crypto/kimchi_bindings/stubs/README.md b/src/lib/crypto/kimchi_bindings/stubs/README.md @@ -37,7 +37,7 @@ what's required in OCaml, **not** by limitations in the rust language.
### The ToValue and FromValue traits
-In both methods, the [traits ToValue and FromValue](https://github.com/zshipko/ocaml-rs/blob/master/src/value.rs#L55:L73) are used:
+In both methods, the [traits ToValue and FromValue](https://github.com/zshipko/ocaml-rs/blob/f300f2f382a694a6cc51dc14a9b3f849191580f0/src/value.rs#L55:L73) are used:
```rust=
pub unsafe trait IntoValue {
@@ -48,7 +48,7 @@ pub unsafe trait FromValue<'a> {
}
```
-these traits are implemented for all primitive Rust types ([here](https://github.com/zshipko/ocaml-rs/blob/master/src/conv.rs)), and can be derived automatically via [derive macros](https://docs.rs/ocaml/0.22.0/ocaml/#derives). Don't forget that you can use [cargo expand](https://github.com/dtolnay/cargo-expand) to expand macros, which is really useful to understand what the ocaml-rs macros are doing.
+these traits are implemented for all primitive Rust types ([here](https://github.com/zshipko/ocaml-rs/blob/f300f2f382a694a6cc51dc14a9b3f849191580f0/src/conv.rs)), and can be derived automatically via [derive macros](https://docs.rs/ocaml/0.22.0/ocaml/#derives). Don't forget that you can use [cargo expand](https://github.com/dtolnay/cargo-expand) to expand macros, which is really useful to understand what the ocaml-rs macros are doing.
```
$ cargo expand -- some_filename_without_rs > expanded.rs
@@ -56,7 +56,7 @@ $ cargo expand -- some_filename_without_rs > expanded.rs
### Custom types
-The macro [custom!](https://github.com/zshipko/ocaml-rs/blob/master/src/custom.rs) allows you to quickly create custom types.
+The macro [custom!](https://github.com/zshipko/ocaml-rs/blob/f300f2f382a694a6cc51dc14a9b3f849191580f0/src/custom.rs) allows you to quickly create custom types.
Values of custom types are opaque to OCaml, used to store the data of some rust
value on the OCaml heap. When this data may contain pointers to the rust heap,
@@ -89,7 +89,7 @@ pub unsafe fn alloc_custom<T: crate::Custom>() -> Value {
}
```
-and the data of your type (probably a pointer to some Rust memory) is copied into the OCaml's heap ([source](https://github.com/zshipko/ocaml-rs/blob/master/src/types.rs#L80)):
+and the data of your type (probably a pointer to some Rust memory) is copied into the OCaml's heap ([source](https://github.com/zshipko/ocaml-rs/blob/f300f2f382a694a6cc51dc14a9b3f849191580f0/src/types.rs#L80)):
```rust=
pub fn set(&mut self, x: T) {
",14
"diff --git a/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml b/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml @@ -198,7 +198,10 @@ module Plonk_constraint = struct
; b8 = f b8
}
- (* TODO: this seems to be a ""double check"" type of function? It just checks that the basic gate is equal to 0? what is eval_one? what is v and f? *)
+ (** [eval (module F) get_variable gate] checks that [gate]'s polynomial is
+ satisfied by the assignments given by [get_variable].
+ Currently only implemented for the [Basic] gate.
+ *)
let eval (type v f)
(module F : Snarky_backendless.Field_intf.S with type t = f)
(eval_one : v -> f) (t : (v, f) t) =
",14
"diff --git a/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml b/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml @@ -200,7 +200,7 @@ module Plonk_constraint = struct
(** [eval (module F) get_variable gate] checks that [gate]'s polynomial is
satisfied by the assignments given by [get_variable].
- Currently only implemented for the [Basic] gate.
+ Warning: currently only implemented for the [Basic] gate.
*)
let eval (type v f)
(module F : Snarky_backendless.Field_intf.S with type t = f)
@@ -228,7 +228,6 @@ module Plonk_constraint = struct
false )
else true
| _ ->
- (* TODO: this fails open for other gates than basic? *)
true
end
",14
"diff --git a/src/lib/snarky_js_bindings/lib/snarky_js_bindings_lib.ml b/src/lib/snarky_js_bindings/lib/snarky_js_bindings_lib.ml @@ -1622,39 +1622,79 @@ let dummy_constraints =
(Kimchi_backend_common.Scalar_challenge.create x)
: Field.t * Field.t )
-type ('a_var, 'a_value, 'a_weird) pickles_rule =
- { identifier : string
- ; prevs : 'a_weird list
- ; main : 'a_var list -> 'a_var -> Boolean.var list
- ; main_value : 'a_value list -> 'a_value -> bool list
- }
+type ('a_var, 'a_value) packed_pickles_rule =
+ | Packed_inductive :
+ ( 'prev_vars
+ , 'prev_values
+ , 'widths
+ , 'heights
+ , 'a_var
+ , 'a_value )
+ Pickles.Inductive_rule.t
+ -> ('a_var, 'a_value) packed_pickles_rule
+
+type ('a_var, 'a_value) packed_pickles_rules =
+ | Packed_inductive_list :
+ ( 'prev_varss
+ , 'prev_valuess
+ , 'widthss
+ , 'heightss
+ , 'a_var
+ , 'a_value )
+ Pickles_types.Hlist.H4_2.T(Pickles.Inductive_rule).t
+ -> ('a_var, 'a_value) packed_pickles_rules
+
+let rec combine_packed_rules :
+ type a_var a_value.
+ (a_var, a_value) packed_pickles_rule list
+ -> (a_var, a_value) packed_pickles_rules = function
+ | [] ->
+ Packed_inductive_list []
+ | Packed_inductive hd :: tl ->
+ let (Packed_inductive_list tl) = combine_packed_rules tl in
+ Packed_inductive_list (hd :: tl)
+
+let rec split_packed_rules :
+ type a_var a_value.
+ (a_var, a_value) packed_pickles_rules
+ -> (a_var, a_value) packed_pickles_rule list = function
+ | Packed_inductive_list [] ->
+ []
+ | Packed_inductive_list (hd :: tl) ->
+ Packed_inductive hd :: split_packed_rules (Packed_inductive_list tl)
type pickles_rule_js = Js.js_string Js.t * (zkapp_statement_js -> unit)
let create_pickles_rule ((identifier, main) : pickles_rule_js) =
+ Packed_inductive
{ identifier = Js.to_string identifier
; prevs = []
; main =
- (fun _ statement ->
+ (fun statement ->
dummy_constraints () ;
main (Zkapp_statement.to_js statement) ;
[] )
- ; main_value = (fun _ _ -> [])
}
let dummy_rule self =
+ Packed_inductive
{ identifier = ""dummy""
; prevs = [ self; self ]
- ; main_value = (fun _ _ -> [ true; true ])
; main =
- (fun _ _ ->
+ (fun _ ->
dummy_constraints () ;
(* unsatisfiable *)
let x =
Impl.exists Field.typ ~compute:(fun () -> Field.Constant.zero)
in
Field.(Assert.equal x (x + one)) ;
- Boolean.[ true_; true_ ] )
+ let public_input =
+ Impl.exists zkapp_statement_typ ~compute:(fun () ->
+ assert false )
+ in
+ [ { public_input; proof_must_verify = Boolean.true_ }
+ ; { public_input; proof_must_verify = Boolean.true_ }
+ ] )
}
let other_verification_key_constr :
@@ -1697,13 +1737,55 @@ let nat_module (i : int) : (module Pickles_types.Nat.Intf) =
let pickles_compile (choices : pickles_rule_js Js.js_array Js.t) =
let choices = choices |> Js.to_array |> Array.to_list in
let branches = List.length choices + 1 in
+ let module Types = struct
+ type prev_varss
+
+ type prev_valuess
+
+ type widthss
+
+ type heightss
+ end in
let choices ~self =
+ let (Packed_inductive_list l) =
List.map choices ~f:create_pickles_rule @ [ dummy_rule self ]
+ |> combine_packed_rules
+ in
+ let convert_unsafe :
+ type prev_varss prev_valuess widthss heightss.
+ ( prev_varss
+ , prev_valuess
+ , widthss
+ , heightss
+ , Zkapp_statement.t
+ , Zkapp_statement.Constant.t )
+ Pickles_types.Hlist.H4_2.T(Pickles.Inductive_rule).t
+ -> ( Types.prev_varss
+ , Types.prev_valuess
+ , Types.widthss
+ , Types.heightss
+ , Zkapp_statement.t
+ , Zkapp_statement.Constant.t )
+ Pickles_types.Hlist.H4_2.T(Pickles.Inductive_rule).t =
+ fun l ->
+ (* Be very careful with this value. *)
+ let (T, T, T, T)
+ : (prev_varss, Types.prev_varss) Core_kernel.Type_equal.t
+ * (prev_valuess, Types.prev_valuess) Core_kernel.Type_equal.t
+ * (widthss, Types.widthss) Core_kernel.Type_equal.t
+ * (heightss, Types.heightss) Core_kernel.Type_equal.t =
+ ( Obj.magic Core_kernel.Type_equal.T
+ , Obj.magic Core_kernel.Type_equal.T
+ , Obj.magic Core_kernel.Type_equal.T
+ , Obj.magic Core_kernel.Type_equal.T )
+ in
+ l
+ in
+ convert_unsafe l
in
let (module Branches) = nat_module branches in
- (* TODO get rid of Obj.magic for choices *)
let tag, _cache, p, provers =
- Pickles.compile_promise ~choices:(Obj.magic choices)
+ Pickles.compile_promise ~choices
(module Zkapp_statement)
(module Zkapp_statement.Constant)
~typ:zkapp_statement_typ
@@ -1728,8 +1810,7 @@ let pickles_compile (choices : pickles_rule_js Js.js_array Js.t) =
let module Proof = (val p) in
let to_js_prover prover =
let prove (statement_js : zkapp_statement_js) =
- (* TODO: get rid of Obj.magic, this should be an empty ""H3.T"" *)
- let prevs = Obj.magic [] in
+ let prevs: (_, _, _) Statement_with_proof.t = Obj.magic [] in
let statement = Zkapp_statement.(statement_js |> of_js |> to_constant) in
prover ?handler:None prevs statement |> Promise_js_helpers.to_js
in
",14
"diff --git a/src/app/client_sdk/js_util.ml b/src/app/client_sdk/js_util.ml @@ -6,7 +6,8 @@ open Mina_base
module Global_slot = Mina_numbers.Global_slot
module Memo = Signed_command_memo
-let raise_js_error s = Js.raise_js_error (new%js Js.error_constr (Js.string s))
+let raise_js_error s =
+ Js_error.(raise_ @@ of_error (new%js Js.error_constr (Js.string s)))
type string_js = Js.js_string Js.t
",14
"diff --git a/src/lib/pickles/pickles.ml b/src/lib/pickles/pickles.ml @@ -520,12 +520,13 @@ struct
let step_data =
let i = ref 0 in
Timer.clock __LOC__ ;
- let module M =
- H4.Map (IR) (Branch_data)
- (struct
- let f :
- type a b c d. (a, b, c, d) IR.t -> (a, b, c, d) Branch_data.t =
- fun rule ->
+ let rec f :
+ type a b c d.
+ (a, b, c, d) H4.T(IR).t -> (a, b, c, d) H4.T(Branch_data).t = function
+ | [] ->
+ []
+ | rule :: rules ->
+ let first =
Timer.clock __LOC__ ;
let res =
Common.time ""make step data"" (fun () ->
@@ -536,9 +537,10 @@ struct
~wrap_domains ~proofs_verifieds )
in
Timer.clock __LOC__ ; incr i ; res
- end)
in
- M.f choices
+ first :: f rules
+ in
+ f choices
in
Timer.clock __LOC__ ;
let step_domains =
",14
"diff --git a/src/lib/pickles/pseudo/pseudo.ml b/src/lib/pickles/pseudo/pseudo.ml @@ -64,7 +64,7 @@ module Make (Impl : Snarky_backendless.Snark_intf.Run) = struct
let all_shifts = Vector.map log2s ~f:(fun d -> shifts ~log2_size:d) in
match all_shifts with
| [] ->
- Array.init num_shifts ~f:(fun _ -> Field.zero)
+ failwith ""Pseudo.Domain.shifts: no domains were given""
| shifts :: other_shiftss ->
(* Runtime check that the shifts across all domains are consistent.
The optimisation below will not work if this is not true; if the
",14
"diff --git a/serverjs/cubefn.js b/serverjs/cubefn.js @@ -106,7 +106,7 @@ function setCubeType(cube, carddb) {
let peasant = false;
let type = FORMATS.length - 1;
for (const card of cube.cards) {
- if (pauper && !['legal', 'banned'].includes(carddb.cardFromId(card.cardID).legalities.Pauper)) {
+ if (pauper && !cardIsLegal(carddb.cardFromId(card.cardID), 'Pauper')) {
pauper = false;
peasant = true;
}
",14
"diff --git a/README.md b/README.md @@ -49,10 +49,10 @@ To get started, check out:
Use [Releases page](https://github.com/wenzhixin/bootstrap-table/releases) or [the source](https://github.com/wenzhixin/bootstrap-table/archive/master.zip).
-### Bower
+### Yarn
```
-bower install bootstrap-table
+yarn add bootstrap-table
```
### Npm
",14
"diff --git a/docusaurus/docs/setting-up-your-editor.md b/docusaurus/docs/setting-up-your-editor.md @@ -55,7 +55,7 @@ Then add the block below to your `launch.json` file and put it inside the `.vsco
""type"": ""chrome"",
""request"": ""launch"",
""url"": ""http://localhost:3000"",
- ""webRoot"": ""${workspaceRoot}/src"",
+ ""webRoot"": ""${workspaceFolder}/src"",
""sourceMapPathOverrides"": {
""webpack:///src/*"": ""${webRoot}/*""
}
",14
"diff --git a/packages/react-scripts/lib/react-app.d.ts b/packages/react-scripts/lib/react-app.d.ts @@ -42,7 +42,7 @@ declare module '*.webp' {
declare module '*.svg' {
import * as React from 'react';
- export const ReactComponent: React.SFC<React.SVGProps<SVGSVGElement>>;
+ export const ReactComponent: React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
const src: string;
export default src;
",14
"diff --git a/updater.bat b/updater.bat @@ -39,7 +39,7 @@ IF DEFINED _updateb (
IF NOT ""!_myname:~0,9!""==""[updated]"" (
ECHO Checking updater version...
ECHO.
- DEL /F ""[updated]!_myname!.bat"" 2>nul
+ IF EXIST ""[updated]!_myname!.bat"" ( DEL /F ""[updated]!_myname!.bat"" )
REM Uncomment the next line and comment the powershell call for testing.
REM COPY /B /V /Y ""!_myname!.bat"" ""[updated]!_myname!.bat""
(
@@ -51,7 +51,7 @@ IF DEFINED _updateb (
) ELSE (
ECHO Failed. Make sure PowerShell is allowed internet access.
ECHO.
- PING -n 301 127.0.0.1>nul
+ TIMEOUT 300
EXIT /B
)
) ELSE (
@@ -63,7 +63,7 @@ IF DEFINED _updateb (
) ELSE (
ECHO.
ECHO The [updated] label is reserved. Do not run an [updated] script directly, or rename it to something else before you run it.
- PING -n 301 127.0.0.1>nul
+ TIMEOUT 300
EXIT /B
)
)
",14
"diff --git a/updater.bat b/updater.bat @@ -16,7 +16,7 @@ IF /I ""%~1""==""-logp"" (SET _log=1 & SET _logp=1)
IF /I ""%~1""==""-multioverrides"" (SET _multi=1)
IF /I ""%~1""==""-merge"" (SET _merge=1)
IF /I ""%~1""==""-updatebatch"" (SET _updateb=1)
-IF /I ""%~1""==""-multibackups"" (SET _multibackups=1)
+IF /I ""%~1""==""-singlebackup"" (SET _singlebackup=1)
SHIFT
GOTO parse
:endparse
@@ -158,10 +158,10 @@ IF EXIST user.js.new (
)
IF ""!_changed!""==""true"" (
CALL :message ""Backing up...""
- IF DEFINED _multibackups (
- MOVE /Y user.js ""user-backup-!date:/=-!_!time::=.!.js"" >nul
- ) ELSE (
+ IF DEFINED _singlebackup (
MOVE /Y user.js user.js.bak >nul
+ ) ELSE (
+ MOVE /Y user.js ""user-backup-!date:/=-!_!time::=.!.js"" >nul
)
REN user.js.new user.js
CALL :message ""Update complete.""
@@ -196,18 +196,14 @@ REM ############ Merge function ############
:merge
SETLOCAL DisableDelayedExpansion
(
- FOR /F tokens^=2^,^*^ delims^=^'^"" %%G IN ('FINDSTR /B /R /C:""user_pref.*\).*;"" ""%~1""') DO (
- IF NOT ""%%G""=="""" (
- IF NOT ""%%H""=="""" (SET ""%%G=%%H"")
- )
- )
+ FOR /F tokens^=2^,^*^ delims^=^'^"" %%G IN ('FINDSTR /B /R /C:""user_pref.*\)[ ]*;"" ""%~1""') DO (IF NOT ""%%H""=="""" (SET ""%%G=%%H""))
FOR /F ""tokens=1,* delims=:"" %%I IN ('FINDSTR /N ""^"" ""%~1""') DO (
SET ""_temp=%%J""
SETLOCAL EnableDelayedExpansion
- IF ""!_temp:)=!""==""!_temp!"" (
+ IF NOT ""!_temp:~0,9!""==""user_pref"" (
ENDLOCAL & ECHO:%%J
) ELSE (
- IF NOT ""!_temp:~0,9!""==""user_pref"" (
+ IF ""!_temp:;=!""==""!_temp!"" (
ENDLOCAL & ECHO:%%J
) ELSE (
ENDLOCAL
",14
"diff --git a/pages/code_schools.js b/pages/code_schools.js @@ -57,7 +57,7 @@ export default class CodeSchools extends React.Component {
isFullTime={school.full_time}
locations={school.locations}
logoSource={`${s3}codeSchoolLogos/${school.name
- .replace(/ /g, '_')
+ .replace(/[ \u00A0]/g, '_')
.toLowerCase()}.jpg`}
name={school.name}
website={school.url}
",14
"diff --git a/pages/history.js b/pages/history.js import Head from 'components/head';
import { s3 } from 'common/constants/urls';
-import Section from 'components/_common_/Section/Section';
+import Content from 'components/Content/Content';
import HeroBanner from 'components/HeroBanner/HeroBanner';
import Timeline from 'components/Timeline/Timeline';
import styles from './styles/history.css';
@@ -24,9 +24,7 @@ export default function() {
</>
</HeroBanner>
- <Section theme=""white"" hasHeadingLines={false}>
- <Timeline />
- </Section>
+ <Content theme=""white"" columns={[<Timeline />]} />
</>
);
}
",14
"diff --git a/pages/styles/leadership_circle.css b/pages/styles/leadership_circle.css -.center {
- align-self: center;
+.linkButtonContainer {
+ text-align: center;
+ margin-top: 2rem;
}
",14
"diff --git a/jade/page-contents/media_content.html b/jade/page-contents/media_content.html <h4>Captions</h4>
<p>It is very easy to add a short caption to your photo. Just add the caption as a <code class=""language-markup"">data-caption</code> attribute.</p>
- <img class=""materialboxed"" data-caption=""A picture of some deer and tons of trees"" width=""250"" src=""http://th01.deviantart.net/fs70/PRE/i/2013/126/1/e/nature_portrait_by_pw_fotografie-d63tx0n.jpg"">
+ <img class=""materialboxed"" data-caption=""A picture of a way with a group of trees in a park"" width=""250"" src=""http://lorempixel.com/800/400/nature/4"">
<pre><code class=""language-markup"">
- &lt;img class=""materialboxed"" data-caption=""A picture of some deer and tons of trees"" width=""250"" src=""http://th01.deviantart.net/fs70/PRE/i/2013/126/1/e/nature_portrait_by_pw_fotografie-d63tx0n.jpg"">
+ &lt;img class=""materialboxed"" data-caption=""A picture of a way with a group of trees in a park"" width=""250"" src=""http://lorempixel.com/800/400/nature/4"">
</code></pre>
</div>
",14
"diff --git a/modules/backup/docker/script/init_container.sh b/modules/backup/docker/script/init_container.sh @@ -10,7 +10,7 @@ printf '%s\n' \
printf '%s\n' \
""$S3_BACKUP_BUCKET"" \
- >> ~/bucket
+ > ~/bucket
printf '%s\n' \
""$BACKUP_CRON_EXP root flock -xn ~/backup.lck -c /script/backup.sh"" \
",14
"diff --git a/modules/gui/frontend/src/app/home/body/browse/browse.js b/modules/gui/frontend/src/app/home/body/browse/browse.js @@ -87,7 +87,7 @@ const removeFile$ = (path) => {
const directory = Path.dirname(path)
const fileName = Path.basename(path)
return actionBuilder('FILE_REMOVED', {directory, fileName})
- .delValueByKey(['files', 'loaded', directory, 'files'], 'name', fileName)
+ .delValueByTemplate(['files', 'loaded', directory, 'files'], {name: fileName})
.build()
})
}
@@ -97,7 +97,7 @@ const removeDirectory$ = (path) => {
const directory = Path.dirname(path)
const fileName = Path.basename(path)
return actionBuilder('DIRECTORY_REMOVED', path)
- .delValueByKey(['files', 'loaded', directory, 'files'], 'name', fileName)
+ .delValueByTemplate(['files', 'loaded', directory, 'files'], {name: fileName})
.del(['files', 'loaded', path])
.build()
})
",14
"diff --git a/modules/gui/frontend/src/app/home/body/body.js b/modules/gui/frontend/src/app/home/body/body.js @@ -2,7 +2,7 @@ import {CenteredProgress} from 'widget/progress'
import {Select} from 'widget/selectable'
import {connect} from 'store'
import {initGoogleMapsApi$} from '../map/map'
-import {isPathInLocation, location} from 'route'
+import {isPathInLocation, location, history} from 'route'
import {loadApps$, requestedApps, runApp$} from 'apps'
import {msg} from 'translate'
import Account from './account/account'
@@ -33,6 +33,11 @@ class Body extends React.Component {
.dispatch()
}
+ componentDidUpdate() {
+ if (this.props.location.pathname === '/')
+ history().replace('/process').dispatch()
+ }
+
UNSAFE_componentWillReceiveProps({action, location, requestedApps}) {
if (action('LOAD_APPS').dispatched && isPathInLocation('/app/sandbox')) {
const path = location.pathname.replace(/^\/app/, '')
",14
"diff --git a/modules/gui/frontend/src/locale/en/translations.json b/modules/gui/frontend/src/locale/en/translations.json ""corrections"": {
""label"": ""Corrections"",
""surfaceReflectance"": {
- ""label"": ""Surface reflectance"",
+ ""label"": ""SR"",
""tooltip"": ""Use scenes atmospherically corrected surface reflectance.""
},
""brdf"": {
",14
"diff --git a/modules/gui/frontend/src/app/home/body/users/users.js b/modules/gui/frontend/src/app/home/body/users/users.js @@ -403,8 +403,8 @@ class User extends React.Component {
<div className={styles.number}>{format.dollars(monthlyInstanceSpending)}</div>
<div className={styles.number}>{format.dollars(monthlyStorageBudget, 0)}</div>
<div className={styles.number}>{format.dollars(monthlyStorageSpending)}</div>
- <div className={styles.number}>{format.GB(storageQuota, 0)}</div>
- <div className={styles.number}>{format.GB(storageUsed)}</div>
+ <div className={styles.number}>{format.fileSize(storageQuota, 0)}</div>
+ <div className={styles.number}>{format.fileSize(storageUsed)}</div>
</div>
)
}
",14
"diff --git a/modules/gui/frontend/src/widget/tabs.module.css b/modules/gui/frontend/src/widget/tabs.module.css .container {
+ position: relative;
padding: 0;
pointer-events: none;
}
pointer-events: all;
}
+/* .tabBar:before {
+ content: '';
+ position: absolute;
+ height: 3rem;
+ width: 5rem;
+ right: 5.3rem;
+ z-index: 3;
+ background: red;
+ mask-image: linear-gradient(to right, rgba(0, 0, 0, 1), transparent);
+} */
+
.tabs {
+ position: relative;
padding: 0 0 0 1rem;
display: flex;
- flex-wrap: wrap;
width: 100%;
+ overflow-x: auto;
+ margin-right: .5rem;
}
.newTab {
.tab {
position: relative;
display: flex;
+ flex-grow: 1;
background-color: #2B2B29;
border-bottom: 3px solid var(--tab-default-border-color);
border-top-right-radius: 0.5rem;
",14
"diff --git a/modules/gui/frontend/src/widget/slider.js b/modules/gui/frontend/src/widget/slider.js @@ -69,14 +69,14 @@ class SliderContainer extends React.Component {
}
renderDynamics() {
- const {input, width, range, float, ticks, snap, minValue, maxValue} = this.props
+ const {input, width, range, decimals, ticks, snap, minValue, maxValue} = this.props
return (
<SliderDynamics
input={input}
minValue={minValue}
maxValue={maxValue}
width={width}
- float={float}
+ decimals={decimals}
ticks={ticks}
snap={snap}
range={range}
@@ -106,6 +106,7 @@ class SliderContainer extends React.Component {
SliderContainer.propTypes = {
input: PropTypes.object.isRequired,
+ decimals: PropTypes.number,
denormalize: PropTypes.func,
disabled: PropTypes.any,
info: PropTypes.oneOfType([
@@ -115,7 +116,6 @@ SliderContainer.propTypes = {
maxValue: PropTypes.number,
minValue: PropTypes.number,
normalize: PropTypes.func,
- float: PropTypes.bool,
snap: PropTypes.bool,
ticks: PropTypes.oneOfType([
PropTypes.number,
@@ -349,11 +349,9 @@ class SliderDynamics extends React.Component {
if (position !== this.state.position) {
this.setState(prevState => ({...prevState, position}))
const value = this.toValue(this.snapPosition(position))
- this.props.input.set(
- this.props.float
- ? value
- : Math.round(value)
- )
+ const factor = Math.pow(10, this.props.decimals)
+ const roundedValue = Math.round(value * factor) / factor
+ this.props.input.set(roundedValue)
}
}
}
@@ -391,7 +389,7 @@ SliderDynamics.propTypes = {
maxValue: PropTypes.number.isRequired,
minValue: PropTypes.number.isRequired,
normalize: PropTypes.func.isRequired,
- float: PropTypes.bool,
+ decimals: PropTypes.number,
snap: PropTypes.bool,
ticks: PropTypes.array,
width: PropTypes.number
@@ -462,14 +460,14 @@ export default class Slider extends React.Component {
}
renderContainer() {
- const {input, logScale, float = false, snap, range = 'left', info, disabled} = this.props
+ const {input, logScale, decimals = 0, snap, range = 'left', info, disabled} = this.props
const {ticks, minValue, maxValue, width} = this.state
return (
<SliderContainer
input={input}
minValue={minValue}
maxValue={maxValue}
- float={float}
+ decimals={decimals}
ticks={ticks}
snap={snap}
range={range}
@@ -513,6 +511,7 @@ export default class Slider extends React.Component {
Slider.propTypes = {
input: PropTypes.object.isRequired,
+ decimals: PropTypes.number,
disabled: PropTypes.any,
info: PropTypes.oneOfType([
PropTypes.string,
@@ -523,7 +522,6 @@ Slider.propTypes = {
maxValue: PropTypes.number,
minValue: PropTypes.number,
range: PropTypes.oneOf(['none', 'left', 'right']),
- float: PropTypes.any,
snap: PropTypes.any,
ticks: PropTypes.oneOfType([
// PropTypes.number,
",14
"diff --git a/modules/gui/frontend/src/format.js b/modules/gui/frontend/src/format.js @@ -15,8 +15,8 @@ const decimal = (value, decimals = 2) =>
const units = (value, precisionDigits = 3) => number({value, precisionDigits})
const unitsPerHour = (value, precisionDigits = 3) => number({value, precisionDigits, suffix: '/h'})
const dollars = (value, {precisionDigits = 3, prefix = '$'} = {}) => number({value, precisionDigits, prefix, minScale: ''})
-const dollarsPerHour = (value, {precisionDigits = 3, prefix = '$'} = {}) => number({value, precisionDigits, minScale: '', prefix, unit: '/h'})
-const dollarsPerMonth = (value, {precisionDigits = 3, prefix = '$'} = {}) => number({value, precisionDigits, minScale: '', prefix, unit: '/mon'})
+const dollarsPerHour = (value, {precisionDigits = 3, prefix = '$'} = {}) => number({value, precisionDigits, minScale: '', prefix, suffix: '/h'})
+const dollarsPerMonth = (value, {precisionDigits = 3, prefix = '$'} = {}) => number({value, precisionDigits, minScale: '', prefix, suffix: '/mon'})
const hours = (value, decimals = 2) =>
<NumberFormat
",14
"diff --git a/modules/gui/frontend/src/app/home/body/process/mosaic/sceneAreas.js b/modules/gui/frontend/src/app/home/body/process/mosaic/sceneAreas.js @@ -40,10 +40,10 @@ class SceneAreas extends React.Component {
}
render() {
- const {sceneAreasShown, action} = this.props
+ const {sceneAreasShown, stream} = this.props
return (
<React.Fragment>
- {action('LOAD_SCENE_AREAS').dispatched
+ {stream('LOAD_SCENE_AREAS') === 'COMPLETED'
? sceneAreasShown && this.state.show ? this.renderSceneAreas() : null
: <MapStatus message={msg('process.mosaic.sceneAreas.loading')}/>}
</React.Fragment>
@@ -79,14 +79,14 @@ class SceneAreas extends React.Component {
loadSceneAreas(aoi, source) {
this.loadSceneArea$.next()
this.recipeActions.setSceneAreas(null).dispatch()
- this.props.asyncActionBuilder('LOAD_SCENE_AREAS',
+ this.props.stream('LOAD_SCENE_AREAS',
api.gee.sceneAreas$({aoi, source}).pipe(
- map(sceneAreas =>
- this.recipeActions.setSceneAreas(sceneAreas)
+ map(sceneAreas => {
+ this.recipeActions.setSceneAreas(sceneAreas).dispatch()
+ }
),
takeUntil(this.loadSceneArea$)
))
- .dispatch()
}
}
",14
"diff --git a/modules/gui/frontend/src/app/home/body/process/radarMosaic/bandSelection.js b/modules/gui/frontend/src/app/home/body/process/radarMosaic/bandSelection.js @@ -32,6 +32,7 @@ class BandSelection extends React.Component {
'VH',
'VV/VH'
],
+ searchableText: 'VV VH VV_VH VV/VH',
timeScan: false,
pointInTime: true
}, {
@@ -41,6 +42,7 @@ class BandSelection extends React.Component {
<span>VH<sub>med</sub></span>,
<span>VV<sub>sd</sub></span>
],
+ searchableText: 'VV_median VH_median VV_stdDev median stdDev sd',
timeScan: true,
pointInTime: false
}, {
@@ -50,6 +52,7 @@ class BandSelection extends React.Component {
<span>VH<sub>med</sub></span>,
<span>VV<sub>med</sub>/VH<sub>med</sub></span>
],
+ searchableText: 'VV_median VH_median VV_median_VH_median median',
timeScan: true,
pointInTime: false
}, {
@@ -59,6 +62,7 @@ class BandSelection extends React.Component {
<span>VV<sub>min</sub></span>,
<span>VV<sub>sd</sub></span>
],
+ searchableText: 'VV_max VV_min VV_stdDev max min stdDev sd',
timeScan: true,
pointInTime: false
}, {
@@ -68,6 +72,7 @@ class BandSelection extends React.Component {
<span>VH<sub>min</sub></span>,
<span>VV<sub>sd</sub></span>
],
+ searchableText: 'VV_min VH_min VV_stdDev min stdDev sd',
timeScan: true,
pointInTime: false
}]
@@ -106,7 +111,8 @@ class BandSelection extends React.Component {
recipeActions={this.recipeActions}
selection={selection}
options={options}
- onChange={() => this.setSelectorShown(false)}/>
+ onChange={() => this.setSelectorShown(false)}
+ onCancel={() => this.setSelectorShown(false)}/>
: <SelectedBands
selectedOption={this.optionByValue[selection.value]}
onClick={() => this.setSelectorShown(true)}/>
@@ -141,14 +147,12 @@ class BandSelection extends React.Component {
return bandOptions
}
- setSelectorShown(shown) {
- this.setState(prevState =>
- ({...prevState, showSelector: shown})
- )
+ setSelectorShown(showSelector) {
+ this.setState({showSelector})
}
}
-const BandSelector = ({recipeActions, selection, options, onChange}) =>
+const BandSelector = ({recipeActions, selection, options, onChange, onCancel}) =>
<form>
<Combo
input={selection}
@@ -159,11 +163,11 @@ const BandSelector = ({recipeActions, selection, options, onChange}) =>
keepOpen
inputClassName={styles.comboInput}
optionsClassName={styles.comboOptions}
- onBlur={onChange}
onChange={option => {
- recipeActions.setBands(option ? option.value : null).dispatch()
+ recipeActions.setBands(option.value).dispatch()
onChange()
- }}/>
+ }}
+ onCancel={onCancel}/>
</form>
const SelectedBands = ({selectedOption, onClick}) => {
",14
"diff --git a/modules/gui/frontend/src/widget/datePicker.js b/modules/gui/frontend/src/widget/datePicker.js @@ -147,7 +147,11 @@ class _DatePickerPanel extends React.Component {
const startYear = startDate.year()
const endYear = endDate.year()
const selectedYear = date.year()
- const options = _.range(startYear, endYear + 1).map(year => ({label: year, value: year}))
+ const options = _.concat(
+ _.range(startYear - 5, startYear).map(year => ({label: year})),
+ _.range(startYear, endYear + 1).map(year => ({label: year, value: year})),
+ _.range(endYear + 1, endYear + 6).map(year => ({label: year}))
+ )
const selectedOption = _.find(options, ({value}) => value === selectedYear)
return (
<div className={styles.years}>
@@ -155,7 +159,6 @@ class _DatePickerPanel extends React.Component {
options={options}
selectedOption={selectedOption}
onSelect={option => this.updateDate('year', option.value)}
- overScroll={true}
/>
</div>
)
",14
"diff --git a/modules/gui/frontend/src/app/home/body/process/classification/inputImagery/recipeSection.js b/modules/gui/frontend/src/app/home/body/process/classification/inputImagery/recipeSection.js @@ -3,7 +3,6 @@ import {connect, select} from 'store'
import {isMobile} from 'widget/userAgent'
import {msg} from 'translate'
import Combo from 'widget/combo'
-import Label from 'widget/label'
import PropTypes from 'prop-types'
import React from 'react'
@@ -22,9 +21,9 @@ class RecipeSection extends React.Component {
}))
return (
<React.Fragment>
- <Label msg={msg('process.classification.panel.inputImagery.form.recipe.label')}/>
<Combo
input={recipe}
+ label={msg('process.classification.panel.inputImagery.form.recipe.label')}
placeholder={msg('process.classification.panel.inputImagery.form.recipe.placeholder')}
options={options}
autoFocus={!isMobile()}/>
",14
"diff --git a/modules/gui/frontend/src/store.js b/modules/gui/frontend/src/store.js @@ -169,6 +169,7 @@ export const dispatchable = action => ({
const EnabledContext = React.createContext()
export class Enabled extends React.PureComponent {
+ ref = React.createRef()
render() {
const {value} = this.props
return (
@@ -182,27 +183,17 @@ export class Enabled extends React.PureComponent {
const {children} = this.props
return (
<EnabledContext.Provider value={enabled}>
- <React.Fragment>
+ <div style={{
+ width: '100%',
+ height: '100%',
+ display: enabled ? 'block' : 'none'
+ }}>
{children}
- {enabled ? null : this.renderPointerEventsShield()}
- </React.Fragment>
+ </div>
</EnabledContext.Provider>
)
}
- renderPointerEventsShield() {
- return (
- <div style={{
- position: 'absolute',
- top: '0',
- bottom: '0',
- left: '0',
- right: '0',
- pointerEvents: 'all'
- }}/>
- )
- }
-
componentDidUpdate(prevProps) {
const prevValue = prevProps.value
const value = this.props.value
",14
"diff --git a/modules/google-earth-engine/docker/sepal-ee/sepal/drive/rx/operators.py b/modules/google-earth-engine/docker/sepal-ee/sepal/drive/rx/operators.py import rx
-from rx import defer, of
+from rx import from_callable
from rx.core.typing import Mapper
from rx.operators import flat_map
from sepal.rx.workqueue import WorkQueue
@@ -41,7 +41,7 @@ def execute(
enqueue(
credentials,
queue=_drive_executions,
- mapper=lambda value: defer(lambda _: of(mapper(value))),
+ mapper=lambda value: from_callable(lambda: mapper(value)),
description=description,
retries=retries
)
",14
"diff --git a/modules/gui/frontend/src/widget/superButton.js b/modules/gui/frontend/src/widget/superButton.js @@ -78,7 +78,7 @@ class _SuperButton extends React.Component {
className
]).join(' ')
return (
- <div className={classNames}>
+ <div className={classNames} ref={this.ref}>
<div className={styles.main}>
<div className={styles.clickTarget} onClick={() => this.handleClick()}/>
<div className={styles.info}>
@@ -90,7 +90,7 @@ class _SuperButton extends React.Component {
className={styles.buttons}>
{this.renderTimestamp()}
{this.renderExtraButtons()}
- {this.renderDragButton()}
+ {/* {this.renderDragButton()} */}
{this.renderEditButton()}
{this.renderDuplicateButton()}
{this.renderRemoveButton()}
",14
"diff --git a/dev-env/sepal.sh b/dev-env/sepal.sh @@ -3,7 +3,7 @@ set -e
SEPAL_CONFIG=/etc/sepal/module.d
SEPAL=/usr/local/lib/sepal
-SEPAL_MODULES=""user sepal-server api-gateway task-executor gee gui""
+SEPAL_MODULES=""user sepal-server api-gateway task gee gui""
pidof () {
screen -ls | grep ""sepal:$1"" | cut -d ""."" -f 1
@@ -157,10 +157,17 @@ run-api-gateway)
-DconfigDir=""$SEPAL_CONFIG/api-gateway""
;;
run-gee)
+ cd $SEPAL/lib/js/shared
+ npm install
cd $SEPAL/modules/gee/docker
npm i
SEPAL_CONFIG=$SEPAL_CONFIG source ./dev.sh
;;
+run-gui)
+ cd $SEPAL/modules/gui/frontend
+ npm install
+ npm start
+ ;;
run-sepal-server)
$SEPAL/gradlew \
-p $SEPAL \
@@ -169,11 +176,12 @@ run-sepal-server)
-DconfigDir=""$SEPAL_CONFIG/sepal-server""
#-DskipSceneMetaDataUpdate
;;
-run-task-executor)
- $SEPAL/gradlew \
- -p $SEPAL \
- --no-daemon \
- :task-executor:runDev --args=""$SEPAL_CONFIG/task-executor/task-executor.properties""
+run-task)
+ cd $SEPAL/lib/js/shared
+ npm install
+ cd $SEPAL/modules/task/docker
+ npm i
+ SEPAL_CONFIG=$SEPAL_CONFIG source ./dev.sh
;;
run-user)
$SEPAL/gradlew \
@@ -182,24 +190,6 @@ run-user)
:sepal-user:runDev \
-DconfigDir=""$SEPAL_CONFIG/user""
;;
-run-gui)
- cd $SEPAL/lib/js/shared
- npm install
- cd $SEPAL/modules/gui/frontend
- npm install
- npm start
- # pip3 install -r $SEPAL/modules/google-earth-engine/docker/requirements.txt
- # pip3 install -e $SEPAL/modules/google-earth-engine/docker/sepal-ee
- # python3\
- # $SEPAL/modules/google-earth-engine/docker/src/test_server.py \
- # --gee-email google-earth-engine@openforis-sepal.iam.gserviceaccount.com \
- # --gee-key-path $SEPAL_CONFIG/google-earth-engine/gee-service-account.pem \
- # --sepal-host localhost:3000 \
- # --sepal-username ""sepalAdmin"" \
- # --sepal-password ""the admin password"" \
- # --home-dir $SEPAL_CONFIG/sepal-server/home/admin \
- # --username admin
- ;;
*)
usage
;;
",14
"diff --git a/lib/js/shared/src/ee/extensions/utils.js b/lib/js/shared/src/ee/extensions/utils.js @@ -2,7 +2,7 @@ const {defer} = require('rxjs')
const log = require('sepal/log').getLogger('ee')
const {limiter$} = require('../eeLimiter')
const {v4: uuid} = require('uuid')
-const {fromPromise} = require('sepal/rxjs')
+const {promise$} = require('sepal/rxjs')
const {retry} = require('sepal/rxjs/operators')
const {EEException} = require('sepal/ee/exception')
@@ -14,8 +14,7 @@ module.exports = ee => {
const $ = ({operation, operationId = uuid().substr(-4), ee, maxRetries = MAX_RETRIES}) =>
defer(() =>
limiter$(
- fromPromise(
- new Promise(
+ promise$(
(resolve, reject) => {
const report = Report(operation, operationId)
try {
@@ -33,7 +32,7 @@ module.exports = ee => {
log.debug(report(error))
reject(createEEException(error, operation, operationId))
}
- })
+ }
).pipe(
retry(maxRetries)
), operationId
",14
"diff --git a/modules/gateway/docker/src/main.js b/modules/gateway/docker/src/main.js @@ -5,7 +5,6 @@ const express = require('express')
const session = require('express-session')
const {logout} = require('./logout')
const {proxyEndpoints} = require('./proxy')
-const {parse} = require('url')
const log = require('sepal/log').getLogger('gateway')
const app = express()
@@ -29,7 +28,7 @@ const server = app.listen(port)
server.on('upgrade', (req, socket, head) => {
sessionParser(req, {}, () => { // Make sure we have access to session for the websocket
- const requestPath = parse(req.url).pathname
+ const requestPath = new URL(req.url).pathname
const user = req.session.user
const username = user ? user.username : 'not-authenticated'
if (user) {
",14
"diff --git a/modules/gui/frontend/src/app/home/map/visParams/visParamsPanel.js b/modules/gui/frontend/src/app/home/map/visParams/visParamsPanel.js @@ -215,15 +215,29 @@ class _VisParamsPanel extends React.Component {
renderTypeButtons() {
const {inputs: {type}} = this.props
return (
- <Form.Buttons
+ <ButtonSelect
+ chromeless
+ shape='pill'
+ placement='below'
input={type}
- alignment='right'
- options={[
- {value: 'continuous', label: msg('map.visParams.type.continuous.label'), tooltip: msg('map.visParams.type.continuous.tooltip')},
- {value: 'categorical', label: msg('map.visParams.type.categorical.label'), tooltip: msg('map.visParams.type.categorical.tooltip')},
- {value: 'rgb', label: msg('map.visParams.type.rgb.label'), tooltip: msg('map.visParams.type.rgb.tooltip')},
- {value: 'hsv', label: msg('map.visParams.type.hsv.label'), tooltip: msg('map.visParams.type.hsv.tooltip')},
- ]}
+ tooltipPlacement='bottom'
+ options={[{
+ value: 'continuous',
+ label: msg('map.visParams.type.continuous.label'),
+ tooltip: msg('map.visParams.type.continuous.tooltip')
+ }, {
+ value: 'categorical',
+ label: msg('map.visParams.type.categorical.label'),
+ tooltip: msg('map.visParams.type.categorical.tooltip')
+ }, {
+ value: 'rgb',
+ label: msg('map.visParams.type.rgb.label'),
+ tooltip: msg('map.visParams.type.rgb.tooltip')
+ }, {
+ value: 'hsv',
+ label: msg('map.visParams.type.hsv.label'),
+ tooltip: msg('map.visParams.type.hsv.tooltip')
+ }]}
onChange={nextType => this.onTypeChanged(nextType)}
/>
)
",14
"diff --git a/lib/js/shared/package.json b/lib/js/shared/package.json ""serialize-error"": ""^8.1.0"",
""short-unique-id"": ""^4.4.4"",
""uuid"": ""^8.3.2"",
- ""ws"": ""^8.5.0""
+ ""ws"": ""^8.6.0"",
+ ""xmlhttprequest"": ""npm:@lpaolini/xmlhttprequest@^1.8.1""
},
""devDependencies"": {
""eslint"": ""^8.14.0"",
",14
"diff --git a/hosting-services/aws/sepal/provision.yml b/hosting-services/aws/sepal/provision.yml gather_facts: false
tasks:
+ # TODO: Use community.aws.iam_access_key to create keys instead
# - name: Create letsencrypt AWS user
# community.aws.iam:
# iam_type: user
# access_key_state: create
# register: letsencrypt_user
- - name: Create letsencrypt AWS user
- community.aws.iam_user:
- name: letsencrypt
- state: present
- register: letsencrypt_user
+ # - name: Create letsencrypt AWS user
+ # community.aws.iam_user:
+ # name: letsencrypt
+ # state: present
+ # register: letsencrypt_user
- - name: Create letsencrypt user policy
- community.aws.iam_policy:
- iam_type: user
- iam_name: letsencrypt
- policy_name: letsencrypt_policy
- policy_json: >
- {
- ""Version"": ""2012-10-17"",
- ""Statement"": [
- {
- ""Effect"": ""Allow"",
- ""Action"": [
- ""route53:GetHostedZone"",
- ""route53:ListHostedZones"",
- ""route53:ListHostedZonesByName"",
- ""route53:GetHostedZoneCount"",
- ""route53:ChangeResourceRecordSets"",
- ""route53:ListResourceRecordSets""
- ],
- ""Resource"": ""*""
- }
- ]
- }
- state: present
+ # - name: Create letsencrypt user policy
+ # community.aws.iam_policy:
+ # iam_type: user
+ # iam_name: letsencrypt
+ # policy_name: letsencrypt_policy
+ # policy_json: >
+ # {
+ # ""Version"": ""2012-10-17"",
+ # ""Statement"": [
+ # {
+ # ""Effect"": ""Allow"",
+ # ""Action"": [
+ # ""route53:GetHostedZone"",
+ # ""route53:ListHostedZones"",
+ # ""route53:ListHostedZonesByName"",
+ # ""route53:GetHostedZoneCount"",
+ # ""route53:ChangeResourceRecordSets"",
+ # ""route53:ListResourceRecordSets""
+ # ],
+ # ""Resource"": ""*""
+ # }
+ # ]
+ # }
+ # state: present
# - name: Store letsencrypt keys
# copy:
register: sepal_storage_group
- name: Provision Sepal-Storage instance
- ec2:
+ ec2_instance:
key_name: ""{{ lookup('env', 'AWS_REGION') }}""
- group: ""Sepal-Storage""
+ security_groups:
+ - ""Sepal-Storage""
instance_type: m5a.large
- image: ""{{ lookup('env', 'AWS_AMI') }}""
+ image_id: ""{{ lookup('env', 'AWS_AMI') }}""
region: ""{{ lookup('env', 'AWS_REGION') }}""
- zone: ""{{ lookup('env', 'AWS_AVAILABILITY_ZONE') }}""
+ availability_zone: ""{{ lookup('env', 'AWS_AVAILABILITY_ZONE') }}""
wait: true
- instance_tags:
- Name: ""Sepal-Storage - {{ lookup('env', 'DEPLOY_ENVIRONMENT') }}""
- Type: ""SepalStorage""
- Environment: ""{{ lookup('env', 'DEPLOY_ENVIRONMENT') }}""
+ filters:
+ tag:Name: ""Sepal-Storage - {{ lookup('env', 'DEPLOY_ENVIRONMENT') }}""
+ tag:Type: ""SepalStorage""
+ tag:Environment: ""{{ lookup('env', 'DEPLOY_ENVIRONMENT') }}""
exact_count: 1
- count_tag:
+ purge_tags: false
+ tags:
Type: ""SepalStorage""
Environment: ""{{ lookup('env', 'DEPLOY_ENVIRONMENT') }}""
volumes:
cidr_ip: 0.0.0.0/0
- name: Provision Sepal instance
- ec2:
+ ec2_instance:
key_name: ""{{ lookup('env', 'AWS_REGION') }}""
- group: ""Sepal""
+ security_groups:
+ - ""Sepal""
instance_type: ""{{ lookup('env', 'AWS_INSTANCE_TYPE') }}""
- image: ""{{ lookup('env', 'AWS_AMI') }}""
+ image_id: ""{{ lookup('env', 'AWS_AMI') }}""
region: ""{{ lookup('env', 'AWS_REGION') }}""
- zone: ""{{ lookup('env', 'AWS_AVAILABILITY_ZONE') }}""
+ availability_zone: ""{{ lookup('env', 'AWS_AVAILABILITY_ZONE') }}""
wait: true
exact_count: 1
- count_tag:
- Type: Sepal
- Environment: ""{{ lookup('env', 'DEPLOY_ENVIRONMENT') }}""
- instance_tags:
+ filters:
+ tag:Type: Sepal
+ tag:Environment: ""{{ lookup('env', 'DEPLOY_ENVIRONMENT') }}""
+ purge_tags: false
+ tags:
Name: ""Sepal - {{ lookup('env', 'DEPLOY_ENVIRONMENT') }}""
Type: Sepal
Environment: ""{{ lookup('env', 'DEPLOY_ENVIRONMENT') }}""
volume_size: 100
register: started_ec2_sepal
+ - ec2_instance_info:
+ region: ""{{ lookup('env', 'AWS_REGION') }}""
+ filters:
+ ""tag:Type"": ""Sepal""
+ ""tag:Environment"": ""{{ lookup('env', 'DEPLOY_ENVIRONMENT') }}""
+ register: ec2_sepal
+
- name: Wait for SSH to be available on Sepal
- local_action: wait_for host=""{{ item.public_ip }}""
+ local_action: wait_for host=""{{ item.public_ip_address }}""
port=22
state=""started""
- with_items: ""{{ started_ec2_sepal.instances }}""
+ with_items: ""{{ ec2_sepal.instances }}""
- name: Wait for SSH to be available on Sepal-Storage
- local_action: wait_for host=""{{ item.public_ip }}""
+ local_action: wait_for host=""{{ item.public_ip_address }}""
port=22
state=""started""
- with_items: ""{{ started_ec2_sepal_storage.instances }}""
+ with_items: ""{{ ec2_sepal_storage.instances }}""
",14
"diff --git a/packages/vega-typings/types/spec/transform.d.ts b/packages/vega-typings/types/spec/transform.d.ts @@ -11,6 +11,7 @@ import {
DataRef,
EventStream,
FieldValue,
+ Compare,
} from '.';
export type FieldRef =
@@ -130,7 +131,7 @@ export interface VgAggregateTransform {
export interface VgCollectTransform {
type: 'collect';
- sort: VgSort;
+ sort: Compare;
}
export interface VgCountPatternTransform {
@@ -159,7 +160,7 @@ export interface VgStackTransform {
offset?: StackOffset;
groupby: string[];
field: string;
- sort: VgSort;
+ sort: Compare;
as: string[];
}
@@ -256,15 +257,6 @@ export interface VgLegendEncode {
}
export type VgGuideEncode = any; // TODO: replace this (See guideEncode in Vega Schema)
-export type VgSort =
- | {
- field: string;
- order?: 'ascending' | 'descending';
- }
- | {
- field: string[];
- order?: ('ascending' | 'descending')[];
- };
export interface VgImputeTransform {
type: 'impute';
",14
"diff --git a/packages/rnv/src/platformTools/android.js b/packages/rnv/src/platformTools/android.js @@ -416,7 +416,7 @@ const _runGradle = async (c, platform) => {
// Only one that is active, running on that one
const dv = activeDevices[0];
logInfo(`Found device ${dv.name}:${dv.udid}!`);
- await _runGradleApp(c, platform, appFolder, signingConfig, dv);
+ await _runGradleApp(c, platform, dv);
} else if (activeDevices.length === 0 && inactiveDevices.length > 0) {
// No device active, but there are emulators created
const devicesString = composeDevicesString(inactiveDevices, true);
@@ -430,7 +430,7 @@ const _runGradle = async (c, platform) => {
if (response.chosenEmulator) {
await launchAndroidSimulator(c, platform, response.chosenEmulator, true);
const devices = await _checkForActiveEmulator(c, platform);
- await _runGradleApp(c, platform, appFolder, signingConfig, devices);
+ await _runGradleApp(c, platform, devices);
}
} else if (activeDevices.length > 1) {
const devicesString = composeDevicesString(activeDevices, true);
@@ -443,11 +443,11 @@ const _runGradle = async (c, platform) => {
}]);
if (response.chosenEmulator) {
const dev = activeDevices.find(d => d.name === response.chosenEmulator);
- await _runGradleApp(c, platform, appFolder, signingConfig, dev);
+ await _runGradleApp(c, platform, dev);
}
} else {
const devices = await _checkForActiveEmulator(c, platform);
- await _runGradleApp(c, platform, appFolder, signingConfig, devices);
+ await _runGradleApp(c, platform, devices);
}
};
@@ -520,6 +520,7 @@ const _runGradleApp = (c, platform, device) => new Promise((resolve, reject) =>
const appFolder = getAppFolder(c, platform);
const bundleId = getConfigProp(c, platform, 'id');
const outputFolder = signingConfig === 'Debug' ? 'debug' : 'release';
+ const { arch, name } = device;
shell.cd(`${appFolder}`);
@@ -534,14 +535,9 @@ const _runGradleApp = (c, platform, device) => new Promise((resolve, reject) =>
if (!fs.existsSync(apkPath)) {
apkPath = path.join(appFolder, `app/build/outputs/apk/${outputFolder}/app-${outputFolder}-unsigned.apk`);
} if (!fs.existsSync(apkPath)) {
- apkPath = path.join(appFolder, `app/build/outputs/apk/${outputFolder}/app-x86-${outputFolder}.apk`);
- } if (!fs.existsSync(apkPath)) {
- apkPath = path.join(appFolder, `app/build/outputs/apk/${outputFolder}/app-x86_64-${outputFolder}.apk`);
- } if (!fs.existsSync(apkPath)) {
- apkPath = path.join(appFolder, `app/build/outputs/apk/${outputFolder}/app-arm64-v8a-${outputFolder}.apk`);
- } if (!fs.existsSync(apkPath)) {
- apkPath = path.join(appFolder, `app/build/outputs/apk/${outputFolder}/app-armeabi-v7a-${outputFolder}.apk`);
+ apkPath = path.join(appFolder, `app/build/outputs/apk/${outputFolder}/app-${arch}-${outputFolder}.apk`);
}
+ logInfo(`Installing ${apkPath} on ${name}`);
return executeAsync(c.cli[CLI_ANDROID_ADB], ['-s', device.udid, 'install', '-r', '-d', '-f', apkPath]);
})
.then(() => ((device.isDevice && platform !== ANDROID_WEAR)
@@ -565,7 +561,6 @@ const buildAndroid = (c, platform) => new Promise((resolve, reject) => {
const appFolder = getAppFolder(c, platform);
const signingConfig = getConfigProp(c, platform, 'signingConfig', 'Debug');
- const outputFolder = signingConfig === 'Debug' ? 'debug' : 'release';
shell.cd(`${appFolder}`);
",14
"diff --git a/packages/rnv/src/resolve.js b/packages/rnv/src/resolve.js @@ -115,7 +115,7 @@ const _doResolveExternalPackage = (aPath, options) => {
...options,
extensions: ['.js', '.json'].concat(options.extensions ?? [])
})
- .replace(/\/package.json$/, '');
+ .replace(/(\\|\/)package.json$/, '');
return options.keepSuffix ?? false
? `${resolvedPath}/${packageSuffix}`
: resolvedPath;
",14
"diff --git a/packages/rnv/src/platformTools/tizen/index.js b/packages/rnv/src/platformTools/tizen/index.js import path from 'path';
import fs from 'fs';
import chalk from 'chalk';
+import semver from 'semver';
import inquirer from 'inquirer';
import net from 'net';
import parser from 'xml2json';
@@ -15,6 +16,7 @@ import {
} from '../../constants';
import {
getAppFolder,
+ getAppVersion,
writeCleanFile,
getAppTemplateFolder,
getConfigProp,
@@ -506,7 +508,8 @@ export const configureProject = (c, platform) => new Promise((resolve) => {
[
{ pattern: '{{PACKAGE}}', override: p.package },
{ pattern: '{{ID}}', override: p.id },
- { pattern: '{{APP_NAME}}', override: p.appName }
+ { pattern: '{{APP_NAME}}', override: p.appName },
+ { pattern: '{{APP_VERSION}}', override: semver.coerce(getAppVersion(c, platform))
]
);
",14
"diff --git a/packages/rnv/src/resolve.js b/packages/rnv/src/resolve.js @@ -115,7 +115,7 @@ const _doResolveExternalPackage = (aPath, options) => {
...options,
extensions: ['.js', '.json'].concat(options.extensions ?? [])
})
- .replace(/\/package.json$/, '');
+ .replace(/\/package.json$/, '').replace(/\\/g, '/');
return options.keepSuffix ?? false
? `${resolvedPath}/${packageSuffix}`
: resolvedPath;
",14
"diff --git a/scripts/com.r2studio.MarvelFutureFight2/index.js b/scripts/com.r2studio.MarvelFutureFight2/index.js @@ -77,7 +77,8 @@ MarvelFutureFight.prototype.runAutoCowork = function(task) {
console.log(""[MMFS][Co-Op] choose a hero"");
rbm.click({ x: 118, y: 900 });
console.log(""[MMFS][Co-Op] start to match"");
- rbm.imageWaitClick(""match_start.1920x1080.png"", 10000);
+ sleep(1000);
+ rbm.imageClick(""match_start.1920x1080.png"");
sleep(30000); continue;
}
}
",14
"diff --git a/src/kickstart/ks-route.js b/src/kickstart/ks-route.js @@ -4,7 +4,6 @@ kickStart.register('route', function () {
var app = kickStart;
var routes = {};
var routeRE = {};
- var silent;
addListener();
@@ -75,16 +74,14 @@ kickStart.register('route', function () {
function go(route) {
route = String('/'+route).replace(/\/{2,}/g, '/');
- setTimeout(function () { window.location.hash = route; }, 1);
+ window.history.replaceState({}, document.title, '#' + route)
+ process()
return app.route;
}
function set(route) {
- silent = true;
- // do not use go(route) here
route = String('/'+route).replace(/\/{2,}/g, '/');
- window.location.hash = route;
- setTimeout(function () { silent = false }, 1);
+ window.history.replaceState({}, document.title, '#' + route)
return app.route;
}
@@ -105,7 +102,6 @@ kickStart.register('route', function () {
}
function process() {
- if (silent === true) return;
prepare();
// match routes
var hash = window.location.hash.substr(1).replace(/\/{2,}/g, '/');
",14
"diff --git a/packages/cli/lib/lib/webpack/webpack-base-config.js b/packages/cli/lib/lib/webpack/webpack-base-config.js @@ -302,7 +302,7 @@ module.exports = function(env) {
}),
new ProgressBarPlugin({
format:
- '\u001b[37m\u001b[44m Build \u001b[49m\u001b[39m [:bar] \u001b[32m\u001b[1m:percent\u001b[22m\u001b[39m (:elapseds) \u001b[2m:msg\u001b[22m',
+ '\u001b[97m\u001b[44m Build \u001b[49m\u001b[39m [:bar] \u001b[32m\u001b[1m:percent\u001b[22m\u001b[39m (:elapseds) \u001b[2m:msg\u001b[22m',
renderThrottle: 100,
summary: false,
clear: true,
",14
"diff --git a/html/src/app.js b/html/src/app.js @@ -12706,6 +12706,13 @@ speechSynthesis.getVoices();
return;
}
D.ref = ref;
+ D.incomingRequest = false;
+ D.outgoingRequest = false;
+ if (D.ref.friendRequestStatus === 'incoming') {
+ D.incomingRequest = true;
+ } else if (D.ref.friendRequestStatus === 'outgoing') {
+ D.outgoingRequest = true;
+ }
$app.applyUserDialogLocation();
});
@@ -12941,6 +12948,11 @@ speechSynthesis.getVoices();
}
}
D.isFavorite = API.cachedFavoritesByObjectId.has(D.id);
+ if (D.ref.friendRequestStatus === 'incoming') {
+ D.incomingRequest = true;
+ } else if (D.ref.friendRequestStatus === 'outgoing') {
+ D.outgoingRequest = true;
+ }
this.applyUserDialogLocation();
if (this.$refs.userDialogTabs.currentName === '0') {
this.userDialogLastActiveTab = 'Info';
@@ -12972,9 +12984,6 @@ speechSynthesis.getVoices();
this.userDialogLastActiveTab = 'JSON';
this.refreshUserDialogTreeData();
}
- API.getFriendStatus({
- userId: D.id
- });
if (args.cache) {
API.getUser(args.params);
}
",14
"diff --git a/README.md b/README.md @@ -55,7 +55,7 @@ Read the [Getting started page](https://getbootstrap.com/getting-started/) for i
[![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap)
[![Gem version](https://img.shields.io/gem/v/bootstrap.svg)](https://rubygems.org/gems/bootstrap)
[![Build Status](https://img.shields.io/travis/twbs/bootstrap/v4-dev.svg)](https://travis-ci.org/twbs/bootstrap)
-[![dependencies Status](https://david-dm.org/twbs/bootstrap/status.svg)](https://david-dm.org/twbs/bootstrap)
+[![peerDependencies Status](https://david-dm.org/twbs/bootstrap/peer-status.svg)](https://david-dm.org/twbs/bootstrap?type=peer)
[![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg)](https://david-dm.org/twbs/bootstrap?type=dev)
[![Meteor Atmosphere](https://img.shields.io/badge/meteor-twbs%3Abootstrap-blue.svg)](https://atmospherejs.com/twbs/bootstrap)
[![Packagist Prerelease](https://img.shields.io/packagist/vpre/twbs/bootstrap.svg)](https://packagist.org/packages/twbs/bootstrap)
",14
"diff --git a/scss/_buttons.scss b/scss/_buttons.scss @@ -105,11 +105,11 @@ fieldset[disabled] a.btn {
//
.btn-lg {
- @include button-size($input-btn-padding-y-lg, $input-btn-padding-x-lg, $font-size-lg, $line-height-lg, $btn-border-radius-lg);
+ @include button-size($input-btn-padding-y-lg, $input-btn-padding-x-lg, $font-size-lg, $input-btn-line-height-lg, $btn-border-radius-lg);
}
.btn-sm {
- @include button-size($input-btn-padding-y-sm, $input-btn-padding-x-sm, $font-size-sm, $line-height-sm, $btn-border-radius-sm);
+ @include button-size($input-btn-padding-y-sm, $input-btn-padding-x-sm, $font-size-sm, $input-btn-line-height-sm, $btn-border-radius-sm);
}
",14
"diff --git a/docs/4.0/components/carousel.md b/docs/4.0/components/carousel.md @@ -24,7 +24,7 @@ Carousels don't automatically normalize slide dimensions. As such, you may need
### Slides only
-Here's a carousel with slides only. Note the presence of the `.d-block` and `.img-fluid` on carousel images to prevent browser default image alignment.
+Here's a carousel with slides only. Note the presence of the `.d-block` and `.w-100` on carousel images to prevent browser default image alignment.
{% example html %}
<div id=""carouselExampleSlidesOnly"" class=""carousel slide"" data-ride=""carousel"">
",14
"diff --git a/site/content/docs/5.0/getting-started/introduction.md b/site/content/docs/5.0/getting-started/introduction.md @@ -154,7 +154,7 @@ Stay up to date on the development of Bootstrap and reach out to the community w
- Read and subscribe to [The Official Bootstrap Blog]({{< param blog >}}).
- Join [the official Slack room]({{< param slack >}}).
-- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
+- Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel.
- Implementation help may be found at Stack Overflow (tagged [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5)).
- Developers should use the keyword `bootstrap` on packages that modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/search?q=keywords:bootstrap) or similar delivery mechanisms for maximum discoverability.
",14
"diff --git a/site/content/docs/5.1/helpers/text-truncation.md b/site/content/docs/5.1/helpers/text-truncation.md @@ -12,12 +12,12 @@ For longer content, you can add a `.text-truncate` class to truncate the text wi
<!-- Block level -->
<div class=""row"">
<div class=""col-2 text-truncate"">
- Praeterea iter est quasdam res quas ex communi.
+ This text is quite long, and will be truncated once displayed.
</div>
</div>
<!-- Inline level -->
<span class=""d-inline-block text-truncate"" style=""max-width: 150px;"">
- Praeterea iter est quasdam res quas ex communi.
+ This text is quite long, and will be truncated once displayed.
</span>
{{< /example >}}
",14
"diff --git a/site/content/docs/5.1/examples/dropdowns/index.html b/site/content/docs/5.1/examples/dropdowns/index.html @@ -107,19 +107,19 @@ body_class: """"
</form>
<ul class=""list-unstyled mb-0"">
<li><a class=""dropdown-item d-flex align-items-center gap-2 py-2"" href=""#"">
- <span class=""d-inline-block bg-success rounded-circle"" style=""width: .5em; height: .5em;""></span>
+ <span class=""d-inline-block bg-success rounded-circle p-1""></span>
Action
</a></li>
<li><a class=""dropdown-item d-flex align-items-center gap-2 py-2"" href=""#"">
- <span class=""d-inline-block bg-primary rounded-circle"" style=""width: .5em; height: .5em;""></span>
+ <span class=""d-inline-block bg-primary rounded-circle p-1""></span>
Another action
</a></li>
<li><a class=""dropdown-item d-flex align-items-center gap-2 py-2"" href=""#"">
- <span class=""d-inline-block bg-danger rounded-circle"" style=""width: .5em; height: .5em;""></span>
+ <span class=""d-inline-block bg-danger rounded-circle p-1""></span>
Something else here
</a></li>
<li><a class=""dropdown-item d-flex align-items-center gap-2 py-2"" href=""#"">
- <span class=""d-inline-block bg-info rounded-circle"" style=""width: .5em; height: .5em;""></span>
+ <span class=""d-inline-block bg-info rounded-circle p-1""></span>
Separated link
</a></li>
</ul>
@@ -131,19 +131,19 @@ body_class: """"
</form>
<ul class=""list-unstyled mb-0"">
<li><a class=""dropdown-item d-flex align-items-center gap-2 py-2"" href=""#"">
- <span class=""d-inline-block bg-success rounded-circle"" style=""width: .5em; height: .5em;""></span>
+ <span class=""d-inline-block bg-success rounded-circle p-1""></span>
Action
</a></li>
<li><a class=""dropdown-item d-flex align-items-center gap-2 py-2"" href=""#"">
- <span class=""d-inline-block bg-primary rounded-circle"" style=""width: .5em; height: .5em;""></span>
+ <span class=""d-inline-block bg-primary rounded-circle p-1""></span>
Another action
</a></li>
<li><a class=""dropdown-item d-flex align-items-center gap-2 py-2"" href=""#"">
- <span class=""d-inline-block bg-danger rounded-circle"" style=""width: .5em; height: .5em;""></span>
+ <span class=""d-inline-block bg-danger rounded-circle p-1""></span>
Something else here
</a></li>
<li><a class=""dropdown-item d-flex align-items-center gap-2 py-2"" href=""#"">
- <span class=""d-inline-block bg-info rounded-circle"" style=""width: .5em; height: .5em;""></span>
+ <span class=""d-inline-block bg-info rounded-circle p-1""></span>
Separated link
</a></li>
</ul>
",14
"diff --git a/src/react/Pages/Connect/BudgetFields.jsx b/src/react/Pages/Connect/BudgetFields.jsx @@ -7,7 +7,7 @@ import Switch from ""@material-ui/core/Switch"";
import FormControl from ""@material-ui/core/FormControl"";
import FormControlLabel from ""@material-ui/core/FormControlLabel"";
-import MoneyFormatInputDefault from ""../../Components/FormFields/MoneyFormatInputDefault"";
+import MoneyFormatInput from ""../../Components/FormFields/MoneyFormatInput"";
import TranslateMenuItem from ""../../Components/TranslationHelpers/MenuItem"";
const styles = {
@@ -27,7 +27,7 @@ export default props => {
return (
<Grid item xs={12}>
<Grid container spacing={8}>
- <Grid item xs={12} md={4}>
+ <Grid item xs={12} sm={4}>
<FormControlLabel
style={styles.formControl}
control={
@@ -47,21 +47,7 @@ export default props => {
{props.setBudget ? (
<React.Fragment>
- <Grid item xs={12} sm={6} md={4}>
- <FormControl
- style={styles.formControl}
- error={props.budgetError}
- >
- <MoneyFormatInputDefault
- id=""budget""
- onChange={e => console.log(e.target.value)}
- onValueChange={e => console.log(e)}
- value={props.budget}
- />
- {/*handleChangeFormatted(""budget"")*/}
- </FormControl>
- </Grid>
- <Grid item xs={12} sm={6} md={4}>
+ <Grid item xs={12} sm={8}>
<FormControl style={styles.formControl}>
<Select
value={props.budgetFrequency}
@@ -88,6 +74,18 @@ export default props => {
</Select>
</FormControl>
</Grid>
+ <Grid item xs={12}>
+ <FormControl
+ style={styles.formControl}
+ error={props.budgetError}
+ >
+ <MoneyFormatInput
+ id=""budget""
+ value={props.budget}
+ onValueChange={handleChangeFormatted(""budget"")}
+ />
+ </FormControl>
+ </Grid>
</React.Fragment>
) : null}
</Grid>
",14