@imposium-hub/components 2.2.45-0 → 2.2.45
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/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/AssetsTableNameCell.js +2 -2
- package/dist/cjs/components/assets/AssetsTableNameCell.js.map +1 -1
- package/dist/cjs/components/assets/AssetsTablePreviewCell.d.ts +1 -1
- package/dist/cjs/components/assets/AssetsUploadMenu.js +2 -3
- package/dist/cjs/components/assets/AssetsUploadMenu.js.map +1 -1
- package/dist/cjs/components/assets/FontAssetPreview.d.ts +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/Button.d.ts +1 -1
- package/dist/cjs/components/button/Button.stories.d.ts +5 -6
- package/dist/cjs/components/button-group-field/ButtonGroupField.stories.d.ts +1 -2
- package/dist/cjs/components/button-menu/ButtonMenu.d.ts +2 -2
- package/dist/cjs/components/button-menu/ButtonMenu.stories.d.ts +1 -2
- package/dist/cjs/components/button-menu/ButtonMenuItem.d.ts +1 -1
- package/dist/cjs/components/card/Card.stories.d.ts +1 -2
- package/dist/cjs/components/checkbox-field/CheckboxField.d.ts +1 -1
- package/dist/cjs/components/checkbox-field/CheckboxField.stories.d.ts +1 -2
- package/dist/cjs/components/color-field/ColorField.d.ts +1 -1
- package/dist/cjs/components/color-field/ColorFiled.stories.d.ts +1 -2
- package/dist/cjs/components/compositions/TextLayer.d.ts +1 -1
- package/dist/cjs/components/context-menu/AnimateComponent.d.ts +1 -2
- package/dist/cjs/components/context-menu/ContextMenu.d.ts +1 -2
- package/dist/cjs/components/context-menu/ContextMenuItem.d.ts +1 -2
- package/dist/cjs/components/context-menu/ContextMenuTrigger.d.ts +1 -2
- package/dist/cjs/components/context-menu/SubMenu.d.ts +1 -2
- package/dist/cjs/components/controlled-list/ControlledList.d.ts +2 -2
- package/dist/cjs/components/controlled-list/ControlledList.stories.d.ts +1 -2
- package/dist/cjs/components/determinate-loader/DeterminateLoader.stories.d.ts +3 -3
- package/dist/cjs/components/dropdown/Dropdown.d.ts +1 -1
- package/dist/cjs/components/dropdown/dropdown.stories.d.ts +1 -1
- package/dist/cjs/components/dropdown/dropdown.stories.js +1 -1
- package/dist/cjs/components/dropdown/dropdown.stories.js.map +1 -1
- package/dist/cjs/components/field-wrapper/FieldWrapper.d.ts +2 -2
- package/dist/cjs/components/field-wrapper/FieldWrapper.stories.d.ts +1 -2
- package/dist/cjs/components/font-picker/FontPicker.d.ts +1 -1
- package/dist/cjs/components/h-rule/HRule.d.ts +1 -2
- package/dist/cjs/components/h-rule/HRule.stories.d.ts +2 -3
- 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/list-field/ListField.stories.d.ts +1 -2
- package/dist/cjs/components/log-viewer/LogViewer.d.ts +1 -1
- package/dist/cjs/components/media-variable-field/MediaVariableField.d.ts +1 -1
- package/dist/cjs/components/modal/Modal.d.ts +1 -1
- package/dist/cjs/components/modal/Modal.stories.d.ts +1 -2
- package/dist/cjs/components/number-field/NumberField.d.ts +1 -1
- package/dist/cjs/components/number-field/NumberField.stories.d.ts +1 -2
- package/dist/cjs/components/players/AudioPlayer.d.ts +1 -1
- package/dist/cjs/components/players/AudioPreview.d.ts +1 -1
- package/dist/cjs/components/players/ImagePlayer.d.ts +1 -1
- package/dist/cjs/components/players/ImagePreview.d.ts +1 -1
- package/dist/cjs/components/players/ImageSequencePlayer.d.ts +1 -1
- package/dist/cjs/components/players/TemplatePlayer.d.ts +1 -1
- package/dist/cjs/components/players/VideoPreview.d.ts +1 -1
- package/dist/cjs/components/publish-wizard/PublishWizard.d.ts +3 -3
- package/dist/cjs/components/publish-wizard/PublishWizard.js +59 -119
- package/dist/cjs/components/publish-wizard/PublishWizard.js.map +1 -1
- package/dist/cjs/components/publish-wizard/publish/APIIntegration.d.ts +1 -1
- package/dist/cjs/components/publish-wizard/publish/HubSpotFlow.d.ts +1 -1
- package/dist/cjs/components/publish-wizard/publish/WebpageHosted.d.ts +2 -2
- package/dist/cjs/components/section/Section.d.ts +1 -2
- package/dist/cjs/components/section/Section.stories.d.ts +2 -3
- package/dist/cjs/components/select-field/SelectField.d.ts +1 -1
- package/dist/cjs/components/select-field/SelectField.stories.d.ts +1 -2
- package/dist/cjs/components/shortcut-menu/ShortcutMenu.stories.d.ts +1 -1
- package/dist/cjs/components/slider-field/SliderField.d.ts +1 -1
- package/dist/cjs/components/slider-field/SliderField.stories.d.ts +1 -2
- package/dist/cjs/components/smpte-field/SMPTEField.d.ts +1 -1
- package/dist/cjs/components/tabs/Tabs.stories.d.ts +1 -1
- package/dist/cjs/components/text-area-field/TextAreaField.d.ts +1 -1
- package/dist/cjs/components/text-area-field/TextAreaField.stories.d.ts +1 -2
- package/dist/cjs/components/text-field/TextField.d.ts +1 -1
- package/dist/cjs/components/text-field/TextField.stories.d.ts +1 -2
- package/dist/cjs/constants/copy.d.ts +0 -5
- package/dist/cjs/constants/copy.js +0 -5
- package/dist/cjs/constants/copy.js.map +1 -1
- package/dist/cjs/constants/icons.d.ts +70 -72
- package/dist/cjs/constants/icons.js +1 -3
- package/dist/cjs/constants/icons.js.map +1 -1
- package/dist/cjs/index.d.ts +2 -2
- package/dist/cjs/index.js +4 -2
- 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/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/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/cjs/utils/assets.d.ts +0 -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/AssetsTableNameCell.js +2 -2
- package/dist/esm/components/assets/AssetsTableNameCell.js.map +1 -1
- package/dist/esm/components/assets/AssetsTablePreviewCell.d.ts +1 -1
- package/dist/esm/components/assets/AssetsUploadMenu.js +2 -3
- package/dist/esm/components/assets/AssetsUploadMenu.js.map +1 -1
- package/dist/esm/components/assets/FontAssetPreview.d.ts +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/Button.d.ts +1 -1
- package/dist/esm/components/button/Button.stories.d.ts +5 -6
- package/dist/esm/components/button-group-field/ButtonGroupField.stories.d.ts +1 -2
- package/dist/esm/components/button-menu/ButtonMenu.d.ts +2 -2
- package/dist/esm/components/button-menu/ButtonMenu.stories.d.ts +1 -2
- package/dist/esm/components/button-menu/ButtonMenuItem.d.ts +1 -1
- package/dist/esm/components/card/Card.stories.d.ts +1 -2
- package/dist/esm/components/checkbox-field/CheckboxField.d.ts +1 -1
- package/dist/esm/components/checkbox-field/CheckboxField.stories.d.ts +1 -2
- package/dist/esm/components/color-field/ColorField.d.ts +1 -1
- package/dist/esm/components/color-field/ColorFiled.stories.d.ts +1 -2
- package/dist/esm/components/compositions/TextLayer.d.ts +1 -1
- package/dist/esm/components/context-menu/AnimateComponent.d.ts +1 -2
- package/dist/esm/components/context-menu/ContextMenu.d.ts +1 -2
- package/dist/esm/components/context-menu/ContextMenuItem.d.ts +1 -2
- package/dist/esm/components/context-menu/ContextMenuTrigger.d.ts +1 -2
- package/dist/esm/components/context-menu/SubMenu.d.ts +1 -2
- package/dist/esm/components/controlled-list/ControlledList.d.ts +2 -2
- package/dist/esm/components/controlled-list/ControlledList.stories.d.ts +1 -2
- package/dist/esm/components/determinate-loader/DeterminateLoader.stories.d.ts +3 -3
- package/dist/esm/components/dropdown/Dropdown.d.ts +1 -1
- package/dist/esm/components/dropdown/dropdown.stories.d.ts +1 -1
- package/dist/esm/components/dropdown/dropdown.stories.js +1 -1
- package/dist/esm/components/dropdown/dropdown.stories.js.map +1 -1
- package/dist/esm/components/field-wrapper/FieldWrapper.d.ts +2 -2
- package/dist/esm/components/field-wrapper/FieldWrapper.stories.d.ts +1 -2
- package/dist/esm/components/font-picker/FontPicker.d.ts +1 -1
- package/dist/esm/components/h-rule/HRule.d.ts +1 -2
- package/dist/esm/components/h-rule/HRule.stories.d.ts +2 -3
- 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/list-field/ListField.stories.d.ts +1 -2
- package/dist/esm/components/log-viewer/LogViewer.d.ts +1 -1
- package/dist/esm/components/media-variable-field/MediaVariableField.d.ts +1 -1
- package/dist/esm/components/modal/Modal.d.ts +1 -1
- package/dist/esm/components/modal/Modal.stories.d.ts +1 -2
- package/dist/esm/components/number-field/NumberField.d.ts +1 -1
- package/dist/esm/components/number-field/NumberField.stories.d.ts +1 -2
- package/dist/esm/components/players/AudioPlayer.d.ts +1 -1
- package/dist/esm/components/players/AudioPreview.d.ts +1 -1
- package/dist/esm/components/players/ImagePlayer.d.ts +1 -1
- package/dist/esm/components/players/ImagePreview.d.ts +1 -1
- package/dist/esm/components/players/ImageSequencePlayer.d.ts +1 -1
- package/dist/esm/components/players/TemplatePlayer.d.ts +1 -1
- package/dist/esm/components/players/VideoPreview.d.ts +1 -1
- package/dist/esm/components/publish-wizard/PublishWizard.d.ts +3 -3
- package/dist/esm/components/publish-wizard/PublishWizard.js +60 -119
- package/dist/esm/components/publish-wizard/PublishWizard.js.map +1 -1
- package/dist/esm/components/publish-wizard/publish/APIIntegration.d.ts +1 -1
- package/dist/esm/components/publish-wizard/publish/HubSpotFlow.d.ts +1 -1
- package/dist/esm/components/publish-wizard/publish/WebpageHosted.d.ts +2 -2
- package/dist/esm/components/section/Section.d.ts +1 -2
- package/dist/esm/components/section/Section.stories.d.ts +2 -3
- package/dist/esm/components/select-field/SelectField.d.ts +1 -1
- package/dist/esm/components/select-field/SelectField.stories.d.ts +1 -2
- package/dist/esm/components/shortcut-menu/ShortcutMenu.stories.d.ts +1 -1
- package/dist/esm/components/slider-field/SliderField.d.ts +1 -1
- package/dist/esm/components/slider-field/SliderField.stories.d.ts +1 -2
- package/dist/esm/components/smpte-field/SMPTEField.d.ts +1 -1
- package/dist/esm/components/tabs/Tabs.stories.d.ts +1 -1
- package/dist/esm/components/text-area-field/TextAreaField.d.ts +1 -1
- package/dist/esm/components/text-area-field/TextAreaField.stories.d.ts +1 -2
- package/dist/esm/components/text-field/TextField.d.ts +1 -1
- package/dist/esm/components/text-field/TextField.stories.d.ts +1 -2
- package/dist/esm/constants/copy.d.ts +0 -5
- package/dist/esm/constants/copy.js +0 -5
- package/dist/esm/constants/copy.js.map +1 -1
- package/dist/esm/constants/icons.d.ts +70 -72
- package/dist/esm/constants/icons.js +0 -2
- package/dist/esm/constants/icons.js.map +1 -1
- package/dist/esm/index.d.ts +2 -2
- package/dist/esm/index.js +2 -2
- 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/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/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/esm/utils/assets.d.ts +0 -1
- package/dist/styles.css +0 -23
- package/dist/styles.less +0 -26
- package/less/components/header.less +0 -13
- package/less/components/publish-wizard.less +0 -13
- package/package.json +1 -1
- package/src/components/app-wrapper/AppWrapper.tsx +120 -79
- package/src/components/assets/AssetsTableNameCell.tsx +1 -4
- package/src/components/assets/AssetsUploadMenu.tsx +8 -13
- package/src/components/auth-gate/AuthGate.tsx +8 -14
- package/src/components/header/Header.tsx +39 -74
- package/src/components/publish-wizard/PublishWizard.tsx +87 -172
- package/src/constants/copy.ts +0 -6
- package/src/constants/icons.tsx +0 -3
- package/src/index.ts +10 -1
- package/src/redux/actions/access.ts +67 -5
- package/src/redux/actions/publish.ts +3 -6
- package/src/redux/reducers/access.ts +8 -5
- 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/src/components/dropdown/{dropdown.stories.tsx → Dropdown.stories.tsx} +0 -0
|
@@ -33,6 +33,31 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
33
33
|
__setModuleDefault(result, mod);
|
|
34
34
|
return result;
|
|
35
35
|
};
|
|
36
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
37
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
38
|
+
if (!m) return o;
|
|
39
|
+
var i = m.call(o), r, ar = [], e;
|
|
40
|
+
try {
|
|
41
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
42
|
+
}
|
|
43
|
+
catch (error) { e = { error: error }; }
|
|
44
|
+
finally {
|
|
45
|
+
try {
|
|
46
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
47
|
+
}
|
|
48
|
+
finally { if (e) throw e.error; }
|
|
49
|
+
}
|
|
50
|
+
return ar;
|
|
51
|
+
};
|
|
52
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
53
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
54
|
+
if (ar || !(i in from)) {
|
|
55
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
56
|
+
ar[i] = from[i];
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
60
|
+
};
|
|
36
61
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
37
62
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
38
63
|
};
|
|
@@ -42,13 +67,15 @@ var axios_1 = __importDefault(require("axios"));
|
|
|
42
67
|
var SessionService = /** @class */ (function () {
|
|
43
68
|
function SessionService() {
|
|
44
69
|
}
|
|
45
|
-
SessionService.
|
|
46
|
-
SessionService.
|
|
70
|
+
SessionService.LAST_STORY_ID_CACHE = 'imp_hub_last_story_id';
|
|
71
|
+
SessionService.LAST_ORG_ID_CACHE = 'imp_hub_last_org_id';
|
|
47
72
|
SessionService.SESSION_COOKIE_NAME = 'auth_state';
|
|
48
73
|
SessionService.FRESH_COOKIE = {
|
|
49
74
|
sub: '',
|
|
50
75
|
organization_id: '',
|
|
51
|
-
story_id: ''
|
|
76
|
+
story_id: '',
|
|
77
|
+
stories_hash: 0,
|
|
78
|
+
orgs_hash: 0
|
|
52
79
|
};
|
|
53
80
|
/*
|
|
54
81
|
Get list of accessible services with themes from Imposium API
|
|
@@ -81,19 +108,59 @@ var SessionService = /** @class */ (function () {
|
|
|
81
108
|
var domain = SessionService.scrapeDomain();
|
|
82
109
|
Cookies.remove(SessionService.SESSION_COOKIE_NAME, { domain: domain });
|
|
83
110
|
};
|
|
84
|
-
SessionService.buildFreshSession = function (freshIdentity,
|
|
85
|
-
if (orgId === void 0) { orgId = null; }
|
|
86
|
-
if (storyId === void 0) { storyId = null; }
|
|
111
|
+
SessionService.buildFreshSession = function (freshIdentity, freshAccess) {
|
|
87
112
|
var _a = freshIdentity.idTokenPayload, sub = _a.sub, exp = _a.exp;
|
|
88
|
-
var
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
113
|
+
var organizations = freshAccess.organizations;
|
|
114
|
+
var cachedOrganizationId;
|
|
115
|
+
var cachedStoryId;
|
|
116
|
+
var organizationId = '';
|
|
117
|
+
var activeStoryId = '';
|
|
118
|
+
var activeOrg;
|
|
119
|
+
try {
|
|
120
|
+
cachedOrganizationId = localStorage.getItem(SessionService.LAST_ORG_ID_CACHE);
|
|
121
|
+
cachedStoryId = localStorage.getItem(SessionService.LAST_STORY_ID_CACHE);
|
|
122
|
+
}
|
|
123
|
+
catch (e) {
|
|
124
|
+
console.warn('Failed to look up cached hub settings', e);
|
|
93
125
|
}
|
|
94
|
-
if
|
|
95
|
-
|
|
126
|
+
// Check if org exists in access data fetched from imposium
|
|
127
|
+
if (cachedOrganizationId) {
|
|
128
|
+
activeOrg = freshAccess.organizations.find(function (o) { return o.id === cachedOrganizationId; });
|
|
129
|
+
if (typeof activeOrg === 'object' && activeOrg.hasOwnProperty('id')) {
|
|
130
|
+
organizationId = cachedOrganizationId;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
// If the cached org id matched up with an org record, check to see if the cached story id also
|
|
134
|
+
// matches an existing story
|
|
135
|
+
if (cachedStoryId &&
|
|
136
|
+
organizationId &&
|
|
137
|
+
activeOrg.stories &&
|
|
138
|
+
activeOrg.stories.find(function (s) { return s.id === cachedStoryId; })) {
|
|
139
|
+
activeStoryId = cachedStoryId;
|
|
140
|
+
}
|
|
141
|
+
// If the cached org id was missing / not belonging to the current org, use the first org id if possible
|
|
142
|
+
if (!organizationId &&
|
|
143
|
+
organizations.length > 0 &&
|
|
144
|
+
typeof organizations[0] === 'object' &&
|
|
145
|
+
organizations[0].hasOwnProperty('id')) {
|
|
146
|
+
organizationId = organizations[0].id;
|
|
96
147
|
}
|
|
148
|
+
// Same for story id if the cache was missing / belonging to a different org
|
|
149
|
+
if (!activeStoryId &&
|
|
150
|
+
organizations &&
|
|
151
|
+
organizations[0] &&
|
|
152
|
+
organizations[0].stories.length > 0 &&
|
|
153
|
+
typeof organizations[0].stories[0] === 'object' &&
|
|
154
|
+
organizations[0].stories[0].hasOwnProperty('id')) {
|
|
155
|
+
activeStoryId = organizations[0].stories[0].id;
|
|
156
|
+
}
|
|
157
|
+
var freshSession = {
|
|
158
|
+
sub: sub,
|
|
159
|
+
organization_id: organizationId,
|
|
160
|
+
story_id: activeStoryId,
|
|
161
|
+
stories_hash: SessionService.generateStoriesHash(freshAccess),
|
|
162
|
+
orgs_hash: SessionService.generateOrgsHash(freshAccess)
|
|
163
|
+
};
|
|
97
164
|
SessionService.storeSession(freshSession, exp);
|
|
98
165
|
};
|
|
99
166
|
SessionService.storeSession = function (values, auth0Expiry) {
|
|
@@ -102,29 +169,58 @@ var SessionService = /** @class */ (function () {
|
|
|
102
169
|
var expiry = new Date(auth0Expiry * 1000);
|
|
103
170
|
Cookies.set(SessionService.SESSION_COOKIE_NAME, cookieData, { domain: domain, expires: expiry });
|
|
104
171
|
};
|
|
105
|
-
SessionService.cacheOrgId = function (organizationId) {
|
|
106
|
-
localStorage.setItem(SessionService.LOGIN_ORG_ID_CACHE, organizationId);
|
|
107
|
-
};
|
|
108
|
-
SessionService.clearCachedOrgId = function () {
|
|
109
|
-
localStorage.removeItem(SessionService.LOGIN_ORG_ID_CACHE);
|
|
110
|
-
};
|
|
111
|
-
SessionService.getCachedOrgId = function () {
|
|
112
|
-
return localStorage.getItem(SessionService.LOGIN_ORG_ID_CACHE);
|
|
113
|
-
};
|
|
114
|
-
SessionService.cacheStoryId = function (storyId) {
|
|
115
|
-
localStorage.setItem(SessionService.LOGIN_STORY_ID_CACHE, storyId);
|
|
116
|
-
};
|
|
117
|
-
SessionService.clearCachedStoryId = function () {
|
|
118
|
-
localStorage.removeItem(SessionService.LOGIN_STORY_ID_CACHE);
|
|
119
|
-
};
|
|
120
|
-
SessionService.getCachedStoryId = function () {
|
|
121
|
-
return localStorage.getItem(SessionService.LOGIN_STORY_ID_CACHE);
|
|
122
|
-
};
|
|
123
172
|
SessionService.updateSession = function (values, auth0Expiry) {
|
|
124
173
|
var prevCookieData = SessionService.getSession();
|
|
125
174
|
var nextCookieData = __assign(__assign({}, prevCookieData), values);
|
|
175
|
+
if (values.hasOwnProperty('organization_id')) {
|
|
176
|
+
try {
|
|
177
|
+
localStorage.setItem(SessionService.LAST_ORG_ID_CACHE, values.organization_id);
|
|
178
|
+
}
|
|
179
|
+
catch (e) {
|
|
180
|
+
console.warn('Failed to cache last organization id selected', e);
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
if (values.hasOwnProperty('story_id')) {
|
|
184
|
+
try {
|
|
185
|
+
localStorage.setItem(SessionService.LAST_STORY_ID_CACHE, values.story_id);
|
|
186
|
+
}
|
|
187
|
+
catch (e) {
|
|
188
|
+
console.warn('Failed to cache last story id selected', e);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
126
191
|
SessionService.storeSession(nextCookieData, auth0Expiry);
|
|
127
192
|
};
|
|
193
|
+
/*
|
|
194
|
+
Hash org ids on an account so distributed apps can detected if this state changed (i.e new org got added)
|
|
195
|
+
*/
|
|
196
|
+
SessionService.generateOrgsHash = function (accessData) {
|
|
197
|
+
var allOrgIdsStringified = accessData.organizations.map(function (o) { return o.id; }).join('');
|
|
198
|
+
return SessionService.string2Hash(allOrgIdsStringified);
|
|
199
|
+
};
|
|
200
|
+
/*
|
|
201
|
+
Hash a combination of story ids & names on an account so distributed apps can detect if this state changed
|
|
202
|
+
*/
|
|
203
|
+
SessionService.generateStoriesHash = function (accessData) {
|
|
204
|
+
var allStories = accessData.organizations.reduce(function (p, c) { return __spreadArray(__spreadArray([], __read(p), false), __read(c.stories), false); }, []);
|
|
205
|
+
var allStoriesStringified = allStories
|
|
206
|
+
.map(function (story) { return "".concat(story.id).concat(story.name); })
|
|
207
|
+
.join('');
|
|
208
|
+
return SessionService.string2Hash(allStoriesStringified);
|
|
209
|
+
};
|
|
210
|
+
/*
|
|
211
|
+
Generate hash from string
|
|
212
|
+
*/
|
|
213
|
+
SessionService.string2Hash = function (s) {
|
|
214
|
+
var hash = 0;
|
|
215
|
+
if (s.length === 0) {
|
|
216
|
+
return hash;
|
|
217
|
+
}
|
|
218
|
+
for (var i = 0; i < s.length; i++) {
|
|
219
|
+
hash = (hash << 5) - hash + s.charCodeAt(i);
|
|
220
|
+
hash |= 0;
|
|
221
|
+
}
|
|
222
|
+
return hash;
|
|
223
|
+
};
|
|
128
224
|
/*
|
|
129
225
|
Determine which domain to assign cookie to
|
|
130
226
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../../../src/services/Session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../../../src/services/Session.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAqC;AACrC,gDAAyD;AAWzD;IAAA;IAgOA,CAAC;IA/N2B,kCAAmB,GAAW,uBAAuB,CAAC;IAEtD,gCAAiB,GAAW,qBAAqB,CAAC;IAElD,kCAAmB,GAAW,YAAY,CAAC;IAE3C,2BAAY,GAAgB;QAChD,GAAG,EAAE,EAAE;QACP,eAAe,EAAE,EAAE;QACnB,QAAQ,EAAE,EAAE;QACZ,YAAY,EAAE,CAAC;QACf,SAAS,EAAE,CAAC;KACf,CAAC;IAEF;;MAEE;IACY,4BAAa,GAAG,UAC1B,OAAe,EACf,OAAgB,EAChB,eAAgC,EAChC,SAAkB;QADlB,gCAAA,EAAA,uBAAgC;QAGhC,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;YAC/B,IAAI,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,UAAG,OAAO,YAAS,CAAC,CAAC,CAAC,cAAc,CAAC,kBAAkB,EAAE,CAAC;YACpF,IAAM,OAAO,GAAQ,EAAE,aAAa,EAAE,iBAAU,OAAO,CAAE,EAAE,CAAC;YAE5D,IAAI,eAAe,EAAE,CAAC;gBAClB,SAAS,IAAI,6BAA6B,CAAC;YAC/C,CAAC;YAED,IAAI,SAAS,IAAI,SAAS,KAAK,WAAW,EAAE,CAAC;gBACzC,OAAO,CAAC,uBAAuB,CAAC,GAAG,SAAS,CAAC;YACjD,CAAC;YAED,eAAK;iBACA,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,SAAA,EAAE,CAAC;iBAC3B,IAAI,CAAC,UAAC,GAAkB;gBACrB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACtC,CAAC,CAAC;iBACD,KAAK,CAAC,UAAC,CAAa;gBACjB,MAAM,CAAC,CAAC,CAAC,CAAC;YACd,CAAC,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEY,yBAAU,GAAG;QACvB,OAAA,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAAC;IAAnD,CAAmD,CAAC;IAE1C,4BAAa,GAAG;QAC1B,IAAM,MAAM,GAAW,cAAc,CAAC,YAAY,EAAE,CAAC;QACrD,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,mBAAmB,EAAE,EAAE,MAAM,QAAA,EAAE,CAAC,CAAC;IACnE,CAAC,CAAC;IAEY,gCAAiB,GAAG,UAAC,aAAwB,EAAE,WAAgB;QAErE,IAAA,KACA,aAAa,eADe,EAAV,GAAG,SAAA,EAAE,GAAG,SAAE,CACd;QACV,IAAA,aAAa,GAAK,WAAW,cAAhB,CAAiB;QAEtC,IAAI,oBAA4B,CAAC;QACjC,IAAI,aAAqB,CAAC;QAC1B,IAAI,cAAc,GAAW,EAAE,CAAC;QAChC,IAAI,aAAa,GAAW,EAAE,CAAC;QAC/B,IAAI,SAAc,CAAC;QAEnB,IAAI,CAAC;YACD,oBAAoB,GAAG,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;YAC9E,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;QAC7E,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAC;QAC7D,CAAC;QAED,2DAA2D;QAC3D,IAAI,oBAAoB,EAAE,CAAC;YACvB,SAAS,GAAG,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,UAAC,CAAM,IAAK,OAAA,CAAC,CAAC,EAAE,KAAK,oBAAoB,EAA7B,CAA6B,CAAC,CAAC;YAEtF,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClE,cAAc,GAAG,oBAAoB,CAAC;YAC1C,CAAC;QACL,CAAC;QAED,+FAA+F;QAC/F,4BAA4B;QAC5B,IACI,aAAa;YACb,cAAc;YACd,SAAS,CAAC,OAAO;YACjB,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,UAAC,CAAM,IAAK,OAAA,CAAC,CAAC,EAAE,KAAK,aAAa,EAAtB,CAAsB,CAAC,EAC5D,CAAC;YACC,aAAa,GAAG,aAAa,CAAC;QAClC,CAAC;QAED,wGAAwG;QACxG,IACI,CAAC,cAAc;YACf,aAAa,CAAC,MAAM,GAAG,CAAC;YACxB,OAAO,aAAa,CAAC,CAAC,CAAC,KAAK,QAAQ;YACpC,aAAa,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,EACvC,CAAC;YACC,cAAc,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,CAAC;QAED,4EAA4E;QAC5E,IACI,CAAC,aAAa;YACd,aAAa;YACb,aAAa,CAAC,CAAC,CAAC;YAChB,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YACnC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ;YAC/C,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,EAClD,CAAC;YACC,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,CAAC;QAED,IAAM,YAAY,GAAgB;YAC9B,GAAG,KAAA;YACH,eAAe,EAAE,cAAc;YAC/B,QAAQ,EAAE,aAAa;YACvB,YAAY,EAAE,cAAc,CAAC,mBAAmB,CAAC,WAAW,CAAC;YAC7D,SAAS,EAAE,cAAc,CAAC,gBAAgB,CAAC,WAAW,CAAC;SAC1D,CAAC;QAEF,cAAc,CAAC,YAAY,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IACnD,CAAC,CAAC;IAEY,2BAAY,GAAG,UAAC,MAAW,EAAE,WAAmB;QAC1D,IAAM,UAAU,yBAAqB,cAAc,CAAC,YAAY,GAAK,MAAM,CAAE,CAAC;QAC9E,IAAM,MAAM,GAAW,cAAc,CAAC,YAAY,EAAE,CAAC;QACrD,IAAM,MAAM,GAAS,IAAI,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;QAElD,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,mBAAmB,EAAE,UAAU,EAAE,EAAE,MAAM,QAAA,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7F,CAAC,CAAC;IAEY,4BAAa,GAAG,UAAC,MAAW,EAAE,WAAmB;QAC3D,IAAM,cAAc,GAAgB,cAAc,CAAC,UAAU,EAAE,CAAC;QAChE,IAAM,cAAc,yBAAqB,cAAc,GAAK,MAAM,CAAE,CAAC;QAErE,IAAI,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC;gBACD,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,iBAAiB,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;YACnF,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,OAAO,CAAC,IAAI,CAAC,+CAA+C,EAAE,CAAC,CAAC,CAAC;YACrE,CAAC;QACL,CAAC;QAED,IAAI,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC;gBACD,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,mBAAmB,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC9E,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,OAAO,CAAC,IAAI,CAAC,wCAAwC,EAAE,CAAC,CAAC,CAAC;YAC9D,CAAC;QACL,CAAC;QAED,cAAc,CAAC,YAAY,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC7D,CAAC,CAAC;IAEF;;OAEG;IACW,+BAAgB,GAAG,UAAC,UAAe;QAC7C,IAAM,oBAAoB,GAAW,UAAU,CAAC,aAAa,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,EAAE,EAAJ,CAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAExF,OAAO,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;IAC5D,CAAC,CAAC;IAEF;;OAEG;IACW,kCAAmB,GAAG,UAAC,UAAe;QAChD,IAAM,UAAU,GAAU,UAAU,CAAC,aAAa,CAAC,MAAM,CACrD,UAAC,CAAC,EAAE,CAAC,IAAK,8CAAI,CAAC,kBAAK,CAAC,CAAC,OAAO,WAAnB,CAAoB,EAC9B,EAAE,CACL,CAAC;QACF,IAAM,qBAAqB,GAAW,UAAU;aAC3C,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,UAAG,KAAK,CAAC,EAAE,SAAG,KAAK,CAAC,IAAI,CAAE,EAA1B,CAA0B,CAAC;aAC1C,IAAI,CAAC,EAAE,CAAC,CAAC;QAEd,OAAO,cAAc,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAC7D,CAAC,CAAC;IAEF;;OAEG;IACY,0BAAW,GAAG,UAAC,CAAS;QACnC,IAAI,IAAI,GAAW,CAAC,CAAC;QAErB,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,IAAI,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAC5C,IAAI,IAAI,CAAC,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;IAEF;;OAEG;IACY,2BAAY,GAAG;QAC1B,IAAM,WAAW,GAAa,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;QACxE,OAAO,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAI,WAAW,CAAC,CAAC,CAAC,cAAI,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAChG,CAAC,CAAC;IAEF;;MAEE;IACa,iCAAkB,GAAG;QAE5B,IAAA,KACA,MAAM,SADsB,EAAhB,QAAQ,cAAA,EAAE,IAAI,UAAE,CACrB;QAEX,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;YAC3B,OAAO,oBAAoB,CAAC;QAChC,CAAC;aAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACpC,OAAO,yCAAyC,CAAC;QACrD,CAAC;aAAM,CAAC;YACJ,OAAO,iCAAiC,CAAC;QAC7C,CAAC;IACL,CAAC,CAAC;IACN,qBAAC;CAAA,AAhOD,IAgOC;kBAhOoB,cAAc"}
|
|
@@ -11,13 +11,14 @@ export interface IAppWrapperProps {
|
|
|
11
11
|
access: any;
|
|
12
12
|
auth: any;
|
|
13
13
|
isFreshUser: boolean;
|
|
14
|
-
setAccessData(accessData: any): any;
|
|
15
14
|
allowUnauthenticatedRender: boolean;
|
|
16
15
|
onAuthenticated: (activeOrgId: string, activeStoryId: string) => any;
|
|
17
16
|
onAuthenticationFailure: (e: Error) => any;
|
|
18
17
|
showRequestAccess?: boolean;
|
|
19
18
|
login: (id: IIdentity) => any;
|
|
20
19
|
clearCachedAuth: () => any;
|
|
20
|
+
cacheAccessData: (accessData: any) => any;
|
|
21
|
+
clearCachedAccessList: () => any;
|
|
21
22
|
}
|
|
22
23
|
export interface IAppWrapperState {
|
|
23
24
|
blockRender: boolean;
|
|
@@ -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":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAC7C,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,cAA+B,MAAM,wBAAwB,CAAC;AACrE,OAAO,WAA0B,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AA4BjD,MAAM,UAAW,SAAQ,KAAK,CAAC,SAA6C;IAChE,MAAM,CAAU,kBAAkB,GAAgB,CACtD,oBAAC,QAAQ,IACL,GAAG,EAAC,iBAAiB,EACrB,IAAI,EAAC,SAAS,GAChB,CACL,CAAC;IAEM,MAAM,CAAU,gBAAgB,GAAgB,CACpD,oBAAC,QAAQ,IACL,GAAG,EAAC,iBAAiB,EACrB,IAAI,EAAC,UAAU,GACjB,CACL,CAAC;IAEM,MAAM,CAAU,OAAO,GAAgB,CAC3C,oBAAC,QAAQ,IACL,GAAG,EAAC,iBAAiB,EACrB,IAAI,EAAC,SAAS,GAChB,CACL,CAAC;IAEF,YAAY,CAAmB;QAC3B,KAAK,CAAC,CAAC,CAAC,CAAC;QAET,IAAI,CAAC,KAAK,GAAG;YACT,WAAW,EAAE,IAAI;YACjB,cAAc,EAAE,KAAK;SACxB,CAAC;IACN,CAAC;IAEM,iBAAiB,GAAG,GAAS,EAAE;QAClC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC7E,MAAM,OAAO,GAAgB,cAAc,CAAC,UAAU,EAAE,CAAC;QAEzD,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAErD,MAAM,gBAAgB,GAAG,mBAAmB,CACxC,IAAI,CAAC,KAAK,CAAC,cAAc,EACzB,IAAI,CAAC,KAAK,CAAC,SAAS,EACpB,IAAI,CAAC,KAAK,CAAC,MAAM,CACpB,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAClD,IAAI,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,gBAAgB,EAAE,CAAC;YAChD,IAAI,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,0DAA0D;QAC1D,2DAA2D;QAC3D,IACI,CAAC,WAAW;YACZ,IAAI,KAAK,IAAI;YACb,MAAM,KAAK,IAAI;YACf,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ;YAC/B,OAAO,CAAC,GAAG,KAAK,IAAI,CAAC,cAAc,CAAC,GAAG;YACvC,OAAO,CAAC,YAAY,KAAK,cAAc,CAAC,mBAAmB,CAAC,MAAM,CAAC;YACnE,OAAO,CAAC,SAAS,KAAK,cAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAC/D,CAAC;YACC,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC,CAAC;IAEF;;OAEG;IACI,kBAAkB,GAAG,CACxB,SAAqC,EACrC,SAAqC,EACjC,EAAE;QACN,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5B,IAAI,gBAAyB,CAAC;QAE9B,IAAI,IAAI,EAAE,CAAC;YACP,MAAM,EACF,cAAc,EAAE,EAAE,GAAG,EAAE,EAC1B,GAAG,IAAI,CAAC;YACT,MAAM,YAAY,GAAY,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAE3D,IAAI,CAAC,YAAY,EAAE,CAAC;gBAChB,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;gBAC7B,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;gBACnC,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1B,CAAC;QACL,CAAC;QAED,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,KAAK,SAAS,CAAC,cAAc,EAAE,CAAC;YACzD,gBAAgB,GAAG,mBAAmB,CAClC,IAAI,CAAC,KAAK,CAAC,cAAc,EACzB,IAAI,CAAC,KAAK,CAAC,SAAS,EACpB,IAAI,CAAC,KAAK,CAAC,MAAM,CACpB,CAAC;YAEF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAClD,IAAI,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,gBAAgB,EAAE,CAAC;gBAChD,IAAI,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7C,CAAC;QACL,CAAC;IACL,CAAC,CAAC;IAEF;;OAEG;IACK,cAAc,GAAG,GAAS,EAAE;QAChC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9D,MAAM,WAAW,GAAW,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3E,IAAI,aAAa,GAAW,cAAc,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC;QAEjE,IAAI,OAAO,EAAE,CAAC;YACV,aAAa,GAAG,OAAO,CAAC;QAC5B,CAAC;QAED,eAAe,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAE5C,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1C,CAAC;IACL,CAAC,CAAC;IAEF;;OAEG;IACK,yBAAyB,GAAG,CAAC,CAAQ,EAAQ,EAAE;QACnD,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;QAC7B,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF;;MAEE;IACM,cAAc,GAAG,CAAC,cAAuB,KAAK,EAAQ,EAAE;QAC5D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE/B,IAAI,WAAW,EAAE,CAAC;YACd,IAAI,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,WAAW,CAAC,YAAY,EAAE;aACrB,IAAI,CAAC,CAAC,aAAwB,EAAE,EAAE;YAC/B,cAAc,CAAC,aAAa,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC;iBACvD,IAAI,CAAC,CAAC,WAAgB,EAAE,EAAE;gBACvB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;gBAChC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;gBACxC,cAAc,CAAC,iBAAiB,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;gBAC7D,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1B,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE;gBAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;QACX,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAQ,EAAE,EAAE;YAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACX,CAAC,CAAC;IAEM,6BAA6B,CACjC,IAAe,EACf,OAAoB,EACpB,eAAyB;QAEzB,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,MAAM,EACF,cAAc,EAAE,EAAE,GAAG,EAAE,EAC1B,GAAG,IAAI,CAAC;QAET,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,IAAI,cAAc,IAAI,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBACjE,OAAO,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;YACpE,CAAC;YAED,IACI,OAAO;gBACP,OAAO,CAAC,eAAe;gBACvB,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,EACvD,CAAC;gBACC,OAAO,OAAO,CAAC,eAAe,CAAC;YACnC,CAAC;YAED,OAAO,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACxE,CAAC;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;OAEG;IACK,2BAA2B,GAAG,CAAC,IAAe,EAAE,MAAW,EAAU,EAAE;QAC3E,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACjC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;QACjC,MAAM,OAAO,GAAgB,cAAc,CAAC,UAAU,EAAE,CAAC;QACzD,MAAM,kBAAkB,GAAa,aAAa,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEzE,MAAM,WAAW,GAAW,IAAI,CAAC,6BAA6B,CAC1D,IAAI,EACJ,OAAO,EACP,kBAAkB,CACrB,CAAC;QACF,MAAM,SAAS,GAAQ,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,CAAC;QAEvE,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,WAAW,CAAC;IACvB,CAAC,CAAC;IAEF;;OAEG;IACK,qBAAqB,GAAG,CAC5B,cAAsB,EACtB,GAAW,EACX,aAA0B,EACpB,EAAE;QACR,IACI,CAAC,aAAa;YACd,CAAC,aAAa,CAAC,eAAe;YAC9B,aAAa,CAAC,eAAe,KAAK,cAAc,EAClD,CAAC;YACC,MAAM,SAAS,GAAQ,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CACvD,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,cAAc,CACtC,CAAC;YACF,MAAM,YAAY,GACd,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAE5E,cAAc,CAAC,aAAa,CACxB,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,EAC3D,GAAG,CACN,CAAC;QACN,CAAC;QAED,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAC;IAEK,MAAM,GAAG,GAAgB,EAAE;QAC9B,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACnD,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAE/E,IAAI,YAAiB,CAAC;QAEtB,IAAI,CAAC,WAAW,IAAI,cAAc,EAAE,CAAC;YACjC,MAAM,UAAU,GACZ,IAAI,CAAC,KAAK,CAAC,MAAM;gBACjB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa;gBAC/B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC;YACjD,MAAM,cAAc,GAAG,UAAU;gBAC7B,CAAC,CAAC,UAAU,CAAC,OAAO;gBACpB,CAAC,CAAC,iBAAiB;oBACnB,CAAC,CAAC,UAAU,CAAC,kBAAkB;oBAC/B,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;YAClC,YAAY,GAAG;gBACX,OAAO,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC;gBAC7E,cAAc;aACjB,CAAC;QACN,CAAC;QAED,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,cAAc,CAAC,IAAI,0BAA0B,EAAE,CAAC;YAClE,YAAY,GAAG,QAAQ,CAAC;QAC5B,CAAC;QAED,OAAO,CACH,6BACI,EAAE,EAAC,KAAK,EACR,SAAS,EAAC,KAAK,IACd,YAAY,CACX,CACT,CAAC;IACN,CAAC,CAAC;;AAGN,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,EAAE;IACpC,OAAO,kBAAkB,CACrB;QACI,KAAK;QACL,eAAe;QACf,eAAe;QACf,qBAAqB;KACxB,EACD,QAAQ,CACX,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAK,EAAO,EAAE;IACnC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;AACtD,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC"}
|
|
@@ -7,7 +7,7 @@ import { bindActionCreators } from 'redux';
|
|
|
7
7
|
import { DeterminateLoader } from '../determinate-loader/DeterminateLoader';
|
|
8
8
|
let updateTimeout;
|
|
9
9
|
const AssetsTableNameCell = (props) => {
|
|
10
|
-
const { cell: { row: { original: { name, id, percent: uploadProgress } } }
|
|
10
|
+
const { cell: { row: { original: { name, id, percent: uploadProgress } } } } = props;
|
|
11
11
|
const [localName, setLocalName] = useState(name);
|
|
12
12
|
const onUpdate = (n) => {
|
|
13
13
|
setLocalName(n);
|
|
@@ -28,7 +28,7 @@ const AssetsTableNameCell = (props) => {
|
|
|
28
28
|
return loader;
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
|
-
return (React.createElement(TextField, { value: localName, width: '100%',
|
|
31
|
+
return (React.createElement(TextField, { value: localName, width: '100%', onChange: (n) => onUpdate(n) }));
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
34
|
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;AAQ5E,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,uDAA+B,CAClC,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"}
|
|
@@ -11,7 +11,7 @@ declare class AssetsTablePreviewCell extends React.PureComponent<IAssetsTablePre
|
|
|
11
11
|
constructor(props: any);
|
|
12
12
|
private handleClose;
|
|
13
13
|
private handlePreviewClick;
|
|
14
|
-
render():
|
|
14
|
+
render(): any;
|
|
15
15
|
}
|
|
16
16
|
declare const AssetsTablePreviewCellMemoized: React.MemoExoticComponent<typeof AssetsTablePreviewCell>;
|
|
17
17
|
export default AssetsTablePreviewCellMemoized;
|
|
@@ -22,7 +22,7 @@ class AssetsUploadMenu extends React.PureComponent {
|
|
|
22
22
|
this.props.cancelAssetUpload(fileName, api);
|
|
23
23
|
}
|
|
24
24
|
render() {
|
|
25
|
-
const { assetUploads: { uploads, assignToStory, tagByFileName, tagByDelimiter, delimiter, tagManually, manualTags }, assetTags
|
|
25
|
+
const { assetUploads: { uploads, assignToStory, tagByFileName, tagByDelimiter, delimiter, tagManually, manualTags }, assetTags } = this.props;
|
|
26
26
|
let uploadsListInner;
|
|
27
27
|
if (uploads.length > 0) {
|
|
28
28
|
uploadsListInner = uploads.map((u) => {
|
|
@@ -54,7 +54,7 @@ class AssetsUploadMenu extends React.PureComponent {
|
|
|
54
54
|
delimiterSelector,
|
|
55
55
|
React.createElement(CheckboxField, { width: '50%', label: copy.uploads.manualTagging, value: tagManually, onChange: () => this.props.toggleManualTagging(!tagManually) }),
|
|
56
56
|
React.createElement(CheckboxField, { width: '50%', label: copy.uploads.autoTagFilname, value: tagByFileName, onChange: () => this.props.toggleTagFileName(!tagByFileName) }),
|
|
57
|
-
|
|
57
|
+
React.createElement(CheckboxField, { width: '50%', label: copy.uploads.assignToProjectInput, info: copy.uploads.assignToProjectInfo, value: assignToStory, onChange: () => this.props.toggleAssignToStory(!assignToStory) })),
|
|
58
58
|
tagsColumn,
|
|
59
59
|
React.createElement("div", { className: 'uploads-list' }, uploadsListInner)));
|
|
60
60
|
}
|
|
@@ -75,7 +75,6 @@ const mapDispatchToProps = (dispatch) => {
|
|
|
75
75
|
const mapStateToProps = (state) => {
|
|
76
76
|
return {
|
|
77
77
|
assetUploads: state.assetUploads,
|
|
78
|
-
editor: state.editor,
|
|
79
78
|
assetTags: state.assetTags
|
|
80
79
|
};
|
|
81
80
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetsUploadMenu.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsUploadMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,aAAa,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EACH,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,mBAAmB,EACnB,YAAY,EACZ,eAAe,EACf,gBAAgB,EACnB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,MAAM,MAAM,kBAAkB,CAAC;AAEtC,OAAO,WAAW,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,GAAG,MAAM,YAAY,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"AssetsUploadMenu.js","sourceRoot":"","sources":["../../../../src/components/assets/AssetsUploadMenu.tsx"],"names":[],"mappings":"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"}
|