Release for 2020.3 (#2356)

* Bump verions

* Remove enableUnitTestingBeta setting (#2358)

* Bump versions
This commit is contained in:
Gregory Schier
2020-07-09 14:59:22 -07:00
committed by GitHub
parent 618f1dd27e
commit 4e56d2c26d
9 changed files with 6 additions and 36 deletions

View File

@@ -57,7 +57,6 @@ type BaseSettings = {
// Feature flags
enableSyncBeta: boolean,
enableUnitTestingBeta: boolean,
};
export type Settings = BaseModel & BaseSettings;
@@ -113,7 +112,6 @@ export function init(): BaseSettings {
// Feature flags
enableSyncBeta: false,
enableUnitTestingBeta: false,
};
}

View File

@@ -4,31 +4,21 @@ import React from 'react';
import { MultiSwitch } from 'insomnia-components';
import type { GlobalActivity } from '../../common/constants';
import { ACTIVITY_DEBUG, ACTIVITY_SPEC, ACTIVITY_UNIT_TEST } from '../../common/constants';
import type { Settings } from '../../models/settings';
import type { Workspace } from '../../models/workspace';
type Props = {
activity: GlobalActivity,
handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>,
settings: Settings,
workspace: Workspace,
};
export default function ActivityToggle({
activity,
handleActivityChange,
settings,
workspace,
}: Props) {
export default function ActivityToggle({ activity, handleActivityChange, workspace }: Props) {
const choices = [
{ label: 'Design', value: ACTIVITY_SPEC },
{ label: 'Debug', value: ACTIVITY_DEBUG },
{ label: 'Test', value: ACTIVITY_UNIT_TEST },
];
if (settings.enableUnitTestingBeta || activity === ACTIVITY_UNIT_TEST) {
choices.push({ label: 'Test', value: ACTIVITY_UNIT_TEST });
}
return (
<MultiSwitch
defaultValue={activity}

View File

@@ -10,7 +10,6 @@ import {
EDITOR_KEY_MAP_EMACS,
EDITOR_KEY_MAP_SUBLIME,
EDITOR_KEY_MAP_VIM,
getAppId,
HttpVersions,
isLinux,
isMac,
@@ -23,7 +22,6 @@ import { setFont } from '../../../plugins/misc';
import * as session from '../../../account/session';
import Tooltip from '../tooltip';
import CheckForUpdatesButton from '../check-for-updates-button';
import { APP_ID_DESIGNER } from '../../../../config';
// Font family regex to match certain monospace fonts that don't get
// recognized as monospace
@@ -510,18 +508,6 @@ class General extends React.PureComponent<Props, State> {
{this.renderBooleanSetting('Enable version control beta', 'enableSyncBeta', '', true)}
</React.Fragment>
)}
{getAppId() === APP_ID_DESIGNER && (
<>
<hr />
{this.renderBooleanSetting(
'Enable unit testing beta',
'enableUnitTestingBeta',
'',
false,
)}
</>
)}
</div>
);
}

View File

@@ -56,7 +56,7 @@ class WrapperDebug extends React.PureComponent<Props> {
const {
gitSyncDropdown,
handleActivityChange,
wrapperProps: { activeApiSpec, activeWorkspace, settings, activity },
wrapperProps: { activeApiSpec, activeWorkspace, activity },
} = this.props;
return (
@@ -76,7 +76,6 @@ class WrapperDebug extends React.PureComponent<Props> {
<ActivityToggle
activity={activity}
handleActivityChange={handleActivityChange}
settings={settings}
workspace={activeWorkspace}
/>
}

View File

@@ -191,7 +191,6 @@ class WrapperDesign extends React.PureComponent<Props, State> {
<ActivityToggle
activity={activity}
handleActivityChange={handleActivityChange}
settings={settings}
workspace={activeWorkspace}
/>
}

View File

@@ -501,7 +501,7 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
render() {
const { handleActivityChange, gitSyncDropdown } = this.props;
const { activeWorkspace, activity, settings, activeApiSpec } = this.props.wrapperProps;
const { activeWorkspace, activity, activeApiSpec } = this.props.wrapperProps;
return (
<PageLayout
wrapperProps={this.props.wrapperProps}
@@ -524,7 +524,6 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
<ActivityToggle
activity={activity}
handleActivityChange={handleActivityChange}
settings={settings}
workspace={activeWorkspace}
/>
}

View File

@@ -64,7 +64,6 @@
}
&__results {
padding-left: var(--padding-md);
border-left: 1px solid var(--hl-md);
grid-area: body-right;
background: var(--color-bg);

View File

@@ -1,5 +1,5 @@
{
"version": "2020.2.2",
"version": "2020.3.0",
"name": "insomnia",
"executableName": "insomnia",
"appId": "com.insomnia.app",

View File

@@ -1,5 +1,5 @@
{
"version": "2020.3.0-alpha.4",
"version": "2020.3.0",
"name": "insomnia-designer",
"executableName": "insomnia-designer",
"appId": "com.insomnia.designer",