diff --git a/src/features/StackScripts/SelectStackScriptPanel/CASelectStackScriptPanel.tsx b/src/features/StackScripts/SelectStackScriptPanel/CASelectStackScriptPanel.tsx index 12db7edb889..4c5bcf9aeeb 100644 --- a/src/features/StackScripts/SelectStackScriptPanel/CASelectStackScriptPanel.tsx +++ b/src/features/StackScripts/SelectStackScriptPanel/CASelectStackScriptPanel.tsx @@ -62,7 +62,8 @@ const styles: StyleRulesCallback = theme => ({ panel: { flexGrow: 1, width: '100%', - backgroundColor: theme.color.white + backgroundColor: theme.color.white, + marginBottom: theme.spacing.unit * 3 }, inner: { padding: theme.spacing.unit * 2, @@ -224,16 +225,18 @@ class SelectStackScriptPanel extends React.Component { An error occured while loading the selected StackScript. )} - + + + ); diff --git a/src/features/linodes/LinodesCreate/CALinodeCreate.tsx b/src/features/linodes/LinodesCreate/CALinodeCreate.tsx index 0eec87864a3..0f24f9114fb 100644 --- a/src/features/linodes/LinodesCreate/CALinodeCreate.tsx +++ b/src/features/linodes/LinodesCreate/CALinodeCreate.tsx @@ -7,7 +7,10 @@ import MUITab from 'src/components/core/Tab'; import Tabs from 'src/components/core/Tabs'; import ErrorState from 'src/components/ErrorState'; import Grid from 'src/components/Grid'; -import { getStackScriptsByUser } from 'src/features/StackScripts/stackScriptUtils'; +import { + getCommunityStackscripts, + getStackScriptsByUser +} from 'src/features/StackScripts/stackScriptUtils'; import SubTabs, { Tab } from './CALinodeCreateSubTabs'; import FromBackupsContent from './TabbedContent/FromBackupsContent'; import FromImageContent from './TabbedContent/FromImageContent'; @@ -249,6 +252,10 @@ export class LinodeCreate extends React.PureComponent< const { accountBackupsEnabled, userCannotCreateLinode, + selectedLinodeID, + updateLinodeID, + selectedBackupID, + setBackupID, ...rest } = this.props; return ( @@ -276,7 +283,24 @@ export class LinodeCreate extends React.PureComponent< title: 'Community StackScripts', type: 'fromStackScript', render: () => { - return
community stackscripts
; + const { + accountBackupsEnabled, + userCannotCreateLinode, + selectedLinodeID, + updateLinodeID, + selectedBackupID, + setBackupID, + ...rest + } = this.props; + return ( + + ); } } ]; diff --git a/src/features/linodes/LinodesCreate/TabbedContent/FromStackScriptContent.tsx b/src/features/linodes/LinodesCreate/TabbedContent/FromStackScriptContent.tsx index 30a73bcf346..659e4298c1f 100644 --- a/src/features/linodes/LinodesCreate/TabbedContent/FromStackScriptContent.tsx +++ b/src/features/linodes/LinodesCreate/TabbedContent/FromStackScriptContent.tsx @@ -145,6 +145,7 @@ export class FromStackScriptContent extends React.PureComponent { const { backupsEnabled, password, + privateIPEnabled, userSSHKeys, handleSubmitForm, selectedImageID, @@ -165,6 +166,7 @@ export class FromStackScriptContent extends React.PureComponent { image: selectedImageID /* optional */, backups_enabled: backupsEnabled /* optional */, booted: true, + private_ip: privateIPEnabled, authorized_users: userSSHKeys .filter(u => u.selected) .map(u => u.username),