Skip to content

Commit

Permalink
fix: #3908 #3910 #3912 #3914 #3911 #3884 various bugfixes (#3929)
Browse files Browse the repository at this point in the history
  • Loading branch information
willmcvay authored Apr 12, 2021
1 parent 65f139e commit 56e5ee2
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 26 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/release-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
with:
node-version: '14.x'

- name: Set Version
run: |
echo "${{ steps.tagName.outputs.version}}" >> $RELEASE_VERSION
- name: Install
run: yarn

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2499,13 +2499,6 @@ exports[`DeveloperSubmitApp should match a snapshot when pendingRevisions = fals
</div>
</Field>
</Input>
<FormSubHeading>
<div
className="form-subheading"
>
This field is disabled during the beta period. Your app will be private by default as the Marketplace is not yet live. You will have the opportunity to make your app private via an edit before setting it to be "Listed" in the marketplace when we move from beta to production.
</div>
</FormSubHeading>
</div>
</GridItem>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ exports[`MarketplaceStatusSection should match a snapshot 1`] = `
placeholder="Please enter the Customer ID. For multiple Customer ID’s, please separate using a comma"
type="text"
/>
<FormSubHeading>
This field is disabled during the beta period. Your app will be private by default as the Marketplace is not yet live. You will have the opportunity to make your app private via an edit before setting it to be "Listed" in the marketplace when we move from beta to production.
</FormSubHeading>
</GridItem>
</Grid>
</FormSection>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,6 @@ const RedirectUriSection: React.FC<RedirectUriSectionProps> = ({ authFlow, isPri
name={limitToClientIds.name}
placeholder={limitToClientIds.placeHolder}
/>
<FormSubHeading>
This field is disabled during the beta period. Your app will be private by default as the Marketplace is not
yet live. You will have the opportunity to make your app private via an edit before setting it to be
&#34;Listed&#34; in the marketplace when we move from beta to production.
</FormSubHeading>
</GridItem>
</Grid>
</FormSection>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ exports[`Subcriptions should match snapshot 1`] = `
<p
className="mb-4"
>
The subscriptions table below is just for reference whilst we are in Beta. When we move out of the Beta Phase you can use the table below to view and manage your Developer Portal Subscriptions.
Please use the table below to view and manage your Developer Portal Subscriptions.
</p>
<Table
bordered={true}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,7 @@ export const Subcriptions: React.FC = () => {
<>
<H5>Subscriptions</H5>
<FadeIn>
<p className="mb-4">
The subscriptions table below is just for reference whilst we are in Beta. When we move out of the Beta
Phase you can use the table below to view and manage your Developer Portal Subscriptions.
</p>
<p className="mb-4">Please use the table below to view and manage your Developer Portal Subscriptions.</p>
<Table scrollable columns={columns} data={subscriptionsData} loading={false} bordered />
</FadeIn>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ exports[`DeveloperDesktopPage SettingsBillingTabPage should match snapshot 1`] =
<p
className="mb-4"
>
The subscriptions table below is just for reference whilst we are in Beta. When we move out of the Beta Phase you can use the table below to view and manage your Developer Portal Subscriptions.
Please use the table below to view and manage your Developer Portal Subscriptions.
</p>
<Table
bordered={true}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,7 @@ export const Support = () => {
return (
<div className={content}>
<p className="mb-5">
You are currently logged into our Beta release of Reapit Foundations and we are continuing to update, add
additional features and address any issues that may appear. In the meantime, if you would like to request a
feature or report a bug, this can be done from the ‘Help’ section on the left.
If you would like to request a feature or report a bug, this can be done from the ‘Help’ section on the left.
</p>

<p className="mb-5">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`StepBeforeYouStart should match snapshot 1`] = `
isCentered={true}
>
<a
className="button is-white is-secondary"
className="button is-secondary"
href="/api-docs/developer-portal"
rel="noreferrer"
target="_blank"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const StepBeforeYouStart: WizardStepComponent = ({ setWizardStep }) => {
footerItems={
<ButtonGroup hasSpacing isCentered>
<a
className="button is-white is-secondary"
className="button is-secondary"
href={`${Routes.API_DOCS}/developer-portal`}
rel="noreferrer"
target="_blank"
Expand Down
6 changes: 6 additions & 0 deletions packages/reapit-connect/.sentryclirc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[defaults]
project=reapit-connect
org=reapit-ltd

[http]
keepalive=false
11 changes: 11 additions & 0 deletions packages/reapit-connect/src/core/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* istanbul ignore file */
import React from 'react'
import * as Sentry from '@sentry/browser'
import { render } from 'react-dom'
import { Config } from '@/types/global'
import { logger } from '@reapit/utils'
Expand All @@ -14,6 +15,7 @@ window.reapit = {
connectOAuthUrl: '',
connectUserPoolId: '',
developerPortalUrl: '',
sentryDns: '',
},
}

Expand All @@ -33,6 +35,15 @@ const run = async () => {
try {
const configRes = await fetch('config.json')
const config = (await configRes.json()) as Config
const isLocal = config.appEnv !== 'production'

if (!isLocal && config.sentryDns) {
Sentry.init({
release: process.env.APP_VERSION,
dsn: config.sentryDns,
environment: config.appEnv,
})
}

window.reapit.config = config

Expand Down
1 change: 1 addition & 0 deletions packages/reapit-connect/src/types/global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export type Config = {
connectOAuthUrl: string
connectUserPoolId: string
developerPortalUrl: string
sentryDns: string
}

declare global {
Expand Down
1 change: 1 addition & 0 deletions packages/ts-scripts/src/webpack/webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const webpackConfigProd = {
minimizer: [
new ESBuildMinifyPlugin({
target: 'es2019',
sourcemap: true,
}),
],
},
Expand Down

0 comments on commit 56e5ee2

Please sign in to comment.