jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ui) - project id redirection on creation

Browse source
This commit is contained in:
Shekar Siri 2022-04-19 19:45:22 +02:00
parent 18c1d9e132
commit 4897f4b5d7
5 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
frontend/app/components/Client/Sites/NewSiteForm.js
View file

@ -17,7 +17,7 @@ import styles from './siteForm.css';
update,
pushNewSite,
fetchList,
setSiteId
setSiteId
})
@withRouter
export default class NewSiteForm extends React.PureComponent {
@ -38,13 +38,17 @@ export default class NewSiteForm extends React.PureComponent {
})
} else {
this.props.save(this.props.site).then(() => {
const { sites } = this.props;
const site = sites.last();
this.props.pushNewSite(site)
if (!pathname.includes('/client')) {
this.props.setSiteId(site.id)
}
this.props.onClose(null, site)
this.props.fetchList().then(() => {
const { sites } = this.props;
const site = sites.last();
if (!pathname.includes('/client')) {
console.log('site', site)
this.props.setSiteId(site.get('id'))
}
this.props.onClose(null, site)
})
// this.props.pushNewSite(site)
});
}
}

10
frontend/app/components/Onboarding/components/OnboardingTabs/ProjectCodeSnippet/ProjectCodeSnippet.js
View file

@ -19,7 +19,8 @@ const inputModeOptionsMap = {}
inputModeOptions.forEach((o, i) => inputModeOptionsMap[o.value] = i)
const ProjectCodeSnippet = props => {
const { site, gdpr } = props;
const site = props.sites.find(s => s.id === props.siteId);
const { gdpr } = site;
const [changed, setChanged] = useState(false)
const [copied, setCopied] = useState(false)
@ -72,7 +73,7 @@ const ProjectCodeSnippet = props => {
}
const getOptionValues = () => {
const { gdpr } = props.site;
// const { gdpr } = site;
return (!!gdpr.maskEmails)|(!!gdpr.maskNumbers << 1)|(['plain' , 'obscured', 'hidden'].indexOf(gdpr.defaultInputMode) << 5)|28
}
@ -164,7 +165,8 @@ const ProjectCodeSnippet = props => {
}
export default connect(state => ({
site: state.getIn([ 'site', 'instance' ]),
gdpr: state.getIn([ 'site', 'instance', 'gdpr' ]),
siteId: state.getIn([ 'site', 'siteId' ]),
sites: state.getIn([ 'site', 'list' ]),
// gdpr: state.getIn([ 'site', 'instance', 'gdpr' ]),
saving: state.getIn([ 'site', 'saveGDPR', 'loading' ])
}), { editGDPR, saveGDPR })(ProjectCodeSnippet)

6
frontend/app/components/Onboarding/components/ProjectFormButton/ProjectFormButton.js
View file

@ -3,8 +3,9 @@ import { connect } from 'react-redux'
import { SlideModal } from 'UI'
import NewSiteForm from '../../../Client/Sites/NewSiteForm'
const ProjectFormButton = ({ children, site }) => {
const ProjectFormButton = ({ children, sites, siteId }) => {
const [showModal, setShowModal] = useState(false)
const site = sites.find(({ id }) => id === siteId)
const closeModal = () => setShowModal(!showModal);
@ -27,5 +28,6 @@ const ProjectFormButton = ({ children, site }) => {
}
export default connect(state => ({
site: state.getIn([ 'site', 'instance' ]),
siteId: state.getIn([ 'site', 'siteId' ]),
sites: state.getIn([ 'site', 'list' ]),
}))(ProjectFormButton)

2
frontend/app/components/shared/NoSessionsMessage/NoSessionsMessage.js
View file

@ -35,6 +35,6 @@ const NoSessionsMessage= (props) => {
}
export default connect(state => ({
site: state.getIn([ 'site', 'instance' ]),
site: state.getIn([ 'site', 'siteId' ]),
sites: state.getIn([ 'site', 'list' ])
}))(withRouter(NoSessionsMessage))

3
frontend/app/components/shared/TrackingCodeModal/ProjectCodeSnippet/ProjectCodeSnippet.js
View file

@ -19,7 +19,7 @@ inputModeOptions.forEach((o, i) => inputModeOptionsMap[o.value] = i)
const ProjectCodeSnippet = props => {
const { site, gdpr, saving } = props;
const { gdpr, site } = props;
const [changed, setChanged] = useState(false)
const [copied, setCopied] = useState(false)
@ -152,6 +152,7 @@ const ProjectCodeSnippet = props => {
}
export default connect(state => ({
// siteId: state.getIn([ 'site', 'siteId' ]),
site: state.getIn([ 'site', 'instance' ]),
gdpr: state.getIn([ 'site', 'instance', 'gdpr' ]),
saving: state.getIn([ 'site', 'saveGDPR', 'loading' ])