From 76f382908b20da3224d60f561713bdf133b48f24 Mon Sep 17 00:00:00 2001 From: Simon Stone Date: Thu, 6 Jul 2017 09:39:46 +0100 Subject: [PATCH 01/88] Add WebSQL adapter to handle Safari (#1484) --- packages/composer-runtime-pouchdb/lib/pouchdbdataservice.js | 3 ++- packages/composer-runtime-pouchdb/package.json | 1 + packages/composer-runtime-web/lib/webdataservice.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/composer-runtime-pouchdb/lib/pouchdbdataservice.js b/packages/composer-runtime-pouchdb/lib/pouchdbdataservice.js index c987369750..ee1dfac452 100644 --- a/packages/composer-runtime-pouchdb/lib/pouchdbdataservice.js +++ b/packages/composer-runtime-pouchdb/lib/pouchdbdataservice.js @@ -23,8 +23,9 @@ const PouchDBUtils = require('./pouchdbutils'); const LOG = Logger.getLog('PouchDBDataService'); -// Install the PouchDB plugins. +// Install the PouchDB plugins. The order of the adapters is important! PouchDB.plugin(require('pouchdb-adapter-idb')); +PouchDB.plugin(require('pouchdb-adapter-websql')); PouchDB.plugin(require('pouchdb-adapter-memory')); PouchDB.plugin(require('pouchdb-find')); diff --git a/packages/composer-runtime-pouchdb/package.json b/packages/composer-runtime-pouchdb/package.json index ab8fb35cf8..65bacd390d 100644 --- a/packages/composer-runtime-pouchdb/package.json +++ b/packages/composer-runtime-pouchdb/package.json @@ -58,6 +58,7 @@ "istanbul-lib-instrument": "^1.7.2", "pouchdb-adapter-idb": "^6.2.0", "pouchdb-adapter-memory": "^6.2.0", + "pouchdb-adapter-websql": "^6.2.0", "pouchdb-collate": "^6.2.0", "pouchdb-core": "^6.2.0", "pouchdb-find": "^6.2.0", diff --git a/packages/composer-runtime-web/lib/webdataservice.js b/packages/composer-runtime-web/lib/webdataservice.js index 94524f2cf5..158e17d100 100644 --- a/packages/composer-runtime-web/lib/webdataservice.js +++ b/packages/composer-runtime-web/lib/webdataservice.js @@ -31,7 +31,7 @@ class WebDataService extends PouchDBDataService { * @param {boolean} [autocommit] Should this data service auto commit? */ constructor(uuid, autocommit) { - super(uuid, autocommit, { adapter: 'idb' }); + super(uuid, autocommit); const method = 'constructor'; LOG.entry(method, uuid, autocommit); LOG.exit(method); From ea1da4bd8a60281ef02ccfb8a80c8078ad6bb56d Mon Sep 17 00:00:00 2001 From: EdProsser Date: Thu, 6 Jul 2017 10:54:14 +0100 Subject: [PATCH 02/88] Command changes ed (#1483) * Woooh changes.... * ToC changes * ToC changes * identity issue * TOC Update * Beta->RC * network deploy changes --- .../jekylldocs/_includes/sidebars/managing.md | 1 + .../jekylldocs/business-network/bnd-create.md | 2 + .../jekylldocs/business-network/bnd-deploy.md | 10 ++-- .../business-network/bnd-publish.md | 2 + .../business-network-index.md | 2 + .../businessnetworkdefinition.md | 2 + .../business-network/publishing-events.md | 2 + .../jekylldocs/business-network/query.md | 3 +- .../jekylldocs/business-network/testing.md | 2 + .../installing/development-tools.md | 4 +- .../installing/using-playground-locally.md | 10 ++-- .../jekylldocs/introduction/introduction.md | 4 +- .../jekylldocs/introduction/key-concepts.md | 7 +-- .../introduction/solution-architecture.md | 7 +-- .../jekylldocs/managing/updating-composer.md | 25 +++++++++- .../jekylldocs/problems/diagnostics.md | 2 + .../jekylldocs/reference/JSDOC-README.md | 34 ++++++++++++++ .../jekylldocs/reference/commands.md | 4 ++ .../reference/composer.identity.issue.md | 2 + .../reference/composer.network.deploy.md | 46 ++++++++++++++++--- .../reference/composer.network.logLevel.md | 27 +++++++++++ .../jekylldocs/reference/connectionprofile.md | 7 +-- .../jekylldocs/reference/glossary.md | 2 +- .../jekylldocs/reference/reference-index.md | 2 +- .../jekylldocs/support/index.md | 2 + 25 files changed, 179 insertions(+), 32 deletions(-) create mode 100644 packages/composer-website/jekylldocs/reference/JSDOC-README.md create mode 100644 packages/composer-website/jekylldocs/reference/composer.network.logLevel.md diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/managing.md b/packages/composer-website/jekylldocs/_includes/sidebars/managing.md index d7f3ebf1ba..f7bafc398f 100644 --- a/packages/composer-website/jekylldocs/_includes/sidebars/managing.md +++ b/packages/composer-website/jekylldocs/_includes/sidebars/managing.md @@ -11,6 +11,7 @@ - [Revoking an identity from a participant](../managing/identity-revoke.html) - [Enabling OAuth using GitHub](../managing/github-oauth.html) - [Enabling access control using the current participant](../managing/current-participant.html) + - [Updating {{site.data.conrefs.composer_full}}](../managing/updating-composer.html) - [Diagnosing Problems](../problems/diagnostics.html) - [Reference](../reference/reference-index.html) - [Support](../support/index.html) diff --git a/packages/composer-website/jekylldocs/business-network/bnd-create.md b/packages/composer-website/jekylldocs/business-network/bnd-create.md index 67143680a1..e5283b29b2 100644 --- a/packages/composer-website/jekylldocs/business-network/bnd-create.md +++ b/packages/composer-website/jekylldocs/business-network/bnd-create.md @@ -2,6 +2,8 @@ layout: default title: Task - Create a Business Network Definition category: tasks +section: business-network +index-order: 2 sidebar: sidebars/businessnetworks.md excerpt: How to create a business network definition --- diff --git a/packages/composer-website/jekylldocs/business-network/bnd-deploy.md b/packages/composer-website/jekylldocs/business-network/bnd-deploy.md index d6c4dcb515..51e43ee2ff 100644 --- a/packages/composer-website/jekylldocs/business-network/bnd-deploy.md +++ b/packages/composer-website/jekylldocs/business-network/bnd-deploy.md @@ -2,6 +2,8 @@ layout: default title: Task - Deploying and Updating Business Networks category: tasks +section: business-network +index-order: 3 sidebar: sidebars/businessnetworks.md excerpt: How to deploy or update Business Networks --- @@ -20,17 +22,17 @@ For example: To update the definition of an already deployed business network use the `composer network update` CLI command. -## Deploying business networks to {{site.data.conrefs.hlf_full}} v1.0 Beta 1 +## Deploying business networks to {{site.data.conrefs.hlf_full}} v1.0 RC 1 -In {{site.data.conrefs.hlf_full}} v1.0 Beta 1 peers now enforce the concepts of admins and members. Admin user's identities and crypto material must be available to the peer at deployment. To make that identity and its crypto material available, your must import it to your local `keyValStore` directory before deploying the business network. To import the identity, use the [`composer identity import` command](../reference/composer.identity.import.html). When importing an identity, you do not assign it a secret, however the `composer network deploy` command requires a secret. If you are using an imported identity, you can enter any value for the secret. +In {{site.data.conrefs.hlf_full}} v1.0 RC 1 peers now enforce the concepts of admins and members. Admin user's identities and crypto material must be available to the peer at deployment. To make that identity and its crypto material available, your must import it to your local `keyValStore` directory before deploying the business network. To import the identity, use the [`composer identity import` command](../reference/composer.identity.import.html). When importing an identity, you do not assign it a secret, however the `composer network deploy` command requires a secret. If you are using an imported identity, you can enter any value for the secret. When connecting to the peer you must use an identity (certificate) where the Common Name (CN) contains the text `admin`, for example, `PeerAdmin`, `myadmin`, `Admin` or `AdminPeer` are all valid Common Names. Peers in different organizations may have different admin users. Only an admin user of peer's organization will be able to deploy a business network to their peers. -Due to many breaking API changes between {{site.data.conrefs.hlf_full}} alpha 1 and {{site.data.conrefs.hlf_full}} v1.0 Beta 1, {{site.data.conrefs.composer_full}} only supports the beta 1 level and cannot support older versions of {{site.data.conrefs.hlf_full}} v1.0 (e.g. alpha 1). +Due to many breaking API changes between {{site.data.conrefs.hlf_full}} alpha 1 and {{site.data.conrefs.hlf_full}} v1.0 RC 1, {{site.data.conrefs.composer_full}} only supports the RC 1 level and cannot support older versions of {{site.data.conrefs.hlf_full}} v1.0 (e.g. alpha 1). ### Deploying business networks using Playground locally -When deploying a business network to {{site.data.conrefs.hlf_full}} v1.0 Beta 1 using the Playground locally, you must follow the process above to connect using the peer admin identity. However, in order to create identities and interact with your business network in the Playground, you must use the certificate authority admin identity. +When deploying a business network to {{site.data.conrefs.hlf_full}} v1.0 RC 1 using the Playground locally, you must follow the process above to connect using the peer admin identity. However, in order to create identities and interact with your business network in the Playground, you must use the certificate authority admin identity. ## References diff --git a/packages/composer-website/jekylldocs/business-network/bnd-publish.md b/packages/composer-website/jekylldocs/business-network/bnd-publish.md index 9a04d33df8..43f40ebca1 100644 --- a/packages/composer-website/jekylldocs/business-network/bnd-publish.md +++ b/packages/composer-website/jekylldocs/business-network/bnd-publish.md @@ -2,6 +2,8 @@ layout: default title: Task - Publish Models or Business Network Definitions category: tasks +section: business-network +index-order: 6 sidebar: sidebars/businessnetworks.md excerpt: How to publish a model or business network definition for use by applications --- diff --git a/packages/composer-website/jekylldocs/business-network/business-network-index.md b/packages/composer-website/jekylldocs/business-network/business-network-index.md index 29c1ed2678..c220d4ef2d 100644 --- a/packages/composer-website/jekylldocs/business-network/business-network-index.md +++ b/packages/composer-website/jekylldocs/business-network/business-network-index.md @@ -2,6 +2,8 @@ layout: default title: Hyperledger Composer - Developing Business Networks category: concepts +section: business-network +index-order: 0 sidebar: sidebars/businessnetworks.md excerpt: Overview of Developing Business Networks --- diff --git a/packages/composer-website/jekylldocs/business-network/businessnetworkdefinition.md b/packages/composer-website/jekylldocs/business-network/businessnetworkdefinition.md index 0575117e3e..c3b0009f05 100644 --- a/packages/composer-website/jekylldocs/business-network/businessnetworkdefinition.md +++ b/packages/composer-website/jekylldocs/business-network/businessnetworkdefinition.md @@ -2,6 +2,8 @@ layout: default title: Hyperledger Composer - Business Network Definition category: concepts +section: business-network +index-order: 1 sidebar: sidebars/businessnetworks.md excerpt: Overview of the Business Network Definition --- diff --git a/packages/composer-website/jekylldocs/business-network/publishing-events.md b/packages/composer-website/jekylldocs/business-network/publishing-events.md index 30c4482d49..caf84b3013 100644 --- a/packages/composer-website/jekylldocs/business-network/publishing-events.md +++ b/packages/composer-website/jekylldocs/business-network/publishing-events.md @@ -2,6 +2,8 @@ layout: default title: Emitting Events category: tasks +section: business-network +index-order: 4 sidebar: sidebars/businessnetworks.md excerpt: Emitting Events from Transaction Processor Functions --- diff --git a/packages/composer-website/jekylldocs/business-network/query.md b/packages/composer-website/jekylldocs/business-network/query.md index 16e1b1854c..3fe3c2894d 100644 --- a/packages/composer-website/jekylldocs/business-network/query.md +++ b/packages/composer-website/jekylldocs/business-network/query.md @@ -3,6 +3,7 @@ layout: default title: Querying Business Network Data category: tasks section: business-network +index-order: 7 sidebar: sidebars/businessnetworks.md excerpt: Queries are used to return data about the blockchain world-state; for example, you could write a query to return all drivers over a defined age parameter, or all drivers with a specific name. --- @@ -15,7 +16,7 @@ Queries are used to return data about the blockchain world-state; for example, y Queries are an optional component of a business network definition, written in a single query file (`queries.qry`). -Note: Queries are supported by the {{site.data.conrefs.hlf_full}} v1.0, embedded and web runtimes. The query support for the embedded and web runtimes currently has limitations and is unstable. When using the {{site.data.conrefs.hlf_full}} v1.0-beta runtime {{site.data.conrefs.hlf_full}} must be configured to use CouchDB persistence. Queries are **not** supported with the {{site.data.conrefs.hlf_full}} v0.6 runtime. +Note: Queries are supported by the {{site.data.conrefs.hlf_full}} v1.0, embedded and web runtimes. The query support for the embedded and web runtimes currently has limitations and is unstable. When using the {{site.data.conrefs.hlf_full}} v1.0-RC runtime {{site.data.conrefs.hlf_full}} must be configured to use CouchDB persistence. Queries are **not** supported with the {{site.data.conrefs.hlf_full}} v0.6 runtime. ## Writing Queries diff --git a/packages/composer-website/jekylldocs/business-network/testing.md b/packages/composer-website/jekylldocs/business-network/testing.md index 12a4257090..193c1a2b82 100644 --- a/packages/composer-website/jekylldocs/business-network/testing.md +++ b/packages/composer-website/jekylldocs/business-network/testing.md @@ -2,6 +2,8 @@ layout: default title: Task - Testing Business Networks category: tasks +section: business-network +index-order: 5 sidebar: sidebars/businessnetworks.md excerpt: How to test business networks --- diff --git a/packages/composer-website/jekylldocs/installing/development-tools.md b/packages/composer-website/jekylldocs/installing/development-tools.md index ba2753afba..40daeb6c5b 100644 --- a/packages/composer-website/jekylldocs/installing/development-tools.md +++ b/packages/composer-website/jekylldocs/installing/development-tools.md @@ -12,7 +12,7 @@ index-order: 3 Follow the instructions below to get the required {{site.data.conrefs.composer_full}} development tools and stand up a {{site.data.conrefs.hlf_full}}. -There are two version of {{site.data.conrefs.hlf_full}}: v0.6 and v1.0-beta. The default is for v1.0-beta and we suggest this is the one you use. +There are two version of {{site.data.conrefs.hlf_full}}: v0.6 and v1.0-RC. The default is for v1.0-RC and we suggest this is the one you use. ## Before you begin @@ -107,7 +107,7 @@ docker rmi $(docker images dev-* -q) export FABRIC_VERSION=hlfv0.6 - {{site.data.conrefs.hlf_full}} v1.0-beta is the default, but to 'unset' the v0.6, or to be explicit in using v1 use this command + {{site.data.conrefs.hlf_full}} v1.0-RC is the default, but to 'unset' the v0.6, or to be explicit in using v1 use this command export FABRIC_VERSION=hlfv1 diff --git a/packages/composer-website/jekylldocs/installing/using-playground-locally.md b/packages/composer-website/jekylldocs/installing/using-playground-locally.md index cad98245a6..590e030b98 100644 --- a/packages/composer-website/jekylldocs/installing/using-playground-locally.md +++ b/packages/composer-website/jekylldocs/installing/using-playground-locally.md @@ -10,7 +10,7 @@ index-order: 2 # Installing and running {{site.data.conrefs.composer_full}} Playground locally -This tutorial will take you through how to install and run the {{site.data.conrefs.composer_full}} Playground on your local machine. It also creates an instance of {{site.data.conrefs.hlf_full}} v1.0 Beta 1. +This tutorial will take you through how to install and run the {{site.data.conrefs.composer_full}} Playground on your local machine. It also creates an instance of {{site.data.conrefs.hlf_full}} v1.0 RC 1. {{site.data.conrefs.composer_full}} Playground can also be used in a "browser only" mode, without a running instance of {{site.data.conrefs.hlf_full}}. When used in this mode, all the functionality of {{site.data.conrefs.composer_full}} Playground is available, but all of the data (business networks, assets, participants, and transactions) is persisted into browser local storage. @@ -39,17 +39,17 @@ docker images -aq | xargs docker rmi -f 2. Access your local {{site.data.conrefs.composer_full}} Playground by clicking this link: http://localhost:8080. -## Deploying business networks to {{site.data.conrefs.hlf_full}} Beta +## Deploying business networks to {{site.data.conrefs.hlf_full}} RC -In {{site.data.conrefs.hlf_full}} Beta peers now enforce the concepts of admins and members. Admin user's identities and crypto material must be available to the peer at deployment. To make that identity and its crypto material available, your must import it to your local `keyValStore` directory before deploying the business network. To import the identity, use the [`composer identity import` command](../reference/composer.identity.import.html). When importing an identity, you do not assign it a secret, however the `composer network deploy` command requires a secret. If you are using an imported identity, you can enter any value for the secret. +In {{site.data.conrefs.hlf_full}} RC peers now enforce the concepts of admins and members. Admin user's identities and crypto material must be available to the peer at deployment. To make that identity and its crypto material available, your must import it to your local `keyValStore` directory before deploying the business network. To import the identity, use the [`composer identity import` command](../reference/composer.identity.import.html). When importing an identity, you do not assign it a secret, however the `composer network deploy` command requires a secret. If you are using an imported identity, you can enter any value for the secret. When connecting to the peer you must use an identity (certificate) where the Common Name (CN) contains the text `admin`, for example, `PeerAdmin`, `myadmin`, `Admin` or `AdminPeer` are all valid Common Names. Peers in different organizations may have different admin users. Only an admin user of peer's organization will be able to deploy a business network to their peers. -Due to many breaking API changes between {{site.data.conrefs.hlf_full}} v1.0 alpha 1 and {{site.data.conrefs.hlf_full}} v1.0 beta, {{site.data.conrefs.composer_full}} only supports the beta level and cannot support older versions of {{site.data.conrefs.hlf_full}} v1.0 (e.g. alpha 1). +Due to many breaking API changes between {{site.data.conrefs.hlf_full}} v1.0 alpha 1 and {{site.data.conrefs.hlf_full}} v1.0 RC, {{site.data.conrefs.composer_full}} only supports the RC level and cannot support older versions of {{site.data.conrefs.hlf_full}} v1.0 (e.g. alpha 1). ### Deploying business networks using Playground locally -When deploying a business network to {{site.data.conrefs.hlf_full}} Beta using the Playground locally, you must follow the process above to connect using the peer admin identity. However, in order to create identities and interact with your business network in the Playground, you must use the certificate authority admin identity. +When deploying a business network to {{site.data.conrefs.hlf_full}} RC using the Playground locally, you must follow the process above to connect using the peer admin identity. However, in order to create identities and interact with your business network in the Playground, you must use the certificate authority admin identity. --- diff --git a/packages/composer-website/jekylldocs/introduction/introduction.md b/packages/composer-website/jekylldocs/introduction/introduction.md index 19a952eaa0..1d5fae8f3d 100644 --- a/packages/composer-website/jekylldocs/introduction/introduction.md +++ b/packages/composer-website/jekylldocs/introduction/introduction.md @@ -1,7 +1,9 @@ --- layout: default -title: Hyperledger Composer - Overview +title: Introduction category: overview +section: introduction +index-order: 0 sidebar: sidebars/introduction.md excerpt: Hyperledger Composer overview --- diff --git a/packages/composer-website/jekylldocs/introduction/key-concepts.md b/packages/composer-website/jekylldocs/introduction/key-concepts.md index 1399141825..2e04897846 100644 --- a/packages/composer-website/jekylldocs/introduction/key-concepts.md +++ b/packages/composer-website/jekylldocs/introduction/key-concepts.md @@ -1,11 +1,12 @@ --- layout: default -title: Key Concepts in Hyperledger Composer +title: Key Concepts sidebar: sidebars/introduction.md -excerpt: +section: introduction +index-order: 1 --- -# Features and Concepts in {{site.data.conrefs.composer_full}} +# Key Concepts in {{site.data.conrefs.composer_full}} {{site.data.conrefs.composer_full}} is a programming model containing a modeling language, and a set of APIs to quickly define and deploy business networks and applications that allow **participants** to send **transactions** that exchange **assets**. diff --git a/packages/composer-website/jekylldocs/introduction/solution-architecture.md b/packages/composer-website/jekylldocs/introduction/solution-architecture.md index 5d155c023e..4a15228418 100644 --- a/packages/composer-website/jekylldocs/introduction/solution-architecture.md +++ b/packages/composer-website/jekylldocs/introduction/solution-architecture.md @@ -1,8 +1,9 @@ --- layout: default -title: Solution Architecture +title: Typical Solution Architecture sidebar: sidebars/introduction.md -excerpt: +section: introduction +index-order: 2.5 --- # Typical {{site.data.conrefs.composer_full}} Solution Architecture @@ -29,7 +30,7 @@ excerpt: {{site.data.conrefs.composer_full}} has been designed to support different pluggable runtimes, and currently has four runtime implementations: * {{site.data.conrefs.hlf_full}} version 0.6. State is stored on the distributed ledger. -* {{site.data.conrefs.hlf_full}} version 1.0 beta 1. State is stored on the distributed ledger. +* {{site.data.conrefs.hlf_full}} version 1.0 RC 1. State is stored on the distributed ledger. * Web, which executes within a web page, and is used by Playground. State is stored in browser local storage. * Embedded, which executes within a Node.js process, and is used primarily for unit testing business logic. State is stored in an in-memory key-value store. diff --git a/packages/composer-website/jekylldocs/managing/updating-composer.md b/packages/composer-website/jekylldocs/managing/updating-composer.md index baf08b8440..2f2450945d 100644 --- a/packages/composer-website/jekylldocs/managing/updating-composer.md +++ b/packages/composer-website/jekylldocs/managing/updating-composer.md @@ -4,10 +4,31 @@ title: Updating Hyperledger Composer category: tasks section: managing sidebar: sidebars/managing.md -excerpt: +excerpt: To [update Hyperledger Composer](./updating-composer.html) to a new version, the Hyperledger Composer components must be uninstalled and reinstalled using npm. index-order: 7 --- # Updating {{site.data.conrefs.composer_full}} -After deploying {{site.data.conrefs.composer_full}} you may wish to upgrade to a new version for additional functionality. +After deploying {{site.data.conrefs.composer_full}} you may wish to upgrade to a new version. To update your installed version of {{site.data.conrefs.composer_full}} you must uninstall the client, admin, and runtime CLI components and reinstall them by using npm. + +## Procedure + +1. Uninstall the {{site.data.conrefs.composer_full}} components by using the following commands: + + npm uninstall -g composer-cli + npm uninstall -g composer-rest-server + npm uninstall -g generator-fabric-composer + +2. Install the latest version of the {{site.data.conrefs.composer_full}} components by using the following commands: + + npm install -g composer-cli + npm install -g composer-rest-server + npm install -g generator-fabric-composer + + +## What next? + +- [Defining a business network](../business-network/bnd-create.html) +- [Modeling language](../reference/cto_language.html) +- [Managing your solution](./managingindex.html) diff --git a/packages/composer-website/jekylldocs/problems/diagnostics.md b/packages/composer-website/jekylldocs/problems/diagnostics.md index 3080179b23..dc3d631f65 100644 --- a/packages/composer-website/jekylldocs/problems/diagnostics.md +++ b/packages/composer-website/jekylldocs/problems/diagnostics.md @@ -4,6 +4,8 @@ title: Task - Diagnosing Problems category: tasks sidebar: sidebars/problems.md excerpt: Diagnosing Problems +section: diagnostics +index-order: 0 --- # Diagnosing Problems diff --git a/packages/composer-website/jekylldocs/reference/JSDOC-README.md b/packages/composer-website/jekylldocs/reference/JSDOC-README.md new file mode 100644 index 0000000000..76132da2bc --- /dev/null +++ b/packages/composer-website/jekylldocs/reference/JSDOC-README.md @@ -0,0 +1,34 @@ +--- +index-order: 9 +title: API Documentation +section: reference +layout: default +exception: API +excerpt: The Client, Admin, and Runtime components of Hyperledger Composer contain [JavaScript APIs](../jsdoc/index.html) for application integration. +--- + +# Hyperledger Composer API +Hyperledger Composer is an application development framework for building Blockchain applications based on Hyperledger. This is the JavaScript documentation for the Hyperledger Composer Client, Admin, and Runtime JavaScript APIs. + + +## Overview +The major components of Hyperledger Composer are: + +1. The Hyperledger Composer language for describing the structure of resources (assets, participants +and transactions) that participate in a blockchain backed business network. +2. JavaScript APIs to query, create, update and delete resources and submit transactions + from client applications. Hyperledger Composer resources are stored on the Blockchain. +3. JavaScript transaction processor functions that runs on Hyperledger Fabric when transactions are +submitted for processing. These functions may update the state of resources +stored on the Blockchain via server-side Hyperledger Composer APIs. + +## Resources + +- [Documentation](https://hyperledger.github.io/composer/) +- [npm modules](https://www.npmjs.com/search?q=hyperledger-composer) +- [GitHub repositories](https://github.com/hyperledger/composer) + +## Contributing + +To read more about the community and guidelines for submitting pull requests, +please read the [Contributing document](https://github.com/hyperledger/composer/blob/master/CONTRIBUTING.md). diff --git a/packages/composer-website/jekylldocs/reference/commands.md b/packages/composer-website/jekylldocs/reference/commands.md index 46031a7f24..c916b4c4e5 100644 --- a/packages/composer-website/jekylldocs/reference/commands.md +++ b/packages/composer-website/jekylldocs/reference/commands.md @@ -44,6 +44,10 @@ Permanently disable a business network definition: [composer network undeploy](. List the contents of a deployed Business Network: [composer network list](./composer.network.list.md) +`composer network logLevel` + +Return or update the log level for the composer runtime: [`composer network logLevel`](./composer.network.logLevel.md) + `composer network ping` Test the connection to a deployed a Business Network: [composer network ping](./composer.network.ping.md) diff --git a/packages/composer-website/jekylldocs/reference/composer.identity.issue.md b/packages/composer-website/jekylldocs/reference/composer.identity.issue.md index ea3758c2d5..9deebb694e 100644 --- a/packages/composer-website/jekylldocs/reference/composer.identity.issue.md +++ b/packages/composer-website/jekylldocs/reference/composer.identity.issue.md @@ -29,6 +29,8 @@ Options: --newUserId, -u The user ID for the new identity [string] [required] --participantId, -a The particpant to issue the new identity to [string] [required] --issuer, -x If the new identity should be able to issue other new identities [boolean] [required] + --option, -o Options that are specific specific to a connection. Multiple options are specified by repeating this option [string] + --optionFile, -O A file containing options that are specific to connection [string] ``` ## Options diff --git a/packages/composer-website/jekylldocs/reference/composer.network.deploy.md b/packages/composer-website/jekylldocs/reference/composer.network.deploy.md index 15ea40633d..9e17dbbe64 100644 --- a/packages/composer-website/jekylldocs/reference/composer.network.deploy.md +++ b/packages/composer-website/jekylldocs/reference/composer.network.deploy.md @@ -18,12 +18,15 @@ composer network deploy -a -i -s -p -l -i -s +``` + +### Options +``` +--help Show help [boolean] +-v, --version Show version number [boolean] +--businessNetworkName, -n The business network name [string] [required] +--connectionProfileName, -p The connection profile name [string] [required] +--newlevel, -l the new logging level (INFO/WARNING/ERROR/DEBUG) [string] +--enrollId, -i The enrollment ID of the user [string] [required] +--enrollSecret, -s The enrollment secret of the user [string] +``` diff --git a/packages/composer-website/jekylldocs/reference/connectionprofile.md b/packages/composer-website/jekylldocs/reference/connectionprofile.md index 8613af6f5f..ad6727e166 100644 --- a/packages/composer-website/jekylldocs/reference/connectionprofile.md +++ b/packages/composer-website/jekylldocs/reference/connectionprofile.md @@ -4,7 +4,7 @@ title: Connection Profiles section: reference index-order: 6 sidebar: sidebars/reference.md -excerpt: In order to connect your business network to a fabric, you must [**define a connection profile**](./connectionprofile.html). Connection profiles contain the information necessary to connect to a fabric. This topic contains example connection profiles for Hyperledger Fabric v0.6 and v1.0-beta. +excerpt: In order to connect your business network to a fabric, you must [**define a connection profile**](./connectionprofile.html). Connection profiles contain the information necessary to connect to a fabric. This topic contains example connection profiles for Hyperledger Fabric v0.6 and v1.0-RC. --- # Connection Profiles @@ -36,7 +36,7 @@ A Connection Profile is used by {{site.data.conrefs.composer_full}} to connect t "peerURL": , "eventHubURL": } - If you are creating a connection profile for {{site.data.conrefs.hlf_full}} v1.0 beta, use the following format: + If you are creating a connection profile for {{site.data.conrefs.hlf_full}} v1.0 RC, use the following format: { "type": "hlfv1", @@ -106,7 +106,7 @@ A Connection Profile is used by {{site.data.conrefs.composer_full}} to connect t "maxRecvSize": 15 } - - `type` defines the version of {{site.data.conrefs.hlf_full}} that you will connect to. To connect to {{site.data.conrefs.hlf_full}} v1.0-beta is must be `hlfv1`. + - `type` defines the version of {{site.data.conrefs.hlf_full}} that you will connect to. To connect to {{site.data.conrefs.hlf_full}} v1.0-RC is must be `hlfv1`. - `orderers` is an array of objects which describe the orderes to communicate with. Within `orderers`, you must define the `url` of each orderer. If you are connecting via TLS, all `url` properties in your connection profile must begin with `grpcs://` and must also contain the correct TLS certificate in the `cert` property. - `peers` is an array of objects describing the peers to communicate with. Each `peer` must have a defined `requestURL` and a defined `eventURL`. If you are connecting using TLS, each `peer` must also have the correct TLS certificate in the `cert` property. @@ -117,5 +117,6 @@ A Connection Profile is used by {{site.data.conrefs.composer_full}} to connect t - `mspid` is the Membership Service Provider ID of your organization. It is associated with the enrollment id that you will use to interact with the business network. - `timeout` is an optional property which controls the timeout for each request made to peers and orderers. Please note, some commands may make several sequential requests and the timeout will be applied individually to each request. + - `globalcert` defines the TLS certificate which is used for all peers and orderers if no `cert` property is specified. If a `cert` property is specified, it overrides the `globalcert` property only for the peer or orderer it is specified for. - `maxSendSize` is an optional property which defines the size limit of outbound grpc messages being send to orderers and peers. The value is defined in megabytes. If this is not set, grpc sets a default. Setting this property to `-1` results in no size restriction. - `maxRecvSize` is an optional property which defines the size limit of inbound grpc messages being received from orderers and peers. The value is defined in megabytes. If this is not set, grpc sets a default. Setting this property to `-1` results in no size restriction. diff --git a/packages/composer-website/jekylldocs/reference/glossary.md b/packages/composer-website/jekylldocs/reference/glossary.md index a10066aa46..31bdf31c03 100644 --- a/packages/composer-website/jekylldocs/reference/glossary.md +++ b/packages/composer-website/jekylldocs/reference/glossary.md @@ -2,7 +2,7 @@ layout: default title: Hyperledger Composer Glossary of Terms section: reference -index-order: 9 +index-order: 10 sidebar: sidebars/reference.md excerpt: The glossary contains [**definitions of all Hyperledger Composer terms**](./glossary.html) for developing a solution with Hyperledger Composer. --- diff --git a/packages/composer-website/jekylldocs/reference/reference-index.md b/packages/composer-website/jekylldocs/reference/reference-index.md index 1e53b577a3..7e5d87b316 100644 --- a/packages/composer-website/jekylldocs/reference/reference-index.md +++ b/packages/composer-website/jekylldocs/reference/reference-index.md @@ -15,7 +15,7 @@ The {{site.data.conrefs.composer_full}} reference material contains a number of {% assign sorted = site.pages | sort: 'index-order' %} {% for page in sorted %} -{% if page.section == 'reference' and page.title != "Reference Index" %} +{% if page.section == 'reference' and page.title != "Reference Index" or page.exception == 'API' %} ### {{ page.title }} {{ page.excerpt }} {% endif %} diff --git a/packages/composer-website/jekylldocs/support/index.md b/packages/composer-website/jekylldocs/support/index.md index d4865b3b68..4a0a8d7b48 100644 --- a/packages/composer-website/jekylldocs/support/index.md +++ b/packages/composer-website/jekylldocs/support/index.md @@ -4,6 +4,8 @@ title: Support category: start sidebar: sidebars/support.md excerpt: Get support with Hyperledger Composer +section: support +index-order: 0 --- #Community From e682b18c22c4a1594d52249e1f443467a19ab39b Mon Sep 17 00:00:00 2001 From: fabric-composer-app Date: Thu, 6 Jul 2017 13:06:20 +0000 Subject: [PATCH 03/88] Automatic version bump to 0.9.2 --- lerna.json | 2 +- package.json | 2 +- packages/composer-admin/package.json | 8 ++++---- packages/composer-cli/package.json | 10 +++++----- packages/composer-client/package.json | 8 ++++---- packages/composer-common/package.json | 2 +- .../composer-connector-embedded/package.json | 8 ++++---- packages/composer-connector-hlf/package.json | 6 +++--- packages/composer-connector-hlfv1/package.json | 6 +++--- packages/composer-connector-proxy/package.json | 4 ++-- .../composer-connector-server/package.json | 10 +++++----- packages/composer-connector-web/package.json | 8 ++++---- packages/composer-cucumber-steps/package.json | 10 +++++----- packages/composer-playground-api/package.json | 6 +++--- packages/composer-playground/package.json | 18 +++++++++--------- packages/composer-rest-server/package.json | 12 ++++++------ .../composer-runtime-embedded/package.json | 8 ++++---- packages/composer-runtime-hlf/package.json | 4 ++-- packages/composer-runtime-hlfv1/package.json | 4 ++-- packages/composer-runtime-pouchdb/package.json | 6 +++--- packages/composer-runtime-web/package.json | 8 ++++---- packages/composer-runtime/package.json | 4 ++-- packages/composer-systests/package.json | 16 ++++++++-------- packages/composer-website/package.json | 10 +++++----- .../package.json | 10 +++++----- .../loopback-connector-composer/package.json | 10 +++++----- 26 files changed, 100 insertions(+), 100 deletions(-) diff --git a/lerna.json b/lerna.json index 21e6fe4b37..05e6b4521e 100644 --- a/lerna.json +++ b/lerna.json @@ -3,6 +3,6 @@ "packages": [ "packages/*" ], - "version": "0.9.1", + "version": "0.9.2", "hoist": true } diff --git a/package.json b/package.json index 3166a6aa55..945a0fac38 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "name": "composer", "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.", - "version": "0.9.1", + "version": "0.9.2", "main": "index.js", "private": true, "scripts": { diff --git a/packages/composer-admin/package.json b/packages/composer-admin/package.json index 5ba99c8722..aded8ffafe 100644 --- a/packages/composer-admin/package.json +++ b/packages/composer-admin/package.json @@ -1,6 +1,6 @@ { "name": "composer-admin", - "version": "0.9.1", + "version": "0.9.2", "description": "Hyperledger Composer Admin, code that manages business networks deployed to Hyperledger Fabric", "engines": { "node": ">=6", @@ -42,9 +42,9 @@ "sinon-as-promised": "^4.0.2" }, "dependencies": { - "composer-common": "^0.9.1", - "composer-connector-hlf": "^0.9.1", - "composer-connector-hlfv1": "^0.9.1" + "composer-common": "^0.9.2", + "composer-connector-hlf": "^0.9.2", + "composer-connector-hlfv1": "^0.9.2" }, "license-check-config": { "src": [ diff --git a/packages/composer-cli/package.json b/packages/composer-cli/package.json index 13d9d5f707..60efd18aa8 100644 --- a/packages/composer-cli/package.json +++ b/packages/composer-cli/package.json @@ -1,6 +1,6 @@ { "name": "composer-cli", - "version": "0.9.1", + "version": "0.9.2", "description": "Hyperledger Composer command line interfaces (CLIs)", "engines": { "node": ">=6", @@ -42,10 +42,10 @@ "dependencies": { "chalk": "^1.1.3", "cli-table": "^0.3.1", - "composer-admin": "^0.9.1", - "composer-client": "^0.9.1", - "composer-common": "^0.9.1", - "composer-rest-server": "^0.9.1", + "composer-admin": "^0.9.2", + "composer-client": "^0.9.2", + "composer-common": "^0.9.2", + "composer-rest-server": "^0.9.2", "homedir": "^0.6.0", "npm-paths": "^0.1.3", "nunjucks": "^3.0.0", diff --git a/packages/composer-client/package.json b/packages/composer-client/package.json index 338df94ca5..ec87a53e1c 100644 --- a/packages/composer-client/package.json +++ b/packages/composer-client/package.json @@ -1,6 +1,6 @@ { "name": "composer-client", - "version": "0.9.1", + "version": "0.9.2", "description": "The node.js client library for Hyperledger Composer, a development framework for Hyperledger Fabric", "engines": { "node": ">=6", @@ -42,9 +42,9 @@ "logError": true }, "dependencies": { - "composer-common": "^0.9.1", - "composer-connector-hlf": "^0.9.1", - "composer-connector-hlfv1": "^0.9.1", + "composer-common": "^0.9.2", + "composer-connector-hlf": "^0.9.2", + "composer-connector-hlfv1": "^0.9.2", "uuid": "^3.0.1" }, "devDependencies": { diff --git a/packages/composer-common/package.json b/packages/composer-common/package.json index 8b8cb131ea..c264334181 100644 --- a/packages/composer-common/package.json +++ b/packages/composer-common/package.json @@ -1,6 +1,6 @@ { "name": "composer-common", - "version": "0.9.1", + "version": "0.9.2", "description": "Hyperledger Composer Common, code that is common across client, admin and runtime.", "engines": { "node": ">=6", diff --git a/packages/composer-connector-embedded/package.json b/packages/composer-connector-embedded/package.json index 65c85d85c3..83acfc466e 100644 --- a/packages/composer-connector-embedded/package.json +++ b/packages/composer-connector-embedded/package.json @@ -1,6 +1,6 @@ { "name": "composer-connector-embedded", - "version": "0.9.1", + "version": "0.9.2", "description": "The embedded client connector for Hyperledger Composer", "engines": { "node": ">=6", @@ -52,9 +52,9 @@ "watchify": "^3.7.0" }, "dependencies": { - "composer-common": "^0.9.1", - "composer-runtime": "^0.9.1", - "composer-runtime-embedded": "^0.9.1" + "composer-common": "^0.9.2", + "composer-runtime": "^0.9.2", + "composer-runtime-embedded": "^0.9.2" }, "nyc": { "exclude": [ diff --git a/packages/composer-connector-hlf/package.json b/packages/composer-connector-hlf/package.json index 4a6002650f..ce7f76d1e2 100644 --- a/packages/composer-connector-hlf/package.json +++ b/packages/composer-connector-hlf/package.json @@ -1,6 +1,6 @@ { "name": "composer-connector-hlf", - "version": "0.9.1", + "version": "0.9.2", "description": "The Hyperledger Fabric Client connector for Hyperledger Composer", "engines": { "node": ">=6", @@ -40,8 +40,8 @@ "logError": true }, "dependencies": { - "composer-common": "^0.9.1", - "composer-runtime-hlf": "^0.9.1", + "composer-common": "^0.9.2", + "composer-runtime-hlf": "^0.9.2", "fs-extra": "^1.0.0", "hfc": "^0.6.5", "semver": "^5.3.0", diff --git a/packages/composer-connector-hlfv1/package.json b/packages/composer-connector-hlfv1/package.json index 2f80770e8f..cc494612ed 100644 --- a/packages/composer-connector-hlfv1/package.json +++ b/packages/composer-connector-hlfv1/package.json @@ -1,6 +1,6 @@ { "name": "composer-connector-hlfv1", - "version": "0.9.1", + "version": "0.9.2", "description": "The Hyperledger Fabric v1.x Client connector for Hyperledger Composer", "engines": { "node": ">=6", @@ -40,8 +40,8 @@ "logError": true }, "dependencies": { - "composer-common": "^0.9.1", - "composer-runtime-hlfv1": "^0.9.1", + "composer-common": "^0.9.2", + "composer-runtime-hlfv1": "^0.9.2", "fabric-ca-client": "1.0.0-rc1", "fabric-client": "1.0.0-rc1", "fs-extra": "^1.0.0", diff --git a/packages/composer-connector-proxy/package.json b/packages/composer-connector-proxy/package.json index b26a0043ef..050cd45120 100644 --- a/packages/composer-connector-proxy/package.json +++ b/packages/composer-connector-proxy/package.json @@ -1,6 +1,6 @@ { "name": "composer-connector-proxy", - "version": "0.9.1", + "version": "0.9.2", "description": "The proxying client connector for Hyperledger Composer", "engines": { "node": ">=6", @@ -54,7 +54,7 @@ "watchify": "^3.7.0" }, "dependencies": { - "composer-common": "^0.9.1", + "composer-common": "^0.9.2", "socket.io-client": "^1.7.3" }, "nyc": { diff --git a/packages/composer-connector-server/package.json b/packages/composer-connector-server/package.json index 38f65cffdc..8a18522ed6 100644 --- a/packages/composer-connector-server/package.json +++ b/packages/composer-connector-server/package.json @@ -1,6 +1,6 @@ { "name": "composer-connector-server", - "version": "0.9.1", + "version": "0.9.2", "description": "The remote connector server for Hyperledger Composer", "engines": { "node": ">=6", @@ -44,10 +44,10 @@ "logError": true }, "dependencies": { - "composer-common": "^0.9.1", - "composer-connector-embedded": "^0.9.1", - "composer-connector-hlf": "^0.9.1", - "composer-connector-hlfv1": "^0.9.1", + "composer-common": "^0.9.2", + "composer-connector-embedded": "^0.9.2", + "composer-connector-hlf": "^0.9.2", + "composer-connector-hlfv1": "^0.9.2", "serializerr": "^1.0.3", "socket.io": "^1.7.3", "uuid": "^3.0.1", diff --git a/packages/composer-connector-web/package.json b/packages/composer-connector-web/package.json index 32a16924fe..0b90569753 100644 --- a/packages/composer-connector-web/package.json +++ b/packages/composer-connector-web/package.json @@ -1,6 +1,6 @@ { "name": "composer-connector-web", - "version": "0.9.1", + "version": "0.9.2", "description": "The web client connector for Hyperledger Composer", "engines": { "node": ">=6", @@ -62,9 +62,9 @@ "watchify": "^3.7.0" }, "dependencies": { - "composer-common": "^0.9.1", - "composer-runtime": "^0.9.1", - "composer-runtime-web": "^0.9.1", + "composer-common": "^0.9.2", + "composer-runtime": "^0.9.2", + "composer-runtime-web": "^0.9.2", "uuid": "^3.0.1" } } diff --git a/packages/composer-cucumber-steps/package.json b/packages/composer-cucumber-steps/package.json index 1fc80317e2..96f1bc642b 100644 --- a/packages/composer-cucumber-steps/package.json +++ b/packages/composer-cucumber-steps/package.json @@ -1,6 +1,6 @@ { "name": "composer-cucumber-steps", - "version": "0.9.1", + "version": "0.9.2", "description": "A library of Cucumber steps for testing Hyperledger Composer", "main": "index.js", "scripts": { @@ -70,10 +70,10 @@ "dependencies": { "browserfs": "^1.1.0", "chai": "^3.5.0", - "composer-admin": "^0.9.1", - "composer-client": "^0.9.1", - "composer-common": "^0.9.1", - "composer-connector-embedded": "^0.9.1", + "composer-admin": "^0.9.2", + "composer-client": "^0.9.2", + "composer-common": "^0.9.2", + "composer-connector-embedded": "^0.9.2", "thenify-all": "^1.6.0" } } diff --git a/packages/composer-playground-api/package.json b/packages/composer-playground-api/package.json index d47b8a4166..29d07b98d8 100644 --- a/packages/composer-playground-api/package.json +++ b/packages/composer-playground-api/package.json @@ -1,6 +1,6 @@ { "name": "composer-playground-api", - "version": "0.9.1", + "version": "0.9.2", "description": "The REST API for the Hyperledger Composer Playground", "engines": { "node": ">=6", @@ -58,8 +58,8 @@ "dependencies": { "async": "^2.5.0", "body-parser": "^1.17.0", - "composer-common": "^0.9.1", - "composer-connector-server": "^0.9.1", + "composer-common": "^0.9.2", + "composer-connector-server": "^0.9.2", "dotenv": "^4.0.0", "express": "^4.15.2", "http-status": "^1.0.1", diff --git a/packages/composer-playground/package.json b/packages/composer-playground/package.json index 072de84733..aaf84bb42f 100644 --- a/packages/composer-playground/package.json +++ b/packages/composer-playground/package.json @@ -1,6 +1,6 @@ { "name": "composer-playground", - "version": "0.9.1", + "version": "0.9.2", "description": "A test harness/UI for the web runtime container for Hyperledger Composer", "engines": { "node": ">=6", @@ -78,8 +78,8 @@ "dependencies": { "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.24", "cheerio": "^0.22.0", - "composer-common": "^0.9.1", - "composer-playground-api": "^0.9.1", + "composer-common": "^0.9.2", + "composer-playground-api": "^0.9.2", "express": "^4.15.2", "fast-json-patch": "^1.1.8", "file-saver": "^1.3.3", @@ -133,12 +133,12 @@ "chai": "^3.5.0", "codelyzer": "^2.0.1", "codemirror": "5.26.0", - "composer-admin": "^0.9.1", - "composer-client": "^0.9.1", - "composer-connector-proxy": "^0.9.1", - "composer-connector-web": "^0.9.1", - "composer-runtime": "^0.9.1", - "composer-runtime-web": "^0.9.1", + "composer-admin": "^0.9.2", + "composer-client": "^0.9.2", + "composer-connector-proxy": "^0.9.2", + "composer-connector-web": "^0.9.2", + "composer-runtime": "^0.9.2", + "composer-runtime-web": "^0.9.2", "copy-webpack-plugin": "^4.0.1", "core-js": "^2.4.1", "css-loader": "^0.26.1", diff --git a/packages/composer-rest-server/package.json b/packages/composer-rest-server/package.json index 3329e89bbe..119ac0cad7 100644 --- a/packages/composer-rest-server/package.json +++ b/packages/composer-rest-server/package.json @@ -1,6 +1,6 @@ { "name": "composer-rest-server", - "version": "0.9.1", + "version": "0.9.2", "description": "Hyperledger Composer REST server that uses the Hyperledger Composer LoopBack connector", "engines": { "node": ">=6", @@ -36,7 +36,7 @@ "chalk": "^1.1.3", "clear": "0.0.1", "clui": "^0.3.1", - "composer-common": "^0.9.1", + "composer-common": "^0.9.2", "compression": "^1.0.3", "connect-ensure-login": "^0.1.1", "cookie-parser": "^1.4.3", @@ -52,7 +52,7 @@ "loopback-boot": "^2.23.0", "loopback-component-explorer": "^4.1.1", "loopback-component-passport": "^3.2.0", - "loopback-connector-composer": "^0.9.1", + "loopback-connector-composer": "^0.9.2", "passport-local": "^1.0.0", "serve-favicon": "^2.0.1", "strong-error-handler": "^1.0.1", @@ -64,9 +64,9 @@ "chai-as-promised": "^6.0.0", "chai-http": "^3.0.0", "clone": "^2.1.1", - "composer-admin": "^0.9.1", - "composer-client": "^0.9.1", - "composer-connector-embedded": "^0.9.1", + "composer-admin": "^0.9.2", + "composer-client": "^0.9.2", + "composer-connector-embedded": "^0.9.2", "eslint": "^3.17.1", "jsdoc": "^3.4.3", "license-check": "^1.1.5", diff --git a/packages/composer-runtime-embedded/package.json b/packages/composer-runtime-embedded/package.json index 0cc6ae21b4..62b316a4ae 100644 --- a/packages/composer-runtime-embedded/package.json +++ b/packages/composer-runtime-embedded/package.json @@ -1,6 +1,6 @@ { "name": "composer-runtime-embedded", - "version": "0.9.1", + "version": "0.9.2", "description": "The embedded runtime container for Hyperledger Composer", "engines": { "node": ">=6", @@ -52,9 +52,9 @@ "logError": true }, "dependencies": { - "composer-common": "^0.9.1", - "composer-runtime": "^0.9.1", - "composer-runtime-pouchdb": "^0.9.1", + "composer-common": "^0.9.2", + "composer-runtime": "^0.9.2", + "composer-runtime-pouchdb": "^0.9.2", "debug": "^2.6.2", "istanbul-lib-instrument": "^1.7.2", "request": "^2.81.0", diff --git a/packages/composer-runtime-hlf/package.json b/packages/composer-runtime-hlf/package.json index 922c63309b..8c061b9b5e 100644 --- a/packages/composer-runtime-hlf/package.json +++ b/packages/composer-runtime-hlf/package.json @@ -1,6 +1,6 @@ { "name": "composer-runtime-hlf", - "version": "0.9.1", + "version": "0.9.2", "description": "The Hyperledger Fabric runtime container for Hyperledger Composer", "engines": { "node": ">=6", @@ -28,7 +28,7 @@ "babelify": "^7.3.0", "browserify": "^13.3.0", "browserify-replace": "^0.9.0", - "composer-runtime": "^0.9.1", + "composer-runtime": "^0.9.2", "exorcist": "^0.4.0", "fs-extra": "^1.0.0", "uglify-js": "2.7.5" diff --git a/packages/composer-runtime-hlfv1/package.json b/packages/composer-runtime-hlfv1/package.json index 624209e647..68e8cb2223 100644 --- a/packages/composer-runtime-hlfv1/package.json +++ b/packages/composer-runtime-hlfv1/package.json @@ -1,6 +1,6 @@ { "name": "composer-runtime-hlfv1", - "version": "0.9.1", + "version": "0.9.2", "description": "The Hyperledger Fabric v1.x runtime container for Hyperledger Composer", "engines": { "node": ">=6", @@ -28,7 +28,7 @@ "babelify": "^7.3.0", "browserify": "^13.3.0", "browserify-replace": "^0.9.0", - "composer-runtime": "^0.9.1", + "composer-runtime": "^0.9.2", "exorcist": "^0.4.0", "fs-extra": "^1.0.0", "uglify-js": "2.7.5" diff --git a/packages/composer-runtime-pouchdb/package.json b/packages/composer-runtime-pouchdb/package.json index 65bacd390d..76e96e0587 100644 --- a/packages/composer-runtime-pouchdb/package.json +++ b/packages/composer-runtime-pouchdb/package.json @@ -1,6 +1,6 @@ { "name": "composer-runtime-pouchdb", - "version": "0.9.1", + "version": "0.9.2", "description": "Common PouchDB based runtime container code for Hyperledger Composer", "engines": { "node": ">=6", @@ -52,8 +52,8 @@ "logError": true }, "dependencies": { - "composer-common": "^0.9.1", - "composer-runtime": "^0.9.1", + "composer-common": "^0.9.2", + "composer-runtime": "^0.9.2", "debug": "^2.6.2", "istanbul-lib-instrument": "^1.7.2", "pouchdb-adapter-idb": "^6.2.0", diff --git a/packages/composer-runtime-web/package.json b/packages/composer-runtime-web/package.json index b7e4e5ff21..c5c73bfdbf 100644 --- a/packages/composer-runtime-web/package.json +++ b/packages/composer-runtime-web/package.json @@ -1,6 +1,6 @@ { "name": "composer-runtime-web", - "version": "0.9.1", + "version": "0.9.2", "description": "The web runtime container for Hyperledger Composer", "engines": { "node": ">=6", @@ -62,9 +62,9 @@ "logError": true }, "dependencies": { - "composer-common": "^0.9.1", - "composer-runtime": "^0.9.1", - "composer-runtime-pouchdb": "^0.9.1", + "composer-common": "^0.9.2", + "composer-runtime": "^0.9.2", + "composer-runtime-pouchdb": "^0.9.2", "uuid": "^3.0.1", "xhr": "^2.4.0" } diff --git a/packages/composer-runtime/package.json b/packages/composer-runtime/package.json index 7ca776a5bb..767bb80026 100644 --- a/packages/composer-runtime/package.json +++ b/packages/composer-runtime/package.json @@ -1,6 +1,6 @@ { "name": "composer-runtime", - "version": "0.9.1", + "version": "0.9.2", "description": "The runtime execution environment for Hyperledger Composer", "engines": { "node": ">=6", @@ -62,7 +62,7 @@ "logError": true }, "dependencies": { - "composer-common": "^0.9.1", + "composer-common": "^0.9.2", "debug": "^2.6.2", "fast-json-patch": "^1.1.8", "jsonata": "^1.2.2", diff --git a/packages/composer-systests/package.json b/packages/composer-systests/package.json index 3f63745953..5eae127d61 100644 --- a/packages/composer-systests/package.json +++ b/packages/composer-systests/package.json @@ -1,6 +1,6 @@ { "name": "composer-systests", - "version": "0.9.1", + "version": "0.9.2", "private": true, "description": "System tests and automation for Hyperledger Composer", "engines": { @@ -42,13 +42,13 @@ "chai": "^3.5.0", "chai-as-promised": "^6.0.0", "chai-subset": "^1.3.0", - "composer-admin": "^0.9.1", - "composer-client": "^0.9.1", - "composer-common": "^0.9.1", - "composer-connector-embedded": "^0.9.1", - "composer-connector-proxy": "^0.9.1", - "composer-connector-server": "^0.9.1", - "composer-connector-web": "^0.9.1", + "composer-admin": "^0.9.2", + "composer-client": "^0.9.2", + "composer-common": "^0.9.2", + "composer-connector-embedded": "^0.9.2", + "composer-connector-proxy": "^0.9.2", + "composer-connector-server": "^0.9.2", + "composer-connector-web": "^0.9.2", "eslint": "^3.17.1", "homedir": "^0.6.0", "karma": "^1.3.0", diff --git a/packages/composer-website/package.json b/packages/composer-website/package.json index a5b03913d7..7db5815bb9 100644 --- a/packages/composer-website/package.json +++ b/packages/composer-website/package.json @@ -1,6 +1,6 @@ { "name": "composer-website", - "version": "0.9.1", + "version": "0.9.2", "private": true, "description": "Hyperledger Composer is a blockchain development framework for Hyperledger Fabric: a library of assets/functions for creating blockchain-based applications.", "engines": { @@ -30,10 +30,10 @@ "author": "Hyperledger Composer", "license": "Apache-2.0", "devDependencies": { - "composer-admin": "^0.9.1", - "composer-client": "^0.9.1", - "composer-common": "^0.9.1", - "composer-runtime": "^0.9.1", + "composer-admin": "^0.9.2", + "composer-client": "^0.9.2", + "composer-common": "^0.9.2", + "composer-runtime": "^0.9.2", "jsdoc": "^3.4.3", "node-plantuml": "^0.5.0", "sanitize-html": "^1.14.1" diff --git a/packages/generator-hyperledger-composer/package.json b/packages/generator-hyperledger-composer/package.json index 2a6b070dc2..584fa4b753 100755 --- a/packages/generator-hyperledger-composer/package.json +++ b/packages/generator-hyperledger-composer/package.json @@ -1,6 +1,6 @@ { "name": "generator-hyperledger-composer", - "version": "0.9.1", + "version": "0.9.2", "description": "Generates projects from Hyperledger Composer business network definitions", "engines": { "node": ">=6", @@ -15,8 +15,8 @@ "liveNetworkTest": "mocha -t 0 test/angular-network.js" }, "dependencies": { - "composer-client": "^0.9.1", - "composer-common": "^0.9.1", + "composer-client": "^0.9.2", + "composer-common": "^0.9.2", "shelljs": "^0.7.7", "underscore.string": "^3.3.4", "yeoman-generator": "^0.24.1" @@ -29,8 +29,8 @@ "license": "Apache-2.0", "devDependencies": { "@angular/cli": "^1.0.0-rc.0", - "composer-admin": "^0.9.1", - "composer-connector-embedded": "^0.9.1", + "composer-admin": "^0.9.2", + "composer-connector-embedded": "^0.9.2", "mocha": "^3.4.2", "typings": "^2.1.0", "yeoman-assert": "^3.0.0", diff --git a/packages/loopback-connector-composer/package.json b/packages/loopback-connector-composer/package.json index 294672440a..aa09d11610 100644 --- a/packages/loopback-connector-composer/package.json +++ b/packages/loopback-connector-composer/package.json @@ -1,6 +1,6 @@ { "name": "loopback-connector-composer", - "version": "0.9.1", + "version": "0.9.2", "description": "A Loopback connector for Hyperledger Composer", "engines": { "node": ">=6", @@ -26,8 +26,8 @@ "author": "Hyperledger Composer", "license": "Apache-2.0", "dependencies": { - "composer-client": "^0.9.1", - "composer-common": "^0.9.1", + "composer-client": "^0.9.2", + "composer-common": "^0.9.2", "loopback": "^3.4.0", "loopback-connector": "^4.0.0", "node-cache": "^4.1.1" @@ -35,8 +35,8 @@ "devDependencies": { "chai": "^3.5.0", "chai-as-promised": "^6.0.0", - "composer-admin": "^0.9.1", - "composer-connector-embedded": "^0.9.1", + "composer-admin": "^0.9.2", + "composer-connector-embedded": "^0.9.2", "eslint": "^3.17.1", "jsdoc": "^3.4.3", "license-check": "^1.1.5", From ab17b3992fdccafcd0e362380bee93c9e937afbf Mon Sep 17 00:00:00 2001 From: Tobias Hunter Date: Thu, 6 Jul 2017 16:48:15 +0100 Subject: [PATCH 04/88] homepage fixes (#1496) --- .../jekylldocs/_includes/indexfooter.html | 6 +++--- .../jekylldocs/assets/css/new-style.min.css | 2 +- .../jekylldocs/assets/css/new-style.scss | 12 ++++-------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/composer-website/jekylldocs/_includes/indexfooter.html b/packages/composer-website/jekylldocs/_includes/indexfooter.html index a89bcd5e94..dedebfa4cd 100644 --- a/packages/composer-website/jekylldocs/_includes/indexfooter.html +++ b/packages/composer-website/jekylldocs/_includes/indexfooter.html @@ -5,10 +5,10 @@
diff --git a/packages/composer-website/jekylldocs/assets/css/new-style.min.css b/packages/composer-website/jekylldocs/assets/css/new-style.min.css index 2a9d7aa49e..fe9e25d0e1 100644 --- a/packages/composer-website/jekylldocs/assets/css/new-style.min.css +++ b/packages/composer-website/jekylldocs/assets/css/new-style.min.css @@ -1 +1 @@ -@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600|Source+Code+Pro");html{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:16px;height:100%;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}body{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;padding-bottom:0}h1{font-family:"Open Sans";font-weight:300;font-size:2.50rem;color:#19273C}h2{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;font-size:1.35rem;line-height:130%;color:#19273C}p{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#19273C;font-weight:400;font-size:0.9rem}svg{font-family:"Source Code Pro"}button{position:relative;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;user-select:none;background-image:none;border:1px solid transparent;border-radius:5px;margin:0;box-shadow:none;line-height:40px;cursor:pointer;background-color:#FDFDFD;flex-basis:auto;width:auto;padding-right:30px;padding-left:30px;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:0.9rem;font-weight:400;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);min-width:140px}button:focus{outline:none}button+button{margin-left:0.8em}button h1{display:inline;margin-right:.5em}button[disabled],button[disabled]:hover{opacity:.65;cursor:not-allowed}button.primary{background-color:#3F55AF;border-color:#3F55AF;color:#FDFDFD}button.primary:hover{background-color:#2D3D7D}button.primary.active,button.primary:active,button.primary:focus{background-color:#2D3D7D}button.primary[disabled],button.primary[disabled]:hover{background-color:#B8C1C1;border-color:#B8C1C1}button.secondary{background-color:#FDFDFD;color:#3F55AF;border-color:#E3ECEC}button.secondary:hover{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary.active,button.secondary:active,button.secondary:focus{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary[disabled],button.secondary[disabled]:hover{border-color:#B8C1C1;color:#B8C1C1}button.expand{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:25px;box-shadow:0 0 20px rgba(0,0,0,0.1);padding:0;font-size:0.75em;line-height:25px;color:#8C9696}button.action{border:none;border-bottom:2px solid transparent;background-color:transparent;color:#19273C;min-width:0;padding:0;border-radius:0px}button.action:hover{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:hover svg.ibm-icon{fill:#3F55AF}button.action:focus,button.action.active,button.action:active{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:focus svg.ibm-icon,button.action.active svg.ibm-icon,button.action:active svg.ibm-icon{fill:#3F55AF}button.action[disabled],button.action[disabled]:hover{background-color:transparent;color:#F1F3F7;border-bottom:2px solid #F1F3F7}button.action[disabled] svg.ibm-icon,button.action[disabled]:hover svg.ibm-icon{fill:#F1F3F7}button.icon{background-color:transparent;min-width:0;padding:0}button.icon:hover{color:#3F55AF;background-color:transparent}button.icon:hover svg.ibm-icon{fill:#3F55AF}button.basic{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:0.25em}.overlay{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAAGUlEQVQImWPwS9olhQsz+CXtkmLABQabJABXUBO1fQxIrwAAAABJRU5ErkJggg==) repeat,linear-gradient(137deg, #3F55AF 0%, #5376D4 40%, #5477D5 42%, #597FDE 52%, #B4E4FF 100%);overflow:hidden;top:0;left:0;bottom:0;right:0;z-index:-100}.hero_container{width:70vw;margin:auto;margin-top:17vh;display:flex;position:relative;flex-direction:row;z-index:10;box-sizing:border-box}.hero_container .leftcontent{flex-basis:40%;display:flex;flex-direction:column;padding-right:2rem;padding-bottom:8rem}.hero_container .hero_illustration{flex-basis:55%;padding-bottom:5rem;box-sizing:border-box}.hero_container .hero_illustration img{max-height:30rem}.hero_container button{box-shadow:0 1px 7px 0 rgba(0,0,0,0.2)}.hero_container h1{color:#FDFDFD;line-height:50px}.hero_container .social-container{display:flex}.hero_container .social-container ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.hero_container .social-container li{margin-right:1.5rem;flex-direction:column;justify-content:center;height:100%;display:flex}.hero_container .social-container .icon2{font-size:1.2rem;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#FDFDFD}.hero_container .social-container .icon2:hover{color:#2D3D7D}.buttoncontainer{margin-top:3.5rem;margin-bottom:1rem;display:flex}.readmore{margin-bottom:2rem;color:#FDFDFD}.readmore a{color:#FDFDFD;text-decoration:underline}.homepage-callout{display:flex;background-color:#FFD640;box-shadow:2px 2px 10px 0 rgba(0,0,0,0.2)}.homepage-callout .callout-copy{margin:auto;margin-top:1rem;margin-bottom:0.5rem}.homepage-callout .callout-copy a{text-decoration:none;border-bottom:1px solid #19273C;color:#19273C;transition:all 0.2s ease-in-out}.homepage-callout .callout-copy a:hover{border-bottom:1px solid #19273C;padding-bottom:3px}.navbar{display:flex;flex-basis:auto;width:100vw;height:4rem;margin:auto;background-color:none;color:#19273C}.navbar-fixed-top{border:none}.indexnav{display:flex;flex-direction:row;align-items:center;width:100%;height:3rem;z-index:11;padding-top:0px;position:absolute}.navcontent{font-size:0.9rem;display:flex;width:70vw;margin:auto;padding-top:2rem}.navlogo{flex-grow:1;flex-basis:100%;flex-shrink:1}.navlogo .brand{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#FDFDFD;font-weight:400;font-size:0.9rem;cursor:pointer;text-decoration:none}.navlogo .brand a{text-decoration:none}.menuitems{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.menuitems ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.menuitems ul li{margin-left:1rem;margin-right:1rem;flex-direction:column;justify-content:center;height:100%;display:flex}.menuitems ul li a{color:#FDFDFD;text-decoration:none}.menuitems ul li a:hover{border-bottom:1px solid #FDFDFD;padding-bottom:3px}.footer-bg{display:flex;background-color:#3F55AF;width:100vw;height:auto}.footer-container{display:flex;width:70vw;margin:auto;padding-top:3rem;margin-bottom:4rem}.footer-container .footer-left{display:flex;flex-grow:1;flex-shrink:1}.footer-container .footer-left p{color:#FDFDFD}.footer-container .footer-left .icon2{font-size:20px;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#19273C}.footer-container .footer-left .icon2:hover{color:#3F55AF}.footer-container .footer-right{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.footer-container .footer-right ul{display:flex;flex-grow:2;flex-direction:row;margin:0;padding:0;height:100%}.footer-container .footer-right li{margin-left:2rem;flex-direction:column;justify-content:center;height:100%;display:flex}.footer-container .footer-right li a{color:#FDFDFD;text-decoration:none;font-size:0.9rem}.footer-container .footer-right li a:hover{border-bottom:1px solid #FDFDFD}.footer-container .footer-right li p{opacity:0.6;color:#FDFDFD}.trio{margin-top:9rem;margin-bottom:7rem;margin-left:auto;margin-right:auto;width:70vw;display:flex;flex-direction:row;justify-content:space-around;flex-wrap:wrap}.trio p{text-align:center}.trio h2{text-align:center;padding-bottom:1rem}.trio .trio-left{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-left img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-center{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-center img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-right{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-right img{display:flex;height:60px;width:auto;margin:auto}.contact-bg{background-color:#F1F3F7;position:relative;padding-bottom:4rem;padding-top:4rem;height:auto}.contact-bg .contact-us{display:flex;flex-direction:row;justify-content:center;margin-left:auto;margin-right:auto;width:70vw}.contact-bg .contact-us .contact-illustration{flex-basis:40%;flex-grow:0}.contact-bg .contact-us .contact-illustration img{display:flex;height:17rem;width:auto}.contact-bg .contact-us .contact-content{flex-basis:50%}.contact-bg .contact-us .contact-content .social-icons{display:flex;flex-wrap:wrap;flex-direction:row}.contact-bg .contact-us .contact-content .social-icons .icon3{margin-top:0.5rem;margin-right:1rem;color:#3F55AF;font-size:1.5rem;width:auto}.contact-bg .contact-us .contact-content a{color:#19273C}.contact-bg .contact-us .contact-content a:hover{text-decoration:none}.contact-bg .contact-us .contact-content .community{color:#3F55AF;border-bottom:1px solid #3F55AF;padding-bottom:3px}.contact-bg .contact-us .contact-content .community:hover{color:#2D3D7D;border-bottom:1px solid #2D3D7D;padding-bottom:3px;text-decoration:none}.contact-bg .contact-us .contact-content .social-icons>div{display:flex;flex-basis:calc(40% - 30px);justify-content:center;flex-direction:column;margin-right:2rem}.contact-bg .contact-us .contact-content .social-icons>div>div{display:flex;flex-direction:row}.contact-bg .contact-us .contact-content button{margin-top:1rem;margin-bottom:1rem}.contact-bg .contact-us .contact-content p{margin-top:1rem}@media only screen and (max-width: 1200px){.hero_container{flex-direction:column-reverse;-webkit-flex-direction:row}.hero_container .hero_illustration{padding-bottom:2rem}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-illustration{margin-right:2rem}}@media only screen and (max-width: 900px){.hero_container{-webkit-flex-direction:row}.homepage-callout .callout-copy{padding-left:2rem;padding-right:2rem}.trio{flex-direction:column;max-width:30rem;margin-top:4rem;margin-bottom:4rem}.trio .trio-left{margin-bottom:3rem}.trio .trio-center{margin-bottom:3rem}.trio .trio-right{margin-bottom:3rem}.contact-bg .contact-us{flex-direction:column}.contact-bg .contact-us .contact-illustration{padding-bottom:2rem}}@media only screen and (max-width: 750px){.hero_container{-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row}}@media only screen and (max-width: 500px){.indexnav{overflow:hidden;height:auto}.indexnav .navcontent{flex-direction:column;-webkit-flex-direction:row}.indexnav .navcontent .navlogo{margin-bottom:0.5rem}.indexnav .navcontent .menuitems{justify-content:flex-start}.indexnav .navcontent .menuitems ul{margin-top:0.5rem}.indexnav .navcontent .menuitems ul li{margin-left:0;margin-right:2rem}.hero_container{-webkit-flex-direction:row}.trio{-webkit-flex-direction:row}.contact-bg .contact-us{-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons{flex-direction:column;-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column;-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row;-webkit-flex-direction:row}.contact-bg .contact-us .contact-illustration img{height:auto}.hero_container .leftcontent .textcontent .buttoncontainer{display:flex}.footer-bg .footer-container{flex-wrap:wrap;flex-direction:column;-webkit-flex-direction:row}.footer-bg .footer-container .footer-right ul{flex-direction:column;-webkit-flex-direction:row}.footer-bg .footer-container .footer-right li{margin-left:0}.footer-bg .footer-container .footer-right li a{padding-top:0.6rem}.footer-bg .footer-container .footer-right li a:hover{border-bottom:none}} +@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600|Source+Code+Pro");html{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:16px;height:100%;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}body{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;padding-bottom:0}h1{font-family:"Open Sans";font-weight:300;font-size:2.50rem;color:#19273C}h2{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;font-size:1.35rem;line-height:130%;color:#19273C}p{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#19273C;font-weight:400;font-size:0.9rem}svg{font-family:"Source Code Pro"}button{position:relative;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;user-select:none;background-image:none;border:1px solid transparent;border-radius:5px;margin:0;box-shadow:none;line-height:40px;cursor:pointer;background-color:#FDFDFD;flex-basis:auto;width:auto;padding-right:30px;padding-left:30px;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:0.9rem;font-weight:400;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);min-width:140px}button:focus{outline:none}button+button{margin-left:0.8em}button h1{display:inline;margin-right:.5em}button[disabled],button[disabled]:hover{opacity:.65;cursor:not-allowed}button.primary{background-color:#3F55AF;border-color:#3F55AF;color:#FDFDFD}button.primary:hover{background-color:#2D3D7D}button.primary.active,button.primary:active,button.primary:focus{background-color:#2D3D7D}button.primary[disabled],button.primary[disabled]:hover{background-color:#B8C1C1;border-color:#B8C1C1}button.secondary{background-color:#FDFDFD;color:#3F55AF;border-color:#E3ECEC}button.secondary:hover{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary.active,button.secondary:active,button.secondary:focus{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary[disabled],button.secondary[disabled]:hover{border-color:#B8C1C1;color:#B8C1C1}button.expand{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:25px;box-shadow:0 0 20px rgba(0,0,0,0.1);padding:0;font-size:0.75em;line-height:25px;color:#8C9696}button.action{border:none;border-bottom:2px solid transparent;background-color:transparent;color:#19273C;min-width:0;padding:0;border-radius:0px}button.action:hover{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:hover svg.ibm-icon{fill:#3F55AF}button.action:focus,button.action.active,button.action:active{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:focus svg.ibm-icon,button.action.active svg.ibm-icon,button.action:active svg.ibm-icon{fill:#3F55AF}button.action[disabled],button.action[disabled]:hover{background-color:transparent;color:#F1F3F7;border-bottom:2px solid #F1F3F7}button.action[disabled] svg.ibm-icon,button.action[disabled]:hover svg.ibm-icon{fill:#F1F3F7}button.icon{background-color:transparent;min-width:0;padding:0}button.icon:hover{color:#3F55AF;background-color:transparent}button.icon:hover svg.ibm-icon{fill:#3F55AF}button.basic{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:0.25em}.overlay{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAAGUlEQVQImWPwS9olhQsz+CXtkmLABQabJABXUBO1fQxIrwAAAABJRU5ErkJggg==) repeat,linear-gradient(137deg, #3F55AF 0%, #5376D4 40%, #5477D5 42%, #597FDE 52%, #B4E4FF 100%);overflow:hidden;top:0;left:0;bottom:0;right:0;z-index:-100}.hero_container{width:70vw;margin:auto;margin-top:17vh;display:flex;position:relative;flex-direction:row;z-index:10;box-sizing:border-box}.hero_container .leftcontent{flex-basis:40%;display:flex;flex-direction:column;padding-right:2rem;padding-bottom:8rem}.hero_container .hero_illustration{flex-basis:55%;padding-bottom:5rem;box-sizing:border-box}.hero_container .hero_illustration img{max-height:30rem}.hero_container button{box-shadow:0 1px 7px 0 rgba(0,0,0,0.2)}.hero_container h1{color:#FDFDFD;line-height:50px}.hero_container .social-container{display:flex}.hero_container .social-container ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.hero_container .social-container li{margin-right:1.5rem;flex-direction:column;justify-content:center;height:100%;display:flex}.hero_container .social-container .icon2{font-size:1.2rem;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#FDFDFD}.hero_container .social-container .icon2:hover{color:#2D3D7D}.buttoncontainer{margin-top:3.5rem;margin-bottom:1rem;display:flex}.readmore{margin-bottom:2rem;color:#FDFDFD}.readmore a{color:#FDFDFD;text-decoration:underline}.homepage-callout{display:flex;background-color:#FFD640;box-shadow:2px 2px 10px 0 rgba(0,0,0,0.2)}.homepage-callout .callout-copy{margin:auto;margin-top:1rem;margin-bottom:0.5rem}.homepage-callout .callout-copy a{text-decoration:none;border-bottom:1px solid #19273C;color:#19273C;transition:all 0.2s ease-in-out}.homepage-callout .callout-copy a:hover{border-bottom:1px solid #19273C;padding-bottom:3px}.navbar{display:flex;flex-basis:auto;width:100vw;height:4rem;margin:auto;background-color:none;color:#19273C}.navbar-fixed-top{border:none}.indexnav{display:flex;flex-direction:row;align-items:center;width:100%;height:3rem;z-index:11;padding-top:0px;position:absolute}.navcontent{font-size:0.9rem;display:flex;width:70vw;margin:auto;padding-top:2rem}.navlogo{flex-grow:1;flex-basis:100%;flex-shrink:1}.navlogo .brand{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#FDFDFD;font-weight:400;font-size:0.9rem;cursor:pointer;text-decoration:none}.navlogo .brand a{text-decoration:none}.menuitems{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.menuitems ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.menuitems ul li{margin-left:1rem;margin-right:1rem;flex-direction:column;justify-content:center;height:100%;display:flex}.menuitems ul li a{color:#FDFDFD;text-decoration:none}.menuitems ul li a:hover{border-bottom:1px solid #FDFDFD;padding-bottom:3px}.footer-bg{display:flex;background-color:#3F55AF;width:100vw;height:auto}.footer-container{display:flex;width:70vw;margin:auto;padding-top:3rem;margin-bottom:4rem}.footer-container .footer-left{display:flex;flex-grow:1;flex-shrink:1}.footer-container .footer-left p{color:#FDFDFD}.footer-container .footer-left .icon2{font-size:20px;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#19273C}.footer-container .footer-left .icon2:hover{color:#3F55AF}.footer-container .footer-right{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.footer-container .footer-right ul{display:flex;flex-grow:2;flex-direction:row;margin:0;padding:0;height:100%}.footer-container .footer-right .license{opacity:0.6}.footer-container .footer-right li{margin-left:2rem;flex-direction:column;justify-content:center;height:100%;display:flex}.footer-container .footer-right li a{color:#FDFDFD;text-decoration:none;font-size:0.9rem}.footer-container .footer-right li a:hover{border-bottom:1px solid #FDFDFD}.footer-container .footer-right li p{color:#FDFDFD}.trio{margin-top:9rem;margin-bottom:7rem;margin-left:auto;margin-right:auto;width:70vw;display:flex;flex-direction:row;justify-content:space-around;flex-wrap:wrap}.trio p{text-align:center}.trio h2{text-align:center;padding-bottom:1rem}.trio .trio-left{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-left img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-center{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-center img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-right{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-right img{display:flex;height:60px;width:auto;margin:auto}.contact-bg{background-color:#F1F3F7;position:relative;padding-bottom:4rem;padding-top:4rem;height:auto}.contact-bg .contact-us{display:flex;flex-direction:row;justify-content:center;margin-left:auto;margin-right:auto;width:70vw}.contact-bg .contact-us .contact-illustration{flex-basis:40%;flex-grow:0}.contact-bg .contact-us .contact-illustration img{display:flex;height:17rem;width:auto}.contact-bg .contact-us .contact-content{flex-basis:50%}.contact-bg .contact-us .contact-content .social-icons{display:flex;flex-wrap:wrap;flex-direction:row}.contact-bg .contact-us .contact-content .social-icons .icon3{margin-top:0.5rem;margin-right:1rem;color:#3F55AF;font-size:1.5rem;width:auto}.contact-bg .contact-us .contact-content a{color:#19273C}.contact-bg .contact-us .contact-content a:hover{text-decoration:none}.contact-bg .contact-us .contact-content .community{color:#3F55AF;padding-bottom:3px}.contact-bg .contact-us .contact-content .community:hover{color:#2D3D7D;padding-bottom:3px;text-decoration:none}.contact-bg .contact-us .contact-content .social-icons>div{display:flex;flex-basis:calc(40% - 30px);justify-content:center;flex-direction:column;margin-right:2rem}.contact-bg .contact-us .contact-content .social-icons>div>div{display:flex;flex-direction:row}.contact-bg .contact-us .contact-content button{margin-top:1rem;margin-bottom:1rem}.contact-bg .contact-us .contact-content p{margin-top:1rem}@media only screen and (max-width: 1200px){.hero_container{flex-direction:column-reverse;-webkit-flex-direction:row}.hero_container .hero_illustration{padding-bottom:2rem}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-illustration{margin-right:2rem}}@media only screen and (max-width: 900px){.hero_container{-webkit-flex-direction:row}.homepage-callout .callout-copy{padding-left:2rem;padding-right:2rem}.trio{flex-direction:column;max-width:30rem;margin-top:4rem;margin-bottom:4rem}.trio .trio-left{margin-bottom:3rem}.trio .trio-center{margin-bottom:3rem}.trio .trio-right{margin-bottom:3rem}.contact-bg .contact-us{flex-direction:column}.contact-bg .contact-us .contact-illustration{padding-bottom:2rem}}@media only screen and (max-width: 750px){.hero_container{-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row}}@media only screen and (max-width: 500px){.indexnav{overflow:hidden;height:auto}.indexnav .navcontent{flex-direction:column;-webkit-flex-direction:row}.indexnav .navcontent .navlogo{margin-bottom:0.5rem}.indexnav .navcontent .menuitems{justify-content:flex-start}.indexnav .navcontent .menuitems ul{margin-top:0.5rem}.indexnav .navcontent .menuitems ul li{margin-left:0;margin-right:2rem}.hero_container{-webkit-flex-direction:row}.trio{-webkit-flex-direction:row}.contact-bg .contact-us{-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons{flex-direction:column;-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column;-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row;-webkit-flex-direction:row}.contact-bg .contact-us .contact-illustration img{height:auto}.hero_container .leftcontent .textcontent .buttoncontainer{display:flex}.footer-bg .footer-container{flex-wrap:wrap;flex-direction:column;-webkit-flex-direction:row}.footer-bg .footer-container .footer-right ul{flex-direction:column;-webkit-flex-direction:row}.footer-bg .footer-container .footer-right li{margin-left:0}.footer-bg .footer-container .footer-right li a{padding-top:0.6rem}.footer-bg .footer-container .footer-right li a:hover{border-bottom:none}} diff --git a/packages/composer-website/jekylldocs/assets/css/new-style.scss b/packages/composer-website/jekylldocs/assets/css/new-style.scss index 1b8b42f683..ad183f90c5 100644 --- a/packages/composer-website/jekylldocs/assets/css/new-style.scss +++ b/packages/composer-website/jekylldocs/assets/css/new-style.scss @@ -459,7 +459,6 @@ li { .footer-left { display: flex; - flex-grow: 1; flex-shrink: 1; @@ -480,7 +479,6 @@ li { .footer-right { display: flex; - justify-content: flex-end; flex-basis: auto; flex-shrink: 1; @@ -493,13 +491,15 @@ li { padding: 0; height: 100%; } + .license { + opacity: 0.6; + } li { margin-left: 2rem; flex-direction: column; justify-content: center; height: 100%; display: flex; - a { color: $white; text-decoration: none; @@ -508,12 +508,10 @@ li { border-bottom: 1px solid $white; } } - p { - opacity: 0.6; + // opacity: 0.6; color: $white; } - } } @@ -644,11 +642,9 @@ li { } .community { color: $first-highlight; - border-bottom: 1px solid $first-highlight; padding-bottom: 3px; &:hover { color: $sixth-highlight; - border-bottom: 1px solid $sixth-highlight; padding-bottom: 3px; text-decoration: none; } From ba75648f93e9eb5b6d800b197afc6d1578778969 Mon Sep 17 00:00:00 2001 From: Liam Grace <14gracel@users.noreply.github.com> Date: Thu, 6 Jul 2017 18:01:21 +0100 Subject: [PATCH 05/88] Added footer to playground (#1478) * Fix alignment of transaction in view-transaction * Added footer to playground * Fixed Height issue and page loading issues --- .../composer-playground/src/app/app.module.ts | 1 + .../connection-profile.component.html | 53 ++++++++------- .../connection-profile.component.scss | 3 +- .../connection-profile.component.spec.ts | 13 +++- .../connection-profile.module.ts | 3 +- .../src/app/editor/editor.component.html | 5 +- .../src/app/editor/editor.component.scss | 2 + .../src/app/editor/editor.component.spec.ts | 12 +++- .../src/app/editor/editor.module.ts | 3 +- .../src/app/footer/footer.component.html | 24 +++++++ .../src/app/footer/footer.component.scss | 42 ++++++++++++ .../src/app/footer/footer.component.spec.ts | 67 +++++++++++++++++++ .../src/app/footer/footer.component.ts | 32 +++++++++ .../src/app/footer/footer.module.ts | 17 +++++ .../src/app/footer/index.ts | 1 + .../src/app/identity/identity.component.html | 60 +++++++++-------- .../src/app/identity/identity.component.scss | 2 + .../app/identity/identity.component.spec.ts | 12 +++- .../src/app/identity/identity.module.ts | 3 +- .../src/app/services/about.service.ts | 52 +++++++------- .../src/app/test/test.component.html | 6 +- .../src/app/test/test.component.scss | 2 + .../src/app/test/test.component.spec.ts | 15 ++++- .../src/app/test/test.module.ts | 3 +- .../view-transaction.component.html | 15 ++--- .../view-transaction.component.scss | 39 ++++++----- .../view-transaction.component.ts | 2 +- .../src/assets/styles/base/_codemirror.scss | 1 - 28 files changed, 372 insertions(+), 118 deletions(-) create mode 100644 packages/composer-playground/src/app/footer/footer.component.html create mode 100644 packages/composer-playground/src/app/footer/footer.component.scss create mode 100644 packages/composer-playground/src/app/footer/footer.component.spec.ts create mode 100644 packages/composer-playground/src/app/footer/footer.component.ts create mode 100644 packages/composer-playground/src/app/footer/footer.module.ts create mode 100644 packages/composer-playground/src/app/footer/index.ts diff --git a/packages/composer-playground/src/app/app.module.ts b/packages/composer-playground/src/app/app.module.ts index b71815ab1d..6f39cbf215 100644 --- a/packages/composer-playground/src/app/app.module.ts +++ b/packages/composer-playground/src/app/app.module.ts @@ -22,6 +22,7 @@ import { BasicModalsModule } from './basic-modals/basic-models.module'; import { WelcomeComponent } from './welcome'; import { NoContentComponent } from './no-content'; import { VersionCheckComponent } from './version-check'; +import { FooterComponent } from './footer'; import { ServicesModule } from './services/services.module'; let actionBasedIcons = require.context('../assets/svg/action-based', false, /.*\.svg$/); diff --git a/packages/composer-playground/src/app/connection-profile/connection-profile.component.html b/packages/composer-playground/src/app/connection-profile/connection-profile.component.html index e80fdacfc5..85b0bedd9f 100644 --- a/packages/composer-playground/src/app/connection-profile/connection-profile.component.html +++ b/packages/composer-playground/src/app/connection-profile/connection-profile.component.html @@ -25,31 +25,34 @@
-
-
-
- -
-
-

Connection Profiles are not available in Web Playground

-

- It is not possible to add Connection Profiles in the Web Playground version of Hyperledger Composer. - If you like what you see, you can install a a local version of Hyperledger Composer. - The local version offers the same UI, or a CLI experience, and can be used to deploy Business Network Definitions to running Hyperledger Fabric instances. -

-

And of course it's still 100% open source

-

Learn more in the docs

-
-
- -
-
+
+
+
+
+ +
+
+

Connection Profiles are not available in Web Playground

+

+ It is not possible to add Connection Profiles in the Web Playground version of Hyperledger Composer. + If you like what you see, you can install a a local version of Hyperledger Composer. + The local version offers the same UI, or a CLI experience, and can be used to deploy Business Network Definitions to running Hyperledger Fabric instances. +

+

And of course it's still 100% open source

+

Learn more in the docs

+
+
+ +
+
-
+
-
- -
+
+ +
+
+
diff --git a/packages/composer-playground/src/app/connection-profile/connection-profile.component.scss b/packages/composer-playground/src/app/connection-profile/connection-profile.component.scss index b8c80462ac..372ec88c0a 100644 --- a/packages/composer-playground/src/app/connection-profile/connection-profile.component.scss +++ b/packages/composer-playground/src/app/connection-profile/connection-profile.component.scss @@ -36,7 +36,8 @@ connection-profile { overflow-y: auto; background-color: $fourth-highlight; padding: $space-large $space-large $space-medium $space-large; - overflow-y:auto; + display: flex; + flex-direction: column; .playground-profile-warning { background-color: $white; diff --git a/packages/composer-playground/src/app/connection-profile/connection-profile.component.spec.ts b/packages/composer-playground/src/app/connection-profile/connection-profile.component.spec.ts index 1cec4900d1..83bb05350c 100644 --- a/packages/composer-playground/src/app/connection-profile/connection-profile.component.spec.ts +++ b/packages/composer-playground/src/app/connection-profile/connection-profile.component.spec.ts @@ -3,7 +3,7 @@ /* tslint:disable:no-var-requires */ /* tslint:disable:max-classes-per-file */ import { async, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { Directive, Input } from '@angular/core'; +import { Directive, Input, Component } from '@angular/core'; import { ConnectionProfileComponent } from './connection-profile.component'; import { ConnectionProfileService } from '../services/connectionprofile.service'; @@ -15,10 +15,17 @@ import { AlertService } from '../basic-modals/alert.service'; let should = chai.should(); +@Component({ + selector: 'app-footer', + template: '' +}) +class MockFooterComponent { + +} + @Directive({ selector: 'connection-profile-data' }) - class MockConnectionProfileDataDirective { @Input() public profileUpdated; @@ -36,7 +43,7 @@ describe('ConnectionProfileComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ConnectionProfileComponent, MockConnectionProfileDataDirective], + declarations: [ConnectionProfileComponent, MockConnectionProfileDataDirective, MockFooterComponent], providers: [ {provide: ConnectionProfileService, useValue: mockConnectionProfileService}, {provide: AlertService, useValue: mockAlertService}, diff --git a/packages/composer-playground/src/app/connection-profile/connection-profile.module.ts b/packages/composer-playground/src/app/connection-profile/connection-profile.module.ts index 5be630d645..b71317fa5f 100644 --- a/packages/composer-playground/src/app/connection-profile/connection-profile.module.ts +++ b/packages/composer-playground/src/app/connection-profile/connection-profile.module.ts @@ -12,9 +12,10 @@ import { DeleteConnectionProfileComponent } from './delete-connection-profile/de import { ViewCertificateComponent } from './view-certificate/view-certificate.component'; import { FileImporterModule } from '../file-importer/file-importer.module'; import { SwitchIdentityComponent } from '../test/switch-identity/switch-identity.component'; +import { FooterModule } from '../footer/footer.module'; @NgModule({ - imports: [CommonModule, FormsModule, NgbModule, ReactiveFormsModule, FileImporterModule, ConnectionProfileRoutingModule], + imports: [CommonModule, FormsModule, NgbModule, ReactiveFormsModule, FileImporterModule, ConnectionProfileRoutingModule, FooterModule], entryComponents: [AddCertificateComponent, AddConnectionProfileComponent, DeleteConnectionProfileComponent, ViewCertificateComponent, SwitchIdentityComponent], declarations: [ConnectionProfileComponent, ConnectionProfileDataComponent, AddCertificateComponent, AddConnectionProfileComponent, DeleteConnectionProfileComponent, ViewCertificateComponent, SwitchIdentityComponent], providers: [] diff --git a/packages/composer-playground/src/app/editor/editor.component.html b/packages/composer-playground/src/app/editor/editor.component.html index 1175277ec1..04d639f5ca 100644 --- a/packages/composer-playground/src/app/editor/editor.component.html +++ b/packages/composer-playground/src/app/editor/editor.component.html @@ -112,5 +112,8 @@

+
+ + + diff --git a/packages/composer-playground/src/app/editor/editor.component.scss b/packages/composer-playground/src/app/editor/editor.component.scss index 98ca30dda7..7ea3a9e5d2 100644 --- a/packages/composer-playground/src/app/editor/editor.component.scss +++ b/packages/composer-playground/src/app/editor/editor.component.scss @@ -43,6 +43,8 @@ app-editor { } .main-view { + display: flex; + flex-direction: column; .business-network-details { display: flex; height:50px; diff --git a/packages/composer-playground/src/app/editor/editor.component.spec.ts b/packages/composer-playground/src/app/editor/editor.component.spec.ts index cea95b2bc6..2c52c6fa54 100644 --- a/packages/composer-playground/src/app/editor/editor.component.spec.ts +++ b/packages/composer-playground/src/app/editor/editor.component.spec.ts @@ -3,7 +3,7 @@ /* tslint:disable:no-var-requires */ /* tslint:disable:max-classes-per-file */ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { Directive, Input } from '@angular/core'; +import { Directive, Input, Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; @@ -42,6 +42,14 @@ class MockEditorFileDirective { class MockPerfectScrollBarDirective { } +@Component({ + selector: 'app-footer', + template: '' +}) +class MockFooterComponent { + +} + describe('EditorComponent', () => { let component: EditorComponent; let fixture: ComponentFixture; @@ -73,7 +81,7 @@ describe('EditorComponent', () => { TestBed.configureTestingModule({ imports: [FormsModule], - declarations: [EditorComponent, MockEditorFileDirective, MockPerfectScrollBarDirective, ScrollToElementDirective], + declarations: [EditorComponent, MockEditorFileDirective, MockPerfectScrollBarDirective, ScrollToElementDirective, MockFooterComponent], providers: [ {provide: AdminService, useValue: mockAdminService}, {provide: ClientService, useValue: mockClientService}, diff --git a/packages/composer-playground/src/app/editor/editor.module.ts b/packages/composer-playground/src/app/editor/editor.module.ts index 591d3ede9e..0c1a499db4 100644 --- a/packages/composer-playground/src/app/editor/editor.module.ts +++ b/packages/composer-playground/src/app/editor/editor.module.ts @@ -13,9 +13,10 @@ import { AddFileComponent } from './add-file/add-file.component'; import { ImportComponent } from './import/import.component'; import { FileImporterModule } from '../file-importer/file-importer.module'; import { DirectivesModule } from '../directives/directives.module'; +import { FooterModule } from '../footer/footer.module'; @NgModule({ - imports: [CommonModule, FormsModule, NgbModule, PerfectScrollbarModule, CodemirrorModule, DirectivesModule, FileImporterModule, EditorRoutingModule], + imports: [CommonModule, FormsModule, NgbModule, PerfectScrollbarModule, CodemirrorModule, DirectivesModule, FileImporterModule, EditorRoutingModule, FooterModule], entryComponents: [AddFileComponent, ImportComponent], declarations: [EditorComponent, EditorFileComponent, AddFileComponent, ImportComponent], providers: [EditorService] diff --git a/packages/composer-playground/src/app/footer/footer.component.html b/packages/composer-playground/src/app/footer/footer.component.html new file mode 100644 index 0000000000..b92341cae3 --- /dev/null +++ b/packages/composer-playground/src/app/footer/footer.component.html @@ -0,0 +1,24 @@ +
+
+
+ Legal +
+
+ Github +
+
+
+
+ Playground v{{ playgroundVersion }} +
+
+ Tutorial +
+
+ Docs +
+
+ Community +
+
+
diff --git a/packages/composer-playground/src/app/footer/footer.component.scss b/packages/composer-playground/src/app/footer/footer.component.scss new file mode 100644 index 0000000000..00140b9c70 --- /dev/null +++ b/packages/composer-playground/src/app/footer/footer.component.scss @@ -0,0 +1,42 @@ +@import '../../assets/styles/base/_colors.scss'; +@import '../../assets/styles/base/_variables.scss'; + +app-footer { + position: relative; + display: flex; + width: 100%; + bottom: -($space-large); + + .footer-main{ + position: relative; + bottom: 0; + flex: 1; + padding: 22px 10px 22px 10px; + border-top: solid 1px #D0DADA; + color: $secondary-text ; + font-size: 12px; + display: flex; + height: 62px; + + .footer-left, .footer-right{ + flex:1; + display:flex; + + .footer-item{ + flex-shrink: 1; + padding-right:30px; + a { + color: $secondary-text; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + } + } + } + .footer-right { + justify-content: flex-end; + } + } +} diff --git a/packages/composer-playground/src/app/footer/footer.component.spec.ts b/packages/composer-playground/src/app/footer/footer.component.spec.ts new file mode 100644 index 0000000000..abc386cd20 --- /dev/null +++ b/packages/composer-playground/src/app/footer/footer.component.spec.ts @@ -0,0 +1,67 @@ +import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; +import { DebugElement } from '@angular/core'; +import { BehaviorSubject, Subject } from 'rxjs/Rx'; + +import { FooterComponent } from './footer.component'; +import { AboutService } from '../services/about.service'; +import { AlertService } from '../basic-modals/alert.service'; + +import * as sinon from 'sinon'; +import * as sap from 'sinon-as-promised'; + +import * as chai from 'chai'; + +class MockAlertService { + public errorStatus$: Subject = new BehaviorSubject(null); + public busyStatus$: Subject = new BehaviorSubject(null); +} + +describe('FooterComponent', () => { + + let component: FooterComponent; + let fixture: ComponentFixture; + let de: DebugElement; + let el: HTMLElement; + let mockAboutService; + + beforeEach(() => { + + mockAboutService = sinon.createStubInstance(AboutService); + + TestBed.configureTestingModule({ + declarations: [FooterComponent], + providers: [ + {provide: AboutService, useValue: mockAboutService}, + {provide: AlertService, useClass: MockAlertService} + ] + }); + + fixture = TestBed.createComponent(FooterComponent); + component = fixture.componentInstance; + + // query for the title

by CSS element selector + de = fixture.debugElement.query(By.css('a')); + el = de.nativeElement; + }); + + describe('ngOninit', () => { + it('should call getVersions from the AboutService', fakeAsync(() => { + mockAboutService.getVersions.resolves({playground: {version: 'v1'}}); + component.ngOnInit(); + tick(); + component['playgroundVersion'].should.equal('v1'); + })); + + it('should send the error to the AlertService', fakeAsync(() => { + mockAboutService.getVersions.returns(Promise.reject('detailed reject message')); + component.ngOnInit(); + tick(); + component['alertService'].errorStatus$.subscribe( + (message) => { + message.should.equal('detailed reject message'); + } + ); + })); + }); +}); diff --git a/packages/composer-playground/src/app/footer/footer.component.ts b/packages/composer-playground/src/app/footer/footer.component.ts new file mode 100644 index 0000000000..ff1f07deb7 --- /dev/null +++ b/packages/composer-playground/src/app/footer/footer.component.ts @@ -0,0 +1,32 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { AboutService } from './../services/about.service'; +import { AlertService } from './../basic-modals/alert.service'; + +@Component({ + selector: 'app-footer', + templateUrl: './footer.component.html', + styleUrls: [ + './footer.component.scss'.toString() + ] +}) + +export class FooterComponent implements OnInit { + + private playgroundVersion: string = ''; + + constructor(private aboutService: AboutService, + private alertService: AlertService) { + } + + ngOnInit() { + return this.aboutService.getVersions() + .then((versions) => { + this.playgroundVersion = versions.playground.version; + }) + .catch((err) => { + this.alertService.errorStatus$.next(err); + }); + } +} diff --git a/packages/composer-playground/src/app/footer/footer.module.ts b/packages/composer-playground/src/app/footer/footer.module.ts new file mode 100644 index 0000000000..fc7cc14cd1 --- /dev/null +++ b/packages/composer-playground/src/app/footer/footer.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; + +import { FooterComponent } from './footer.component'; + +@NgModule({ + imports: [CommonModule], + entryComponents: [], + declarations: [FooterComponent], + providers: [], + exports: [FooterComponent] +}) + +export class FooterModule { +} diff --git a/packages/composer-playground/src/app/footer/index.ts b/packages/composer-playground/src/app/footer/index.ts new file mode 100644 index 0000000000..a50d57382e --- /dev/null +++ b/packages/composer-playground/src/app/footer/index.ts @@ -0,0 +1 @@ +export * from './footer.component'; diff --git a/packages/composer-playground/src/app/identity/identity.component.html b/packages/composer-playground/src/app/identity/identity.component.html index 8d5157c841..e8672d73ac 100644 --- a/packages/composer-playground/src/app/identity/identity.component.html +++ b/packages/composer-playground/src/app/identity/identity.component.html @@ -1,36 +1,40 @@
-
-

My Wallet

+
+
+

My Wallet

- + - -
- -
-
ID Name
-
Status
-
-
-
- {{id}} +
-
- In use - -
-
- In my wallet + +
+
ID Name
+
Status
-
- - +
+
+ {{id}} +
+
+ In use + +
+
+ In my wallet +
+
+ + +
+ +
diff --git a/packages/composer-playground/src/app/identity/identity.component.scss b/packages/composer-playground/src/app/identity/identity.component.scss index 96f9c6fc44..f6a106587d 100644 --- a/packages/composer-playground/src/app/identity/identity.component.scss +++ b/packages/composer-playground/src/app/identity/identity.component.scss @@ -7,6 +7,8 @@ identity { .main-view { overflow-y: auto; + display: flex; + flex-direction: column; .identity-title { display: flex; diff --git a/packages/composer-playground/src/app/identity/identity.component.spec.ts b/packages/composer-playground/src/app/identity/identity.component.spec.ts index 29e1ef71e9..f73091d6a1 100644 --- a/packages/composer-playground/src/app/identity/identity.component.spec.ts +++ b/packages/composer-playground/src/app/identity/identity.component.spec.ts @@ -2,6 +2,7 @@ /* tslint:disable:no-unused-expression */ /* tslint:disable:no-var-requires */ /* tslint:disable:max-classes-per-file */ +import { Component } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; @@ -20,6 +21,14 @@ import { WalletService } from '../services/wallet.service'; let should = chai.should(); +@Component({ + selector: 'app-footer', + template: '' +}) +class MockFooterComponent { + +} + describe(`IdentityComponent`, () => { let component: IdentityComponent; @@ -50,7 +59,8 @@ describe(`IdentityComponent`, () => { TestBed.configureTestingModule({ imports: [FormsModule], declarations: [ - IdentityComponent + IdentityComponent, + MockFooterComponent ], providers: [ {provide: NgbModal, useValue: mockModal}, diff --git a/packages/composer-playground/src/app/identity/identity.module.ts b/packages/composer-playground/src/app/identity/identity.module.ts index 5f0c082667..aceaa61848 100644 --- a/packages/composer-playground/src/app/identity/identity.module.ts +++ b/packages/composer-playground/src/app/identity/identity.module.ts @@ -11,9 +11,10 @@ import { AddIdentityComponent } from './add-identity/add-identity.component'; import { IdentityIssuedComponent } from './identity-issued/identity-issued.component'; import { IssueIdentityComponent } from './issue-identity/issue-identity.component'; import { IdentityComponent } from './identity.component'; +import { FooterModule } from '../footer/footer.module'; @NgModule({ - imports: [CommonModule, FormsModule, NgbModule, FileImporterModule, IdentityRoutingModule], + imports: [CommonModule, FormsModule, NgbModule, FileImporterModule, IdentityRoutingModule, FooterModule], entryComponents: [AddIdentityComponent, IdentityIssuedComponent, IssueIdentityComponent], declarations: [AddIdentityComponent, IdentityIssuedComponent, IssueIdentityComponent, IdentityComponent], providers: [] diff --git a/packages/composer-playground/src/app/services/about.service.ts b/packages/composer-playground/src/app/services/about.service.ts index 3870f8c30b..082e189cad 100644 --- a/packages/composer-playground/src/app/services/about.service.ts +++ b/packages/composer-playground/src/app/services/about.service.ts @@ -1,36 +1,40 @@ import { Injectable } from '@angular/core'; import { Http } from '@angular/http'; +import { BehaviorSubject, Observable } from 'rxjs/Rx'; @Injectable() export class AboutService { + versions = null; constructor(private http: Http) { } getVersions(): Promise { - return this.getModules() - .then((modules) => { - return { - playground: { - name: 'playground', - version: modules.version - }, - common: { - name: 'composer-common', - version: modules.dependencies['composer-common'].version - }, - client: { - name: 'composer-client', - version: modules.dependencies['composer-client'].version, - }, - admin: { - name: 'composer-admin', - version: modules.dependencies['composer-admin'].version - } - }; - }) - .catch((e) => { - console.log(e); - }); + if (!this.versions) { + return this.getModules() + .then((modules) => { + this.versions = { + playground: { + name: 'playground', + version: modules.version + }, + common: { + name: 'composer-common', + version: modules.dependencies['composer-common'].version + }, + client: { + name: 'composer-client', + version: modules.dependencies['composer-client'].version, + }, + admin: { + name: 'composer-admin', + version: modules.dependencies['composer-admin'].version + } + }; + return this.versions; + }); + } else { + return Promise.resolve(this.versions); + } } private getModules(): Promise { diff --git a/packages/composer-playground/src/app/test/test.component.html b/packages/composer-playground/src/app/test/test.component.html index 0c9124d868..e980ed5230 100644 --- a/packages/composer-playground/src/app/test/test.component.html +++ b/packages/composer-playground/src/app/test/test.component.html @@ -45,5 +45,9 @@

All Transactions

- +
+
+ +
+ diff --git a/packages/composer-playground/src/app/test/test.component.scss b/packages/composer-playground/src/app/test/test.component.scss index 8e33402c5d..a0ba1a2993 100644 --- a/packages/composer-playground/src/app/test/test.component.scss +++ b/packages/composer-playground/src/app/test/test.component.scss @@ -43,5 +43,7 @@ app-test { .main-view { overflow-y: auto; + display: flex; + flex-direction: column; } } diff --git a/packages/composer-playground/src/app/test/test.component.spec.ts b/packages/composer-playground/src/app/test/test.component.spec.ts index aeccb6e3e3..12c681b997 100644 --- a/packages/composer-playground/src/app/test/test.component.spec.ts +++ b/packages/composer-playground/src/app/test/test.component.spec.ts @@ -3,8 +3,9 @@ /* tslint:disable:no-var-requires */ /* tslint:disable:max-classes-per-file */ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { Directive, Input } from '@angular/core'; +import { Directive, Input, Component } from '@angular/core'; import { TestComponent } from './test.component'; +import { FooterComponent } from '../footer/footer.component'; import { ClientService } from '../services/client.service'; import { InitializationService } from '../services/initialization.service'; import { TransactionService } from '../services/transaction.service'; @@ -19,6 +20,14 @@ import { BusinessNetworkConnection } from 'composer-client'; let should = chai.should(); +@Component({ + selector: 'app-footer', + template: '' +}) +class MockFooterComponent { + +} + @Directive({ selector: 'registry' }) @@ -59,14 +68,14 @@ describe('TestComponent', () => { mockClientService.getBusinessNetworkConnection.returns(mockBusinessNetworkConnection); TestBed.configureTestingModule({ - declarations: [TestComponent, MockRegistryDirective], + declarations: [TestComponent, MockRegistryDirective, MockFooterComponent], providers: [ {provide: NgbModal, useValue: mockModal}, {provide: InitializationService, useValue: mockInitializationService}, {provide: AlertService, useValue: mockAlertService}, {provide: ClientService, useValue: mockClientService}, {provide: TransactionService, useValue: mockTransactionService} - ] + ], }); fixture = TestBed.createComponent(TestComponent); diff --git a/packages/composer-playground/src/app/test/test.module.ts b/packages/composer-playground/src/app/test/test.module.ts index 2729f80759..c59c7309d0 100644 --- a/packages/composer-playground/src/app/test/test.module.ts +++ b/packages/composer-playground/src/app/test/test.module.ts @@ -11,9 +11,10 @@ import { RegistryComponent } from './registry/registry.component'; import { TransactionComponent } from './transaction/transaction.component'; import { ViewTransactionComponent } from './view-transaction/view-transaction.component'; import { DirectivesModule } from '../directives/directives.module'; +import { FooterModule } from '../footer/footer.module'; @NgModule({ - imports: [CommonModule, FormsModule, NgbModule, CodemirrorModule, DirectivesModule, TestRoutingModule], + imports: [CommonModule, FormsModule, NgbModule, CodemirrorModule, DirectivesModule, TestRoutingModule, FooterModule], entryComponents: [ResourceComponent, TransactionComponent, ViewTransactionComponent], declarations: [RegistryComponent, ResourceComponent, TransactionComponent, TestComponent, ViewTransactionComponent], providers: [] diff --git a/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.html b/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.html index 313d46df21..cb852927e4 100644 --- a/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.html +++ b/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.html @@ -1,4 +1,4 @@ -
+

Transaction Data

-
-
- +
+ -
-
-
+ +
-
+
diff --git a/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.scss b/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.scss index c00b0f360b..63f74eea4c 100644 --- a/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.scss +++ b/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.scss @@ -1,7 +1,21 @@ @import '../../../assets/styles/base/_colors.scss'; @import '../../../assets/styles/base/_variables.scss'; @import '../../../assets/styles/base/_typography.scss'; -transaction-modal { +@import '../transaction/transaction.component'; + +.view-transaction-modal { + + @extend transaction-modal; + + .resource-component { + padding-right: $space-small; + margin-top: $space-medium; + } + + .resource-component.events { + overflow-y: scroll; + } + .modal-sub-header { display: flex; align-items: center; @@ -52,6 +66,10 @@ transaction-modal { width: 100%; background-color: $third-highlight; padding: $space-small $space-medium; + min-height: 0; + max-height: 50px; + min-width: 630px; + max-width: 650px; .resource-title { .title { width: 85%; @@ -63,30 +81,21 @@ transaction-modal { &::after { content: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSIxN3B4IiBoZWlnaHQ9IjE0cHgiIHZpZXdCb3g9IjAgMCAxNyAxNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4gICAgICAgIDx0aXRsZT5Db2xsYXBzZS1FeHBhbmQ8L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iUGFnZS0xIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gICAgICAgIDxnIGlkPSJGYWJyaWMtQ29tcG9zZXItUGxheWdyb3VuZC1EZWZpbmUtMi1Db3B5LTEyMSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEwNzYuMDAwMDAwLCAtNDg2LjAwMDAwMCkiPiAgICAgICAgICAgIDxnIGlkPSJHcm91cC0zLUNvcHkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDMwMC4wMDAwMDAsIDQ2NC4wMDAwMDApIj4gICAgICAgICAgICAgICAgPGcgaWQ9Ikdyb3VwLUNvcHktMiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNzg0LjUwMDAwMCwgMjkuMDAwMDAwKSByb3RhdGUoOTAuMDAwMDAwKSB0cmFuc2xhdGUoLTc4NC41MDAwMDAsIC0yOS4wMDAwMDApIHRyYW5zbGF0ZSg3NzcuNTAwMDAwLCAyMS41MDAwMDApIj4gICAgICAgICAgICAgICAgICAgIDxnIGlkPSJDb2xsYXBzZS1FeHBhbmQiPiAgICAgICAgICAgICAgICAgICAgICAgIDxwb2x5Z29uIGlkPSJGaWxsLTMiIGZpbGw9IiMxOTI3M0MiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDMuNDYxNTM4LCA3LjUzODQ2Mikgc2NhbGUoLTEsIDEpIHRyYW5zbGF0ZSgtMy40NjE1MzgsIC03LjUzODQ2MikgIiBwb2ludHM9IjUuNTM4NDYxNTQgMiAwIDcuNTM4NDYxNTQgNS41Mzg0NjE1NCAxMy4wNzY5MjMxIDYuOTIzMDc2OTIgMTEuNjkyMzA3NyAyLjc2OTIzMDc3IDcuNTM4NDYxNTQgNi45MjMwNzY5MiAzLjM4NDYxNTM4Ij48L3BvbHlnb24+ICAgICAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTEzLDAgTDEzLDE1IiBpZD0iTGluZSIgc3Ryb2tlPSIjMTkyNzNDIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJzcXVhcmUiPjwvcGF0aD4gICAgICAgICAgICAgICAgICAgIDwvZz4gICAgICAgICAgICAgICAgPC9nPiAgICAgICAgICAgIDwvZz4gICAgICAgIDwvZz4gICAgPC9nPjwvc3ZnPg==); cursor: pointer; - position: fixed; - right: 8%; + position: absolute; + right: 6%; + bottom: 85%; width: 0; height: 0; } } .resource-content { - position: relative; - width: 100%; - background-color: $third-highlight; - padding: $space-small $space-medium; - text-align: left; - border-top:1px solid #e3ecec; .CodeMirror { height: 200px; min-height: 0; max-width: none; - .CodeMirror-scroll { - max-width: 0; - } } - .ps.ps--active-x>.ps__scrollbar-x-rail, - .ps.ps--active-y>.ps__scrollbar-y-rail{ - opacity: 0.6; + .CodeMirror, .CodeMirror-scroll { + min-height: 0; } } } diff --git a/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.ts b/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.ts index b4acc4be9f..fb1836aac9 100644 --- a/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.ts +++ b/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.ts @@ -35,7 +35,7 @@ export class ViewTransactionComponent implements OnInit, OnDestroy { private codeConfig = { lineNumbers: true, lineWrapping: true, - readOnly: false, + readOnly: true, mode: 'javascript', autofocus: true, extraKeys: { diff --git a/packages/composer-playground/src/assets/styles/base/_codemirror.scss b/packages/composer-playground/src/assets/styles/base/_codemirror.scss index 8f4f4ca2ae..b16ce05964 100644 --- a/packages/composer-playground/src/assets/styles/base/_codemirror.scss +++ b/packages/composer-playground/src/assets/styles/base/_codemirror.scss @@ -74,5 +74,4 @@ flex:1; color: #8C9696; padding-left:1rem; - border-bottom: solid 1px #D0DADA; } From 8424d76ac56270cc569f57db8974db644bf2d5cb Mon Sep 17 00:00:00 2001 From: James Taylor Date: Thu, 6 Jul 2017 20:07:53 +0100 Subject: [PATCH 06/88] Improve wallet service test coverage (#1506) Contributes to #848 Signed-off-by: James Taylor --- .../src/app/services/wallet.service.spec.ts | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/packages/composer-playground/src/app/services/wallet.service.spec.ts b/packages/composer-playground/src/app/services/wallet.service.spec.ts index 78ab309942..19e31dc8e3 100644 --- a/packages/composer-playground/src/app/services/wallet.service.spec.ts +++ b/packages/composer-playground/src/app/services/wallet.service.spec.ts @@ -6,6 +6,7 @@ import { TestBed, inject, fakeAsync, tick } from '@angular/core/testing'; import { WalletService } from './wallet.service'; import * as sinon from 'sinon'; import { FileWallet } from 'composer-common'; +import { Logger } from 'composer-common'; describe('WalletService', () => { @@ -23,6 +24,37 @@ describe('WalletService', () => { }); }); + describe('getWallet', () => { + beforeEach(() => { + // webpack can't handle dymanically creating a logger + Logger.setFunctionalLogger({ + log: sinon.stub() + }); + }); + + it('should get a wallet', fakeAsync(inject([WalletService], (service: WalletService) => { + service['fileWallets'] = mockFileWallets; + mockFileWallets.has.returns(true); + + service.getWallet('identity1'); + + tick(); + + mockFileWallets.set.should.not.have.been.called; + mockFileWallets.get.should.have.been.calledWith('identity1'); + }))); + + it('should create a new wallet if it doesn\'t already exist', fakeAsync(inject([WalletService], (service: WalletService) => { + service['fileWallets'] = mockFileWallets; + + service.getWallet('secrectIdentity'); + + tick(); + + mockFileWallets.set.should.have.been.calledWith('secrectIdentity'); + }))); + }); + describe('removeFromWallet', () => { it('should remove an identity from the wallet', fakeAsync(inject([WalletService], (service: WalletService) => { let mockGetWallet = sinon.stub(service, 'getWallet').returns(mockFileWallet); From 9a0351f940e5412c5dad3caeb61708f18897fece Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Thu, 6 Jul 2017 21:42:37 +0100 Subject: [PATCH 07/88] Tests updated to get the code coverage; and defects fixed that it found (#1502) --- packages/composer-common/messages/en.json | 2 + .../test/model/relationship.js | 13 +++ .../test/model/validatedconcept.js | 106 ++++++++++++++++++ 3 files changed, 121 insertions(+) create mode 100644 packages/composer-common/test/model/validatedconcept.js diff --git a/packages/composer-common/messages/en.json b/packages/composer-common/messages/en.json index 534800e1e7..7046f0fbff 100644 --- a/packages/composer-common/messages/en.json +++ b/packages/composer-common/messages/en.json @@ -39,6 +39,8 @@ "factory-newinstance-missingidentifier": "Missing identifier for Type {type} in namespace {namespace}", "factory-newinstance-invalididentifier": "Invalid or missing identifier for Type {type} in namespace {namespace}", "factory-newinstance-abstracttype": "Cannot instantiate Abstract Type {type} in namespace {namespace}", + "factory-newrelationship-notregisteredwithmm" : "Cannot create relationship as namespace {namespace} is not known", + "factory-newinstance-typenotdeclaredinns" : "Cannot instantiate Type {type} in namespace {namespace}", "instancegenerator-newinstance-noconcreteclass": "No concrete extending type for {type}", diff --git a/packages/composer-common/test/model/relationship.js b/packages/composer-common/test/model/relationship.js index 8bbaa5ad19..b2144fcf1e 100644 --- a/packages/composer-common/test/model/relationship.js +++ b/packages/composer-common/test/model/relationship.js @@ -124,5 +124,18 @@ describe('Relationship', function () { rel.getType().should.equal('Person'); rel.getIdentifier().should.equal('123'); }); + + it('check invalid name space gets error', function() { + (function () { + Relationship.fromURI(modelManager, '123', 'org.acme.empty', 'Person' ); + }).should.throw(/Cannot create relationship as namespace org.acme.empty is not known/); + }); + + it('check that relationships can be created from a URI', function() { + (function () { + Relationship.fromURI(modelManager, 'resource:org.acme.l1.Unkown#123' ); + }).should.throw(/Cannot instantiate Type Unkown in namespace org.acme.l1/); + }); + }); }); diff --git a/packages/composer-common/test/model/validatedconcept.js b/packages/composer-common/test/model/validatedconcept.js new file mode 100644 index 0000000000..4fb6715100 --- /dev/null +++ b/packages/composer-common/test/model/validatedconcept.js @@ -0,0 +1,106 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +const ModelManager = require('../../lib/modelmanager'); +const ValidatedConcept = require('../../lib/model/validatedconcept'); +const ResourceValidator = require('../../lib/serializer/resourcevalidator'); +const sinon = require('sinon'); +const chai = require('chai'); +chai.should(); +chai.use(require('chai-things')); + +describe('Validatedoncept', function () { + + const levelOneModel = `namespace org.acme.l1 + concept Person { + o String name + o String[] arrayName + } + asset Car identified by vin { + o String vin + o Person owner + } + `; + + let modelManager = null; + let mockResourceValidator; + + before(function () { + modelManager = new ModelManager(); + }); + + beforeEach(function () { + modelManager.addModelFile(levelOneModel); + mockResourceValidator = sinon.createStubInstance(ResourceValidator); + mockResourceValidator.visit.returns(null); + + }); + + afterEach(function () { + modelManager.clearModelFiles(); + }); + + describe('#getClassDeclaration', function() { + it('should throw with no ModelFile', function () { + const resource = new ValidatedConcept(modelManager, 'org.acme.l1', 'Person' ,mockResourceValidator); + const stub = sinon.stub(modelManager, 'getModelFile', function(){return null;}); + (function () { + resource.getClassDeclaration(); + }).should.throw(/No model for namespace org.acme.l1 is registered with the ModelManager/); + stub.restore(); + }); + }); + + describe('#setPropertyValue', () => { + it (' should accept valid property - value', function (){ + const resource = new ValidatedConcept(modelManager, 'org.acme.l1', 'Person' ,mockResourceValidator); + resource.setPropertyValue('name','Fred Bloggs'); + }); + it (' should throw error for invalid property name', function (){ + const resource = new ValidatedConcept(modelManager, 'org.acme.l1', 'Person' ,mockResourceValidator); + ( () => { + resource.setPropertyValue('namenamename','Fred Bloggs'); + }).should.throw(/Trying to set field namenamename which is not declared in the model/); + }); + it (' should throw error for array', function (){ + const resource = new ValidatedConcept(modelManager, 'org.acme.l1', 'Person' ,mockResourceValidator); + ( () => { + resource.addArrayValue('name',['Fred','Bloggs']); + }).should.throw(/Trying to add array item name which is not declared as an array in the model/); + }); + it (' correct path for adding an array', function (){ + const resource = new ValidatedConcept(modelManager, 'org.acme.l1', 'Person' ,mockResourceValidator); + resource.addArrayValue('arrayName',['Fred','Bloggs']); + }); + it (' should throw error for invalid property name', function (){ + const resource = new ValidatedConcept(modelManager, 'org.acme.l1', 'Person' ,mockResourceValidator); + (()=>{ + resource.addArrayValue('invalid','Fred'); + }).should.throw(/Trying to set field invalid which is not declared in the model/); + }); + it (' validate', function (){ + const resource = new ValidatedConcept(modelManager, 'org.acme.l1', 'Person' ,mockResourceValidator); + resource.validate(); + }); + it (' add two elements separately to an array property', function (){ + const resource = new ValidatedConcept(modelManager, 'org.acme.l1', 'Person' ,mockResourceValidator); + resource.addArrayValue('arrayName','Fred'); + resource.addArrayValue('arrayName','Bloggs'); + }); + + }); + +}); From f993330fae5b7976ae8f44271842ad1d7f738617 Mon Sep 17 00:00:00 2001 From: Simon Stone Date: Fri, 7 Jul 2017 09:21:45 +0100 Subject: [PATCH 08/88] Complete PersistentModel API tests (resolves #930) (#1511) --- .../lib/businessnetworkconnector.js | 118 ++-- .../test/assets.js | 392 ++++++++++- .../test/businessnetworkconnector.js | 314 +++++---- .../loopback-connector-composer/test/index.js | 6 + .../test/participants.js | 633 ++++++++++++++++++ 5 files changed, 1239 insertions(+), 224 deletions(-) create mode 100644 packages/loopback-connector-composer/test/participants.js diff --git a/packages/loopback-connector-composer/lib/businessnetworkconnector.js b/packages/loopback-connector-composer/lib/businessnetworkconnector.js index b4b6c7e22f..099adb2275 100644 --- a/packages/loopback-connector-composer/lib/businessnetworkconnector.js +++ b/packages/loopback-connector-composer/lib/businessnetworkconnector.js @@ -257,49 +257,30 @@ class BusinessNetworkConnector extends Connector { let filterKeys = Object.keys(filter); if(filterKeys.indexOf('where') >= 0) { - debug('where', JSON.stringify(filter.where)); - let whereKeys = Object.keys(filter.where); - debug('where keys', whereKeys); + const keys = Object.keys(filter.where); + if (keys.length === 0) { + throw new Error('The destroyAll operation without a where clause is not supported'); + } let identifierField = this.getClassIdentifier(composerModelName); - debug('identifierField', identifierField); + if(!filter.where[identifierField]) { + throw new Error('The specified filter does not match the identifier in the model'); + } // Check we have the right identifier for the object type - if(whereKeys.indexOf(identifierField) >= 0) { - let objectId = filter.where[identifierField]; - if(doResolve) { - return registry.resolve(objectId) - .then((result) => { - debug('Got Result:', result); - return [ result ]; - }) - .catch((error) => { - // check the error - it might be ok just an error indicating that the object doesn't exist - debug('all: error ', error); - if(error.toString().indexOf('does not exist') >= 0) { - return {}; - } else { - throw error; - } - }); - - } else { - return registry.get(objectId) - .then((result) => { - debug('Got Result:', result); - return [ this.serializer.toJSON(result) ]; - }) - .catch((error) => { - // check the error - it might be ok just an error indicating that the object doesn't exist - debug('all: error ', error); - if(error.toString().indexOf('does not exist') >= 0) { - return {}; - } else { - throw error; - } - }); - } + let objectId = filter.where[identifierField]; + if(doResolve) { + return registry.resolve(objectId) + .then((result) => { + debug('Got Result:', result); + return [ result ]; + }); + } else { - throw new Error('The specified filter does not match the identifier in the model'); + return registry.get(objectId) + .then((result) => { + debug('Got Result:', result); + return [ this.serializer.toJSON(result) ]; + }); } } else if(doResolve) { debug('no where filter, about to resolve on all'); @@ -326,6 +307,10 @@ class BusinessNetworkConnector extends Connector { callback(null, result); }) .catch((error) => { + if (error.message.match(/does not exist/)) { + callback(null, []); + return; + } callback(error); }); } @@ -469,13 +454,21 @@ class BusinessNetworkConnector extends Connector { data.$class = composerModelName; } - let resource; + let registry; return this.ensureConnected(options) .then((businessNetworkConnection) => { - resource = this.serializer.fromJSON(data); return this.getRegistryForModel(businessNetworkConnection, composerModelName); }) - .then((registry) => { + .then((registry_) => { + registry = registry_; + return registry.get(objectId); + }) + .then((resource) => { + const object = this.serializer.toJSON(resource); + Object.keys(data).forEach((key) => { + object[key] = data[key]; + }); + resource = this.serializer.fromJSON(object); return registry.update(resource); }) .then(() => { @@ -667,13 +660,14 @@ class BusinessNetworkConnector extends Connector { * Update an instance of an object in Composer. For assets, this method * updates the asset to the default asset registry. * @param {string} lbModelName the fully qualified model name. + * @param {string} where The filter to identify the asset or participant to be removed. * @param {Object} data the data for the asset or transaction. * @param {Object} options the options provided by Loopback. * @param {function} callback the callback to call when complete. * @returns {Promise} A promise that is resolved when complete. */ - update(lbModelName, data, options, callback) { - debug('update', lbModelName, data, options); + update(lbModelName, where, data, options, callback) { + debug('update', lbModelName, where, data, options); let composerModelName = this.getComposerModelName(lbModelName); // If the $class property has not been provided, add it now. @@ -681,17 +675,28 @@ class BusinessNetworkConnector extends Connector { data.$class = composerModelName; } + let idField; return this.ensureConnected(options) .then((businessNetworkConnection) => { + const keys = Object.keys(where); + if (keys.length === 0) { + throw new Error('The update operation without a where clause is not supported'); + } + idField = keys[0]; + if(!this.isValidId(composerModelName, idField)) { + throw new Error('The specified filter does not match the identifier in the model'); + } + return this.getRegistryForModel(businessNetworkConnection, composerModelName); + }) + .then((registry) => { + // Convert the JSON data into a resource. let serializer = this.businessNetworkDefinition.getSerializer(); let resource = serializer.fromJSON(data); - - // The create action is based on the type of the resource. - return this.getRegistryForModel(businessNetworkConnection, composerModelName) - .then((registry) => { - return registry.update(resource); - }); + if (resource.getIdentifier() !== where[idField]) { + throw new Error('The specified resource does not match the identifier in the filter'); + } + return registry.update(resource); }) .then(() => { @@ -721,12 +726,15 @@ class BusinessNetworkConnector extends Connector { let idField, registry; return this.ensureConnected(options) .then((businessNetworkConnection) => { - idField = Object.keys(where)[0]; - if(this.isValidId(composerModelName, idField)) { - return this.getRegistryForModel(businessNetworkConnection, composerModelName); - } else { - callback(new Error('The specified filter does not match the identifier in the model')); + const keys = Object.keys(where); + if (keys.length === 0) { + throw new Error('The destroyAll operation without a where clause is not supported'); } + idField = keys[0]; + if(!this.isValidId(composerModelName, idField)) { + throw new Error('The specified filter does not match the identifier in the model'); + } + return this.getRegistryForModel(businessNetworkConnection, composerModelName); }) .then((registry_) => { registry = registry_; diff --git a/packages/loopback-connector-composer/test/assets.js b/packages/loopback-connector-composer/test/assets.js index 15839e7d52..bd0a52ce98 100644 --- a/packages/loopback-connector-composer/test/assets.js +++ b/packages/loopback-connector-composer/test/assets.js @@ -22,6 +22,7 @@ const connector = require('..'); const fs = require('fs'); const loopback = require('loopback'); const path = require('path'); +const Util = require('composer-common').Util; const chai = require('chai'); const should = chai.should(); @@ -213,6 +214,20 @@ const bfs_fs = BrowserFS.BFSRequire('fs'); }); }); + beforeEach(() => { + return Util.invokeChainCode(businessNetworkConnection.securityContext, 'resetBusinessNetwork', []) + .then(() => { + return businessNetworkConnection.getAssetRegistry('org.acme.bond.BondAsset'); + }) + .then((assetRegistry_) => { + assetRegistry = assetRegistry_; + return assetRegistry.addAll([ + serializer.fromJSON(assetData[0]), + serializer.fromJSON(assetData[1]) + ]); + }); + }); + describe(`#count namespaces[${namespaces}]`, () => { it('should count all of the assets', () => { @@ -248,7 +263,6 @@ const bfs_fs = BrowserFS.BFSRequire('fs'); .then((asset) => { let json = serializer.toJSON(asset); json.should.deep.equal(assetData[2]); - return assetRegistry.remove('ISIN_3'); }); }); @@ -261,7 +275,6 @@ const bfs_fs = BrowserFS.BFSRequire('fs'); let json = serializer.toJSON(asset); delete json.$class; json.should.deep.equal(assetData[3]); - return assetRegistry.remove('ISIN_4'); }); }); @@ -285,7 +298,6 @@ const bfs_fs = BrowserFS.BFSRequire('fs'); .then((asset) => { let json = serializer.toJSON(asset); json.should.deep.equal(assetData[2]); - return assetRegistry.remove('ISIN_3'); }) .then(() => { return assetRegistry.get('ISIN_4'); @@ -294,7 +306,6 @@ const bfs_fs = BrowserFS.BFSRequire('fs'); let json = serializer.toJSON(asset); delete json.$class; json.should.deep.equal(assetData[3]); - return assetRegistry.remove('ISIN_4'); }); }); @@ -302,10 +313,46 @@ const bfs_fs = BrowserFS.BFSRequire('fs'); describe(`#destroyAll namespaces[${namespaces}]`, () => { + it('should throw without a where clause as it is unsupported', () => { + return app.models[prefix + 'BondAsset'].destroyAll() + .should.be.rejectedWith(/is not supported/); + + }); + + it('should remove a single specified asset', () => { + return app.models[prefix + 'BondAsset'].destroyAll({ ISINCode: 'ISIN_1' }) + .then(() => { + return assetRegistry.exists('ISIN_1'); + }) + .then((exists) => { + exists.should.be.false; + }); + }); + + it('should return an error if the specified asset does not exist', () => { + return app.models[prefix + 'BondAsset'].destroyAll({ ISINCode: 'ISIN_999' }) + .should.be.rejected; + }); + }); describe(`#destroyById namespaces[${namespaces}]`, () => { + it('should delete the specified asset', () => { + return app.models[prefix + 'BondAsset'].destroyById('ISIN_1') + .then(() => { + return assetRegistry.exists('ISIN_1'); + }) + .then((exists) => { + exists.should.be.false; + }); + }); + + it('should return an error if the specified asset does not exist', () => { + return app.models[prefix + 'BondAsset'].destroyById('ISIN_999') + .should.be.rejected; + }); + }); describe(`#exists namespaces[${namespaces}]`, () => { @@ -410,7 +457,6 @@ const bfs_fs = BrowserFS.BFSRequire('fs'); .then((asset) => { let json = serializer.toJSON(asset); json.should.deep.equal(assetData[2]); - return assetRegistry.remove('ISIN_3'); }); }); @@ -422,7 +468,6 @@ const bfs_fs = BrowserFS.BFSRequire('fs'); .then((asset) => { let json = serializer.toJSON(asset); json.should.deep.equal(assetData[2]); - return assetRegistry.remove('ISIN_3'); }); }); @@ -430,38 +475,373 @@ const bfs_fs = BrowserFS.BFSRequire('fs'); describe(`#replaceById namespaces[${namespaces}]`, () => { + const updatedAsset = { + $class: 'org.acme.bond.BondAsset', + ISINCode: 'ISIN_1', + bond: { + $class: 'org.acme.bond.Bond', + dayCountFraction: 'EOM', + exchangeId: [ + 'NYSE' + ], + faceAmount: 1000, + instrumentId: [ + 'AliceNewCorp' + ], + issuer: 'resource:org.acme.bond.Issuer#1', + maturity: '2018-02-27T21:03:52.000Z', + parValue: 1000, + paymentFrequency: { + $class: 'org.acme.bond.PaymentFrequency', + period: 'MONTH', + periodMultiplier: 6 + } + } + }; + + it('should update the specified asset', () => { + return app.models[prefix + 'BondAsset'].replaceById('ISIN_1', updatedAsset) + .then(() => { + return assetRegistry.get('ISIN_1'); + }) + .then((asset) => { + asset.bond.instrumentId.should.deep.equal([ 'AliceNewCorp' ]); + }); + }); + + it('should return an error if the specified asset does not exist', () => { + return app.models[prefix + 'BondAsset'].replaceById('ISIN_999', updatedAsset) + .should.be.rejected; + }); + }); describe(`#replaceOrCreate namespaces[${namespaces}]`, () => { + const updatedAsset = { + $class: 'org.acme.bond.BondAsset', + ISINCode: 'ISIN_1', + bond: { + $class: 'org.acme.bond.Bond', + dayCountFraction: 'EOM', + exchangeId: [ + 'NYSE' + ], + faceAmount: 1000, + instrumentId: [ + 'AliceNewCorp' + ], + issuer: 'resource:org.acme.bond.Issuer#1', + maturity: '2018-02-27T21:03:52.000Z', + parValue: 1000, + paymentFrequency: { + $class: 'org.acme.bond.PaymentFrequency', + period: 'MONTH', + periodMultiplier: 6 + } + } + }; + + it('should update the specified asset', () => { + return app.models[prefix + 'BondAsset'].replaceOrCreate(updatedAsset) + .then(() => { + return assetRegistry.get('ISIN_1'); + }) + .then((asset) => { + asset.bond.instrumentId.should.deep.equal([ 'AliceNewCorp' ]); + }); + }); + + it('should create a new asset if the specified asset does not exist', () => { + return app.models[prefix + 'BondAsset'].replaceOrCreate(assetData[2]) + .then(() => { + return assetRegistry.get('ISIN_3'); + }) + .then((asset) => { + let json = serializer.toJSON(asset); + json.should.deep.equal(assetData[2]); + }); + }); + }); describe(`#updateAll namespaces[${namespaces}]`, () => { + const updatedAsset = { + $class: 'org.acme.bond.BondAsset', + ISINCode: 'ISIN_1', + bond: { + $class: 'org.acme.bond.Bond', + dayCountFraction: 'EOM', + exchangeId: [ + 'NYSE' + ], + faceAmount: 1000, + instrumentId: [ + 'AliceNewCorp' + ], + issuer: 'resource:org.acme.bond.Issuer#1', + maturity: '2018-02-27T21:03:52.000Z', + parValue: 1000, + paymentFrequency: { + $class: 'org.acme.bond.PaymentFrequency', + period: 'MONTH', + periodMultiplier: 6 + } + } + }; + + it('should throw without a where clause as it is unsupported', () => { + return app.models[prefix + 'BondAsset'].updateAll(updatedAsset) + .should.be.rejectedWith(/is not supported/); + + }); + + it('should remove a single specified asset', () => { + return app.models[prefix + 'BondAsset'].updateAll({ ISINCode: 'ISIN_1' }, updatedAsset) + .then(() => { + return assetRegistry.get('ISIN_1'); + }) + .then((asset) => { + asset.bond.instrumentId.should.deep.equal([ 'AliceNewCorp' ]); + }); + }); + + it('should return an error if the specified asset does not exist', () => { + return app.models[prefix + 'BondAsset'].updateAll({ ISINCode: 'ISIN_999' }, updatedAsset) + .should.be.rejected; + }); + }); describe(`#upsert namespaces[${namespaces}]`, () => { + const updatedAsset = { + $class: 'org.acme.bond.BondAsset', + ISINCode: 'ISIN_1', + bond: { + $class: 'org.acme.bond.Bond', + dayCountFraction: 'EOM', + exchangeId: [ + 'NYSE' + ], + faceAmount: 1000, + instrumentId: [ + 'AliceNewCorp' + ], + issuer: 'resource:org.acme.bond.Issuer#1', + maturity: '2018-02-27T21:03:52.000Z', + parValue: 1000, + paymentFrequency: { + $class: 'org.acme.bond.PaymentFrequency', + period: 'MONTH', + periodMultiplier: 6 + } + } + }; + + it('should update the specified asset', () => { + return app.models[prefix + 'BondAsset'].upsert(updatedAsset) + .then(() => { + return assetRegistry.get('ISIN_1'); + }) + .then((asset) => { + asset.bond.instrumentId.should.deep.equal([ 'AliceNewCorp' ]); + }); + }); + + it('should create a new asset if the specified asset does not exist', () => { + return app.models[prefix + 'BondAsset'].upsert(assetData[2]) + .then(() => { + return assetRegistry.get('ISIN_3'); + }) + .then((asset) => { + let json = serializer.toJSON(asset); + json.should.deep.equal(assetData[2]); + }); + }); + }); describe(`#upsertWithWhere namespaces[${namespaces}]`, () => { + const updatedAsset = { + $class: 'org.acme.bond.BondAsset', + ISINCode: 'ISIN_1', + bond: { + $class: 'org.acme.bond.Bond', + dayCountFraction: 'EOM', + exchangeId: [ + 'NYSE' + ], + faceAmount: 1000, + instrumentId: [ + 'AliceNewCorp' + ], + issuer: 'resource:org.acme.bond.Issuer#1', + maturity: '2018-02-27T21:03:52.000Z', + parValue: 1000, + paymentFrequency: { + $class: 'org.acme.bond.PaymentFrequency', + period: 'MONTH', + periodMultiplier: 6 + } + } + }; + + it('should throw without a where clause as it is unsupported', () => { + return app.models[prefix + 'BondAsset'].upsertWithWhere({}, updatedAsset) + .should.be.rejectedWith(/is not supported/); + + }); + + it('should update the specified asset', () => { + return app.models[prefix + 'BondAsset'].upsertWithWhere({ ISINCode: 'ISIN_1' }, updatedAsset) + .then(() => { + return assetRegistry.get('ISIN_1'); + }) + .then((asset) => { + asset.bond.instrumentId.should.deep.equal([ 'AliceNewCorp' ]); + }); + }); + + it('should create a new asset if the specified asset does not exist', () => { + return app.models[prefix + 'BondAsset'].upsertWithWhere({ ISINCode: 'ISIN_3' }, assetData[2]) + .then(() => { + return assetRegistry.get('ISIN_3'); + }) + .then((asset) => { + let json = serializer.toJSON(asset); + json.should.deep.equal(assetData[2]); + }); + }); + }); describe(`#destroy namespaces[${namespaces}]`, () => { + it('should delete the specified asset', () => { + return app.models[prefix + 'BondAsset'].findById('ISIN_1') + .then((asset) => { + return asset.destroy(); + }) + .then(() => { + return assetRegistry.exists('ISIN_1'); + }) + .then((exists) => { + exists.should.be.false; + }); + }); + }); describe(`#replaceAttributes namespaces[${namespaces}]`, () => { + it('should replace attributes in the specified asset', () => { + return app.models[prefix + 'BondAsset'].findById('ISIN_1') + .then((asset) => { + return asset.replaceAttributes({ + bond: { + $class: 'org.acme.bond.Bond', + dayCountFraction: 'EOM', + exchangeId: [ + 'NYSE' + ], + faceAmount: 1000, + instrumentId: [ + 'AliceNewCorp' + ], + issuer: 'resource:org.acme.bond.Issuer#1', + maturity: '2018-02-27T21:03:52.000Z', + parValue: 1000, + paymentFrequency: { + $class: 'org.acme.bond.PaymentFrequency', + period: 'MONTH', + periodMultiplier: 6 + } + } + }); + }) + .then(() => { + return assetRegistry.get('ISIN_1'); + }) + .then((asset) => { + asset.bond.instrumentId.should.deep.equal([ 'AliceNewCorp' ]); + }); + }); + }); describe(`#updateAttribute namespaces[${namespaces}]`, () => { + it('should replace attribute in the specified asset', () => { + return app.models[prefix + 'BondAsset'].findById('ISIN_1') + .then((asset) => { + return asset.updateAttribute('bond', { + $class: 'org.acme.bond.Bond', + dayCountFraction: 'EOM', + exchangeId: [ + 'NYSE' + ], + faceAmount: 1000, + instrumentId: [ + 'AliceNewCorp' + ], + issuer: 'resource:org.acme.bond.Issuer#1', + maturity: '2018-02-27T21:03:52.000Z', + parValue: 1000, + paymentFrequency: { + $class: 'org.acme.bond.PaymentFrequency', + period: 'MONTH', + periodMultiplier: 6 + } + }); + }) + .then(() => { + return assetRegistry.get('ISIN_1'); + }) + .then((asset) => { + asset.bond.instrumentId.should.deep.equal([ 'AliceNewCorp' ]); + }); + }); + }); describe(`#updateAttributes namespaces[${namespaces}]`, () => { + it('should replace attributes in the specified asset', () => { + return app.models[prefix + 'BondAsset'].findById('ISIN_1') + .then((asset) => { + return asset.updateAttributes({ + bond: { + $class: 'org.acme.bond.Bond', + dayCountFraction: 'EOM', + exchangeId: [ + 'NYSE' + ], + faceAmount: 1000, + instrumentId: [ + 'AliceNewCorp' + ], + issuer: 'resource:org.acme.bond.Issuer#1', + maturity: '2018-02-27T21:03:52.000Z', + parValue: 1000, + paymentFrequency: { + $class: 'org.acme.bond.PaymentFrequency', + period: 'MONTH', + periodMultiplier: 6 + } + } + }); + }) + .then(() => { + return assetRegistry.get('ISIN_1'); + }) + .then((asset) => { + asset.bond.instrumentId.should.deep.equal([ 'AliceNewCorp' ]); + }); + }); + }); }); diff --git a/packages/loopback-connector-composer/test/businessnetworkconnector.js b/packages/loopback-connector-composer/test/businessnetworkconnector.js index e74c994379..cf1997881c 100644 --- a/packages/loopback-connector-composer/test/businessnetworkconnector.js +++ b/packages/loopback-connector-composer/test/businessnetworkconnector.js @@ -14,21 +14,18 @@ 'use strict'; -const AssetDeclaration = require('composer-common/lib/introspect/assetdeclaration'); const AssetRegistry = require('composer-client/lib/assetregistry'); const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection; const BusinessNetworkConnector = require('../lib/businessnetworkconnector'); const BusinessNetworkConnectionWrapper = require('../lib/businessnetworkconnectionwrapper'); const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition; +const Factory = require('composer-common').Factory; const Introspector = require('composer-common').Introspector; const LoopbackVisitor = require('composer-common').LoopbackVisitor; const ModelManager = require('composer-common').ModelManager; const NodeCache = require('node-cache'); -const ParticipantDeclaration = require('composer-common/lib/introspect/participantdeclaration'); const ParticipantRegistry = require('composer-client/lib/participantregistry'); -const Resource = require('composer-common/lib/model/resource'); const Serializer = require('composer-common').Serializer; -const TransactionDeclaration = require('composer-common/lib/introspect/transactiondeclaration'); const TransactionRegistry = require('composer-client/lib/transactionregistry'); const TypeNotFoundException = require('composer-common/lib/typenotfoundexception'); @@ -63,6 +60,7 @@ describe('BusinessNetworkConnector', () => { let sandbox; let testConnector; let modelManager; + let factory; let introspector; beforeEach(() => { @@ -90,6 +88,7 @@ describe('BusinessNetworkConnector', () => { modelManager = new ModelManager(); modelManager.addModelFile(MODEL_FILE); introspector = new Introspector(modelManager); + factory = new Factory(modelManager); sandbox = sinon.sandbox.create(); @@ -551,7 +550,7 @@ describe('BusinessNetworkConnector', () => { .then((result) => { sinon.assert.calledOnce(testConnector.ensureConnected); sinon.assert.calledWith(testConnector.ensureConnected, { test: 'options' }); - result.should.deep.equal({}); + result.should.deep.equal([]); }); }); @@ -569,7 +568,7 @@ describe('BusinessNetworkConnector', () => { .then((result) => { sinon.assert.calledOnce(testConnector.ensureConnected); sinon.assert.calledWith(testConnector.ensureConnected, { test: 'options' }); - result.should.deep.equal({}); + result.should.deep.equal([]); }); }); @@ -881,7 +880,7 @@ describe('BusinessNetworkConnector', () => { describe('#updateAttributes', () => { let mockAssetRegistry; - let mockResourceToUpdate; + let resource; beforeEach(() => { sinon.spy(testConnector, 'getRegistryForModel'); @@ -893,12 +892,14 @@ describe('BusinessNetworkConnector', () => { testConnector.connected = true; mockAssetRegistry = sinon.createStubInstance(AssetRegistry); mockBusinessNetworkConnection.getAssetRegistry.resolves(mockAssetRegistry); - mockResourceToUpdate = sinon.createStubInstance(Resource); + resource = factory.newResource('org.acme.base', 'BaseAsset', 'theId'); + mockAssetRegistry.get.withArgs('theId').resolves(resource); + mockSerializer.toJSON.withArgs(resource).returns({ theValue: 'theId', prop1: 'woohoo' }); }); it('should update the attributes for the given object id on the blockchain with no $class attribute', () => { return new Promise((resolve, reject) => { - mockSerializer.fromJSON.returns(mockResourceToUpdate); + mockSerializer.fromJSON.returns(resource); mockAssetRegistry.update.resolves(); testConnector.updateAttributes('org.acme.base.BaseAsset', 'theId', { 'theValue' : 'updated' }, { test: 'options' }, (error) => { if(error) { @@ -908,18 +909,18 @@ describe('BusinessNetworkConnector', () => { }); }) .then((result) => { - sinon.assert.calledWith(mockSerializer.fromJSON, { '$class': 'org.acme.base.BaseAsset', 'theValue' : 'updated' }); + sinon.assert.calledWith(mockSerializer.fromJSON, { '$class': 'org.acme.base.BaseAsset', 'theValue' : 'updated', prop1: 'woohoo' }); sinon.assert.calledOnce(testConnector.ensureConnected); sinon.assert.calledWith(testConnector.ensureConnected, { test: 'options' }); sinon.assert.calledOnce(testConnector.getRegistryForModel); sinon.assert.calledOnce(mockAssetRegistry.update); - sinon.assert.calledWith(mockAssetRegistry.update, mockResourceToUpdate); + sinon.assert.calledWith(mockAssetRegistry.update, resource); }); }); it('should update the attributes for the given object id on the blockchain with a $class attribute', () => { return new Promise((resolve, reject) => { - mockSerializer.fromJSON.returns(mockResourceToUpdate); + mockSerializer.fromJSON.returns(resource); mockAssetRegistry.update.resolves(); testConnector.updateAttributes('org.acme.base.BaseAsset', 'theId', { '$class': 'org.acme.base.BaseAsset', 'theValue' : 'updated' }, { test: 'options' }, (error) => { if(error) { @@ -929,18 +930,18 @@ describe('BusinessNetworkConnector', () => { }); }) .then((result) => { - sinon.assert.calledWith(mockSerializer.fromJSON, { '$class': 'org.acme.base.BaseAsset', 'theValue' : 'updated' }); + sinon.assert.calledWith(mockSerializer.fromJSON, { '$class': 'org.acme.base.BaseAsset', 'theValue' : 'updated', prop1: 'woohoo' }); sinon.assert.calledOnce(testConnector.ensureConnected); sinon.assert.calledWith(testConnector.ensureConnected, { test: 'options' }); sinon.assert.calledOnce(testConnector.getRegistryForModel); sinon.assert.calledOnce(mockAssetRegistry.update); - sinon.assert.calledWith(mockAssetRegistry.update, mockResourceToUpdate); + sinon.assert.calledWith(mockAssetRegistry.update, resource); }); }); it('should handle the error when an invalid model is specified', () => { return new Promise((resolve, reject) => { - mockSerializer.fromJSON.returns(mockResourceToUpdate); + mockSerializer.fromJSON.returns(resource); mockAssetRegistry.update.resolves(); testConnector.updateAttributes('org.acme.base.WrongBaseAsset', 'theId', { 'theValue' : 'updated' }, { test: 'options' }, (error) => { if(error) { @@ -959,7 +960,7 @@ describe('BusinessNetworkConnector', () => { it('should handle an update error from the composer api', () => { return new Promise((resolve, reject) => { - mockSerializer.fromJSON.returns(mockResourceToUpdate); + mockSerializer.fromJSON.returns(resource); mockAssetRegistry.update.rejects(new Error('Update error from Composer')); testConnector.updateAttributes('org.acme.base.BaseAsset', 'theId', { 'theValue' : 'updated' }, { test: 'options' }, (error) => { if(error) { @@ -979,7 +980,7 @@ describe('BusinessNetworkConnector', () => { it('should handle an update error from the composer api for an asset that does not exist', () => { return new Promise((resolve, reject) => { - mockSerializer.fromJSON.returns(mockResourceToUpdate); + mockSerializer.fromJSON.returns(resource); mockAssetRegistry.update.rejects(new Error('does not exist')); testConnector.updateAttributes('org.acme.base.BaseAsset', 'theId', { 'theValue' : 'updated' }, { test: 'options' }, (error) => { if(error) { @@ -1004,7 +1005,7 @@ describe('BusinessNetworkConnector', () => { describe('#replaceById', () => { let mockAssetRegistry; - let mockResourceToUpdate; + let asset; beforeEach(() => { sinon.stub(testConnector, 'ensureConnected').resolves(mockBusinessNetworkConnection); @@ -1016,12 +1017,12 @@ describe('BusinessNetworkConnector', () => { testConnector.connected = true; mockAssetRegistry = sinon.createStubInstance(AssetRegistry); mockBusinessNetworkConnection.getAssetRegistry.resolves(mockAssetRegistry); - mockResourceToUpdate = sinon.createStubInstance(Resource); + asset = factory.newResource('org.acme.base', 'BaseAsset', 'myId'); }); it('should update the attributes for the given object id on the blockchain with no $class attribute', () => { return new Promise((resolve, reject) => { - mockSerializer.fromJSON.returns(mockResourceToUpdate); + mockSerializer.fromJSON.returns(asset); mockAssetRegistry.update.resolves(); testConnector.replaceById('org.acme.base.BaseAsset', '1', { 'assetId': '1', 'theValue' : 'updated' }, { test: 'options' }, (error) => { if(error) { @@ -1036,13 +1037,13 @@ describe('BusinessNetworkConnector', () => { sinon.assert.calledWith(testConnector.ensureConnected, { test: 'options' }); sinon.assert.calledOnce(testConnector.getRegistryForModel); sinon.assert.calledOnce(mockAssetRegistry.update); - sinon.assert.calledWith(mockAssetRegistry.update, mockResourceToUpdate); + sinon.assert.calledWith(mockAssetRegistry.update, asset); }); }); it('should update the attributes for the given object id on the blockchain with a $class attribute', () => { return new Promise((resolve, reject) => { - mockSerializer.fromJSON.returns(mockResourceToUpdate); + mockSerializer.fromJSON.returns(asset); mockAssetRegistry.update.resolves(); testConnector.replaceById('org.acme.base.BaseAsset', '1', { '$class': 'org.acme.base.BaseAsset', 'assetId': '1', 'theValue' : 'updated' }, { test: 'options' }, (error) => { if(error) { @@ -1057,13 +1058,13 @@ describe('BusinessNetworkConnector', () => { sinon.assert.calledWith(testConnector.ensureConnected, { test: 'options' }); sinon.assert.calledOnce(testConnector.getRegistryForModel); sinon.assert.calledOnce(mockAssetRegistry.update); - sinon.assert.calledWith(mockAssetRegistry.update, mockResourceToUpdate); + sinon.assert.calledWith(mockAssetRegistry.update, asset); }); }); it('should handle the error when an invalid model is specified', () => { return new Promise((resolve, reject) => { - mockSerializer.fromJSON.returns(mockResourceToUpdate); + mockSerializer.fromJSON.returns(asset); mockAssetRegistry.update.resolves(); testConnector.replaceById('org.acme.base.WrongBaseAsset', '1', { 'assetId': '1', 'theValue' : 'updated' }, { test: 'options' }, (error) => { if(error) { @@ -1082,7 +1083,7 @@ describe('BusinessNetworkConnector', () => { it('should handle an update error from the composer api', () => { return new Promise((resolve, reject) => { - mockSerializer.fromJSON.returns(mockResourceToUpdate); + mockSerializer.fromJSON.returns(asset); mockAssetRegistry.update.rejects(new Error('Update error from Composer')); testConnector.replaceById('org.acme.base.BaseAsset', '1', { 'assetId': '1', 'theValue' : 'updated' }, { test: 'options' }, (error) => { if(error) { @@ -1102,7 +1103,7 @@ describe('BusinessNetworkConnector', () => { it('should handle an update error from the composer api for an asset that does not exist', () => { return new Promise((resolve, reject) => { - mockSerializer.fromJSON.returns(mockResourceToUpdate); + mockSerializer.fromJSON.returns(asset); mockAssetRegistry.update.rejects(new Error('does not exist')); testConnector.replaceById('org.acme.base.BaseAsset', '1', { 'assetId': '1', 'theValue' : 'updated' }, { test: 'options' }, (error) => { if(error) { @@ -1129,10 +1130,9 @@ describe('BusinessNetworkConnector', () => { let mockAssetRegistry; let mockParticipantRegistry; - let mockAssetDeclaration; - let mockParticipantDeclaration; - let mockTransactionDeclaration; - let mockResource; + let asset; + let participant; + let transaction; beforeEach(() => { sinon.stub(testConnector, 'ensureConnected').resolves(mockBusinessNetworkConnection); @@ -1140,22 +1140,17 @@ describe('BusinessNetworkConnector', () => { testConnector.modelManager = modelManager; testConnector.introspector = introspector; mockAssetRegistry = sinon.createStubInstance(AssetRegistry); + mockBusinessNetworkConnection.getAssetRegistry.resolves(mockAssetRegistry); mockParticipantRegistry = sinon.createStubInstance(ParticipantRegistry); - mockAssetDeclaration = sinon.createStubInstance(AssetDeclaration); - mockParticipantDeclaration = sinon.createStubInstance(ParticipantDeclaration); - mockTransactionDeclaration = sinon.createStubInstance(TransactionDeclaration); - mockResource = sinon.createStubInstance(Resource); + mockBusinessNetworkConnection.getParticipantRegistry.resolves(mockParticipantRegistry); mockBusinessNetworkDefinition.getSerializer.returns(mockSerializer); - mockSerializer.fromJSON.onFirstCall().returns(mockResource); - + asset = factory.newResource('org.acme.base', 'BaseAsset', 'myId'); + participant = factory.newResource('org.acme.base', 'BaseParticipant', 'myId'); + transaction = factory.newResource('org.acme.base', 'BaseTransaction', 'myId'); }); it('should use the model name as the class name if not specified', () => { - - mockBusinessNetworkConnection.getAssetRegistry.resolves(mockAssetRegistry); - mockAssetDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.base.BaseAsset'); - mockResource.getClassDeclaration.onFirstCall().returns(mockAssetDeclaration); - + mockSerializer.fromJSON.onFirstCall().returns(asset); return new Promise((resolve, reject) => { testConnector.create('org.acme.base.BaseAsset', { @@ -1178,9 +1173,8 @@ describe('BusinessNetworkConnector', () => { }); it('should throw if the type is not an asset or a transaction', () => { - mockBusinessNetworkConnection.getAssetRegistry.onFirstCall().resolves(mockAssetRegistry); - mockResource.getClassDeclaration.onFirstCall().returns({}); - + let concept = factory.newConcept('org.acme.base', 'BaseConcept'); + mockSerializer.fromJSON.onFirstCall().returns(concept); return new Promise((resolve, reject) => { testConnector.create('org.acme.base.BaseConcept', { some : 'data' @@ -1194,10 +1188,7 @@ describe('BusinessNetworkConnector', () => { }); it('should add an asset to the default asset registry', () => { - mockBusinessNetworkConnection.getAssetRegistry.resolves(mockAssetRegistry); - mockAssetDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.base.BaseAsset'); - mockResource.getClassDeclaration.onFirstCall().returns(mockAssetDeclaration); - + mockSerializer.fromJSON.onFirstCall().returns(asset); return new Promise((resolve, reject) => { testConnector.create('org.acme.base.BaseAsset', { $class : 'org.acme.base.BaseAsset', @@ -1215,16 +1206,14 @@ describe('BusinessNetworkConnector', () => { sinon.assert.calledOnce(mockBusinessNetworkConnection.getAssetRegistry); sinon.assert.calledWith(mockBusinessNetworkConnection.getAssetRegistry, 'org.acme.base.BaseAsset'); sinon.assert.calledOnce(mockAssetRegistry.add); - sinon.assert.calledWith(mockAssetRegistry.add, mockResource); + sinon.assert.calledWith(mockAssetRegistry.add, asset); should.equal(identifier, undefined); }); }); it('should handle an error adding an asset to the default asset registry', () => { - mockAssetRegistry.add.onFirstCall().throws(new Error('expected error')); - mockBusinessNetworkConnection.getAssetRegistry.onFirstCall().resolves(mockAssetRegistry); - mockAssetDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.base.BaseAsset'); - mockResource.getClassDeclaration.onFirstCall().returns(mockAssetDeclaration); + mockAssetRegistry.add.onFirstCall().rejects(new Error('expected error')); + mockSerializer.fromJSON.onFirstCall().returns(asset); return new Promise((resolve, reject) => { testConnector.create('org.acme.base.BaseAsset', { @@ -1240,9 +1229,7 @@ describe('BusinessNetworkConnector', () => { }); it('should add a participant to the default participant registry', () => { - mockBusinessNetworkConnection.getParticipantRegistry.resolves(mockParticipantRegistry); - mockParticipantDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.base.BaseParticipant'); - mockResource.getClassDeclaration.onFirstCall().returns(mockParticipantDeclaration); + mockSerializer.fromJSON.onFirstCall().returns(participant); return new Promise((resolve, reject) => { testConnector.create('org.acme.base.BaseParticipant', { @@ -1261,16 +1248,14 @@ describe('BusinessNetworkConnector', () => { sinon.assert.calledOnce(mockBusinessNetworkConnection.getParticipantRegistry); sinon.assert.calledWith(mockBusinessNetworkConnection.getParticipantRegistry, 'org.acme.base.BaseParticipant'); sinon.assert.calledOnce(mockParticipantRegistry.add); - sinon.assert.calledWith(mockParticipantRegistry.add, mockResource); + sinon.assert.calledWith(mockParticipantRegistry.add, participant); should.equal(identifier, undefined); }); }); it('should handle an error adding a participant to the default participant registry', () => { - mockParticipantRegistry.add.onFirstCall().throws(new Error('expected error')); - mockBusinessNetworkConnection.getParticipantRegistry.onFirstCall().resolves(mockParticipantRegistry); - mockParticipantDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.base.BaseParticipant'); - mockResource.getClassDeclaration.onFirstCall().returns(mockParticipantDeclaration); + mockParticipantRegistry.add.onFirstCall().rejects(new Error('expected error')); + mockSerializer.fromJSON.onFirstCall().returns(participant); return new Promise((resolve, reject) => { testConnector.create('org.acme.base.BaseParticipant', { @@ -1286,9 +1271,7 @@ describe('BusinessNetworkConnector', () => { }); it('should submit a transaction', () => { - mockTransactionDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.Transaction'); - mockResource.getIdentifier.returns('f7cf42d6-492f-4b7e-8b6a-2150ac5bcc5f'); - mockResource.getClassDeclaration.onFirstCall().returns(mockTransactionDeclaration); + mockSerializer.fromJSON.onFirstCall().returns(transaction); return new Promise((resolve, reject) => { testConnector.create('org.acme.Transaction', { @@ -1305,15 +1288,14 @@ describe('BusinessNetworkConnector', () => { sinon.assert.calledOnce(testConnector.ensureConnected); sinon.assert.calledWith(testConnector.ensureConnected, { test: 'options' }); sinon.assert.calledOnce(mockBusinessNetworkConnection.submitTransaction); - sinon.assert.calledWith(mockBusinessNetworkConnection.submitTransaction, mockResource); - identifier.should.equal('f7cf42d6-492f-4b7e-8b6a-2150ac5bcc5f'); + sinon.assert.calledWith(mockBusinessNetworkConnection.submitTransaction, transaction); + identifier.should.equal('myId'); }); }); it('should handle an error submitting a transaction', () => { mockBusinessNetworkConnection.submitTransaction.onFirstCall().rejects(new Error('expected error')); - mockTransactionDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.Transaction'); - mockResource.getClassDeclaration.onFirstCall().returns(mockTransactionDeclaration); + mockSerializer.fromJSON.onFirstCall().returns(transaction); return new Promise((resolve, reject) => { testConnector.create('org.acme.Transaction', { @@ -1332,6 +1314,9 @@ describe('BusinessNetworkConnector', () => { describe('#retrieve', () => { let mockAssetRegistry; + let mockParticipantRegistry; + let asset; + let participant; beforeEach(() => { sinon.stub(testConnector, 'ensureConnected').resolves(mockBusinessNetworkConnection); @@ -1342,17 +1327,15 @@ describe('BusinessNetworkConnector', () => { testConnector.serializer = mockSerializer; mockAssetRegistry = sinon.createStubInstance(AssetRegistry); mockBusinessNetworkConnection.getAssetRegistry.resolves(mockAssetRegistry); + mockParticipantRegistry = sinon.createStubInstance(ParticipantRegistry); + mockBusinessNetworkConnection.getParticipantRegistry.resolves(mockParticipantRegistry); + asset = factory.newResource('org.acme.base', 'BaseAsset', 'theId'); + participant = factory.newResource('org.acme.base', 'BaseParticipant', 'theId'); }); it('should retrieve an asset', () => { - mockAssetRegistry.get.resolves({assetId : 'myId', stringValue : 'a big car'}); + mockAssetRegistry.get.resolves(asset); mockSerializer.toJSON.onFirstCall().returns({assetId : 'myId', stringValue : 'a big car'}); - mockBusinessNetworkConnection.getAssetRegistry.resolves(mockAssetRegistry); - - let mockModelManager = sinon.createStubInstance(ModelManager); - mockBusinessNetworkDefinition.getModelManager.returns(mockModelManager); - let mockAssetDeclaration = sinon.createStubInstance(AssetDeclaration); - mockModelManager.getType.returns(mockAssetDeclaration); return new Promise((resolve, reject) => { @@ -1376,15 +1359,7 @@ describe('BusinessNetworkConnector', () => { }); it('should handle asset errors', () => { - let mockAssetRegistry = sinon.createStubInstance(AssetRegistry); - mockAssetRegistry.get.onFirstCall().throws(new Error('expected error')); - mockBusinessNetworkConnection.getAssetRegistry.onFirstCall().resolves(mockAssetRegistry); - - let mockModelManager = sinon.createStubInstance(ModelManager); - mockBusinessNetworkDefinition.getModelManager.returns(mockModelManager); - let mockAssetDeclaration = sinon.createStubInstance(AssetDeclaration); - mockModelManager.getType.returns(mockAssetDeclaration); - + mockAssetRegistry.get.onFirstCall().rejects(new Error('expected error')); return new Promise((resolve, reject) => { testConnector.retrieve('org.acme.base.BaseAsset', { @@ -1399,15 +1374,8 @@ describe('BusinessNetworkConnector', () => { }); it('should retrieve a participant', () => { - let mockParticipantRegistry = sinon.createStubInstance(ParticipantRegistry); - mockParticipantRegistry.get.resolves({participantId : 'myId', stringValue : 'a big car'}); + mockParticipantRegistry.get.resolves(participant); mockSerializer.toJSON.onFirstCall().returns({participantId : 'myId', stringValue : 'a big car'}); - mockBusinessNetworkConnection.getParticipantRegistry.resolves(mockParticipantRegistry); - - let mockModelManager = sinon.createStubInstance(ModelManager); - mockBusinessNetworkDefinition.getModelManager.returns(mockModelManager); - let mockParticipantDeclaration = sinon.createStubInstance(ParticipantDeclaration); - mockModelManager.getType.returns(mockParticipantDeclaration); return new Promise((resolve, reject) => { testConnector.retrieve('org.acme.base.BaseParticipant', 'myId', { test: 'options' }, (error, result) => { @@ -1430,14 +1398,7 @@ describe('BusinessNetworkConnector', () => { }); it('should handle participant errors', () => { - let mockParticipantRegistry = sinon.createStubInstance(ParticipantRegistry); - mockParticipantRegistry.get.onFirstCall().throws(new Error('expected error')); - mockBusinessNetworkConnection.getParticipantRegistry.onFirstCall().resolves(mockParticipantRegistry); - - let mockModelManager = sinon.createStubInstance(ModelManager); - mockBusinessNetworkDefinition.getModelManager.returns(mockModelManager); - let mockParticipantDeclaration = sinon.createStubInstance(ParticipantDeclaration); - mockModelManager.getType.returns(mockParticipantDeclaration); + mockParticipantRegistry.get.onFirstCall().rejects(new Error('expected error')); return new Promise((resolve, reject) => { testConnector.retrieve('org.acme.base.BaseParticipant', { @@ -1452,10 +1413,6 @@ describe('BusinessNetworkConnector', () => { }); it('should throw error on unsupported type', () => { - let mockModelManager = sinon.createStubInstance(ModelManager); - mockBusinessNetworkDefinition.getModelManager.returns(mockModelManager); - mockModelManager.getType.returns({}); - return new Promise((resolve, reject) => { testConnector.retrieve('org.acme.base.BaseConcept', 'myId', { test: 'options' }, (error, result) => { if (error) { @@ -1471,9 +1428,9 @@ describe('BusinessNetworkConnector', () => { let mockAssetRegistry; let mockParticipantRegistry; - let mockResource; - let mockAssetDeclaration; - let mockParticipantDeclaration; + let asset; + let participant; + beforeEach(() => { sinon.stub(testConnector, 'ensureConnected').resolves(mockBusinessNetworkConnection); testConnector.businessNetworkDefinition = mockBusinessNetworkDefinition; @@ -1484,21 +1441,16 @@ describe('BusinessNetworkConnector', () => { mockBusinessNetworkDefinition.getSerializer.returns(mockSerializer); mockAssetRegistry = sinon.createStubInstance(AssetRegistry); mockParticipantRegistry = sinon.createStubInstance(ParticipantRegistry); - mockAssetDeclaration = sinon.createStubInstance(AssetDeclaration); - mockParticipantDeclaration = sinon.createStubInstance(ParticipantDeclaration); - mockResource = sinon.createStubInstance(Resource); - mockSerializer.fromJSON.onFirstCall().returns(mockResource); + asset = factory.newResource('org.acme.base', 'BaseAsset', 'myId'); + participant = factory.newResource('org.acme.base', 'BaseParticipant', 'myId'); mockBusinessNetworkConnection.getParticipantRegistry.resolves(mockParticipantRegistry); mockBusinessNetworkConnection.getAssetRegistry.resolves(mockAssetRegistry); }); it('should update an asset', ()=> { - + mockSerializer.fromJSON.onFirstCall().returns(asset); return new Promise((resolve, reject) => { - mockAssetDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.base.BaseAsset'); - mockResource.getClassDeclaration.onFirstCall().returns(mockAssetDeclaration); - - testConnector.update('org.acme.base.BaseAsset', { + testConnector.update('org.acme.base.BaseAsset', { theValue: 'myId' }, { $class : 'org.acme.base.BaseAsset', some : 'data' }, { test: 'options' }, (error) => { @@ -1514,16 +1466,14 @@ describe('BusinessNetworkConnector', () => { sinon.assert.calledOnce(mockBusinessNetworkConnection.getAssetRegistry); sinon.assert.calledWith(mockBusinessNetworkConnection.getAssetRegistry, 'org.acme.base.BaseAsset'); sinon.assert.calledOnce(mockAssetRegistry.update); - sinon.assert.calledWith(mockAssetRegistry.update, mockResource); + sinon.assert.calledWith(mockAssetRegistry.update, asset); }); }); it('should update a participant', ()=> { - mockParticipantDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.base.BaseParticipant'); - mockResource.getClassDeclaration.onFirstCall().returns(mockParticipantDeclaration); - + mockSerializer.fromJSON.onFirstCall().returns(participant); return new Promise((resolve, reject) => { - testConnector.update('org.acme.base.BaseParticipant', { + testConnector.update('org.acme.base.BaseParticipant', { theValue: 'myId' }, { $class : 'org.acme.base.BaseParticipant', some : 'data' }, { test: 'options' }, (error) => { @@ -1539,13 +1489,13 @@ describe('BusinessNetworkConnector', () => { sinon.assert.calledOnce(mockBusinessNetworkConnection.getParticipantRegistry); sinon.assert.calledWith(mockBusinessNetworkConnection.getParticipantRegistry, 'org.acme.base.BaseParticipant'); sinon.assert.calledOnce(mockParticipantRegistry.update); - sinon.assert.calledWith(mockParticipantRegistry.update, mockResource); + sinon.assert.calledWith(mockParticipantRegistry.update, participant); }); }); - it('should handle error if unsupported class', () => { + it('should handle error if no where clause', () => { return new Promise((resolve, reject) => { - testConnector.update('org.acme.base.BaseConcept', { + testConnector.update('org.acme.base.BaseConcept', { }, { assetId : 'myId', stringValue : 'a bigger car' }, { test: 'options' }, (error, result) => { @@ -1554,16 +1504,43 @@ describe('BusinessNetworkConnector', () => { } resolve(result); }); - }).should.be.rejectedWith(/No registry for specified model name/); + }).should.be.rejectedWith(/is not supported/); + }); + + it('should handle error if unsupported ID field', () => { + return new Promise((resolve, reject) => { + testConnector.update('org.acme.base.BaseConcept', { doge: 'myId' }, { + assetId : 'myId', + stringValue : 'a bigger car' + }, { test: 'options' }, (error, result) => { + if (error) { + return reject(error); + } + resolve(result); + }); + }).should.be.rejectedWith(/does not match the identifier/); + }); + + it('should handle error if mismatched ID field', () => { + mockSerializer.fromJSON.onFirstCall().returns(asset); + return new Promise((resolve, reject) => { + testConnector.update('org.acme.base.BaseConcept', { theValue: 'doge' }, { + theValue : 'lolz' + }, { test: 'options' }, (error, result) => { + if (error) { + return reject(error); + } + resolve(result); + }); + }).should.be.rejectedWith(/does not match the identifier/); }); it('should handle asset errors', () => { - mockAssetRegistry.update.onFirstCall().throws(new Error('expected error')); - mockAssetDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.base.BaseAsset'); - mockResource.getClassDeclaration.onFirstCall().returns(mockAssetDeclaration); + mockAssetRegistry.update.onFirstCall().rejects(new Error('expected error')); + mockSerializer.fromJSON.onFirstCall().returns(asset); return new Promise((resolve, reject) => { - testConnector.update('org.acme.base.BaseAsset', { + testConnector.update('org.acme.base.BaseAsset', { theValue: 'myId' }, { assetId : 'myId', stringValue : 'value' }, { test: 'options' }, (error) => { @@ -1576,13 +1553,11 @@ describe('BusinessNetworkConnector', () => { }); it('should handle participant errors', () => { - mockParticipantRegistry.update.onFirstCall().throws(new Error('expected error')); - mockSerializer.fromJSON.onFirstCall().returns(mockResource); - mockParticipantDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.base.BaseParticipant'); - mockResource.getClassDeclaration.onFirstCall().returns(mockParticipantDeclaration); + mockParticipantRegistry.update.onFirstCall().rejects(new Error('expected error')); + mockSerializer.fromJSON.onFirstCall().returns(participant); return new Promise((resolve, reject) => { - testConnector.update('org.acme.base.BaseParticipant', { + testConnector.update('org.acme.base.BaseParticipant', { theValue: 'myId' }, { participantId : 'myId', stringValue : 'value' }, { test: 'options' }, (error) => { @@ -1595,12 +1570,11 @@ describe('BusinessNetworkConnector', () => { }); it('should handle asset errors for assets that do not exist', () => { - mockAssetRegistry.update.onFirstCall().throws(new Error('does not exist')); - mockAssetDeclaration.getFullyQualifiedName.onFirstCall().returns('org.acme.base.BaseAsset'); - mockResource.getClassDeclaration.onFirstCall().returns(mockAssetDeclaration); + mockAssetRegistry.update.onFirstCall().rejects(new Error('does not exist')); + mockSerializer.fromJSON.onFirstCall().returns(asset); return new Promise((resolve, reject) => { - testConnector.update('org.acme.base.BaseAsset', { + testConnector.update('org.acme.base.BaseAsset', { theValue: 'myId' }, { assetId : 'myId', stringValue : 'value' }, { test: 'options' }, (error) => { @@ -1622,7 +1596,7 @@ describe('BusinessNetworkConnector', () => { describe('#destroy', () => { let mockAssetRegistry; - let mockResourceToDelete; + let resourceToDelete; beforeEach(() => { sinon.stub(testConnector, 'ensureConnected').resolves(mockBusinessNetworkConnection); @@ -1633,11 +1607,11 @@ describe('BusinessNetworkConnector', () => { testConnector.connected = true; mockAssetRegistry = sinon.createStubInstance(AssetRegistry); mockBusinessNetworkConnection.getAssetRegistry.resolves(mockAssetRegistry); - mockResourceToDelete = sinon.createStubInstance(Resource); + resourceToDelete = factory.newResource('org.acme.base', 'BaseAsset', 'foo'); }); it('should delete the object for the given id from the blockchain', () => { - mockAssetRegistry.get.resolves(mockResourceToDelete); + mockAssetRegistry.get.resolves(resourceToDelete); mockAssetRegistry.remove.resolves(); return new Promise((resolve, reject) => { testConnector.destroy('org.acme.base.BaseAsset','foo' , { test: 'options' }, (error) => { @@ -1676,7 +1650,7 @@ describe('BusinessNetworkConnector', () => { }); it('should handle an error when calling composer remove for the given id', () => { - mockAssetRegistry.get.resolves(mockResourceToDelete); + mockAssetRegistry.get.resolves(resourceToDelete); mockAssetRegistry.remove.rejects(new Error('removal error')); return new Promise((resolve, reject) => { testConnector.destroy('org.acme.base.BaseAsset','foo', { test: 'options' }, (error) => { @@ -1696,7 +1670,7 @@ describe('BusinessNetworkConnector', () => { }); it('should handle an error when calling composer remove for an asset that does not exist', () => { - mockAssetRegistry.get.resolves(mockResourceToDelete); + mockAssetRegistry.get.resolves(resourceToDelete); mockAssetRegistry.remove.rejects(new Error('does not exist')); return new Promise((resolve, reject) => { testConnector.destroy('org.acme.base.BaseAsset', 'foo' , { test: 'options' }, (error) => { @@ -1722,7 +1696,7 @@ describe('BusinessNetworkConnector', () => { describe('#destroyAll', () => { let mockAssetRegistry; - let mockResourceToDelete; + let resourceToDelete; beforeEach(() => { sinon.stub(testConnector, 'ensureConnected').resolves(mockBusinessNetworkConnection); @@ -1733,11 +1707,11 @@ describe('BusinessNetworkConnector', () => { testConnector.connected = true; mockAssetRegistry = sinon.createStubInstance(AssetRegistry); mockBusinessNetworkConnection.getAssetRegistry.resolves(mockAssetRegistry); - mockResourceToDelete = sinon.createStubInstance(Resource); + resourceToDelete = factory.newResource('org.acme.base', 'BaseAsset', 'foo'); }); it('should delete the object for the given id from the blockchain', () => { - mockAssetRegistry.get.resolves(mockResourceToDelete); + mockAssetRegistry.get.resolves(resourceToDelete); mockAssetRegistry.remove.resolves(); return new Promise((resolve, reject) => { testConnector.destroyAll('org.acme.base.BaseAsset', { 'theValue' : 'foo' }, { test: 'options' }, (error) => { @@ -1755,6 +1729,23 @@ describe('BusinessNetworkConnector', () => { }); }); + it('should handle an error when an empty where clause is specified', () => { + mockAssetRegistry.get.rejects(new Error('get error')); + return new Promise((resolve, reject) => { + testConnector.destroyAll('org.acme.base.BaseAsset', {}, { test: 'options' }, (error) => { + if(error) { + return reject(error); + } + resolve(); + }); + }) + .should.be.rejectedWith(/is not supported/) + .then(() => { + sinon.assert.calledOnce(testConnector.ensureConnected); + sinon.assert.calledWith(testConnector.ensureConnected, { test: 'options' }); + }); + }); + it('should handle an error when an invalid Object identifier is specified', () => { mockAssetRegistry.get.rejects(new Error('get error')); return new Promise((resolve, reject) => { @@ -1791,7 +1782,7 @@ describe('BusinessNetworkConnector', () => { }); it('should handle an error when calling composer remove for the given id', () => { - mockAssetRegistry.get.resolves(mockResourceToDelete); + mockAssetRegistry.get.resolves(resourceToDelete); mockAssetRegistry.remove.rejects(new Error('removal error')); return new Promise((resolve, reject) => { testConnector.destroyAll('org.acme.base.BaseAsset', { 'theValue' : 'foo' }, { test: 'options' }, (error) => { @@ -1811,7 +1802,7 @@ describe('BusinessNetworkConnector', () => { }); it('should handle an error when calling composer remove for an asset that does not exist', () => { - mockAssetRegistry.get.resolves(mockResourceToDelete); + mockAssetRegistry.get.resolves(resourceToDelete); mockAssetRegistry.remove.rejects(new Error('does not exist')); return new Promise((resolve, reject) => { testConnector.destroyAll('org.acme.base.BaseAsset', { 'theValue' : 'foo' }, { test: 'options' }, (error) => { @@ -1922,25 +1913,23 @@ describe('BusinessNetworkConnector', () => { describe('#getAllTransactions', () => { let mockTransactionRegistry; - let mockTransaction1, mockTransaction2; + let transaction1, transaction2; beforeEach(() => { sinon.stub(testConnector, 'ensureConnected').resolves(mockBusinessNetworkConnection); testConnector.connected = true; mockTransactionRegistry = sinon.createStubInstance(TransactionRegistry); mockBusinessNetworkConnection.getTransactionRegistry.resolves(mockTransactionRegistry); - mockTransaction1 = sinon.createStubInstance(Resource); - mockTransaction1.transactionId = 'tx1'; - mockTransaction2 = sinon.createStubInstance(Resource); - mockTransaction2.transactionId = 'tx2'; + transaction1 = factory.newResource('org.acme.base', 'BaseTransaction', 'tx1'); + transaction2 = factory.newResource('org.acme.base', 'BaseTransaction', 'tx2'); testConnector.serializer = mockSerializer; }); it('should get all of the transactions in the transaction registry', () => { mockBusinessNetworkConnection.getTransactionRegistry.resolves(mockTransactionRegistry); - mockTransactionRegistry.getAll.resolves([mockTransaction1, mockTransaction2]); - mockSerializer.toJSON.withArgs(mockTransaction1).returns({ transactionId: 'tx1', $class: 'sometx' }); - mockSerializer.toJSON.withArgs(mockTransaction2).returns({ transactionId: 'tx2', $class: 'sometx' }); + mockTransactionRegistry.getAll.resolves([transaction1, transaction2]); + mockSerializer.toJSON.withArgs(transaction1).returns({ transactionId: 'tx1', $class: 'sometx' }); + mockSerializer.toJSON.withArgs(transaction2).returns({ transactionId: 'tx2', $class: 'sometx' }); const cb = sinon.stub(); return testConnector.getAllTransactions({ test: 'options' }, cb) .then(() => { @@ -1979,22 +1968,21 @@ describe('BusinessNetworkConnector', () => { describe('#getTransactionByID', () => { let mockTransactionRegistry; - let mockTransaction1; + let transaction; beforeEach(() => { sinon.stub(testConnector, 'ensureConnected').resolves(mockBusinessNetworkConnection); testConnector.connected = true; mockTransactionRegistry = sinon.createStubInstance(TransactionRegistry); mockBusinessNetworkConnection.getTransactionRegistry.resolves(mockTransactionRegistry); - mockTransaction1 = sinon.createStubInstance(Resource); - mockTransaction1.transactionId = 'tx1'; + transaction = factory.newResource('org.acme.base', 'BaseTransaction', 'tx1'); testConnector.serializer = mockSerializer; }); it('should get the specified transaction in the transaction registry', () => { mockBusinessNetworkConnection.getTransactionRegistry.resolves(mockTransactionRegistry); - mockTransactionRegistry.get.withArgs('tx1').resolves(mockTransaction1); - mockSerializer.toJSON.withArgs(mockTransaction1).returns({ transactionId: 'tx1', $class: 'sometx' }); + mockTransactionRegistry.get.withArgs('tx1').resolves(transaction); + mockSerializer.toJSON.withArgs(transaction).returns({ transactionId: 'tx1', $class: 'sometx' }); const cb = sinon.stub(); return testConnector.getTransactionByID('tx1', { test: 'options' }, cb) .then(() => { @@ -2013,7 +2001,7 @@ describe('BusinessNetworkConnector', () => { it('should handle an error getting the specified transaction in the transaction registry', () => { mockBusinessNetworkConnection.getTransactionRegistry.resolves(mockTransactionRegistry); mockTransactionRegistry.get.withArgs('tx1').rejects(new Error('such error')); - mockSerializer.toJSON.withArgs(mockTransaction1).returns({ transactionId: 'tx1', $class: 'sometx' }); + mockSerializer.toJSON.withArgs(transaction).returns({ transactionId: 'tx1', $class: 'sometx' }); const cb = sinon.stub(); return testConnector.getTransactionByID('tx1', { test: 'options' }, cb) .then(() => { @@ -2029,7 +2017,7 @@ describe('BusinessNetworkConnector', () => { it('should return a 404 error getting the specified transaction in the transaction registry', () => { mockBusinessNetworkConnection.getTransactionRegistry.resolves(mockTransactionRegistry); mockTransactionRegistry.get.withArgs('tx1').rejects(new Error('the thing does not exist')); - mockSerializer.toJSON.withArgs(mockTransaction1).returns({ transactionId: 'tx1', $class: 'sometx' }); + mockSerializer.toJSON.withArgs(transaction).returns({ transactionId: 'tx1', $class: 'sometx' }); const cb = sinon.stub(); return testConnector.getTransactionByID('tx1', { test: 'options' }, cb) .then(() => { diff --git a/packages/loopback-connector-composer/test/index.js b/packages/loopback-connector-composer/test/index.js index 65c569ecad..f0cbd51988 100644 --- a/packages/loopback-connector-composer/test/index.js +++ b/packages/loopback-connector-composer/test/index.js @@ -74,6 +74,7 @@ describe('loopback-connector-composer', () => { sinon.assert.calledOnce(connectorModule.createConnector); sinon.assert.calledWith(connectorModule.createConnector, dataSource.settings); sinon.assert.calledOnce(mockBusinessNetworkConnector.connect); + mockBusinessNetworkConnector.connecting = true; }); }); @@ -94,6 +95,7 @@ describe('loopback-connector-composer', () => { sinon.assert.calledOnce(connectorModule.createConnector); sinon.assert.calledWith(connectorModule.createConnector, {}); sinon.assert.calledOnce(mockBusinessNetworkConnector.connect); + mockBusinessNetworkConnector.connecting = true; }); }); @@ -102,6 +104,10 @@ describe('loopback-connector-composer', () => { settings : {} }; connectorModule.initialize(dataSource); + dataSource.connector.should.be.an.instanceOf(BusinessNetworkConnector); + sinon.assert.calledOnce(connectorModule.createConnector); + sinon.assert.calledWith(connectorModule.createConnector, {}); + mockBusinessNetworkConnector.connecting = false; }); }); }); diff --git a/packages/loopback-connector-composer/test/participants.js b/packages/loopback-connector-composer/test/participants.js new file mode 100644 index 0000000000..72d46bb54b --- /dev/null +++ b/packages/loopback-connector-composer/test/participants.js @@ -0,0 +1,633 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +const AdminConnection = require('composer-admin').AdminConnection; +const BrowserFS = require('browserfs/dist/node/index'); +const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection; +const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition; +const connector = require('..'); +const fs = require('fs'); +const loopback = require('loopback'); +const path = require('path'); +const Util = require('composer-common').Util; + +const chai = require('chai'); +const should = chai.should(); +chai.use(require('chai-as-promised')); + +const bfs_fs = BrowserFS.BFSRequire('fs'); + +['always', 'never'].forEach((namespaces) => { + + const prefix = namespaces === 'always' ? 'org_acme_bond_' : ''; + + const participantData = [{ + $class: 'org.acme.bond.Issuer', + memberId: 'MEMBER_1', + name: 'Alice' + }, { + $class: 'org.acme.bond.Issuer', + memberId: 'MEMBER_2', + name: 'Bob' + }, { + $class: 'org.acme.bond.Issuer', + memberId: 'MEMBER_3', + name: 'Charlie' + }, { + // $class: 'org.acme.bond.Issuer', + memberId: 'MEMBER_4', + name: 'Daria' + }]; + + describe(`Participant persisted model unit tests namespaces[${namespaces}]`, () => { + + let app; + let dataSource; + let businessNetworkConnection; + let participantRegistry; + let serializer; + + before(() => { + BrowserFS.initialize(new BrowserFS.FileSystem.InMemory()); + const adminConnection = new AdminConnection({ fs: bfs_fs }); + return adminConnection.createProfile('defaultProfile', { + type : 'embedded' + }) + .then(() => { + return adminConnection.connect('defaultProfile', 'admin', 'Xurw3yU9zI0l'); + }) + .then(() => { + const banana = fs.readFileSync(path.resolve(__dirname, 'bond-network.bna')); + return BusinessNetworkDefinition.fromArchive(banana); + }) + .then((businessNetworkDefinition) => { + serializer = businessNetworkDefinition.getSerializer(); + return adminConnection.deploy(businessNetworkDefinition); + }) + .then(() => { + app = loopback(); + const connectorSettings = { + name: 'composer', + connector: connector, + connectionProfileName: 'defaultProfile', + businessNetworkIdentifier: 'bond-network', + participantId: 'admin', + participantPwd: 'adminpw', + namespaces: namespaces, + fs: bfs_fs + }; + dataSource = app.loopback.createDataSource('composer', connectorSettings); + return new Promise((resolve, reject) => { + console.log('Discovering types from business network definition ...'); + dataSource.discoverModelDefinitions({}, (error, modelDefinitions) => { + if (error) { + return reject(error); + } + resolve(modelDefinitions); + }); + }); + }) + .then((modelDefinitions) => { + console.log('Discovered types from business network definition'); + console.log('Generating schemas for all types in business network definition ...'); + return modelDefinitions.reduce((promise, modelDefinition) => { + return promise.then((schemas) => { + return new Promise((resolve, reject) => { + dataSource.discoverSchemas(modelDefinition.name, { visited: {}, associations: true }, (error, modelSchema) => { + if (error) { + return reject(error); + } + schemas.push(modelSchema); + resolve(schemas); + }); + }); + }); + }, Promise.resolve([])); + }) + .then((modelSchemas) => { + console.log('Generated schemas for all types in business network definition'); + console.log('Adding schemas for all types to Loopback ...'); + modelSchemas.forEach((modelSchema) => { + let model = app.loopback.createModel(modelSchema); + app.model(model, { + dataSource: dataSource, + public: true + }); + }); + businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs }); + return businessNetworkConnection.connect('defaultProfile', 'bond-network', 'admin', 'Xurw3yU9zI0l'); + }) + .then(() => { + return businessNetworkConnection.getParticipantRegistry('org.acme.bond.Issuer'); + }) + .then((participantRegistry_) => { + participantRegistry = participantRegistry_; + return participantRegistry.addAll([ + serializer.fromJSON(participantData[0]), + serializer.fromJSON(participantData[1]) + ]); + }); + }); + + beforeEach(() => { + return Util.invokeChainCode(businessNetworkConnection.securityContext, 'resetBusinessNetwork', []) + .then(() => { + return businessNetworkConnection.getParticipantRegistry('org.acme.bond.Issuer'); + }) + .then((participantRegistry_) => { + participantRegistry = participantRegistry_; + return participantRegistry.addAll([ + serializer.fromJSON(participantData[0]), + serializer.fromJSON(participantData[1]) + ]); + }); + }); + + describe(`#count namespaces[${namespaces}]`, () => { + + it('should count all of the participants', () => { + return app.models[prefix + 'Issuer'].count() + .then((count) => { + count.should.equal(2); + }); + }); + + it('should count an existing participant using the participant ID', () => { + return app.models[prefix + 'Issuer'].count({ memberId: 'MEMBER_1' }) + .then((count) => { + count.should.equal(1); + }); + }); + + it('should count an non-existing participant using the participant ID', () => { + return app.models[prefix + 'Issuer'].count({ memberId: 'MEMBER_999' }) + .then((count) => { + count.should.equal(0); + }); + }); + + }); + + describe(`#create namespaces[${namespaces}]`, () => { + + it('should create the specified participant', () => { + return app.models[prefix + 'Issuer'].create(participantData[2]) + .then(() => { + return participantRegistry.get('MEMBER_3'); + }) + .then((participant) => { + let json = serializer.toJSON(participant); + json.should.deep.equal(participantData[2]); + }); + }); + + it('should create the specified participant without a $class property', () => { + return app.models[prefix + 'Issuer'].create(participantData[3]) + .then(() => { + return participantRegistry.get('MEMBER_4'); + }) + .then((participant) => { + let json = serializer.toJSON(participant); + delete json.$class; + json.should.deep.equal(participantData[3]); + }); + }); + + it('should return an error if the specified participant already exists', () => { + return app.models[prefix + 'Issuer'].create(participantData[0]) + .should.be.rejected; + }); + + it('should create the specified array of participants', () => { + return new Promise((resolve, reject) => { + return app.models[prefix + 'Issuer'].create([ participantData[2], participantData[3] ], (err) => { + if (err) { + return reject(err); + } + resolve(); + }); + }) + .then(() => { + return participantRegistry.get('MEMBER_3'); + }) + .then((participant) => { + let json = serializer.toJSON(participant); + json.should.deep.equal(participantData[2]); + }) + .then(() => { + return participantRegistry.get('MEMBER_4'); + }) + .then((participant) => { + let json = serializer.toJSON(participant); + delete json.$class; + json.should.deep.equal(participantData[3]); + }); + }); + + }); + + describe(`#destroyAll namespaces[${namespaces}]`, () => { + + it('should throw without a where clause as it is unsupported', () => { + return app.models[prefix + 'Issuer'].destroyAll() + .should.be.rejectedWith(/is not supported/); + + }); + + it('should remove a single specified participant', () => { + return app.models[prefix + 'Issuer'].destroyAll({ memberId: 'MEMBER_1' }) + .then(() => { + return participantRegistry.exists('MEMBER_1'); + }) + .then((exists) => { + exists.should.be.false; + }); + }); + + it('should return an error if the specified participant does not exist', () => { + return app.models[prefix + 'Issuer'].destroyAll({ memberId: 'MEMBER_999' }) + .should.be.rejected; + }); + + }); + + describe(`#destroyById namespaces[${namespaces}]`, () => { + + it('should delete the specified participant', () => { + return app.models[prefix + 'Issuer'].destroyById('MEMBER_1') + .then(() => { + return participantRegistry.exists('MEMBER_1'); + }) + .then((exists) => { + exists.should.be.false; + }); + }); + + it('should return an error if the specified participant does not exist', () => { + return app.models[prefix + 'Issuer'].destroyById('MEMBER_999') + .should.be.rejected; + }); + + }); + + describe(`#exists namespaces[${namespaces}]`, () => { + + it('should check the existence of an existing participant using the participant ID', () => { + return app.models[prefix + 'Issuer'].exists('MEMBER_1') + .then((exists) => { + exists.should.be.true; + }); + }); + + it('should check the existence of an non-existing participant using the participant ID', () => { + return app.models[prefix + 'Issuer'].exists('MEMBER_999') + .then((exists) => { + exists.should.be.false; + }); + }); + + }); + + describe(`#find namespaces[${namespaces}]`, () => { + + it('should find all existing participants', () => { + return app.models[prefix + 'Issuer'].find() + .then((participants) => { + JSON.parse(JSON.stringify(participants)).should.deep.equal([participantData[0], participantData[1]]); + }); + }); + + it('should find an existing participant using the participant ID', () => { + return app.models[prefix + 'Issuer'].find({ where: { memberId: 'MEMBER_1' } }) + .then((participants) => { + JSON.parse(JSON.stringify(participants)).should.deep.equal([participantData[0]]); + }); + }); + + }); + + describe(`#findById namespaces[${namespaces}]`, () => { + + it('should find an existing participant using the participant ID', () => { + return app.models[prefix + 'Issuer'].findById('MEMBER_1') + .then((participant) => { + JSON.parse(JSON.stringify(participant)).should.deep.equal(participantData[0]); + }); + }); + + it('should not find an non-existing participant using the participant ID', () => { + return app.models[prefix + 'Issuer'].findById('MEMBER_999') + .then((participant) => { + should.equal(participant, null); + }); + }); + + }); + + describe(`#findOne namespaces[${namespaces}]`, () => { + + it('should find the first of all existing participants', () => { + return app.models[prefix + 'Issuer'].findOne() + .then((participant) => { + JSON.parse(JSON.stringify(participant)).should.deep.equal(participantData[0]); + }); + }); + + it('should find an existing participant using the participant ID', () => { + return app.models[prefix + 'Issuer'].findOne({ where: { memberId: 'MEMBER_1' } }) + .then((participant) => { + JSON.parse(JSON.stringify(participant)).should.deep.equal(participantData[0]); + }); + }); + + }); + + describe(`#findOrCreate namespaces[${namespaces}]`, () => { + + it('should find an existing participant using the input participant', () => { + return app.models[prefix + 'Issuer'].findOrCreate(participantData[0]) + .then((parts) => { + const participant = parts[0]; + const created = parts[1]; + JSON.parse(JSON.stringify(participant)).should.deep.equal(participantData[0]); + created.should.be.false; + }); + }); + + it('should find an existing participant using a where clause', () => { + return app.models[prefix + 'Issuer'].findOrCreate({ where: { memberId: 'MEMBER_1' } }, participantData[0]) + .then((parts) => { + const participant = parts[0]; + const created = parts[1]; + JSON.parse(JSON.stringify(participant)).should.deep.equal(participantData[0]); + created.should.be.false; + }); + }); + + it('should not find and create the specified participant using the input participant', () => { + return app.models[prefix + 'Issuer'].findOrCreate(participantData[2]) + .then(() => { + return participantRegistry.get('MEMBER_3'); + }) + .then((participant) => { + let json = serializer.toJSON(participant); + json.should.deep.equal(participantData[2]); + }); + }); + + it('should not find and create the specified participant using a where clause', () => { + return app.models[prefix + 'Issuer'].findOrCreate({ where: { memberId: 'MEMBER_3' } }, participantData[2]) + .then(() => { + return participantRegistry.get('MEMBER_3'); + }) + .then((participant) => { + let json = serializer.toJSON(participant); + json.should.deep.equal(participantData[2]); + }); + }); + + }); + + describe(`#replaceById namespaces[${namespaces}]`, () => { + + const updatedParticipant = { + $class: 'org.acme.bond.Issuer', + memberId: 'MEMBER_1', + name: 'Alexa' + }; + + it('should update the specified participant', () => { + return app.models[prefix + 'Issuer'].replaceById('MEMBER_1', updatedParticipant) + .then(() => { + return participantRegistry.get('MEMBER_1'); + }) + .then((participant) => { + participant.name.should.equal('Alexa'); + }); + }); + + it('should return an error if the specified participant does not exist', () => { + return app.models[prefix + 'Issuer'].replaceById('MEMBER_999', updatedParticipant) + .should.be.rejected; + }); + + }); + + describe(`#replaceOrCreate namespaces[${namespaces}]`, () => { + + const updatedParticipant = { + $class: 'org.acme.bond.Issuer', + memberId: 'MEMBER_1', + name: 'Alexa' + }; + + it('should update the specified participant', () => { + return app.models[prefix + 'Issuer'].replaceOrCreate(updatedParticipant) + .then(() => { + return participantRegistry.get('MEMBER_1'); + }) + .then((participant) => { + participant.name.should.equal('Alexa'); + }); + }); + + it('should create a new participant if the specified participant does not exist', () => { + return app.models[prefix + 'Issuer'].replaceOrCreate(participantData[2]) + .then(() => { + return participantRegistry.get('MEMBER_3'); + }) + .then((participant) => { + let json = serializer.toJSON(participant); + json.should.deep.equal(participantData[2]); + }); + }); + + }); + + describe(`#updateAll namespaces[${namespaces}]`, () => { + + const updatedParticipant = { + $class: 'org.acme.bond.Issuer', + memberId: 'MEMBER_1', + name: 'Alexa' + }; + + it('should throw without a where clause as it is unsupported', () => { + return app.models[prefix + 'Issuer'].updateAll(updatedParticipant) + .should.be.rejectedWith(/is not supported/); + + }); + + it('should remove a single specified participant', () => { + return app.models[prefix + 'Issuer'].updateAll({ memberId: 'MEMBER_1' }, updatedParticipant) + .then(() => { + return participantRegistry.get('MEMBER_1'); + }) + .then((participant) => { + participant.name.should.equal('Alexa'); + }); + }); + + it('should return an error if the specified participant does not exist', () => { + return app.models[prefix + 'Issuer'].updateAll({ memberId: 'MEMBER_999' }, updatedParticipant) + .should.be.rejected; + }); + + }); + + describe(`#upsert namespaces[${namespaces}]`, () => { + + const updatedParticipant = { + $class: 'org.acme.bond.Issuer', + memberId: 'MEMBER_1', + name: 'Alexa' + }; + + it('should update the specified participant', () => { + return app.models[prefix + 'Issuer'].upsert(updatedParticipant) + .then(() => { + return participantRegistry.get('MEMBER_1'); + }) + .then((participant) => { + participant.name.should.equal('Alexa'); + }); + }); + + it('should create a new participant if the specified participant does not exist', () => { + return app.models[prefix + 'Issuer'].upsert(participantData[2]) + .then(() => { + return participantRegistry.get('MEMBER_3'); + }) + .then((participant) => { + let json = serializer.toJSON(participant); + json.should.deep.equal(participantData[2]); + }); + }); + + }); + + describe(`#upsertWithWhere namespaces[${namespaces}]`, () => { + + const updatedParticipant = { + $class: 'org.acme.bond.Issuer', + memberId: 'MEMBER_1', + name: 'Alexa' + }; + + it('should throw without a where clause as it is unsupported', () => { + return app.models[prefix + 'Issuer'].upsertWithWhere({}, updatedParticipant) + .should.be.rejectedWith(/is not supported/); + + }); + + it('should update the specified participant', () => { + return app.models[prefix + 'Issuer'].upsertWithWhere({ memberId: 'MEMBER_1' }, updatedParticipant) + .then(() => { + return participantRegistry.get('MEMBER_1'); + }) + .then((participant) => { + participant.name.should.equal('Alexa'); + }); + }); + + it('should create a new participant if the specified participant does not exist', () => { + return app.models[prefix + 'Issuer'].upsertWithWhere({ memberId: 'MEMBER_3' }, participantData[2]) + .then(() => { + return participantRegistry.get('MEMBER_3'); + }) + .then((participant) => { + let json = serializer.toJSON(participant); + json.should.deep.equal(participantData[2]); + }); + }); + + }); + + describe(`#destroy namespaces[${namespaces}]`, () => { + + it('should delete the specified participant', () => { + return app.models[prefix + 'Issuer'].findById('MEMBER_1') + .then((participant) => { + return participant.destroy(); + }) + .then(() => { + return participantRegistry.exists('MEMBER_1'); + }) + .then((exists) => { + exists.should.be.false; + }); + }); + + }); + + describe(`#replaceAttributes namespaces[${namespaces}]`, () => { + + it('should replace attributes in the specified participant', () => { + return app.models[prefix + 'Issuer'].findById('MEMBER_1') + .then((participant) => { + return participant.replaceAttributes({ + name: 'Alexa' + }); + }) + .then(() => { + return participantRegistry.get('MEMBER_1'); + }) + .then((participant) => { + participant.name.should.equal('Alexa'); + }); + }); + + }); + + describe(`#updateAttribute namespaces[${namespaces}]`, () => { + + it('should replace attribute in the specified participant', () => { + return app.models[prefix + 'Issuer'].findById('MEMBER_1') + .then((participant) => { + return participant.updateAttribute('name', 'Alexa'); + }) + .then(() => { + return participantRegistry.get('MEMBER_1'); + }) + .then((participant) => { + participant.name.should.equal('Alexa'); + }); + }); + + }); + + describe(`#updateAttributes namespaces[${namespaces}]`, () => { + + it('should replace attributes in the specified participant', () => { + return app.models[prefix + 'Issuer'].findById('MEMBER_1') + .then((participant) => { + return participant.updateAttributes({ + name: 'Alexa' + }); + }) + .then(() => { + return participantRegistry.get('MEMBER_1'); + }) + .then((participant) => { + participant.name.should.equal('Alexa'); + }); + }); + + }); + + }); + +}); From c5fdad2d8350b6dd81f1609631beb1cd966fcd2e Mon Sep 17 00:00:00 2001 From: Liam Grace <14gracel@users.noreply.github.com> Date: Fri, 7 Jul 2017 10:12:24 +0100 Subject: [PATCH 09/88] composer-common/lib/introspect unit tests (#1507) * Added assetdeclaration unit test * composer-common/lib/introspect unit tests --- .../lib/introspect/relationshipdeclaration.js | 3 - .../parser/assetdeclaration.systypename.cto | 5 + .../classdeclaration.isrelationshiptarget.cto | 3 + .../parser/classdeclaration.noidentifier.cto | 4 + ...claration.participantwithparents.child.cto | 6 +- .../parser/eventdeclaration.systypename.cto | 5 + .../participantdeclaration.systypename.cto | 5 + .../parser/participantdeclaration.valid.cto | 5 + .../relationshipdeclaration.missingtype.cto | 6 ++ .../test/introspect/assetdeclaration.js | 11 +++ .../test/introspect/basemodelexception.js | 5 + .../test/introspect/classdeclaration.js | 48 +++++++++ .../test/introspect/eventdeclaration.js | 43 ++++++++ .../test/introspect/modelfile.js | 35 +++++++ .../test/introspect/numbervalidator.js | 12 +++ .../test/introspect/participantdeclaration.js | 97 +++++++++++++++++++ .../introspect/relationshipdeclaration.js | 58 ++++++++++- .../test/introspect/transactiondeclaration.js | 65 +++++++++++++ 18 files changed, 408 insertions(+), 8 deletions(-) create mode 100644 packages/composer-common/test/data/parser/assetdeclaration.systypename.cto create mode 100644 packages/composer-common/test/data/parser/classdeclaration.isrelationshiptarget.cto create mode 100644 packages/composer-common/test/data/parser/classdeclaration.noidentifier.cto create mode 100644 packages/composer-common/test/data/parser/eventdeclaration.systypename.cto create mode 100644 packages/composer-common/test/data/parser/participantdeclaration.systypename.cto create mode 100644 packages/composer-common/test/data/parser/participantdeclaration.valid.cto create mode 100644 packages/composer-common/test/data/parser/relationshipdeclaration.missingtype.cto create mode 100644 packages/composer-common/test/introspect/participantdeclaration.js create mode 100644 packages/composer-common/test/introspect/transactiondeclaration.js diff --git a/packages/composer-common/lib/introspect/relationshipdeclaration.js b/packages/composer-common/lib/introspect/relationshipdeclaration.js index da092b8743..eeeac24e60 100644 --- a/packages/composer-common/lib/introspect/relationshipdeclaration.js +++ b/packages/composer-common/lib/introspect/relationshipdeclaration.js @@ -77,11 +77,8 @@ class RelationshipDeclaration extends Property { throw new IllegalModelException('Relationship ' + this.getName() + ' points to a missing type ' + this.getFullyQualifiedTypeName(), classDecl.getModelFile(), this.ast.location); } - if ((namespace === ModelUtil.getSystemNamespace()) && classDecl.isEvent()) { // Transaction relationship in event, continue - } else if((namespace === ModelUtil.getSystemNamespace()) && classDeclaration.isSystemRelationshipTarget() === false) { - throw new IllegalModelException('Relationship ' + this.getName() + ' must be to an asset, participant or transaction, but is to ' + this.getFullyQualifiedTypeName(), classDecl.getModelFile(), this.ast.location); } else if(classDeclaration.isRelationshipTarget() === false) { throw new IllegalModelException('Relationship ' + this.getName() + ' must be to an asset or participant, but is to ' + this.getFullyQualifiedTypeName(), classDecl.getModelFile(), this.ast.location); } diff --git a/packages/composer-common/test/data/parser/assetdeclaration.systypename.cto b/packages/composer-common/test/data/parser/assetdeclaration.systypename.cto new file mode 100644 index 0000000000..e84793b08b --- /dev/null +++ b/packages/composer-common/test/data/parser/assetdeclaration.systypename.cto @@ -0,0 +1,5 @@ +namespace com.testing + +asset Asset identified by id { + o String id +} \ No newline at end of file diff --git a/packages/composer-common/test/data/parser/classdeclaration.isrelationshiptarget.cto b/packages/composer-common/test/data/parser/classdeclaration.isrelationshiptarget.cto new file mode 100644 index 0000000000..13f26ac52b --- /dev/null +++ b/packages/composer-common/test/data/parser/classdeclaration.isrelationshiptarget.cto @@ -0,0 +1,3 @@ +namespace com.testing +concept Test { +} \ No newline at end of file diff --git a/packages/composer-common/test/data/parser/classdeclaration.noidentifier.cto b/packages/composer-common/test/data/parser/classdeclaration.noidentifier.cto new file mode 100644 index 0000000000..15f988d565 --- /dev/null +++ b/packages/composer-common/test/data/parser/classdeclaration.noidentifier.cto @@ -0,0 +1,4 @@ +namespace com.testing + +transaction Transaction { +} \ No newline at end of file diff --git a/packages/composer-common/test/data/parser/classdeclaration.participantwithparents.child.cto b/packages/composer-common/test/data/parser/classdeclaration.participantwithparents.child.cto index 2559bb7579..dd533027ce 100644 --- a/packages/composer-common/test/data/parser/classdeclaration.participantwithparents.child.cto +++ b/packages/composer-common/test/data/parser/classdeclaration.participantwithparents.child.cto @@ -4,4 +4,8 @@ import com.testing.parent.Super participant Sub extends Super { } -participant Sub2 extends Super { } \ No newline at end of file +participant Sub2 extends Super { } + +concept Test { + +} \ No newline at end of file diff --git a/packages/composer-common/test/data/parser/eventdeclaration.systypename.cto b/packages/composer-common/test/data/parser/eventdeclaration.systypename.cto new file mode 100644 index 0000000000..0bf429402c --- /dev/null +++ b/packages/composer-common/test/data/parser/eventdeclaration.systypename.cto @@ -0,0 +1,5 @@ +namespace com.testing + +event Event identified by eventId{ + o String eventId +} \ No newline at end of file diff --git a/packages/composer-common/test/data/parser/participantdeclaration.systypename.cto b/packages/composer-common/test/data/parser/participantdeclaration.systypename.cto new file mode 100644 index 0000000000..a02505dd5d --- /dev/null +++ b/packages/composer-common/test/data/parser/participantdeclaration.systypename.cto @@ -0,0 +1,5 @@ +namespace com.testing + +participant Participant identified by participantId { + o String participantId +} \ No newline at end of file diff --git a/packages/composer-common/test/data/parser/participantdeclaration.valid.cto b/packages/composer-common/test/data/parser/participantdeclaration.valid.cto new file mode 100644 index 0000000000..08e43751e0 --- /dev/null +++ b/packages/composer-common/test/data/parser/participantdeclaration.valid.cto @@ -0,0 +1,5 @@ +namespace com.testing + +participant P identified by pId { + o String pId +} \ No newline at end of file diff --git a/packages/composer-common/test/data/parser/relationshipdeclaration.missingtype.cto b/packages/composer-common/test/data/parser/relationshipdeclaration.missingtype.cto new file mode 100644 index 0000000000..9f59b4937f --- /dev/null +++ b/packages/composer-common/test/data/parser/relationshipdeclaration.missingtype.cto @@ -0,0 +1,6 @@ +namespace com.testing + +asset A identified by AId { + o String AId + --> Testing test +} \ No newline at end of file diff --git a/packages/composer-common/test/introspect/assetdeclaration.js b/packages/composer-common/test/introspect/assetdeclaration.js index 92c0c961bc..1fe5cb41cc 100644 --- a/packages/composer-common/test/introspect/assetdeclaration.js +++ b/packages/composer-common/test/introspect/assetdeclaration.js @@ -14,6 +14,7 @@ 'use strict'; +const IllegalModelException = require('../../lib/introspect/illegalmodelexception'); const AssetDeclaration = require('../../lib/introspect/assetdeclaration'); const ClassDeclaration = require('../../lib/introspect/classdeclaration'); const ModelFile = require('../../lib/introspect/modelfile'); @@ -129,6 +130,16 @@ describe('AssetDeclaration', () => { asset.validate(); }).should.throw(/more than one field named/); }); + + it('should throw an an IllegalModelException if its not a System Type and is called Asset', () => { + let asset = loadLastAssetDeclaration('test/data/parser/assetdeclaration.systypename.cto'); + try { + asset.validate(); + } catch (err) { + err.should.be.an.instanceOf(IllegalModelException); + err.message.should.match(/Asset is a reserved type name./); + } + }); }); describe('#getSuperType', () => { diff --git a/packages/composer-common/test/introspect/basemodelexception.js b/packages/composer-common/test/introspect/basemodelexception.js index a58db2a41a..d2269686e9 100644 --- a/packages/composer-common/test/introspect/basemodelexception.js +++ b/packages/composer-common/test/introspect/basemodelexception.js @@ -43,6 +43,11 @@ describe('BaseModelException', function () { exc.stack.should.be.a('string'); }); + it('should use messahe over fulMessage', () => { + let exc = new BaseModelException('message', {start: 1, end: 2}); + exc.message.should.equal('message'); + }); + it('should handle a lack of support for stack traces', function () { let captureStackTrace = Error.captureStackTrace; Error.captureStackTrace = null; diff --git a/packages/composer-common/test/introspect/classdeclaration.js b/packages/composer-common/test/introspect/classdeclaration.js index 3602620920..69e2f102a3 100644 --- a/packages/composer-common/test/introspect/classdeclaration.js +++ b/packages/composer-common/test/introspect/classdeclaration.js @@ -14,6 +14,7 @@ 'use strict'; +const IllegalModelException = require('../../lib/introspect/illegalmodelexception'); const ClassDeclaration = require('../../lib/introspect/classdeclaration'); const AssetDeclaration = require('../../lib/introspect/assetdeclaration'); const EnumDeclaration = require('../../lib/introspect/enumdeclaration'); @@ -139,6 +140,17 @@ describe('ClassDeclaration', () => { }).should.throw(/Duplicate class/); }); + it('should throw when not abstract, not enum and not concept without an identifier', () => { + let asset = loadLastDeclaration('test/data/parser/classdeclaration.noidentifier.cto', TransactionDeclaration); + asset.superType = null; + try { + asset.validate(); + } catch (err) { + err.should.be.an.instanceOf(IllegalModelException); + should.exist(err.message); + err.message.should.match(/Class Transaction is not declared as abstract. It must define an identifying field./); + } + }); }); describe('#accept', () => { @@ -309,4 +321,40 @@ describe('ClassDeclaration', () => { }); }); + describe('#isEvent', () => { + const modelFileNames = [ + 'test/data/parser/classdeclaration.participantwithparents.parent.cto', + 'test/data/parser/classdeclaration.participantwithparents.child.cto' + ]; + let modelManager; + + beforeEach(() => { + modelManager = new ModelManager(); + const modelFiles = loadModelFiles(modelFileNames, modelManager); + modelManager.addModelFiles(modelFiles); + }); + it('should return false', () => { + const testClass = modelManager.getType('com.testing.child.Sub'); + testClass.isEvent().should.be.false; + + }); + }); + + describe('#isRelationshipTarget', () => { + const modelFileNames = [ + 'test/data/parser/classdeclaration.isrelationshiptarget.cto', + ]; + let modelManager; + + beforeEach(() => { + modelManager = new ModelManager(); + const modelFiles = loadModelFiles(modelFileNames, modelManager); + modelManager.addModelFiles(modelFiles); + }); + it('should return false', () => { + const testClass = modelManager.getType('com.testing.Test'); + testClass.isRelationshipTarget().should.be.false; + + }); + }); }); diff --git a/packages/composer-common/test/introspect/eventdeclaration.js b/packages/composer-common/test/introspect/eventdeclaration.js index 0509e0c22f..eb555aa9ee 100644 --- a/packages/composer-common/test/introspect/eventdeclaration.js +++ b/packages/composer-common/test/introspect/eventdeclaration.js @@ -24,10 +24,44 @@ const sinon = require('sinon'); describe('EventDeclaration', () => { + let mockModelManager; + let mockSystemEvent; + + /** + * Load an arbitrary number of model files. + * @param {String[]} modelFileNames array of model file names. + * @param {ModelManager} modelManager the model manager to which the created model files will be registered. + * @return {ModelFile[]} array of loaded model files, matching the supplied arguments. + */ + const loadModelFiles = (modelFileNames, modelManager) => { + const modelFiles = []; + for (let modelFileName of modelFileNames) { + const modelDefinitions = fs.readFileSync(modelFileName, 'utf8'); + const modelFile = new ModelFile(modelManager, modelDefinitions); + modelFiles.push(modelFile); + } + modelManager.addModelFiles(modelFiles, modelFileNames); + return modelFiles; + }; + + const loadModelFile = (modelFileName) => { + return loadModelFiles([modelFileName], mockModelManager)[0]; + }; + + const loadLastDeclaration = (modelFileName, type) => { + const modelFile = loadModelFile(modelFileName); + const declarations = modelFile.getDeclarations(type); + return declarations[declarations.length - 1]; + }; + let sandbox; beforeEach(() => { sandbox = sinon.sandbox.create(); + mockModelManager = sinon.createStubInstance(ModelManager); + mockSystemEvent = sinon.createStubInstance(EventDeclaration); + mockSystemEvent.getFullyQualifiedName.returns('org.hyperledger.composer.system.Event'); + mockModelManager.getSystemTypes.returns([mockSystemEvent]); }); afterEach(() => { @@ -50,6 +84,15 @@ describe('EventDeclaration', () => { }); }); + describe('#validate', () => { + it('should throw if event is not a system type but named event', () => { + let event = loadLastDeclaration('test/data/parser/eventdeclaration.systypename.cto', EventDeclaration); + event.superType = null; + (() => { + event.validate(); + }).should.throw(/Event is a reserved type name./); + }); + }); describe('#parse', () => { diff --git a/packages/composer-common/test/introspect/modelfile.js b/packages/composer-common/test/introspect/modelfile.js index 3a47a76496..e19d538aed 100644 --- a/packages/composer-common/test/introspect/modelfile.js +++ b/packages/composer-common/test/introspect/modelfile.js @@ -466,6 +466,17 @@ describe('ModelFile', () => { mf.getType('String').should.equal('String'); }); + it('should return false if imported, non primative\'s modelFile doesn\'t exist', () => { + const ast = { + namespace: 'org.acme', + body: [ ] + }; + sandbox.stub(parser, 'parse').returns(ast); + let mf = new ModelFile(mockModelManager, 'fake'); + mf.isImportedType = () => { return true; }; + mf.resolveImport = () => { return 'org.acme'; }; + should.not.exist(mf.getType('TNTAsset')); + }); }); describe('#getAssetDeclaration', () => { @@ -542,4 +553,28 @@ describe('ModelFile', () => { }); + describe('#getFullyQualifiedTypeName', () => { + it('should return null if not prmative, imported or local type', () => { + const ast = { + namespace: 'org.acme', + body: [ ] + }; + sandbox.stub(parser, 'parse').returns(ast); + let mf = new ModelFile(mockModelManager, 'fake'); + mf.isImportedType = () => { return false; }; + mf.isLocalType = () => { return false; }; + should.not.exist(mf.getFullyQualifiedTypeName('TNTAsset')); + }); + + it('should return the type name if its a primative type', () => { + const ast = { + namespace: 'org.acme', + body: [ ] + }; + sandbox.stub(parser, 'parse').returns(ast); + let modelFile = new ModelFile(mockModelManager, 'something'); + + modelFile.getFullyQualifiedTypeName('String').should.equal('String'); + }); + }); }); diff --git a/packages/composer-common/test/introspect/numbervalidator.js b/packages/composer-common/test/introspect/numbervalidator.js index 8f00224895..4fd1425372 100644 --- a/packages/composer-common/test/introspect/numbervalidator.js +++ b/packages/composer-common/test/introspect/numbervalidator.js @@ -114,5 +114,17 @@ describe('NumberValidator', () => { v.validate('id', 101); }).should.throw(/org.acme.myField: Value is outside upper bound 101/); }); + + it('should do nothing if no value is given', () => { + let v = new NumberValidator(mockField, VALID_UPPER_AND_LOWER_BOUND_AST); + v.validate(); + }); + }); + + describe('#toString', () => { + it('should return the correct string', () => { + let v = new NumberValidator(mockField, VALID_UPPER_AND_LOWER_BOUND_AST); + v.toString().should.equal(`NumberValidator lower: ${VALID_UPPER_AND_LOWER_BOUND_AST.lower} upper: ${VALID_UPPER_AND_LOWER_BOUND_AST.upper}`); + }); }); }); diff --git a/packages/composer-common/test/introspect/participantdeclaration.js b/packages/composer-common/test/introspect/participantdeclaration.js new file mode 100644 index 0000000000..158a040626 --- /dev/null +++ b/packages/composer-common/test/introspect/participantdeclaration.js @@ -0,0 +1,97 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +const ParticipantDeclaration = require('../../lib/introspect/participantdeclaration'); +const ClassDeclaration = require('../../lib/introspect/classdeclaration'); +const ModelFile = require('../../lib/introspect/modelfile'); +const ModelManager = require('../../lib/modelmanager'); +const fs = require('fs'); + +require('chai').should(); +const sinon = require('sinon'); + +describe('ParticipantDeclaration', () => { + + let mockModelManager; + let mockClassDeclaration; + let mockSystemParticipant; + let sandbox; + + beforeEach(() => { + sandbox = sinon.sandbox.create(); + mockModelManager = sinon.createStubInstance(ModelManager); + mockSystemParticipant = sinon.createStubInstance(ParticipantDeclaration); + mockSystemParticipant.getFullyQualifiedName.returns('org.hyperledger.composer.system.Participant'); + mockModelManager.getSystemTypes.returns([mockSystemParticipant]); + mockClassDeclaration = sinon.createStubInstance(ClassDeclaration); + mockModelManager.getType.returns(mockClassDeclaration); + mockClassDeclaration.getProperties.returns([]); + }); + + afterEach(() => { + sandbox.restore(); + }); + + let loadParticipantDeclaration = (modelFileName) => { + let modelDefinitions = fs.readFileSync(modelFileName, 'utf8'); + let modelFile = new ModelFile(mockModelManager, modelDefinitions); + let assets = modelFile.getParticipantDeclarations(); + assets.should.have.lengthOf(1); + + return assets[0]; + }; + + describe('#constructor', () => { + + it('should throw if modelFile not specified', () => { + (() => { + new ParticipantDeclaration(null, {}); + }).should.throw(/required/); + }); + + it('should throw if ast not specified', () => { + let mockModelFile = sinon.createStubInstance(ModelFile); + (() => { + new ParticipantDeclaration(mockModelFile, null); + }).should.throw(/required/); + }); + + }); + + describe('#isRelationshipTarget', () => { + it('should return true', () => { + let p = loadParticipantDeclaration('test/data/parser/participantdeclaration.valid.cto'); + p.isRelationshipTarget().should.be.true; + }); + }); + + describe('#getSystemType', () => { + it('should return Participant', () => { + let p = loadParticipantDeclaration('test/data/parser/participantdeclaration.valid.cto'); + p.getSystemType().should.equal('Participant'); + }); + }); + + describe('#validate', () => { + it('should throw error if system type and name Participant', () => { + let p = loadParticipantDeclaration('test/data/parser/participantdeclaration.systypename.cto'); + (() => { + p.validate(); + }).should.throw(/Participant is a reserved type name./); + }); + }); + +}); diff --git a/packages/composer-common/test/introspect/relationshipdeclaration.js b/packages/composer-common/test/introspect/relationshipdeclaration.js index df4c490cec..4c7e5b9ecd 100644 --- a/packages/composer-common/test/introspect/relationshipdeclaration.js +++ b/packages/composer-common/test/introspect/relationshipdeclaration.js @@ -16,6 +16,7 @@ const ModelManager = require('../../lib/modelmanager'); const sinon = require('sinon'); +const ClassDeclaration = require('../../lib/introspect/classdeclaration'); const RelationshipDeclaration = require('../../lib/introspect/relationshipdeclaration'); // const ModelUtil = require('../../lib/modelutil'); @@ -26,6 +27,7 @@ chai.use(require('chai-things')); describe('RelationshipDeclaration', function () { let modelManager; + let mockClassDeclaration; const levelOneModel = `namespace org.acme.l1 participant Person identified by ssn { @@ -38,11 +40,11 @@ describe('RelationshipDeclaration', function () { `; - before(function () { + beforeEach(function () { modelManager = new ModelManager(); - }); + mockClassDeclaration = sinon.createStubInstance(ClassDeclaration); + mockClassDeclaration.getModelFile.returns(mockClassDeclaration); - beforeEach(function () { }); afterEach(function () { @@ -60,11 +62,59 @@ describe('RelationshipDeclaration', function () { (function () { field.validate(vehicleDeclaration); }).should.throw(/Relationship must have a type/); + }); + it('should throw if relationship points to a missing type', () => { + const model = ` + namespace org.acme.l1 + participant Person identified by ssn { + o String ssn + } + `; + const model2 = ` + namespace org.acme.l2 + import org.acme.l1.* + + asset Car identified by vin { + o String vin + -->Person owner + } + `; + + modelManager.addModelFile(model); + modelManager.addModelFile(model2); + const vehicleDeclaration = modelManager.getType('org.acme.l2.Car'); + const field = vehicleDeclaration.getProperty('owner'); + (field instanceof RelationshipDeclaration).should.be.true; + modelManager.getType = () => { return null; }; + (function () { + field.validate(vehicleDeclaration); + }).should.throw(/Relationship owner points to a missing type org.acme.l1./); }); + it('should throw if relationship is not a relationship target', () => { + const model = ` + namespace org.acme.l1 + participant Person identified by ssn { + o String ssn + } + + asset Car identified by vin { + o String vin + -->Person owner + } + `; + modelManager.addModelFile(model); + const vehicleDeclaration = modelManager.getType('org.acme.l1.Car'); + const field = vehicleDeclaration.getProperty('owner'); + (field instanceof RelationshipDeclaration).should.be.true; + mockClassDeclaration.isRelationshipTarget.returns(false); + field.getParent().getModelFile().getType = () => {return mockClassDeclaration;}; - + (function () { + field.validate(vehicleDeclaration); + }).should.throw(/Relationship owner must be to an asset or participant/); + }); }); }); diff --git a/packages/composer-common/test/introspect/transactiondeclaration.js b/packages/composer-common/test/introspect/transactiondeclaration.js new file mode 100644 index 0000000000..e384e121f5 --- /dev/null +++ b/packages/composer-common/test/introspect/transactiondeclaration.js @@ -0,0 +1,65 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +const TransactionDeclaration = require('../../lib/introspect/transactiondeclaration'); +const ClassDeclaration = require('../../lib/introspect/classdeclaration'); +const ModelFile = require('../../lib/introspect/modelfile'); +const ModelManager = require('../../lib/modelmanager'); + +require('chai').should(); +const sinon = require('sinon'); + +describe('TransactionDeclaration', () => { + + let mockModelManager; + let mockSystemTransaction; + let mockClassDeclaration; + let sandbox; + + beforeEach(() => { + sandbox = sinon.sandbox.create(); + mockModelManager = sinon.createStubInstance(ModelManager); + mockSystemTransaction = sinon.createStubInstance(TransactionDeclaration); + mockSystemTransaction.getFullyQualifiedName.returns('org.hyperledger.composer.system.Transaction'); + mockModelManager.getSystemTypes.returns([mockSystemTransaction]); + mockClassDeclaration = sinon.createStubInstance(ClassDeclaration); + mockModelManager.getType.returns(mockClassDeclaration); + mockClassDeclaration.getProperties.returns([]); + }); + + afterEach(() => { + sandbox.restore(); + }); + + describe('#validate', () => { + it('should throw error name is Transaction', () => { + const model = ` + namespace com.test + + transaction Transaction identified by transactionId { + o String transactionId + }`; + + const modelFile = new ModelFile(mockModelManager, model); + const p = modelFile.getTransactionDeclarations()[0]; + + (() => { + p.validate(); + }).should.throw(/Transaction is a reserved type name./); + }); + }); + +}); From a57392815c0c1cc218e53e75564e70dfd333ad2a Mon Sep 17 00:00:00 2001 From: Liam Grace <14gracel@users.noreply.github.com> Date: Fri, 7 Jul 2017 13:47:08 +0100 Subject: [PATCH 10/88] Event validation (#1508) * fix event bug * Fixed problem where invalid events are emitted --- packages/composer-common/lib/serializer.js | 9 ++++++--- .../lib/serializer/resourcevalidator.js | 19 ++++++++++++++++++- .../basic-sample-network/models/sample.cto | 1 + .../composer-cucumber-steps/lib/composer.js | 1 - 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/packages/composer-common/lib/serializer.js b/packages/composer-common/lib/serializer.js index 918aea9177..0de7e22ff5 100644 --- a/packages/composer-common/lib/serializer.js +++ b/packages/composer-common/lib/serializer.js @@ -82,9 +82,12 @@ class Serializer { const classDeclaration = this.modelManager.getType( resource.getFullyQualifiedType() ); // validate the resource against the model - options = options || { validate: true }; - if(options.validate === true) { - const validator = new ResourceValidator(); + options = options || {}; + if(options.validate === undefined) { + options.validate = true; + } + if(options.validate) { + const validator = new ResourceValidator(options); classDeclaration.accept(validator, parameters); } diff --git a/packages/composer-common/lib/serializer/resourcevalidator.js b/packages/composer-common/lib/serializer/resourcevalidator.js index a49350e669..65be0f974a 100644 --- a/packages/composer-common/lib/serializer/resourcevalidator.js +++ b/packages/composer-common/lib/serializer/resourcevalidator.js @@ -46,6 +46,19 @@ const Globalize = require('../globalize'); * @memberof module:composer-common */ class ResourceValidator { + + /** + * ResourceValidator constructor + * @param {Object} options - the optional serialization options. + * @param {boolean} options.validate - validate the structure of the Resource + * with its model prior to serialization (default to true) + * @param {boolean} options.convertResourcesToRelationships - Convert resources that + * are specified for relationship fields into relationships, false by default. + * @param {boolean} options.permitResourcesForRelationships - Permit resources in the + */ + constructor(options) { + this.options = options || {}; + } /** * Visitor design pattern. * @@ -370,7 +383,11 @@ class ResourceValidator { * @private */ checkRelationship(parameters, relationshipDeclaration, obj) { - if(!(obj instanceof Relationship)) { + if(obj instanceof Relationship) { + // All good.. + } else if (obj instanceof Resource && (this.options.convertResourcesToRelationships || this.options.permitResourcesForRelationships)) { + // All good.. Again + } else { ResourceValidator.reportNotRelationshipViolation(parameters.rootResourceIdentifier, relationshipDeclaration, obj); } diff --git a/packages/composer-cucumber-steps/features/basic-sample-network/models/sample.cto b/packages/composer-cucumber-steps/features/basic-sample-network/models/sample.cto index 25d8dca45a..d2f62c72a7 100644 --- a/packages/composer-cucumber-steps/features/basic-sample-network/models/sample.cto +++ b/packages/composer-cucumber-steps/features/basic-sample-network/models/sample.cto @@ -23,4 +23,5 @@ transaction SampleTransaction { event SampleEvent { o String oldValue o String newValue + --> SampleAsset asset } diff --git a/packages/composer-cucumber-steps/lib/composer.js b/packages/composer-cucumber-steps/lib/composer.js index 0f3235d613..77346a8ed2 100644 --- a/packages/composer-cucumber-steps/lib/composer.js +++ b/packages/composer-cucumber-steps/lib/composer.js @@ -475,7 +475,6 @@ class Composer { this.compareResources(actualResource, expectedResource); return true; } catch (error) { - console.log(error); return false; } }); From 1149319f988cd48555159ae84bc9e05f4e394320 Mon Sep 17 00:00:00 2001 From: "Mark S. Lewis" Date: Fri, 7 Jul 2017 14:24:45 +0100 Subject: [PATCH 11/88] PR for #796 (#1434) * Rafactor of composer-common/factory - Re-work unit tests to simplify and improve test coverage. - Refactor Factory to remove code duplication. * Add includeOptionalFields option for Factory.newXX functions * Create sample array fields with only one element in InstanceGenerator Rather than creating three elements for every generated array field value: - For sample data, create a single element array. - For empty data, create an empty array. * Generate concrete type for references to abstract types. * Refactor InstanceGenerator to remove duplicate ID generation code. * Add 'Optional Properties' checkbox to create resource and new transaction dialogs --- packages/composer-common/api.txt | 8 +- packages/composer-common/changelog.txt | 2 + .../fromcto/loopback/loopbackvisitor.js | 2 +- packages/composer-common/lib/factory.js | 94 ++++++++------ .../lib/introspect/classdeclaration.js | 14 +- .../lib/introspect/property.js | 4 +- .../lib/introspect/relationshipdeclaration.js | 2 +- packages/composer-common/lib/model/typed.js | 3 +- packages/composer-common/lib/modelutil.js | 2 +- packages/composer-common/lib/serializer.js | 6 +- .../lib/serializer/instancegenerator.js | 87 ++++++------- .../lib/serializer/jsonpopulator.js | 8 +- .../lib/serializer/valuegenerator.js | 18 +++ packages/composer-common/test/factory.js | 122 +++++++++++------- .../test/serializer/instancegenerator.js | 102 ++++++++------- .../test/serializer/valuegenerator.js | 105 ++++++++------- .../app/test/resource/resource.component.html | 6 + .../app/test/resource/resource.component.ts | 6 +- .../transaction/transaction.component.html | 6 + .../test/transaction/transaction.component.ts | 6 +- .../generators/angular/index.js | 2 +- 21 files changed, 362 insertions(+), 243 deletions(-) diff --git a/packages/composer-common/api.txt b/packages/composer-common/api.txt index 27c132ecd8..11e9c4b445 100644 --- a/packages/composer-common/api.txt +++ b/packages/composer-common/api.txt @@ -26,11 +26,11 @@ class BusinessNetworkMetadata { } class Factory { + void constructor(ModelManager) - + Resource newResource(string,string,string,Object,boolean,string) throws TypeNotFoundException - + Resource newConcept(string,string,Object,boolean,string) throws TypeNotFoundException + + Resource newResource(string,string,string,Object,boolean,string,boolean) throws TypeNotFoundException + + Resource newConcept(string,string,Object,boolean,string,boolean) throws TypeNotFoundException + Relationship newRelationship(string,string,string) throws TypeNotFoundException - + Resource newTransaction(string,string,string,Object,string) - + Resource newEvent(string,string,string,Object,string) + + Resource newTransaction(string,string,string,Object,string,boolean) + + Resource newEvent(string,string,string,Object,string,boolean) } class FileWallet extends Wallet { + string getHomeDirectory() diff --git a/packages/composer-common/changelog.txt b/packages/composer-common/changelog.txt index f9173170aa..b3f04ca16c 100644 --- a/packages/composer-common/changelog.txt +++ b/packages/composer-common/changelog.txt @@ -11,6 +11,8 @@ # # Note that the latest public API is documented using JSDocs and is available in api.txt. # +Version 0.9.2 {60327250ee4f059647020f8aee5ed67b} 2017-07-06 +- Added includeOptionalFields option to Factory.newXXX functions Version 0.9.0 {d0b9ae5179276e20604874624fe9529d} 2017-06-23 - Removed useless toJSON methods everywhere diff --git a/packages/composer-common/lib/codegen/fromcto/loopback/loopbackvisitor.js b/packages/composer-common/lib/codegen/fromcto/loopback/loopbackvisitor.js index 3aa656e46e..d43866b056 100644 --- a/packages/composer-common/lib/codegen/fromcto/loopback/loopbackvisitor.js +++ b/packages/composer-common/lib/codegen/fromcto/loopback/loopbackvisitor.js @@ -326,7 +326,7 @@ class LoopbackVisitor { // Add information from the class declaration into the composer section. if (jsonSchema.options && jsonSchema.options.composer) { - jsonSchema.options.composer.namespace = classDeclaration.getModelFile().getNamespace(); + jsonSchema.options.composer.namespace = classDeclaration.getNamespace(); jsonSchema.options.composer.name = classDeclaration.getName(); jsonSchema.options.composer.fqn = classDeclaration.getFullyQualifiedName(); } diff --git a/packages/composer-common/lib/factory.js b/packages/composer-common/lib/factory.js index a7f4e3c85d..c74ee31ba4 100644 --- a/packages/composer-common/lib/factory.js +++ b/packages/composer-common/lib/factory.js @@ -35,7 +35,6 @@ const EventDeclaration = require('./introspect/eventdeclaration'); const uuid = require('uuid'); - /** * Use the Factory to create instances of Resource: transactions, participants * and assets. @@ -68,6 +67,8 @@ class Factory { * @param {string} [options.generate] - Pass one of:
*
sample
return a resource instance with generated sample data.
*
empty
return a resource instance with empty property values.
+ * @param {boolean} [options.includeOptionalFields] - if options.generate + * is specified, whether optional fields should be generated. * @return {Resource} the new instance * @throws {TypeNotFoundException} if the type is not registered with the ModelManager */ @@ -112,29 +113,7 @@ class Factory { newObj = new ValidatedResource(this.modelManager, ns, type, id, new ResourceValidator()); } newObj.assignFieldDefaults(); - - if(options.generate) { - let generator; - let includeOptionalFields; - if ((/^empty$/i).test(options.generate)) { - generator = ValueGeneratorFactory.empty(); - includeOptionalFields = false; - } else { - generator = ValueGeneratorFactory.sample(); - includeOptionalFields = true; - } - - const visitor = new InstanceGenerator(); - const parameters = { - stack: new TypedStack(newObj), - modelManager: this.modelManager, - factory: this, - valueGenerator: generator, - includeOptionalFields: includeOptionalFields - }; - - classDecl.accept(visitor, parameters); - } + this.initializeNewObject(newObj, classDecl, options); // if we have an identifier, we set it now let idField = classDecl.getIdentifierFieldName(); @@ -153,6 +132,8 @@ class Factory { * @param {string} [options.generate] - Pass one of:
*
sample
return a resource instance with generated sample data.
*
empty
return a resource instance with empty property values.
+ * @param {boolean} [options.includeOptionalFields] - if options.generate + * is specified, whether optional fields should be generated. * @return {Resource} the new instance * @throws {TypeNotFoundException} if the type is not registered with the ModelManager */ @@ -181,18 +162,7 @@ class Factory { newObj = new ValidatedConcept(this.modelManager,ns,type, new ResourceValidator()); } newObj.assignFieldDefaults(); - - if(options.generate) { - const visitor = new InstanceGenerator(); - const generator = (/^empty$/i).test(options.generate) ? ValueGeneratorFactory.empty() : ValueGeneratorFactory.sample(); - const parameters = { - stack: new TypedStack(newObj), - modelManager: this.modelManager, - factory: this, - valueGenerator: generator - }; - classDecl.accept(visitor, parameters); - } + this.initializeNewObject(newObj, classDecl, options); debug('Factory.newResource created concept %s', classDecl.getFullyQualifiedName() ); return newObj; @@ -230,6 +200,8 @@ class Factory { * @param {string} [options.generate] - Pass one of:
*
sample
return a resource instance with generated sample data.
*
empty
return a resource instance with empty property values.
+ * @param {boolean} [options.includeOptionalFields] - if options.generate + * is specified, whether optional fields should be generated. * @return {Resource} A resource for the new transaction. */ newTransaction(ns, type, id, options) { @@ -263,6 +235,8 @@ class Factory { * @param {string} [options.generate] - Pass one of:
*
sample
return a resource instance with generated sample data.
*
empty
return a resource instance with empty property values.
+ * @param {boolean} [options.includeOptionalFields] - if options.generate + * is specified, whether optional fields should be generated. * @return {Resource} A resource for the new event. */ newEvent(ns, type, id, options) { @@ -285,6 +259,54 @@ class Factory { return event; } + /** + * PRIVATE IMPLEMENTATION. DO NOT CALL FROM OUTSIDE THIS CLASS. + * + * Initialize the state of a newly created resource + * @private + * @param {Typed} newObject - resource to initialize. + * @param {ClassDeclaration} classDeclaration - class declaration for the resource. + * @param {Object} clientOptions - field generation options supplied by the caller. + */ + initializeNewObject(newObject, classDeclaration, clientOptions) { + const generateParams = this.parseGenerateOptions(clientOptions); + if (generateParams) { + generateParams.stack = new TypedStack(newObject); + const visitor = new InstanceGenerator(); + classDeclaration.accept(visitor, generateParams); + } + } + + /** + * PRIVATE IMPLEMENTATION. DO NOT CALL FROM OUTSIDE THIS CLASS. + * + * Parse the client-supplied field generation options and return a corresponding set of InstanceGenerator + * options that can be used to initialize a resource. + * @private + * @param {Object} clientOptions - field generation options supplied by the caller. + * @return {Object} InstanceGenerator options. + */ + parseGenerateOptions(clientOptions) { + if (!clientOptions.generate) { + return null; + } + + const generateParams = { }; + generateParams.modelManager = this.modelManager; + generateParams.factory = this; + + if ((/^empty$/i).test(clientOptions.generate)) { + generateParams.valueGenerator = ValueGeneratorFactory.empty(); + } else { + // Allow any other value for backwards compatibility with previous (truthy) behavior + generateParams.valueGenerator = ValueGeneratorFactory.sample(); + } + + generateParams.includeOptionalFields = clientOptions.includeOptionalFields ? true : false; + + return generateParams; + } + } module.exports = Factory; diff --git a/packages/composer-common/lib/introspect/classdeclaration.js b/packages/composer-common/lib/introspect/classdeclaration.js index 1c4d66ddc0..fa80673402 100644 --- a/packages/composer-common/lib/introspect/classdeclaration.js +++ b/packages/composer-common/lib/introspect/classdeclaration.js @@ -231,7 +231,7 @@ class ClassDeclaration { // we now validate the field, however to ensure that // imports are resolved correctly we validate in the context // of the declared type of the field for non-primitives in a different namespace - if(field.isPrimitive() || this.isEnum() || field.getNamespace() === this.getModelFile().getNamespace() ) { + if(field.isPrimitive() || this.isEnum() || field.getNamespace() === this.getNamespace() ) { field.validate(this); } else { @@ -304,7 +304,7 @@ class ClassDeclaration { * @return {boolean} true if the class may be pointed to by a relationship */ isSystemType() { - return ModelUtil.getSystemNamespace() === this.modelFile.getNamespace(); + return ModelUtil.getSystemNamespace() === this.getNamespace(); } /** @@ -317,6 +317,14 @@ class ClassDeclaration { return this.name; } + /** + * Return the namespace of this class. + * @return {String} namespace - a namespace. + */ + getNamespace() { + return this.modelFile.getNamespace(); + } + /** * Returns the fully qualified name of this class. * The name will include the namespace if present. @@ -324,7 +332,7 @@ class ClassDeclaration { * @return {string} the fully-qualified name of this class */ getFullyQualifiedName() { - return this.modelFile.getNamespace() + '.' + this.name; + return this.getNamespace() + '.' + this.name; } /** diff --git a/packages/composer-common/lib/introspect/property.js b/packages/composer-common/lib/introspect/property.js index c5154be285..8c81c11398 100644 --- a/packages/composer-common/lib/introspect/property.js +++ b/packages/composer-common/lib/introspect/property.js @@ -156,7 +156,7 @@ class Property { * @return {string} the fully qualified name of this property */ getFullyQualifiedName() { - return this.getNamespace() + '.' + this.getParent().getName() + '.' + this.getName(); + return this.getParent().getFullyQualifiedName() + '.' + this.getName(); } /** @@ -164,7 +164,7 @@ class Property { * @return {string} the namespace of the parent of this property */ getNamespace() { - return this.getParent().getModelFile().getNamespace(); + return this.getParent().getNamespace(); } /** diff --git a/packages/composer-common/lib/introspect/relationshipdeclaration.js b/packages/composer-common/lib/introspect/relationshipdeclaration.js index eeeac24e60..28131b004c 100644 --- a/packages/composer-common/lib/introspect/relationshipdeclaration.js +++ b/packages/composer-common/lib/introspect/relationshipdeclaration.js @@ -57,7 +57,7 @@ class RelationshipDeclaration extends Property { if(ModelUtil.isPrimitiveType(this.getType())) { throw new IllegalModelException('Relationship ' + this.getName() + ' cannot be to the primitive type ' + this.getType(), classDecl.getModelFile(), this.ast.location ); } else { - let namespace = this.getParent().getModelFile().getNamespace(); + let namespace = this.getParent().getNamespace(); // we first try to get the type from our own model file // because during validate we have not yet been added to the model manager diff --git a/packages/composer-common/lib/model/typed.js b/packages/composer-common/lib/model/typed.js index fe74073c84..18e398fe87 100644 --- a/packages/composer-common/lib/model/typed.js +++ b/packages/composer-common/lib/model/typed.js @@ -15,6 +15,7 @@ 'use strict'; const Field = require('../introspect/field'); +const ModelUtil = require('../modelutil'); /** * Object is an instance with a namespace and a type. @@ -76,7 +77,7 @@ class Typed { * @return {string} The fully-qualified type name of this object */ getFullyQualifiedType() { - return this.$namespace + '.' + this.$type; + return ModelUtil.getFullyQualifiedName(this.$namespace, this.$type); } /** diff --git a/packages/composer-common/lib/modelutil.js b/packages/composer-common/lib/modelutil.js index c2bea80c83..e365aa1ce6 100644 --- a/packages/composer-common/lib/modelutil.js +++ b/packages/composer-common/lib/modelutil.js @@ -188,7 +188,7 @@ class ModelUtil { */ static getFullyQualifiedName(namespace, type) { if (namespace) { - return namespace + '.' + type; + return `${namespace}.${type}`; } else { return type; } diff --git a/packages/composer-common/lib/serializer.js b/packages/composer-common/lib/serializer.js index 0de7e22ff5..a0488b0bb8 100644 --- a/packages/composer-common/lib/serializer.js +++ b/packages/composer-common/lib/serializer.js @@ -139,15 +139,15 @@ class Serializer { // create a new instance, using the identifier field name as the ID. let resource; if (classDeclaration instanceof TransactionDeclaration) { - resource = this.factory.newTransaction( classDeclaration.getModelFile().getNamespace(), + resource = this.factory.newTransaction( classDeclaration.getNamespace(), classDeclaration.getName(), jsonObject[classDeclaration.getIdentifierFieldName()] ); } else if (classDeclaration instanceof EventDeclaration) { - resource = this.factory.newEvent( classDeclaration.getModelFile().getNamespace(), + resource = this.factory.newEvent( classDeclaration.getNamespace(), classDeclaration.getName(), jsonObject[classDeclaration.getIdentifierFieldName()] ); } else { - resource = this.factory.newResource( classDeclaration.getModelFile().getNamespace(), + resource = this.factory.newResource( classDeclaration.getNamespace(), classDeclaration.getName(), jsonObject[classDeclaration.getIdentifierFieldName()] ); } diff --git a/packages/composer-common/lib/serializer/instancegenerator.js b/packages/composer-common/lib/serializer/instancegenerator.js index 0d05c75f11..359c68edaf 100644 --- a/packages/composer-common/lib/serializer/instancegenerator.js +++ b/packages/composer-common/lib/serializer/instancegenerator.js @@ -21,7 +21,6 @@ const leftPad = require('left-pad'); const ModelUtil = require('../modelutil'); const RelationshipDeclaration = require('../introspect/relationshipdeclaration'); const Util = require('../util'); -const ValueGeneratorFactory = require('./valuegenerator'); const Globalize = require('../globalize'); /** @@ -84,11 +83,8 @@ class InstanceGenerator { */ visitField(field, parameters) { if (field.isArray()) { - let result = []; - for (let i = 0; i < 3; i++) { - result.push(this.getFieldValue(field, parameters)); - } - return result; + const valueSupplier = () => this.getFieldValue(field, parameters); + return parameters.valueGenerator.getArray(valueSupplier); } else { return this.getFieldValue(field, parameters); } @@ -102,57 +98,53 @@ class InstanceGenerator { */ getFieldValue(field, parameters) { let type = field.getFullyQualifiedTypeName(); - let valueGenerator = parameters.valueGenerator || ValueGeneratorFactory.sample(); + if (ModelUtil.isPrimitiveType(type)) { switch(type) { case 'DateTime': - return valueGenerator.getDateTime(); + return parameters.valueGenerator.getDateTime(); case 'Integer': - return valueGenerator.getInteger(); + return parameters.valueGenerator.getInteger(); case 'Long': - return valueGenerator.getLong(); + return parameters.valueGenerator.getLong(); case 'Double': - return valueGenerator.getDouble(); + return parameters.valueGenerator.getDouble(); case 'Boolean': - return valueGenerator.getBoolean(); + return parameters.valueGenerator.getBoolean(); default: - return valueGenerator.getString(); + return parameters.valueGenerator.getString(); } } + let classDeclaration = parameters.modelManager.getType(type); + if (classDeclaration instanceof EnumDeclaration) { let enumValues = classDeclaration.getOwnProperties(); - return valueGenerator.getEnum(enumValues).getName(); + return parameters.valueGenerator.getEnum(enumValues).getName(); } - if (classDeclaration.isAbstract()) { - const newClassDecl = this.findConcreteSubclass(classDeclaration); - classDeclaration = newClassDecl; - type = newClassDecl.getName(); - } + classDeclaration = this.findConcreteSubclass(classDeclaration); if (classDeclaration.isConcept()) { - let concept = parameters.factory.newConcept(classDeclaration.getModelFile().getNamespace(), classDeclaration.getName()); + let concept = parameters.factory.newConcept(classDeclaration.getNamespace(), classDeclaration.getName()); parameters.stack.push(concept); return classDeclaration.accept(this, parameters); } else { - let identifierFieldName = classDeclaration.getIdentifierFieldName(); - let idx = Math.round(Math.random() * 9999).toString(); - idx = leftPad(idx, 4, '0'); - let id = `${identifierFieldName}:${idx}`; - let resource = parameters.factory.newResource(classDeclaration.getModelFile().getNamespace(), classDeclaration.getName(), id); + const id = this.generateRandomId(classDeclaration); + let resource = parameters.factory.newResource(classDeclaration.getNamespace(), classDeclaration.getName(), id); parameters.stack.push(resource); return classDeclaration.accept(this, parameters); } } /** - * Find a type that extends the provided abstract type and return it. + * Find a concrete type that extends the provided type. If the supplied type argument is + * not abstract then it will be returned. * TODO: work out whether this has to be a leaf node or whether the closest type can be used * It depends really since the closest type will satisfy the model but whether it satisfies * any transaction code which attempts to use the generated resource is another matter. * @param {ClassDeclaration} declaration the class declaration. - * @return {ClassDeclaration} the closest extending concrete class definition - null if none are found. + * @return {ClassDeclaration} the closest extending concrete class definition. * @throws {Error} if no concrete subclasses exist. */ findConcreteSubclass(declaration) { @@ -176,33 +168,38 @@ class InstanceGenerator { /** * Visitor design pattern * @param {RelationshipDeclaration} relationshipDeclaration - the object being visited - * @param {Object} parameters - the parameter - * @return {Object} the result of visiting or null + * @param {Object} parameters - the parameter + * @return {Relationship} the result of visiting * @private */ visitRelationshipDeclaration(relationshipDeclaration, parameters) { let classDeclaration = parameters.modelManager.getType(relationshipDeclaration.getFullyQualifiedTypeName()); - let identifierFieldName = classDeclaration.getIdentifierFieldName(); - let factory = parameters.factory; + classDeclaration = this.findConcreteSubclass(classDeclaration); + const factory = parameters.factory; + const valueSupplier = () => { + const id = this.generateRandomId(classDeclaration); + return factory.newRelationship(classDeclaration.getNamespace(), classDeclaration.getName(), id); + }; if (relationshipDeclaration.isArray()) { - let result = []; - for (let i = 0; i < 3; i++) { - let idx = Math.round(Math.random() * 9999).toString(); - idx = leftPad(idx, 4, '0'); - let id = `${identifierFieldName}:${idx}`; - let relationship = factory.newRelationship(classDeclaration.getModelFile().getNamespace(), classDeclaration.getName(), id); - result.push(relationship); - } - return result; + return parameters.valueGenerator.getArray(valueSupplier); } else { - let idx = Math.round(Math.random() * 9999).toString(); - idx = leftPad(idx, 4, '0'); - let id = `${identifierFieldName}:${idx}`; - let relationship = factory.newRelationship(classDeclaration.getModelFile().getNamespace(), classDeclaration.getName(), id); - return relationship; + return valueSupplier(); } } + /** + * Generate a random ID for a given type. + * @private + * @param {ClassDeclaration} classDeclaration - class declaration for a type. + * @return {String} an ID. + */ + generateRandomId(classDeclaration) { + const prefix = classDeclaration.getIdentifierFieldName(); + let index = Math.round(Math.random() * 9999).toString(); + index = leftPad(index, 4, '0'); + return `${prefix}:${index}`; + } + } module.exports = InstanceGenerator; diff --git a/packages/composer-common/lib/serializer/jsonpopulator.js b/packages/composer-common/lib/serializer/jsonpopulator.js index e19896aaa1..e8e6c4f6a1 100644 --- a/packages/composer-common/lib/serializer/jsonpopulator.js +++ b/packages/composer-common/lib/serializer/jsonpopulator.js @@ -139,12 +139,12 @@ class JSONPopulator { // if this is identifiable, then we create a resource if(!classDeclaration.isConcept()) { - subResource = parameters.factory.newResource(classDeclaration.getModelFile().getNamespace(), + subResource = parameters.factory.newResource(classDeclaration.getNamespace(), classDeclaration.getName(), jsonItem[classDeclaration.getIdentifierFieldName()] ); } else { // otherwise we create a concept - subResource = parameters.factory.newConcept(classDeclaration.getModelFile().getNamespace(), + subResource = parameters.factory.newConcept(classDeclaration.getNamespace(), classDeclaration.getName() ); } @@ -232,7 +232,7 @@ class JSONPopulator { const classDeclaration = parameters.modelManager.getType(jsonItem.$class); // create a new instance, using the identifier field name as the ID. - let subResource = parameters.factory.newResource(classDeclaration.getModelFile().getNamespace(), + let subResource = parameters.factory.newResource(classDeclaration.getNamespace(), classDeclaration.getName(), jsonItem[classDeclaration.getIdentifierFieldName()] ); parameters.jsonStack.push(jsonItem); parameters.resourceStack.push(subResource); @@ -257,7 +257,7 @@ class JSONPopulator { const classDeclaration = parameters.modelManager.getType(jsonObj.$class); // create a new instance, using the identifier field name as the ID. - let subResource = parameters.factory.newResource(classDeclaration.getModelFile().getNamespace(), + let subResource = parameters.factory.newResource(classDeclaration.getNamespace(), classDeclaration.getName(), jsonObj[classDeclaration.getIdentifierFieldName()] ); parameters.jsonStack.push(jsonObj); parameters.resourceStack.push(subResource); diff --git a/packages/composer-common/lib/serializer/valuegenerator.js b/packages/composer-common/lib/serializer/valuegenerator.js index fc0f91dc2f..c28c8c37cc 100644 --- a/packages/composer-common/lib/serializer/valuegenerator.js +++ b/packages/composer-common/lib/serializer/valuegenerator.js @@ -107,6 +107,15 @@ class EmptyValueGenerator { getEnum(enumValues) { return enumValues[0]; } + + /** + * Get an array using the supplied callback to obtain array values. + * @param {Function} valueSupplier - callback to obtain values. + * @return {Array} an array + */ + getArray(valueSupplier) { + return [ ]; + } } /** @@ -170,6 +179,15 @@ class SampleValueGenerator extends EmptyValueGenerator { getEnum(enumValues) { return enumValues[Math.floor(Math.random() * enumValues.length)]; } + + /** + * Get an array using the supplied callback to obtain array values. + * @param {Function} valueSupplier - callback to obtain values. + * @return {Array} an array + */ + getArray(valueSupplier) { + return [ valueSupplier() ]; + } } module.exports = ValueGeneratorFactory; diff --git a/packages/composer-common/test/factory.js b/packages/composer-common/test/factory.js index a464797139..eff55cf261 100644 --- a/packages/composer-common/test/factory.js +++ b/packages/composer-common/test/factory.js @@ -22,7 +22,7 @@ const uuid = require('uuid'); const should = require('chai').should(); const sinon = require('sinon'); -describe('Factory', () => { +describe('Factory', function() { const namespace = 'org.acme.test'; const assetName = 'MyAsset'; @@ -40,6 +40,9 @@ describe('Factory', () => { concept MyConcept { o String newValue } + abstract asset AbstractAsset identified by assetId { + o String assetId + } asset MyAsset identified by assetId { o String assetId o String newValue @@ -63,88 +66,107 @@ describe('Factory', () => { sandbox.restore(); }); - describe('#newResource', () => { - it('should throw creating a new instance without an ID', () => { + describe('#newResource', function() { + it('should throw creating a new instance without an ID', function() { (() => { factory.newResource(namespace, assetName, null); }).should.throw(/Invalid or missing identifier/); }); - it('should throw creating a new instance with an ID that is just whitespace', () => { + it('should throw creating a new instance with an ID that is just whitespace', function() { (() => { factory.newResource(namespace, assetName, ' '); }).should.throw(/Missing identifier/); }); - it('should create a new instance with a specified ID', () => { - let resource = factory.newResource(namespace, assetName, 'MY_ID_1'); + it('should throw creating an abstract asset', function() { + (() => { + factory.newResource(namespace, 'AbstractAsset', 'MY_ID_1'); + }).should.throw(/AbstractAsset/); + }); + + it('should throw creating a concept', function() { + (() => { + factory.newResource(namespace, 'MyConcept', 'MY_ID_1'); + }).should.throw(/MyConcept/); + }); + + it('should create a new instance with a specified ID', function() { + const resource = factory.newResource(namespace, assetName, 'MY_ID_1'); resource.assetId.should.equal('MY_ID_1'); - should.equal(resource.newValue, undefined); - should.equal(resource.optionalValue, undefined); + }); + + it('should create a new validating instance by default', function() { + const resource = factory.newResource(namespace, assetName, 'MY_ID_1'); should.not.equal(resource.validate, undefined); }); - it('should create a new non-validating instance with a specified ID', () => { - let resource = factory.newResource(namespace, assetName, 'MY_ID_1', { disableValidation: true }); - resource.assetId.should.equal('MY_ID_1'); - should.equal(resource.newValue, undefined); - should.equal(resource.optionalValue, undefined); + it('should create a new non-validating instance', function() { + const resource = factory.newResource(namespace, assetName, 'MY_ID_1', { disableValidation: true }); should.equal(resource.validate, undefined); }); - it('should create a new instance with a specified ID and generated empty data', () => { - let resource = factory.newResource(namespace, assetName, 'MY_ID_1', { generate: 'empty' }); - resource.assetId.should.equal('MY_ID_1'); - resource.newValue.should.be.a('String'); - resource.newValue.length.should.equal(0); - should.equal(resource.optionalValue, undefined); - should.not.equal(resource.validate, undefined); + it('should not define fields if \'generate\' option is not set', function() { + const resource = factory.newResource(namespace, assetName, 'MY_ID_1'); + should.equal(resource.newValue, undefined); }); - const validateSampleData = (resource) => { - resource.assetId.should.equal('MY_ID_1'); + it('should generate empty field values', function() { + const resource = factory.newResource(namespace, assetName, 'MY_ID_1', { generate: 'empty' }); + assertEmptyFieldValues(resource); + }); + + const assertEmptyFieldValues = function(resource) { + should.not.equal(resource.newValue, undefined); resource.newValue.should.be.a('String'); - resource.newValue.length.should.not.equal(0); - resource.optionalValue.should.be.a('String'); - resource.optionalValue.length.should.not.equal(0); - should.not.equal(resource.validate, undefined); + resource.newValue.length.should.equal(0); }; - it('should create a new instance with a specified ID and generated sample data', () => { + it('should generate sample field values', function() { const resource = factory.newResource(namespace, assetName, 'MY_ID_1', { generate: 'sample' }); - validateSampleData(resource); + assertSampleFieldValues(resource); }); - it('should generate sample data if \'generate\' option is a boolean', () => { + it('should generate sample field values if \'generate\' option is a boolean', function() { const resource = factory.newResource(namespace, assetName, 'MY_ID_1', { generate: true }); - validateSampleData(resource); + assertSampleFieldValues(resource); }); - }); + const assertSampleFieldValues = function(resource) { + should.not.equal(resource.newValue, undefined); + resource.newValue.should.be.a('String'); + resource.newValue.length.should.not.equal(0); + }; - describe('#newResource', () => { + it('should not define optional fields with generated empty data if includeOptionalFields not specified', function() { + const resource = factory.newResource(namespace, assetName, 'MY_ID_1', { generate: 'empty' }); + assertOptionalNotDefined(resource); + }); - it('should create a new instance with a specified ID', () => { - let resource = factory.newResource(namespace, assetName, 'MY_ID_1'); - resource.assetId.should.equal('MY_ID_1'); - should.equal(resource.newValue, undefined); - should.not.equal(resource.validate, undefined); + it('should not define optional fields with generated sample data if includeOptionalFields not specified', function() { + const resource = factory.newResource(namespace, assetName, 'MY_ID_1', { generate: 'sample' }); + assertOptionalNotDefined(resource); }); - it('should create a new non-validating instance with a specified ID', () => { - let resource = factory.newResource(namespace, assetName, 'MY_ID_1', { disableValidation: true }); - resource.assetId.should.equal('MY_ID_1'); - should.equal(resource.newValue, undefined); - should.equal(resource.validate, undefined); + const assertOptionalNotDefined = function(resource) { + should.equal(resource.optionalValue, undefined); + }; + + it ('should define optional fields with generated empty data if includeOptionalFields is specified', function() { + const resource = factory.newResource(namespace, assetName, 'MY_ID_1', { generate: 'empty', includeOptionalFields: true }); + assertOptionalIsDefined(resource); }); - it('should create a new instance with a specified ID and generated data', () => { - let resource = factory.newResource(namespace, assetName, 'MY_ID_1', { generate: true }); - resource.assetId.should.equal('MY_ID_1'); - resource.newValue.should.be.a('string'); - should.not.equal(resource.validate, undefined); + it ('should define optional fields with generated sample data if includeOptionalFields is specified', function() { + const resource = factory.newResource(namespace, assetName, 'MY_ID_1', { generate: 'sample', includeOptionalFields: true }); + assertOptionalIsDefined(resource); }); + const assertOptionalIsDefined = function(resource) { + should.not.equal(resource.optionalValue, undefined); + resource.optionalValue.should.be.a('String'); + }; + }); describe('#newConcept', () => { @@ -167,6 +189,12 @@ describe('Factory', () => { }).should.throw(/Cannot instantiate Abstract Type AbstractConcept in namespace org.acme.test/); }); + it('should throw creating a non-concept', function() { + (() => { + factory.newConcept(namespace, assetName); + }).should.throw(new RegExp(assetName)); + }); + it('should create a new concept', () => { let resource = factory.newConcept(namespace, 'MyConcept'); should.equal(resource.newValue, undefined); diff --git a/packages/composer-common/test/serializer/instancegenerator.js b/packages/composer-common/test/serializer/instancegenerator.js index 04216f8b8a..454020a1c3 100644 --- a/packages/composer-common/test/serializer/instancegenerator.js +++ b/packages/composer-common/test/serializer/instancegenerator.js @@ -18,30 +18,38 @@ const Factory = require('../../lib/factory'); const InstanceGenerator = require('../../lib/serializer/instancegenerator'); const ModelManager = require('../../lib/modelmanager'); const TypedStack = require('../../lib/serializer/typedstack'); +const ValueGenerator = require('../../lib/serializer/valuegenerator'); const chai = require('chai'); const should = chai.should(); describe('InstanceGenerator', () => { - let factory; let modelManager; let parameters; let visitor; + const useEmptyGenerator = () => { + parameters.valueGenerator = ValueGenerator.empty(); + }; + + const useSampleGenerator = () => { + parameters.valueGenerator = ValueGenerator.sample(); + }; + beforeEach(() => { modelManager = new ModelManager(); factory = new Factory(modelManager); parameters = { modelManager: modelManager, - factory: factory + factory: factory, }; + useSampleGenerator(); visitor = new InstanceGenerator(); }); - let test = (modelFile, additionalParams) => { + const test = (modelFile) => { modelManager.addModelFile(modelFile); - Object.assign(parameters, additionalParams); let resource = factory.newResource('org.acme.test', 'MyAsset', 'asset1'); parameters.stack = new TypedStack(resource); let classDeclaration = resource.getClassDeclaration(); @@ -65,16 +73,25 @@ describe('InstanceGenerator', () => { resource.theValue.should.be.a('string'); }); - it('should generate a default value for a string array property', () => { + it('should generate empty array value for array property with empty generator ', () => { + useEmptyGenerator(); + let resource = test(`namespace org.acme.test + asset MyAsset identified by assetId { + o String assetId + o String[] theValues + }`); + resource.theValues.should.be.a('Array').that.is.empty; + }); + + it('should generate one default value for a string array property with sample generator ', () => { + useSampleGenerator(); let resource = test(`namespace org.acme.test asset MyAsset identified by assetId { o String assetId o String[] theValues }`); - resource.theValues.should.have.lengthOf(3); - resource.theValues[0].should.be.a('string'); - resource.theValues[1].should.be.a('string'); - resource.theValues[2].should.be.a('string'); + resource.theValues.should.be.a('Array').and.have.lengthOf(1); + resource.theValues[0].should.be.a('String'); }); it('should generate a default value for a date/time property', () => { @@ -86,16 +103,14 @@ describe('InstanceGenerator', () => { resource.theValue.should.be.an.instanceOf(Date); }); - it('should generate a default value for a date/time array property', () => { + it('should generate one default value for a date/time array property', () => { let resource = test(`namespace org.acme.test asset MyAsset identified by assetId { o String assetId o DateTime[] theValues }`); - resource.theValues.should.have.lengthOf(3); - resource.theValues[0].should.be.an.instanceOf(Date); - resource.theValues[1].should.be.an.instanceOf(Date); - resource.theValues[2].should.be.an.instanceOf(Date); + resource.theValues.should.be.a('Array').and.have.lengthOf(1); + resource.theValues[0].should.be.a('Date'); }); it('should generate a default value for an integer property', () => { @@ -113,10 +128,8 @@ describe('InstanceGenerator', () => { o String assetId o Integer[] theValues }`); - resource.theValues.should.have.lengthOf(3); - resource.theValues[0].should.be.a('number'); - resource.theValues[1].should.be.a('number'); - resource.theValues[2].should.be.a('number'); + resource.theValues.should.be.a('Array').and.have.lengthOf(1); + resource.theValues[0].should.be.a('Number'); }); it('should generate a default value for a long property', () => { @@ -134,10 +147,8 @@ describe('InstanceGenerator', () => { o String assetId o Long[] theValues }`); - resource.theValues.should.have.lengthOf(3); - resource.theValues[0].should.be.a('number'); - resource.theValues[1].should.be.a('number'); - resource.theValues[2].should.be.a('number'); + resource.theValues.should.be.a('Array').and.have.lengthOf(1); + resource.theValues[0].should.be.a('Number'); }); it('should generate a default value for a double property', () => { @@ -155,10 +166,8 @@ describe('InstanceGenerator', () => { o String assetId o Double[] theValues }`); - resource.theValues.should.have.lengthOf(3); - resource.theValues[0].should.be.a('number'); - resource.theValues[1].should.be.a('number'); - resource.theValues[2].should.be.a('number'); + resource.theValues.should.be.a('Array').and.have.lengthOf(1); + resource.theValues[0].should.be.a('Number'); }); it('should generate a default value for a boolean property', () => { @@ -176,10 +185,8 @@ describe('InstanceGenerator', () => { o String assetId o Boolean[] theValues }`); - resource.theValues.should.have.lengthOf(3); - resource.theValues[0].should.be.a('boolean'); - resource.theValues[1].should.be.a('boolean'); - resource.theValues[2].should.be.a('boolean'); + resource.theValues.should.be.a('Array').and.have.lengthOf(1); + resource.theValues[0].should.be.a('Boolean'); }); it('should generate a default value for an enum property', () => { @@ -207,10 +214,8 @@ describe('InstanceGenerator', () => { o String assetId o MyEnum[] theValues }`); - resource.theValues.should.have.lengthOf(3); + resource.theValues.should.be.a('Array').and.have.lengthOf(1); resource.theValues[0].should.be.oneOf(['ENUM_VAL1', 'ENUM_VAL2', 'ENUM_VAL3']); - resource.theValues[1].should.be.oneOf(['ENUM_VAL1', 'ENUM_VAL2', 'ENUM_VAL3']); - resource.theValues[2].should.be.oneOf(['ENUM_VAL1', 'ENUM_VAL2', 'ENUM_VAL3']); }); it('should generate a default value for a relationship property', () => { @@ -228,10 +233,8 @@ describe('InstanceGenerator', () => { o String assetId --> MyAsset[] theValues }`); - resource.theValues.should.have.lengthOf(3); + resource.theValues.should.be.a('Array').and.have.lengthOf(1); resource.theValues[0].getIdentifier().should.match(/^assetId:\d{4}$/); - resource.theValues[1].getIdentifier().should.match(/^assetId:\d{4}$/); - resource.theValues[2].getIdentifier().should.match(/^assetId:\d{4}$/); }); it('should generate a default value for a resource property', () => { @@ -258,13 +261,9 @@ describe('InstanceGenerator', () => { o String assetId o MyInnerAsset[] theValues }`); - resource.theValues.should.have.lengthOf(3); + resource.theValues.should.be.a('Array').and.have.lengthOf(1); resource.theValues[0].getIdentifier().should.match(/^innerAssetId:\d{4}$/); resource.theValues[0].theValue.should.be.a('string'); - resource.theValues[1].getIdentifier().should.match(/^innerAssetId:\d{4}$/); - resource.theValues[1].theValue.should.be.a('string'); - resource.theValues[2].getIdentifier().should.match(/^innerAssetId:\d{4}$/); - resource.theValues[2].theValue.should.be.a('string'); }); it('should generate a default value for base class properties', () => { @@ -290,7 +289,7 @@ describe('InstanceGenerator', () => { o String id o BaseConcept aConcept }`); - resource.aConcept.$type.should.match(/^MyConcept$/); + resource.aConcept.getType().should.equal('MyConcept'); }); it('should throw an error when trying to generate a resource from a model that uses an Abstract type with no concrete Implementing type', () => { @@ -309,23 +308,34 @@ describe('InstanceGenerator', () => { }); it('should not generate default value for optional property if not requested', () => { - let resource = test(`namespace org.acme.test + parameters.includeOptionalFields = false; + const resource = test(`namespace org.acme.test asset MyAsset identified by assetId { o String assetId o String theValue optional - }`, { includeOptionalFields: false }); + }`); should.equal(resource.theValue, undefined); }); it('should generate default value for optional property if requested', () => { - let resource = test(`namespace org.acme.test + parameters.includeOptionalFields = true; + const resource = test(`namespace org.acme.test asset MyAsset identified by assetId { o String assetId o String theValue optional - }`, { includeOptionalFields: true }); + }`); resource.theValue.should.be.a('String'); }); + it('should generate concrete subclass for abstract reference', function() { + let resource = test(`namespace org.acme.test + asset MyAsset identified by id { + o String id + --> Asset theValue + }`); + resource.theValue.getType().should.equal('MyAsset'); + }); + }); }); diff --git a/packages/composer-common/test/serializer/valuegenerator.js b/packages/composer-common/test/serializer/valuegenerator.js index 8f0bae26dc..653d17af5a 100644 --- a/packages/composer-common/test/serializer/valuegenerator.js +++ b/packages/composer-common/test/serializer/valuegenerator.js @@ -19,66 +19,79 @@ const ValueGeneratorFactory = require('../../lib/serializer/valuegenerator'); const chai = require('chai'); const expect = chai.expect; -describe('ValueGenerator', () => { - - /** Array of names of the static factory methods for obtaining ValueGenerator objects. */ - let generatorNames; - - /** - * Check that invoking the supplied function name on all of the ValueGenerator implementations returns the expected type. - * @param {string} functionName name of the function to invoke. - * @param {string} type expected return type. - */ - let assertFunctionReturnsType = (functionName, type) => { - generatorNames.forEach((generatorName) => { - const generator = ValueGeneratorFactory[generatorName](); - const returnValue = generator[functionName](); - expect(returnValue, generatorName + '.' + functionName + '() should return a ' + type) - .to.be.a(type); - }); - }; +describe('ValueGenerator', function() { - before(() => { - generatorNames = Object.getOwnPropertyNames(ValueGeneratorFactory) + describe('Consistent return types', function() { + /** Array of names of the static factory methods for obtaining ValueGenerator objects. */ + const generatorNames = Object.getOwnPropertyNames(ValueGeneratorFactory) .filter((p) => { return typeof ValueGeneratorFactory[p] === 'function'; }); - }); - it('getDateTime should return a Date', () => { - assertFunctionReturnsType('getDateTime', 'Date'); - }); + /** + * Check that invoking the supplied function name on all of the ValueGenerator implementations returns the expected type. + * @param {string} functionName name of the function to invoke. + * @param {string} type expected return type. + */ + const assertFunctionReturnsType = (functionName, type) => { + generatorNames.forEach((generatorName) => { + const generator = ValueGeneratorFactory[generatorName](); + const returnValue = generator[functionName](); + expect(returnValue, generatorName + '.' + functionName + '() should return a ' + type) + .to.be.a(type); + }); + }; - it('getInteger should return a number', () => { - assertFunctionReturnsType('getInteger', 'number'); - }); + it('getDateTime should return a Date', function() { + assertFunctionReturnsType('getDateTime', 'Date'); + }); - it('getLong should return a number', () => { - assertFunctionReturnsType('getLong', 'number'); - }); + it('getInteger should return a number', function() { + assertFunctionReturnsType('getInteger', 'number'); + }); - it('getDouble should return a number', () => { - assertFunctionReturnsType('getDouble', 'number'); - }); + it('getLong should return a number', function() { + assertFunctionReturnsType('getLong', 'number'); + }); - it('getBoolean should return a boolean', () => { - assertFunctionReturnsType('getBoolean', 'boolean'); - }); + it('getDouble should return a number', function() { + assertFunctionReturnsType('getDouble', 'number'); + }); + + it('getBoolean should return a boolean', function() { + assertFunctionReturnsType('getBoolean', 'boolean'); + }); - it('getString should return a string', () => { - assertFunctionReturnsType('getString', 'string'); + it('getString should return a string', function() { + assertFunctionReturnsType('getString', 'string'); + }); }); - it('EmptyValueGenerator.getEnum should return the first value', () => { - const inputs = ['One', 'Two', 'Three']; - const output = ValueGeneratorFactory.empty().getEnum(inputs); - expect(output).to.equal(inputs[0]); + describe('EmptyValueGenerator', function() { + it('getEnum should return the first value', function() { + const inputs = ['One', 'Two', 'Three']; + const output = ValueGeneratorFactory.empty().getEnum(inputs); + expect(output).to.equal(inputs[0]); + }); + + it('getArray should return empty array', function() { + const output = ValueGeneratorFactory.empty().getArray(() => ''); + expect(output).to.be.a('Array').that.is.empty; + }); }); - it('SampleValueGenerator.getEnum should return one of the input values', () => { - const inputs = ['One', 'Two', 'Three']; - const output = ValueGeneratorFactory.sample().getEnum(inputs); - expect(inputs).to.include(output); + describe('SampleValueGenerator', function() { + it('getEnum should return one of the input values', function() { + const inputs = ['One', 'Two', 'Three']; + const output = ValueGeneratorFactory.sample().getEnum(inputs); + expect(inputs).to.include(output); + }); + + it('getArray should return array with one element obtained from callback', function() { + const value = 'TEST_VALUE'; + const output = ValueGeneratorFactory.sample().getArray(() => value); + expect(output).to.be.a('Array').and.deep.equal([value]); + }); }); }); diff --git a/packages/composer-playground/src/app/test/resource/resource.component.html b/packages/composer-playground/src/app/test/resource/resource.component.html index 01658c4c0d..bbed7e8998 100644 --- a/packages/composer-playground/src/app/test/resource/resource.component.html +++ b/packages/composer-playground/src/app/test/resource/resource.component.html @@ -18,6 +18,12 @@

In registry: {{registryID}}

(ngModelChange)="onDefinitionChanged()" width="100%" height="100%" ngDefaultControl> +
+ +

{{definitionError}}

diff --git a/packages/composer-playground/src/app/test/resource/resource.component.ts b/packages/composer-playground/src/app/test/resource/resource.component.ts index 9940d430f4..e35da6e176 100644 --- a/packages/composer-playground/src/app/test/resource/resource.component.ts +++ b/packages/composer-playground/src/app/test/resource/resource.component.ts @@ -37,6 +37,7 @@ export class ResourceComponent implements OnInit { private resourceDeclaration: ClassDeclaration = null; private actionInProgress: boolean = false; private definitionError: string = null; + private includeOptionalFields: boolean = false; private codeConfig = { lineNumbers: true, @@ -118,7 +119,10 @@ export class ResourceComponent implements OnInit { idx = leftPad(idx, 4, '0'); let id = `${this.resourceDeclaration.getIdentifierFieldName()}:${idx}`; try { - const generateParameters = {generate: withSampleData ? 'sample' : 'empty'}; + const generateParameters = { + generate: withSampleData ? 'sample' : 'empty', + includeOptionalFields: this.includeOptionalFields + }; let resource = factory.newResource( this.resourceDeclaration.getModelFile().getNamespace(), this.resourceDeclaration.getName(), diff --git a/packages/composer-playground/src/app/test/transaction/transaction.component.html b/packages/composer-playground/src/app/test/transaction/transaction.component.html index 3b6f129d0d..4d71d417ef 100644 --- a/packages/composer-playground/src/app/test/transaction/transaction.component.html +++ b/packages/composer-playground/src/app/test/transaction/transaction.component.html @@ -33,6 +33,12 @@

Submit Transaction

(ngModelChange)="onDefinitionChanged()" width="100%" height="100%" ngDefaultControl> +
+ +

{{definitionError}}

diff --git a/packages/composer-playground/src/app/test/transaction/transaction.component.ts b/packages/composer-playground/src/app/test/transaction/transaction.component.ts index 436bb6b1c9..68b56e0616 100644 --- a/packages/composer-playground/src/app/test/transaction/transaction.component.ts +++ b/packages/composer-playground/src/app/test/transaction/transaction.component.ts @@ -30,6 +30,7 @@ export class TransactionComponent implements OnInit { private selectedTransactionName: string = null; private hiddenTransactionItems = new Map(); private submittedTransaction = null; + private includeOptionalFields: boolean = false; private resourceDefinition: string = null; private submitInProgress: boolean = false; @@ -121,7 +122,10 @@ export class TransactionComponent implements OnInit { private generateTransactionDeclaration(withSampleData?: boolean): void { let businessNetworkDefinition = this.clientService.getBusinessNetwork(); let factory = businessNetworkDefinition.getFactory(); - const generateParameters = {generate: withSampleData ? 'sample' : 'empty'}; + const generateParameters = { + generate: withSampleData ? 'sample' : 'empty', + includeOptionalFields: this.includeOptionalFields + }; let resource = factory.newTransaction( this.selectedTransaction.getModelFile().getNamespace(), this.selectedTransaction.getName(), diff --git a/packages/generator-hyperledger-composer/generators/angular/index.js b/packages/generator-hyperledger-composer/generators/angular/index.js index d3b3ee8f4a..33a7fe8cc7 100755 --- a/packages/generator-hyperledger-composer/generators/angular/index.js +++ b/packages/generator-hyperledger-composer/generators/angular/index.js @@ -445,7 +445,7 @@ module.exports = yeoman.Base.extend({ assetList.push({ 'name': asset.name, - 'namespace': asset.getModelFile().getNamespace(), + 'namespace': asset.getNamespace(), 'properties': tempList, 'identifier': asset.getIdentifierFieldName() }); From e9be2ab079322c99c4cf2f34ef38715a398b7eb0 Mon Sep 17 00:00:00 2001 From: Liam Grace <14gracel@users.noreply.github.com> Date: Mon, 10 Jul 2017 15:44:45 +0100 Subject: [PATCH 12/88] Added svg transformation when showing event (#1512) --- .../test/view-transaction/view-transaction.component.html | 2 +- .../test/view-transaction/view-transaction.component.scss | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.html b/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.html index cb852927e4..4b93531afd 100644 --- a/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.html +++ b/packages/composer-playground/src/app/test/view-transaction/view-transaction.component.html @@ -25,7 +25,7 @@

Transaction Data

-
- Github + GitHub
From 6db781e1f946f61d5916e522fb97e1014e171faa Mon Sep 17 00:00:00 2001 From: Kai Usher Date: Mon, 10 Jul 2017 19:36:51 +0100 Subject: [PATCH 14/88] Issue 1332 - Enable query support in playground. (#1519) * Add Query file to playground. * Ability to add query file and tests. --- .../release-process/playground-validation.md | 4 +- .../lib/businessnetworkdefinition.js | 2 +- .../e2e/data/bna/basic-sample-network.bna | Bin 6469 -> 5574 bytes .../e2e/data/bna/importBNA.bna | Bin 0 -> 6643 bytes .../e2e/data/files/importQuery.qry | 8 + .../e2e/tests/editor-define.spec.ts | 54 +++- .../editor/add-file/add-file.component.html | 1 + .../editor/add-file/add-file.component.scss | 6 +- .../add-file/add-file.component.spec.ts | 37 ++- .../app/editor/add-file/add-file.component.ts | 13 +- .../editor-file/editor-file.component.spec.ts | 41 +++ .../editor-file/editor-file.component.ts | 11 + .../src/app/editor/editor.component.html | 3 +- .../src/app/editor/editor.component.spec.ts | 235 +++++++++++++++++- .../src/app/editor/editor.component.ts | 59 ++++- .../app/editor/import/import.component.html | 3 + .../src/app/services/client.service.spec.ts | 103 +++++++- .../src/app/services/client.service.ts | 21 +- .../src/assets/svg/other/QRY_File.svg | 1 + 19 files changed, 580 insertions(+), 22 deletions(-) create mode 100644 packages/composer-playground/e2e/data/bna/importBNA.bna create mode 100644 packages/composer-playground/e2e/data/files/importQuery.qry create mode 100644 packages/composer-playground/src/assets/svg/other/QRY_File.svg diff --git a/contrib-notes/release-process/playground-validation.md b/contrib-notes/release-process/playground-validation.md index 529f05fcc1..2dc77bde9f 100644 --- a/contrib-notes/release-process/playground-validation.md +++ b/contrib-notes/release-process/playground-validation.md @@ -67,7 +67,9 @@ Start with the basic sample network loaded - Import/replace button should bring up the Import/replace modal - Should have access to all samples - All samples should import - + - Add file button should bring up add file modal + - Should be able to add query file from disk + ### Define Page (File-Editor) This page is the main file editor page, where it is possible to edit resources. We need to ensure that the linking between the side navigation menu and the file editor is consistent, that validation errors report correctly for each file type and that file specific edit options are enabled. diff --git a/packages/composer-common/lib/businessnetworkdefinition.js b/packages/composer-common/lib/businessnetworkdefinition.js index 63cf5e32cf..3e5ff2accb 100644 --- a/packages/composer-common/lib/businessnetworkdefinition.js +++ b/packages/composer-common/lib/businessnetworkdefinition.js @@ -532,7 +532,7 @@ class BusinessNetworkDefinition { } } - // grab the query.qry + // grab the queries.qry const queryPath = fsPath.resolve(path, 'queries.qry'); if(fs.existsSync(queryPath)) { let queryContents = fs.readFileSync( queryPath, ENCODING); diff --git a/packages/composer-playground/e2e/data/bna/basic-sample-network.bna b/packages/composer-playground/e2e/data/bna/basic-sample-network.bna index 9821e66225e57dd220e355a18656d2a7bd1e2e54..5bce114bb238f88a395565cae82bfa4162e565d0 100644 GIT binary patch literal 5574 zcmb7|3pCUJ|HsFMk^7~PTe+mLCQ{@!a%W*KQ)x5CT!!3ArE*&rG532Y_sFF$$}M-f z6D1<|$|biF67}2i{c8EA&VM_*owGgmdcW?^kD(qA!~h`QM$W$1{qg4CCoTXh0AuBD zZ!P6+g?DwrN;zXaF1WZk9yUcX0w!!w7Imb@XDUvBAql|=0F&<95du3QASV$hgole8 zmdqk^{$tI?6vFGEoErH(;PgZ6JfY~eCX-unq9#+-)zm5g{2>!?0J|r;wf5P9kG}o_ zAIfm7w%UYYUVAya`@*bQ*q9=~wy2H8ms=I|K81Mr)^RiNq!dqMo)P?jhWw~oix_&| zl7;47Y$E5~uNOqdM;`h{Jr)nM7JC_G{`JF4=W&6U*fGs_5;~0MgLS(vyh-f;xhiuV-NZlv6o(l)u`&`#nTlLCpW`1G~ob==RITn`Df43$3a z40=qwFW!=2op`_I(lx?;@haA@SF|T1^X@WLu}l_3-I@x3PrdFhfTXA^+_zS^hbZ%U zr`}rd1v=PYpf2sCq_38#vetV0qsydx!}7Y|wc+m)w?E#Hw(?2}Ug&4dMR&eF+1Q{3 zc(aG<+%5}8;@C#-XEM+N1>(e7Rsaq4=)edSy$ww&006`d_z|JaATMkSGCe6mD3k$A z{S*SZ6;v z4&??OVBJeqxR=#`l}oh^V7{;VI`B9l00fKUf?7_Jy+H?F;(1jeOG@;Mqz5^FH;;)! zkN;8vJUivDlRak3TOJ~(x4gA^!tI#-f5L1Q7sSDxTnc2?e>_hUBbV1u)~oN$6EE&F zk&Ih@^1%3?Xy@mLLcvATsX8Gqj4^g4>Z+#SzjnZ>o6%RPzCQgrSKj#^bWHe(uU%3~ zSFD<-u?c#Jtu|bAsYlax!B5xy;7G!EF2!BkkMAum^&0bGX=qOPh0-1huCF=z;bO@3 z8z4R4S=IePN8am;fR7%V&x5y)oe6myt?tYud^|NE+^bxfHFjT?M%7-#RTjUpJfC;< zYsOgEP_@SbpHkbN#r0kE&Kz?4wI0GolW$8ncwGjWg{K7Ib!bNcO^r{g0XQ&&rl0IL+dUw8_thDcM5LkZ#nbwp^$Se&SLaBo#~!qEysj_DJm z)+g?0iHk^xK&ofa*{(VI+J?RBA-jn(s%}BkBlk>7fZ@##BVrW>F!jCxcb!D0*g2k# z(-(_9x{U?L4W_ccV2jLR$eRszV2?c=pSWibIvxU9dlcyRT>Qy-c;lTGgi%9)?JWae zrnW7lYtbV@$%nxp9b|)3yZprA-q1u@9kXm)nMwJT z`y4~fM~I(w;I^JKr&E_CAyI4oMP}pI2lDyCUVV|SREk+!uX^ej{!TV?*>qGOP~O|5 zDUxtE>1=1NbH5(G>q2ko0bUlJB!gLlw%IR%J`p_nymXdVFe+}9Z=2#ZFR8mR^(3Uv z%^yV`WB<$4>9P&oMSXAvanyDn6OJ z*mkio=f109HFNn>(c?)`fhMpf0&7(bqOP_P_8_dp&5z%ncocRslVK+0kb&`g!zd@Y zHEo&8?Bj&yx<$I~Z>@DNsX%=eHu6fGuOAcXV^Gda(!TyGAG<%#nC!9Mz^UPE^ zdn=49(;;&|YSbCwWqR9dcH22IqS-VGziqVhp_BK$(ny~Y%yx1D3atH|(eEUYq3ywLqD&CSzkNmi37Y4#3goGJJ8C*GNSXEtQmIcgeZp z)`aDZN}S7K^PDpv@WNoTG-uZaV1haF(L{`=F6%%<`34y7+jm_Ul?l==eU^G{v12Nj zxv}ry6y2S)$7*F^U7Fg0P5nG^5eM29VRP4A=_CQ!jxMR=uEZ7AC3*3y7^{Hrcmr5G zLbSUB+D4tvJOUhY)HFCNds2s^D^z8M;fexld`j;Pov(zqSNd!{lyiHi?%arHseVkC z*?hd5z7+vnykMzxX&o~y47T;t*P>HYAkw&nKa4!nld7&;6x}!>@6bx8Ij#EIUu)W6 z+I+(3!pO9i%8B#kt#I4U=EQoVB0mM)g(kwunknRAf6uS7xz}ekCp9x58kq}<0njzi zo)qVs{24h3qxjW!#cCFg1=)t`)iZsmlA#PNroQM2Aa*!}&gkR9BAwSs4_u!(j?0GH?_h zgohL9rP{3;rZ33lO?;OM)$#1cod@%sK>Y^nLFfUs+oIuM@Tn4;{yqD zm+6{Z+@oST+-krZenGKte7!dKhltNG;8(I{#II_Eh<0a(3@^Q^z*Gt3WL4XTrM+&8Pzkk02{kA*xhbK z5oOHmU%c;(e__KPu6^Ke{F-tjd~jFf5l{NK)6@M<-@+^H-rsM%T8tPBhbnV@b+qwM zAp%CIM&;srM*8Kh-4g3Se;clUf7yRYd|f@?lRr7Dcy>3}%OPPD_9^qt8ktXF)cY|V zOYY|DGqkk}s3rHcI1VQEeOKn;qH6FcB?a@n6Pe6RImK!%yJGdlMxJT~>6x$m2!)iX zX7xc*cT)pWhT@~~ubM*6z)Vy}nqeY=d0%K2?y{bz8OFQJI`Z2ae1{o+EWvWHYMe!7xG#h5mA7ByP7spe}0BazCL<& zb#+KarB1?|;{j> z|KZMzbVd1^B7YmhajPa=Ujy`TpFUl>P+#`VkR^fdnWXPE-FZCtaW|B$9uaEgWd}p1 zAZkoIgx6rU+D0cQWWec;Fn%sZ+CDaq=VgtiZHgZho=LW43_PANFJPMt1PW!hB8>Q9 zH-*%1<}ytb%~#4~(OAqH#y=lWlkdtl?&zuq1!UZfZNHfFnQeItWgB-k#ImWQ+wEM( zd2xT{81gIVPYD;?Qe}#Bwi+wadQO$zwZg zq<(PbSRoEggXonKu%EEQzN;D+^5fP_j#j!9z|1l|l6WR~J!*g{*!2q^FV z2}hw|!CO~6Ho2Q-{$FMO)65OnTT*M>Y96M@P1DHQ`cDW-(>7pyB;RZy{&?h{+@D9L z6wC*IIWq3A++Xzj?@zzIW$;k^#Via+8VbL)cvFXOdV{Q+DFa1DQi_)Slt^FQKOreJ zIe1HxQ+j&4xqOst*iq6t@mq7ZM9|I_Q*QcVlvLkqf1y$eqU~1yye>hx^6dMC|A=k} ztAAAwJEJK_xX3SP`dvGrw{K9tr;|r1<&YKng&s*Nl;67hmuU*#S_&wWgiNL!ViFYO zG+#rezm?3kk^TEWA!iF^ccQGzSzle|9n7bgj+AbpA>{!8z)ZTo1_1!QtmIGs1BtR% A*8l(j literal 6469 zcmb_g&5s*N75B1V!hiq?iR+7zHlAqQ_Dqt^GD}u?lL;}&&O|fLj#d%Nl)KAzXWHFO zRrPpAVK{I>+6y->TsUy#kKoE5z?lOV{tSMvs@q-daW<@k6=&R4@4b2-zxPr7?8)2j zv|Id{pZ@!oe^P(_!_IrH7Jt8swOoW}VkU!^I!j-5WIBsesXKeGI$^fRGc8qTuk+;~ z_-QccTy1w!v5;7p2pxw#Ef#qqd#Nk=2zG)&Z+EbBZ*XsLd+^bn z-QABs5J?@XI5&=HJeTxXCP_vonMxwcru6tSmnxCbOe%U%DnRZW4SvUM)ytL4i%Ame zIgVSLMX|~$=tr?O^uY&IDNjO$^Y~m+sH8BGdOe*LDwJcKL*Q909KbLNs3%Gx{Y@qY zlT<(p9BrgFI5*7~q>7Z1I5pU?fA%_3^A8G`G}ESBt!cw>&fZF5`(uxP$W+T-IF})B zIHq#5VvDj6Tm1iC=cUG9sGiG6q$cK{N`{5fFfb&$8-!Up1p_PEi__G`agl{{K|Mo* z6$kr<{Z)j;Vj@-VCA--&g&D%hHeQBQDd9{ z34YIw$@N~pkF|L*fx3(SybgZ93g8;Zbigto|4d#2bP=HNqT}!Z$rY3LbA`@dZFfXr z<{6u`31#3Z;{bvovSKcKy8u0d_WYsDWg5vej9qR_RJKHFOmTeY%bmc{!M8C#-wy6t zK7Q^A-OE+Bh_#G(@55l=_DXE`M6`%GVO)y!_`J%BUYJ;UHupypnLNf9AGULf=<^&oJHl2s_H z6`q_z_`!(=MLJM}vrHLI(-&C2Fg;x?76Li9jr>|9Od=9Q$0=m%3moLms8$g|BiYM9 zz|LR*JCsO4T0KsSG~|L^J)@kJdskP_8m;A@U;X}P(|21f{(c*+OG8|ssC#;BJKB(!PPeupqa@0OLYa+oRNE%$vwEY!VBkY7tlydp<9fp~q)~l} zJVz9oOg%6XLp{9q>zL%gx+c{DNAbxXDWpv zrHLeDK|GC}OkGSCu`zH`P3#p;qHGOI5D;jt=NEaVAM4Rh^aA7{o?3e9o&)c}h+(FmX<- zoaM`P!dUCMSWPeyZ2qD&1QJsm%W}^|8-7UI*|32mGt6TQ8HOw^A4H>rjypLa~U^3DDCea6npZxA$Z?#(d z{b5a10vscIGb^tRFm|@F7P#!>+qlM61--MGEbX={sLqwv1%$rn%yc6I*ZEOoF`dz| zQJl?|X%xZQUhk8#Hh2kV2M&eZ6@xA2oIYOaZs2Pk?a{6)(Ae@1n#M{SzN7n#i73~g zfR|>a0v`0Om9TIV6f}V^H z9&VF_w-6V3ftN1e9nd9eVc%E zA4&yo)6##ulJ%VDLMP4c*MMGKJe<6y04K3Z=33k@>=;;0uu9GtW0$K)divq5VWCpK zt_->O9+jlso0~msiEg^q!{!CBKkcqu*0qu=AuDGwC4bD`fXBa-(FQxa^;n$bXKUE_MK);g*d2=`aXN^5t=aG zDR#F4M8X#4Ywo+bO*g&5eUpov_p!p9As$FJ(Rf&@er_VGAh8Y*?@W6o?%I=^&Vwhf z+RvW6^{pSZUjK&P?-R}U_3NDLFJNlU7kJyhdL6UQwtiKp+5YpLYZr%g=9;+G;=#v# zetCQb`SvcBXGN~13igA~ zcf$|E-QaR3$iz%yVJvhKb+woksqALb%yV@X>;&gh=_JoUup91yVJC>Cj#N?@w>p|i zdMML0r>D6}W6CG=a8XE=%J@_&x>ub@POt{QJu3JQC1q77ZY zPPMiqR5VS_B}GaKBdOcfd8r~f!Z`$<<-#E>p^&kV$iGs?~-zil*$IG_gPS`G?H3>_$@=@rGlnHfy#xkFdpm?g!5` z{)Xy>j74S={;6bCDh&f8vb$lFXA>~6qTM9RY~W^jG!@h}w7cYB->|>RsGNON;T zTc#*S{Mg1tM70v0G)Lw6z}o{d5S?5nCRYmvkAb^EdYZ78N|oaG)R;o=_j*{HmSd

rI>B_v!$yph|}<1M<)00w{|Cg=c}o2PD@_-p?f*f4LKg(oAzUX&uVIQ^f%UeWbxu zc5haoJ-;stnZ+`T5|<2PmCun26C59Wz85+=_%`9^_rhD2kDt3jcMFxz5-nri`ykwP zdlk03BAz9jAyrN_Hgu!ZN^`l^UY9`IT9zDvj^OmJL@?vnoq1J49c*o6VNF<)R68vF zW@VN`Gq1cCeh}`#PslNmjZ2Oq)P6s_g*6L0NA$iWYJ(b-d#C|S>2lTa-m;_?mX6nX za+c336K{rlKe9AHAye$3j)XTE04@1lMtgF~P}2&8&w?8_dN)wSaNe~LU;>m;)q1?@ zma;sSznbN7nM&;~=cVzUs&eC20H8t`t~OICVyQxN!Dt?*d32U!INPXFLa+REkWKPn ze2DWc;PvQ-5Ra%a@52%(YeWyF7PcNcajk%6>+oRnF_Wx9Sw z5v%qtFCVu$$lreZn;%c!?sWM3b###9gZ}+b4#HXdLwYJxq@*O1uPyA?Ha14nL=*lu zXa#}S3xd}*gRtUtxlgg2u!1CLTx$NMsp>;@E3oZF5H?R!NkVIBh|3afoeXW`>hsdc z_6}rJM1@c&u1SF!+a`V7Y_u2*e5i%>Tbp6jY*>aYZcdTsh(eqEfR|3TVWY2`K0!B= zl+QC6(|7?1)vm7&)Q50(=ebBrNhm((sAfTV)-X6zDH0itB_RuvN#bPcay(0nfs-0) zU-^)@X;FV_iUt*2r+x5Tjdv&s-i z%y2BnsgdA^VuxmeE7FQ?4)RMpcxnI{E*&^n)?ap5iV*~rCa84OpP<}W=a~k{P*4Lu z&;~-`I;t*3d3plazk<|-K3G49xP&RhM~>UMHQZwvy$Lj)%EosTlx8C$6%fhcMvo=h>#=0~mG|)HSXWjK#_Ts=$GW z&lyCp-BuJ-w(J$9kGM)XB?neO?^qV8h$QNlF?og~A9DCnhABlDGNxXK?`!R1+sG4n>rrfo#wXas`h>#8E?m%#6xY46)jT*zRp8bVY*4)nc5- zi+dtFM#rjg%XX%a!JR>OXpP^mOBL5=#zfezQs(Wps>qmEf{r5LI9sYi|A*#|1mxp$Z zxH3-JNz3}v)e3$EpmAM7CvT_j#)gf5Rcx%rgf8uz?gkj{I)m7HD5s%OTw5&DAcpU| z-8&Vtm;QGAQP^EF*w(_y>=lwVeC?w>+EoQwTmC_lL}|nC3H-%WRBKScOZrLyFA=Sk zjY-ZQ)>vO0rl3!GZex3-9SmJw*!K6oiNHYRM0h^(#J16}#0!4Bg>RaSSMbs=-ueBX zG1~L@TNOnGmgl%RaXWeB-e1I2;*RXb1b2b1cXsGg_bP~RzoRW~%|XQ!Y=6WexSP(z zf=5NPMjjl{jVB4(5bjB`Fx-*(cAqBPU}=t*2DZajQW%QF0}{)~$3}o$fT6&X8#60H z5(cD9&F>%Z`e8nwhr-_WL*TcUI#YD-(cs>};qZW80aOf6GF%n8p}i;*<)-Coo*hHY zRLqe8Bu%*4u*7eO!tls?+-?UqeDDBp#I@!^zq>E{tiia3vrPb zcyR>_peBYE40f2FAZuvnG+D>WPEi~oUC0Pydj!+6(-OC5I^{d0okYB`g6CrvlO~wR zs?q+6U9MDYv`dShF4YtU)#{6<)$ON9Mlqw8E2SlLN#SMJC7BC*HF3}+Uv@p)JBi*7 z)b4H6=T$SCCv(eOY$N56oFI|zm!-=1^3> { it('should enable populated BNA import via file selection', (() => { // Select BNA - ImportModalHelper.selectBusinessNetworkDefinitionFromFile('./e2e/data/bna/basic-sample-network.bna'); + ImportModalHelper.selectBusinessNetworkDefinitionFromFile('./e2e/data/bna/importBNA.bna'); // Replace confirm should show, confirm it ReplaceModalHelper.confirmReplace(); @@ -130,10 +130,10 @@ describe('Editor Define', (() => { browser.wait(ExpectedConditions.invisibilityOf(element(by.css('.import'))), 10000); // -success message browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); - // -expected files in navigator (Just a readme) + // -expected files in navigator EditorHelper.retrieveNavigatorFileNames() .then( (list: any) => { - let expectedFiles = ['About\nREADME.md', 'Model File\nmodels/sample.cto', 'Script File\nlib/sample.js', 'Access Control\npermissions.acl']; + let expectedFiles = ['About\nREADME.md', 'Model File\nmodels/sample.cto', 'Script File\nlib/sample.js', 'Access Control\npermissions.acl', 'Query File\nqueries.qry']; list.should.be.deep.equal(expectedFiles); }); // -deploy not enabled @@ -172,7 +172,8 @@ describe('Editor Define', (() => { 'models/', 'models/sample.cto', 'lib/', - 'lib/sample.js' ]; + 'lib/sample.js', + 'queries.qry' ]; contents.length.should.be.equal(expectedContents.length); expectedContents.forEach((element) => { contents.includes(element).should.be.true; @@ -220,6 +221,14 @@ describe('Editor Define', (() => { }); })); + it('should prevent the addition of a file with an invalid file extension', (() => { + let inputFileElement = element(by.id('file-importer_input')); + dragDropFile(inputFileElement, './e2e/data/files/importBanned.wombat'); + browser.wait(ExpectedConditions.visibilityOf(element(by.css('.error'))), 10000); + element(by.id('error_close')).click(); + AddFileModalHelper.exitAdd(); + })); + it('should enable the cancelling of script file addition part way through without completing the file addition', (() => { AddFileModalHelper.selectScriptRadioOption(); @@ -565,12 +574,39 @@ describe('Editor Define', (() => { }); })); - it('should prevent the addition of a file with an invalid file extension', (() => { - let inputFileElement = element(by.id('file-importer_input')); - dragDropFile(inputFileElement, './e2e/data/files/importBanned.wombat'); - browser.wait(ExpectedConditions.visibilityOf(element(by.css('.error'))), 10000); - element(by.id('error_close')).click(); + it('should warn about replacing current query file when adding new query file', (() => { + AddFileModalHelper.exitAdd(); + + EditorHelper.importBND() + .then(() => { + ImportModalHelper.waitForImportModalToAppear(); + }) + .then(() => { + ImportModalHelper.selectBusinessNetworkDefinitionFromFile('./e2e/data/bna/importBNA.bna'); + ReplaceModalHelper.confirmReplace(); + browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); + }) + .then(() => { + EditorHelper.addFile() + .then(() => { + AddFileModalHelper.waitForAddFileModalToAppear(); + }); + }) + .then(() => { + let startFiles; + EditorHelper.retrieveNavigatorFileNames() + .then((names) => { + startFiles = names; + }); + }) + .then(() => { + AddFileModalHelper.selectFromFile('./e2e/data/files/importQuery.qry'); + }) + .then(() => { + ReplaceModalHelper.confirmReplace(); + }); })); + })); })); diff --git a/packages/composer-playground/src/app/editor/add-file/add-file.component.html b/packages/composer-playground/src/app/editor/add-file/add-file.component.html index dc68ebae94..a3dea06604 100644 --- a/packages/composer-playground/src/app/editor/add-file/add-file.component.html +++ b/packages/composer-playground/src/app/editor/add-file/add-file.component.html @@ -22,6 +22,7 @@

Add a file

+
{{currentFileName}}
diff --git a/packages/composer-playground/src/app/editor/add-file/add-file.component.scss b/packages/composer-playground/src/app/editor/add-file/add-file.component.scss index 8f64e306ab..b04a0c1ba5 100644 --- a/packages/composer-playground/src/app/editor/add-file/add-file.component.scss +++ b/packages/composer-playground/src/app/editor/add-file/add-file.component.scss @@ -4,18 +4,19 @@ add-file-modal { .import { width: 700px; - height: 475px; + height: 520px; display: flex; flex-direction: column; .file-types-list { - max-height: 200px; + max-height: 250px; margin-top: 16px; .file-types-list-item { background-color: $third-highlight; padding: $space-medium; + width: 100%; &:nth-child(even) { background-color: $white; } @@ -119,4 +120,3 @@ add-file-modal { } } } - diff --git a/packages/composer-playground/src/app/editor/add-file/add-file.component.spec.ts b/packages/composer-playground/src/app/editor/add-file/add-file.component.spec.ts index 22ada1902f..8ea79c5500 100644 --- a/packages/composer-playground/src/app/editor/add-file/add-file.component.spec.ts +++ b/packages/composer-playground/src/app/editor/add-file/add-file.component.spec.ts @@ -9,7 +9,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { BehaviorSubject, Subject } from 'rxjs/Rx'; import { BusinessNetworkDefinition, AdminConnection } from 'composer-admin'; -import { ModelFile, ModelManager, ScriptManager, Script, AclFile, AssetDeclaration } from 'composer-common'; +import { ModelFile, ModelManager, ScriptManager, Script, AclFile, AssetDeclaration, QueryFile } from 'composer-common'; import { AddFileComponent } from './add-file.component'; import { FileImporterComponent } from '../../file-importer'; @@ -200,6 +200,23 @@ describe('AddFileComponent', () => { createMock.should.have.been.called; })); + it('should call this.createQuery if query file detected', fakeAsync(() => { + + let b = new Blob(['/**QUERY File*/'], {type: 'text/plain'}); + let file = new File([b], 'newfile.qry'); + + let createMock = sandbox.stub(component, 'createQuery'); + let dataBufferMock = sandbox.stub(component, 'getDataBuffer') + .returns(Promise.resolve('some data')); + + // Run method + component.fileAccepted(file); + tick(); + + // Assertions + createMock.should.have.been.called; + })); + it('should call this.fileRejected when there is an error reading the file', fakeAsync(() => { let b = new Blob(['/**CTO File*/'], {type: 'text/plain'}); @@ -351,6 +368,24 @@ describe('AddFileComponent', () => { })); }); + describe('#createQuery', () => { + it('should create a new query file named queries.qry', async(() => { + let dataBuffer = new Buffer('/**QUERY File**/ query things'); + let filename = 'queries.qry'; + let mockQueryFile = sinon.createStubInstance(QueryFile); + mockClientService.createQueryFile.returns(mockQueryFile); + + // Run method + component.createQuery(dataBuffer); + + // Assertions + component.fileType.should.equal('qry'); + mockClientService.createQueryFile.should.have.been.calledWith(filename, dataBuffer.toString()); + component.currentFile.should.deep.equal(mockQueryFile); + component.currentFileName.should.equal(filename); + })); + }); + describe('#createReadme', () => { it('should establish a readme file', async(() => { let dataBuffer = new Buffer('/**README File**/ read all the things'); diff --git a/packages/composer-playground/src/app/editor/add-file/add-file.component.ts b/packages/composer-playground/src/app/editor/add-file/add-file.component.ts index 0246798d96..396da347c6 100644 --- a/packages/composer-playground/src/app/editor/add-file/add-file.component.ts +++ b/packages/composer-playground/src/app/editor/add-file/add-file.component.ts @@ -20,7 +20,7 @@ export class AddFileComponent { expandInput: boolean = false; maxFileSize: number = 5242880; - supportedFileTypes: string[] = ['.js', '.cto', '.md', '.acl']; + supportedFileTypes: string[] = ['.js', '.cto', '.md', '.acl', '.qry']; addModelNamespace: string = 'org.acme.model'; addModelFileName: string = 'models/org.acme.model'; @@ -72,6 +72,10 @@ export class AddFileComponent { this.expandInput = true; this.createRules(data); break; + case 'qry': + this.expandInput = true; + this.createQuery(data); + break; default: throw new Error('Unexpected File Type: ' + type); } @@ -123,6 +127,13 @@ export class AddFileComponent { this.currentFileName = filename; } + createQuery(dataBuffer) { + this.fileType = 'qry'; + let filename = 'queries.qry'; + this.currentFile = this.clientService.createQueryFile(filename, dataBuffer.toString()); + this.currentFileName = filename; + } + fileRejected(reason: string) { this.expandInput = false; this.alertService.errorStatus$.next(reason); diff --git a/packages/composer-playground/src/app/editor/editor-file/editor-file.component.spec.ts b/packages/composer-playground/src/app/editor/editor-file/editor-file.component.spec.ts index 197b50bd77..293ea476fc 100644 --- a/packages/composer-playground/src/app/editor/editor-file/editor-file.component.spec.ts +++ b/packages/composer-playground/src/app/editor/editor-file/editor-file.component.spec.ts @@ -248,6 +248,33 @@ describe('EditorFileComponent', () => { should.not.exist(component['editorContent']); }); + it('should load a query file', () => { + mockClientService.getQueryFile.returns({ + getDefinitions: sinon.stub().returns('my query') + }); + + component['_editorFile'] = { + query: true, + }; + + component.loadFile(); + + component['editorContent'].should.equal('my query'); + component['editorType'].should.equal('code'); + }); + + it('should load a query file but not find it', () => { + mockClientService.getQueryFile.returns(null); + + component['_editorFile'] = { + query: true, + }; + + component.loadFile(); + + should.not.exist(component['editorContent']); + }); + it('should not load any file', () => { component['_editorFile'] = {}; @@ -311,6 +338,20 @@ describe('EditorFileComponent', () => { should.not.exist(component['currentError']); }); + it('should set query file', () => { + component['_editorFile'] = { + query: true, + id: 'query' + }; + + component['editorContent'] = 'my query'; + + component.setCurrentCode(); + + mockClientService.updateFile.should.have.been.calledWith('query', 'my query', 'query'); + should.not.exist(component['currentError']); + }); + it('should set package file', () => { component['_editorFile'] = { package: true, diff --git a/packages/composer-playground/src/app/editor/editor-file/editor-file.component.ts b/packages/composer-playground/src/app/editor/editor-file/editor-file.component.ts index b38cfbc385..0a4a677a37 100644 --- a/packages/composer-playground/src/app/editor/editor-file/editor-file.component.ts +++ b/packages/composer-playground/src/app/editor/editor-file/editor-file.component.ts @@ -100,6 +100,15 @@ export class EditorFileComponent { this.editorContent = marked(readme); this.editorType = 'readme'; } + } else if (this._editorFile.query) { + let queryFile = this.clientService.getQueryFile(); + if (queryFile) { + this.editorContent = queryFile.getDefinitions(); + this.editorType = 'code'; + this.currentError = this.clientService.validateFile(this._editorFile.id, this.editorContent, 'qry'); + } else { + this.editorContent = null; + } } else { this.editorContent = null; } @@ -116,6 +125,8 @@ export class EditorFileComponent { type = 'script'; } else if (this._editorFile.acl) { type = 'acl'; + } else if (this._editorFile.query) { + type = 'query'; } else if (this._editorFile.package) { let packageObject = JSON.parse(this.editorContent); this.clientService.setBusinessNetworkPackageJson(packageObject); diff --git a/packages/composer-playground/src/app/editor/editor.component.html b/packages/composer-playground/src/app/editor/editor.component.html index 04d639f5ca..44ad1063d3 100644 --- a/packages/composer-playground/src/app/editor/editor.component.html +++ b/packages/composer-playground/src/app/editor/editor.component.html @@ -11,6 +11,7 @@

Model File

Script File

Access Control

About

+

Query File

{{file.displayID}}
@@ -62,7 +63,7 @@

{{currentFile.displayID}}

{{deployedPackageVersion}}
-
+
diff --git a/packages/composer-playground/src/app/services/client.service.spec.ts b/packages/composer-playground/src/app/services/client.service.spec.ts index 8af39d2509..cea9cc8a7d 100644 --- a/packages/composer-playground/src/app/services/client.service.spec.ts +++ b/packages/composer-playground/src/app/services/client.service.spec.ts @@ -13,7 +13,7 @@ let expect = chai.expect; import { AdminService } from './admin.service'; import { AlertService } from '../basic-modals/alert.service'; -import { BusinessNetworkDefinition, ModelFile, Script, AclFile } from 'composer-common'; +import { BusinessNetworkDefinition, ModelFile, Script, AclFile, QueryFile } from 'composer-common'; import { ConnectionProfileService } from './connectionprofile.service'; import { BusinessNetworkConnection } from 'composer-client'; import { IdentityService } from './identity.service'; @@ -31,6 +31,7 @@ describe('ClientService', () => { let modelFileMock; let scriptFileMock; let aclFileMock; + let queryFileMock; beforeEach(() => { sandbox = sinon.sandbox.create(); @@ -44,6 +45,7 @@ describe('ClientService', () => { modelFileMock = sinon.createStubInstance(ModelFile); scriptFileMock = sinon.createStubInstance(Script); aclFileMock = sinon.createStubInstance(AclFile); + queryFileMock = sinon.createStubInstance(QueryFile); alertMock.errorStatus$ = {next: sinon.stub()}; alertMock.busyStatus$ = {next: sinon.stub()}; @@ -222,6 +224,23 @@ describe('ClientService', () => { businessNetworkChangedSpy.should.have.been.calledWith(true); })); + it('should update a query file', inject([ClientService], (service: ClientService) => { + let queryManagerMock = { + setQueryFile: sinon.stub() + }; + + businessNetworkDefMock.getQueryManager.returns(queryManagerMock); + + let mockCreateQueryFile = sinon.stub(service, 'createQueryFile').returns(queryFileMock); + + // call function + let result = service.updateFile('query', 'my-query', 'query'); + + queryManagerMock.setQueryFile.should.have.been.calledWith(queryFileMock); + should.not.exist(result); + businessNetworkChangedSpy.should.have.been.calledWith(true); + })); + it('should not update a model file if invalid with a matching namespace', inject([ClientService], (service: ClientService) => { modelManagerMock = { @@ -369,6 +388,25 @@ describe('ClientService', () => { should.not.exist(result); })); + it('should validate a query file', inject([ClientService], (service: ClientService) => { + let queryManagerMock = { + validateQueryFile: sinon.stub() + }; + + businessNetworkDefMock.getQueryManager.returns(queryFileMock); + + queryFileMock = { + validate: sinon.stub() + }; + + sinon.stub(service, 'createQueryFile').returns(queryFileMock); + + let result = service.validateFile('query', 'my-query', 'query'); + + queryFileMock.validate.should.have.been.called; + should.not.exist(result); + })); + it('should return error message if a model file is invalid', inject([ClientService], (service: ClientService) => { let modelManagerMock = { validateModelFile: sinon.stub().throws('invalid') @@ -420,6 +458,25 @@ describe('ClientService', () => { result.should.equal('invalid'); })); + it('should return error message if an query file is invalid', inject([ClientService], (service: ClientService) => { + let queryManagerMock = { + validateQueryFile: sinon.stub() + }; + + businessNetworkDefMock.getQueryManager.returns(queryManagerMock); + + queryFileMock = { + validate: sinon.stub().throws('invalid') + }; + + sinon.stub(service, 'createQueryFile').returns(queryFileMock); + + let result = service.validateFile('query', 'my-query', 'query'); + + queryFileMock.validate.should.have.been.called; + result.should.equal('invalid'); + })); + }); describe('replaceFile', () => { @@ -583,6 +640,22 @@ describe('ClientService', () => { })); }); + describe('getQueryFile', () => { + it('should get the query file', inject([ClientService], (service: ClientService) => { + let queryManagerMock = { + getQueryFile: sinon.stub().returns(queryFileMock) + }; + + businessNetworkDefMock.getQueryManager.returns(queryManagerMock); + let businessNetworkMock = sinon.stub(service, 'getBusinessNetwork').returns(businessNetworkDefMock); + + let result = service.getQueryFile(); + + result.should.deep.equal(queryFileMock); + queryManagerMock.getQueryFile.should.have.been.called; + })); + }); + describe('getMetaData', () => { it('should get the metadata', inject([ClientService], (service: ClientService) => { businessNetworkDefMock.getMetadata.returns({metadata: 'my metadata'}); @@ -614,9 +687,15 @@ describe('ClientService', () => { addScript: sinon.stub() }; + let queryManagerMock = { + setQueryFile: sinon.stub(), + getQueryFile: sinon.stub().returns(queryFileMock) + }; + businessNetworkDefMock.getModelManager.returns(modelManagerMock); businessNetworkDefMock.getScriptManager.returns(scriptManagerMock); businessNetworkDefMock.getAclManager.returns(aclManagerMock); + businessNetworkDefMock.getQueryManager.returns(queryManagerMock); sinon.stub(service, 'getBusinessNetwork').returns(businessNetworkDefMock); @@ -992,9 +1071,15 @@ describe('ClientService', () => { addScript: sinon.stub() }; + let queryManagerMock = { + setQueryFile: sinon.stub(), + getQueryFile: sinon.stub().returns(queryFileMock) + }; + businessNetworkDefMock.getModelManager.returns(modelManagerMock); businessNetworkDefMock.getScriptManager.returns(scriptManagerMock); businessNetworkDefMock.getAclManager.returns(aclManagerMock); + businessNetworkDefMock.getQueryManager.returns(queryManagerMock); sinon.stub(service, 'getBusinessNetwork').returns(businessNetworkDefMock); @@ -1013,4 +1098,20 @@ describe('ClientService', () => { })); }); + describe('createQueryFile', () => { + let mockBusinessNetwork; + + beforeEach(() => { + mockBusinessNetwork = sinon.createStubInstance(BusinessNetworkDefinition); + }); + + it('should create a Query file', fakeAsync(inject([ClientService], (service: ClientService) => { + service['currentBusinessNetwork'] = mockBusinessNetwork; + let queryFile = service.createQueryFile('query', ''); + queryFile.should.be.instanceOf(QueryFile); + mockBusinessNetwork.getModelManager.should.have.been.called; + }))); + + }); + }); diff --git a/packages/composer-playground/src/app/services/client.service.ts b/packages/composer-playground/src/app/services/client.service.ts index 43a33a77fc..f16b9e1ae1 100644 --- a/packages/composer-playground/src/app/services/client.service.ts +++ b/packages/composer-playground/src/app/services/client.service.ts @@ -7,7 +7,7 @@ import { IdentityService } from './identity.service'; import { AlertService } from '../basic-modals/alert.service'; import { BusinessNetworkConnection } from 'composer-client'; -import { BusinessNetworkDefinition, Util, ModelFile, Script, AclFile } from 'composer-common'; +import { BusinessNetworkDefinition, Util, ModelFile, Script, AclFile, QueryFile } from 'composer-common'; /* tslint:disable-next-line:no-var-requires */ const sampleBusinessNetworkArchive = require('basic-sample-network/dist/basic-sample-network.bna'); @@ -44,6 +44,11 @@ export class ClientService { return this.getBusinessNetwork().getScriptManager().createScript(id, type, content); } + // horrible hack for tests + createQueryFile(id, content) { + return new QueryFile(id, this.getBusinessNetwork().getModelManager(), content); + } + // horrible hack for tests createBusinessNetwork(identifier, description, packageJson, readme) { return new BusinessNetworkDefinition(identifier, description, packageJson, readme); @@ -87,6 +92,9 @@ export class ClientService { } else if (type === 'acl') { let aclFile = this.createAclFile(id, content); aclFile.validate(); + } else if (type === 'query') { + let queryFile = this.createQueryFile(id, content); + queryFile.validate(); } return null; } catch (e) { @@ -117,6 +125,9 @@ export class ClientService { } else if (type === 'acl') { let aclFile = this.createAclFile(id, content); this.getBusinessNetwork().getAclManager().setAclFile(aclFile); + } else if (type === 'query') { + let query = this.createQueryFile(id, content); + this.getBusinessNetwork().getQueryManager().setQueryFile(query); } this.businessNetworkChanged$.next(true); @@ -167,6 +178,10 @@ export class ClientService { return this.getBusinessNetwork().getAclManager().getAclFile(); } + getQueryFile(): QueryFile { + return this.getBusinessNetwork().getQueryManager().getQueryFile(); + } + getMetaData() { return this.getBusinessNetwork().getMetadata(); } @@ -353,6 +368,10 @@ export class ClientService { newBusinessNetwork.getAclManager().setAclFile(this.getBusinessNetwork().getAclManager().getAclFile()); } + if (this.getBusinessNetwork().getQueryManager().getQueryFile()) { + newBusinessNetwork.getQueryManager().setQueryFile(this.getBusinessNetwork().getQueryManager().getQueryFile()); + } + this.currentBusinessNetwork = newBusinessNetwork; this.alertService.busyStatus$.next(null); this.businessNetworkChanged$.next(true); diff --git a/packages/composer-playground/src/assets/svg/other/QRY_File.svg b/packages/composer-playground/src/assets/svg/other/QRY_File.svg new file mode 100644 index 0000000000..229d7b9485 --- /dev/null +++ b/packages/composer-playground/src/assets/svg/other/QRY_File.svg @@ -0,0 +1 @@ +qry_file \ No newline at end of file From 30af048d11166f3b175b1c99407eab466ec0ff7a Mon Sep 17 00:00:00 2001 From: Simon Stone Date: Mon, 10 Jul 2017 21:21:04 +0100 Subject: [PATCH 15/88] Only deploy for tagged/release builds and the master branch (#1523) --- .travis/deploy.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis/deploy.sh b/.travis/deploy.sh index eab415e3cb..835f38be24 100755 --- a/.travis/deploy.sh +++ b/.travis/deploy.sh @@ -34,6 +34,12 @@ if [[ "${TRAVIS_REPO_SLUG}" != hyperledger* ]]; then exit 0 fi +# Check that if this is not a tagged build, then we only deploy master. +if [ "${TRAVIS_TAG}" = "" -a "${TRAVIS_BRANCH}" != "master" ]; then + echo Not executing as not building a tag and not building from master + exit 0 +fi + # are we building the docs? if [ "${DOCS}" != "" ]; then if [ -z "${TRAVIS_TAG}" ]; then From 8c28c1fab15e3f8e80833b3795473ce09818c135 Mon Sep 17 00:00:00 2001 From: Simon Stone Date: Mon, 10 Jul 2017 23:34:47 +0100 Subject: [PATCH 16/88] Enable complex queries against nested properties (#1524) --- .../composer-runtime/lib/querycompiler.js | 25 +++++- .../composer-runtime/test/querycompiler.js | 82 ++++++++++++++++++- .../systest/data/queries.qry | 20 +++++ .../systest/data/transactions.queries.qry | 20 +++++ packages/composer-systests/systest/queries.js | 50 +++++++++++ .../systest/transactions.queries.js | 42 ++++++++++ 6 files changed, 234 insertions(+), 5 deletions(-) diff --git a/packages/composer-runtime/lib/querycompiler.js b/packages/composer-runtime/lib/querycompiler.js index f6a8e16ef3..194fff1c1d 100644 --- a/packages/composer-runtime/lib/querycompiler.js +++ b/packages/composer-runtime/lib/querycompiler.js @@ -86,6 +86,8 @@ class QueryCompiler { result = this.visitIdentifier(thing, parameters); } else if (thing.type === 'Literal') { result = this.visitLiteral(thing, parameters); + } else if (thing.type === 'MemberExpression') { + result = this.visitMemberExpression(thing, parameters); } else { throw new Error('Unrecognised type: ' + typeof thing + ', value: ' + JSON.stringify(thing)); } @@ -524,15 +526,19 @@ class QueryCompiler { // Grab the left hand side of this expression. let left = this.visit(ast.left, parameters); const leftIsIdentifier = (ast.left.type === 'Identifier' && typeof left !== 'function'); + const leftIsMemberExpression = (ast.left.type === 'MemberExpression'); + const leftIsVariable = leftIsIdentifier || leftIsMemberExpression; const leftIsLiteral = (ast.left.type === 'Literal' || typeof left === 'function'); // Grab the right hand side of this expression. let right = this.visit(ast.right, parameters); const rightIsIdentifier = (ast.right.type === 'Identifier' && typeof right !== 'function'); + const rightIsMemberExpression = (ast.right.type === 'MemberExpression'); + const rightIsVariable = rightIsIdentifier || rightIsMemberExpression; const rightIsLiteral = (ast.right.type === 'Literal' || typeof right === 'function'); // Check for invalid left and right expressions. - if (leftIsLiteral === rightIsLiteral || leftIsIdentifier === rightIsIdentifier) { + if (leftIsLiteral === rightIsLiteral || leftIsVariable === rightIsVariable) { // Either two literals or two identifiers. throw new Error('The query compiler cannot compile condition operators that do not have an identifier and a literal'); } @@ -630,6 +636,23 @@ class QueryCompiler { return selector; } + /** + * Visitor design pattern; handle a member expression. + * @param {Object} ast The abstract syntax tree being visited. + * @param {Object} parameters The parameters. + * @return {Object} The result of visiting, or null. + * @private + */ + visitMemberExpression(ast, parameters) { + const method = 'visitMemberExpression'; + LOG.entry(method, ast, parameters); + const property = this.visit(ast.property, parameters); + const object = this.visit(ast.object, parameters); + const selector = `${object}.${property}`; + LOG.exit(method, selector); + return selector; + } + } module.exports = QueryCompiler; diff --git a/packages/composer-runtime/test/querycompiler.js b/packages/composer-runtime/test/querycompiler.js index 933dbdc42f..ceaa10571e 100644 --- a/packages/composer-runtime/test/querycompiler.js +++ b/packages/composer-runtime/test/querycompiler.js @@ -137,6 +137,12 @@ describe('QueryCompiler', () => { SELECT org.acme.sample.SampleAsset ORDER BY [foo ASC, bar DESC] } + query Q14 { + description: "Select all drivers aged older than PARAM" + statement: + SELECT org.acme.sample.SampleAsset + WHERE (baa.moo.neigh.meow.woof == _$animalNoise) + } `); queryFile1.validate(); queries = {}; @@ -164,7 +170,7 @@ describe('QueryCompiler', () => { const compiledQueryBundle = queryCompiler.compile(queryManager); compiledQueryBundle.queryCompiler.should.equal(queryCompiler); compiledQueryBundle.compiledQueries.should.be.an('array'); - compiledQueryBundle.compiledQueries.should.have.lengthOf(13); + compiledQueryBundle.compiledQueries.should.have.lengthOf(14); compiledQueryBundle.compiledQueries.should.all.have.property('name'); compiledQueryBundle.compiledQueries.should.all.have.property('hash'); compiledQueryBundle.compiledQueries.should.all.have.property('generator'); @@ -177,7 +183,7 @@ describe('QueryCompiler', () => { it('should visit all of the things', () => { const compiled = queryCompiler.visit(queryManager, {}); compiled.should.be.an('array'); - compiled.should.have.lengthOf(13); + compiled.should.have.lengthOf(14); compiled.should.all.have.property('name'); compiled.should.all.have.property('hash'); compiled.should.all.have.property('generator'); @@ -196,7 +202,7 @@ describe('QueryCompiler', () => { it('should compile all queries in the query manager', () => { const compiled = queryCompiler.visitQueryManager(queryManager, {}); compiled.should.be.an('array'); - compiled.should.have.lengthOf(13); + compiled.should.have.lengthOf(14); compiled.should.all.have.property('name'); compiled.should.all.have.property('hash'); compiled.should.all.have.property('generator'); @@ -216,7 +222,7 @@ describe('QueryCompiler', () => { it('should compile all queries in the query file', () => { const compiled = queryCompiler.visitQueryFile(queryFile1, {}); compiled.should.be.an('array'); - compiled.should.have.lengthOf(13); + compiled.should.have.lengthOf(14); compiled.should.all.have.property('name'); compiled.should.all.have.property('hash'); compiled.should.all.have.property('generator'); @@ -252,6 +258,14 @@ describe('QueryCompiler', () => { compiled.generator({ foo: 'Red hat' }).should.equal('{"selector":{"$class":"org.acme.sample.SampleAsset","$registryType":"Asset","$registryID":"org.acme.sample.SampleAsset","value":{"$eq":"Red hat"}}}'); }); + it('should compile a query with nested parameters', () => { + const compiled = queryCompiler.visitQuery(queries.Q14, {}); + compiled.name.should.equal('Q14'); + compiled.hash.should.equal('951f2465d94148ffbe2e4c081fe6c8f73f95056ccdb8be3dcb8180ba6f3d9098'); + compiled.generator.should.be.a('function'); + compiled.generator({ animalNoise: 'ribbet' }).should.equal('{"selector":{"$class":"org.acme.sample.SampleAsset","$registryType":"Asset","$registryID":"org.acme.sample.SampleAsset","baa.moo.neigh.meow.woof":{"$eq":"ribbet"}}}'); + }); + }); describe('#buildTrivialCompiledQueryGenerator', () => { @@ -989,4 +1003,64 @@ describe('QueryCompiler', () => { }); + describe('#visitMemberExpression', () => { + + it('should return a nested property value', () => { + const ast = { + type: 'MemberExpression', + object: { + type: 'Identifier', + name: 'baa' + }, + property: { + type: 'Identifier', + name: 'moo' + }, + computed: false + }; + queryCompiler.visitMemberExpression(ast, {}).should.equal('baa.moo'); + }); + + it('should return a deeply nested property value', () => { + const ast = { + type: 'MemberExpression', + object: { + type: 'MemberExpression', + object: { + type: 'MemberExpression', + object: { + type: 'MemberExpression', + object: { + type: 'Identifier', + name: 'baa' + }, + property: { + type: 'Identifier', + name: 'moo' + }, + computed: false + }, + property: { + type: 'Identifier', + name: 'neigh' + }, + computed: false + }, + property: { + type: 'Identifier', + name: 'meow' + }, + computed: false + }, + property: { + type: 'Identifier', + name: 'woof' + }, + computed: false + }; + queryCompiler.visitMemberExpression(ast, {}).should.equal('baa.moo.neigh.meow.woof'); + }); + + }); + }); diff --git a/packages/composer-systests/systest/data/queries.qry b/packages/composer-systests/systest/data/queries.qry index 5b96eaf4d8..478027e6f8 100644 --- a/packages/composer-systests/systest/data/queries.qry +++ b/packages/composer-systests/systest/data/queries.qry @@ -17,3 +17,23 @@ query participants_stringValueParameter { description: "" statement: SELECT systest.queries.SampleParticipant WHERE (stringValue == _$inputStringValue) } + +query assets_nestedStringValue { + description: "" + statement: SELECT systest.queries.SampleAsset WHERE (conceptValue.stringValue == 'string 0') +} + +query participants_nestedStringValue { + description: "" + statement: SELECT systest.queries.SampleParticipant WHERE (conceptValue.stringValue == 'string 0') +} + +query assets_nestedStringValueParameter { + description: "" + statement: SELECT systest.queries.SampleAsset WHERE (conceptValue.stringValue == _$inputStringValue) +} + +query participants_nestedStringValueParameter { + description: "" + statement: SELECT systest.queries.SampleParticipant WHERE (conceptValue.stringValue == _$inputStringValue) +} diff --git a/packages/composer-systests/systest/data/transactions.queries.qry b/packages/composer-systests/systest/data/transactions.queries.qry index 1007b40f0f..c97415d865 100644 --- a/packages/composer-systests/systest/data/transactions.queries.qry +++ b/packages/composer-systests/systest/data/transactions.queries.qry @@ -17,3 +17,23 @@ query participants_stringValueParameter { description: "" statement: SELECT systest.transactions.queries.SampleParticipant WHERE (stringValue == _$inputStringValue) } + +query assets_nestedStringValue { + description: "" + statement: SELECT systest.transactions.queries.SampleAsset WHERE (conceptValue.stringValue == 'string 0') +} + +query participants_nestedStringValue { + description: "" + statement: SELECT systest.transactions.queries.SampleParticipant WHERE (conceptValue.stringValue == 'string 0') +} + +query assets_nestedStringValueParameter { + description: "" + statement: SELECT systest.transactions.queries.SampleAsset WHERE (conceptValue.stringValue == _$inputStringValue) +} + +query participants_nestedStringValueParameter { + description: "" + statement: SELECT systest.transactions.queries.SampleParticipant WHERE (conceptValue.stringValue == _$inputStringValue) +} diff --git a/packages/composer-systests/systest/queries.js b/packages/composer-systests/systest/queries.js index 3cb5720636..0bbedde639 100644 --- a/packages/composer-systests/systest/queries.js +++ b/packages/composer-systests/systest/queries.js @@ -230,6 +230,56 @@ describe('Query system tests', () => { }); }); + it('should execute a named query on a nested string property', () => { + return client.query(`${type}_nestedStringValue`) + .then((resources) => { + const actual = resources.map((resource) => { + return serializer.toJSON(resource); + }); + actual.should.deep.equal(expected.filter((thing) => { + return thing.conceptValue.stringValue === 'string 0'; + })); + }); + }); + + it('should execute a dynamic query on a nested string property', () => { + const query = client.buildQuery(`SELECT ${resource} WHERE (conceptValue.stringValue == 'string 0')`); + return client.query(query) + .then((resources) => { + const actual = resources.map((resource) => { + return serializer.toJSON(resource); + }); + actual.should.deep.equal(expected.filter((thing) => { + return thing.conceptValue.stringValue === 'string 0'; + })); + }); + }); + + it('should execute a named query on a nested string property using a parameter', () => { + return client.query(`${type}_nestedStringValueParameter`, { inputStringValue: 'string 1' }) + .then((resources) => { + const actual = resources.map((resource) => { + return serializer.toJSON(resource); + }); + actual.should.deep.equal(expected.filter((thing) => { + return thing.conceptValue.stringValue === 'string 1'; + })); + }); + }); + + it('should execute a dynamic query on a nested string property using a parameter', () => { + const query = client.buildQuery(`SELECT ${resource} WHERE (conceptValue.stringValue == _$inputStringValue)`); + return client.query(query, { inputStringValue: 'string 1' }) + .then((resources) => { + const actual = resources.map((resource) => { + return serializer.toJSON(resource); + }); + actual.should.deep.equal(expected.filter((thing) => { + return thing.conceptValue.stringValue === 'string 1'; + })); + }); + }); + }); }); diff --git a/packages/composer-systests/systest/transactions.queries.js b/packages/composer-systests/systest/transactions.queries.js index 442aee9ab6..29d5fe1c7b 100644 --- a/packages/composer-systests/systest/transactions.queries.js +++ b/packages/composer-systests/systest/transactions.queries.js @@ -226,6 +226,48 @@ describe('Transaction (query specific) system tests', () => { return client.submitTransaction(tx); }); + it('should execute a named query on a nested string property', () => { + const tx = factory.newTransaction('systest.transactions.queries', 'SampleTransaction'); + tx.namedQuery = `${type}_nestedStringValue`; + tx.expected = JSON.stringify(expected.filter((thing) => { + return thing.conceptValue.stringValue === 'string 0'; + })); + return client.submitTransaction(tx); + }); + + it('should execute a dynamic query on a nested string property', () => { + const tx = factory.newTransaction('systest.transactions.queries', 'SampleTransaction'); + tx.dynamicQuery = `SELECT ${resource} WHERE (conceptValue.stringValue == 'string 0')`; + tx.expected = JSON.stringify(expected.filter((thing) => { + return thing.conceptValue.stringValue === 'string 0'; + })); + return client.submitTransaction(tx); + }); + + it('should execute a named query on a nested string property using a parameter', () => { + const tx = factory.newTransaction('systest.transactions.queries', 'SampleTransaction'); + tx.namedQuery = `${type}_stringValueParameter`; + tx.parameters = JSON.stringify({ + inputStringValue: 'string 1' + }); + tx.expected = JSON.stringify(expected.filter((thing) => { + return thing.conceptValue.stringValue === 'string 1'; + })); + return client.submitTransaction(tx); + }); + + it('should execute a dynamic query on a nested string property using a parameter', () => { + const tx = factory.newTransaction('systest.transactions.queries', 'SampleTransaction'); + tx.dynamicQuery = `SELECT ${resource} WHERE (stringValue == _$inputStringValue)`; + tx.parameters = JSON.stringify({ + inputStringValue: 'string 1' + }); + tx.expected = JSON.stringify(expected.filter((thing) => { + return thing.conceptValue.stringValue === 'string 1'; + })); + return client.submitTransaction(tx); + }); + }); }); From 906a7406231124d3a49b6f521853865449e90b78 Mon Sep 17 00:00:00 2001 From: Kai Usher Date: Tue, 11 Jul 2017 10:40:34 +0100 Subject: [PATCH 17/88] update validation notes for query (#1528) --- contrib-notes/release-process/playground-validation.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib-notes/release-process/playground-validation.md b/contrib-notes/release-process/playground-validation.md index 2dc77bde9f..d3b194774a 100644 --- a/contrib-notes/release-process/playground-validation.md +++ b/contrib-notes/release-process/playground-validation.md @@ -117,6 +117,10 @@ Select ACL file - Reverse change to resource field - Error message should disappear +Add a query file - a dummy file can be found at composer/packages/composer-playground/e2e/data/files/importQuery.qry + - It should become the focal item and contents should show in the editor + - Edit the file to cause a breakage, it should show an error message under the editor. Repair the file and the error message should disappear. + Select the main model file and delete it - Deploy button should not be active - ACL file navigation menu should be shown in error (via red indicators) From f5fc03423dfde735b8123174978db174cbc4c3b2 Mon Sep 17 00:00:00 2001 From: Tobias Hunter Date: Tue, 11 Jul 2017 16:40:00 +0100 Subject: [PATCH 18/88] Styling changes to README & typography fixes (#1532) * styling changes to READMEs * fixes * fixes * fixes --- .../editor-file/editor-file.component.scss | 16 ++++++------ .../src/app/editor/editor.component.scss | 25 +++++++++++++++++-- .../src/assets/styles/base/_codemirror.scss | 6 ++++- .../src/assets/styles/base/_typography.scss | 9 +++++++ .../src/assets/styles/composer.scss | 2 +- 5 files changed, 46 insertions(+), 12 deletions(-) diff --git a/packages/composer-playground/src/app/editor/editor-file/editor-file.component.scss b/packages/composer-playground/src/app/editor/editor-file/editor-file.component.scss index ee4f02b31f..aecc7ee9a5 100644 --- a/packages/composer-playground/src/app/editor/editor-file/editor-file.component.scss +++ b/packages/composer-playground/src/app/editor/editor-file/editor-file.component.scss @@ -1,4 +1,4 @@ -@import '../../../assets/styles/base/colors'; + @import '../../../assets/styles/base/colors'; @import '../../../assets/styles/base/variables'; editor-file { @@ -25,13 +25,13 @@ editor-file { } } - .readme { - background-color: $white; - padding: $space-large; - min-height: 63vh; - max-height: 63vh; - overflow-y: scroll; - } + // .readme { + // background-color: $white; + // padding: $space-large; + // min-height: 63vh; + // max-height: 63vh; + // overflow-y: scroll; + // } } .CodeMirror { diff --git a/packages/composer-playground/src/app/editor/editor.component.scss b/packages/composer-playground/src/app/editor/editor.component.scss index 7ea3a9e5d2..c20458ea0f 100644 --- a/packages/composer-playground/src/app/editor/editor.component.scss +++ b/packages/composer-playground/src/app/editor/editor.component.scss @@ -97,9 +97,30 @@ app-editor { .readme { background-color: $white; padding: $space-large; - min-height: 63vh; - max-height: 63vh; + min-height: 72vh; + max-height: 72vh; overflow-y: auto; + + pre { + font-size: 0.8rem; + color: $white; + background-color: #272B36; + code { + background-color: transparent; + border: none; + font-size: 0.7rem; + } + } + + code { + border: 1px solid $keyline-highlight; + background-color: $white; + border-radius: 2px; + padding-right: 5px; + padding-left: 5px; + padding-top: 1px; + padding-bottom: 1px; + } } .edit_icon { diff --git a/packages/composer-playground/src/assets/styles/base/_codemirror.scss b/packages/composer-playground/src/assets/styles/base/_codemirror.scss index b16ce05964..ee40d4f439 100644 --- a/packages/composer-playground/src/assets/styles/base/_codemirror.scss +++ b/packages/composer-playground/src/assets/styles/base/_codemirror.scss @@ -72,6 +72,10 @@ .alert-message{ flex:1; - color: #8C9696; + color: $secondary-text; padding-left:1rem; + + p { + margin-top: 5px; + } } diff --git a/packages/composer-playground/src/assets/styles/base/_typography.scss b/packages/composer-playground/src/assets/styles/base/_typography.scss index baa0cf57ef..366a7ca390 100644 --- a/packages/composer-playground/src/assets/styles/base/_typography.scss +++ b/packages/composer-playground/src/assets/styles/base/_typography.scss @@ -3,6 +3,9 @@ @import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700|Source+Code+Pro'); .composer { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: greyscale; + h1, h2, h3 { line-height: 100%; margin: 0; @@ -131,6 +134,12 @@ border: 1px solid $keyline-highlight; padding: 1rem; border-radius: 5px; + // -webkit-font-smoothing: antialiased; + } + + code { + font-family: $svg-font; + font-size: 0.8rem; } blockquote { diff --git a/packages/composer-playground/src/assets/styles/composer.scss b/packages/composer-playground/src/assets/styles/composer.scss index 1c674c4f3a..a921591fef 100644 --- a/packages/composer-playground/src/assets/styles/composer.scss +++ b/packages/composer-playground/src/assets/styles/composer.scss @@ -1,5 +1,5 @@ -@import 'base/_codemirror'; @import 'base/_colors.scss'; +@import 'base/_codemirror'; @import 'base/_variables.scss'; @import 'base/_extends.scss'; @import 'base/_typography.scss'; From 7e6c956f458fa2c904f47b2c24ccae5e0a84969b Mon Sep 17 00:00:00 2001 From: Simon Stone Date: Tue, 11 Jul 2017 20:18:31 +0100 Subject: [PATCH 19/88] Move to Hyperledger Fabric v1.0.0 (npm dependencies, system tests) (#1533) --- packages/composer-connector-hlfv1/package.json | 4 ++-- .../composer-systests/hlfv1/docker-compose.tls.yml | 8 ++++---- packages/composer-systests/hlfv1/docker-compose.yml | 8 ++++---- packages/composer-systests/scripts/run-system-tests.sh | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/composer-connector-hlfv1/package.json b/packages/composer-connector-hlfv1/package.json index cc494612ed..bbb882f555 100644 --- a/packages/composer-connector-hlfv1/package.json +++ b/packages/composer-connector-hlfv1/package.json @@ -42,8 +42,8 @@ "dependencies": { "composer-common": "^0.9.2", "composer-runtime-hlfv1": "^0.9.2", - "fabric-ca-client": "1.0.0-rc1", - "fabric-client": "1.0.0-rc1", + "fabric-ca-client": "^1.0.0", + "fabric-client": "^1.0.0", "fs-extra": "^1.0.0", "semver": "^5.3.0", "temp": "^0.8.3", diff --git a/packages/composer-systests/hlfv1/docker-compose.tls.yml b/packages/composer-systests/hlfv1/docker-compose.tls.yml index 821da2c19b..2924f2ef4c 100644 --- a/packages/composer-systests/hlfv1/docker-compose.tls.yml +++ b/packages/composer-systests/hlfv1/docker-compose.tls.yml @@ -2,7 +2,7 @@ version: '2' services: ca.org1.example.com: - image: hyperledger/fabric-ca:x86_64-1.0.0-rc1 + image: hyperledger/fabric-ca:x86_64-1.0.0 environment: - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - FABRIC_CA_SERVER_CA_NAME=ca.org1.example.com @@ -19,7 +19,7 @@ services: orderer.example.com: container_name: orderer.example.com - image: hyperledger/fabric-orderer:x86_64-1.0.0-rc1 + image: hyperledger/fabric-orderer:x86_64-1.0.0 environment: - ORDERER_GENERAL_LOGLEVEL=debug - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 @@ -44,7 +44,7 @@ services: peer0.org1.example.com: container_name: peer0.org1.example.com - image: hyperledger/fabric-peer:x86_64-1.0.0-rc1 + image: hyperledger/fabric-peer:x86_64-1.0.0 environment: - CORE_LOGGING_PEER=debug - CORE_CHAINCODE_LOGGING_LEVEL=DEBUG @@ -78,7 +78,7 @@ services: couchdb: container_name: couchdb - image: hyperledger/fabric-couchdb:x86_64-1.0.0-rc1 + image: hyperledger/fabric-couchdb:x86_64-1.0.0 ports: - 5984:5984 environment: diff --git a/packages/composer-systests/hlfv1/docker-compose.yml b/packages/composer-systests/hlfv1/docker-compose.yml index ae5b07c6e0..c300790cd8 100644 --- a/packages/composer-systests/hlfv1/docker-compose.yml +++ b/packages/composer-systests/hlfv1/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: ca.org1.example.com: - image: hyperledger/fabric-ca:x86_64-1.0.0-rc1 + image: hyperledger/fabric-ca:x86_64-1.0.0 environment: - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - FABRIC_CA_SERVER_CA_NAME=ca.org1.example.com @@ -15,7 +15,7 @@ services: orderer.example.com: container_name: orderer.example.com - image: hyperledger/fabric-orderer:x86_64-1.0.0-rc1 + image: hyperledger/fabric-orderer:x86_64-1.0.0 environment: - ORDERER_GENERAL_LOGLEVEL=debug - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 @@ -33,7 +33,7 @@ services: peer0.org1.example.com: container_name: peer0.org1.example.com - image: hyperledger/fabric-peer:x86_64-1.0.0-rc1 + image: hyperledger/fabric-peer:x86_64-1.0.0 environment: - CORE_LOGGING_PEER=debug - CORE_CHAINCODE_LOGGING_LEVEL=DEBUG @@ -62,7 +62,7 @@ services: couchdb: container_name: couchdb - image: hyperledger/fabric-couchdb:x86_64-1.0.0-rc1 + image: hyperledger/fabric-couchdb:x86_64-1.0.0 ports: - 5984:5984 environment: diff --git a/packages/composer-systests/scripts/run-system-tests.sh b/packages/composer-systests/scripts/run-system-tests.sh index f700fa23a2..a9062c70a0 100755 --- a/packages/composer-systests/scripts/run-system-tests.sh +++ b/packages/composer-systests/scripts/run-system-tests.sh @@ -47,11 +47,11 @@ for SYSTEST in $(echo ${SYSTEST} | tr "," " "); do else DOCKER_FILE=${DIR}/hlfv1/docker-compose.yml fi - docker pull hyperledger/fabric-peer:x86_64-1.0.0-rc1 - docker pull hyperledger/fabric-ca:x86_64-1.0.0-rc1 - docker pull hyperledger/fabric-ccenv:x86_64-1.0.0-rc1 - docker pull hyperledger/fabric-orderer:x86_64-1.0.0-rc1 - docker pull hyperledger/fabric-couchdb:x86_64-1.0.0-rc1 + docker pull hyperledger/fabric-peer:x86_64-1.0.0 + docker pull hyperledger/fabric-ca:x86_64-1.0.0 + docker pull hyperledger/fabric-ccenv:x86_64-1.0.0 + docker pull hyperledger/fabric-orderer:x86_64-1.0.0 + docker pull hyperledger/fabric-couchdb:x86_64-1.0.0 if [ ! -d ./hlfv1/crypto-config ]; then cd hlfv1 tar -xvf crypto-config.tar.gz From e614ac08c19ce6b43254203c23463cd242f54ad4 Mon Sep 17 00:00:00 2001 From: Liam Grace <14gracel@users.noreply.github.com> Date: Wed, 12 Jul 2017 10:51:36 +0100 Subject: [PATCH 20/88] Remove double scroll bar (#1527) --- .../composer-playground/src/app/footer/footer.component.scss | 5 ++--- .../src/assets/styles/components/_side-bar-nav.scss | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/composer-playground/src/app/footer/footer.component.scss b/packages/composer-playground/src/app/footer/footer.component.scss index 00140b9c70..117519e48a 100644 --- a/packages/composer-playground/src/app/footer/footer.component.scss +++ b/packages/composer-playground/src/app/footer/footer.component.scss @@ -5,18 +5,17 @@ app-footer { position: relative; display: flex; width: 100%; - bottom: -($space-large); .footer-main{ position: relative; bottom: 0; flex: 1; - padding: 22px 10px 22px 10px; + padding: 20px 10px 20px 10px; border-top: solid 1px #D0DADA; color: $secondary-text ; font-size: 12px; display: flex; - height: 62px; + height: 55px; .footer-left, .footer-right{ flex:1; diff --git a/packages/composer-playground/src/assets/styles/components/_side-bar-nav.scss b/packages/composer-playground/src/assets/styles/components/_side-bar-nav.scss index 016f28e649..f1f0dd8473 100644 --- a/packages/composer-playground/src/assets/styles/components/_side-bar-nav.scss +++ b/packages/composer-playground/src/assets/styles/components/_side-bar-nav.scss @@ -38,6 +38,6 @@ .main-view { background-color: $fourth-highlight; width: 100%; - padding: $space-large; + padding: $space-large $space-large 0 $space-large; } } From 7a38ff695a7cf4d15baf81912a3ae1d2dbd33cd2 Mon Sep 17 00:00:00 2001 From: Liam Grace <14gracel@users.noreply.github.com> Date: Wed, 12 Jul 2017 13:04:07 +0100 Subject: [PATCH 21/88] Fix ability to issue identity to none existent participant (#1526) --- .../lib/businessnetworkconnection.js | 19 ++++++++++++++++++- .../test/businessnetworkconnection.js | 16 ++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/packages/composer-client/lib/businessnetworkconnection.js b/packages/composer-client/lib/businessnetworkconnection.js index 4c10c8e111..e848ae5705 100644 --- a/packages/composer-client/lib/businessnetworkconnection.js +++ b/packages/composer-client/lib/businessnetworkconnection.js @@ -552,13 +552,30 @@ class BusinessNetworkConnection extends EventEmitter { throw new Error('userID not specified'); } let participantFQI; + let participantId; + let participantType; if (participant instanceof Resource) { participantFQI = participant.getFullyQualifiedIdentifier(); + participantId = participant.getIdentifier(); + participantType = participant.getFullyQualifiedType(); } else { participantFQI = participant; + participantId = participantFQI.substring(participantFQI.lastIndexOf('#') + 1); + participantType = participantFQI.substr(0, participantFQI.lastIndexOf('#')); } + Util.securityCheck(this.securityContext); - return this.connection.createIdentity(this.securityContext, userID, options) + return this.getParticipantRegistry(participantType) + .then((participantRegistry) => { + return participantRegistry.exists(participantId); + }) + .then((exists) => { + if (exists) { + return this.connection.createIdentity(this.securityContext, userID, options); + } else { + throw new Error(`Participant '${participantFQI}' does not exist `); + } + }) .then((identity) => { return Util.invokeChainCode(this.securityContext, 'addParticipantIdentity', [participantFQI, userID]) .then(() => { diff --git a/packages/composer-client/test/businessnetworkconnection.js b/packages/composer-client/test/businessnetworkconnection.js index ec7d0fbb1b..b327e7967e 100644 --- a/packages/composer-client/test/businessnetworkconnection.js +++ b/packages/composer-client/test/businessnetworkconnection.js @@ -55,6 +55,7 @@ describe('BusinessNetworkConnection', () => { let mockQueryFile; let mockFactory; let mockSerializer; + let mockParticipantRegistry; beforeEach(() => { sandbox = sinon.sandbox.create(); @@ -74,6 +75,7 @@ describe('BusinessNetworkConnection', () => { mockSerializer = sinon.createStubInstance(Serializer); businessNetworkConnection.businessNetwork.getSerializer.returns(mockSerializer); businessNetworkConnection.securityContext = mockSecurityContext; + mockParticipantRegistry = sinon.createStubInstance(ParticipantRegistry); delete process.env.COMPOSER_CONFIG; }); @@ -868,6 +870,11 @@ describe('BusinessNetworkConnection', () => { userID: 'dogeid1', userSecret: 'suchsecret' }); + + mockParticipantRegistry.exists.resolves(true); + businessNetworkConnection.getParticipantRegistry = () => { + return Promise.resolve(mockParticipantRegistry); + }; }); it('should throw if participant not specified', () => { @@ -931,6 +938,15 @@ describe('BusinessNetworkConnection', () => { }); }); + it('should throw if participant does not exist', () => { + sandbox.stub(Util, 'invokeChainCode').resolves(); + mockParticipantRegistry.exists.resolves(false); + + return businessNetworkConnection.issueIdentity('org.doge.Doge#DOGE_1', 'dogeid1') + .catch((error) => { + error.should.match(/does not exist /); + }); + }); }); describe('#revokeIdentity', () => { From b1c4e0d9cac59faec94cf21062bffb62b9954aa8 Mon Sep 17 00:00:00 2001 From: Liam Grace <14gracel@users.noreply.github.com> Date: Wed, 12 Jul 2017 16:35:00 +0100 Subject: [PATCH 22/88] Prevent identifying fields in transaction and event model (#1517) (#1544) * Fixed protractor tests * Prevent identifying fields in transaction and event model --- .../data/businessnetwork/models/mozart.cto | 2 +- .../lib/introspect/classdeclaration.js | 11 + .../lib/introspect/eventdeclaration.js | 14 + .../lib/introspect/transactiondeclaration.js | 15 + packages/composer-common/lib/system.cto | 2 +- .../test/data/model/concept2.cto | 10 +- .../model/dependencies/contract/proforma.cto | 4 +- .../test/data/model/farm2fork.cto | 2 +- .../classdeclaration.dupetransactionname.cto | 4 +- .../test/introspect/functiondeclaration.js | 2 +- .../test/introspect/transactiondeclaration.js | 13 +- .../e2e/data/bna/basic-sample-network.bna | Bin 5574 -> 6444 bytes .../e2e/tests/editor-define.spec.ts | 507 +++++++++--------- .../e2e/utils/add-file-helper.ts | 23 +- .../e2e/utils/editor-helper.ts | 9 +- .../e2e/utils/import-helper.ts | 10 +- .../e2e/utils/operations-helper.ts | 2 +- .../e2e/utils/replace-helper.ts | 4 +- .../src/app/app.component.html | 4 +- .../composer-runtime/test/data/mozart.cto | 2 +- .../templates/models/namespace.cto | 2 +- .../model/templates/models/namespace.cto | 2 +- .../test/businessnetworkconnector.js | 3 +- 23 files changed, 330 insertions(+), 317 deletions(-) diff --git a/packages/composer-admin/test/data/businessnetwork/models/mozart.cto b/packages/composer-admin/test/data/businessnetwork/models/mozart.cto index 221437a2be..76e47aed01 100644 --- a/packages/composer-admin/test/data/businessnetwork/models/mozart.cto +++ b/packages/composer-admin/test/data/businessnetwork/models/mozart.cto @@ -103,7 +103,7 @@ asset Business identified by sbi { /** * An abstract transaction type for animal movements */ -abstract transaction AnimalMovement identified by transactionId { +abstract transaction AnimalMovement { o String transactionId o String[] logs optional --> Animal animal diff --git a/packages/composer-common/lib/introspect/classdeclaration.js b/packages/composer-common/lib/introspect/classdeclaration.js index fa80673402..da89dbf9a1 100644 --- a/packages/composer-common/lib/introspect/classdeclaration.js +++ b/packages/composer-common/lib/introspect/classdeclaration.js @@ -167,6 +167,17 @@ class ClassDeclaration { if(classDecl===null) { throw new IllegalModelException('Could not find super type ' + this.superType, this.modelFile, this.ast.location); } + + // Prevent extending declaration with different type of declaration + const supertypeDeclaration = this.getModelFile().getType(this.superType); + if (supertypeDeclaration) { + if (this.constructor.name !== supertypeDeclaration.constructor.name) { + let typeName = this.getSystemType(); + let superTypeName = supertypeDeclaration.getSystemType(); + throw new IllegalModelException(`${typeName} (${this.getName()}) cannot extend ${superTypeName} (${supertypeDeclaration.getName()})`, this.modelFile, this.ast.location); + } + } + // TODO (DCS) // else { // // check that assets only inherit from assets etc. diff --git a/packages/composer-common/lib/introspect/eventdeclaration.js b/packages/composer-common/lib/introspect/eventdeclaration.js index e1162227bb..edef12cf0b 100644 --- a/packages/composer-common/lib/introspect/eventdeclaration.js +++ b/packages/composer-common/lib/introspect/eventdeclaration.js @@ -16,6 +16,7 @@ const ClassDeclaration = require('./classdeclaration'); const IllegalModelException = require('./illegalmodelexception'); +const ModelUtil = require('../modelutil'); /** Class representing the definition of an Event. * @extends ClassDeclaration @@ -58,6 +59,19 @@ class EventDeclaration extends ClassDeclaration { if(!this.isSystemType() && this.getName() === 'Event') { throw new IllegalModelException('Event is a reserved type name.', this.modelFile, this.ast.location); } + + let systemTypeDeclared = true; + + // If using models without importing system models + try { + this.getModelFile().getType(ModelUtil.getSystemNamespace() + '.' + this.getSystemType()); + } catch (e) { + systemTypeDeclared = false; + } + + if (!this.isSystemType() && this.idField && systemTypeDeclared) { + throw new IllegalModelException('Event should not specify an identifying field.', this.modelFile, this.ast.location); + } } /** diff --git a/packages/composer-common/lib/introspect/transactiondeclaration.js b/packages/composer-common/lib/introspect/transactiondeclaration.js index 4c807dfcb0..06485b78c3 100644 --- a/packages/composer-common/lib/introspect/transactiondeclaration.js +++ b/packages/composer-common/lib/introspect/transactiondeclaration.js @@ -16,6 +16,8 @@ const ClassDeclaration = require('./classdeclaration'); const IllegalModelException = require('./illegalmodelexception'); +const ModelUtil = require('../modelutil'); + /** Class representing the definition of an Transaction. * @extends ClassDeclaration @@ -58,6 +60,19 @@ class TransactionDeclaration extends ClassDeclaration { if(!this.isSystemType() && this.getName() === 'Transaction') { throw new IllegalModelException('Transaction is a reserved type name.', this.modelFile, this.ast.location); } + + let systemTypeDeclared = true; + + // If using models without importing system models + try { + this.getModelFile().getType(ModelUtil.getSystemNamespace() + '.' + this.getSystemType()); + } catch (e) { + systemTypeDeclared = false; + } + + if (!this.isSystemType() && this.idField && systemTypeDeclared) { + throw new IllegalModelException('Transaction should not specify an identifying field.', this.modelFile, this.ast.location); + } } } diff --git a/packages/composer-common/lib/system.cto b/packages/composer-common/lib/system.cto index 84618d4c98..ec816a76fb 100644 --- a/packages/composer-common/lib/system.cto +++ b/packages/composer-common/lib/system.cto @@ -4,7 +4,7 @@ abstract asset Asset { } abstract participant Participant { } -abstract transaction Transaction identified by transactionId{ +abstract transaction Transaction { o String transactionId o DateTime timestamp } diff --git a/packages/composer-common/test/data/model/concept2.cto b/packages/composer-common/test/data/model/concept2.cto index a6b1ec85f8..8a568c395d 100755 --- a/packages/composer-common/test/data/model/concept2.cto +++ b/packages/composer-common/test/data/model/concept2.cto @@ -146,18 +146,18 @@ asset POContractorRecord identified by poContractorKey { *****************************/ /** Create purchase order from PO provider, ie SAP system */ -transaction CreatePO identified by trxId { +transaction CreatePO { o String trxId o PurchaseOrder po } -transaction UpdatePOContractorSupplierDetails identified by trxId { +transaction UpdatePOContractorSupplierDetails { o String trxId o String poNumber o POContractorSupplierDetails poContractorSupplierDetails } -transaction UpdatePOContractorBuyerDetails identified by trxId { +transaction UpdatePOContractorBuyerDetails { o String trxId o String poNumber o POContractorBuyerDetails poContractorBuyerDetails @@ -166,7 +166,7 @@ transaction UpdatePOContractorBuyerDetails identified by trxId { /** * Transaction for supplier account manager to approve purchase order buyer details */ -transaction ApprovePOContractorBuyerDetails identified by trxId { +transaction ApprovePOContractorBuyerDetails { o String trxId o String poNumber } @@ -174,7 +174,7 @@ transaction ApprovePOContractorBuyerDetails identified by trxId { /** * Transaction for buyer manager to approve purchase order supplier details */ -transaction ApprovePOContractorSupplierDetails identified by trxId { +transaction ApprovePOContractorSupplierDetails { o String trxId o String poNumber } diff --git a/packages/composer-common/test/data/model/dependencies/contract/proforma.cto b/packages/composer-common/test/data/model/dependencies/contract/proforma.cto index 183aedf18b..0bff5acfa3 100644 --- a/packages/composer-common/test/data/model/dependencies/contract/proforma.cto +++ b/packages/composer-common/test/data/model/dependencies/contract/proforma.cto @@ -41,13 +41,13 @@ asset ProForma identified by id { o Clause[] clauses } -transaction CreateProForma identified by id { +transaction CreateProForma { o String id o String description o Clause[] clauses } -transaction UpdateProForma identified by id { +transaction UpdateProForma { o String id o String description o Clause[] clauses diff --git a/packages/composer-common/test/data/model/farm2fork.cto b/packages/composer-common/test/data/model/farm2fork.cto index 8aa35247d2..d0ceba4d77 100644 --- a/packages/composer-common/test/data/model/farm2fork.cto +++ b/packages/composer-common/test/data/model/farm2fork.cto @@ -57,7 +57,7 @@ abstract transaction AnimalTransaction { } -transaction Foo extends Meat { +transaction Foo { } diff --git a/packages/composer-common/test/data/parser/classdeclaration.dupetransactionname.cto b/packages/composer-common/test/data/parser/classdeclaration.dupetransactionname.cto index 901e107513..82c4d9e821 100644 --- a/packages/composer-common/test/data/parser/classdeclaration.dupetransactionname.cto +++ b/packages/composer-common/test/data/parser/classdeclaration.dupetransactionname.cto @@ -1,11 +1,11 @@ namespace com.testing -transaction AssetTransaction identified by id { +transaction AssetTransaction { o String id o String newValue } -transaction AssetTransaction identified by id { +transaction AssetTransaction { o String id o String newValue } \ No newline at end of file diff --git a/packages/composer-common/test/introspect/functiondeclaration.js b/packages/composer-common/test/introspect/functiondeclaration.js index 52f6cbd9f3..781bf3a4c6 100644 --- a/packages/composer-common/test/introspect/functiondeclaration.js +++ b/packages/composer-common/test/introspect/functiondeclaration.js @@ -25,7 +25,7 @@ const sinon = require('sinon'); describe('FunctionDeclaration', () => { const modelManager = new ModelManager(); - modelManager.addModelFile('namespace org.acme transaction TestTransaction identified by id {o String id}'); + modelManager.addModelFile('namespace org.acme transaction TestTransaction {}'); let mozartModel = fs.readFileSync('test/data/model/mozart.cto', 'utf8'); modelManager.addModelFile(mozartModel, 'mozart.cto'); diff --git a/packages/composer-common/test/introspect/transactiondeclaration.js b/packages/composer-common/test/introspect/transactiondeclaration.js index e384e121f5..952d897260 100644 --- a/packages/composer-common/test/introspect/transactiondeclaration.js +++ b/packages/composer-common/test/introspect/transactiondeclaration.js @@ -23,20 +23,17 @@ require('chai').should(); const sinon = require('sinon'); describe('TransactionDeclaration', () => { - - let mockModelManager; let mockSystemTransaction; let mockClassDeclaration; let sandbox; + let modelManager; beforeEach(() => { sandbox = sinon.sandbox.create(); - mockModelManager = sinon.createStubInstance(ModelManager); + modelManager = new ModelManager(); mockSystemTransaction = sinon.createStubInstance(TransactionDeclaration); mockSystemTransaction.getFullyQualifiedName.returns('org.hyperledger.composer.system.Transaction'); - mockModelManager.getSystemTypes.returns([mockSystemTransaction]); mockClassDeclaration = sinon.createStubInstance(ClassDeclaration); - mockModelManager.getType.returns(mockClassDeclaration); mockClassDeclaration.getProperties.returns([]); }); @@ -45,15 +42,15 @@ describe('TransactionDeclaration', () => { }); describe('#validate', () => { + it('should throw error name is Transaction', () => { const model = ` namespace com.test - transaction Transaction identified by transactionId { - o String transactionId + transaction Transaction { }`; - const modelFile = new ModelFile(mockModelManager, model); + const modelFile = new ModelFile(modelManager, model); const p = modelFile.getTransactionDeclarations()[0]; (() => { diff --git a/packages/composer-playground/e2e/data/bna/basic-sample-network.bna b/packages/composer-playground/e2e/data/bna/basic-sample-network.bna index 5bce114bb238f88a395565cae82bfa4162e565d0..2404572cb450a010dac2c295bc6d44aeb87fc380 100644 GIT binary patch literal 6444 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 C=LI$Z literal 5574 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 A*8l(j diff --git a/packages/composer-playground/e2e/tests/editor-define.spec.ts b/packages/composer-playground/e2e/tests/editor-define.spec.ts index 94c89d219c..3687e6a275 100644 --- a/packages/composer-playground/e2e/tests/editor-define.spec.ts +++ b/packages/composer-playground/e2e/tests/editor-define.spec.ts @@ -1,4 +1,4 @@ -import { browser, element, by } from 'protractor'; +import { browser, element, by } from 'protractor'; import { ExpectedConditions } from 'protractor'; import { OperationsHelper } from '../utils/operations-helper.ts'; import { EditorHelper } from '../utils/editor-helper.ts'; @@ -16,12 +16,14 @@ let should = chai.should(); describe('Editor Define', (() => { - // Navigate to Editor base page and move past welcome splash - beforeAll(() => { - OperationsHelper.navigatePastWelcome(); - }); - describe('On initialise', (() => { + + // Navigate to Editor base page and move past welcome splash + beforeAll(() => { + browser.get(browser.baseUrl); + OperationsHelper.navigatePastWelcome(); + }); + it('should initialise the side navigation with basic sample network', (() => { // Check Files (Basic Sample Files) Present and clickable // -within
@@ -59,6 +61,11 @@ describe('Editor Define', (() => { })); describe('Import BND button', (() => { + // Navigate to Editor base page and move past welcome splash + beforeAll(() => { + browser.get(browser.baseUrl); + OperationsHelper.navigatePastWelcome(); + }); // Press the 'Import' button beforeEach(() => { @@ -147,6 +154,12 @@ describe('Editor Define', (() => { describe('Export BND button', (() => { + // Navigate to Editor base page and move past welcome splash + beforeAll(() => { + browser.get(browser.baseUrl); + OperationsHelper.navigatePastWelcome(); + }); + it('should export BNA named as the package name', (() => { let filename; EditorHelper.retrieveDeployedPackageName() @@ -191,11 +204,32 @@ describe('Editor Define', (() => { describe('Add File button', (() => { - // Press the 'AddFile' button + let startFiles = [ 'About\nREADME.md', + 'Model File\nmodels/sample.cto', + 'Script File\nlib/sample.js', + 'Access Control\npermissions.acl']; + + // Navigate to Editor base page and move past welcome splash + beforeAll(() => { + browser.get(browser.baseUrl); + OperationsHelper.navigatePastWelcome(); + }); + + // Reset the BNA and then press the 'AddFile' button beforeEach(() => { - EditorHelper.addFile() + + EditorHelper.importBND() .then(() => { - AddFileModalHelper.waitForAddFileModalToAppear(); + ImportModalHelper.waitForImportModalToAppear(); + ImportModalHelper.selectBusinessNetworkDefinitionFromFile('./e2e/data/bna/basic-sample-network.bna'); + ReplaceModalHelper.confirmReplace(); + browser.wait(ExpectedConditions.invisibilityOf(element(by.css('.import'))), 10000); + browser.wait(ExpectedConditions.invisibilityOf(element(by.id('success_notify'))), 10000); + + EditorHelper.addFile() + .then(() => { + AddFileModalHelper.waitForAddFileModalToAppear(); + }); }); }); @@ -266,310 +300,252 @@ describe('Editor Define', (() => { })); it('should enable the addition of a script file via radio button selection', (() => { - let startFiles = EditorHelper.retrieveNavigatorFileNames() - .then((names) => { - startFiles = names; - }) - .then(() => { - AddFileModalHelper.selectScriptRadioOption(); - }) - .then(() => { - // Add File - AddFileModalHelper.confirmAdd(); - }) - .then(() => { - browser.waitForAngularEnabled(false); - // Check extracted against new template file that we should have in the list - EditorHelper.retrieveNavigatorFileNames() - .then((list: any) => { - // Previous files should still exist - startFiles.forEach((element) => { - list.includes(element).should.be.true; - }); - // We should have added one file - list.length.should.be.equal(startFiles.length + 1); - list.includes('Script File\nlib/script.js').should.be.true; - browser.waitForAngularEnabled(true); + AddFileModalHelper.selectScriptRadioOption(); + AddFileModalHelper.confirmAdd(); + browser.waitForAngularEnabled(false); + // Check extracted against new template file that we should have in the list + EditorHelper.retrieveNavigatorFileNames() + .then((list: any) => { + // Previous files should still exist + startFiles.forEach((element) => { + list.includes(element).should.be.true; }); - // -deploy enabled + // We should have added one file + list.length.should.be.equal(startFiles.length + 1); + list.includes('Script File\nlib/script.js').should.be.true; + browser.waitForAngularEnabled(true); + }); + // -deploy enabled + EditorHelper.retrieveNavigatorFileActionButtons() + .then((array: any) => { + array[1].enabled.should.be.equal(true); + }); + // -active file + EditorHelper.retrieveNavigatorActiveFile() + .then((list: any) => { + list.length.should.equal(1); + list.includes('Script File\nlib/script.js').should.be.true; + }); + // deploy new item + EditorHelper.deployBND() + .then(() => { + // -success message + browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); + // -deploy disabled EditorHelper.retrieveNavigatorFileActionButtons() .then((array: any) => { - array[1].enabled.should.be.equal(true); - }); - // -active file - EditorHelper.retrieveNavigatorActiveFile() - .then((list: any) => { - list.length.should.equal(1); - list.includes('Script File\nlib/script.js').should.be.true; - }); - // deploy new item - EditorHelper.deployBND() - .then(() => { - // -success message - browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); - // -deploy disabled - EditorHelper.retrieveNavigatorFileActionButtons() - .then((array: any) => { - array[1].enabled.should.be.equal(false); - }); + array[1].enabled.should.be.equal(false); }); }); })); it('should enable the addition of a script file via file input event', (() => { - let startFiles; + AddFileModalHelper.selectFromFile('./e2e/data/files/importScript.js'); + browser.waitForAngularEnabled(false); + // Check extracted against new file that we should have in the list EditorHelper.retrieveNavigatorFileNames() - .then((names) => { - startFiles = names; - }) - .then(() => { - AddFileModalHelper.selectFromFile('./e2e/data/files/importScript.js'); - }) - .then(() => { - browser.waitForAngularEnabled(false); - // Check extracted against new file that we should have in the list - EditorHelper.retrieveNavigatorFileNames() - .then( (list: any) => { - // Previous files should still exist - startFiles.forEach((element) => { - list.includes(element).should.be.true; - }); - // We should have added one file - list.length.should.be.equal(startFiles.length + 1); - list.includes('Script File\nlib/importScript.js').should.be.true; - browser.waitForAngularEnabled(true); + .then( (list: any) => { + // Previous files should still exist + startFiles.forEach((element) => { + list.includes(element).should.be.true; }); - // -deploy enabled + // We should have added one file + list.length.should.be.equal(startFiles.length + 1); + list.includes('Script File\nlib/importScript.js').should.be.true; + browser.waitForAngularEnabled(true); + }); + // -deploy enabled + EditorHelper.retrieveNavigatorFileActionButtons() + .then((array: any) => { + array[1].enabled.should.be.equal(true); + }); + // -active file + EditorHelper.retrieveNavigatorActiveFile() + .then((list: any) => { + list.length.should.equal(1); + list.includes('Script File\nlib/importScript.js').should.be.true; + }); + // deploy new item + EditorHelper.deployBND() + .then(() => { + // -success message + browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); + // -deploy disabled EditorHelper.retrieveNavigatorFileActionButtons() .then((array: any) => { - array[1].enabled.should.be.equal(true); - }); - // -active file - EditorHelper.retrieveNavigatorActiveFile() - .then((list: any) => { - list.length.should.equal(1); - list.includes('Script File\nlib/importScript.js').should.be.true; - }); - // deploy new item - EditorHelper.deployBND() - .then(() => { - // -success message - browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); - // -deploy disabled - EditorHelper.retrieveNavigatorFileActionButtons() - .then((array: any) => { - array[1].enabled.should.be.equal(false); - }); + array[1].enabled.should.be.equal(false); }); }); })); it('should enable the addition of a model file via radio button selection', (() => { - let startFiles; + AddFileModalHelper.selectModelRadioOption(); + AddFileModalHelper.confirmAdd(); + browser.waitForAngularEnabled(false); + // -active file + EditorHelper.retrieveNavigatorActiveFile() + .then((list: any) => { + list.length.should.equal(1); + list[0].should.be.equal('Model File\nmodels/org.acme.model.cto'); + browser.waitForAngularEnabled(true); + }); + // Check extracted against new template file that we should have in the list EditorHelper.retrieveNavigatorFileNames() - .then((names) => { - startFiles = names; - }) - .then(() => { - AddFileModalHelper.selectModelRadioOption(); - }) - .then(() => { - // Add option becomes enabled - AddFileModalHelper.confirmAdd(); - }) - .then(() => { - browser.waitForAngularEnabled(false); - // -active file - EditorHelper.retrieveNavigatorActiveFile() - .then((list: any) => { - list.length.should.equal(1); - list.includes('Model File\nmodels/org.acme.model.cto').should.be.true; - browser.waitForAngularEnabled(true); - }); - // Check extracted against new template file that we should have in the list - EditorHelper.retrieveNavigatorFileNames() - .then( (list: any) => { - // Previous files should still exist - startFiles.forEach((element) => { - list.includes(element).should.be.true; - }); - // We should have added one file - list.length.should.be.equal(startFiles.length + 1); - list.includes('Model File\nmodels/org.acme.model.cto').should.be.true; + .then( (list: any) => { + // Previous files should still exist + startFiles.forEach((element) => { + list.includes(element).should.be.true; }); - // -deploy enabled + // We should have added one file + list.length.should.be.equal(startFiles.length + 1); + list.includes('Model File\nmodels/org.acme.model.cto').should.be.true; + }); + // -deploy enabled + EditorHelper.retrieveNavigatorFileActionButtons() + .then((array: any) => { + array[1].enabled.should.be.equal(true); + }); + // deploy new item + EditorHelper.deployBND() + .then(() => { + // -success message + browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); + // -deploy disabled EditorHelper.retrieveNavigatorFileActionButtons() .then((array: any) => { - array[1].enabled.should.be.equal(true); - }); - // deploy new item - EditorHelper.deployBND() - .then(() => { - // -success message - browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); - // -deploy disabled - EditorHelper.retrieveNavigatorFileActionButtons() - .then((array: any) => { - array[1].enabled.should.be.equal(false); - }); + array[1].enabled.should.be.equal(false); }); }); })); it('should enable the addition of a model file via file input event', (() => { - let startFiles; + + AddFileModalHelper.selectFromFile('./e2e/data/files/importModel.cto'); + + browser.waitForAngularEnabled(false); + // -active file + EditorHelper.retrieveNavigatorActiveFile() + .then((list: any) => { + list.length.should.equal(1); + list.includes('Model File\nmodels/importModel.cto').should.be.true; + browser.waitForAngularEnabled(true); + }); + // Check extracted against new file that we should have in the list EditorHelper.retrieveNavigatorFileNames() - .then((names) => { - startFiles = names; - }) - .then(() => { - AddFileModalHelper.selectFromFile('./e2e/data/files/importModel.cto'); - }) - .then(() => { - browser.waitForAngularEnabled(false); - // -active file - EditorHelper.retrieveNavigatorActiveFile() - .then((list: any) => { - list.length.should.equal(1); - list.includes('Model File\nmodels/importModel.cto').should.be.true; - browser.waitForAngularEnabled(true); - }); - // Check extracted against new file that we should have in the list - EditorHelper.retrieveNavigatorFileNames() - .then( (list: any) => { - // Previous files should still exist - startFiles.forEach((element) => { - list.includes(element).should.be.true; - }); - // We should have added one file - list.length.should.be.equal(startFiles.length + 1); - list.includes('Model File\nmodels/importModel.cto').should.be.true; + .then( (list: any) => { + // Previous files should still exist + startFiles.forEach((element) => { + list.includes(element).should.be.true; }); - // -deploy enabled + // We should have added one file + list.length.should.be.equal(startFiles.length + 1); + list.includes('Model File\nmodels/importModel.cto').should.be.true; + }); + // -deploy enabled + EditorHelper.retrieveNavigatorFileActionButtons() + .then((array: any) => { + array[1].enabled.should.be.equal(true); + }); + // deploy new item + EditorHelper.deployBND() + .then(() => { + // -success message + browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); + // -deploy disabled EditorHelper.retrieveNavigatorFileActionButtons() .then((array: any) => { - array[1].enabled.should.be.equal(true); - }); - // deploy new item - EditorHelper.deployBND() - .then(() => { - // -success message - browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); - // -deploy disabled - EditorHelper.retrieveNavigatorFileActionButtons() - .then((array: any) => { - array[1].enabled.should.be.equal(false); - }); + array[1].enabled.should.be.equal(false); }); }); })); it('should enable the addition of an ACL file via file input event', (() => { - let startFiles; - EditorHelper.retrieveNavigatorFileNames() - .then((names) => { - startFiles = names; - }) - .then(() => { - AddFileModalHelper.selectFromFile('./e2e/data/files/importACL.acl'); - }) - .then(() => { - // Replace confirm modal should show - ReplaceModalHelper.confirmReplace(); - }) - .then(() => { - browser.waitForAngularEnabled(false); - // -active file - EditorHelper.retrieveNavigatorActiveFile() - .then((list: any) => { - list.length.should.equal(1); - list.includes('Access Control\npermissions.acl').should.be.true; - }); - // Check code mirror for new contents (we only have one permissions file) - EditorFileHelper.retrieveEditorCodeMirrorText() - .then((text) => { - text.should.contain('description: "Newly imported ACL file"'); - }); + + AddFileModalHelper.selectFromFile('./e2e/data/files/importACL.acl'); + ReplaceModalHelper.confirmReplace(); + + browser.waitForAngularEnabled(false); + // -active file + EditorHelper.retrieveNavigatorActiveFile() + .then((list: any) => { + list.length.should.equal(1); + list.should.contain('Access Control\npermissions.acl'); browser.waitForAngularEnabled(true); - // Check file list unchanged - EditorHelper.retrieveNavigatorFileNames() - .then( (list: any) => { - // No new file (names) - list.length.should.be.equal(startFiles.length); - // Previous files should still exist - startFiles.forEach((element) => { - list.includes(element).should.be.true; - }); + }); + // Check code mirror for new contents (we only have one permissions file) + EditorFileHelper.retrieveEditorCodeMirrorText() + .then((text) => { + text.should.contain('description: "Newly imported ACL file"'); + }); + + // Check file list unchanged + EditorHelper.retrieveNavigatorFileNames() + .then( (list: any) => { + // Previous files should still exist + startFiles.forEach((element) => { + list.should.contain(element); }); - // -deploy enabled + }); + + // -deploy enabled + EditorHelper.retrieveNavigatorFileActionButtons() + .then((array: any) => { + array[1].enabled.should.be.equal(true); + }); + // deploy new item + EditorHelper.deployBND() + .then(() => { + // -success message + browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); + // -deploy disabled EditorHelper.retrieveNavigatorFileActionButtons() .then((array: any) => { - array[1].enabled.should.be.equal(true); - }); - // deploy new item - EditorHelper.deployBND() - .then(() => { - // -success message - browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); - // -deploy disabled - EditorHelper.retrieveNavigatorFileActionButtons() - .then((array: any) => { - array[1].enabled.should.be.equal(false); - }); + array[1].enabled.should.be.equal(false); }); }); })); it('should enable the addition of a Readme file via file input event', (() => { - let startFiles; + + AddFileModalHelper.selectFromFile('./e2e/data/files/importReadMe.md'); + + // Replace confirm modal should show + ReplaceModalHelper.confirmReplace(); + // Check for new contents (we only have one readme file) + // -active file + EditorHelper.retrieveNavigatorActiveFile() + .then((list: any) => { + list.length.should.equal(1); + list.includes('About\nREADME.md').should.be.true; + }); + EditorFileHelper.retrieveEditorText() + .then((text) => { + text.should.contain('This is the NEW readme.'); + }); + // Check file list unchanged EditorHelper.retrieveNavigatorFileNames() - .then((names) => { - startFiles = names; - }) - .then(() => { - AddFileModalHelper.selectFromFile('./e2e/data/files/importReadMe.md'); - }) - .then(() => { - // Replace confirm modal should show - ReplaceModalHelper.confirmReplace(); - }) - .then(() => { - // Check for new contents (we only have one readme file) - // -active file - EditorHelper.retrieveNavigatorActiveFile() - .then((list: any) => { - list.length.should.equal(1); - list.includes('About\nREADME.md').should.be.true; - }); - EditorFileHelper.retrieveEditorText() - .then((text) => { - text.should.contain('This is the NEW readme.'); - }); - // Check file list unchanged - EditorHelper.retrieveNavigatorFileNames() - .then( (list: any) => { - // No new file (names) - list.length.should.be.equal(startFiles.length); - // Previous files should still exist - startFiles.forEach((element) => { - list.includes(element).should.be.true; - }); + .then( (list: any) => { + // No new file (names) + list.length.should.be.equal(startFiles.length); + // Previous files should still exist + startFiles.forEach((element) => { + list.includes(element).should.be.true; }); - // -deploy enabled + }); + // -deploy enabled + EditorHelper.retrieveNavigatorFileActionButtons() + .then((array: any) => { + array[1].enabled.should.be.equal(true); + }); + // deploy new item + EditorHelper.deployBND() + .then(() => { + // -success message + browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); + // -deploy disabled EditorHelper.retrieveNavigatorFileActionButtons() .then((array: any) => { - array[1].enabled.should.be.equal(true); - }); - // deploy new item - EditorHelper.deployBND() - .then(() => { - // -success message - browser.wait(ExpectedConditions.visibilityOf(element(by.id('success_notify'))), 10000); - // -deploy disabled - EditorHelper.retrieveNavigatorFileActionButtons() - .then((array: any) => { - array[1].enabled.should.be.equal(false); - }); + array[1].enabled.should.be.equal(false); }); }); })); @@ -593,7 +569,6 @@ describe('Editor Define', (() => { }); }) .then(() => { - let startFiles; EditorHelper.retrieveNavigatorFileNames() .then((names) => { startFiles = names; diff --git a/packages/composer-playground/e2e/utils/add-file-helper.ts b/packages/composer-playground/e2e/utils/add-file-helper.ts index fe60b0bc4b..74784c9e9b 100644 --- a/packages/composer-playground/e2e/utils/add-file-helper.ts +++ b/packages/composer-playground/e2e/utils/add-file-helper.ts @@ -7,13 +7,13 @@ export class AddFileModalHelper { // Wait for modal to appear static waitForAddFileModalToAppear() { - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 5000); + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 10000); } // Cancel Add static cancelAdd() { // AddFile modal should be present - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 5000) + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 10000) .then(() => { return element(by.id('add-file_cancel')).click(); }); @@ -22,7 +22,7 @@ export class AddFileModalHelper { // Exit Add static exitAdd() { // AddFile modal should be present - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 5000) + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 10000) .then(() => { return element(by.id('add-file_exit')).click(); }); @@ -31,10 +31,10 @@ export class AddFileModalHelper { // Confirm Add static confirmAdd() { // AddFile modal should be present - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 5000) + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 10000) .then(() => { let addElement = element(by.id('add-file_confirm')); - browser.wait(ExpectedConditions.elementToBeClickable(addElement), 5000); + browser.wait(ExpectedConditions.elementToBeClickable(addElement), 10000); return addElement.click(); }); } @@ -42,10 +42,10 @@ export class AddFileModalHelper { // Select Script file via Radio Button static selectScriptRadioOption() { // AddFile modal should be present - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 5000) + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 10000) .then(() => { let selectElement = element(by.css('[for="file-type-js"]')); - browser.wait(ExpectedConditions.elementToBeClickable(selectElement), 5000); + browser.wait(ExpectedConditions.elementToBeClickable(selectElement), 10000); return selectElement.click(); }); } @@ -53,10 +53,10 @@ export class AddFileModalHelper { // Select Model file via Radio Button static selectModelRadioOption() { // AddFile modal should be present - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 5000) + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 10000) .then(() => { let selectElement = element(by.css('[for="file-type-cto"]')); - browser.wait(ExpectedConditions.elementToBeClickable(selectElement), 5000); + browser.wait(ExpectedConditions.elementToBeClickable(selectElement), 10000); return selectElement.click(); }); } @@ -64,13 +64,12 @@ export class AddFileModalHelper { // Select BND from BNA file drop static selectFromFile(filePath: string) { // Import modal should be present - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 5000) + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 10000) .then(() => { - // Import empty-network let inputFileElement = element(by.id('file-importer_input')); let importElement = element(by.id('add-file_confirm')); dragDropFile(inputFileElement, filePath); - browser.wait(ExpectedConditions.elementToBeClickable(importElement), 5000); + browser.wait(ExpectedConditions.elementToBeClickable(importElement), 10000); return importElement.click(); }); } diff --git a/packages/composer-playground/e2e/utils/editor-helper.ts b/packages/composer-playground/e2e/utils/editor-helper.ts index a874b051f0..45e66f84f6 100644 --- a/packages/composer-playground/e2e/utils/editor-helper.ts +++ b/packages/composer-playground/e2e/utils/editor-helper.ts @@ -1,7 +1,6 @@ import { browser, element, by } from 'protractor'; import { ExpectedConditions } from 'protractor'; - let scrollMe = (target) => { target.scrollIntoView(true); }; @@ -34,7 +33,7 @@ export class EditorHelper { static retrieveNavigatorFileNames() { // Due to scroll bar, need to scroll element into view in order to inspect text return element(by.css('.side-bar-nav')).all(by.css('.flex-container')).map((elm) => { browser.executeScript(scrollMe, elm); - browser.wait(ExpectedConditions.visibilityOf(elm), 5000); + browser.wait(ExpectedConditions.visibilityOf(elm), 10000); return elm.getText(); }); } @@ -61,8 +60,12 @@ export class EditorHelper { // Retrieve current 'active' file from navigator static retrieveNavigatorActiveFile() { return element(by.css('.files')).all(by.css('.active')).map((elm) => { browser.executeScript(scrollMe, elm); - browser.wait(ExpectedConditions.visibilityOf(elm), 5000); + browser.wait(ExpectedConditions.visibilityOf(elm), 10000); return elm.getText(); }); } + // Retrieve Editor Side Navigation File Elements + static clickNavigatorFileItem(name: string) { + return element(by.css('.side-bar-nav')).all(by.css('.flex-container')).filter((element) => { return element.getText().then((text) => { return text.indexOf(name) !== -1; }); }).click(); + } } diff --git a/packages/composer-playground/e2e/utils/import-helper.ts b/packages/composer-playground/e2e/utils/import-helper.ts index 94a76b08d8..d23e1d8a49 100644 --- a/packages/composer-playground/e2e/utils/import-helper.ts +++ b/packages/composer-playground/e2e/utils/import-helper.ts @@ -7,14 +7,14 @@ export class ImportModalHelper { // Select BND from BNA file drop static selectBusinessNetworkDefinitionFromFile(filePath: string) { // Import modal should be present - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 5000) + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 10000) .then(() => { let inputFileElement = element(by.id('file-importer_input')); return dragDropFile(inputFileElement, filePath); }) .then(() => { let importElement = element(by.id('import_confirm')); - return browser.wait(ExpectedConditions.elementToBeClickable(importElement), 5000) + return browser.wait(ExpectedConditions.elementToBeClickable(importElement), 10000) .then(() => { return importElement.click(); }); @@ -24,7 +24,7 @@ export class ImportModalHelper { // Confirm import static confirmImport() { // Import modal should be present - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 5000) + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 10000) .then(() => { return element(by.id('import_confirm')).click(); }); @@ -33,13 +33,13 @@ export class ImportModalHelper { // Cancel import static cancelImport() { // Import modal should be present - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 5000) + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 10000) .then(() => { return element(by.id('import_cancel')).click(); }); } static waitForImportModalToAppear() { - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 5000); + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.import'))), 10000); } } diff --git a/packages/composer-playground/e2e/utils/operations-helper.ts b/packages/composer-playground/e2e/utils/operations-helper.ts index 96039d45aa..39a7c5340a 100644 --- a/packages/composer-playground/e2e/utils/operations-helper.ts +++ b/packages/composer-playground/e2e/utils/operations-helper.ts @@ -9,7 +9,7 @@ export class OperationsHelper { .then(() => { return element(by.id('welcome_start')).click() .then(() => { - return browser.wait(ExpectedConditions.invisibilityOf(element(by.css('.welcome'))), 5000); + return browser.wait(ExpectedConditions.invisibilityOf(element(by.css('.welcome'))), 10000); }); }); }; diff --git a/packages/composer-playground/e2e/utils/replace-helper.ts b/packages/composer-playground/e2e/utils/replace-helper.ts index 889de912f2..b676da896a 100644 --- a/packages/composer-playground/e2e/utils/replace-helper.ts +++ b/packages/composer-playground/e2e/utils/replace-helper.ts @@ -6,14 +6,14 @@ export class ReplaceModalHelper { // Cancel replace static cancelReplace() { // Replace modal should be present - browser.wait(ExpectedConditions.visibilityOf(element(by.css('.replace'))), 5000); + browser.wait(ExpectedConditions.visibilityOf(element(by.css('.replace'))), 10000); return element(by.id('replace_cancel')).click(); } // Confirm Replace static confirmReplace() { // Replace modal should be present - return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.replace'))), 5000) + return browser.wait(ExpectedConditions.visibilityOf(element(by.css('.replace'))), 10000) .then(() => { return element(by.id('replace_confirm')).click(); }); diff --git a/packages/composer-playground/src/app/app.component.html b/packages/composer-playground/src/app/app.component.html index 7e780bb912..b31b2e0c63 100644 --- a/packages/composer-playground/src/app/app.component.html +++ b/packages/composer-playground/src/app/app.component.html @@ -6,10 +6,10 @@
  • - +
  • - +
    diff --git a/packages/composer-runtime/test/data/mozart.cto b/packages/composer-runtime/test/data/mozart.cto index 4465830766..07cad6ec78 100644 --- a/packages/composer-runtime/test/data/mozart.cto +++ b/packages/composer-runtime/test/data/mozart.cto @@ -103,7 +103,7 @@ asset Business identified by sbi { /** * An abstract transaction type for animal movements */ -abstract transaction AnimalMovement identified by transactionId { +abstract transaction AnimalMovement { o String transactionId o String[] logs optional --> Animal animal diff --git a/packages/generator-hyperledger-composer/generators/businessnetwork/templates/models/namespace.cto b/packages/generator-hyperledger-composer/generators/businessnetwork/templates/models/namespace.cto index 13b441749b..088ab0f9de 100644 --- a/packages/generator-hyperledger-composer/generators/businessnetwork/templates/models/namespace.cto +++ b/packages/generator-hyperledger-composer/generators/businessnetwork/templates/models/namespace.cto @@ -13,7 +13,7 @@ asset Asset identified by assetId { o String value } -transaction ChangeAssetValue identified by transactionId { +transaction ChangeAssetValue { o String transactionId o String newValue --> Asset relatedAsset diff --git a/packages/generator-hyperledger-composer/generators/model/templates/models/namespace.cto b/packages/generator-hyperledger-composer/generators/model/templates/models/namespace.cto index 13b441749b..088ab0f9de 100644 --- a/packages/generator-hyperledger-composer/generators/model/templates/models/namespace.cto +++ b/packages/generator-hyperledger-composer/generators/model/templates/models/namespace.cto @@ -13,7 +13,7 @@ asset Asset identified by assetId { o String value } -transaction ChangeAssetValue identified by transactionId { +transaction ChangeAssetValue { o String transactionId o String newValue --> Asset relatedAsset diff --git a/packages/loopback-connector-composer/test/businessnetworkconnector.js b/packages/loopback-connector-composer/test/businessnetworkconnector.js index cf1997881c..48f502b038 100644 --- a/packages/loopback-connector-composer/test/businessnetworkconnector.js +++ b/packages/loopback-connector-composer/test/businessnetworkconnector.js @@ -48,8 +48,7 @@ describe('BusinessNetworkConnector', () => { participant BaseParticipant identified by theValue { o String theValue } - transaction BaseTransaction identified by theValue { - o String theValue + transaction BaseTransaction { }`; let settings; From eaf0b3568d3323538d87e5807b9f0ccc41ba4b82 Mon Sep 17 00:00:00 2001 From: Paul O'M Date: Wed, 12 Jul 2017 19:48:46 +0100 Subject: [PATCH 23/88] Updated tutorial guide, minor fixes to cmdline , package.json instruction (#1534) * Updated Developer Tutorial removed version info and minor errata and tidy up * Updated Developer Tutorial package.json instruction --- .../jekylldocs/tutorials/developer-guide.md | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/packages/composer-website/jekylldocs/tutorials/developer-guide.md b/packages/composer-website/jekylldocs/tutorials/developer-guide.md index 13f99c301d..14f61bc913 100644 --- a/packages/composer-website/jekylldocs/tutorials/developer-guide.md +++ b/packages/composer-website/jekylldocs/tutorials/developer-guide.md @@ -10,13 +10,13 @@ excerpt: "The developer guide will walk you through the steps required to build # Developer Tutorial for creating a {{site.data.conrefs.composer_full}} solution -*Note:* this tutorial was written against {{site.data.conrefs.composer_full}} v0.8 on Ubuntu Linux running with {{site.data.conrefs.hlf_full}} v1.0 where referenced below and also tested for a Mac environment. (The relevant steps for a {{site.data.conrefs.hlf_full}} v0.6 setup are shown in *italics*). +*Note:* this tutorial was written against the current release of {{site.data.conrefs.composer_full}} on Ubuntu Linux running with {{site.data.conrefs.hlf_full}} v1.0 where referenced below and also tested on a Mac environment. (Note: the relevant steps for a {{site.data.conrefs.hlf_full}} v0.6 setup are shown in *italics*). This tutorial will walk you through the steps required to build a {{site.data.conrefs.composer_full}} blockchain solution from scratch. In the space of a day or probably less, you will be able to go from an idea for a disruptive blockchain innovation, to executing transactions against a real {{site.data.conrefs.hlf_full}} blockchain network, and generating/running a sample Angular 2 based application for Commodity Trading that interacts with a blockchain network. ## Install {{site.data.conrefs.composer_full}} -First, make sure you have installed {{site.data.conrefs.composer_full}}. Follow this [Development Environment Install guide](../installing/development-tools.html) - As well as installing Composer, it has instructions to quickly build your {{site.data.conrefs.hlf_full}} blockchain environment (using Docker containers) which we will use later on in this guide. It includes the installation of the Yeoman app generator and some pre-requisite Angular 2 packages. +First, make sure you have installed {{site.data.conrefs.composer_full}}. Follow this [Development Environment Install guide](../installing/development-tools.html) - As well as installing Composer, it has instructions to quickly build your {{site.data.conrefs.hlf_full}} blockchain environment (using Docker containers) which we will use later on in this guide. It includes the installation of the Yeoman application generator and some pre-requisite Angular 2 packages. ## Install an Editor (eg. VSCode - and its {{site.data.conrefs.composer_full}} Extension for Syntax Highlighting) @@ -30,7 +30,7 @@ After installation, launch VSCode and select `View > Command Palette...` then ty ## Create a Business Network Definition -The key concept for Composer is the **business network definition (BND)**. It defines the data model, business (and therein transaction) logic and access control rules for your blockchain solution. It executes on {{site.data.conrefs.hlf_full}}. To create a BND, we need to create a suitable project structure on disk. +The key concept for Composer is the **business network definition (BND)**. It defines the data model, business (and therein transaction) logic and access control rules for your blockchain solution. It executes on {{site.data.conrefs.hlf_full}}. To create a BND, you need to create a suitable project structure on disk. The easiest way to get started is to clone an **existing sample business network**. Open up a command prompt and clone the Composer sample networks GitHub repository. For Linux, perform this as a non-root user. @@ -44,7 +44,7 @@ Then, make a copy of this directory in your project, called 'my-network'. cp -r ./composer-sample-networks/packages/basic-sample-network/ ./my-network ``` -You should now have a folder called `my-network` (as the basis for our project) that we can start to modify. Using VSCode, open the `my-network` folder using Explorer in VSCode, click OK to open the folder. You should see the file layout in the explorer pane. +You should now have a folder called `my-network` (as the basis for our project) that we can start to modify. Using VSCode, open the `my-network` folder click on Explorer in VSCode, click OK to open the folder. You should see the file layout in the explorer pane.
- + diff --git a/packages/composer-website/jekylldocs/_layouts/indexbase.html b/packages/composer-website/jekylldocs/_layouts/indexbase.html index 9b56784595..c83a79d426 100644 --- a/packages/composer-website/jekylldocs/_layouts/indexbase.html +++ b/packages/composer-website/jekylldocs/_layouts/indexbase.html @@ -21,11 +21,4 @@ {% endif %}
- - - - - - - diff --git a/packages/composer-website/jekylldocs/_layouts/single-column.html b/packages/composer-website/jekylldocs/_layouts/single-column.html deleted file mode 100644 index 4d9ef04cce..0000000000 --- a/packages/composer-website/jekylldocs/_layouts/single-column.html +++ /dev/null @@ -1,31 +0,0 @@ ---- -layout: base ---- - -
-

- {{ page.title }} -

-
-
-
- {% if page.markdown == 1 %} - {{ content | markdownify }} - {% else %} - {{ content }} - {% endif %} -
-
-
- - {% if page.social_text %} - {% include social.html %} - {% endif %} - - {% if page.class == 'documentation' %} -
- Found a typo? An unclear example? Help us improve our documentation by forking and sending your fixes and suggestions. -
Improve this Page! -
- {% endif %} -
diff --git a/packages/composer-website/jekylldocs/applications/applications-index.md b/packages/composer-website/jekylldocs/applications/applications-index.md index ecb4477b24..8b93712328 100644 --- a/packages/composer-website/jekylldocs/applications/applications-index.md +++ b/packages/composer-website/jekylldocs/applications/applications-index.md @@ -3,8 +3,8 @@ layout: default title: Developing Applications section: applications category: start -index-order: 0 -sidebar: sidebars/applications.md +index-order: 500 +sidebar: sidebars/accordion-toc0.md excerpt: Writing a node.js application --- diff --git a/packages/composer-website/jekylldocs/applications/node.md b/packages/composer-website/jekylldocs/applications/node.md index 47826d3a4c..11b6d150c2 100644 --- a/packages/composer-website/jekylldocs/applications/node.md +++ b/packages/composer-website/jekylldocs/applications/node.md @@ -3,8 +3,8 @@ layout: default title: Writing a Node.js application section: applications category: start -index-order: 1 -sidebar: sidebars/applications.md +index-order: 501 +sidebar: sidebars/accordion-toc0.md excerpt: "[**Developing Node.js applications to work with Hyperledger Composer**](./node.html) allows you to programmatically connect to a deployed business network, create, read, update and delete assets and participants and to submit transactions." --- diff --git a/packages/composer-website/jekylldocs/applications/subscribing-to-events.md b/packages/composer-website/jekylldocs/applications/subscribing-to-events.md index 4b5f131afb..f11aa3de83 100644 --- a/packages/composer-website/jekylldocs/applications/subscribing-to-events.md +++ b/packages/composer-website/jekylldocs/applications/subscribing-to-events.md @@ -3,8 +3,8 @@ layout: default title: Subscribing to events category: tasks section: applications -index-order: 3 -sidebar: sidebars/applications.md +index-order: 503 +sidebar: sidebars/accordion-toc0.md excerpt: Node.js applications can [**subscribe to events from a business network**](./subscribing-to-events.html) by using the `composer-client.BusinessNetworkConnection.on` API call. Events are defined in the business network model file and are emitted by specified transactions in the transaction processor function file. --- diff --git a/packages/composer-website/jekylldocs/applications/web.md b/packages/composer-website/jekylldocs/applications/web.md index da74fabc82..c39bc86fdb 100644 --- a/packages/composer-website/jekylldocs/applications/web.md +++ b/packages/composer-website/jekylldocs/applications/web.md @@ -3,8 +3,8 @@ layout: default title: Writing Web or mobile applications category: start section: applications -index-order: 2 -sidebar: sidebars/applications.md +index-order: 502 +sidebar: sidebars/accordion-toc0.md excerpt: Web or mobile applications that need to interact with deployed business networks should make calls to a REST API. The easiest way to create the REST API is to use the `composer-rest-server` to [**dynamically generate a REST API from the deployed business network**](./web.html). --- diff --git a/packages/composer-website/jekylldocs/assets/css/codelab.css b/packages/composer-website/jekylldocs/assets/css/codelab.css deleted file mode 100644 index b08845166c..0000000000 --- a/packages/composer-website/jekylldocs/assets/css/codelab.css +++ /dev/null @@ -1,138 +0,0 @@ -/* General Overrides */ - -em { - padding-right: 2px; -} - -.highlight > pre, -code.prettyprint { - color: white; /* default color in case offline */ -} - -/* Codelab article */ - -.social { - margin-top: 25px; -} - -.authors { - font-style: italic; -} - -.keyboard { - border: 1px solid #ccc; - border-radius: 5px; - padding: 2px 6px; - font-style: normal; -} - -/* Note callouts */ - -.note { - padding: 25px; -} - -.note pre, -.note code { - padding: 0.2em 0.4em; - border-radius: 3px; - border-width: 0; -} - -.note.important { - background: #f2dede; -} - -.note.important code, -.note.important pre { - background: #e2cbcb; -} - -.note.tip { - background: #d2e0d2; -} - -.note.tip code, -.note.tip pre { - background: #bed3be; -} - -.note p, -.note li { - font-size: 0.9em; -} - -.note h2 { - font-size: 1em; - margin-top: 1em; -} - -.note *:first-child { - margin-top: 0; -} - -.note *:last-child { - margin-bottom: 0; -} - -/* Images */ - -.mast-holder { - width: 100%; - text-align: center; -} - -.mast-holder img { - max-height: 350px; -} - -.mast-intro > img { - max-height: 300px; -} - -@media (min-width: 761px) { - .mast-intro > img { - float: left; - margin: -10px 10px 0 0; - display: block; - } - - .mast-intro ~ h2 { - clear: left; - } - - article { - overflow: auto; /* required for above clear: left */; - } -} - -@media (min-width: 761px) { - .side-by-side { - overflow: auto; - } - - .side-by-side img { - width: 50%; - float: left; - } -} - -/* Footer paging */ - -.codelab-paging { - margin-top: 2em; - text-align: center; -} - -.codelab-paging a { - font-weight: bold; - white-space: nowrap; -} - -.codelab-paging a:first-child { - margin-right: 1em; -} - -.codelab-paging a:nth-of-type(2) { - margin-left: 1em; -} diff --git a/packages/composer-website/jekylldocs/assets/css/footer.css b/packages/composer-website/jekylldocs/assets/css/footer.css deleted file mode 100644 index 18062fc56c..0000000000 --- a/packages/composer-website/jekylldocs/assets/css/footer.css +++ /dev/null @@ -1,85 +0,0 @@ -.SiteFooter { - background: #000; - padding: 20px; - display: flex; - color: #fff; -} - -.SiteFooter-donation { - flex: 1; -} - -.SiteFooter-links { - text-align: center; - margin: 0; - padding: 0; - list-style: none; -} - -.SiteFooter-links li { - display: inline-block; - vertical-align: middle; - margin: 3px; -} - -.SiteFooter-links a { - display: inline-block; - transition: all 0.5s ease -} - -.SiteFooter-icon { - width: 30px; - transition: all 0.5s ease -} - -.SiteFooter-icon:hover, -.SiteFooter-icon:focus, -.SiteFooter-icon:active { - opacity: 0.5; -} - -.SiteFooter-button { - display: inline-block; - padding: 0.8em 1.2em; - background: #333; - color: #ccc; - border-radius: 3px; - text-decoration: none; - text-shadow: 1px 1px 3px rgba(0,0,0,0.5); -} - -.SiteFooter-button:active, -.SiteFooter-button:hover, -.SiteFooter-button:focus { - background: #555; -} - -.SiteFooter-button--light { - background: #5aadbb; - color: #fff; -} - -.SiteFooter-button--light:active, -.SiteFooter-button--light:hover, -.SiteFooter-button--light:focus { - background: #3398a9; -} - -.SiteFooter .icon { - color: #FFF; - width: 30px; - height: 30px; - font-size: 30px; -} - -@media (max-width: 800px) { - .SiteFooter { - display: block; - } -} - -@media (max-width: 500px) { - .SiteFooter-links .mobile-ln { - display: block; - } -} diff --git a/packages/composer-website/jekylldocs/assets/css/grid-layout.min.css b/packages/composer-website/jekylldocs/assets/css/grid-layout.min.css index a51d7e225a..bbad387b01 100644 --- a/packages/composer-website/jekylldocs/assets/css/grid-layout.min.css +++ b/packages/composer-website/jekylldocs/assets/css/grid-layout.min.css @@ -1 +1 @@ -.docs-container{display:grid;grid-template-columns:20% 20% 20% 20% 20%;grid-template-rows:20% 20% 20% 20% 20%;-ms-overflow-style:none}.docs-container ::-webkit-scrollbar{display:none}.docs-container hr{display:none}.docs-container .page-sidebar-grid{grid-column-start:1;grid-column-end:2;justify-items:start;overflow-y:scroll;height:100vh}.docs-container .page-sidebar-grid .docs-pagenav-grid{padding-top:5vh}.docs-container .page-sidebar-grid .docs-pagenav-grid .navbar-brand{padding-left:2rem;text-decoration:none;color:#19273C;font-size:1rem;display:inline-block}.docs-container .page-sidebar-grid .docs-pagenav-grid .top-nav-docs{padding-left:2rem;padding-top:0.5rem}.docs-container .page-sidebar-grid .docs-pagenav-grid .top-nav-docs a{text-decoration:none;color:#8C9696;font-size:0.9rem;padding-right:1rem}.docs-container .page-sidebar-grid .docs-pagenav-grid .top-nav-docs a:hover{color:#3F55AF}.docs-container .page-sidebar-grid .docs-pagenav-grid ul{list-style:none;padding-left:2rem}.docs-container .page-sidebar-grid .docs-pagenav-grid ul li a{font-size:0.9rem;text-decoration:none;color:#19273C}.docs-container .page-sidebar-grid .docs-current-page-grid p{font-weight:300;font-size:1.5rem;padding:2rem;display:block}.docs-container .page-sidebar-grid .context-nav ul{padding-left:0;margin:0}.docs-container .page-sidebar-grid .context-nav ul li{list-style:none;border-bottom:1px solid #E3ECEC;position:relative}.docs-container .page-sidebar-grid .context-nav ul li:hover{border-right:2px solid #3F55AF}.docs-container .page-sidebar-grid .context-nav ul li a{padding-left:2rem;padding-right:1rem;display:block;padding-top:1rem;padding-bottom:1rem}.docs-container .page-sidebar-grid .context-nav ul li ul{list-style:none;padding-left:0;margin:0;margin-left:2rem;margin-top:1rem;padding-bottom:2rem}.docs-container .page-sidebar-grid .context-nav ul li ul:hover:after{display:none}.docs-container .page-sidebar-grid .context-nav ul li ul:after{content:" ";position:absolute;top:0;right:0px;bottom:0;width:2px;background-color:#3F55AF}.docs-container .page-sidebar-grid .context-nav ul li ul li{border-bottom:none;border-left:2px solid #E3ECEC}.docs-container .page-sidebar-grid .context-nav ul li ul li:hover{border-left:2px solid #3F55AF;border-right:none}.docs-container .page-sidebar-grid .context-nav a{text-decoration:none;color:#19273C;font-size:0.9rem}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid{margin-top:5rem;margin-bottom:2rem;align-items:end}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid p{font-size:0.8rem;color:grey;padding-left:2rem}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid ul{list-style:none;margin:0}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid ul li{border-bottom:none;padding:0}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid ul li:hover{border-right:none}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid ul li a{font-size:0.8rem;color:grey;margin:0;padding-left:2rem;padding-top:0;padding-bottom:0}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid ul li a:hover{color:#3F55AF}.docs-container .page-content-grid{grid-column-start:2;grid-column-end:6;background-color:#F9F9F9;overflow-y:scroll;height:100vh}.docs-container .page-content-grid .content-chunk{margin-left:2rem;max-width:750px;margin-top:5vh;margin-bottom:3rem}.docs-container .page-content-grid .content-chunk ul{font-size:0.9rem}.SiteWrapper .content .page-content-grid .content-chunk p{margin-top:1.3rem}.SiteWrapper .content .page-content-grid .content-chunk p code{background-color:white;border:1px solid #E3ECEC;padding-top:1px;padding-bottom:2px;padding-left:4px;color:#19273C;border-radius:1px}.SiteWrapper .content .page-content-grid .content-chunk h1{font-weight:300;font-size:2em;margin-bottom:3rem;padding-top:5rem}.SiteWrapper .content .page-content-grid .content-chunk h1:first-of-type{padding-top:0}.SiteWrapper .content .page-content-grid .content-chunk h2{margin-top:2rem}.SiteWrapper .content .page-content-grid .content-chunk h3{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;font-size:1.2rem;line-height:130%;color:#19273C;margin-top:2rem}.SiteWrapper .content .page-content-grid .content-chunk blockquote{background-color:white;padding:1rem;padding-left:2rem;margin-left:0;margin-right:0;border-left:4px solid #3F55AF}.SiteWrapper .content .page-content-grid .content-chunk pre{background-color:#272B36;padding:1rem;color:white;border-radius:4px}.SiteWrapper .content .page-content-grid .content-chunk code{border-radius:2px;padding-right:5px;padding-top:1px;padding-bottom:1px;font-family:"Source Code Pro";font-size:0.8rem}.SiteWrapper .content .page-content-grid .content-chunk img{max-width:100%;border:1px solid #E3ECEC}.SiteWrapper .content .page-content-grid .content-chunk ul{list-style:none;padding-left:2em;text-indent:-1em;color:#19273C}.SiteWrapper .content .page-content-grid .content-chunk ul li:before{color:#19273C;content:'- \0000a0';font-size:1rem;font-weight:600}.SiteWrapper .content .page-content-grid .content-chunk ul li{padding-bottom:0.5rem}.SiteWrapper .content .page-content-grid .content-chunk ul li p{display:inline}.SiteWrapper .content .page-content-grid .content-chunk ol{border-left:1px solid #E3ECEC;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:0.9rem;color:#19273C}.SiteWrapper .content .page-content-grid .content-chunk ol li{margin-top:1.3rem}.SiteWrapper .content .page-content-grid .content-chunk a{color:#3F55AF}.SiteWrapper .content .page-content-grid .content-chunk .support-button{position:relative;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;user-select:none;background-image:none;border:1px solid transparent;border-radius:5px;margin:0;box-shadow:none;line-height:40px;cursor:pointer;background-color:#FDFDFD;width:auto;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:0.9rem;font-weight:400;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);min-width:140px;text-decoration:none;padding:0.5rem;padding-left:1.5rem;padding-right:1.5rem}.SiteWrapper .content .page-content-grid .content-chunk .support-button.primary{background-color:#3F55AF;border-color:#3F55AF;color:#FDFDFD}.SiteWrapper .content .page-content-grid .content-chunk .support-button.primary:hover{background-color:#2D3D7D}@media only screen and (max-width: 1440px){.docs-container{grid-template-columns:25% 25% 25% 25%}}@media only screen and (max-width: 1024px){.docs-container{grid-template-columns:20% 20% 20% 20% 20%}.docs-container .page-sidebar-grid{grid-column-start:1;grid-column-end:3}.docs-container .page-content-grid{grid-column-start:3;grid-column-end:6}.docs-container .page-content-grid .content-chunk{margin-left:2rem;max-width:550px}}@media only screen and (max-width: 768px){.docs-container .page-content-grid .content-chunk{max-width:400px}}@media only screen and (max-width: 599px){.docs-container .page-sidebar-grid{grid-column-start:1;grid-column-end:6;overflow-y:auto}.docs-container .page-content-grid{grid-column-start:1;grid-column-end:6;padding-right:2rem;overflow-y:auto}.docs-container .page-content-grid .content-chunk{max-width:400px}}.highlight{border-radius:4px;position:relative}.highlight .hll{background-color:#424242}.highlight .c{color:#969896}.highlight .err{color:#d54e53}.highlight .k{color:#c397d8}.highlight .l{color:#e78c45}.highlight .n{color:#eaeaea}.highlight .o{color:#70c0b1}.highlight .p{color:#eaeaea}.highlight .cm{color:#969896}.highlight .cp{color:#969896}.highlight .c1{color:#969896}.highlight .cs{color:#969896}.highlight .gd{color:#d54e53}.highlight .ge{font-style:italic}.highlight .gh{color:#eaeaea;font-weight:bold}.highlight .gi{color:#b9ca4a}.highlight .gp{color:#969896;font-weight:bold}.highlight .gs{font-weight:bold}.highlight .gu{color:#70c0b1;font-weight:bold}.highlight .kc{color:#c397d8}.highlight .kd{color:#c397d8}.highlight .kn{color:#70c0b1}.highlight .kp{color:#c397d8}.highlight .kr{color:#c397d8}.highlight .kt{color:#e7c547}.highlight .ld{color:#b9ca4a}.highlight .m{color:#e78c45}.highlight .s{color:#b9ca4a}.highlight .na{color:#7aa6da}.highlight .nb{color:#eaeaea}.highlight .nc{color:#e7c547}.highlight .no{color:#d54e53}.highlight .nd{color:#70c0b1}.highlight .ni{color:#eaeaea}.highlight .ne{color:#d54e53}.highlight .nf{color:#7aa6da}.highlight .nl{color:#eaeaea}.highlight .nn{color:#e7c547}.highlight .nx{color:#7aa6da}.highlight .py{color:#eaeaea}.highlight .nt{color:#70c0b1}.highlight .nv{color:#d54e53}.highlight .ow{color:#70c0b1}.highlight .w{color:#eaeaea}.highlight .mf{color:#e78c45}.highlight .mh{color:#e78c45}.highlight .mi{color:#e78c45}.highlight .mo{color:#e78c45}.highlight .sb{color:#b9ca4a}.highlight .sc{color:#eaeaea}.highlight .sd{color:#969896}.highlight .s2{color:#899ff1}.highlight .se{color:#e78c45}.highlight .sh{color:#b9ca4a}.highlight .si{color:#e78c45}.highlight .sx{color:#b9ca4a}.highlight .sr{color:#b9ca4a}.highlight .s1{color:#b9ca4a}.highlight .ss{color:#b9ca4a}.highlight .bp{color:#eaeaea}.highlight .vc{color:#d54e53}.highlight .vg{color:#d54e53}.highlight .vi{color:#d54e53}.highlight .il{color:#e78c45}.md-typeset div.highlight{position:relative;overflow:visible;padding:0}.md-typeset div.highlight pre{overflow-x:auto;display:block;padding:1rem 1.2rem .8rem}copy-button{background-color:#393F4F;padding:0.5rem;max-width:50px;cursor:pointer;color:white;font-size:0.8rem;display:inline-block;position:absolute;top:0px;right:0px;padding-top:1rem;padding-left:1rem;padding-right:1rem;padding-bottom:1rem;border-top-right-radius:4px;border-bottom-right-radius:4px;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1)}copy-button:hover{background-color:#4B5368} +.docs-container{display:grid;grid-template-columns:20% 20% 20% 20% 20%;grid-template-rows:20% 20% 20% 20% 20%;-ms-overflow-style:none}.docs-container ::-webkit-scrollbar{display:none}.docs-container hr{display:none}.docs-container .page-sidebar-grid{grid-column-start:1;grid-column-end:2;justify-items:start;overflow-y:scroll;height:100vh}.docs-container .page-sidebar-grid .docs-pagenav-grid{padding-top:5vh}.docs-container .page-sidebar-grid .docs-pagenav-grid .navbar-brand{padding-left:2rem;text-decoration:none;color:#19273C;font-size:1rem;display:inline-block}.docs-container .page-sidebar-grid .docs-pagenav-grid .top-nav-docs{padding-left:2rem;padding-top:0.5rem}.docs-container .page-sidebar-grid .docs-pagenav-grid .top-nav-docs a{text-decoration:none;color:#8C9696;font-size:0.9rem;padding-right:1rem}.docs-container .page-sidebar-grid .docs-pagenav-grid .top-nav-docs a:hover{color:#3F55AF}.docs-container .page-sidebar-grid .docs-pagenav-grid ul{list-style:none;padding-left:2rem}.docs-container .page-sidebar-grid .docs-pagenav-grid ul li a{font-size:0.9rem;text-decoration:none;color:#19273C}.docs-container .page-sidebar-grid .docs-current-page-grid p{font-weight:300;font-size:1.5rem;padding:2rem;display:block}.docs-container .page-sidebar-grid .context-nav ul{padding-left:0;margin:0}.docs-container .page-sidebar-grid .context-nav ul li{list-style:none;border-bottom:1px solid #E3ECEC;position:relative;overflow:hidden;transition:0.4s}.docs-container .page-sidebar-grid .context-nav ul li.hide{height:4rem !important}.docs-container .page-sidebar-grid .context-nav ul li:hover{border-right:0px solid #3F55AF}.docs-container .page-sidebar-grid .context-nav ul li:hover:after{content:" ";position:absolute;top:0;right:0px;bottom:0;width:2px;background-color:#3F55AF}.docs-container .page-sidebar-grid .context-nav ul li.active{height:auto !important;border-left-color:#3F55AF}.docs-container .page-sidebar-grid .context-nav ul li.active:after{content:" ";position:absolute;top:0;right:0px;bottom:0;width:2px;background-color:#3F55AF}.docs-container .page-sidebar-grid .context-nav ul li a{padding-left:2rem;padding-right:1rem;display:block;padding-top:0.5rem;padding-bottom:0.5rem}.docs-container .page-sidebar-grid .context-nav ul li a.active{color:#3F55AF}.docs-container .page-sidebar-grid .context-nav ul li ul{list-style:none;padding-left:0;margin:0;margin-left:2rem;margin-top:1rem;padding-bottom:2rem}.docs-container .page-sidebar-grid .context-nav ul li ul:hover:after{content:" ";position:absolute;top:0;right:0px;bottom:0;width:2px;background-color:#3F55AF}.docs-container .page-sidebar-grid .context-nav ul li ul li{border-bottom:none;border-left:2px solid #E3ECEC}.docs-container .page-sidebar-grid .context-nav ul li ul li:hover{border-left:2px solid #3F55AF;border-right:none}.docs-container .page-sidebar-grid .context-nav a{text-decoration:none;color:#19273C;font-size:0.9rem}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid{margin-top:5rem;margin-bottom:2rem;align-items:end}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid p{font-size:0.8rem;color:grey;padding-left:2rem}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid ul{list-style:none;margin:0}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid ul li{border-bottom:none;padding:0}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid ul li:hover{border-right:none}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid ul li a{font-size:0.8rem;color:grey;margin:0;padding-left:2rem;padding-top:0;padding-bottom:0}.docs-container .page-sidebar-grid .context-nav .docs-footer-grid ul li a:hover{color:#3F55AF}.docs-container .page-content-grid{grid-column-start:2;grid-column-end:6;background-color:#F9F9F9;overflow-y:scroll;height:100vh}.docs-container .page-content-grid .content-chunk{margin-left:2rem;max-width:750px;margin-top:5vh;margin-bottom:3rem}.docs-container .page-content-grid .content-chunk ul{font-size:0.9rem}.SiteWrapper .content .page-content-grid .content-chunk p{margin-top:1.3rem}.SiteWrapper .content .page-content-grid .content-chunk p code{background-color:white;border:1px solid #E3ECEC;padding-top:1px;padding-bottom:2px;padding-left:4px;color:#19273C;border-radius:1px}.SiteWrapper .content .page-content-grid .content-chunk h1{font-weight:300;font-size:2em;margin-bottom:3rem;padding-top:5rem}.SiteWrapper .content .page-content-grid .content-chunk h1:first-of-type{padding-top:0}.SiteWrapper .content .page-content-grid .content-chunk h2{margin-top:2rem}.SiteWrapper .content .page-content-grid .content-chunk h3{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;font-size:1.2rem;line-height:130%;color:#19273C;margin-top:2rem}.SiteWrapper .content .page-content-grid .content-chunk blockquote{background-color:white;padding:1rem;padding-left:2rem;margin-left:0;margin-right:0;border-left:4px solid #3F55AF}.SiteWrapper .content .page-content-grid .content-chunk pre{background-color:#272B36;padding:1rem;color:white;border-radius:4px}.SiteWrapper .content .page-content-grid .content-chunk code{border-radius:2px;padding-right:5px;padding-top:1px;padding-bottom:1px;font-family:"Source Code Pro";font-size:0.8rem}.SiteWrapper .content .page-content-grid .content-chunk img{max-width:100%;border:1px solid #E3ECEC}.SiteWrapper .content .page-content-grid .content-chunk ul{list-style:none;padding-left:2em;text-indent:-1em;color:#19273C}.SiteWrapper .content .page-content-grid .content-chunk ul li:before{color:#19273C;content:'- \0000a0';font-size:1rem;font-weight:600}.SiteWrapper .content .page-content-grid .content-chunk ul li{padding-bottom:0.5rem}.SiteWrapper .content .page-content-grid .content-chunk ul li p{display:inline}.SiteWrapper .content .page-content-grid .content-chunk ol{border-left:1px solid #E3ECEC;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:0.9rem;color:#19273C}.SiteWrapper .content .page-content-grid .content-chunk ol li{margin-top:1.3rem}.SiteWrapper .content .page-content-grid .content-chunk a{color:#3F55AF}.SiteWrapper .content .page-content-grid .content-chunk .support-button{position:relative;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;user-select:none;background-image:none;border:1px solid transparent;border-radius:5px;margin:0;box-shadow:none;line-height:40px;cursor:pointer;background-color:#FDFDFD;width:auto;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:0.9rem;font-weight:400;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);min-width:140px;text-decoration:none;padding:0.5rem;padding-left:1.5rem;padding-right:1.5rem}.SiteWrapper .content .page-content-grid .content-chunk .support-button.primary{background-color:#3F55AF;border-color:#3F55AF;color:#FDFDFD}.SiteWrapper .content .page-content-grid .content-chunk .support-button.primary:hover{background-color:#2D3D7D}@media only screen and (max-width: 1440px){.docs-container{grid-template-columns:25% 25% 25% 25%}}@media only screen and (max-width: 1024px){.docs-container{grid-template-columns:20% 20% 20% 20% 20%}.docs-container .page-sidebar-grid{grid-column-start:1;grid-column-end:3}.docs-container .page-content-grid{grid-column-start:3;grid-column-end:6}.docs-container .page-content-grid .content-chunk{margin-left:2rem;max-width:550px}}@media only screen and (max-width: 768px){.docs-container .page-content-grid .content-chunk{max-width:400px}}@media only screen and (max-width: 599px){.docs-container .page-sidebar-grid{grid-column-start:1;grid-column-end:6;overflow-y:auto}.docs-container .page-content-grid{grid-column-start:1;grid-column-end:6;padding-right:2rem;overflow-y:auto}.docs-container .page-content-grid .content-chunk{max-width:400px}}.highlight{border-radius:4px;position:relative}.highlight .hll{background-color:#424242}.highlight .c{color:#969896}.highlight .err{color:#d54e53}.highlight .k{color:#c397d8}.highlight .l{color:#e78c45}.highlight .n{color:#eaeaea}.highlight .o{color:#70c0b1}.highlight .p{color:#eaeaea}.highlight .cm{color:#969896}.highlight .cp{color:#969896}.highlight .c1{color:#969896}.highlight .cs{color:#969896}.highlight .gd{color:#d54e53}.highlight .ge{font-style:italic}.highlight .gh{color:#eaeaea;font-weight:bold}.highlight .gi{color:#b9ca4a}.highlight .gp{color:#969896;font-weight:bold}.highlight .gs{font-weight:bold}.highlight .gu{color:#70c0b1;font-weight:bold}.highlight .kc{color:#c397d8}.highlight .kd{color:#c397d8}.highlight .kn{color:#70c0b1}.highlight .kp{color:#c397d8}.highlight .kr{color:#c397d8}.highlight .kt{color:#e7c547}.highlight .ld{color:#b9ca4a}.highlight .m{color:#e78c45}.highlight .s{color:#b9ca4a}.highlight .na{color:#7aa6da}.highlight .nb{color:#eaeaea}.highlight .nc{color:#e7c547}.highlight .no{color:#d54e53}.highlight .nd{color:#70c0b1}.highlight .ni{color:#eaeaea}.highlight .ne{color:#d54e53}.highlight .nf{color:#7aa6da}.highlight .nl{color:#eaeaea}.highlight .nn{color:#e7c547}.highlight .nx{color:#7aa6da}.highlight .py{color:#eaeaea}.highlight .nt{color:#70c0b1}.highlight .nv{color:#d54e53}.highlight .ow{color:#70c0b1}.highlight .w{color:#eaeaea}.highlight .mf{color:#e78c45}.highlight .mh{color:#e78c45}.highlight .mi{color:#e78c45}.highlight .mo{color:#e78c45}.highlight .sb{color:#b9ca4a}.highlight .sc{color:#eaeaea}.highlight .sd{color:#969896}.highlight .s2{color:#899ff1}.highlight .se{color:#e78c45}.highlight .sh{color:#b9ca4a}.highlight .si{color:#e78c45}.highlight .sx{color:#b9ca4a}.highlight .sr{color:#b9ca4a}.highlight .s1{color:#b9ca4a}.highlight .ss{color:#b9ca4a}.highlight .bp{color:#eaeaea}.highlight .vc{color:#d54e53}.highlight .vg{color:#d54e53}.highlight .vi{color:#d54e53}.highlight .il{color:#e78c45}.md-typeset div.highlight{position:relative;overflow:visible;padding:0}.md-typeset div.highlight pre{overflow-x:auto;display:block;padding:1rem 1.2rem .8rem}copy-button{background-color:#393F4F;padding:0.5rem;max-width:50px;cursor:pointer;color:white;font-size:0.8rem;display:inline-block;position:absolute;top:0px;right:0px;padding-top:1rem;padding-left:1rem;padding-right:1rem;padding-bottom:1rem;border-top-right-radius:4px;border-bottom-right-radius:4px;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);line-height:1rem}copy-button:hover{background-color:#4B5368} diff --git a/packages/composer-website/jekylldocs/assets/css/grid-layout.scss b/packages/composer-website/jekylldocs/assets/css/grid-layout.scss index 78c42369b2..3109243c88 100644 --- a/packages/composer-website/jekylldocs/assets/css/grid-layout.scss +++ b/packages/composer-website/jekylldocs/assets/css/grid-layout.scss @@ -104,18 +104,48 @@ $callout: #FFD640; list-style: none; border-bottom: 1px solid $keyline-highlight; position: relative; + overflow: hidden; + transition: 0.4s; + &.hide { + height: 4rem !important; + } &:hover { - border-right: 2px solid $first-highlight; + border-right: 0px solid $first-highlight; + &:after { + content: " "; + position: absolute; + top: 0; + right: 0px; + bottom: 0; + width: 2px; + background-color: $first-highlight; + } + } + &.active { + height: auto !important; + border-left-color: $first-highlight; + &:after { + content: " "; + position: absolute; + top: 0; + right: 0px; + bottom: 0; + width: 2px; + background-color: $first-highlight; + } } - a { padding-left: 2rem; padding-right: 1rem; display: block; - padding-top: 1rem; - padding-bottom: 1rem; + padding-top: 0.5rem; + padding-bottom: 0.5rem; + &.active { + color: $first-highlight; + } } + ul { list-style: none; padding-left: 0; @@ -125,17 +155,17 @@ $callout: #FFD640; padding-bottom: 2rem; &:hover { &:after { - display: none; + content: " "; + position: absolute; + top: 0; + right: 0px; + bottom: 0; + width: 2px; + background-color: $first-highlight; } - } - &:after { - content: " "; - position: absolute; - top: 0; - right: 0px; - bottom: 0; - width: 2px; - background-color: $first-highlight; + // &:after { + // display: none; + // } } li { @@ -545,7 +575,6 @@ copy-button { cursor: pointer; color: white; font-size: 0.8rem; - // border-radius: 4px; display: inline-block; position: absolute; top: 0px; @@ -557,6 +586,7 @@ copy-button { border-top-right-radius: 4px; border-bottom-right-radius: 4px; transition: 0.4s cubic-bezier(0.075, 0.820, 0.165, 1.000); + line-height: 1rem; &:hover { background-color: #4B5368; } diff --git a/packages/composer-website/jekylldocs/assets/css/main.css b/packages/composer-website/jekylldocs/assets/css/main.css deleted file mode 100644 index 1930261668..0000000000 --- a/packages/composer-website/jekylldocs/assets/css/main.css +++ /dev/null @@ -1,1589 +0,0 @@ -/*! HTML5 Boilerplate v4.3.0 | MIT License | http://h5bp.com/ */ - -/* -* What follows is the result of much research on cross-browser styling. -* Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal, -* Kroc Camen, and the H5BP dev community and team. -*/ - -/* ========================================================================== -Base styles: opinionated defaults -========================================================================== */ - -html, -button, -input, -select, -textarea { - color: #222; -} - -html { - font-size: 1em; - line-height: 1.4; - box-sizing: border-box; -} -*, *:before, *:after { - box-sizing: inherit; -} -} - -/* -* Remove text-shadow in selection highlight: h5bp.com/i -* These selection rule sets have to be separate. -* Customize the background color to match your design. -*/ - -::-moz-selection { - background: #b3d4fc; - text-shadow: none; -} - -::selection { - background: #b3d4fc; - text-shadow: none; -} - -/* -* A better looking default horizontal rule -*/ - -hr { - display: block; - height: 1px; - border: 0; - border-top: 1px solid #ccc; - margin: 1em 0; - padding: 0; -} - -/* -* Remove the gap between images, videos, audio and canvas and the bottom of -* their containers: h5bp.com/i/440 -*/ - -audio, -canvas, -img, -video { - vertical-align: middle; -} - -/* -* Remove default fieldset styles. -*/ - -fieldset { - border: 0; - margin: 0; - padding: 0; -} - -/* -* Allow only vertical resizing of textareas. -*/ - -textarea { - resize: vertical; -} - -/* ========================================================================== -Author's custom styles -========================================================================== */ - -body, -html { - height: 100%; -} - -html { - font-family: 'Roboto', sans-serif; -} - -h1, h2, h3, h4, h5, h6 { - font-family: 'Roboto', sans-serif; -} - -h2, h3, h4, h5, h6 { - margin-top: 2em; -} - -h5 ,h6 { - margin-bottom: 0; -} - -p, pre { - margin-bottom: 1.3em; -} - -a { - cursor: pointer; -} - -code { - background: #f8f8f8; - border: 1px solid #ddd; - line-height: 1; - border-radius: 3px; -} - -code.prettyprint { - padding: 0; /* otherwise 1st line of multi-line code block is misaligned */ -} - -blockquote { - background: #f9f9f9; - border-left: 10px solid #ccc; - margin: 1.5em 10px; - padding: 0.5em 10px; - quotes: "\201C""\201D""\2018""\2019"; -} - -blockquote:before { - color: #ccc; - content: open-quote; - font-size: 4em; - line-height: 0.1em; - margin-right: 0.05em; - vertical-align: -0.4em; -} - -blockquote p { - display: inline; -} - -.SiteWrapper { - overflow: hidden; -} - -/* Page header and nav -========================================================================== */ - -/* -Logo -*/ - -.logo { - position: absolute; - top: 0.5em; - left: 1.3em; - /*right: 1.0em; - width: 5.0em;*/ - margin: 0; - padding: 0; - line-height: normal; -} - -.logo img { - max-width: 180%; -} - -.logot { - padding: 1em; - color: #fff; - text-decoration: none; -} - -/* -Navigation -*/ - -.mobile-menu-toggle { - display: block; - position: absolute; - z-index: 2; - top: 0; - right: 0; - width: 3em; - height: 3em; -} - -.mobile-menu-toggle:active, .mobile-menu-toggle:focus { - outline: none; -} - -.open .mobile-menu-toggle { - opacity: 0.5; -} - -.main-menu { - display: none; - position: fixed; - top: 48px; - bottom: 0; - right: 0; - left: 0; - z-index: 10; - overflow-x: hidden; - overflow-y: auto; - -webkit-overflow-scrolling: touch; -} - -.open .main-menu { - display: block; -} - -.main-nav { - font-size: 0.9em; - background: #000; -} - -.main-nav a { - display: block; - padding: 1em; - border-bottom: 1px dotted rgba(255,255,255,0.2); - color: #fff; - text-decoration: none; - transition: all 0.3s ease; -} - -.main-nav p { - display: block; - padding: 1em; - border-bottom: 1px dotted rgba(255,255,255,0.2); - color: #fff; - text-decoration: none; - transition: all 0.3s ease; -} - - -.main-nav a.active { - color: #5aadbb; - font-weight: 700; -} - -.main-nav a:hover { - background: rgba(255,255,255,0.1); -} - -.main-nav a:active { - background: rgba(255,255,255,0.17); -} - -.main-nav > li > ul a { - padding: .75em 1em .75em 2em; -} - -.main-nav > li > ul a:before { - content: ' - ' -} - - -.illustration { - position: relative; - top: 1.3em; - max-width: 100%; -} - -/* Content -========================================================================== */ - -#content { - min-height: 100%; -} - -.main { - padding: 0 1.3em; - font-size: 1em; - line-height: 1.6; -} - -.main .bigger-yo-character { - max-width: 30%; - display: block; - margin: 0 auto; -} - -.main img { - max-width: 100%; - height: auto; -} - -.main a { - color: #0096c7; -} - -.main a:hover { - text-decoration: none; -} - -.main .pagination em { - font-style: normal; - cursor: default; -} - -.main .pagination span { - cursor: default; -} - -.section-title { - padding: 0.3em 0; - border-bottom: 4px solid rgba(215,0,41,0.1); -} - -.content-chunk { - margin-bottom: 4em; - min-height: 100vh; -} - -.content-chunk p:first-child { - margin-top: 0; -} - -/* -Excerpt -*/ - -.excerpt { - margin: 1.8em 0; - padding: 0 2em; - font-size: 1.2em; - color: #5aadbb; - font-style: italic; - -} - -.excerpt a { - color: #006080; -} - -/* -Anchor Link Icon -*/ - -.content-chunk h1, -.content-chunk h2, -.content-chunk h3, -.content-chunk h4, -.content-chunk h5, -.content-chunk h6 { - position: relative; -} - -.content-chunk h1:hover, -.content-chunk h2:hover, -.content-chunk h3:hover, -.content-chunk h4:hover, -.content-chunk h5:hover, -.content-chunk h6:hover { - color: #000; - border-color: rgba(215,0,41,0.2); -} - -.anchor { - display: none; - position: absolute; - top: 50%; - left: -24px; - margin-top: -18px; - padding-right: 15px; -} - -*:hover > .anchor { - display: block; -} - -/* -One Line Install -*/ - -.one-line-install { - margin-bottom: 3em; -} - -.one-line-install pre { - padding: 0.5em 1em; - background: #bfe6ed; - border-radius: 0.35em; -} - -/* -Basic Tools -*/ - -.basic-tools { - margin: 0; - padding: 0; - list-style: none; -} - -.basic-tools li { - margin-bottom: 2em; -} - -.basic-tools li:last-child { - margin-bottom: 1em; -} - -.basic-tools .tool-content { - font-size: 0.9em; -} - -.basic-tools .tool-logo { - display: block; - margin-bottom: 0.5em; - padding: 1em; - text-align: center; - transition: all 0.3s ease; -} - -.basic-tools .yo { background: rgba(240,240,240,1); } -.basic-tools .yo:hover { background: rgba(240,240,240,0.6);; } -.basic-tools .gulp { background: #ECF0F1 } -.basic-tools .gulp img { height: 123px; } -.basic-tools .gulp:hover { background: rgba(240,240,240,0.6);; } -.basic-tools .npm { background: rgb(42, 51, 60); } -.basic-tools .npm:hover { background: rgb(32, 39, 46); } - -.basic-tools .tool-logo:active { - box-shadow: inset 0 0 15px rgba(0,0,0,0.2); -} - -.basic-tools .tool-logo img { - max-width: 7em; -} - -/* -Yeoman Team -*/ - -.team { - margin: 0 0 1em; - padding: 0; - list-style: none; -} - -.team a { - display: block; - padding: 0.5em 1.5em; - border-bottom: 1px dotted rgba(0,0,0,0.2); - text-decoration: none; - transition: all 0.5s ease; -} - -.team li:last-child a { - border: none; -} - -.team a:hover, -.team a:active { - background: #bfe6ed; - color: #207d8d; - text-decoration: none; -} - -.team img { - max-width: 3em; - margin-right: 1em; - border-radius: 50%; -} - -/* Inside Pages -========================================================================== */ - -.page-title { - margin-top: 0; - margin-bottom: 2em; - padding: 4.6em 0 2em; - background: #785ef0; - font-size: 1em; - line-height: 1em; - color: #fff; - text-align: center; - font-weight: 400; - text-transform: uppercase; -} - -/* -Context/Local Nav -*/ - -.context-nav { - padding: 0 1.2em; - position: static;; -} - -.context-nav ul { - margin: 0; - padding: 1em 0em; - list-style: none; -} - -.context-nav ul > li { - display: none; -} - -.context-nav.open ul > li { - display: block; -} - -.context-nav ul > li .active { - position: relative; -} - -.context-nav ul > li .active:after { - top: 1.05em; - right: 1em; - border: solid transparent; - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - border-top-color: #fff; - border-width: 0.4em; -} - -.context-nav.open ul > li .active:after { - opacity: 0.4; -} - -.context-nav a { - display: block; - cursor: pointer; - padding: 1em 0em; - border-bottom: 1px solid rgba(0,0,0,0.2); - text-decoration: none; - color: #19273C; - transition: all 0.5s ease; -} - -.context-nav a:hover, -.context-nav a:active { - color: #3C6DF0; - text-decoration: none; -} - -.context-nav ul > li .active { - color: #fff; - background: #5aadbb; - font-style: italic; -} - -.context-nav.open ul > li .active, -.context-nav ul > li .active:hover { - background: #228596; -} - -.year_divider > ul { - display: none; -} - -.year_divider.open > ul { - display: block; -} - -.year_divider li a { - padding-left: 1.5em; -} -.context-nav.navbar-fixed { - position: static; - top: 6em; -} - -.context-nav.navbar-absolute { - position: absolute; - right: 0; -} - -/* Google Code Prettify -========================================================================== */ - -/* Pretty printing styles. Used with prettify.js. */ -/* Vim sunburst theme by David Leibovic */ - -pre .str, code .str { color: #65B042; } /* string - green */ -pre .kwd, code .kwd { color: #E28964; } /* keyword - dark pink */ -pre .com, code .com { color: #AEAEAE; font-style: italic; } /* comment - gray */ -pre .typ, code .typ { color: #89bdff; } /* type - light blue */ -pre .lit, code .lit { color: #3387CC; } /* literal - blue */ -pre .pun, code .pun { color: #fff; } /* punctuation - white */ -pre .pln, code .pln { color: #fff; } /* plaintext - white */ -pre .tag, code .tag { color: #89bdff; } /* html/xml tag - light blue */ -pre .atn, code .atn { color: #bdb76b; } /* html/xml attribute name - khaki */ -pre .atv, code .atv { color: #65B042; } /* html/xml attribute value - green */ -pre .dec, code .dec { color: #3387CC; } /* decimal - blue */ - -.highlight > pre, -code.prettyprint { - font-size: 0.95em; - background-color: #eeeeee; - border-radius: 0.35em; - max-width: 100%; -} - -.highlight > pre { - padding: 1em; - overflow: auto; - word-wrap: normal; - max-width: 100%; -} -.highlight > pre code { - font-size: 1em; - white-space: pre; - background-color: transparent; - border: none; - border-right: none; -} - -pre > code.language-sh:before { - content: '$'; - margin-right: 5px; -} - -/* Specify class=linenums on a pre to get line numbering */ -ol.linenums { margin-top: 0; margin-bottom: 0; color: #AEAEAE; } /* IE indents via margin-left */ -li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8 { list-style-type: none } - -.contribute-doc { - margin-top: 2em; - padding: 0.5em 1em; - font-size: 0.9em; - border: 1px solid #ddd; - background: #efefef; - border-radius: 0.35em; -} - -#search-notfound { - display: none; - font-size: 1.5em; - padding: 20px; - text-align: center; -} - -/* Discovery Page */ - -#plugins-all > table { - width: 100%; -} - -.discovery-page th { - cursor: pointer; -} - -.discovery-page th.sort { - text-align: left; -} - -.discovery-page th.sort:before { - content: '\21C5'; - display: inline-block; - opacity: .4; - font-size: 0.8em; - margin-right: 3px; -} - -.discovery-page th.sort.asc:before, -.discovery-page th.sort.desc:before { - opacity: 1; - margin-right: 7px; -} - -.discovery-page th.sort.asc:before { - content: '\2193'; - text-align: left; -} - -.discovery-page th.sort.desc:before { - content: '\2191'; - text-align: right; -} - -.discovery-page td { - padding: 10px 5px; - border-top: 1px solid #ddd; - position: relative; - vertical-align: top; -} - -.discovery-page tr.official td.generator-item::before { - content: ''; - position: absolute; - top: 50%; - left: -25px; - transform: translateY(-50%); - width: 20px; - height: 7px; - background: url(/assets/img/mustache.svg) no-repeat; - opacity: 0.5; -} - -.discovery-page td.generator-item a { - text-decoration: none; -} - -.discovery-page td.generator-item a:hover { - text-decoration: underline; -} - -.discovery-page .name-info .name{ - font-size: larger; -} - -.discovery-page .name-author { - font-size: small; - margin-left: 20px; -} - -.discovery-page .description{ - font-size: smaller; -} - -.discovery-page td.metadata { - font-size: smaller; - text-align: right; -} - -.discovery-page th.metadata { - font-size: 0.9em; - text-align: right; - width: 85px; -} - -.discovery-page th.last-updated { - width: 125px; -} - -.discovery-page input.search { - width: 100%; - line-height: 1.5em; - margin: 20px 0; - font-size: 20px; - padding: 10px; - box-sizing: border-box; -} - -/* Blog */ - -.blog-post-preview { - border-bottom: 1px solid #dfdfdf; - padding-bottom: 1em; - margin-bottom: 1em; -} - -.blog-post-preview .blog-post-title { - margin: 1em 0 0.2em; -} - -.blog-post-preview .blog-post-title a { - color: #222; - text-decoration: none; -} - -.blog-post-preview .blog-post-date { - margin: 0.2em 0 1em; - font-size: 0.8em; - color: #444; - text-decoration: none; -} - -.note { - background: #f2dede; - padding: 15px; -} - -@media print { - pre .str, code .str { color: #060; } - pre .kwd, code .kwd { color: #006; font-weight: 700; } - pre .com, code .com { color: #600; font-style: italic; } - pre .typ, code .typ { color: #404; font-weight: 700; } - pre .lit, code .lit { color: #044; } - pre .pun, code .pun { color: #440; } - pre .pln, code .pln { color: #000; } - pre .tag, code .tag { color: #006; font-weight: 700; } - pre .atn, code .atn { color: #404; } - pre .atv, code .atv { color: #060; } -} - -/* FAQ */ - -.faq-page a[name] { - position: absolute; - top: -3em; -} - -@media only screen and (min-width: 60em) { - .faq-page a[name] { - top: -5em; - } -} - -/* ========================================================================== -Helper classes -========================================================================== */ - -/* -* Image replacement -*/ - -.ir { - background-color: transparent; - border: 0; - overflow: hidden; - /* IE 6/7 fallback */ - *text-indent: -9999px; -} - -.ir:before { - content: ""; - display: block; - width: 0; - height: 150%; -} - -/* -* Hide from both screenreaders and browsers: h5bp.com/u -*/ - -.hidden { - display: none !important; - visibility: hidden; -} - -/* -* Hide only visually, but have it available for screenreaders: h5bp.com/v -*/ - -.visuallyhidden { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; -} - -/* -* Extends the .visuallyhidden class to allow the element to be focusable -* when navigated to via the keyboard: h5bp.com/p -*/ - -.visuallyhidden.focusable:active, -.visuallyhidden.focusable:focus { - clip: auto; - height: auto; - margin: 0; - overflow: visible; - position: static; - width: auto; -} - -/* -* Hide visually and from screenreaders, but maintain layout -*/ - -.invisible { - visibility: hidden; -} - -/* -* Clearfix: contain floats -* -* For modern browsers -* 1. The space content is one way to avoid an Opera bug when the -* `contenteditable` attribute is included anywhere else in the document. -* Otherwise it causes space to appear at the top and bottom of elements -* that receive the `clearfix` class. -* 2. The use of `table` rather than `block` is only necessary if using -* `:before` to contain the top-margins of child elements. -*/ - -.clearfix:before, -.clearfix:after { - content: " "; /* 1 */ - display: table; /* 2 */ -} - -.clearfix:after { - clear: both; -} - -/* -* For IE 6/7 only -* Include this rule to trigger hasLayout and contain floats. -*/ - -.clearfix { - *zoom: 1; -} - -.video-container { - position: relative; - padding-bottom: 56.25%; - padding-top: 30px; height: 0; overflow: hidden; -} - -.video-container iframe, -.video-container object, -.video-container embed { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; -} - -/* ========================================================================== -EXAMPLE Media Queries for Responsive Design. -These examples override the primary ('mobile first') styles. -Modify as content requires. -========================================================================== */ - -@media only screen and (min-width: 20em) { - .logo a:before { - display: block; - top: -0.5em; - left: -1.3em; - position: absolute; - width: 2.35em; - height: 2.35em; - content: ""; - } - - .logo img { - margin-left: 1.2em; - } - - .page-title { - margin-bottom: 1.7em; - } - - .blog-post-meta .date { - float: left; - } - - .blog-post-meta .social { - float: right; - } -} - - -@media only screen and (min-width: 28em) { - - .page-title { - margin-bottom: 1.4em; - padding: 3.5em 0 1.7em; - font-size: 1.5em; - } - - .main { - font-size: 1.2em; - } - - .basic-tools li { - overflow: hidden; - } - - .basic-tools .tool-logo { - float: left; - width: 42%; - padding: 14px; - margin: 0 3% 0 0; - box-sizing: border-box; - } - - .basic-tools .tool-content { - display: block; - float: left; - width: 50%; - } - - .team img { - max-width: 5em; - } -} - -@media only screen and (min-width: 35em) { - - .illustration { - top: 1.5em; - } - - .page-title { - margin-bottom: 1.2em; - padding: 2.3em 0 1em; - font-size: 2em; - } - - .main { - font-size: 1.3em; - } - - .team { - overflow: hidden; - } - - .team li { - display: inline-block; - width: 32%; - margin-right: 2%; - margin-bottom: 2em; - font-size: 0.8em; - } - - .team li:nth-child(3n) { - margin-right: 0; - } - - .team a { - padding: 0; - border: none; - } - - .team a:hover { - background: none; - } - - .team img { - float: none; - width: 100%; - max-width: 100%; - border-radius: 0; - } - - .context-nav { - max-width: 35em; - } -} - -/* Menu gets to be displayed */ -@media only screen and (min-width: 46em) { - .main-menu { - position: relative; - z-index: 13; - top: 0; - display: block; - float: right; - overflow: visible; - } - - .mobile-bar { - position: static; - } - - .mobile-menu-toggle { - display: none; - } - - .main-nav > li { - position: relative; - float: left; - vertical-align: bottom; - } - - .main-nav > li:hover { - background: rgba(255,255,255,0.1); - transition: all 0.8s ease; - } - - .main-nav a { - border: none; - padding: 1em 0.70em; - } - - .main-nav > li > ul { - display: none; - position: absolute; - top: 100%; - left: 0; - min-width: 100%; - background: #000; - } - - .main-nav > li:last-child > ul { - left: auto; - right: 0; - } - - .main-nav > li:hover > ul { - display: block; - } - - .main-nav > li > ul a { - padding: 13px 20px; - white-space: nowrap; - border-left: 10px solid rgba(221,0,42,0); - transition: all 0.3s ease; - } - - .main-nav > li > ul a:hover { - border-left-color: rgba(221,0,42,1); - } - - .main-nav > li > ul a:before { - content: ''; - } - - .page-title { - margin-bottom: 1.5em; - padding: 0; - text-align: left; - font-size: 2.4em; - } - - .page-title .container { - display: block; - max-width: 1200px; - margin: 0 auto; - padding: 2.5em 5em 1.6em 0.6em; - background: #785ef0 97% 70% no-repeat; - background-size: 4em auto; - box-sizing: border-box; - } - - .team li { - width: 23.5%; - margin-right: 2%; - } - - .team li:nth-child(3n) { - margin-right: 2%; - } - - .team li:nth-child(4n) { - margin-right: 0; - } -} - -@media only screen and (min-width: 50em) { - .main-nav a { - padding: 1em; - } - - .illustration { - top: 2em; - } - - .main { - font-size: 1.4em; - } -} - -@media only screen and (min-width: 55em) { - - .one-line-install { - padding: 2em 2em 1em; - vertical-align: top; - border: 1px dashed #ccc; - background: #eee; - /* Columns */ - column-count: 1; - column-gap: 3em; - } - - .one-line-install p:first-child { - margin-top: 0; - } - - .one-line-install pre { - background: #b2d7dd; - } - - .main { - font-size: 1.1em; - padding: 1em 2em 1em 1.3em; - } - - .main-container .main { - padding-top: 0; - } -} - -@media only screen and (min-width: 70em) { - .container { - position: relative; - max-width: 1200px; - margin: 0 auto; - } - - .has-sidebar { - padding-right: 20em; - box-sizing: border-box; - } - - .main-menu { - height: 5em; - } - - .logo { - left: 1.3em; - top: 0.2em; - width: 5.0em; - } - - .logo a:before { - top: -1em; - left: 0; - width: 3.5em; - height: 4.0em; - } - - .logo img { - margin-left: 0.2em; - } - - .page-header nav { - top: 0; - } - - .main-nav > li > a { - padding: 2.1em 1.4em; - } - - .main-nav > li > ul { - top: 100%; - min-width: 200px; - } - - .illustration { - float: right; - width: 18%; - margin-right: 2%; - margin-left: 2.0em; - margin-bottom: 8.0em; - } - - .page-title { - margin-bottom: 0.7em; - } - - .page-title .container { - padding-top: 3.4em; - background-position: 97% 78%; - background-size: 5em auto; - } - - .main { - line-height: 1.6; - } - - .context-nav { - position: static; - top: 1.3em; - /*width: 17em;*/ - margin: 0; - padding: 0; - max-width: 100%; - padding-top: 1em; - } - - .context-nav ul > li { - display: block; - } - - .context-nav ul > li .active:after { - display: none; - } - - .basic-tools li { - float: left; - width: 31%; - margin-right: 2%; - margin-bottom: 0; - line-height: 1.5em; - } - - .basic-tools .tool-logo, - .basic-tools .tool-content { - float: none; - width: 100%; - margin: 0 0 1em; - } - - .section-tools { - float: left; - width: 63%; - } - - .section-team { - float: right; - width: 30%; - } - - .basic-tools li { - width: 28%; - margin-right: 4%; - } - - .team a { - display: block; - padding: 0.5em 1.5em; - border-bottom: 1px dotted rgba(0,0,0,0.2); - text-decoration: none; - } - - .team li { - float: none; - width: 100%; - margin: 0; - } - - .team li:nth-child(3n), - .team li:nth-child(4n) { - margin: 0; /* its actually better to keep this separately from selector above, so we don't break some legacy browsers */ - } - - .team li:last-child a { - border: none; - } - - .team a:hover, - .team a:active { - background: #bfe6ed; - color: #207d8d; - text-decoration: none; - } - - .team img { - max-width: 5em; - margin-right: 1em; - border-radius: 50%; - } -} - -@media only screen and (min-width: 65em) { - .main-nav > li > a { - padding: 2.1em 2em; - } -} - -@media print, -(-o-min-device-pixel-ratio: 5/4), -(-webkit-min-device-pixel-ratio: 1.25), -(min-resolution: 120dpi) { - /* Style adjustments for high resolution devices */ -} - -/* ========================================================================== -Print styles. -Inlined to avoid required HTTP connection: h5bp.com/r -========================================================================== */ - -@media print { - * { - background: transparent !important; - color: #000 !important; /* Black prints faster: h5bp.com/s */ - box-shadow: none !important; - text-shadow: none !important; - } - - a, - a:visited { - text-decoration: underline; - } - - a[href]:after { - content: " (" attr(href) ")"; - } - - abbr[title]:after { - content: " (" attr(title) ")"; - } - - /* - * Don't show links for images, or javascript/internal links - */ - - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - - thead { - display: table-header-group; /* h5bp.com/t */ - } - - tr, - img { - page-break-inside: avoid; - } - - img { - max-width: 100% !important; - } - - @page { - margin: 0.5cm; - } - - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - - h2, - h3 { - page-break-after: avoid; - } -} -/* ========================================================================== -Blockchain project added styles. -Button, -========================================================================== */ - - -.click-button--light { - display: inline-block; - padding: 0.8em 1.0em; - margin-right:1.3em; - margin-bottom: 6.5em; - border-radius: 0px; -/* background: #5aadbb ; changed fg from sky blue to subtle grey/green below - background: #a3babf ; light grey */ - background: #fe8500 ; /* light green */ - color: #fff; -} - -.click-button--light:active, -.click-button--light:hover, -.click-button--light:focus { - /* background: #a9dd4f ; changed hover/active frm rich blue to lighter green */ - background: #ad6418 ; /* changed hover/active frm rich blue to dark green */ -} - -.youtubeplayer -{ - border-radius: 3px; - background-image: url("./assets/img/video-bg-overlay.png") center no-repeat; - z-index:-1; -} - - - - -/* entire container, keeps perspective */ -.flip-container { - perspective: 1000px; -} - /* flip the pane when hovered */ - .flip-container:hover .flipper, .flip-container.hover .flipper { - transform: rotateY(180deg); - } - -.flip-container, .front, .back { - width: 150px; - height: 150px; -} - -/* flip speed goes here */ -.flipper { - transition: 0.6s; - transform-style: preserve-3d; - - position: relative; -} - -/* hide back of pane during swap -display: flex; -justify-content: center; -align-items: center; - -*/ -.front, .back { - backface-visibility: hidden; - - position: absolute; - top: 0; - left: 0; - text-align: center; - - color: #fff; - -} - -.front { - background: #302560; - font-weight: bold; -} -.back { - background: #785ef0; -} -/* front pane, placed above back */ -.front { - z-index: 2; - /* for firefox 31 */ - transform: rotateY(0deg); -} - -/* back, initially hidden pane */ -.back { - transform: rotateY(180deg); -} - -.content { - padding-top: 5rem; -} - - -.highlight .hll { background-color: #ffffcc } -.highlight .c { color: #999988; font-style: italic } /* Comment */ -.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ -.highlight .k { color: #000000; font-weight: bold } /* Keyword */ -.highlight .o { color: #000000; font-weight: bold } /* Operator */ -.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */ -.highlight .cp { color: #999999; font-weight: bold; font-style: italic } /* Comment.Preproc */ -.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */ -.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */ -.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ -.highlight .ge { color: #000000; font-style: italic } /* Generic.Emph */ -.highlight .gr { color: #aa0000 } /* Generic.Error */ -.highlight .gh { color: #999999 } /* Generic.Heading */ -.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ -.highlight .go { color: #888888 } /* Generic.Output */ -.highlight .gp { color: #555555 } /* Generic.Prompt */ -.highlight .gs { font-weight: bold } /* Generic.Strong */ -.highlight .gu { color: #aaaaaa } /* Generic.Subheading */ -.highlight .gt { color: #aa0000 } /* Generic.Traceback */ -.highlight .kc { color: #000000; font-weight: bold } /* Keyword.Constant */ -.highlight .kd { color: #000000; font-weight: bold } /* Keyword.Declaration */ -.highlight .kn { color: #000000; font-weight: bold } /* Keyword.Namespace */ -.highlight .kp { color: #000000; font-weight: bold } /* Keyword.Pseudo */ -.highlight .kr { color: #000000; font-weight: bold } /* Keyword.Reserved */ -.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */ -.highlight .m { color: #009999 } /* Literal.Number */ -.highlight .s { color: #d01040 } /* Literal.String */ -.highlight .na { color: #008080 } /* Name.Attribute */ -.highlight .nb { color: #0086B3 } /* Name.Builtin */ -.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */ -.highlight .no { color: #008080 } /* Name.Constant */ -.highlight .nd { color: #3c5d5d; font-weight: bold } /* Name.Decorator */ -.highlight .ni { color: #800080 } /* Name.Entity */ -.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */ -.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */ -.highlight .nl { color: #990000; font-weight: bold } /* Name.Label */ -.highlight .nn { color: #555555 } /* Name.Namespace */ -.highlight .nt { color: #000080 } /* Name.Tag */ -.highlight .nv { color: #008080 } /* Name.Variable */ -.highlight .ow { color: #000000; font-weight: bold } /* Operator.Word */ -.highlight .w { color: #bbbbbb } /* Text.Whitespace */ -.highlight .mf { color: #009999 } /* Literal.Number.Float */ -.highlight .mh { color: #009999 } /* Literal.Number.Hex */ -.highlight .mi { color: #009999 } /* Literal.Number.Integer */ -.highlight .mo { color: #009999 } /* Literal.Number.Oct */ -.highlight .sb { color: #d01040 } /* Literal.String.Backtick */ -.highlight .sc { color: #d01040 } /* Literal.String.Char */ -.highlight .sd { color: #d01040 } /* Literal.String.Doc */ -.highlight .s2 { color: #d01040 } /* Literal.String.Double */ -.highlight .se { color: #d01040 } /* Literal.String.Escape */ -.highlight .sh { color: #d01040 } /* Literal.String.Heredoc */ -.highlight .si { color: #d01040 } /* Literal.String.Interpol */ -.highlight .sx { color: #d01040 } /* Literal.String.Other */ -.highlight .sr { color: #009926 } /* Literal.String.Regex */ -.highlight .s1 { color: #d01040 } /* Literal.String.Single */ -.highlight .ss { color: #990073 } /* Literal.String.Symbol */ -.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */ -.highlight .vc { color: #008080 } /* Name.Variable.Class */ -.highlight .vg { color: #008080 } /* Name.Variable.Global */ -.highlight .vi { color: #008080 } /* Name.Variable.Instance */ -.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */ diff --git a/packages/composer-website/jekylldocs/assets/css/new-style.min.css b/packages/composer-website/jekylldocs/assets/css/new-style.min.css index fe9e25d0e1..2a9d7aa49e 100644 --- a/packages/composer-website/jekylldocs/assets/css/new-style.min.css +++ b/packages/composer-website/jekylldocs/assets/css/new-style.min.css @@ -1 +1 @@ -@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600|Source+Code+Pro");html{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:16px;height:100%;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}body{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;padding-bottom:0}h1{font-family:"Open Sans";font-weight:300;font-size:2.50rem;color:#19273C}h2{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;font-size:1.35rem;line-height:130%;color:#19273C}p{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#19273C;font-weight:400;font-size:0.9rem}svg{font-family:"Source Code Pro"}button{position:relative;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;user-select:none;background-image:none;border:1px solid transparent;border-radius:5px;margin:0;box-shadow:none;line-height:40px;cursor:pointer;background-color:#FDFDFD;flex-basis:auto;width:auto;padding-right:30px;padding-left:30px;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:0.9rem;font-weight:400;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);min-width:140px}button:focus{outline:none}button+button{margin-left:0.8em}button h1{display:inline;margin-right:.5em}button[disabled],button[disabled]:hover{opacity:.65;cursor:not-allowed}button.primary{background-color:#3F55AF;border-color:#3F55AF;color:#FDFDFD}button.primary:hover{background-color:#2D3D7D}button.primary.active,button.primary:active,button.primary:focus{background-color:#2D3D7D}button.primary[disabled],button.primary[disabled]:hover{background-color:#B8C1C1;border-color:#B8C1C1}button.secondary{background-color:#FDFDFD;color:#3F55AF;border-color:#E3ECEC}button.secondary:hover{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary.active,button.secondary:active,button.secondary:focus{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary[disabled],button.secondary[disabled]:hover{border-color:#B8C1C1;color:#B8C1C1}button.expand{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:25px;box-shadow:0 0 20px rgba(0,0,0,0.1);padding:0;font-size:0.75em;line-height:25px;color:#8C9696}button.action{border:none;border-bottom:2px solid transparent;background-color:transparent;color:#19273C;min-width:0;padding:0;border-radius:0px}button.action:hover{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:hover svg.ibm-icon{fill:#3F55AF}button.action:focus,button.action.active,button.action:active{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:focus svg.ibm-icon,button.action.active svg.ibm-icon,button.action:active svg.ibm-icon{fill:#3F55AF}button.action[disabled],button.action[disabled]:hover{background-color:transparent;color:#F1F3F7;border-bottom:2px solid #F1F3F7}button.action[disabled] svg.ibm-icon,button.action[disabled]:hover svg.ibm-icon{fill:#F1F3F7}button.icon{background-color:transparent;min-width:0;padding:0}button.icon:hover{color:#3F55AF;background-color:transparent}button.icon:hover svg.ibm-icon{fill:#3F55AF}button.basic{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:0.25em}.overlay{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAAGUlEQVQImWPwS9olhQsz+CXtkmLABQabJABXUBO1fQxIrwAAAABJRU5ErkJggg==) repeat,linear-gradient(137deg, #3F55AF 0%, #5376D4 40%, #5477D5 42%, #597FDE 52%, #B4E4FF 100%);overflow:hidden;top:0;left:0;bottom:0;right:0;z-index:-100}.hero_container{width:70vw;margin:auto;margin-top:17vh;display:flex;position:relative;flex-direction:row;z-index:10;box-sizing:border-box}.hero_container .leftcontent{flex-basis:40%;display:flex;flex-direction:column;padding-right:2rem;padding-bottom:8rem}.hero_container .hero_illustration{flex-basis:55%;padding-bottom:5rem;box-sizing:border-box}.hero_container .hero_illustration img{max-height:30rem}.hero_container button{box-shadow:0 1px 7px 0 rgba(0,0,0,0.2)}.hero_container h1{color:#FDFDFD;line-height:50px}.hero_container .social-container{display:flex}.hero_container .social-container ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.hero_container .social-container li{margin-right:1.5rem;flex-direction:column;justify-content:center;height:100%;display:flex}.hero_container .social-container .icon2{font-size:1.2rem;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#FDFDFD}.hero_container .social-container .icon2:hover{color:#2D3D7D}.buttoncontainer{margin-top:3.5rem;margin-bottom:1rem;display:flex}.readmore{margin-bottom:2rem;color:#FDFDFD}.readmore a{color:#FDFDFD;text-decoration:underline}.homepage-callout{display:flex;background-color:#FFD640;box-shadow:2px 2px 10px 0 rgba(0,0,0,0.2)}.homepage-callout .callout-copy{margin:auto;margin-top:1rem;margin-bottom:0.5rem}.homepage-callout .callout-copy a{text-decoration:none;border-bottom:1px solid #19273C;color:#19273C;transition:all 0.2s ease-in-out}.homepage-callout .callout-copy a:hover{border-bottom:1px solid #19273C;padding-bottom:3px}.navbar{display:flex;flex-basis:auto;width:100vw;height:4rem;margin:auto;background-color:none;color:#19273C}.navbar-fixed-top{border:none}.indexnav{display:flex;flex-direction:row;align-items:center;width:100%;height:3rem;z-index:11;padding-top:0px;position:absolute}.navcontent{font-size:0.9rem;display:flex;width:70vw;margin:auto;padding-top:2rem}.navlogo{flex-grow:1;flex-basis:100%;flex-shrink:1}.navlogo .brand{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#FDFDFD;font-weight:400;font-size:0.9rem;cursor:pointer;text-decoration:none}.navlogo .brand a{text-decoration:none}.menuitems{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.menuitems ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.menuitems ul li{margin-left:1rem;margin-right:1rem;flex-direction:column;justify-content:center;height:100%;display:flex}.menuitems ul li a{color:#FDFDFD;text-decoration:none}.menuitems ul li a:hover{border-bottom:1px solid #FDFDFD;padding-bottom:3px}.footer-bg{display:flex;background-color:#3F55AF;width:100vw;height:auto}.footer-container{display:flex;width:70vw;margin:auto;padding-top:3rem;margin-bottom:4rem}.footer-container .footer-left{display:flex;flex-grow:1;flex-shrink:1}.footer-container .footer-left p{color:#FDFDFD}.footer-container .footer-left .icon2{font-size:20px;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#19273C}.footer-container .footer-left .icon2:hover{color:#3F55AF}.footer-container .footer-right{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.footer-container .footer-right ul{display:flex;flex-grow:2;flex-direction:row;margin:0;padding:0;height:100%}.footer-container .footer-right .license{opacity:0.6}.footer-container .footer-right li{margin-left:2rem;flex-direction:column;justify-content:center;height:100%;display:flex}.footer-container .footer-right li a{color:#FDFDFD;text-decoration:none;font-size:0.9rem}.footer-container .footer-right li a:hover{border-bottom:1px solid #FDFDFD}.footer-container .footer-right li p{color:#FDFDFD}.trio{margin-top:9rem;margin-bottom:7rem;margin-left:auto;margin-right:auto;width:70vw;display:flex;flex-direction:row;justify-content:space-around;flex-wrap:wrap}.trio p{text-align:center}.trio h2{text-align:center;padding-bottom:1rem}.trio .trio-left{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-left img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-center{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-center img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-right{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-right img{display:flex;height:60px;width:auto;margin:auto}.contact-bg{background-color:#F1F3F7;position:relative;padding-bottom:4rem;padding-top:4rem;height:auto}.contact-bg .contact-us{display:flex;flex-direction:row;justify-content:center;margin-left:auto;margin-right:auto;width:70vw}.contact-bg .contact-us .contact-illustration{flex-basis:40%;flex-grow:0}.contact-bg .contact-us .contact-illustration img{display:flex;height:17rem;width:auto}.contact-bg .contact-us .contact-content{flex-basis:50%}.contact-bg .contact-us .contact-content .social-icons{display:flex;flex-wrap:wrap;flex-direction:row}.contact-bg .contact-us .contact-content .social-icons .icon3{margin-top:0.5rem;margin-right:1rem;color:#3F55AF;font-size:1.5rem;width:auto}.contact-bg .contact-us .contact-content a{color:#19273C}.contact-bg .contact-us .contact-content a:hover{text-decoration:none}.contact-bg .contact-us .contact-content .community{color:#3F55AF;padding-bottom:3px}.contact-bg .contact-us .contact-content .community:hover{color:#2D3D7D;padding-bottom:3px;text-decoration:none}.contact-bg .contact-us .contact-content .social-icons>div{display:flex;flex-basis:calc(40% - 30px);justify-content:center;flex-direction:column;margin-right:2rem}.contact-bg .contact-us .contact-content .social-icons>div>div{display:flex;flex-direction:row}.contact-bg .contact-us .contact-content button{margin-top:1rem;margin-bottom:1rem}.contact-bg .contact-us .contact-content p{margin-top:1rem}@media only screen and (max-width: 1200px){.hero_container{flex-direction:column-reverse;-webkit-flex-direction:row}.hero_container .hero_illustration{padding-bottom:2rem}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-illustration{margin-right:2rem}}@media only screen and (max-width: 900px){.hero_container{-webkit-flex-direction:row}.homepage-callout .callout-copy{padding-left:2rem;padding-right:2rem}.trio{flex-direction:column;max-width:30rem;margin-top:4rem;margin-bottom:4rem}.trio .trio-left{margin-bottom:3rem}.trio .trio-center{margin-bottom:3rem}.trio .trio-right{margin-bottom:3rem}.contact-bg .contact-us{flex-direction:column}.contact-bg .contact-us .contact-illustration{padding-bottom:2rem}}@media only screen and (max-width: 750px){.hero_container{-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row}}@media only screen and (max-width: 500px){.indexnav{overflow:hidden;height:auto}.indexnav .navcontent{flex-direction:column;-webkit-flex-direction:row}.indexnav .navcontent .navlogo{margin-bottom:0.5rem}.indexnav .navcontent .menuitems{justify-content:flex-start}.indexnav .navcontent .menuitems ul{margin-top:0.5rem}.indexnav .navcontent .menuitems ul li{margin-left:0;margin-right:2rem}.hero_container{-webkit-flex-direction:row}.trio{-webkit-flex-direction:row}.contact-bg .contact-us{-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons{flex-direction:column;-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column;-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row;-webkit-flex-direction:row}.contact-bg .contact-us .contact-illustration img{height:auto}.hero_container .leftcontent .textcontent .buttoncontainer{display:flex}.footer-bg .footer-container{flex-wrap:wrap;flex-direction:column;-webkit-flex-direction:row}.footer-bg .footer-container .footer-right ul{flex-direction:column;-webkit-flex-direction:row}.footer-bg .footer-container .footer-right li{margin-left:0}.footer-bg .footer-container .footer-right li a{padding-top:0.6rem}.footer-bg .footer-container .footer-right li a:hover{border-bottom:none}} +@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600|Source+Code+Pro");html{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:16px;height:100%;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}body{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;padding-bottom:0}h1{font-family:"Open Sans";font-weight:300;font-size:2.50rem;color:#19273C}h2{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:300;font-size:1.35rem;line-height:130%;color:#19273C}p{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#19273C;font-weight:400;font-size:0.9rem}svg{font-family:"Source Code Pro"}button{position:relative;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;user-select:none;background-image:none;border:1px solid transparent;border-radius:5px;margin:0;box-shadow:none;line-height:40px;cursor:pointer;background-color:#FDFDFD;flex-basis:auto;width:auto;padding-right:30px;padding-left:30px;font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;font-size:0.9rem;font-weight:400;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);min-width:140px}button:focus{outline:none}button+button{margin-left:0.8em}button h1{display:inline;margin-right:.5em}button[disabled],button[disabled]:hover{opacity:.65;cursor:not-allowed}button.primary{background-color:#3F55AF;border-color:#3F55AF;color:#FDFDFD}button.primary:hover{background-color:#2D3D7D}button.primary.active,button.primary:active,button.primary:focus{background-color:#2D3D7D}button.primary[disabled],button.primary[disabled]:hover{background-color:#B8C1C1;border-color:#B8C1C1}button.secondary{background-color:#FDFDFD;color:#3F55AF;border-color:#E3ECEC}button.secondary:hover{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary.active,button.secondary:active,button.secondary:focus{background-color:#5068C2;border-color:#5068C2;color:#FDFDFD}button.secondary[disabled],button.secondary[disabled]:hover{border-color:#B8C1C1;color:#B8C1C1}button.expand{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:25px;box-shadow:0 0 20px rgba(0,0,0,0.1);padding:0;font-size:0.75em;line-height:25px;color:#8C9696}button.action{border:none;border-bottom:2px solid transparent;background-color:transparent;color:#19273C;min-width:0;padding:0;border-radius:0px}button.action:hover{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:hover svg.ibm-icon{fill:#3F55AF}button.action:focus,button.action.active,button.action:active{color:#3F55AF;background-color:transparent;border-bottom:2px solid #3F55AF}button.action:focus svg.ibm-icon,button.action.active svg.ibm-icon,button.action:active svg.ibm-icon{fill:#3F55AF}button.action[disabled],button.action[disabled]:hover{background-color:transparent;color:#F1F3F7;border-bottom:2px solid #F1F3F7}button.action[disabled] svg.ibm-icon,button.action[disabled]:hover svg.ibm-icon{fill:#F1F3F7}button.icon{background-color:transparent;min-width:0;padding:0}button.icon:hover{color:#3F55AF;background-color:transparent}button.icon:hover svg.ibm-icon{fill:#3F55AF}button.basic{background-color:#FDFDFD;border:1px solid #F1F3F7;border-radius:0.25em}.overlay{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAAGUlEQVQImWPwS9olhQsz+CXtkmLABQabJABXUBO1fQxIrwAAAABJRU5ErkJggg==) repeat,linear-gradient(137deg, #3F55AF 0%, #5376D4 40%, #5477D5 42%, #597FDE 52%, #B4E4FF 100%);overflow:hidden;top:0;left:0;bottom:0;right:0;z-index:-100}.hero_container{width:70vw;margin:auto;margin-top:17vh;display:flex;position:relative;flex-direction:row;z-index:10;box-sizing:border-box}.hero_container .leftcontent{flex-basis:40%;display:flex;flex-direction:column;padding-right:2rem;padding-bottom:8rem}.hero_container .hero_illustration{flex-basis:55%;padding-bottom:5rem;box-sizing:border-box}.hero_container .hero_illustration img{max-height:30rem}.hero_container button{box-shadow:0 1px 7px 0 rgba(0,0,0,0.2)}.hero_container h1{color:#FDFDFD;line-height:50px}.hero_container .social-container{display:flex}.hero_container .social-container ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.hero_container .social-container li{margin-right:1.5rem;flex-direction:column;justify-content:center;height:100%;display:flex}.hero_container .social-container .icon2{font-size:1.2rem;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#FDFDFD}.hero_container .social-container .icon2:hover{color:#2D3D7D}.buttoncontainer{margin-top:3.5rem;margin-bottom:1rem;display:flex}.readmore{margin-bottom:2rem;color:#FDFDFD}.readmore a{color:#FDFDFD;text-decoration:underline}.homepage-callout{display:flex;background-color:#FFD640;box-shadow:2px 2px 10px 0 rgba(0,0,0,0.2)}.homepage-callout .callout-copy{margin:auto;margin-top:1rem;margin-bottom:0.5rem}.homepage-callout .callout-copy a{text-decoration:none;border-bottom:1px solid #19273C;color:#19273C;transition:all 0.2s ease-in-out}.homepage-callout .callout-copy a:hover{border-bottom:1px solid #19273C;padding-bottom:3px}.navbar{display:flex;flex-basis:auto;width:100vw;height:4rem;margin:auto;background-color:none;color:#19273C}.navbar-fixed-top{border:none}.indexnav{display:flex;flex-direction:row;align-items:center;width:100%;height:3rem;z-index:11;padding-top:0px;position:absolute}.navcontent{font-size:0.9rem;display:flex;width:70vw;margin:auto;padding-top:2rem}.navlogo{flex-grow:1;flex-basis:100%;flex-shrink:1}.navlogo .brand{font-family:"Open Sans","Helvetica Neue",Helvetica,Arial,sans-serif;color:#FDFDFD;font-weight:400;font-size:0.9rem;cursor:pointer;text-decoration:none}.navlogo .brand a{text-decoration:none}.menuitems{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.menuitems ul{display:flex;flex-direction:row;margin:0;padding:0;height:100%}.menuitems ul li{margin-left:1rem;margin-right:1rem;flex-direction:column;justify-content:center;height:100%;display:flex}.menuitems ul li a{color:#FDFDFD;text-decoration:none}.menuitems ul li a:hover{border-bottom:1px solid #FDFDFD;padding-bottom:3px}.footer-bg{display:flex;background-color:#3F55AF;width:100vw;height:auto}.footer-container{display:flex;width:70vw;margin:auto;padding-top:3rem;margin-bottom:4rem}.footer-container .footer-left{display:flex;flex-grow:1;flex-shrink:1}.footer-container .footer-left p{color:#FDFDFD}.footer-container .footer-left .icon2{font-size:20px;height:100%;width:100%;transition:0.4s cubic-bezier(0.075, 0.82, 0.165, 1);color:#19273C}.footer-container .footer-left .icon2:hover{color:#3F55AF}.footer-container .footer-right{display:flex;justify-content:flex-end;flex-basis:auto;flex-shrink:1;height:100%}.footer-container .footer-right ul{display:flex;flex-grow:2;flex-direction:row;margin:0;padding:0;height:100%}.footer-container .footer-right li{margin-left:2rem;flex-direction:column;justify-content:center;height:100%;display:flex}.footer-container .footer-right li a{color:#FDFDFD;text-decoration:none;font-size:0.9rem}.footer-container .footer-right li a:hover{border-bottom:1px solid #FDFDFD}.footer-container .footer-right li p{opacity:0.6;color:#FDFDFD}.trio{margin-top:9rem;margin-bottom:7rem;margin-left:auto;margin-right:auto;width:70vw;display:flex;flex-direction:row;justify-content:space-around;flex-wrap:wrap}.trio p{text-align:center}.trio h2{text-align:center;padding-bottom:1rem}.trio .trio-left{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-left img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-center{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-center img{display:flex;height:60px;width:auto;margin:auto}.trio .trio-right{justify-content:center;flex-grow:0;flex-basis:20%;flex-shrink:1;flex-wrap:wrap}.trio .trio-right img{display:flex;height:60px;width:auto;margin:auto}.contact-bg{background-color:#F1F3F7;position:relative;padding-bottom:4rem;padding-top:4rem;height:auto}.contact-bg .contact-us{display:flex;flex-direction:row;justify-content:center;margin-left:auto;margin-right:auto;width:70vw}.contact-bg .contact-us .contact-illustration{flex-basis:40%;flex-grow:0}.contact-bg .contact-us .contact-illustration img{display:flex;height:17rem;width:auto}.contact-bg .contact-us .contact-content{flex-basis:50%}.contact-bg .contact-us .contact-content .social-icons{display:flex;flex-wrap:wrap;flex-direction:row}.contact-bg .contact-us .contact-content .social-icons .icon3{margin-top:0.5rem;margin-right:1rem;color:#3F55AF;font-size:1.5rem;width:auto}.contact-bg .contact-us .contact-content a{color:#19273C}.contact-bg .contact-us .contact-content a:hover{text-decoration:none}.contact-bg .contact-us .contact-content .community{color:#3F55AF;border-bottom:1px solid #3F55AF;padding-bottom:3px}.contact-bg .contact-us .contact-content .community:hover{color:#2D3D7D;border-bottom:1px solid #2D3D7D;padding-bottom:3px;text-decoration:none}.contact-bg .contact-us .contact-content .social-icons>div{display:flex;flex-basis:calc(40% - 30px);justify-content:center;flex-direction:column;margin-right:2rem}.contact-bg .contact-us .contact-content .social-icons>div>div{display:flex;flex-direction:row}.contact-bg .contact-us .contact-content button{margin-top:1rem;margin-bottom:1rem}.contact-bg .contact-us .contact-content p{margin-top:1rem}@media only screen and (max-width: 1200px){.hero_container{flex-direction:column-reverse;-webkit-flex-direction:row}.hero_container .hero_illustration{padding-bottom:2rem}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-illustration{margin-right:2rem}}@media only screen and (max-width: 900px){.hero_container{-webkit-flex-direction:row}.homepage-callout .callout-copy{padding-left:2rem;padding-right:2rem}.trio{flex-direction:column;max-width:30rem;margin-top:4rem;margin-bottom:4rem}.trio .trio-left{margin-bottom:3rem}.trio .trio-center{margin-bottom:3rem}.trio .trio-right{margin-bottom:3rem}.contact-bg .contact-us{flex-direction:column}.contact-bg .contact-us .contact-illustration{padding-bottom:2rem}}@media only screen and (max-width: 750px){.hero_container{-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row}}@media only screen and (max-width: 500px){.indexnav{overflow:hidden;height:auto}.indexnav .navcontent{flex-direction:column;-webkit-flex-direction:row}.indexnav .navcontent .navlogo{margin-bottom:0.5rem}.indexnav .navcontent .menuitems{justify-content:flex-start}.indexnav .navcontent .menuitems ul{margin-top:0.5rem}.indexnav .navcontent .menuitems ul li{margin-left:0;margin-right:2rem}.hero_container{-webkit-flex-direction:row}.trio{-webkit-flex-direction:row}.contact-bg .contact-us{-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons{flex-direction:column;-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div{flex-basis:calc(50% - 30px);flex-direction:column;-webkit-flex-direction:row}.contact-bg .contact-us .contact-content .social-icons>div>div{flex-direction:row;-webkit-flex-direction:row}.contact-bg .contact-us .contact-illustration img{height:auto}.hero_container .leftcontent .textcontent .buttoncontainer{display:flex}.footer-bg .footer-container{flex-wrap:wrap;flex-direction:column;-webkit-flex-direction:row}.footer-bg .footer-container .footer-right ul{flex-direction:column;-webkit-flex-direction:row}.footer-bg .footer-container .footer-right li{margin-left:0}.footer-bg .footer-container .footer-right li a{padding-top:0.6rem}.footer-bg .footer-container .footer-right li a:hover{border-bottom:none}} diff --git a/packages/composer-website/jekylldocs/assets/css/new-style.scss b/packages/composer-website/jekylldocs/assets/css/new-style.scss index ad183f90c5..1b8b42f683 100644 --- a/packages/composer-website/jekylldocs/assets/css/new-style.scss +++ b/packages/composer-website/jekylldocs/assets/css/new-style.scss @@ -459,6 +459,7 @@ li { .footer-left { display: flex; + flex-grow: 1; flex-shrink: 1; @@ -479,6 +480,7 @@ li { .footer-right { display: flex; + justify-content: flex-end; flex-basis: auto; flex-shrink: 1; @@ -491,15 +493,13 @@ li { padding: 0; height: 100%; } - .license { - opacity: 0.6; - } li { margin-left: 2rem; flex-direction: column; justify-content: center; height: 100%; display: flex; + a { color: $white; text-decoration: none; @@ -508,10 +508,12 @@ li { border-bottom: 1px solid $white; } } + p { - // opacity: 0.6; + opacity: 0.6; color: $white; } + } } @@ -642,9 +644,11 @@ li { } .community { color: $first-highlight; + border-bottom: 1px solid $first-highlight; padding-bottom: 3px; &:hover { color: $sixth-highlight; + border-bottom: 1px solid $sixth-highlight; padding-bottom: 3px; text-decoration: none; } diff --git a/packages/composer-website/jekylldocs/assets/css/prettify.css b/packages/composer-website/jekylldocs/assets/css/prettify.css deleted file mode 100644 index a1c8a6f194..0000000000 --- a/packages/composer-website/jekylldocs/assets/css/prettify.css +++ /dev/null @@ -1,57 +0,0 @@ -/* Pretty printing styles. Used with prettify.js. */ - -/* SPAN elements with the classes below are added by prettyprint. */ -.pln { color: #ccc } /* plain text */ - -@media screen { - .str { color: #00D300 } /* string content */ - .kwd { color: #61C4F2 } /* a keyword */ - .com { color: #888 } /* a comment */ - .typ { color: #C0F } /* a type name */ - .lit { color: #00D300 } /* a literal value */ - /* punctuation, lisp open bracket, lisp close bracket */ - .pun, .opn, .clo { color: #CCC } - .tag { color: #EC131B } /* a markup tag name */ - .atn { color: #ccc } /* a markup attribute name */ - .atv { color: #FFC20E } /* a markup attribute value */ - .dec, .var { color: #606 } /* a declaration; a variable name */ - .fun { color: red } /* a function name */ -} - -/* Use higher contrast and text-weight for printable form. */ -@media print, projection { - .str { color: #060 } - .kwd { color: #006; font-weight: 700 } - .com { color: #600; font-style: italic } - .typ { color: #404; font-weight: 700 } - .lit { color: #044 } - .pun, .opn, .clo { color: #440 } - .tag { color: #006; font-weight: 700 } - .atn { color: #404 } - .atv { color: #060 } -} - -/* Put a border around prettyprinted code snippets. */ -/*pre.prettyprint { padding: 2px; border: 1px solid #d9d9d9 }*/ - -/* Specify class=linenums on a pre to get line numbering */ -ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */ -li.L0, -li.L1, -li.L2, -li.L3, -li.L4, -li.L5, -li.L6, -li.L7, -li.L8 { list-style-type: decimal; } - -pre.prettyprint { - font-size: 13px; - padding: 2px; border: 1px solid #ccc; - background-color: #000; - border-radius: 5px; - -moz-border-radius: 5px; - padding: 8px 14px 8px 14px; - margin: 0 0 20px 0; -} diff --git a/packages/composer-website/jekylldocs/assets/img/.gitignore b/packages/composer-website/jekylldocs/assets/img/.gitignore old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/banner-center.png b/packages/composer-website/jekylldocs/assets/img/banner-center.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/banner-left.png b/packages/composer-website/jekylldocs/assets/img/banner-left.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/banner-right.png b/packages/composer-website/jekylldocs/assets/img/banner-right.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/concerto_stack.png b/packages/composer-website/jekylldocs/assets/img/concerto_stack.png deleted file mode 100755 index 0a9d73748007e8b3ebada07bc4e6aa268ef8e6b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52882 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 H+P?n>JrK_D diff --git a/packages/composer-website/jekylldocs/assets/img/content-bg.png b/packages/composer-website/jekylldocs/assets/img/content-bg.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/content-list-dot.png b/packages/composer-website/jekylldocs/assets/img/content-list-dot.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-contributing.png b/packages/composer-website/jekylldocs/assets/img/icon-contributing.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-discuss.png b/packages/composer-website/jekylldocs/assets/img/icon-discuss.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-documentation.png b/packages/composer-website/jekylldocs/assets/img/icon-documentation.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-faqs.png b/packages/composer-website/jekylldocs/assets/img/icon-faqs.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-getting-started.png b/packages/composer-website/jekylldocs/assets/img/icon-getting-started.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-github.png b/packages/composer-website/jekylldocs/assets/img/icon-github.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-google-plus.png b/packages/composer-website/jekylldocs/assets/img/icon-google-plus.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-home.png b/packages/composer-website/jekylldocs/assets/img/icon-home.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-link.png b/packages/composer-website/jekylldocs/assets/img/icon-link.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-menu.png b/packages/composer-website/jekylldocs/assets/img/icon-menu.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-requirements.png b/packages/composer-website/jekylldocs/assets/img/icon-requirements.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-rss-feed.png b/packages/composer-website/jekylldocs/assets/img/icon-rss-feed.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-twitter.png b/packages/composer-website/jekylldocs/assets/img/icon-twitter.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/icon-why-yeoman.png b/packages/composer-website/jekylldocs/assets/img/icon-why-yeoman.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/jumbotron-bottom.png b/packages/composer-website/jekylldocs/assets/img/jumbotron-bottom.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/nav-bg.png b/packages/composer-website/jekylldocs/assets/img/nav-bg.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/stitch-line.png b/packages/composer-website/jekylldocs/assets/img/stitch-line.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/subnav-dot.png b/packages/composer-website/jekylldocs/assets/img/subnav-dot.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/commodity_app.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/commodity_app.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/commodity_registry.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/commodity_registry.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/commodity_registry_after.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/commodity_registry_after.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/composer-rest-server.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/composer-rest-server.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/composer-yo-generator.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/composer-yo-generator.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/create_commodity.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/create_commodity.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/create_trader.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/create_trader.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/import_replace.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/import_replace.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/import_replace_confirm.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/import_replace_confirm.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/lb_create_trader.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/lb_create_trader.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/lb_explorer.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/lb_explorer.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/lb_get_trader.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/lb_get_trader.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/skeleton_add_asset.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/skeleton_add_asset.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/submit_tx.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/submit_tx.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/trader_registry.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/trader_registry.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/tx_registry.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/tx_registry.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/vscode_editor_linux.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/vscode_editor_linux.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/vscode_explorer.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/vscode_explorer.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/vscode_extensions.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/vscode_extensions.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/img/tutorials/developer/vscode_project.png b/packages/composer-website/jekylldocs/assets/img/tutorials/developer/vscode_project.png old mode 100755 new mode 100644 diff --git a/packages/composer-website/jekylldocs/assets/js/bootstrap.js b/packages/composer-website/jekylldocs/assets/js/bootstrap.js deleted file mode 100644 index 8a2e99a535..0000000000 --- a/packages/composer-website/jekylldocs/assets/js/bootstrap.js +++ /dev/null @@ -1,2377 +0,0 @@ -/*! - * Bootstrap v3.3.7 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. - * Licensed under the MIT license - */ - -if (typeof jQuery === 'undefined') { - throw new Error('Bootstrap\'s JavaScript requires jQuery') -} - -+function ($) { - 'use strict'; - var version = $.fn.jquery.split(' ')[0].split('.') - if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 3)) { - throw new Error('Bootstrap\'s JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4') - } -}(jQuery); - -/* ======================================================================== - * Bootstrap: transition.js v3.3.7 - * http://getbootstrap.com/javascript/#transitions - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) - // ============================================================ - - function transitionEnd() { - var el = document.createElement('bootstrap') - - var transEndEventNames = { - WebkitTransition : 'webkitTransitionEnd', - MozTransition : 'transitionend', - OTransition : 'oTransitionEnd otransitionend', - transition : 'transitionend' - } - - for (var name in transEndEventNames) { - if (el.style[name] !== undefined) { - return { end: transEndEventNames[name] } - } - } - - return false // explicit for ie8 ( ._.) - } - - // http://blog.alexmaccaw.com/css-transitions - $.fn.emulateTransitionEnd = function (duration) { - var called = false - var $el = this - $(this).one('bsTransitionEnd', function () { called = true }) - var callback = function () { if (!called) $($el).trigger($.support.transition.end) } - setTimeout(callback, duration) - return this - } - - $(function () { - $.support.transition = transitionEnd() - - if (!$.support.transition) return - - $.event.special.bsTransitionEnd = { - bindType: $.support.transition.end, - delegateType: $.support.transition.end, - handle: function (e) { - if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments) - } - } - }) - -}(jQuery); - -/* ======================================================================== - * Bootstrap: alert.js v3.3.7 - * http://getbootstrap.com/javascript/#alerts - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // ALERT CLASS DEFINITION - // ====================== - - var dismiss = '[data-dismiss="alert"]' - var Alert = function (el) { - $(el).on('click', dismiss, this.close) - } - - Alert.VERSION = '3.3.7' - - Alert.TRANSITION_DURATION = 150 - - Alert.prototype.close = function (e) { - var $this = $(this) - var selector = $this.attr('data-target') - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 - } - - var $parent = $(selector === '#' ? [] : selector) - - if (e) e.preventDefault() - - if (!$parent.length) { - $parent = $this.closest('.alert') - } - - $parent.trigger(e = $.Event('close.bs.alert')) - - if (e.isDefaultPrevented()) return - - $parent.removeClass('in') - - function removeElement() { - // detach from parent, fire event then clean up data - $parent.detach().trigger('closed.bs.alert').remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent - .one('bsTransitionEnd', removeElement) - .emulateTransitionEnd(Alert.TRANSITION_DURATION) : - removeElement() - } - - - // ALERT PLUGIN DEFINITION - // ======================= - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.alert') - - if (!data) $this.data('bs.alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - var old = $.fn.alert - - $.fn.alert = Plugin - $.fn.alert.Constructor = Alert - - - // ALERT NO CONFLICT - // ================= - - $.fn.alert.noConflict = function () { - $.fn.alert = old - return this - } - - - // ALERT DATA-API - // ============== - - $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) - -}(jQuery); - -/* ======================================================================== - * Bootstrap: button.js v3.3.7 - * http://getbootstrap.com/javascript/#buttons - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // BUTTON PUBLIC CLASS DEFINITION - // ============================== - - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, Button.DEFAULTS, options) - this.isLoading = false - } - - Button.VERSION = '3.3.7' - - Button.DEFAULTS = { - loadingText: 'loading...' - } - - Button.prototype.setState = function (state) { - var d = 'disabled' - var $el = this.$element - var val = $el.is('input') ? 'val' : 'html' - var data = $el.data() - - state += 'Text' - - if (data.resetText == null) $el.data('resetText', $el[val]()) - - // push to event loop to allow forms to submit - setTimeout($.proxy(function () { - $el[val](data[state] == null ? this.options[state] : data[state]) - - if (state == 'loadingText') { - this.isLoading = true - $el.addClass(d).attr(d, d).prop(d, true) - } else if (this.isLoading) { - this.isLoading = false - $el.removeClass(d).removeAttr(d).prop(d, false) - } - }, this), 0) - } - - Button.prototype.toggle = function () { - var changed = true - var $parent = this.$element.closest('[data-toggle="buttons"]') - - if ($parent.length) { - var $input = this.$element.find('input') - if ($input.prop('type') == 'radio') { - if ($input.prop('checked')) changed = false - $parent.find('.active').removeClass('active') - this.$element.addClass('active') - } else if ($input.prop('type') == 'checkbox') { - if (($input.prop('checked')) !== this.$element.hasClass('active')) changed = false - this.$element.toggleClass('active') - } - $input.prop('checked', this.$element.hasClass('active')) - if (changed) $input.trigger('change') - } else { - this.$element.attr('aria-pressed', !this.$element.hasClass('active')) - this.$element.toggleClass('active') - } - } - - - // BUTTON PLUGIN DEFINITION - // ======================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.button') - var options = typeof option == 'object' && option - - if (!data) $this.data('bs.button', (data = new Button(this, options))) - - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - var old = $.fn.button - - $.fn.button = Plugin - $.fn.button.Constructor = Button - - - // BUTTON NO CONFLICT - // ================== - - $.fn.button.noConflict = function () { - $.fn.button = old - return this - } - - - // BUTTON DATA-API - // =============== - - $(document) - .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) { - var $btn = $(e.target).closest('.btn') - Plugin.call($btn, 'toggle') - if (!($(e.target).is('input[type="radio"], input[type="checkbox"]'))) { - // Prevent double click on radios, and the double selections (so cancellation) on checkboxes - e.preventDefault() - // The target component still receive the focus - if ($btn.is('input,button')) $btn.trigger('focus') - else $btn.find('input:visible,button:visible').first().trigger('focus') - } - }) - .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) { - $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type)) - }) - -}(jQuery); - -/* ======================================================================== - * Bootstrap: carousel.js v3.3.7 - * http://getbootstrap.com/javascript/#carousel - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // CAROUSEL CLASS DEFINITION - // ========================= - - var Carousel = function (element, options) { - this.$element = $(element) - this.$indicators = this.$element.find('.carousel-indicators') - this.options = options - this.paused = null - this.sliding = null - this.interval = null - this.$active = null - this.$items = null - - this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this)) - - this.options.pause == 'hover' && !('ontouchstart' in document.documentElement) && this.$element - .on('mouseenter.bs.carousel', $.proxy(this.pause, this)) - .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) - } - - Carousel.VERSION = '3.3.7' - - Carousel.TRANSITION_DURATION = 600 - - Carousel.DEFAULTS = { - interval: 5000, - pause: 'hover', - wrap: true, - keyboard: true - } - - Carousel.prototype.keydown = function (e) { - if (/input|textarea/i.test(e.target.tagName)) return - switch (e.which) { - case 37: this.prev(); break - case 39: this.next(); break - default: return - } - - e.preventDefault() - } - - Carousel.prototype.cycle = function (e) { - e || (this.paused = false) - - this.interval && clearInterval(this.interval) - - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - - return this - } - - Carousel.prototype.getItemIndex = function (item) { - this.$items = item.parent().children('.item') - return this.$items.index(item || this.$active) - } - - Carousel.prototype.getItemForDirection = function (direction, active) { - var activeIndex = this.getItemIndex(active) - var willWrap = (direction == 'prev' && activeIndex === 0) - || (direction == 'next' && activeIndex == (this.$items.length - 1)) - if (willWrap && !this.options.wrap) return active - var delta = direction == 'prev' ? -1 : 1 - var itemIndex = (activeIndex + delta) % this.$items.length - return this.$items.eq(itemIndex) - } - - Carousel.prototype.to = function (pos) { - var that = this - var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active')) - - if (pos > (this.$items.length - 1) || pos < 0) return - - if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid" - if (activeIndex == pos) return this.pause().cycle() - - return this.slide(pos > activeIndex ? 'next' : 'prev', this.$items.eq(pos)) - } - - Carousel.prototype.pause = function (e) { - e || (this.paused = true) - - if (this.$element.find('.next, .prev').length && $.support.transition) { - this.$element.trigger($.support.transition.end) - this.cycle(true) - } - - this.interval = clearInterval(this.interval) - - return this - } - - Carousel.prototype.next = function () { - if (this.sliding) return - return this.slide('next') - } - - Carousel.prototype.prev = function () { - if (this.sliding) return - return this.slide('prev') - } - - Carousel.prototype.slide = function (type, next) { - var $active = this.$element.find('.item.active') - var $next = next || this.getItemForDirection(type, $active) - var isCycling = this.interval - var direction = type == 'next' ? 'left' : 'right' - var that = this - - if ($next.hasClass('active')) return (this.sliding = false) - - var relatedTarget = $next[0] - var slideEvent = $.Event('slide.bs.carousel', { - relatedTarget: relatedTarget, - direction: direction - }) - this.$element.trigger(slideEvent) - if (slideEvent.isDefaultPrevented()) return - - this.sliding = true - - isCycling && this.pause() - - if (this.$indicators.length) { - this.$indicators.find('.active').removeClass('active') - var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)]) - $nextIndicator && $nextIndicator.addClass('active') - } - - var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid" - if ($.support.transition && this.$element.hasClass('slide')) { - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - $active - .one('bsTransitionEnd', function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { - that.$element.trigger(slidEvent) - }, 0) - }) - .emulateTransitionEnd(Carousel.TRANSITION_DURATION) - } else { - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger(slidEvent) - } - - isCycling && this.cycle() - - return this - } - - - // CAROUSEL PLUGIN DEFINITION - // ========================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.carousel') - var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option) - var action = typeof option == 'string' ? option : options.slide - - if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (action) data[action]() - else if (options.interval) data.pause().cycle() - }) - } - - var old = $.fn.carousel - - $.fn.carousel = Plugin - $.fn.carousel.Constructor = Carousel - - - // CAROUSEL NO CONFLICT - // ==================== - - $.fn.carousel.noConflict = function () { - $.fn.carousel = old - return this - } - - - // CAROUSEL DATA-API - // ================= - - var clickHandler = function (e) { - var href - var $this = $(this) - var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7 - if (!$target.hasClass('carousel')) return - var options = $.extend({}, $target.data(), $this.data()) - var slideIndex = $this.attr('data-slide-to') - if (slideIndex) options.interval = false - - Plugin.call($target, options) - - if (slideIndex) { - $target.data('bs.carousel').to(slideIndex) - } - - e.preventDefault() - } - - $(document) - .on('click.bs.carousel.data-api', '[data-slide]', clickHandler) - .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler) - - $(window).on('load', function () { - $('[data-ride="carousel"]').each(function () { - var $carousel = $(this) - Plugin.call($carousel, $carousel.data()) - }) - }) - -}(jQuery); - -/* ======================================================================== - * Bootstrap: collapse.js v3.3.7 - * http://getbootstrap.com/javascript/#collapse - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - -/* jshint latedef: false */ - -+function ($) { - 'use strict'; - - // COLLAPSE PUBLIC CLASS DEFINITION - // ================================ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, Collapse.DEFAULTS, options) - this.$trigger = $('[data-toggle="collapse"][href="#' + element.id + '"],' + - '[data-toggle="collapse"][data-target="#' + element.id + '"]') - this.transitioning = null - - if (this.options.parent) { - this.$parent = this.getParent() - } else { - this.addAriaAndCollapsedClass(this.$element, this.$trigger) - } - - if (this.options.toggle) this.toggle() - } - - Collapse.VERSION = '3.3.7' - - Collapse.TRANSITION_DURATION = 350 - - Collapse.DEFAULTS = { - toggle: true - } - - Collapse.prototype.dimension = function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - Collapse.prototype.show = function () { - if (this.transitioning || this.$element.hasClass('in')) return - - var activesData - var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing') - - if (actives && actives.length) { - activesData = actives.data('bs.collapse') - if (activesData && activesData.transitioning) return - } - - var startEvent = $.Event('show.bs.collapse') - this.$element.trigger(startEvent) - if (startEvent.isDefaultPrevented()) return - - if (actives && actives.length) { - Plugin.call(actives, 'hide') - activesData || actives.data('bs.collapse', null) - } - - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - .addClass('collapsing')[dimension](0) - .attr('aria-expanded', true) - - this.$trigger - .removeClass('collapsed') - .attr('aria-expanded', true) - - this.transitioning = 1 - - var complete = function () { - this.$element - .removeClass('collapsing') - .addClass('collapse in')[dimension]('') - this.transitioning = 0 - this.$element - .trigger('shown.bs.collapse') - } - - if (!$.support.transition) return complete.call(this) - - var scrollSize = $.camelCase(['scroll', dimension].join('-')) - - this.$element - .one('bsTransitionEnd', $.proxy(complete, this)) - .emulateTransitionEnd(Collapse.TRANSITION_DURATION)[dimension](this.$element[0][scrollSize]) - } - - Collapse.prototype.hide = function () { - if (this.transitioning || !this.$element.hasClass('in')) return - - var startEvent = $.Event('hide.bs.collapse') - this.$element.trigger(startEvent) - if (startEvent.isDefaultPrevented()) return - - var dimension = this.dimension() - - this.$element[dimension](this.$element[dimension]())[0].offsetHeight - - this.$element - .addClass('collapsing') - .removeClass('collapse in') - .attr('aria-expanded', false) - - this.$trigger - .addClass('collapsed') - .attr('aria-expanded', false) - - this.transitioning = 1 - - var complete = function () { - this.transitioning = 0 - this.$element - .removeClass('collapsing') - .addClass('collapse') - .trigger('hidden.bs.collapse') - } - - if (!$.support.transition) return complete.call(this) - - this.$element - [dimension](0) - .one('bsTransitionEnd', $.proxy(complete, this)) - .emulateTransitionEnd(Collapse.TRANSITION_DURATION) - } - - Collapse.prototype.toggle = function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - Collapse.prototype.getParent = function () { - return $(this.options.parent) - .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]') - .each($.proxy(function (i, element) { - var $element = $(element) - this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element) - }, this)) - .end() - } - - Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) { - var isOpen = $element.hasClass('in') - - $element.attr('aria-expanded', isOpen) - $trigger - .toggleClass('collapsed', !isOpen) - .attr('aria-expanded', isOpen) - } - - function getTargetFromTrigger($trigger) { - var href - var target = $trigger.attr('data-target') - || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7 - - return $(target) - } - - - // COLLAPSE PLUGIN DEFINITION - // ========================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.collapse') - var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) - - if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false - if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.collapse - - $.fn.collapse = Plugin - $.fn.collapse.Constructor = Collapse - - - // COLLAPSE NO CONFLICT - // ==================== - - $.fn.collapse.noConflict = function () { - $.fn.collapse = old - return this - } - - - // COLLAPSE DATA-API - // ================= - - $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) { - var $this = $(this) - - if (!$this.attr('data-target')) e.preventDefault() - - var $target = getTargetFromTrigger($this) - var data = $target.data('bs.collapse') - var option = data ? 'toggle' : $this.data() - - Plugin.call($target, option) - }) - -}(jQuery); - -/* ======================================================================== - * Bootstrap: dropdown.js v3.3.7 - * http://getbootstrap.com/javascript/#dropdowns - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // DROPDOWN CLASS DEFINITION - // ========================= - - var backdrop = '.dropdown-backdrop' - var toggle = '[data-toggle="dropdown"]' - var Dropdown = function (element) { - $(element).on('click.bs.dropdown', this.toggle) - } - - Dropdown.VERSION = '3.3.7' - - function getParent($this) { - var selector = $this.attr('data-target') - - if (!selector) { - selector = $this.attr('href') - selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 - } - - var $parent = selector && $(selector) - - return $parent && $parent.length ? $parent : $this.parent() - } - - function clearMenus(e) { - if (e && e.which === 3) return - $(backdrop).remove() - $(toggle).each(function () { - var $this = $(this) - var $parent = getParent($this) - var relatedTarget = { relatedTarget: this } - - if (!$parent.hasClass('open')) return - - if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return - - $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)) - - if (e.isDefaultPrevented()) return - - $this.attr('aria-expanded', 'false') - $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget)) - }) - } - - Dropdown.prototype.toggle = function (e) { - var $this = $(this) - - if ($this.is('.disabled, :disabled')) return - - var $parent = getParent($this) - var isActive = $parent.hasClass('open') - - clearMenus() - - if (!isActive) { - if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { - // if mobile we use a backdrop because click events don't delegate - $(document.createElement('div')) - .addClass('dropdown-backdrop') - .insertAfter($(this)) - .on('click', clearMenus) - } - - var relatedTarget = { relatedTarget: this } - $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget)) - - if (e.isDefaultPrevented()) return - - $this - .trigger('focus') - .attr('aria-expanded', 'true') - - $parent - .toggleClass('open') - .trigger($.Event('shown.bs.dropdown', relatedTarget)) - } - - return false - } - - Dropdown.prototype.keydown = function (e) { - if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return - - var $this = $(this) - - e.preventDefault() - e.stopPropagation() - - if ($this.is('.disabled, :disabled')) return - - var $parent = getParent($this) - var isActive = $parent.hasClass('open') - - if (!isActive && e.which != 27 || isActive && e.which == 27) { - if (e.which == 27) $parent.find(toggle).trigger('focus') - return $this.trigger('click') - } - - var desc = ' li:not(.disabled):visible a' - var $items = $parent.find('.dropdown-menu' + desc) - - if (!$items.length) return - - var index = $items.index(e.target) - - if (e.which == 38 && index > 0) index-- // up - if (e.which == 40 && index < $items.length - 1) index++ // down - if (!~index) index = 0 - - $items.eq(index).trigger('focus') - } - - - // DROPDOWN PLUGIN DEFINITION - // ========================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.dropdown') - - if (!data) $this.data('bs.dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - var old = $.fn.dropdown - - $.fn.dropdown = Plugin - $.fn.dropdown.Constructor = Dropdown - - - // DROPDOWN NO CONFLICT - // ==================== - - $.fn.dropdown.noConflict = function () { - $.fn.dropdown = old - return this - } - - - // APPLY TO STANDARD DROPDOWN ELEMENTS - // =================================== - - $(document) - .on('click.bs.dropdown.data-api', clearMenus) - .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) - .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown) - .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown) - -}(jQuery); - -/* ======================================================================== - * Bootstrap: modal.js v3.3.7 - * http://getbootstrap.com/javascript/#modals - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // MODAL CLASS DEFINITION - // ====================== - - var Modal = function (element, options) { - this.options = options - this.$body = $(document.body) - this.$element = $(element) - this.$dialog = this.$element.find('.modal-dialog') - this.$backdrop = null - this.isShown = null - this.originalBodyPad = null - this.scrollbarWidth = 0 - this.ignoreBackdropClick = false - - if (this.options.remote) { - this.$element - .find('.modal-content') - .load(this.options.remote, $.proxy(function () { - this.$element.trigger('loaded.bs.modal') - }, this)) - } - } - - Modal.VERSION = '3.3.7' - - Modal.TRANSITION_DURATION = 300 - Modal.BACKDROP_TRANSITION_DURATION = 150 - - Modal.DEFAULTS = { - backdrop: true, - keyboard: true, - show: true - } - - Modal.prototype.toggle = function (_relatedTarget) { - return this.isShown ? this.hide() : this.show(_relatedTarget) - } - - Modal.prototype.show = function (_relatedTarget) { - var that = this - var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }) - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - this.isShown = true - - this.checkScrollbar() - this.setScrollbar() - this.$body.addClass('modal-open') - - this.escape() - this.resize() - - this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) - - this.$dialog.on('mousedown.dismiss.bs.modal', function () { - that.$element.one('mouseup.dismiss.bs.modal', function (e) { - if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true - }) - }) - - this.backdrop(function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(that.$body) // don't move modals dom position - } - - that.$element - .show() - .scrollTop(0) - - that.adjustDialog() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element.addClass('in') - - that.enforceFocus() - - var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) - - transition ? - that.$dialog // wait for modal to slide in - .one('bsTransitionEnd', function () { - that.$element.trigger('focus').trigger(e) - }) - .emulateTransitionEnd(Modal.TRANSITION_DURATION) : - that.$element.trigger('focus').trigger(e) - }) - } - - Modal.prototype.hide = function (e) { - if (e) e.preventDefault() - - e = $.Event('hide.bs.modal') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - this.escape() - this.resize() - - $(document).off('focusin.bs.modal') - - this.$element - .removeClass('in') - .off('click.dismiss.bs.modal') - .off('mouseup.dismiss.bs.modal') - - this.$dialog.off('mousedown.dismiss.bs.modal') - - $.support.transition && this.$element.hasClass('fade') ? - this.$element - .one('bsTransitionEnd', $.proxy(this.hideModal, this)) - .emulateTransitionEnd(Modal.TRANSITION_DURATION) : - this.hideModal() - } - - Modal.prototype.enforceFocus = function () { - $(document) - .off('focusin.bs.modal') // guard against infinite focus loop - .on('focusin.bs.modal', $.proxy(function (e) { - if (document !== e.target && - this.$element[0] !== e.target && - !this.$element.has(e.target).length) { - this.$element.trigger('focus') - } - }, this)) - } - - Modal.prototype.escape = function () { - if (this.isShown && this.options.keyboard) { - this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) { - e.which == 27 && this.hide() - }, this)) - } else if (!this.isShown) { - this.$element.off('keydown.dismiss.bs.modal') - } - } - - Modal.prototype.resize = function () { - if (this.isShown) { - $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this)) - } else { - $(window).off('resize.bs.modal') - } - } - - Modal.prototype.hideModal = function () { - var that = this - this.$element.hide() - this.backdrop(function () { - that.$body.removeClass('modal-open') - that.resetAdjustments() - that.resetScrollbar() - that.$element.trigger('hidden.bs.modal') - }) - } - - Modal.prototype.removeBackdrop = function () { - this.$backdrop && this.$backdrop.remove() - this.$backdrop = null - } - - Modal.prototype.backdrop = function (callback) { - var that = this - var animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $(document.createElement('div')) - .addClass('modal-backdrop ' + animate) - .appendTo(this.$body) - - this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) { - if (this.ignoreBackdropClick) { - this.ignoreBackdropClick = false - return - } - if (e.target !== e.currentTarget) return - this.options.backdrop == 'static' - ? this.$element[0].focus() - : this.hide() - }, this)) - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - if (!callback) return - - doAnimate ? - this.$backdrop - .one('bsTransitionEnd', callback) - .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - var callbackRemove = function () { - that.removeBackdrop() - callback && callback() - } - $.support.transition && this.$element.hasClass('fade') ? - this.$backdrop - .one('bsTransitionEnd', callbackRemove) - .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) : - callbackRemove() - - } else if (callback) { - callback() - } - } - - // these following methods are used to handle overflowing modals - - Modal.prototype.handleUpdate = function () { - this.adjustDialog() - } - - Modal.prototype.adjustDialog = function () { - var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight - - this.$element.css({ - paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '', - paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : '' - }) - } - - Modal.prototype.resetAdjustments = function () { - this.$element.css({ - paddingLeft: '', - paddingRight: '' - }) - } - - Modal.prototype.checkScrollbar = function () { - var fullWindowWidth = window.innerWidth - if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8 - var documentElementRect = document.documentElement.getBoundingClientRect() - fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left) - } - this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth - this.scrollbarWidth = this.measureScrollbar() - } - - Modal.prototype.setScrollbar = function () { - var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) - this.originalBodyPad = document.body.style.paddingRight || '' - if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) - } - - Modal.prototype.resetScrollbar = function () { - this.$body.css('padding-right', this.originalBodyPad) - } - - Modal.prototype.measureScrollbar = function () { // thx walsh - var scrollDiv = document.createElement('div') - scrollDiv.className = 'modal-scrollbar-measure' - this.$body.append(scrollDiv) - var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth - this.$body[0].removeChild(scrollDiv) - return scrollbarWidth - } - - - // MODAL PLUGIN DEFINITION - // ======================= - - function Plugin(option, _relatedTarget) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.modal') - var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option) - - if (!data) $this.data('bs.modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option](_relatedTarget) - else if (options.show) data.show(_relatedTarget) - }) - } - - var old = $.fn.modal - - $.fn.modal = Plugin - $.fn.modal.Constructor = Modal - - - // MODAL NO CONFLICT - // ================= - - $.fn.modal.noConflict = function () { - $.fn.modal = old - return this - } - - - // MODAL DATA-API - // ============== - - $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { - var $this = $(this) - var href = $this.attr('href') - var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7 - var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) - - if ($this.is('a')) e.preventDefault() - - $target.one('show.bs.modal', function (showEvent) { - if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown - $target.one('hidden.bs.modal', function () { - $this.is(':visible') && $this.trigger('focus') - }) - }) - Plugin.call($target, option, this) - }) - -}(jQuery); - -/* ======================================================================== - * Bootstrap: tooltip.js v3.3.7 - * http://getbootstrap.com/javascript/#tooltip - * Inspired by the original jQuery.tipsy by Jason Frame - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // TOOLTIP PUBLIC CLASS DEFINITION - // =============================== - - var Tooltip = function (element, options) { - this.type = null - this.options = null - this.enabled = null - this.timeout = null - this.hoverState = null - this.$element = null - this.inState = null - - this.init('tooltip', element, options) - } - - Tooltip.VERSION = '3.3.7' - - Tooltip.TRANSITION_DURATION = 150 - - Tooltip.DEFAULTS = { - animation: true, - placement: 'top', - selector: false, - template: '', - trigger: 'hover focus', - title: '', - delay: 0, - html: false, - container: false, - viewport: { - selector: 'body', - padding: 0 - } - } - - Tooltip.prototype.init = function (type, element, options) { - this.enabled = true - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport)) - this.inState = { click: false, hover: false, focus: false } - - if (this.$element[0] instanceof document.constructor && !this.options.selector) { - throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!') - } - - var triggers = this.options.trigger.split(' ') - - for (var i = triggers.length; i--;) { - var trigger = triggers[i] - - if (trigger == 'click') { - this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) - } else if (trigger != 'manual') { - var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin' - var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout' - - this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) - } - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - Tooltip.prototype.getDefaults = function () { - return Tooltip.DEFAULTS - } - - Tooltip.prototype.getOptions = function (options) { - options = $.extend({}, this.getDefaults(), this.$element.data(), options) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay, - hide: options.delay - } - } - - return options - } - - Tooltip.prototype.getDelegateOptions = function () { - var options = {} - var defaults = this.getDefaults() - - this._options && $.each(this._options, function (key, value) { - if (defaults[key] != value) options[key] = value - }) - - return options - } - - Tooltip.prototype.enter = function (obj) { - var self = obj instanceof this.constructor ? - obj : $(obj.currentTarget).data('bs.' + this.type) - - if (!self) { - self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) - $(obj.currentTarget).data('bs.' + this.type, self) - } - - if (obj instanceof $.Event) { - self.inState[obj.type == 'focusin' ? 'focus' : 'hover'] = true - } - - if (self.tip().hasClass('in') || self.hoverState == 'in') { - self.hoverState = 'in' - return - } - - clearTimeout(self.timeout) - - self.hoverState = 'in' - - if (!self.options.delay || !self.options.delay.show) return self.show() - - self.timeout = setTimeout(function () { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } - - Tooltip.prototype.isInStateTrue = function () { - for (var key in this.inState) { - if (this.inState[key]) return true - } - - return false - } - - Tooltip.prototype.leave = function (obj) { - var self = obj instanceof this.constructor ? - obj : $(obj.currentTarget).data('bs.' + this.type) - - if (!self) { - self = new this.constructor(obj.currentTarget, this.getDelegateOptions()) - $(obj.currentTarget).data('bs.' + this.type, self) - } - - if (obj instanceof $.Event) { - self.inState[obj.type == 'focusout' ? 'focus' : 'hover'] = false - } - - if (self.isInStateTrue()) return - - clearTimeout(self.timeout) - - self.hoverState = 'out' - - if (!self.options.delay || !self.options.delay.hide) return self.hide() - - self.timeout = setTimeout(function () { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } - - Tooltip.prototype.show = function () { - var e = $.Event('show.bs.' + this.type) - - if (this.hasContent() && this.enabled) { - this.$element.trigger(e) - - var inDom = $.contains(this.$element[0].ownerDocument.documentElement, this.$element[0]) - if (e.isDefaultPrevented() || !inDom) return - var that = this - - var $tip = this.tip() - - var tipId = this.getUID(this.type) - - this.setContent() - $tip.attr('id', tipId) - this.$element.attr('aria-describedby', tipId) - - if (this.options.animation) $tip.addClass('fade') - - var placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - var autoToken = /\s?auto?\s?/i - var autoPlace = autoToken.test(placement) - if (autoPlace) placement = placement.replace(autoToken, '') || 'top' - - $tip - .detach() - .css({ top: 0, left: 0, display: 'block' }) - .addClass(placement) - .data('bs.' + this.type, this) - - this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) - this.$element.trigger('inserted.bs.' + this.type) - - var pos = this.getPosition() - var actualWidth = $tip[0].offsetWidth - var actualHeight = $tip[0].offsetHeight - - if (autoPlace) { - var orgPlacement = placement - var viewportDim = this.getPosition(this.$viewport) - - placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top' : - placement == 'top' && pos.top - actualHeight < viewportDim.top ? 'bottom' : - placement == 'right' && pos.right + actualWidth > viewportDim.width ? 'left' : - placement == 'left' && pos.left - actualWidth < viewportDim.left ? 'right' : - placement - - $tip - .removeClass(orgPlacement) - .addClass(placement) - } - - var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) - - this.applyPlacement(calculatedOffset, placement) - - var complete = function () { - var prevHoverState = that.hoverState - that.$element.trigger('shown.bs.' + that.type) - that.hoverState = null - - if (prevHoverState == 'out') that.leave(that) - } - - $.support.transition && this.$tip.hasClass('fade') ? - $tip - .one('bsTransitionEnd', complete) - .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : - complete() - } - } - - Tooltip.prototype.applyPlacement = function (offset, placement) { - var $tip = this.tip() - var width = $tip[0].offsetWidth - var height = $tip[0].offsetHeight - - // manually read margins because getBoundingClientRect includes difference - var marginTop = parseInt($tip.css('margin-top'), 10) - var marginLeft = parseInt($tip.css('margin-left'), 10) - - // we must check for NaN for ie 8/9 - if (isNaN(marginTop)) marginTop = 0 - if (isNaN(marginLeft)) marginLeft = 0 - - offset.top += marginTop - offset.left += marginLeft - - // $.fn.offset doesn't round pixel values - // so we use setOffset directly with our own function B-0 - $.offset.setOffset($tip[0], $.extend({ - using: function (props) { - $tip.css({ - top: Math.round(props.top), - left: Math.round(props.left) - }) - } - }, offset), 0) - - $tip.addClass('in') - - // check to see if placing tip in new offset caused the tip to resize itself - var actualWidth = $tip[0].offsetWidth - var actualHeight = $tip[0].offsetHeight - - if (placement == 'top' && actualHeight != height) { - offset.top = offset.top + height - actualHeight - } - - var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight) - - if (delta.left) offset.left += delta.left - else offset.top += delta.top - - var isVertical = /top|bottom/.test(placement) - var arrowDelta = isVertical ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight - var arrowOffsetPosition = isVertical ? 'offsetWidth' : 'offsetHeight' - - $tip.offset(offset) - this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical) - } - - Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) { - this.arrow() - .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') - .css(isVertical ? 'top' : 'left', '') - } - - Tooltip.prototype.setContent = function () { - var $tip = this.tip() - var title = this.getTitle() - - $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } - - Tooltip.prototype.hide = function (callback) { - var that = this - var $tip = $(this.$tip) - var e = $.Event('hide.bs.' + this.type) - - function complete() { - if (that.hoverState != 'in') $tip.detach() - if (that.$element) { // TODO: Check whether guarding this code with this `if` is really necessary. - that.$element - .removeAttr('aria-describedby') - .trigger('hidden.bs.' + that.type) - } - callback && callback() - } - - this.$element.trigger(e) - - if (e.isDefaultPrevented()) return - - $tip.removeClass('in') - - $.support.transition && $tip.hasClass('fade') ? - $tip - .one('bsTransitionEnd', complete) - .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : - complete() - - this.hoverState = null - - return this - } - - Tooltip.prototype.fixTitle = function () { - var $e = this.$element - if ($e.attr('title') || typeof $e.attr('data-original-title') != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') - } - } - - Tooltip.prototype.hasContent = function () { - return this.getTitle() - } - - Tooltip.prototype.getPosition = function ($element) { - $element = $element || this.$element - - var el = $element[0] - var isBody = el.tagName == 'BODY' - - var elRect = el.getBoundingClientRect() - if (elRect.width == null) { - // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093 - elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top }) - } - var isSvg = window.SVGElement && el instanceof window.SVGElement - // Avoid using $.offset() on SVGs since it gives incorrect results in jQuery 3. - // See https://github.com/twbs/bootstrap/issues/20280 - var elOffset = isBody ? { top: 0, left: 0 } : (isSvg ? null : $element.offset()) - var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } - var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null - - return $.extend({}, elRect, scroll, outerDims, elOffset) - } - - Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) { - return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } : - placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } : - placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } : - /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width } - - } - - Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) { - var delta = { top: 0, left: 0 } - if (!this.$viewport) return delta - - var viewportPadding = this.options.viewport && this.options.viewport.padding || 0 - var viewportDimensions = this.getPosition(this.$viewport) - - if (/right|left/.test(placement)) { - var topEdgeOffset = pos.top - viewportPadding - viewportDimensions.scroll - var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight - if (topEdgeOffset < viewportDimensions.top) { // top overflow - delta.top = viewportDimensions.top - topEdgeOffset - } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow - delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset - } - } else { - var leftEdgeOffset = pos.left - viewportPadding - var rightEdgeOffset = pos.left + viewportPadding + actualWidth - if (leftEdgeOffset < viewportDimensions.left) { // left overflow - delta.left = viewportDimensions.left - leftEdgeOffset - } else if (rightEdgeOffset > viewportDimensions.right) { // right overflow - delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset - } - } - - return delta - } - - Tooltip.prototype.getTitle = function () { - var title - var $e = this.$element - var o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - return title - } - - Tooltip.prototype.getUID = function (prefix) { - do prefix += ~~(Math.random() * 1000000) - while (document.getElementById(prefix)) - return prefix - } - - Tooltip.prototype.tip = function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - if (this.$tip.length != 1) { - throw new Error(this.type + ' `template` option must consist of exactly 1 top-level element!') - } - } - return this.$tip - } - - Tooltip.prototype.arrow = function () { - return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')) - } - - Tooltip.prototype.enable = function () { - this.enabled = true - } - - Tooltip.prototype.disable = function () { - this.enabled = false - } - - Tooltip.prototype.toggleEnabled = function () { - this.enabled = !this.enabled - } - - Tooltip.prototype.toggle = function (e) { - var self = this - if (e) { - self = $(e.currentTarget).data('bs.' + this.type) - if (!self) { - self = new this.constructor(e.currentTarget, this.getDelegateOptions()) - $(e.currentTarget).data('bs.' + this.type, self) - } - } - - if (e) { - self.inState.click = !self.inState.click - if (self.isInStateTrue()) self.enter(self) - else self.leave(self) - } else { - self.tip().hasClass('in') ? self.leave(self) : self.enter(self) - } - } - - Tooltip.prototype.destroy = function () { - var that = this - clearTimeout(this.timeout) - this.hide(function () { - that.$element.off('.' + that.type).removeData('bs.' + that.type) - if (that.$tip) { - that.$tip.detach() - } - that.$tip = null - that.$arrow = null - that.$viewport = null - that.$element = null - }) - } - - - // TOOLTIP PLUGIN DEFINITION - // ========================= - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tooltip') - var options = typeof option == 'object' && option - - if (!data && /destroy|hide/.test(option)) return - if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.tooltip - - $.fn.tooltip = Plugin - $.fn.tooltip.Constructor = Tooltip - - - // TOOLTIP NO CONFLICT - // =================== - - $.fn.tooltip.noConflict = function () { - $.fn.tooltip = old - return this - } - -}(jQuery); - -/* ======================================================================== - * Bootstrap: popover.js v3.3.7 - * http://getbootstrap.com/javascript/#popovers - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // POPOVER PUBLIC CLASS DEFINITION - // =============================== - - var Popover = function (element, options) { - this.init('popover', element, options) - } - - if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') - - Popover.VERSION = '3.3.7' - - Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { - placement: 'right', - trigger: 'click', - content: '', - template: '' - }) - - - // NOTE: POPOVER EXTENDS tooltip.js - // ================================ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) - - Popover.prototype.constructor = Popover - - Popover.prototype.getDefaults = function () { - return Popover.DEFAULTS - } - - Popover.prototype.setContent = function () { - var $tip = this.tip() - var title = this.getTitle() - var content = this.getContent() - - $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events - this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text' - ](content) - - $tip.removeClass('fade top bottom left right in') - - // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do - // this manually by checking the contents. - if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide() - } - - Popover.prototype.hasContent = function () { - return this.getTitle() || this.getContent() - } - - Popover.prototype.getContent = function () { - var $e = this.$element - var o = this.options - - return $e.attr('data-content') - || (typeof o.content == 'function' ? - o.content.call($e[0]) : - o.content) - } - - Popover.prototype.arrow = function () { - return (this.$arrow = this.$arrow || this.tip().find('.arrow')) - } - - - // POPOVER PLUGIN DEFINITION - // ========================= - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.popover') - var options = typeof option == 'object' && option - - if (!data && /destroy|hide/.test(option)) return - if (!data) $this.data('bs.popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.popover - - $.fn.popover = Plugin - $.fn.popover.Constructor = Popover - - - // POPOVER NO CONFLICT - // =================== - - $.fn.popover.noConflict = function () { - $.fn.popover = old - return this - } - -}(jQuery); - -/* ======================================================================== - * Bootstrap: scrollspy.js v3.3.7 - * http://getbootstrap.com/javascript/#scrollspy - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // SCROLLSPY CLASS DEFINITION - // ========================== - - function ScrollSpy(element, options) { - this.$body = $(document.body) - this.$scrollElement = $(element).is(document.body) ? $(window) : $(element) - this.options = $.extend({}, ScrollSpy.DEFAULTS, options) - this.selector = (this.options.target || '') + ' .nav li > a' - this.offsets = [] - this.targets = [] - this.activeTarget = null - this.scrollHeight = 0 - - this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this)) - this.refresh() - this.process() - } - - ScrollSpy.VERSION = '3.3.7' - - ScrollSpy.DEFAULTS = { - offset: 10 - } - - ScrollSpy.prototype.getScrollHeight = function () { - return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight) - } - - ScrollSpy.prototype.refresh = function () { - var that = this - var offsetMethod = 'offset' - var offsetBase = 0 - - this.offsets = [] - this.targets = [] - this.scrollHeight = this.getScrollHeight() - - if (!$.isWindow(this.$scrollElement[0])) { - offsetMethod = 'position' - offsetBase = this.$scrollElement.scrollTop() - } - - this.$body - .find(this.selector) - .map(function () { - var $el = $(this) - var href = $el.data('target') || $el.attr('href') - var $href = /^#./.test(href) && $(href) - - return ($href - && $href.length - && $href.is(':visible') - && [[$href[offsetMethod]().top + offsetBase, href]]) || null - }) - .sort(function (a, b) { return a[0] - b[0] }) - .each(function () { - that.offsets.push(this[0]) - that.targets.push(this[1]) - }) - } - - ScrollSpy.prototype.process = function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - var scrollHeight = this.getScrollHeight() - var maxScroll = this.options.offset + scrollHeight - this.$scrollElement.height() - var offsets = this.offsets - var targets = this.targets - var activeTarget = this.activeTarget - var i - - if (this.scrollHeight != scrollHeight) { - this.refresh() - } - - if (scrollTop >= maxScroll) { - return activeTarget != (i = targets[targets.length - 1]) && this.activate(i) - } - - if (activeTarget && scrollTop < offsets[0]) { - this.activeTarget = null - return this.clear() - } - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1]) - && this.activate(targets[i]) - } - } - - ScrollSpy.prototype.activate = function (target) { - this.activeTarget = target - - this.clear() - - var selector = this.selector + - '[data-target="' + target + '"],' + - this.selector + '[href="' + target + '"]' - - var active = $(selector) - .parents('li') - .addClass('active') - - if (active.parent('.dropdown-menu').length) { - active = active - .closest('li.dropdown') - .addClass('active') - } - - active.trigger('activate.bs.scrollspy') - } - - ScrollSpy.prototype.clear = function () { - $(this.selector) - .parentsUntil(this.options.target, '.active') - .removeClass('active') - } - - - // SCROLLSPY PLUGIN DEFINITION - // =========================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.scrollspy') - var options = typeof option == 'object' && option - - if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.scrollspy - - $.fn.scrollspy = Plugin - $.fn.scrollspy.Constructor = ScrollSpy - - - // SCROLLSPY NO CONFLICT - // ===================== - - $.fn.scrollspy.noConflict = function () { - $.fn.scrollspy = old - return this - } - - - // SCROLLSPY DATA-API - // ================== - - $(window).on('load.bs.scrollspy.data-api', function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - Plugin.call($spy, $spy.data()) - }) - }) - -}(jQuery); - -/* ======================================================================== - * Bootstrap: tab.js v3.3.7 - * http://getbootstrap.com/javascript/#tabs - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // TAB CLASS DEFINITION - // ==================== - - var Tab = function (element) { - // jscs:disable requireDollarBeforejQueryAssignment - this.element = $(element) - // jscs:enable requireDollarBeforejQueryAssignment - } - - Tab.VERSION = '3.3.7' - - Tab.TRANSITION_DURATION = 150 - - Tab.prototype.show = function () { - var $this = this.element - var $ul = $this.closest('ul:not(.dropdown-menu)') - var selector = $this.data('target') - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 - } - - if ($this.parent('li').hasClass('active')) return - - var $previous = $ul.find('.active:last a') - var hideEvent = $.Event('hide.bs.tab', { - relatedTarget: $this[0] - }) - var showEvent = $.Event('show.bs.tab', { - relatedTarget: $previous[0] - }) - - $previous.trigger(hideEvent) - $this.trigger(showEvent) - - if (showEvent.isDefaultPrevented() || hideEvent.isDefaultPrevented()) return - - var $target = $(selector) - - this.activate($this.closest('li'), $ul) - this.activate($target, $target.parent(), function () { - $previous.trigger({ - type: 'hidden.bs.tab', - relatedTarget: $this[0] - }) - $this.trigger({ - type: 'shown.bs.tab', - relatedTarget: $previous[0] - }) - }) - } - - Tab.prototype.activate = function (element, container, callback) { - var $active = container.find('> .active') - var transition = callback - && $.support.transition - && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length) - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - .end() - .find('[data-toggle="tab"]') - .attr('aria-expanded', false) - - element - .addClass('active') - .find('[data-toggle="tab"]') - .attr('aria-expanded', true) - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if (element.parent('.dropdown-menu').length) { - element - .closest('li.dropdown') - .addClass('active') - .end() - .find('[data-toggle="tab"]') - .attr('aria-expanded', true) - } - - callback && callback() - } - - $active.length && transition ? - $active - .one('bsTransitionEnd', next) - .emulateTransitionEnd(Tab.TRANSITION_DURATION) : - next() - - $active.removeClass('in') - } - - - // TAB PLUGIN DEFINITION - // ===================== - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.tab') - - if (!data) $this.data('bs.tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.tab - - $.fn.tab = Plugin - $.fn.tab.Constructor = Tab - - - // TAB NO CONFLICT - // =============== - - $.fn.tab.noConflict = function () { - $.fn.tab = old - return this - } - - - // TAB DATA-API - // ============ - - var clickHandler = function (e) { - e.preventDefault() - Plugin.call($(this), 'show') - } - - $(document) - .on('click.bs.tab.data-api', '[data-toggle="tab"]', clickHandler) - .on('click.bs.tab.data-api', '[data-toggle="pill"]', clickHandler) - -}(jQuery); - -/* ======================================================================== - * Bootstrap: affix.js v3.3.7 - * http://getbootstrap.com/javascript/#affix - * ======================================================================== - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * ======================================================================== */ - - -+function ($) { - 'use strict'; - - // AFFIX CLASS DEFINITION - // ====================== - - var Affix = function (element, options) { - this.options = $.extend({}, Affix.DEFAULTS, options) - - this.$target = $(this.options.target) - .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this)) - .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) - - this.$element = $(element) - this.affixed = null - this.unpin = null - this.pinnedOffset = null - - this.checkPosition() - } - - Affix.VERSION = '3.3.7' - - Affix.RESET = 'affix affix-top affix-bottom' - - Affix.DEFAULTS = { - offset: 0, - target: window - } - - Affix.prototype.getState = function (scrollHeight, height, offsetTop, offsetBottom) { - var scrollTop = this.$target.scrollTop() - var position = this.$element.offset() - var targetHeight = this.$target.height() - - if (offsetTop != null && this.affixed == 'top') return scrollTop < offsetTop ? 'top' : false - - if (this.affixed == 'bottom') { - if (offsetTop != null) return (scrollTop + this.unpin <= position.top) ? false : 'bottom' - return (scrollTop + targetHeight <= scrollHeight - offsetBottom) ? false : 'bottom' - } - - var initializing = this.affixed == null - var colliderTop = initializing ? scrollTop : position.top - var colliderHeight = initializing ? targetHeight : height - - if (offsetTop != null && scrollTop <= offsetTop) return 'top' - if (offsetBottom != null && (colliderTop + colliderHeight >= scrollHeight - offsetBottom)) return 'bottom' - - return false - } - - Affix.prototype.getPinnedOffset = function () { - if (this.pinnedOffset) return this.pinnedOffset - this.$element.removeClass(Affix.RESET).addClass('affix') - var scrollTop = this.$target.scrollTop() - var position = this.$element.offset() - return (this.pinnedOffset = position.top - scrollTop) - } - - Affix.prototype.checkPositionWithEventLoop = function () { - setTimeout($.proxy(this.checkPosition, this), 1) - } - - Affix.prototype.checkPosition = function () { - if (!this.$element.is(':visible')) return - - var height = this.$element.height() - var offset = this.options.offset - var offsetTop = offset.top - var offsetBottom = offset.bottom - var scrollHeight = Math.max($(document).height(), $(document.body).height()) - - if (typeof offset != 'object') offsetBottom = offsetTop = offset - if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) - if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element) - - var affix = this.getState(scrollHeight, height, offsetTop, offsetBottom) - - if (this.affixed != affix) { - if (this.unpin != null) this.$element.css('top', '') - - var affixType = 'affix' + (affix ? '-' + affix : '') - var e = $.Event(affixType + '.bs.affix') - - this.$element.trigger(e) - - if (e.isDefaultPrevented()) return - - this.affixed = affix - this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null - - this.$element - .removeClass(Affix.RESET) - .addClass(affixType) - .trigger(affixType.replace('affix', 'affixed') + '.bs.affix') - } - - if (affix == 'bottom') { - this.$element.offset({ - top: scrollHeight - height - offsetBottom - }) - } - } - - - // AFFIX PLUGIN DEFINITION - // ======================= - - function Plugin(option) { - return this.each(function () { - var $this = $(this) - var data = $this.data('bs.affix') - var options = typeof option == 'object' && option - - if (!data) $this.data('bs.affix', (data = new Affix(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - var old = $.fn.affix - - $.fn.affix = Plugin - $.fn.affix.Constructor = Affix - - - // AFFIX NO CONFLICT - // ================= - - $.fn.affix.noConflict = function () { - $.fn.affix = old - return this - } - - - // AFFIX DATA-API - // ============== - - $(window).on('load', function () { - $('[data-spy="affix"]').each(function () { - var $spy = $(this) - var data = $spy.data() - - data.offset = data.offset || {} - - if (data.offsetBottom != null) data.offset.bottom = data.offsetBottom - if (data.offsetTop != null) data.offset.top = data.offsetTop - - Plugin.call($spy, data) - }) - }) - -}(jQuery); diff --git a/packages/composer-website/jekylldocs/assets/js/clipboard.min.js b/packages/composer-website/jekylldocs/assets/js/clipboard.min.js deleted file mode 100755 index 1d7c5d5d79..0000000000 --- a/packages/composer-website/jekylldocs/assets/js/clipboard.min.js +++ /dev/null @@ -1,7 +0,0 @@ -/*! - * clipboard.js v1.5.16 - * https://zenorocha.github.io/clipboard.js - * - * Licensed MIT © Zeno Rocha - */ -!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.Clipboard=e()}}(function(){var e,t,n;return function e(t,n,i){function o(a,c){if(!n[a]){if(!t[a]){var l="function"==typeof require&&require;if(!c&&l)return l(a,!0);if(r)return r(a,!0);var s=new Error("Cannot find module '"+a+"'");throw s.code="MODULE_NOT_FOUND",s}var u=n[a]={exports:{}};t[a][0].call(u.exports,function(e){var n=t[a][1][e];return o(n?n:e)},u,u.exports,e,t,n,i)}return n[a].exports}for(var r="function"==typeof require&&require,a=0;a0&&void 0!==arguments[0]?arguments[0]:{};this.action=t.action,this.emitter=t.emitter,this.target=t.target,this.text=t.text,this.trigger=t.trigger,this.selectedText=""}},{key:"initSelection",value:function e(){this.text?this.selectFake():this.target&&this.selectTarget()}},{key:"selectFake",value:function e(){var t=this,n="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return t.removeFake()},this.fakeHandler=document.body.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[n?"right":"left"]="-9999px";var i=window.pageYOffset||document.documentElement.scrollTop;this.fakeElem.addEventListener("focus",window.scrollTo(0,i)),this.fakeElem.style.top=i+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,document.body.appendChild(this.fakeElem),this.selectedText=(0,o.default)(this.fakeElem),this.copyText()}},{key:"removeFake",value:function e(){this.fakeHandler&&(document.body.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(document.body.removeChild(this.fakeElem),this.fakeElem=null)}},{key:"selectTarget",value:function e(){this.selectedText=(0,o.default)(this.target),this.copyText()}},{key:"copyText",value:function e(){var t=void 0;try{t=document.execCommand(this.action)}catch(e){t=!1}this.handleResult(t)}},{key:"handleResult",value:function e(t){this.emitter.emit(t?"success":"error",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})}},{key:"clearSelection",value:function e(){this.target&&this.target.blur(),window.getSelection().removeAllRanges()}},{key:"destroy",value:function e(){this.removeFake()}},{key:"action",set:function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"copy";if(this._action=t,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function e(){return this._action}},{key:"target",set:function e(t){if(void 0!==t){if(!t||"object"!==("undefined"==typeof t?"undefined":r(t))||1!==t.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&t.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(t.hasAttribute("readonly")||t.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=t}},get:function e(){return this._target}}]),e}();e.exports=c})},{select:5}],8:[function(t,n,i){!function(o,r){if("function"==typeof e&&e.amd)e(["module","./clipboard-action","tiny-emitter","good-listener"],r);else if("undefined"!=typeof i)r(n,t("./clipboard-action"),t("tiny-emitter"),t("good-listener"));else{var a={exports:{}};r(a,o.clipboardAction,o.tinyEmitter,o.goodListener),o.clipboard=a.exports}}(this,function(e,t,n,i){"use strict";function o(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function c(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function l(e,t){var n="data-clipboard-"+e;if(t.hasAttribute(n))return t.getAttribute(n)}var s=o(t),u=o(n),f=o(i),d=function(){function e(e,t){for(var n=0;n0&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText}},{key:"listenClick",value:function e(t){var n=this;this.listener=(0,f.default)(t,"click",function(e){return n.onClick(e)})}},{key:"onClick",value:function e(t){var n=t.delegateTarget||t.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new s.default({action:this.action(n),target:this.target(n),text:this.text(n),trigger:n,emitter:this})}},{key:"defaultAction",value:function e(t){return l("action",t)}},{key:"defaultTarget",value:function e(t){var n=l("target",t);if(n)return document.querySelector(n)}},{key:"defaultText",value:function e(t){return l("text",t)}},{key:"destroy",value:function e(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)}}]),t}(u.default);e.exports=h})},{"./clipboard-action":7,"good-listener":4,"tiny-emitter":6}]},{},[8])(8)}); \ No newline at end of file diff --git a/packages/composer-website/jekylldocs/assets/js/generator.js b/packages/composer-website/jekylldocs/assets/js/generator.js deleted file mode 100644 index 0ff8ecf6b1..0000000000 --- a/packages/composer-website/jekylldocs/assets/js/generator.js +++ /dev/null @@ -1,47 +0,0 @@ -/*global jQuery, _, List */ -(function (win, $) { - 'use strict'; - - // Settings for doT.js - var doT = win.doT; - doT.templateSettings.interpolate = /<\%=([\s\S]+?)\%\>/g; - doT.templateSettings.conditional = /<\%if( else)?\s*([\s\S]*?)\s*\%>/g; - doT.templateSettings.iterate = /<\%each\s*(?:\%>|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*\%>)/g; - - $(function() { - var instructions = $('#instructions'); - $('#instructions-toggle').on('click', function (e) { - e.preventDefault(); - instructions.toggle('fast'); - }); - - var tpl = doT.template($('#plugins-all-template').text()); - var pluginsAll = $('#plugins-all'); - - $.getJSON('https://storage.googleapis.com/generators.yeoman.io/cache.json') - .done(function (plugins) { - pluginsAll.html(tpl({ - modules: plugins.sort(function (a, b) { - return a.stars === b.stars ? 0 : a.stars < b.stars ? 1 : -1; - }) - })); - var list = new List('plugins-all', { - valueNames: [ - 'name', - 'owner', - 'stars', - 'updated', - 'downloads', - 'description' - ] - }); - - if (list.listContainer) { - list.on('updated', function () { - $('.table thead').toggle(list.matchingItems.length !== 0); - $('#search-notfound').toggle(list.matchingItems.length === 0); - }); - } - }); - }); -})(window, jQuery); diff --git a/packages/composer-website/jekylldocs/assets/js/jquery.js b/packages/composer-website/jekylldocs/assets/js/jquery.js deleted file mode 100644 index d1608e37ff..0000000000 --- a/packages/composer-website/jekylldocs/assets/js/jquery.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ -!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h; -if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="
a",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/\s*$/g,rb={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:k.htmlSerialize?[0,"",""]:[1,"X
","
"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?""!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("