@imposium-hub/components 2.2.45-0 → 2.2.46-0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Util.d.ts +1 -0
- package/dist/cjs/Util.js +8 -1
- package/dist/cjs/Util.js.map +1 -1
- package/dist/cjs/components/Tooltip.d.ts +2 -2
- package/dist/cjs/components/Tooltip.js +4 -7
- package/dist/cjs/components/Tooltip.js.map +1 -1
- package/dist/cjs/components/advanced-number-field/AdvancedNumberField.d.ts +1 -1
- package/dist/cjs/components/anchor-field/AnchorField.d.ts +1 -1
- package/dist/cjs/components/app-wrapper/AppWrapper.d.ts +2 -1
- package/dist/cjs/components/app-wrapper/AppWrapper.js +79 -71
- package/dist/cjs/components/app-wrapper/AppWrapper.js.map +1 -1
- package/dist/cjs/components/assets/AssetField.js +2 -2
- package/dist/cjs/components/assets/AssetField.js.map +1 -1
- package/dist/cjs/components/assets/AssetsTableDurationCell.js +1 -4
- package/dist/cjs/components/assets/AssetsTableDurationCell.js.map +1 -1
- package/dist/cjs/components/assets/AssetsTableGlobalCell.js +1 -1
- package/dist/cjs/components/assets/AssetsTableGlobalCell.js.map +1 -1
- package/dist/cjs/components/assets/AssetsTableNameCell.js +4 -3
- package/dist/cjs/components/assets/AssetsTableNameCell.js.map +1 -1
- package/dist/cjs/components/assets/AssetsTableRateCell.js +9 -3
- package/dist/cjs/components/assets/AssetsTableRateCell.js.map +1 -1
- package/dist/cjs/components/assets/AssetsTableTypeFilter.js +2 -2
- package/dist/cjs/components/assets/AssetsTableTypeFilter.js.map +1 -1
- package/dist/cjs/components/assets/AssetsUploadMenu.js +157 -34
- package/dist/cjs/components/assets/AssetsUploadMenu.js.map +1 -1
- package/dist/cjs/components/auth-gate/AuthGate.js +5 -8
- package/dist/cjs/components/auth-gate/AuthGate.js.map +1 -1
- package/dist/cjs/components/button-group-field/ButtonGroupField.d.ts +1 -1
- package/dist/cjs/components/checkbox-field/CheckboxField.d.ts +1 -1
- package/dist/cjs/components/color-field/ColorField.d.ts +1 -1
- package/dist/cjs/components/color-field/ColorField.js +2 -2
- package/dist/cjs/components/color-field/ColorField.js.map +1 -1
- package/dist/cjs/components/context-menu/ContextMenu.js +8 -4
- package/dist/cjs/components/context-menu/ContextMenu.js.map +1 -1
- package/dist/cjs/components/copy-prop-id-button/CopyPropIdButton.d.ts +12 -0
- package/dist/cjs/components/copy-prop-id-button/CopyPropIdButton.js +75 -0
- package/dist/cjs/components/copy-prop-id-button/CopyPropIdButton.js.map +1 -0
- package/dist/cjs/components/data-table/DataTable.js +2 -2
- package/dist/cjs/components/data-table/DataTable.js.map +1 -1
- package/dist/cjs/components/dropdown/{dropdown.stories.js → Dropdown.stories.js} +1 -1
- package/dist/cjs/components/dropdown/{dropdown.stories.js.map → Dropdown.stories.js.map} +1 -1
- package/dist/cjs/components/header/Header.d.ts +0 -4
- package/dist/cjs/components/header/Header.js +19 -27
- package/dist/cjs/components/header/Header.js.map +1 -1
- package/dist/cjs/components/list-field/ListField.d.ts +1 -1
- package/dist/cjs/components/number-field/NumberField.d.ts +1 -1
- package/dist/cjs/components/publish-wizard/PublishWizard.js +63 -119
- package/dist/cjs/components/publish-wizard/PublishWizard.js.map +1 -1
- package/dist/cjs/components/publish-wizard/publish/EmailWorkflow.js +28 -5
- package/dist/cjs/components/publish-wizard/publish/EmailWorkflow.js.map +1 -1
- package/dist/cjs/components/select-field/SelectField.d.ts +1 -1
- package/dist/cjs/components/select-field/SelectField.js +4 -0
- package/dist/cjs/components/select-field/SelectField.js.map +1 -1
- package/dist/cjs/components/slider-field/SliderField.d.ts +1 -1
- package/dist/cjs/components/smpte-field/SMPTEField.d.ts +1 -1
- package/dist/cjs/components/text-area-field/TextAreaField.d.ts +1 -1
- package/dist/cjs/components/text-field/TextField.d.ts +1 -1
- package/dist/cjs/constants/copy.d.ts +2 -5
- package/dist/cjs/constants/copy.js +5 -8
- package/dist/cjs/constants/copy.js.map +1 -1
- package/dist/cjs/constants/icons.d.ts +0 -1
- package/dist/cjs/constants/icons.js +1 -3
- package/dist/cjs/constants/icons.js.map +1 -1
- package/dist/cjs/index.d.ts +5 -3
- package/dist/cjs/index.js +8 -3
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/redux/actions/access.d.ts +3 -1
- package/dist/cjs/redux/actions/access.js +43 -10
- package/dist/cjs/redux/actions/access.js.map +1 -1
- package/dist/cjs/redux/actions/asset-uploads.d.ts +5 -10
- package/dist/cjs/redux/actions/asset-uploads.js +262 -182
- package/dist/cjs/redux/actions/asset-uploads.js.map +1 -1
- package/dist/cjs/redux/actions/publish.js +3 -4
- package/dist/cjs/redux/actions/publish.js.map +1 -1
- package/dist/cjs/redux/reducers/access.js +30 -7
- package/dist/cjs/redux/reducers/access.js.map +1 -1
- package/dist/cjs/redux/reducers/asset-uploads.js +8 -24
- package/dist/cjs/redux/reducers/asset-uploads.js.map +1 -1
- package/dist/cjs/services/Session.d.ts +8 -9
- package/dist/cjs/services/Session.js +127 -31
- package/dist/cjs/services/Session.js.map +1 -1
- package/dist/esm/Util.d.ts +1 -0
- package/dist/esm/Util.js +6 -0
- package/dist/esm/Util.js.map +1 -1
- package/dist/esm/components/Tooltip.d.ts +2 -2
- package/dist/esm/components/Tooltip.js +4 -4
- package/dist/esm/components/Tooltip.js.map +1 -1
- package/dist/esm/components/advanced-number-field/AdvancedNumberField.d.ts +1 -1
- package/dist/esm/components/anchor-field/AnchorField.d.ts +1 -1
- package/dist/esm/components/app-wrapper/AppWrapper.d.ts +2 -1
- package/dist/esm/components/app-wrapper/AppWrapper.js +79 -69
- package/dist/esm/components/app-wrapper/AppWrapper.js.map +1 -1
- package/dist/esm/components/assets/AssetField.js +2 -2
- package/dist/esm/components/assets/AssetField.js.map +1 -1
- package/dist/esm/components/assets/AssetsTableDurationCell.js +2 -5
- package/dist/esm/components/assets/AssetsTableDurationCell.js.map +1 -1
- package/dist/esm/components/assets/AssetsTableGlobalCell.js +1 -1
- package/dist/esm/components/assets/AssetsTableGlobalCell.js.map +1 -1
- package/dist/esm/components/assets/AssetsTableNameCell.js +4 -3
- package/dist/esm/components/assets/AssetsTableNameCell.js.map +1 -1
- package/dist/esm/components/assets/AssetsTableRateCell.js +9 -3
- package/dist/esm/components/assets/AssetsTableRateCell.js.map +1 -1
- package/dist/esm/components/assets/AssetsTableTypeFilter.js +2 -2
- package/dist/esm/components/assets/AssetsTableTypeFilter.js.map +1 -1
- package/dist/esm/components/assets/AssetsUploadMenu.js +138 -34
- package/dist/esm/components/assets/AssetsUploadMenu.js.map +1 -1
- package/dist/esm/components/auth-gate/AuthGate.js +6 -9
- package/dist/esm/components/auth-gate/AuthGate.js.map +1 -1
- package/dist/esm/components/button-group-field/ButtonGroupField.d.ts +1 -1
- package/dist/esm/components/checkbox-field/CheckboxField.d.ts +1 -1
- package/dist/esm/components/color-field/ColorField.d.ts +1 -1
- package/dist/esm/components/color-field/ColorField.js +2 -2
- package/dist/esm/components/color-field/ColorField.js.map +1 -1
- package/dist/esm/components/context-menu/ContextMenu.js +7 -3
- package/dist/esm/components/context-menu/ContextMenu.js.map +1 -1
- package/dist/esm/components/copy-prop-id-button/CopyPropIdButton.d.ts +12 -0
- package/dist/esm/components/copy-prop-id-button/CopyPropIdButton.js +24 -0
- package/dist/esm/components/copy-prop-id-button/CopyPropIdButton.js.map +1 -0
- package/dist/esm/components/data-table/DataTable.js +2 -2
- package/dist/esm/components/data-table/DataTable.js.map +1 -1
- package/dist/esm/components/dropdown/{dropdown.stories.js → Dropdown.stories.js} +1 -1
- package/dist/esm/components/dropdown/{dropdown.stories.js.map → Dropdown.stories.js.map} +1 -1
- package/dist/esm/components/header/Header.d.ts +0 -4
- package/dist/esm/components/header/Header.js +19 -27
- package/dist/esm/components/header/Header.js.map +1 -1
- package/dist/esm/components/list-field/ListField.d.ts +1 -1
- package/dist/esm/components/number-field/NumberField.d.ts +1 -1
- package/dist/esm/components/publish-wizard/PublishWizard.js +64 -119
- package/dist/esm/components/publish-wizard/PublishWizard.js.map +1 -1
- package/dist/esm/components/publish-wizard/publish/EmailWorkflow.js +28 -5
- package/dist/esm/components/publish-wizard/publish/EmailWorkflow.js.map +1 -1
- package/dist/esm/components/select-field/SelectField.d.ts +1 -1
- package/dist/esm/components/select-field/SelectField.js +3 -0
- package/dist/esm/components/select-field/SelectField.js.map +1 -1
- package/dist/esm/components/slider-field/SliderField.d.ts +1 -1
- package/dist/esm/components/smpte-field/SMPTEField.d.ts +1 -1
- package/dist/esm/components/text-area-field/TextAreaField.d.ts +1 -1
- package/dist/esm/components/text-field/TextField.d.ts +1 -1
- package/dist/esm/constants/copy.d.ts +2 -5
- package/dist/esm/constants/copy.js +5 -8
- package/dist/esm/constants/copy.js.map +1 -1
- package/dist/esm/constants/icons.d.ts +0 -1
- package/dist/esm/constants/icons.js +0 -2
- package/dist/esm/constants/icons.js.map +1 -1
- package/dist/esm/index.d.ts +5 -3
- package/dist/esm/index.js +5 -3
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/redux/actions/access.d.ts +3 -1
- package/dist/esm/redux/actions/access.js +37 -8
- package/dist/esm/redux/actions/access.js.map +1 -1
- package/dist/esm/redux/actions/asset-uploads.d.ts +5 -10
- package/dist/esm/redux/actions/asset-uploads.js +224 -167
- package/dist/esm/redux/actions/asset-uploads.js.map +1 -1
- package/dist/esm/redux/actions/publish.js +3 -4
- package/dist/esm/redux/actions/publish.js.map +1 -1
- package/dist/esm/redux/reducers/access.js +8 -5
- package/dist/esm/redux/reducers/access.js.map +1 -1
- package/dist/esm/redux/reducers/asset-uploads.js +11 -48
- package/dist/esm/redux/reducers/asset-uploads.js.map +1 -1
- package/dist/esm/services/Session.d.ts +8 -9
- package/dist/esm/services/Session.js +102 -29
- package/dist/esm/services/Session.js.map +1 -1
- package/dist/styles.css +151 -25
- package/dist/styles.less +280 -100
- package/less/components/assets.less +237 -63
- package/less/components/button.less +7 -1
- package/less/components/data-table.less +17 -11
- package/less/components/header.less +0 -13
- package/less/components/publish-wizard.less +20 -13
- package/less/components/story-previewer.less +1 -0
- package/package.json +6 -6
- package/src/Util.ts +10 -0
- package/src/components/Tooltip.tsx +9 -9
- package/src/components/advanced-number-field/AdvancedNumberField.tsx +1 -1
- package/src/components/anchor-field/AnchorField.tsx +1 -1
- package/src/components/app-wrapper/AppWrapper.tsx +120 -79
- package/src/components/assets/AssetField.tsx +3 -8
- package/src/components/assets/AssetsTableDurationCell.tsx +2 -5
- package/src/components/assets/AssetsTableGlobalCell.tsx +15 -0
- package/src/components/assets/AssetsTableNameCell.tsx +3 -5
- package/src/components/assets/AssetsTableRateCell.tsx +11 -4
- package/src/components/assets/AssetsTableTypeFilter.tsx +7 -8
- package/src/components/assets/AssetsUploadMenu.tsx +271 -98
- package/src/components/auth-gate/AuthGate.tsx +8 -14
- package/src/components/button-group-field/ButtonGroupField.tsx +1 -1
- package/src/components/checkbox-field/CheckboxField.tsx +1 -1
- package/src/components/color-field/ColorField.tsx +3 -3
- package/src/components/context-menu/ContextMenu.tsx +16 -11
- package/src/components/copy-prop-id-button/CopyPropIdButton.tsx +44 -0
- package/src/components/data-table/DataTable.tsx +2 -2
- package/src/components/header/Header.tsx +39 -74
- package/src/components/list-field/ListField.tsx +1 -1
- package/src/components/number-field/NumberField.tsx +1 -1
- package/src/components/publish-wizard/PublishWizard.tsx +102 -180
- package/src/components/publish-wizard/publish/EmailWorkflow.tsx +42 -10
- package/src/components/select-field/SelectField.tsx +4 -1
- package/src/components/slider-field/SliderField.tsx +1 -1
- package/src/components/smpte-field/SMPTEField.tsx +1 -1
- package/src/components/text-area-field/TextAreaField.tsx +1 -1
- package/src/components/text-field/TextField.tsx +1 -1
- package/src/constants/copy.ts +5 -9
- package/src/constants/icons.tsx +0 -3
- package/src/index.ts +16 -9
- package/src/redux/actions/access.ts +67 -5
- package/src/redux/actions/asset-uploads.ts +305 -205
- package/src/redux/actions/publish.ts +3 -6
- package/src/redux/reducers/access.ts +8 -5
- package/src/redux/reducers/asset-uploads.ts +13 -48
- package/src/services/Session.ts +120 -34
- package/dist/cjs/components/app-wrapper/AppWrapper_BACKUP_73190.d.ts +0 -27
- package/dist/cjs/components/app-wrapper/AppWrapper_BACKUP_73190.js +0 -243
- package/dist/cjs/components/app-wrapper/AppWrapper_BACKUP_73190.js.map +0 -1
- package/dist/cjs/components/app-wrapper/AppWrapper_BASE_73190.d.ts +0 -28
- package/dist/cjs/components/app-wrapper/AppWrapper_BASE_73190.js +0 -255
- package/dist/cjs/components/app-wrapper/AppWrapper_BASE_73190.js.map +0 -1
- package/dist/cjs/components/app-wrapper/AppWrapper_LOCAL_73190.d.ts +0 -27
- package/dist/cjs/components/app-wrapper/AppWrapper_LOCAL_73190.js +0 -243
- package/dist/cjs/components/app-wrapper/AppWrapper_LOCAL_73190.js.map +0 -1
- package/dist/cjs/components/app-wrapper/AppWrapper_REMOTE_73190.d.ts +0 -28
- package/dist/cjs/components/app-wrapper/AppWrapper_REMOTE_73190.js +0 -251
- package/dist/cjs/components/app-wrapper/AppWrapper_REMOTE_73190.js.map +0 -1
- package/dist/cjs/components/error-message-preview/ErrorMessagePreview.d.ts +0 -15
- package/dist/cjs/components/error-message-preview/ErrorMessagePreview.js +0 -91
- package/dist/cjs/components/error-message-preview/ErrorMessagePreview.js.map +0 -1
- package/dist/cjs/components/header/Header_BACKUP_73021.d.ts +0 -33
- package/dist/cjs/components/header/Header_BACKUP_73021.js +0 -393
- package/dist/cjs/components/header/Header_BACKUP_73021.js.map +0 -1
- package/dist/cjs/components/header/Header_BASE_73021.d.ts +0 -29
- package/dist/cjs/components/header/Header_BASE_73021.js +0 -376
- package/dist/cjs/components/header/Header_BASE_73021.js.map +0 -1
- package/dist/cjs/components/header/Header_LOCAL_73021.d.ts +0 -33
- package/dist/cjs/components/header/Header_LOCAL_73021.js +0 -382
- package/dist/cjs/components/header/Header_LOCAL_73021.js.map +0 -1
- package/dist/cjs/components/header/Header_REMOTE_73021.d.ts +0 -30
- package/dist/cjs/components/header/Header_REMOTE_73021.js +0 -386
- package/dist/cjs/components/header/Header_REMOTE_73021.js.map +0 -1
- package/dist/esm/components/app-wrapper/AppWrapper_BACKUP_73190.d.ts +0 -27
- package/dist/esm/components/app-wrapper/AppWrapper_BACKUP_73190.js +0 -194
- package/dist/esm/components/app-wrapper/AppWrapper_BACKUP_73190.js.map +0 -1
- package/dist/esm/components/app-wrapper/AppWrapper_BASE_73190.d.ts +0 -28
- package/dist/esm/components/app-wrapper/AppWrapper_BASE_73190.js +0 -208
- package/dist/esm/components/app-wrapper/AppWrapper_BASE_73190.js.map +0 -1
- package/dist/esm/components/app-wrapper/AppWrapper_LOCAL_73190.d.ts +0 -27
- package/dist/esm/components/app-wrapper/AppWrapper_LOCAL_73190.js +0 -194
- package/dist/esm/components/app-wrapper/AppWrapper_LOCAL_73190.js.map +0 -1
- package/dist/esm/components/app-wrapper/AppWrapper_REMOTE_73190.d.ts +0 -28
- package/dist/esm/components/app-wrapper/AppWrapper_REMOTE_73190.js +0 -204
- package/dist/esm/components/app-wrapper/AppWrapper_REMOTE_73190.js.map +0 -1
- package/dist/esm/components/error-message-preview/ErrorMessagePreview.d.ts +0 -15
- package/dist/esm/components/error-message-preview/ErrorMessagePreview.js +0 -35
- package/dist/esm/components/error-message-preview/ErrorMessagePreview.js.map +0 -1
- package/dist/esm/components/header/Header_BACKUP_73021.d.ts +0 -33
- package/dist/esm/components/header/Header_BACKUP_73021.js +0 -336
- package/dist/esm/components/header/Header_BACKUP_73021.js.map +0 -1
- package/dist/esm/components/header/Header_BASE_73021.d.ts +0 -29
- package/dist/esm/components/header/Header_BASE_73021.js +0 -322
- package/dist/esm/components/header/Header_BASE_73021.js.map +0 -1
- package/dist/esm/components/header/Header_LOCAL_73021.d.ts +0 -33
- package/dist/esm/components/header/Header_LOCAL_73021.js +0 -328
- package/dist/esm/components/header/Header_LOCAL_73021.js.map +0 -1
- package/dist/esm/components/header/Header_REMOTE_73021.d.ts +0 -30
- package/dist/esm/components/header/Header_REMOTE_73021.js +0 -329
- package/dist/esm/components/header/Header_REMOTE_73021.js.map +0 -1
- /package/dist/cjs/components/dropdown/{dropdown.stories.d.ts → Dropdown.stories.d.ts} +0 -0
- /package/dist/esm/components/dropdown/{dropdown.stories.d.ts → Dropdown.stories.d.ts} +0 -0
- /package/src/components/dropdown/{dropdown.stories.tsx → Dropdown.stories.tsx} +0 -0
|
@@ -6,8 +6,8 @@ import AuthService from '../../services/Auth0';
|
|
|
6
6
|
import { connect } from 'react-redux';
|
|
7
7
|
import { bindActionCreators } from 'redux';
|
|
8
8
|
import { login, clearCachedAuth } from '../../redux/actions/auth';
|
|
9
|
+
import { cacheAccessData, clearCachedAccessList } from '../../redux/actions/access';
|
|
9
10
|
import { validateAccessLevel } from '../../Util';
|
|
10
|
-
import { setAccessData } from '../../redux/actions/access';
|
|
11
11
|
class AppWrapper extends React.Component {
|
|
12
12
|
static RESTRICTED_REQUEST = (React.createElement(NoAccess, { key: 'restriction-msg', type: 'request' }));
|
|
13
13
|
static RESTRICTED_BLOCK = (React.createElement(NoAccess, { key: 'restriction-msg', type: 'restrict' }));
|
|
@@ -20,7 +20,8 @@ class AppWrapper extends React.Component {
|
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
22
|
componentDidMount = () => {
|
|
23
|
-
const { auth0ClientId, auth0Domain } = this.props;
|
|
23
|
+
const { auth, access, auth0ClientId, auth0Domain, isFreshUser } = this.props;
|
|
24
|
+
const session = SessionService.getSession();
|
|
24
25
|
AuthService.bindToClient(auth0ClientId, auth0Domain);
|
|
25
26
|
const validAccessLevel = validateAccessLevel(this.props.organizationId, this.props.serviceId, this.props.access);
|
|
26
27
|
if (!this.state.restrictAccess && !validAccessLevel) {
|
|
@@ -29,8 +30,21 @@ class AppWrapper extends React.Component {
|
|
|
29
30
|
if (this.state.restrictAccess && validAccessLevel) {
|
|
30
31
|
this.setState({ restrictAccess: false });
|
|
31
32
|
}
|
|
32
|
-
//
|
|
33
|
-
|
|
33
|
+
// If cookie, auth or access data is missing / mismatched,
|
|
34
|
+
// silently check auth0 session and refresh flow on success
|
|
35
|
+
if (!isFreshUser &&
|
|
36
|
+
auth !== null &&
|
|
37
|
+
access !== null &&
|
|
38
|
+
typeof session === 'object' &&
|
|
39
|
+
typeof session.sub === 'string' &&
|
|
40
|
+
session.sub === auth.idTokenPayload.sub &&
|
|
41
|
+
session.stories_hash === SessionService.generateStoriesHash(access) &&
|
|
42
|
+
session.orgs_hash === SessionService.generateOrgsHash(access)) {
|
|
43
|
+
this.propagateCreds();
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
this.doCheckSession(true);
|
|
47
|
+
}
|
|
34
48
|
};
|
|
35
49
|
/*
|
|
36
50
|
Check the auth0 session expiry
|
|
@@ -43,11 +57,11 @@ class AppWrapper extends React.Component {
|
|
|
43
57
|
const validSession = AuthService.checkExpiry(exp);
|
|
44
58
|
if (!validSession) {
|
|
45
59
|
this.props.clearCachedAuth();
|
|
60
|
+
this.props.clearCachedAccessList();
|
|
46
61
|
this.doCheckSession();
|
|
47
62
|
}
|
|
48
63
|
}
|
|
49
|
-
if (this.props.organizationId !== prevProps.organizationId
|
|
50
|
-
this.props.access !== prevProps.access) {
|
|
64
|
+
if (this.props.organizationId !== prevProps.organizationId) {
|
|
51
65
|
validAccessLevel = validateAccessLevel(this.props.organizationId, this.props.serviceId, this.props.access);
|
|
52
66
|
if (!this.state.restrictAccess && !validAccessLevel) {
|
|
53
67
|
this.setState({ restrictAccess: true });
|
|
@@ -60,50 +74,14 @@ class AppWrapper extends React.Component {
|
|
|
60
74
|
/*
|
|
61
75
|
Emit creds to React parent
|
|
62
76
|
*/
|
|
63
|
-
propagateCreds = (
|
|
64
|
-
const {
|
|
65
|
-
|
|
66
|
-
let
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
const session = SessionService.getSession();
|
|
70
|
-
if (session && session.story_id && session.organization_id) {
|
|
71
|
-
const org = freshAccess.organizations.find((o) => o.id === session.organization_id);
|
|
72
|
-
if (org) {
|
|
73
|
-
const story = org.stories.find((s) => s.id === session.story_id);
|
|
74
|
-
if (story) {
|
|
75
|
-
return { orgId: org.id, storyId: story.id };
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
return null;
|
|
80
|
-
};
|
|
81
|
-
// If the org ID is not provided, but the storyID is provided, find the org ID if we can, if not, use the first org ID found and we'll show the story not found interface
|
|
82
|
-
if (!initialOrganizationId && initialStoryId) {
|
|
83
|
-
const org = freshAccess.organizations.find((o) => o.stories.find((s) => s.id === initialStoryId));
|
|
84
|
-
if (org) {
|
|
85
|
-
initialOrganizationId = org.id;
|
|
86
|
-
}
|
|
87
|
-
else {
|
|
88
|
-
initialOrganizationId = firstOrg.id;
|
|
89
|
-
}
|
|
77
|
+
propagateCreds = () => {
|
|
78
|
+
const { auth, access, storyId, onAuthenticated } = this.props;
|
|
79
|
+
const activeOrgId = this.determineActiveOrganization(auth, access);
|
|
80
|
+
let activeStoryId = SessionService.getSession().story_id;
|
|
81
|
+
if (storyId) {
|
|
82
|
+
activeStoryId = storyId;
|
|
90
83
|
}
|
|
91
|
-
|
|
92
|
-
// If storyID is not provided, try to use the one from the previous session
|
|
93
|
-
const sessionIds = getIDsFromSession();
|
|
94
|
-
if (sessionIds) {
|
|
95
|
-
initialOrganizationId = sessionIds.orgId;
|
|
96
|
-
initialStoryId = sessionIds.storyId;
|
|
97
|
-
}
|
|
98
|
-
else {
|
|
99
|
-
// If that doesn't work - default to the first org & story
|
|
100
|
-
const story = firstOrg.stories[0];
|
|
101
|
-
initialOrganizationId = firstOrg.id;
|
|
102
|
-
initialStoryId = story.id;
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
SessionService.buildFreshSession(freshIdentity, initialOrganizationId, initialStoryId);
|
|
106
|
-
onAuthenticated(initialOrganizationId, initialStoryId);
|
|
84
|
+
onAuthenticated(activeOrgId, activeStoryId);
|
|
107
85
|
if (this.state.blockRender) {
|
|
108
86
|
this.setState({ blockRender: false });
|
|
109
87
|
}
|
|
@@ -112,19 +90,8 @@ class AppWrapper extends React.Component {
|
|
|
112
90
|
Bust cached creds if exist, invoke auth failure handler
|
|
113
91
|
*/
|
|
114
92
|
handleCheckSessionFailure = (e) => {
|
|
115
|
-
if (this.props.storyId) {
|
|
116
|
-
SessionService.cacheStoryId(this.props.storyId);
|
|
117
|
-
}
|
|
118
|
-
else {
|
|
119
|
-
SessionService.clearCachedStoryId();
|
|
120
|
-
}
|
|
121
|
-
if (this.props.organizationId) {
|
|
122
|
-
SessionService.cacheOrgId(this.props.organizationId);
|
|
123
|
-
}
|
|
124
|
-
else {
|
|
125
|
-
SessionService.clearCachedOrgId();
|
|
126
|
-
}
|
|
127
93
|
this.props.clearCachedAuth();
|
|
94
|
+
this.props.clearCachedAccessList();
|
|
128
95
|
this.props.onAuthenticationFailure(e);
|
|
129
96
|
};
|
|
130
97
|
/*
|
|
@@ -137,14 +104,12 @@ class AppWrapper extends React.Component {
|
|
|
137
104
|
}
|
|
138
105
|
AuthService.checkSession()
|
|
139
106
|
.then((freshIdentity) => {
|
|
140
|
-
|
|
141
|
-
? this.props.organizationId
|
|
142
|
-
: SessionService.getCachedOrgId();
|
|
143
|
-
SessionService.getAccessData(freshIdentity.idToken, baseUrl, false, orgId)
|
|
107
|
+
SessionService.getAccessData(freshIdentity.idToken, baseUrl)
|
|
144
108
|
.then((freshAccess) => {
|
|
145
|
-
this.props.setAccessData(freshAccess);
|
|
146
109
|
this.props.login(freshIdentity);
|
|
147
|
-
this.
|
|
110
|
+
this.props.cacheAccessData(freshAccess);
|
|
111
|
+
SessionService.buildFreshSession(freshIdentity, freshAccess);
|
|
112
|
+
this.propagateCreds();
|
|
148
113
|
})
|
|
149
114
|
.catch((e) => {
|
|
150
115
|
console.error(e);
|
|
@@ -156,6 +121,50 @@ class AppWrapper extends React.Component {
|
|
|
156
121
|
this.handleCheckSessionFailure(e);
|
|
157
122
|
});
|
|
158
123
|
};
|
|
124
|
+
determineActiveOrganizationIn(auth, session, organizationIds) {
|
|
125
|
+
const { organizationId } = this.props;
|
|
126
|
+
const { idTokenPayload: { exp } } = auth;
|
|
127
|
+
if (organizationIds.length > 0) {
|
|
128
|
+
if (organizationId && organizationIds.indexOf(organizationId) > -1) {
|
|
129
|
+
return this.setActiveOrganization(organizationId, exp, session);
|
|
130
|
+
}
|
|
131
|
+
if (session &&
|
|
132
|
+
session.organization_id &&
|
|
133
|
+
organizationIds.indexOf(session.organization_id) > -1) {
|
|
134
|
+
return session.organization_id;
|
|
135
|
+
}
|
|
136
|
+
return this.setActiveOrganization(organizationIds[0], exp, session);
|
|
137
|
+
}
|
|
138
|
+
return '';
|
|
139
|
+
}
|
|
140
|
+
/*
|
|
141
|
+
Figure out what the active org should be based on app-wrapper configuration
|
|
142
|
+
*/
|
|
143
|
+
determineActiveOrganization = (auth, access) => {
|
|
144
|
+
const { serviceId } = this.props;
|
|
145
|
+
const { organizations } = access;
|
|
146
|
+
const session = SessionService.getSession();
|
|
147
|
+
const allOrgIdsFlattened = organizations.map((o) => o.id);
|
|
148
|
+
const activeOrgId = this.determineActiveOrganizationIn(auth, session, allOrgIdsFlattened);
|
|
149
|
+
const activeOrg = organizations.find((o) => o.id === activeOrgId);
|
|
150
|
+
if (activeOrg && !activeOrg.services.includes(serviceId)) {
|
|
151
|
+
this.setState({ restrictAccess: true });
|
|
152
|
+
}
|
|
153
|
+
return activeOrgId;
|
|
154
|
+
};
|
|
155
|
+
/*
|
|
156
|
+
Update session if no session exists or diff in org id
|
|
157
|
+
*/
|
|
158
|
+
setActiveOrganization = (organizationId, exp, sharedSession) => {
|
|
159
|
+
if (!sharedSession ||
|
|
160
|
+
!sharedSession.organization_id ||
|
|
161
|
+
sharedSession.organization_id !== organizationId) {
|
|
162
|
+
const activeOrg = this.props.access.organizations.find((o) => o.id === organizationId);
|
|
163
|
+
const firstStoryId = typeof activeOrg.stories[0] === 'object' ? activeOrg.stories[0].id : '';
|
|
164
|
+
SessionService.updateSession({ organization_id: organizationId, story_id: firstStoryId }, exp);
|
|
165
|
+
}
|
|
166
|
+
return organizationId;
|
|
167
|
+
};
|
|
159
168
|
render = () => {
|
|
160
169
|
const { blockRender, restrictAccess } = this.state;
|
|
161
170
|
const { children, showRequestAccess, allowUnauthenticatedRender } = this.props;
|
|
@@ -183,8 +192,9 @@ class AppWrapper extends React.Component {
|
|
|
183
192
|
const mapDispatchToProps = (dispatch) => {
|
|
184
193
|
return bindActionCreators({
|
|
185
194
|
login,
|
|
186
|
-
|
|
187
|
-
|
|
195
|
+
clearCachedAuth,
|
|
196
|
+
cacheAccessData,
|
|
197
|
+
clearCachedAccessList
|
|
188
198
|
}, dispatch);
|
|
189
199
|
};
|
|
190
200
|
const mapStateToProps = (state) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAC7C,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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"}
|
|
@@ -61,12 +61,12 @@ class AssetField extends React.PureComponent {
|
|
|
61
61
|
this.props.updateFilters({ name: this.state.assetName, page: 1 });
|
|
62
62
|
}
|
|
63
63
|
onFileDrop = (i, monitor) => {
|
|
64
|
-
const { accepts,
|
|
64
|
+
const { accepts, api } = this.props;
|
|
65
65
|
if (monitor) {
|
|
66
66
|
const { files } = monitor.getItem();
|
|
67
67
|
if (mimetypeConformsToOverlay(accepts, files[0])) {
|
|
68
68
|
this.setState({ assetUploading: true });
|
|
69
|
-
this.props.uploadAssets(api, [files[0]],
|
|
69
|
+
this.props.uploadAssets(api, [files[0]], (f) => {
|
|
70
70
|
this.setState({ assetName: f.name, error: false }, () => {
|
|
71
71
|
this.setState({ assetUploading: false });
|
|
72
72
|
this.props.onChange(f);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetField.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetField.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"AssetField.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetField.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import { ASSET_TYPES } from '../../constants/assets';
|
|
3
|
-
import { getDuration } from '../../Util';
|
|
3
|
+
import { formatAudioDuration, getDuration } from '../../Util';
|
|
4
4
|
const AssetsTableDurationCell = (props) => {
|
|
5
5
|
const { cell: { row: { original, original: { type, data, rate, frame_count } } } } = props;
|
|
6
6
|
let duration = rate && frame_count ? getDuration(frame_count, rate) : '';
|
|
@@ -12,10 +12,7 @@ const AssetsTableDurationCell = (props) => {
|
|
|
12
12
|
duration = getDuration(frames, frame_rate);
|
|
13
13
|
}
|
|
14
14
|
if (type === ASSET_TYPES.AUDIO) {
|
|
15
|
-
|
|
16
|
-
date.setSeconds(original.duration);
|
|
17
|
-
const timestamp = date.toISOString().slice(11, 19);
|
|
18
|
-
duration = `${timestamp}.x`;
|
|
15
|
+
duration = formatAudioDuration(original.duration);
|
|
19
16
|
}
|
|
20
17
|
if (duration !== null && duration !== undefined) {
|
|
21
18
|
return React.createElement("div", { className: 'asset-duration-cell' }, duration);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetsTableDurationCell.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsTableDurationCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"AssetsTableDurationCell.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsTableDurationCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAM9D,MAAM,uBAAuB,GAAuC,CAChE,KAA+B,EACjC,EAAE;IACA,MAAM,EACF,IAAI,EAAE,EACF,GAAG,EAAE,EACD,QAAQ,EACR,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,EAC9C,EACJ,EACJ,GAAG,KAAK,CAAC;IAEV,IAAI,QAAQ,GAAG,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEzE,IAAI,IAAI,KAAK,WAAW,CAAC,cAAc,EAAE,CAAC;QACtC,QAAQ,GAAG,GAAG,QAAQ,CAAC,QAAQ,SAAS,CAAC;IAC7C,CAAC;IAED,IAAI,IAAI,KAAK,WAAW,CAAC,iBAAiB,EAAE,CAAC;QACzC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtD,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,IAAI,KAAK,WAAW,CAAC,KAAK,EAAE,CAAC;QAC7B,QAAQ,GAAG,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO,6BAAK,SAAS,EAAC,qBAAqB,IAAE,QAAQ,CAAO,CAAC;IACjE,CAAC;SAAM,CAAC;QACJ,OAAO,6BAAK,SAAS,EAAC,qBAAqB,GAAO,CAAC;IACvD,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,aAAa,EAAU,EAAE;IACnD,MAAM,OAAO,GAAQ,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,EAAE,CAAC,CAAC;IACpD,IAAI,OAAO,GAAQ,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,OAAO,GAAG,EAAE,CAAC,CAAC;IAC5D,IAAI,OAAO,GAAG,EAAE,EAAE,CAAC;QACf,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC5B,CAAC;IACD,OAAO,GAAG,OAAO,IAAI,OAAO,EAAE,CAAC;AACnC,CAAC,CAAC;AAEF,eAAe,uBAAuB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import { ICON_GLOBE } from '../../constants/icons';
|
|
3
3
|
const AssetsTableGlobalCell = (p) => {
|
|
4
|
-
return React.createElement("div", { className: 'asset-global-cell' }, p.cell.row.original.story_id ? null : ICON_GLOBE);
|
|
4
|
+
return (React.createElement("div", { className: 'asset-global-cell' }, p.cell.row.original.story_id ? null : ICON_GLOBE));
|
|
5
5
|
};
|
|
6
6
|
const AssetsTableGlobalCellMemoized = React.memo(AssetsTableGlobalCell);
|
|
7
7
|
export default AssetsTableGlobalCellMemoized;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetsTableGlobalCell.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsTableGlobalCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAMnD,MAAM,qBAAqB,GAAqC,CAAC,CAAyB,EAAE,EAAE;IAC1F,OAAO,6BAAK,SAAS,EAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"AssetsTableGlobalCell.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsTableGlobalCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAMnD,MAAM,qBAAqB,GAAqC,CAAC,CAAyB,EAAE,EAAE;IAC1F,OAAO,CACH,6BAAK,SAAS,EAAC,mBAAmB,IAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAO,CAC9F,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,6BAA6B,GAAG,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;AACxE,eAAe,6BAA6B,CAAC"}
|
|
@@ -5,9 +5,10 @@ import { updateAssetName } from '../../redux/actions/asset-list';
|
|
|
5
5
|
import { connect } from 'react-redux';
|
|
6
6
|
import { bindActionCreators } from 'redux';
|
|
7
7
|
import { DeterminateLoader } from '../determinate-loader/DeterminateLoader';
|
|
8
|
+
import { assets as copy } from '../../constants/copy';
|
|
8
9
|
let updateTimeout;
|
|
9
10
|
const AssetsTableNameCell = (props) => {
|
|
10
|
-
const { cell: { row: { original: { name, id, percent: uploadProgress } } }
|
|
11
|
+
const { cell: { row: { original: { name, id, percent: uploadProgress } } } } = props;
|
|
11
12
|
const [localName, setLocalName] = useState(name);
|
|
12
13
|
const onUpdate = (n) => {
|
|
13
14
|
setLocalName(n);
|
|
@@ -24,11 +25,11 @@ const AssetsTableNameCell = (props) => {
|
|
|
24
25
|
};
|
|
25
26
|
}, [name]);
|
|
26
27
|
if (uploadProgress) {
|
|
27
|
-
const loader = uploadProgress < 100 ? (React.createElement(DeterminateLoader, { progress: uploadProgress, text: name })) : (React.createElement("span", null,
|
|
28
|
+
const loader = uploadProgress < 100 ? (React.createElement(DeterminateLoader, { progress: uploadProgress, text: name })) : (React.createElement("span", null, copy.uploads.preparePhase));
|
|
28
29
|
return loader;
|
|
29
30
|
}
|
|
30
31
|
else {
|
|
31
|
-
return (React.createElement(TextField, { value: localName, width: '100%',
|
|
32
|
+
return (React.createElement(TextField, { value: localName, width: '100%', onChange: (n) => onUpdate(n) }));
|
|
32
33
|
}
|
|
33
34
|
};
|
|
34
35
|
const mapDispatchToProps = (dispatch) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetsTableNameCell.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsTableNameCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"AssetsTableNameCell.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsTableNameCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAE3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAQtD,IAAI,aAAkB,CAAC;AACvB,MAAM,mBAAmB,GAAmC,CAAC,KAA2B,EAAE,EAAE;IACxF,MAAM,EACF,IAAI,EAAE,EACF,GAAG,EAAE,EACD,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,EAClD,EACJ,EACJ,GAAG,KAAK,CAAC;IAEV,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEjD,MAAM,QAAQ,GAAG,CAAC,CAAC,EAAE,EAAE;QACnB,YAAY,CAAC,CAAC,CAAC,CAAC;QAChB,YAAY,CAAC,aAAa,CAAC,CAAC;QAC5B,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IACvD,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,CAAC,CAAC,EAAE,EAAE;QAClB,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACX,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,OAAO,GAAG,EAAE;YACR,YAAY,CAAC,aAAa,CAAC,CAAC;QAChC,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,IAAI,cAAc,EAAE,CAAC;QACjB,MAAM,MAAM,GACR,cAAc,GAAG,GAAG,CAAC,CAAC,CAAC,CACnB,oBAAC,iBAAiB,IACd,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,IAAI,GACZ,CACL,CAAC,CAAC,CAAC,CACA,kCAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAQ,CAC3C,CAAC;QACN,OAAO,MAAM,CAAC;IAClB,CAAC;SAAM,CAAC;QACJ,OAAO,CACH,oBAAC,SAAS,IACN,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,GAC9B,CACL,CAAC;IACN,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAO,EAAE;IACzC,OAAO,kBAAkB,CAAC,EAAE,eAAe,EAAE,EAAE,QAAQ,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAK,EAAO,EAAE;IACnC,OAAO,EAAE,CAAC;AACd,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC,mBAAmB,CAAC,CAAC"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
+
import { ASSET_TYPES } from '../../constants/assets';
|
|
2
3
|
const AssetsTableRateCell = (props) => {
|
|
3
|
-
const { cell: { row: { original: { rate } } } } = props;
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
const { cell: { row: { original: { type, data, rate } } } } = props;
|
|
5
|
+
let framerate = rate !== null && rate !== undefined ? rate : '';
|
|
6
|
+
if (type === ASSET_TYPES.VIDEO_COMPOSITION && data) {
|
|
7
|
+
const { rate: frame_rate } = JSON.parse(data);
|
|
8
|
+
framerate = frame_rate;
|
|
9
|
+
}
|
|
10
|
+
if (framerate !== null && framerate !== undefined && framerate !== '') {
|
|
11
|
+
return React.createElement("div", { className: 'asset-rate-cell' }, Number(framerate).toFixed(2));
|
|
6
12
|
}
|
|
7
13
|
else {
|
|
8
14
|
return React.createElement("div", { className: 'asset-rate-cell' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetsTableRateCell.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsTableRateCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"AssetsTableRateCell.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsTableRateCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAKrD,MAAM,mBAAmB,GAAmC,CAAC,KAA2B,EAAE,EAAE;IACxF,MAAM,EACF,IAAI,EAAE,EACF,GAAG,EAAE,EACD,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EACjC,EACJ,EACJ,GAAG,KAAK,CAAC;IAEV,IAAI,SAAS,GAAG,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAEhE,IAAI,IAAI,KAAK,WAAW,CAAC,iBAAiB,IAAI,IAAI,EAAE,CAAC;QACjD,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9C,SAAS,GAAG,UAAU,CAAC;IAC3B,CAAC;IAED,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,SAAS,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;QACpE,OAAO,6BAAK,SAAS,EAAC,iBAAiB,IAAE,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAO,CAAC;IACjF,CAAC;SAAM,CAAC;QACJ,OAAO,6BAAK,SAAS,EAAC,iBAAiB,GAAO,CAAC;IACnD,CAAC;AACL,CAAC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
|
|
@@ -29,8 +29,8 @@ class AssetsTableTypeFilter extends React.PureComponent {
|
|
|
29
29
|
}
|
|
30
30
|
return (React.createElement("div", { className: 'centered cell' },
|
|
31
31
|
React.createElement(Button, { tooltip: 'Filter by Asset type', buttonRef: this.typeFilterRef, onClick: () => this.setState({ openMenu: !openMenu }) },
|
|
32
|
-
React.createElement(AssetsTypeIcon, { type: type || 'filter' }),
|
|
33
|
-
|
|
32
|
+
React.createElement(AssetsTypeIcon, { type: type || 'filter' })),
|
|
33
|
+
React.createElement(ImposiumDropdown, { show: openMenu, position: 'bottomleft', toggleRef: this.typeFilterRef, onOutsideClick: () => this.setState({ openMenu: false }) }, filterButtons)));
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
36
|
const mapDispatchToProps = (dispatch) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetsTableTypeFilter.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsTableTypeFilter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,gBAAgB,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAWhF,MAAM,qBAAsB,SAAQ,KAAK,CAAC,aAGzC;IACoB,aAAa,CAAiB;IAE/C,YAAY,KAA6B;QACrC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,CAAC,KAAK,GAAG;YACT,QAAQ,EAAE,KAAK;SAClB,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;IAC3C,CAAC;IAEO,kBAAkB,GAAG,CAAC,IAAY,EAAQ,EAAE;QAChD,MAAM,eAAe,GAAW,IAAI,KAAK,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC,CAAC;IAEK,MAAM,GAAG,GAAgB,EAAE;QAC9B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,MAAM,EACF,YAAY,EAAE,EAAE,IAAI,EAAE,EACzB,GAAG,IAAI,CAAC,KAAK,CAAC;QACf,MAAM,aAAa,GAAQ,EAAE,CAAC;QAE9B,KAAK,MAAM,eAAe,IAAI,yBAAyB,EAAE,CAAC;YACtD,aAAa,CAAC,IAAI,CACd,6BACI,GAAG,EAAE,eAAe,EACpB,SAAS,EAAC,cAAc,EACxB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC;gBACvD,oBAAC,cAAc,IAAC,IAAI,EAAE,eAAe,GAAI,CACvC,CACT,CAAC;QACN,CAAC;QAED,OAAO,CACH,6BAAK,SAAS,EAAC,eAAe;YAC1B,oBAAC,MAAM,IACH,OAAO,EAAC,sBAAsB,EAC9B,SAAS,EAAE,IAAI,CAAC,aAAa,EAC7B,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;gBACrD,oBAAC,cAAc,IAAC,IAAI,EAAE,IAAI,IAAI,QAAQ,GAAI;
|
|
1
|
+
{"version":3,"file":"AssetsTableTypeFilter.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsTableTypeFilter.tsx"],"names":[],"mappings":"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"}
|