Skip to content

Hotfix/hide addons from add phase catalog #3074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrohit merged 6 commits into from
May 30, 2019
Merged

Hotfix/hide addons from add phase catalog #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0609806
Merge pull request #3007 from appirio-tech/hotfix/fixing_timing_issue…
May 2, 2019
809d3c9
Merge pull request #2997 from appirio-tech/hotfix/enable_layout_prop_…
May 2, 2019
436a280
fixed ACCEPT_OR_REFUSE_INVITE_PENDING reducer
akumar1503 May 17, 2019
a7a94ff
Merge pull request #3043 from akumar1503/issue_3040
maxceem May 19, 2019
ffc6d3e
Merge pull request #3044 from appirio-tech/hotfix/invite-403
May 28, 2019
843ef64
Hiding adding from add phase catalog
May 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/projects/detail/components/SpecQuestions.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ const SpecQuestions = ({
break
case 'radio-group':
ChildElem = TCFormFields.RadioGroup
_.assign(elemProps, {wrapperClass: cn('row', q.theme), options: q.options})
_.assign(elemProps, { layout: q.layout, wrapperClass: cn('row', q.theme), options: q.options})
// child = <TCFormFields.RadioGroup name={q.fieldName} label={q.label} value={value} wrapperClass="row" options={q.options} />
break
case 'tiled-radio-group':
Expand Down
3 changes: 2 additions & 1 deletion src/projects/detail/containers/ProjectAddPhaseContainer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,14 @@ class ProjectAddPhaseContainer extends React.Component {

render() {
const props = this.props
const nonAddOnProductTemplates = _.filter(props.allProductTemplates, pt => !pt.isAddOn)

return (
<EnhancedCreateView
{...this.props}
onCancel={this.closeWizard}
showModal
productTemplates={props.allProductTemplates}
productTemplates={nonAddOnProductTemplates}
onProductTemplateChange={this.updateProductTemplate}
/>
)
Expand Down
2 changes: 1 addition & 1 deletion src/projects/reducers/project.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ export const projectState = function (state=initialState, action) {

case ACCEPT_OR_REFUSE_INVITE_PENDING:
return Object.assign({}, state, {
showUserInvited: false
showUserInvited: true
})

case ACCEPT_OR_REFUSE_INVITE_SUCCESS: {
Expand Down