Skip to content

Commit

Permalink
s/DABL/Daml Hub/ (#10062)
Browse files Browse the repository at this point in the history
It's been long enough.

CHANGELOG_BEGIN
CHANGELOG_END
  • Loading branch information
garyverhaegen-da authored Jun 21, 2021
1 parent a205d0e commit e12a449
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion compatibility/bazel_tools/testing.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ def sdk_platform_test(sdk_version, platform_version):
tags = ["cpu:2"] + extra_tags(sdk_version, platform_version),
)

# For now, we only cover the DABL usecase where
# For now, we only cover the Daml Hub usecase where
# sandbox and the JSON API come from the same SDK.
# However, the test setup is flexible enough, that we
# can control them individually.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/app-dev/app-arch.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ When you deploy your application to a production ledger, you need to authenticat
your users.

Daml ledgers support a unified interface for authorization of commands. Some Daml ledgers, like for
example https://projectdabl.com, offer integrated authentication and authorization, but you can also
example https://hub.daml.com, offer integrated authentication and authorization, but you can also
use an external service provider like https://auth0.com. The Daml react libraries support interfacing
with a Daml ledger that validates authorization of incoming requests. Simply initialize your
``DamlLedger`` object with the token obtained by the respective token issuer. How authorization works and the
Expand Down
2 changes: 1 addition & 1 deletion docs/source/daml-script/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ Running Daml Script against the HTTP JSON API

In some cases, you only have access to the
:doc:`HTTP JSON API </json-api/index>` but not to the gRPC of a ledger, e.g., on
`project:DABL <https://projectdabl.com>`_. For this usecase, Daml
`Daml Hub <https://hub.daml.com>`_. For this usecase, Daml
script can be run against the JSON API. Note that if you do have
access to the gRPC Ledger API, running Daml script against the JSON API does
not have any advantages.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/deploy/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ for production use today.
- `Amazon QLDB <https://aws.amazon.com/qldb/>`__
- `Blockchain Technology Partners <https://blockchaintp.com/>`__
* - `Daml Hub <https://hub.daml.com/>`__
- `Managed cloud enviroment <https://projectdabl.com/>`__
- `Managed cloud enviroment <https://hub.daml.com/>`__
- `Digital Asset <https://digitalasset.com/>`__
* - `Hyperledger Besu <https://besu.hyperledger.org/>`__
- `Blockchain Technology Partners <https://blockchaintp.com/>`__
Expand Down
2 changes: 1 addition & 1 deletion docs/source/getting-started/first-feature.rst
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ You'll notice that new messages appear in the UI as soon as they are sent (due t
:scale: 50 %
:alt: In the create-daml-app as soon as you send the message it will appear in the "Messaging" panel

.. tip:: You completed the second part of the Getting Started Guide! `Join our forum <https://discuss.daml.com>`_ and share a screenshot of your accomplishment to `get your second of 3 badges <https://discuss.daml.com/badges/126/hey-look-what-i-can-do>`_! Get the third badge by `deploying to project:DABL <https://daml.com/learn/getting-started/deploy-to-dabl/>`_
.. tip:: You completed the second part of the Getting Started Guide! `Join our forum <https://discuss.daml.com>`_ and share a screenshot of your accomplishment to `get your second of 3 badges <https://discuss.daml.com/badges/126/hey-look-what-i-can-do>`_! Get the third badge by `deploying to Daml Hub <https://daml.com/learn/getting-started/deploy-to-dabl/>`_

Next Steps
==========
Expand Down
6 changes: 3 additions & 3 deletions docs/source/support/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Cadence

Regular snapshot releases are made every Wednesday, with additional snapshots released as needed. These releases contain Daml Connect and Integration Components, both from the `daml repository <https://github.com/digital-asset/daml>`_ as well as some others.

Stable versions are released once a month. See :ref:`release_process` below for the usual schedule. This schedule is a guide, not a guarantee, and additional releases may be made, or releases may be delayed for skipped entirely.
Stable versions are released once a month. See :ref:`release_process` below for the usual schedule. This schedule is a guide, not a guarantee, and additional releases may be made, or releases may be delayed for skipped entirely.

No more than one major version is released every six months, barring exceptional circumstances.

Expand Down Expand Up @@ -78,7 +78,7 @@ Release Candidate Announcement

Communications, Testing and Feedback

In the days following the announcement, the release is presented and discussed with both commercial and community users. It is also put through its paces by integrating it in `project:DABL <https://projectdabl.com>`_ and several ledger integrations.
In the days following the announcement, the release is presented and discussed with both commercial and community users. It is also put through its paces by integrating it in `Daml Hub <https://hub.daml.com>`_ and several ledger integrations.

Release Candidate Refinement II

Expand All @@ -89,5 +89,5 @@ Release
Assuming the release is not postponed due to extended test periods or newly discovered issues in the release candidate, the release is declared stable and given a regular version number on **the second Wednesday after the first Monday of the Month**.

.. figure:: release-timeline.png

The release process timeline illustrated by example of September 2020.
2 changes: 1 addition & 1 deletion docs/source/tools/assistant.rst
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Here is what each field means:
as well as when invoked via ``daml start``. Changing the platform version is useful if you deploy
to a ledger that is running on a different SDK version than you use locally and you want to make
sure that you catch any issues during testing. E.g., you might compile your Daml code using
SDK 1.3.0 so you get improvements in Daml Studio but deploy to DABL which could still be running
SDK 1.3.0 so you get improvements in Daml Studio but deploy to Daml Hub which could still be running
a ledger and the JSON API from SDK 1.2.0. In that case, you can set ``sdk-version: 1.3.0``
and ``platform-version: 1.2.0``.
It is possible to override the platform version by setting the ``DAML_PLATFORM_VERSION``
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ private[http] object JdbcConfig
s"""\"driver=$driver,url=$url,user=$user,password=$password,createSchema=$createSchema\""""
}

// It is public for DABL
// It is public for Daml Hub
final case class WebsocketConfig(
maxDuration: FiniteDuration,
throttleElem: Int,
Expand Down
8 changes: 4 additions & 4 deletions templates/create-daml-app/README.md.template
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,17 @@ As `Bob`, we can see that we are not following anyone and that `Alice` is follwi
us. We can follow `Alice` by clicking the plus symbol to the right of here name.


## Deploying to DABL
## Deploying to Daml Hub

Deploying `__PROJECT_NAME__` to the hosted Daml platform
[project:DABL](https://projectdabl.com/) is quite simple. Log into your DABL
[Daml Hub](https://hub.daml.com/) is quite simple. Log into your Daml Hub
account, create a new ledger and upload your Daml models and your UI.

To upload the Daml models, compile them into a DAR by executing
```
daml build -o __PROJECT_NAME__.dar
```
at the root of your repository. Afterwards, open to the DABL website, select
at the root of your repository. Afterwards, open to the Daml Hub website, select
the ledger you want to deploy to, go to the "Daml" selection and upload the
DAR `__PROJECT_NAME__.dar` you have just created.

Expand All @@ -91,7 +91,7 @@ daml codegen js .daml/dist/__PROJECT_NAME__-0.1.0.dar -o ui/daml.js
(cd ui && npm install && npm run-script build && zip -r ../__PROJECT_NAME__-ui.zip build)
```
at the root of the repository. Afterwards, select the "UI Assets" tab of your
chosen ledger on the DABL website, upload the ZIP file
chosen ledger on the Daml Hub website, upload the ZIP file
(`__PROJECT_NAME__-ui.zip`) you have just created and publish it.

To see your deployed instance of `__PROJECT_NAME__` in action, follow the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const LoginScreen: React.FC<Props> = ({onLogin}) => {
await login(credentials);
}

const handleDablLogin = () => {
const handleDamlHubLogin = () => {
window.location.assign(`https://login.projectdabl.com/auth/login?ledgerId=${ledgerId}`);
}

Expand Down Expand Up @@ -80,7 +80,7 @@ const LoginScreen: React.FC<Props> = ({onLogin}) => {
</Header>
<Form size='large' className='test-select-login-screen'>
<Segment>
{deploymentMode !== DeploymentMode.PROD_DABL
{deploymentMode !== DeploymentMode.PROD_DAML_HUB
? <>
{/* FORM_BEGIN */}
<Form.Input
Expand All @@ -101,8 +101,8 @@ const LoginScreen: React.FC<Props> = ({onLogin}) => {
</Button>
{/* FORM_END */}
</>
: <Button primary fluid onClick={handleDablLogin}>
Log in with DABL
: <Button primary fluid onClick={handleDamlHubLogin}>
Log in with Daml Hub
</Button>
}
</Segment>
Expand Down
8 changes: 4 additions & 4 deletions templates/create-daml-app/ui/src/config.ts.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@

export enum DeploymentMode {
DEV,
PROD_DABL,
PROD_DAML_HUB,
PROD_OTHER,
}

export const deploymentMode: DeploymentMode =
process.env.NODE_ENV === 'development'
? DeploymentMode.DEV
: window.location.hostname.endsWith('.projectdabl.com')
? DeploymentMode.PROD_DABL
? DeploymentMode.PROD_DAML_HUB
: DeploymentMode.PROD_OTHER;

// Decide the ledger ID based on the deployment mode first,
// then an environment variable, falling back on the sandbox ledger ID.
export const ledgerId: string =
deploymentMode === DeploymentMode.PROD_DABL
deploymentMode === DeploymentMode.PROD_DAML_HUB
? window.location.hostname.split('.')[0]
: process.env.REACT_APP_LEDGER_ID
?? '__PROJECT_NAME__-sandbox';

export const httpBaseUrl =
deploymentMode === DeploymentMode.PROD_DABL
deploymentMode === DeploymentMode.PROD_DAML_HUB
? `https://api.projectdabl.com/data/${ledgerId}/`
: undefined;

0 comments on commit e12a449

Please sign in to comment.