-
-
Copied to Clipboard
+
+
+ { copied &&
Copied to Clipboard
}
)
}
-export default SessionCopyLink
\ No newline at end of file
+export default connectPlayer(state => ({
+ time: state.time,
+}))(SessionCopyLink);
\ No newline at end of file
diff --git a/frontend/app/components/shared/SharePopup/SharePopup.js b/frontend/app/components/shared/SharePopup/SharePopup.js
index 482b04e17..43c960bba 100644
--- a/frontend/app/components/shared/SharePopup/SharePopup.js
+++ b/frontend/app/components/shared/SharePopup/SharePopup.js
@@ -47,7 +47,7 @@ export default class SharePopup extends React.PureComponent {
changeChannel = (e, { value }) => this.setState({ channelId: value })
render() {
- const { trigger, loading, channels } = this.props;
+ const { trigger, loading, channels, showCopyLink = false } = this.props;
const { comment, isOpen, channelId } = this.state;
const options = channels.map(({ webhookId, name }) => ({ value: webhookId, text: name })).toJS();
@@ -67,9 +67,11 @@ export default class SharePopup extends React.PureComponent {
-
-
-
+ { showCopyLink && (
+
+
+
+ )}
>
:
@@ -78,32 +80,34 @@ export default class SharePopup extends React.PureComponent {
name="message"
id="message"
cols="30"
- rows="6"
+ rows="4"
resize="none"
onChange={ this.editMessage }
value={ comment }
placeholder="Type here..."
className="p-4"
/>
+
+
+
+
+
+
+
-
-
-
-
-
diff --git a/frontend/app/components/shared/SharePopup/sharePopup.css b/frontend/app/components/shared/SharePopup/sharePopup.css
index adbc29ff8..c28285457 100644
--- a/frontend/app/components/shared/SharePopup/sharePopup.css
+++ b/frontend/app/components/shared/SharePopup/sharePopup.css
@@ -35,13 +35,18 @@
border-radius: 3px;
resize: none;
}
+ margin-bottom: 14px;
}
.footer {
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding: 10px 0;
+ /* display: flex; */
+ /* align-items: center; */
+ /* justify-content: space-between; */
+ /* padding: 10px 0; */
+ border-top: solid thin $gray-light;
+ margin: 0 -14px;
+ padding: 0 14px;
+ /* border-bottom: solid thin $gray-light; */
}
textarea {
diff --git a/frontend/app/components/shared/TrackingCodeModal/CopyButton/CopyButton.js b/frontend/app/components/shared/TrackingCodeModal/CopyButton/CopyButton.js
index d080b1a02..5e74e7b80 100644
--- a/frontend/app/components/shared/TrackingCodeModal/CopyButton/CopyButton.js
+++ b/frontend/app/components/shared/TrackingCodeModal/CopyButton/CopyButton.js
@@ -17,7 +17,7 @@ function CopyButton({ content, className }) {
className={ className }
onClick={ copyHandler }
>
- { copied ? 'copied' : 'copy' }
+ { copied ? 'Copied' : 'Copy' }
)
}
diff --git a/frontend/app/duck/liveSearch.js b/frontend/app/duck/liveSearch.js
index 9aa1cbde1..38f90d35b 100644
--- a/frontend/app/duck/liveSearch.js
+++ b/frontend/app/duck/liveSearch.js
@@ -16,11 +16,13 @@ const FETCH = fetchType(name);
const EDIT = editType(name);
const CLEAR_SEARCH = `${name}/CLEAR_SEARCH`;
const APPLY = `${name}/APPLY`;
+const UPDATE_CURRENT_PAGE = `${name}/UPDATE_CURRENT_PAGE`;
const initialState = Map({
list: List(),
instance: new Filter({ filters: [] }),
filterSearchList: {},
+ currentPage: 1,
});
@@ -28,6 +30,8 @@ function reducer(state = initialState, action = {}) {
switch (action.type) {
case EDIT:
return state.mergeIn(['instance'], action.instance);
+ case UPDATE_CURRENT_PAGE:
+ return state.set('currentPage', action.page);
}
return state;
}
@@ -90,3 +94,10 @@ export const addFilterByKeyAndValue = (key, value) => (dispatch, getState) => {
defaultFilter.value = value;
dispatch(addFilter(defaultFilter));
}
+
+export function updateCurrentPage(page) {
+ return {
+ type: UPDATE_CURRENT_PAGE,
+ page,
+ };
+}
\ No newline at end of file